Changeset 5437

Timestamp:

Oct 31, 2006, 2:21:42 AM (18 years ago)

Author:

Gary Byers

Message:

handle_protection_violation: pass the tcr. Initialize "addr" before
testing it ...

File:

• trunk/ccl/lisp-kernel/ppc-exceptions.c (modified) (3 diffs)

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

@@ -846 +846 @@
 
 OSStatus
-handle_protection_violation(ExceptionInformation *xp, siginfo_t *info)
+handle_protection_violation(ExceptionInformation *xp, siginfo_t *info, TCR *tcr)
 {
   BytePtr addr;
   protected_area_ptr area;
   protection_handler *handler;
-  TCR *tcr = TCR_FROM_TSD(xpGPR(xp, rcontext));
   extern Boolean touch_page(void *);
   extern void touch_page_end(void);
+
+  if (info) {
+    addr = (BytePtr)(info->si_addr);
+  } else {
+    addr = (BytePtr) ((natural) (xpDAR(xp)));
+  }
 
   if (addr && (addr == tcr->safe_ref_address)) {
@@ -871 +876 @@
   }
 
-  if (info) {
-    addr = (BytePtr)(info->si_addr);
-  } else {
-    addr = (BytePtr) ((natural) (xpDAR(xp)));
-  }
   area = find_protected_area(addr);
 
@@ -1175 +1175 @@
   } else if ((xnum == SIGSEGV) ||
              (xnum == SIGBUS)) {
-    status = handle_protection_violation(xp, info);
+    status = handle_protection_violation(xp, info, tcr);
   } else if (xnum == SIGFPE) {
     status = handle_sigfpe(xp, tcr);