diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-19 18:09:34 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 18:09:34 +0100 |
commit | 9121d9f1ac21a91d2031a186a5b3c77d551acaa4 (patch) | |
tree | d8525983a542d48b98d361276c0415aac4ce8628 /libguile/dynstack.c | |
parent | b636cdb0f3e1b7e8723c214db7a9c80edac9ead6 (diff) | |
download | guile-9121d9f1ac21a91d2031a186a5b3c77d551acaa4.tar.gz |
All instruction pointers are now scm_t_uint32*
* libguile/frames.h (SCM_FRAME_RTL_RETURN_ADDRESS)
(SCM_FRAME_SET_RTL_RETURN_ADDRESS): Remove. The variants without _RTL
now work fine.
(struct scm_vm_frame): Change the return address to be a
scm_t_uint32*.
(struct scm_frame): Change IP to be scm_t_uint32*.
* libguile/frames.c (scm_c_make_frame)
* libguile/control.c (reify_partial_continuation, scm_c_abort)
* libguile/dynstack.c (PROMPT_IP)
(scm_dynstack_push_prompt, scm_dynstack_find_prompt)
* libguile/dynstack.h:
* libguile/vm-engine.c (SYNC_IP, RETURN_ONE_VALUE)
(call, return-values, prompt): Adapt.
Diffstat (limited to 'libguile/dynstack.c')
-rw-r--r-- | libguile/dynstack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/dynstack.c b/libguile/dynstack.c index 5f19a2bc2..2d8895e08 100644 --- a/libguile/dynstack.c +++ b/libguile/dynstack.c @@ -38,7 +38,7 @@ #define PROMPT_KEY(top) (SCM_PACK ((top)[0])) #define PROMPT_FP(top) ((SCM *) ((top)[1])) #define PROMPT_SP(top) ((SCM *) ((top)[2])) -#define PROMPT_IP(top) ((scm_t_uint8 *) ((top)[3])) +#define PROMPT_IP(top) ((scm_t_uint32 *) ((top)[3])) #define PROMPT_JMPBUF(top) ((scm_i_jmp_buf *) ((top)[4])) #define WINDER_WORDS 2 @@ -186,7 +186,7 @@ void scm_dynstack_push_prompt (scm_t_dynstack *dynstack, scm_t_dynstack_prompt_flags flags, SCM key, - SCM *fp, SCM *sp, scm_t_uint8 *ip, + SCM *fp, SCM *sp, scm_t_uint32 *ip, scm_i_jmp_buf *registers) { scm_t_bits *words; @@ -442,7 +442,7 @@ scm_dynstack_unwind_fork (scm_t_dynstack *dynstack, scm_t_dynstack *branch) scm_t_bits* scm_dynstack_find_prompt (scm_t_dynstack *dynstack, SCM key, scm_t_dynstack_prompt_flags *flags, - SCM **fp, SCM **sp, scm_t_uint8 **ip, + SCM **fp, SCM **sp, scm_t_uint32 **ip, scm_i_jmp_buf **registers) { scm_t_bits *walk; |