diff options
author | Andy Wingo <wingo@pobox.com> | 2008-09-13 19:15:20 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2008-09-13 19:22:28 +0200 |
commit | da320011a31f4b58570d8cb7e67cde39133572eb (patch) | |
tree | 85626c75e2be87d1e1dd0301eeff20c280f82e0b /libguile/vm-engine.h | |
parent | 28106f547dc88723e02a38de7d4dc4ffc6434590 (diff) | |
download | guile-da320011a31f4b58570d8cb7e67cde39133572eb.tar.gz |
add a multiple values return address to stack frames
* libguile/frames.c (frame-mv-return-address): New accessor.
* libguile/frames.h: Update frame diagram.
(SCM_FRAME_UPPER_ADDRESS): Update for data area
growing by one pointer.
(SCM_FRAME_MV_RETURN_ADDRESS): New macro.
* libguile/vm-engine.h (NEW_FRAME): Update for frame getting bigger by a
pointer. In a normal NEW_FRAME, set the MV return address to NULL, to
indicate that this continuation does not accept multiple values.
* libguile/vm-i-system.c (tail-call): Update frame replacement code to
understand the MV return address.
(return): Make room for the MVRA.
Diffstat (limited to 'libguile/vm-engine.h')
-rw-r--r-- | libguile/vm-engine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h index 516eedcb4..0d0c03d8a 100644 --- a/libguile/vm-engine.h +++ b/libguile/vm-engine.h @@ -422,7 +422,7 @@ do { \ /* New registers */ \ fp = sp - bp->nargs + 1; \ data = SCM_FRAME_DATA_ADDRESS (fp); \ - sp = data + 3; \ + sp = data + 4; \ CHECK_OVERFLOW (); \ stack_base = sp; \ ip = bp->base; \ @@ -437,7 +437,8 @@ do { \ CONS (external, SCM_UNDEFINED, external); \ \ /* Set frame data */ \ - data[3] = (SCM)ra; \ + data[4] = (SCM)ra; \ + data[3] = 0x0; \ data[2] = (SCM)dl; \ data[1] = SCM_BOOL_F; \ data[0] = external; \ |