[src/netbsd-1-4]: src/sys/arch/arm32/arm32 pullup 1.42->1.43 (mycroft)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c54f3a63fc7b
branches:  netbsd-1-4
changeset: 468665:c54f3a63fc7b
user:      perry <perry%NetBSD.org@localhost>
date:      Thu May 06 00:19:11 1999 +0000

description:
pullup 1.42->1.43 (mycroft)

diffstat:

 sys/arch/arm32/arm32/fault.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 57233f33dcc1 -r c54f3a63fc7b sys/arch/arm32/arm32/fault.c
--- a/sys/arch/arm32/arm32/fault.c      Thu May 06 00:17:34 1999 +0000
+++ b/sys/arch/arm32/arm32/fault.c      Thu May 06 00:19:11 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fault.c,v 1.41 1999/03/26 22:00:24 mycroft Exp $       */
+/*     $NetBSD: fault.c,v 1.41.2.1 1999/05/06 00:19:11 perry Exp $     */
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -150,6 +150,15 @@
        int error;
 
        /*
+        * Must get fault address and status from the CPU before
+        * re-enabling interrupts.  (Interrupt handlers may take
+        * R/M emulation faults.)
+        */
+       fault_address = cpu_faultaddress();
+       fault_status = cpu_faultstatus();
+       fault_pc = frame->tf_pc;
+
+       /*
         * Enable IRQ's (disabled by CPU on abort) if trapframe
         * shows they were enabled.
         */
@@ -159,11 +168,6 @@
        /* Update vmmeter statistics */
        uvmexp.traps++;
 
-       /* Get fault address and status from the CPU */
-       fault_address = cpu_faultaddress();
-       fault_status = cpu_faultstatus();
-       fault_pc = frame->tf_pc;
-
        /* Extract the fault code from the fault status */
        fault_code = fault_status & FAULT_TYPE_MASK;