mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 08:40:19 +02:00
reorder frame layout
* libguile/frames.h: Reorder the frame layout so the return address comes below the arguments.working (SCM_FRAME_SET_RETURN_ADDRESS, SCM_FRAME_SET_MV_RETURN_ADDRESS): New macros. * libguile/frames.c (scm_vm_frame_arguments): Use the macros to access the arguments. * libguile/vm-engine.c (vm_engine): Fix for new calling convention. * libguile/vm-engine.h (INIT_FRAME): New macro. Does part of what NEW_FRAME used to do. * libguile/vm-i-system.c (call, mv-call): Shuffle args up to make room for the stack, and adapt to new calling convention. (goto/args): Shuffling down is easier now. (return, return/args): Adapt to new frame layout. * libguile/vm.c (vm_mark_stack): Adapt to new frame layout, and the possibility of there being crap on the stack. (really_make_boot_program): Remove extraneous comment.
This commit is contained in:
parent
d94be25f72
commit
03e6c16596
6 changed files with 85 additions and 123 deletions
|
@ -111,12 +111,12 @@ SCM_DEFINE (scm_vm_frame_arguments, "vm-frame-arguments", 1, 0, 0,
|
|||
if (!bp->nargs)
|
||||
return SCM_EOL;
|
||||
else if (bp->nrest)
|
||||
ret = fp[bp->nargs - 1];
|
||||
ret = SCM_FRAME_VARIABLE (fp, bp->nargs - 1);
|
||||
else
|
||||
ret = scm_cons (fp[bp->nargs - 1], SCM_EOL);
|
||||
ret = scm_cons (SCM_FRAME_VARIABLE (fp, bp->nargs - 1), SCM_EOL);
|
||||
|
||||
for (i = bp->nargs - 2; i >= 0; i--)
|
||||
ret = scm_cons (fp[i], ret);
|
||||
ret = scm_cons (SCM_FRAME_VARIABLE (fp, i), ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue