Changeset 6025

Timestamp:

Mar 12, 2007, 1:08:04 AM (18 years ago)

Author:

Gary Byers

Message:

in catch_exception_raise(), try to deal with variations in Mach
behavior: "exception" may be EXC_BAD_ACCESS when an illegal instruction
causes a "general protection fault".

File:

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

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

@@ -2210 +2210 @@
       CLR_TCR_FLAG(tcr,TCR_FLAG_BIT_PENDING_EXCEPTION);
     } 
-    if ((exception == EXC_BAD_INSTRUCTION) &&
+    if ((code == EXC_I386_GPFLT) &&
         ((natural)(ts_pc(ts)) == (natural)pseudo_sigreturn)) {
       kret = do_pseudo_sigreturn(thread, tcr);
@@ -2222 +2222 @@
       switch (exception) {
       case EXC_BAD_ACCESS:
-        signum = SIGBUS;
+        if (code == EXC_I386_GPFLT) {
+          signum = SIGSEGV;
+        } else {
+          signum = SIGBUS;
+        }
         break;