Changeset b3b7e14a in mainline for kernel/arch/arm32

Timestamp:

2010-06-11T15:31:03Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

214ec25c

Parents:

be06914

Message:

distinguish between "hot" and "cold" exceptions
display only "hot" exceptions by default
add top to help

Location:

kernel/arch/arm32

Files:

• include/ras.h (modified) (2 diffs)
• src/exc_handler.S (modified) (6 diffs)
• src/exception.c (modified) (1 diff)
• src/ras.c (modified) (2 diffs)

kernel/arch/arm32/include/ras.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jakub Jermar 
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <typedefs.h>
 
-#define RAS_START       0
-#define RAS_END         1
+#define RAS_START  0
+#define RAS_END    1
 
 extern uintptr_t *ras_page;
 
 extern void ras_init(void);
-extern void ras_check(int, istate_t *);
+extern void ras_check(unsigned int, istate_t *);
 
 #endif

kernel/arch/arm32/src/exc_handler.S

@@ -150 +150 @@
         mov r0, #0
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 
@@ -158 +158 @@
         mov r0, #5
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 
@@ -166 +166 @@
         mov r0, #6
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 
@@ -173 +173 @@
         mov r0, #1
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 
@@ -181 +181 @@
         mov r0, #3
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 
@@ -189 +189 @@
         mov r0, #4
         mov r1, r13
-        bl ras_check 
+        bl ras_check
         LOAD_REGS_FROM_STACK
 

kernel/arch/arm32/src/exception.c

@@ -165 +165 @@
         install_exception_handlers();
         
-        exc_register(EXC_IRQ, "interrupt", (iroutine) irq_exception);
-        exc_register(EXC_PREFETCH_ABORT, "prefetch abort",
-            (iroutine) prefetch_abort);
-        exc_register(EXC_DATA_ABORT, "data abort", (iroutine) data_abort);
-        exc_register(EXC_SWI, "software interrupt", (iroutine) swi_exception);
+        exc_register(EXC_IRQ, "interrupt", true,
+            (iroutine_t) irq_exception);
+        exc_register(EXC_PREFETCH_ABORT, "prefetch abort", true,
+            (iroutine_t) prefetch_abort);
+        exc_register(EXC_DATA_ABORT, "data abort", true,
+            (iroutine_t) data_abort);
+        exc_register(EXC_SWI, "software interrupt", true,
+            (iroutine_t) swi_exception);
 }
 

kernel/arch/arm32/src/ras.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jakub Jermar 
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -66 +66 @@
 }
 
-void ras_check(int n, istate_t *istate)
+void ras_check(unsigned int n, istate_t *istate)
 {
         uintptr_t rewrite_pc = istate->pc;