Changeset 12818

Timestamp:

Sep 11, 2009, 1:10:22 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

In handle_fault(), when handling a write to a watched object, pass both the
faulting address and the lisp object to the error callback.

File:

• trunk/source/lisp-kernel/x86-exceptions.c (modified) (2 diffs)

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

@@ -828 +828 @@
         /* caught a write to a watched object */
         LispObj cmain = nrs_CMAIN.vcell;
-        LispObj object = (LispObj)a->low + fulltag_misc; /* always uvectors */
+        LispObj obj = (LispObj)a->low + fulltag_misc; /* always uvectors */
 
         if ((fulltag_of(cmain) == fulltag_misc) &&
@@ -834 +834 @@
           LispObj xcf = create_exception_callback_frame(xp, tcr);
           int skip;
-          LispObj addr = (LispObj)a->low;
 
           /* The magic 2 means this was a write to a watchd object */
-          skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, object, 0);
+          skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, addr, obj);
           xpPC(xp) += skip;
           return true;