All instruction pointers are now scm_t_uint32*

[bpt/guile.git] / libguile / frames.c

diff --git a/libguile/frames.c b/libguile/frames.c
index d32f837..a96b133 100644 (file)
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -28,7 +28,7 @@
 
 /* Make sure assumptions on the layout of `struct scm_vm_frame' hold.  */
 verify (sizeof (SCM) == sizeof (SCM *));
-verify (sizeof (struct scm_vm_frame) == 5 * sizeof (SCM));
+verify (sizeof (struct scm_vm_frame) == 3 * sizeof (SCM));
 verify (offsetof (struct scm_vm_frame, dynamic_link) == 0);
 
 \f
@@ -37,7 +37,7 @@ verify (offsetof (struct scm_vm_frame, dynamic_link) == 0);
 
 SCM
 scm_c_make_frame (SCM stack_holder, SCM *fp, SCM *sp,
-                  scm_t_uint8 *ip, scm_t_ptrdiff offset)
+                  scm_t_uint32 *ip, scm_t_ptrdiff offset)
 {
   struct scm_frame *p = scm_gc_malloc (sizeof (struct scm_frame),
                                        "vmframe");
@@ -110,76 +110,39 @@ SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0,
 }
 #undef FUNC_NAME
 
-/* The number of locals would be a simple thing to compute, if it weren't for
-   the presence of not-yet-active frames on the stack. So we have a cheap
-   heuristic to detect not-yet-active frames, and skip over them. Perhaps we
-   should represent them more usefully.
-*/
 SCM_DEFINE (scm_frame_num_locals, "frame-num-locals", 1, 0, 0,
            (SCM frame),
            "")
 #define FUNC_NAME s_scm_frame_num_locals
 {
-  SCM *fp, *sp, *p;
-  unsigned int n = 0;
+  SCM *fp, *sp;
 
   SCM_VALIDATE_VM_FRAME (1, frame);
 
   fp = SCM_VM_FRAME_FP (frame);
   sp = SCM_VM_FRAME_SP (frame);
-  p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-
-  if (SCM_RTL_PROGRAM_P (fp[-1]))
-    /* The frame size of an RTL program is fixed, except in the case of
-       passing a wrong number of arguments to the program.  So we do
-       need to use an SP for determining the number of locals.  */
-    return scm_from_ptrdiff_t (sp + 1 - p);
 
-  sp = SCM_VM_FRAME_SP (frame);
-  p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p <= sp)
-    {
-      if (SCM_UNPACK (p[0]) == 0)
-        /* skip over not-yet-active frame */
-        p += 3;
-      else
-        {
-          p++;
-          n++;
-        }
-    }
-  return scm_from_uint (n);
+  return scm_from_ptrdiff_t (SCM_FRAME_NUM_LOCALS (fp, sp));
 }
 #undef FUNC_NAME
 
-/* Need same not-yet-active frame logic here as in frame-num-locals */
 SCM_DEFINE (scm_frame_local_ref, "frame-local-ref", 2, 0, 0,
            (SCM frame, SCM index),
            "")
 #define FUNC_NAME s_scm_frame_local_ref
 {
-  SCM *sp, *p;
-  unsigned int n = 0;
+  SCM *fp, *sp;
   unsigned int i;
 
   SCM_VALIDATE_VM_FRAME (1, frame);
   SCM_VALIDATE_UINT_COPY (2, index, i);
 
+  fp = SCM_VM_FRAME_FP (frame);
   sp = SCM_VM_FRAME_SP (frame);
-  p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p <= sp)
-    {
-      if (SCM_UNPACK (p[0]) == 0)
-        /* skip over not-yet-active frame */
-        p += 3;
-      else if (n == i)
-        return *p;
-      else
-        {
-          p++;
-          n++;
-        }
-    }
+
+  if (i < SCM_FRAME_NUM_LOCALS (fp, sp))
+    return SCM_FRAME_LOCAL (fp, i);
+
   SCM_OUT_OF_RANGE (SCM_ARG2, index);
 }
 #undef FUNC_NAME
@@ -190,31 +153,21 @@ SCM_DEFINE (scm_frame_local_set_x, "frame-local-set!", 3, 0, 0,
            "")
 #define FUNC_NAME s_scm_frame_local_set_x
 {
-  SCM *sp, *p;
-  unsigned int n = 0;
+  SCM *fp, *sp;
   unsigned int i;
 
   SCM_VALIDATE_VM_FRAME (1, frame);
   SCM_VALIDATE_UINT_COPY (2, index, i);
 
+  fp = SCM_VM_FRAME_FP (frame);
   sp = SCM_VM_FRAME_SP (frame);
-  p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p <= sp)
+
+  if (i < SCM_FRAME_NUM_LOCALS (fp, sp))
     {
-      if (SCM_UNPACK (p[0]) == 0)
-        /* skip over not-yet-active frame */
-        p += 3;
-      else if (n == i)
-        {
-          *p = val;
-          return SCM_UNSPECIFIED;
-        }
-      else
-        {
-          p++;
-          n++;
-        }
+      SCM_FRAME_LOCAL (fp, i) = val;
+      return SCM_UNSPECIFIED;
     }
+
   SCM_OUT_OF_RANGE (SCM_ARG2, index);
 }
 #undef FUNC_NAME
@@ -262,18 +215,6 @@ SCM_DEFINE (scm_frame_return_address, "frame-return-address", 1, 0, 0,
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_frame_mv_return_address, "frame-mv-return-address", 1, 0, 0,
-           (SCM frame),
-           "")
-#define FUNC_NAME s_scm_frame_mv_return_address
-{
-  SCM_VALIDATE_VM_FRAME (1, frame);
-  return scm_from_uintptr_t ((scm_t_uintptr)
-                             (SCM_FRAME_MV_RETURN_ADDRESS
-                              (SCM_VM_FRAME_FP (frame))));
-}
-#undef FUNC_NAME
-
 SCM_DEFINE (scm_frame_dynamic_link, "frame-dynamic-link", 1, 0, 0,
            (SCM frame),
            "")
@@ -304,15 +245,14 @@ SCM_DEFINE (scm_frame_previous, "frame-previous", 1, 0, 0,
   if (new_fp) 
     {
       new_fp = RELOC (frame, new_fp);
-      new_sp = SCM_FRAME_LOWER_ADDRESS (this_fp) - 1;
+      new_sp = SCM_FRAME_PREVIOUS_SP (this_fp);
       frame = scm_c_make_frame (SCM_VM_FRAME_STACK_HOLDER (frame),
                                 new_fp, new_sp,
                                 SCM_FRAME_RETURN_ADDRESS (this_fp),
                                 SCM_VM_FRAME_OFFSET (frame));
       proc = scm_frame_procedure (frame);
 
-      if ((SCM_PROGRAM_P (proc) || SCM_RTL_PROGRAM_P (proc))
-          && SCM_PROGRAM_IS_BOOT (proc))
+      if (SCM_RTL_PROGRAM_P (proc) && SCM_PROGRAM_IS_BOOT (proc))
         goto again;
       else
         return frame;