Changeset 13002

Timestamp:

Oct 12, 2009, 5:02:23 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

In handle_fault(), pass the watched object on the lisp stack
underneath the xcf rather than as an (integer) callback parameter.
Compute and pass an offset to the written address (reckoned from the
tagged object pointer).

File:

• trunk/source/lisp-kernel/x86-exceptions.c (modified) (1 diff)

trunk/source/lisp-kernel/x86-exceptions.c

@@ -842 +842 @@
           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;
 
+          push_on_lisp_stack(xp, obj);
+          xcf = create_exception_callback_frame(xp, tcr);
+
           /* 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);
+          skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2,
+                                  (natural)addr, offset);
           xpPC(xp) += skip;
           xpGPR(xp, Ifp) = save_fp;