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/control.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/control.c')
| -rw-r--r-- | libguile/control.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libguile/control.c b/libguile/control.c index 3e5c0d855..4b51edfbe 100644 --- a/libguile/control.c +++ b/libguile/control.c @@ -79,7 +79,9 @@ make_partial_continuation (SCM vm_cont) static SCM reify_partial_continuation (SCM vm, - SCM *saved_fp, SCM *saved_sp, scm_t_uint8 *saved_ip, + SCM *saved_fp, + SCM *saved_sp, + scm_t_uint32 *saved_ip, scm_i_jmp_buf *saved_registers, scm_t_dynstack *dynstack, scm_i_jmp_buf *current_registers) @@ -128,7 +130,7 @@ scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv, scm_t_bits *prompt; scm_t_dynstack_prompt_flags flags; SCM *fp, *sp; - scm_t_uint8 *ip; + scm_t_uint32 *ip; scm_i_jmp_buf *registers; size_t i; |