Changeset 12985

Timestamp:

Oct 9, 2009, 9:56:12 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Push the watched object onto the lisp stack before creating the xcf. The
error callback will look for it there.

File:

• branches/watchpoints/lisp-kernel/x86-exceptions.c (modified) (3 diffs)

branches/watchpoints/lisp-kernel/x86-exceptions.c

@@ -301 +301 @@
 }
 
-  
-
-
-
 void
 push_on_lisp_stack(ExceptionInformation *xp, LispObj value)
@@ -312 +308 @@
   xpGPR(xp,Isp) = (LispObj)vsp;
 }
-
 
 /* Hard to know if or whether this is necessary in general.  For now,
@@ -842 +837 @@
           LispObj save_vsp = xpGPR(xp, Isp);
           LispObj save_fp = xpGPR(xp, Ifp);
-          LispObj xcf = create_exception_callback_frame(xp, tcr);
+          LispObj xcf;
+          natural offset = (LispObj)addr - obj;
           int skip;
 
-          /* The magic 2 means this was a write to a watchd object */
-          skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, (natural) addr, obj);
+          push_on_lisp_stack(xp, obj);
+          xcf = create_exception_callback_frame(xp, tcr);
+
+          /* The magic 2 means this was a write to a watched object */
+          skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, (natural) addr, offset);
           xpPC(xp) += skip;
           xpGPR(xp, Ifp) = save_fp;