Changeset f3a6c8e5 in mainline for arch/mips/src/exception.c

Timestamp:

2005-09-10T01:16:19Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9060bd1

Parents:

ffc277e

Message:

Doc updates, small fixes.

File:

• arch/mips/src/exception.c (modified) (4 diffs)

arch/mips/src/exception.c

@@ -52 +52 @@
         cp0_status_write(cp0_status_read() & ~ (cp0_status_exl_exception_bit |
                                                 cp0_status_um_bit));
+
         /* Save pstate so that the threads can access it */
-        if (THREAD)
+        /* If THREAD->pstate is set, this is nested exception,
+         * do not rewrite it
+         */
+        if (THREAD && !THREAD->pstate)
                 THREAD->pstate = pstate;
 
@@ -64 +68 @@
                 case EXC_TLBS:
                         tlb_invalid(pstate);
+                        break;
+                case EXC_CpU:
+#ifdef FPU_LAZY     
+                        scheduler_fpu_lazy_request();
+#else
+                        panic("unhandled Coprocessor Unusable Exception\n");
+#endif
                         break;
                 case EXC_Mod:
@@ -88 +99 @@
                         panic("unhandled Reserved Instruction Exception\n");
                         break;
-                case EXC_CpU:
-#ifdef FPU_LAZY     
-                        scheduler_fpu_lazy_request();
-#else
-                        panic("unhandled Coprocessor Unusable Exception\n");
-#endif
-                        break;
                 case EXC_Ov:
                         panic("unhandled Arithmetic Overflow Exception\n");
@@ -118 +122 @@
         
         pstate->epc += epc_shift;
-        /* Probable not needed, but just for sure that nobody 
-         * will continue accessing it */
+        /* Set to NULL, so that we can still support nested
+         * exceptions
+         * TODO: We should probably set EXL bit before this command,
+         * nesting. On the other hand, if some exception occurs between
+         * here and ERET, it won't set anything on the pstate anyway.
+         */
         if (THREAD)
                 THREAD->pstate = NULL;