callees now check their args, cons rest list, reserve locals

* gdbinit: Ignore SIGPWR and SIGXCPU, which the BDW GC seems to use.

* libguile/vm-engine.h (FETCH_WIDTH): Remove unused macro.
  (INIT_ARGS, INIT_FRAME): Remove; callees now check their args and
  reserve space for their locals.

* libguile/vm-engine.c:
* libguile/vm-i-system.c: Turn on callee arg checking and local
  reservation. Seems to work!

4 files changed, 18 insertions, 68 deletions

diff --git a/gdbinit b/gdbinit
index b66e3e249..812f04b59 100644
--- a/gdbinit
+++ b/gdbinit
@@ -1,5 +1,8 @@
 # -*- GDB-Script -*-
 
+handle SIGPWR noprint nostop
+handle SIGXCPU noprint nostop
+
 define newline
   call (void)scm_newline (scm_current_error_port ())
 end
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index f26a1ebf2..f86a49876 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -112,7 +112,7 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs)
     CACHE_PROGRAM ();
     PUSH (program);
     fp = sp + 1;
-    INIT_FRAME ();
+    ip = bp->base;
     /* MV-call frame, function & arguments */
     PUSH ((SCM)fp); /* dynamic link */
     PUSH (0); /* mvra */
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h
index 4772ad19e..d69328944 100644
--- a/libguile/vm-engine.h
+++ b/libguile/vm-engine.h
@@ -335,7 +335,6 @@ do {						\
 
 #define FETCH()		(*ip++)
 #define FETCH_LENGTH(len) do { len=*ip++; len<<=8; len+=*ip++; len<<=8; len+=*ip++; } while (0)
-#define FETCH_WIDTH(width) do { width=*ip++; } while (0)
 
 #undef CLOCK
 #if VM_USE_CLOCK
@@ -360,45 +359,9 @@ do {						\
 }
 
 
-/*
- * Stack frame
- */
-
-#define INIT_ARGS()				\
-{						\
-  if (SCM_UNLIKELY (bp->nrest))                 \
-    {						\
-      int n = nargs - (bp->nargs - 1);		\
-      if (n < 0)				\
-	goto vm_error_wrong_num_args;		\
-      /* NB, can cause GC while setting up the  \
-         stack frame */                         \
-      POP_LIST (n);				\
-    }						\
-  else						\
-    {						\
-      if (SCM_UNLIKELY (nargs != bp->nargs))    \
-	goto vm_error_wrong_num_args;		\
-    }						\
-}
-
 /* 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 INIT_FRAME()				\
-{						\
-  int i;					\
-						\
-  /* New registers */                           \
-  sp += bp->nlocs;                              \
-  CHECK_OVERFLOW ();				\
-  ip = bp->base;				\
-						\
-  /* Init local variables */			\
-  for (i=bp->nlocs; i;)                         \
-    sp[-(--i)] = SCM_UNDEFINED;                 \
-}
-
 #define DROP_FRAME()                            \
   {                                             \
     sp -= 3;                                    \
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index ede91e287..71d066667 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -485,10 +485,8 @@ VM_DEFINE_INSTRUCTION (38, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0)
   scm_t_ptrdiff n;
   n = FETCH () << 8;
   n += FETCH ();
-#if 0
-  if (sp - fp != n)
+  if (sp - (fp - 1) != n)
     goto vm_error_wrong_num_args;
-#endif
   NEXT;
 }
 
@@ -497,25 +495,21 @@ VM_DEFINE_INSTRUCTION (39, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0)
   scm_t_ptrdiff n;
   n = FETCH () << 8;
   n += FETCH ();
-#if 0
-  if (sp - fp < n)
+  if (sp - (fp - 1) < n)
     goto vm_error_wrong_num_args;
-#endif
   NEXT;
 }
 
 VM_DEFINE_INSTRUCTION (40, push_rest_list, "push-rest-list", 2, -1, -1)
 {
   scm_t_ptrdiff n;
+  SCM rest = SCM_EOL;
   n = FETCH () << 8;
   n += FETCH ();
-#if 0
-  SCM rest = SCM_EOL;
-  while (sp - fp >= n)
+  while (sp - (fp - 1) > n)
     /* No need to check for underflow. */
     CONS (rest, *sp--, rest);
   PUSH (rest);
-#endif
   NEXT;
 }
 
@@ -524,12 +518,10 @@ VM_DEFINE_INSTRUCTION (41, reserve_locals, "reserve-locals", 2, -1, -1)
   scm_t_int32 n;
   n = FETCH () << 8;
   n += FETCH ();
-#if 0
   sp += n;
   CHECK_OVERFLOW ();
   while (n--)
     sp[-n] = SCM_UNDEFINED;
-#endif
   NEXT;
 }
 
@@ -561,13 +553,12 @@ VM_DEFINE_INSTRUCTION (43, call, "call", 1, -1, 1)
     {
       program = x;
       CACHE_PROGRAM ();
-      INIT_ARGS ();
-      fp = sp - bp->nargs + 1;
+      fp = sp - nargs + 1;
       ASSERT (SCM_FRAME_RETURN_ADDRESS (fp) == 0);
       ASSERT (SCM_FRAME_MV_RETURN_ADDRESS (fp) == 0);
       SCM_FRAME_SET_RETURN_ADDRESS (fp, ip);
       SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, 0);
-      INIT_FRAME ();
+      ip = bp->base;
       ENTER_HOOK ();
       APPLY_HOOK ();
       NEXT;
@@ -622,7 +613,8 @@ VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1)
     {
       int i;
 #ifdef VM_ENABLE_STACK_NULLING
-      SCM *old_sp;
+      SCM *old_sp = sp;
+      CHECK_STACK_LEAK ();
 #endif
 
       EXIT_HOOK ();
@@ -630,22 +622,15 @@ VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1)
       /* switch programs */
       program = x;
       CACHE_PROGRAM ();
-      INIT_ARGS ();
-
-#ifdef VM_ENABLE_STACK_NULLING
-      old_sp = sp;
-      CHECK_STACK_LEAK ();
-#endif
+      /* shuffle down the program and the arguments */
+      for (i = -1, sp = sp - nargs + 1; i < nargs; i++)
+        SCM_FRAME_STACK_ADDRESS (fp)[i] = sp[i];
 
-      /* delay shuffling the new program+args down so that if INIT_ARGS had to
-         cons up a rest arg, going into GC, the stack still made sense */
-      for (i = -1, sp = sp - bp->nargs + 1; i < bp->nargs; i++)
-        fp[i] = sp[i];
       sp = fp + i - 1;
 
       NULLSTACK (old_sp - sp);
 
-      INIT_FRAME ();
+      ip = bp->base;
 
       ENTER_HOOK ();
       APPLY_HOOK ();
@@ -721,13 +706,12 @@ VM_DEFINE_INSTRUCTION (47, mv_call, "mv-call", 4, -1, 1)
     {
       program = x;
       CACHE_PROGRAM ();
-      INIT_ARGS ();
-      fp = sp - bp->nargs + 1;
+      fp = sp - nargs + 1;
       ASSERT (SCM_FRAME_RETURN_ADDRESS (fp) == 0);
       ASSERT (SCM_FRAME_MV_RETURN_ADDRESS (fp) == 0);
       SCM_FRAME_SET_RETURN_ADDRESS (fp, ip);
       SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, mvra);
-      INIT_FRAME ();
+      ip = bp->base;
       ENTER_HOOK ();
       APPLY_HOOK ();
       NEXT;