Changeset 7861

Timestamp:

Dec 9, 2007, 5:58:36 AM (17 years ago)

Author:

Gary Byers

Message:

If the callback to handle a UUO claims that we should skip -1 bytes,
treat that as an indication that the relative pc in the exception
callback frame has been adjusted and update the real PC in the
exception frame. (This scheme allows us to "anchor" a UUO to a
the logical label in the main assembly fragment.)

File:

• branches/working-0711/ccl/lisp-kernel/x86-exceptions.c (modified) (2 diffs)

branches/working-0711/ccl/lisp-kernel/x86-exceptions.c

@@ -473 +473 @@
   pc program_counter = (pc)xpPC(xp);
   unsigned char op0 = program_counter[0], op1 = program_counter[1];
-  LispObj rpc = (LispObj) program_counter, errdisp = nrs_ERRDISP.vcell,
-    save_rbp = xpGPR(xp,Irbp), save_vsp = xpGPR(xp,Isp), xcf;
+  LispObj rpc, errdisp = nrs_ERRDISP.vcell,
+    save_rbp = xpGPR(xp,Irbp), save_vsp = xpGPR(xp,Isp), xcf0;
   int skip;
 
@@ -483 +483 @@
       finish_function_entry(xp);
     }
-    xcf = create_exception_callback_frame(xp);
-    skip = callback_to_lisp(tcr, errdisp, xp, xcf, 0, 0, 0, 0);
+    xcf0 = create_exception_callback_frame(xp);
+    skip = callback_to_lisp(tcr, errdisp, xp, xcf0, 0, 0, 0, 0);
+    if (skip == -1) {
+      xcf *xcf1 = (xcf *)xcf0;
+      LispObj container = xcf1->containing_uvector;
+      
+      rpc = xcf1->relative_pc >> fixnumshift;
+      if (container == lisp_nil) {
+        xpPC(xp) = rpc;
+      } else {
+        xpPC(xp) = (LispObj)((&(deref(container,1)))+rpc);
+      }
+        
+      skip = 0;
+    }
     xpGPR(xp,Irbp) = save_rbp;
     xpGPR(xp,Isp) = save_vsp;