Changeset 874621f in mainline for arch/mips32

Timestamp:

2006-06-06T07:40:51Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

0dbc4e7

Parents:

6f9a9bc

Message:

Added kernel circular buffer klog.
Added automatic killing of tasks raising inappropriate exceptions.
TODO Fix vsnprintf return value(and behaviour according to specs) and remove workaround in klog.

Location:

arch/mips32

Files:

• include/arg.h (modified) (1 diff)
• include/exception.h (modified) (2 diffs)
• src/exception.c (modified) (2 diffs)
• src/mm/tlb.c (modified) (4 diffs)

arch/mips32/include/arg.h

@@ -45 +45 @@
         (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((__address)((ap) + 2*4 - 1) & (~3)) : ((__address)((ap) + 2*8 -1) & (~7)) )))[-1])
 
+#define va_copy(dst,src) ((dst)=(src))
+
 #define va_end(ap)
 

arch/mips32/include/exception.h

@@ -35 +35 @@
 
 #include <typedefs.h>
+#include <arch/cp0.h>
 
 #define EXC_Int         0
@@ -99 +100 @@
 }
 
+/** Return true if exception happened while in userspace */
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return istate->status & cp0_status_um_bit;
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->epc;
+}
+
 extern void exception(istate_t *istate);
 extern void tlb_refill_entry(void);

arch/mips32/src/exception.c

@@ -79 +79 @@
 static void unhandled_exception(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "unhandled exception %s", exctable[n]);
+        
         print_regdump(istate);
         panic("unhandled exception %s\n", exctable[n]);
@@ -120 +122 @@
         if (cp0_cause_coperr(cp0_cause_read()) == fpu_cop_id)
                 scheduler_fpu_lazy_request();
-        else
+        else {
+                fault_if_from_uspace(istate, "unhandled Coprocessor Unusable Exception");
                 panic("unhandled Coprocessor Unusable Exception\n");
+        }
 }
 #endif

arch/mips32/src/mm/tlb.c

@@ -40 +40 @@
 #include <debug.h>
 #include <align.h>
+#include <interrupt.h>
 
 static void tlb_refill_fail(istate_t *istate);
@@ -337 +338 @@
         if (s)
                 sym2 = s;
+
+        fault_if_from_uspace(istate, "TLB Refill Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Refill Exception at %X(%s<-%s)\n", cp0_badvaddr_read(), istate->epc, symbol, sym2);
 }
@@ -348 +351 @@
         if (s)
                 symbol = s;
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Invalid Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
 }
@@ -358 +362 @@
         if (s)
                 symbol = s;
+        fault_if_from_uspace(istate, "TLB Modified Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Modified Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
 }