diff options
| author | Andy Wingo <wingo@pobox.com> | 2018-07-15 09:50:52 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2018-07-20 11:42:30 +0200 |
| commit | b1705bd0f0181a6496223b26cb5da68fa470ccaa (patch) | |
| tree | 709a7ac76ea0d491326ab5464820cc72132c984b /libguile/frames.c | |
| parent | e95f15c932650783f34253e396216c66050905f0 (diff) | |
| download | guile-b1705bd0f0181a6496223b26cb5da68fa470ccaa.tar.gz | |
Prepare for frames having separate virtual and machine return addrs
* libguile/frames.c (scm_frame_return_address): Use
SCM_FRAME_VIRTUAL_RETURN_ADDRESS.
(scm_c_frame_previous): Likewise.
* libguile/frames.h: Update diagram for new names.
(union scm_vm_stack_element): Rename "as_ip" to "as_vcode", and
add "as_mcode" for machine code pointers.
(SCM_FRAME_VIRTUAL_RETURN_ADDRESS)
(SCM_FRAME_SET_VIRTUAL_RETURN_ADDRESS): Rename to these, from
SCM_FRAME_RETURN_ADDRESS and SCM_FRAME_SET_RETURN_ADDRESS.
* libguile/vm-engine.c (halt, call, call-label, return-values)
(return-from-interrupt): Adapt to renamings. Make "halt" have frame
size as a parameter.
* libguile/vm.c (scm_i_vm_mark_stack): Adapt to renaming.
(push_interrupt_frame): Take mRA as additional argument. In future we
will set it as frame mRA.
(capture_continuation): Adapt to renaming.
(scm_call_n): Adapt to renaming and make frame size adjustable.
(push_interrupt_frame, reinstate_continuation_x): Make frame size
adjustable.
* module/language/cps/slot-allocation.scm (allocate-slots): Make frame
size adjustable.
* libguile/intrinsics.h (scm_t_thread_mra_intrinsic): New type; use for
push_interrupt_frame.
(scm_t_thread_u8_scm_sp_vra_intrinsic): Rename from the same but was
"ra" instead of "vra", and change type to uint32_t*.
* module/system/vm/disassembler.scm (define-clobber-parser):
Parameterize clobber set for calls by frame size.
Diffstat (limited to 'libguile/frames.c')
| -rw-r--r-- | libguile/frames.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/frames.c b/libguile/frames.c index 845248007..d989d6292 100644 --- a/libguile/frames.c +++ b/libguile/frames.c @@ -366,8 +366,8 @@ SCM_DEFINE (scm_frame_return_address, "frame-return-address", 1, 0, 0, #define FUNC_NAME s_scm_frame_return_address { SCM_VALIDATE_VM_FRAME (1, frame); - return scm_from_uintptr_t ((uintptr_t) (SCM_FRAME_RETURN_ADDRESS - (SCM_VM_FRAME_FP (frame)))); + return scm_from_uintptr_t ((uintptr_t) (SCM_FRAME_VIRTUAL_RETURN_ADDRESS + (SCM_VM_FRAME_FP (frame)))); } #undef FUNC_NAME @@ -404,7 +404,7 @@ scm_c_frame_previous (enum scm_vm_frame_kind kind, struct scm_frame *frame) new_sp = SCM_FRAME_PREVIOUS_SP (this_fp); frame->fp_offset = stack_top - new_fp; frame->sp_offset = stack_top - new_sp; - frame->ip = SCM_FRAME_RETURN_ADDRESS (this_fp); + frame->ip = SCM_FRAME_VIRTUAL_RETURN_ADDRESS (this_fp); if (scm_i_vm_is_boot_continuation_code (frame->ip)) goto again; |