Changes in kernel/arch/arm32/src/exception.c [7e752b2:646b996] in mainline

File:

• kernel/arch/arm32/src/exception.c (modified) (6 diffs)

kernel/arch/arm32/src/exception.c

@@ -37 +37 @@
 #include <arch/memstr.h>
 #include <arch/regutils.h>
-#include <arch/machine_func.h>
 #include <interrupt.h>
 #include <arch/mm/page_fault.h>
@@ -43 +42 @@
 #include <print.h>
 #include <syscall/syscall.h>
-#include <stacktrace.h>
+
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
 
 /** Offset used in calculation of exception handler's relative address.
@@ -84 +90 @@
  *
  * Dispatches the syscall.
- *
  */
-static void swi_exception(unsigned int exc_no, istate_t *istate)
+static void swi_exception(int exc_no, istate_t *istate)
 {
         istate->r0 = syscall_handler(istate->r0, istate->r1, istate->r2,
@@ -142 +147 @@
  * Determines the sources of interrupt and calls their handlers.
  */
-static void irq_exception(unsigned int exc_no, istate_t *istate)
+static void irq_exception(int exc_no, istate_t *istate)
 {
         machine_irq_exception(exc_no, istate);
@@ -159 +164 @@
         install_exception_handlers();
         
-        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);
+        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);
 }
 
@@ -173 +175 @@
  * @param istate Structure to be printed.
  */
-void istate_decode(istate_t *istate)
+void print_istate(istate_t *istate)
 {
-        printf("r0 =%#0" PRIx32 "\tr1 =%#0" PRIx32 "\t"
-            "r2 =%#0" PRIx32 "\tr3 =%#0" PRIx32 "\n",
+        printf("istate dump:\n");
+        
+        printf(" r0: %x    r1: %x    r2: %x    r3: %x\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#" PRIx32 "\tr5 =%#0" PRIx32 "\t"
-            "r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\n",
+        printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0" PRIx32 "\tr9 =%#0" PRIx32 "\t"
-            "r10=%#0" PRIx32 "\tfp =%p\n",
-            istate->r8, istate->r9, istate->r10,
-            (void *) istate->fp);
-        printf("r12=%#0" PRIx32 "\tsp =%p\tlr =%p\tspsr=%p\n",
-            istate->r12, (void *) istate->sp,
-            (void *) istate->lr, (void *) istate->spsr);
+        printf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
+            istate->r8, istate->r9, istate->r10, istate->r11);
+        printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
+            istate->r12, istate->sp, istate->lr, istate->spsr);
+        
+        printf(" pc: %x\n", istate->pc);
 }