diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-01-22 23:20:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-01-22 23:23:44 +0100 |
| commit | 0fc9040fa248c7d964966a568749d1398a457cd8 (patch) | |
| tree | 77f8d07f8c48a3eec416c73df91e65cba234d4a6 /libguile/frames.h | |
| parent | 17cc6e40a9ba5db9b0ff003a9a277ba43a72a067 (diff) | |
| download | guile-0fc9040fa248c7d964966a568749d1398a457cd8.tar.gz | |
Parenthesize and type `SCM_FRAME' macros; check layout of `scm_vm_frame'.
* libguile/frames.c: Add compile-time assertions on the layout of
`struct scm_vm_frame'.
(RELOC): Parenthesize and type VAL.
* libguile/frames.h (SCM_FRAME_STRUCT): Write in terms of
`SCM_FRAME_DATA_ADDRESS'.
(SCM_FRAME_DATA_ADDRESS): Parenthesize and type FP.
(SCM_FRAME_SET_DYNAMIC_LINK): Write in terms of
`SCM_FRAME_DYNAMIC_LINK'.
* libguile/vm.c (RELOC): Parenthesize and type SCM_P.
Diffstat (limited to 'libguile/frames.h')
| -rw-r--r-- | libguile/frames.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/frames.h b/libguile/frames.h index ffb577a8a..eaed79d43 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -70,9 +70,10 @@ struct scm_vm_frame SCM stack[1]; /* Variable-length */ }; -#define SCM_FRAME_STRUCT(fp) ((struct scm_vm_frame*)(((SCM*)(fp)) - 4)) +#define SCM_FRAME_STRUCT(fp) \ + ((struct scm_vm_frame *) SCM_FRAME_DATA_ADDRESS (fp)) -#define SCM_FRAME_DATA_ADDRESS(fp) (fp - 4) +#define SCM_FRAME_DATA_ADDRESS(fp) (((SCM *) (fp)) - 4) #define SCM_FRAME_STACK_ADDRESS(fp) (SCM_FRAME_STRUCT (fp)->stack) #define SCM_FRAME_UPPER_ADDRESS(fp) ((SCM*)&SCM_FRAME_STRUCT (fp)->return_address) #define SCM_FRAME_LOWER_ADDRESS(fp) ((SCM*)SCM_FRAME_STRUCT (fp)) @@ -91,7 +92,7 @@ struct scm_vm_frame #define SCM_FRAME_DYNAMIC_LINK(fp) \ (SCM_FRAME_STRUCT (fp)->dynamic_link) #define SCM_FRAME_SET_DYNAMIC_LINK(fp, dl) \ - SCM_FRAME_STRUCT (fp)->dynamic_link = (dl) + SCM_FRAME_DYNAMIC_LINK (fp) = (dl) #define SCM_FRAME_VARIABLE(fp,i) \ (SCM_FRAME_STRUCT (fp)->stack[i]) #define SCM_FRAME_PROGRAM(fp) \ |