diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:01:19 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:16:46 +0200 |
commit | 7af531508c5931261ff8957708642cac67bf86a5 (patch) | |
tree | bd36d27d9f7a11d954093d4121ccb9e645f5c59f /libguile/vm-engine.h | |
parent | f86f3b5b113b4cb383c531150b13bef9b2789221 (diff) | |
parent | ce3ed0125fcfb9ad09da815f133a2320102d164c (diff) | |
download | guile-7af531508c5931261ff8957708642cac67bf86a5.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/bytevectors.c
libguile/gc-card.c
libguile/gc-mark.c
libguile/programs.c
libguile/srcprop.c
libguile/srfi-14.c
libguile/symbols.c
libguile/threads.c
libguile/unif.c
libguile/vm.c
Diffstat (limited to 'libguile/vm-engine.h')
-rw-r--r-- | libguile/vm-engine.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h index b819b9028..3c1bbf681 100644 --- a/libguile/vm-engine.h +++ b/libguile/vm-engine.h @@ -386,34 +386,29 @@ do { \ /* See frames.h for the layout of stack frames */ /* When this is called, bp points to the new program data, and the arguments are already on the stack */ -#define NEW_FRAME() \ +#define INIT_FRAME() \ { \ int i; \ - SCM *dl, *data; \ - scm_byte_t *ra = ip; \ - \ - /* Save old registers */ \ - ra = ip; \ - dl = fp; \ \ /* New registers */ \ - fp = sp - bp->nargs + 1; \ - data = SCM_FRAME_DATA_ADDRESS (fp); \ - sp = data + 2; \ + sp += bp->nlocs; \ CHECK_OVERFLOW (); \ stack_base = sp; \ ip = bp->base; \ \ /* Init local variables */ \ - for (i=bp->nlocs; i; i--) \ - data[-i] = SCM_UNDEFINED; \ - \ - /* Set frame data */ \ - data[2] = (SCM)ra; \ - data[1] = 0x0; \ - data[0] = (SCM)dl; \ + for (i=bp->nlocs; i;) \ + sp[-(--i)] = SCM_UNDEFINED; \ } +#define DROP_FRAME() \ + { \ + sp -= 3; \ + NULLSTACK (3); \ + CHECK_UNDERFLOW (); \ + } + + /* Local Variables: c-file-style: "gnu" |