mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Fix FFI struct sizing to account for trailing padding.

Browse source 
* libguile/foreign.c (scm_sizeof): Make sure the overall size is a
  multiple of the alignment of the structure.
* test-suite/tests/foreign.test: Test size of { double, int8 }.
This commit is contained in:
Ken Raeburn 2012-05-21 00:30:45 -04:00
parent a722bcaa13
commit cff1d39b20
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libguile/foreign.c
View file

@ -536,13 +536,14 @@ SCM_DEFINE (scm_sizeof, "sizeof", 1, 0, 0, (SCM type),
{ {
/* a struct */ /* a struct */
size_t off = 0; size_t off = 0;
size_t align = scm_to_size_t (scm_alignof(type));
while (scm_is_pair (type)) while (scm_is_pair (type))
{ {
off = ROUND_UP (off, scm_to_size_t (scm_alignof (scm_car (type)))); off = ROUND_UP (off, scm_to_size_t (scm_alignof (scm_car (type))));
off += scm_to_size_t (scm_sizeof (scm_car (type))); off += scm_to_size_t (scm_sizeof (scm_car (type)));
type = scm_cdr (type); type = scm_cdr (type);
} }
return scm_from_size_t (off); return scm_from_size_t (ROUND_UP(off, align));
} }
else else
scm_wrong_type_arg (FUNC_NAME, 1, type); scm_wrong_type_arg (FUNC_NAME, 1, type);

4
test-suite/tests/foreign.test
View file

@ -303,6 +303,10 @@
(= (sizeof (list int8 double)) (= (sizeof (list int8 double))
(+ (alignof double) (sizeof double)))) (+ (alignof double) (sizeof double))))
(pass-if "sizeof { double, int8 }"
(= (sizeof (list double int8))
(+ (alignof double) (sizeof double))))
(pass-if "sizeof { short, int, long, pointer }" (pass-if "sizeof { short, int, long, pointer }"
(let ((layout (list short int long '*))) (let ((layout (list short int long '*)))
(>= (sizeof layout) (>= (sizeof layout)