Changeset 544a2e4 in mainline for kernel/arch/ppc32/src/interrupt.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ppc32/src/interrupt.c (modified) (3 diffs)

kernel/arch/ppc32/src/interrupt.c

@@ -42 +42 @@
 #include <arch/drivers/pic.h>
 #include <arch/mm/tlb.h>
+#include <arch/mm/pht.h>
 #include <print.h>
 
@@ -54 +55 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%#0" PRIx32 "\tr1 =%p\tr2 =%#0" PRIx32 "\n",
-            istate->r0, (void *) istate->sp, istate->r2);
+        printf("r0 =%0#10" PRIx32 "\tr1 =%0#10" PRIx32 "\t"
+            "r2 =%0#10" PRIx32 "\n", istate->r0, istate->sp, istate->r2);
         
-        printf("r3 =%#0" PRIx32 "\tr4 =%#0" PRIx32 "\tr5 =%#0" PRIx32 "\n",
-            istate->r3, istate->r4, istate->r5);
+        printf("r3 =%0#10" PRIx32 "\tr4 =%0#10" PRIx32 "\t"
+            "r5 =%0#10" PRIx32 "\n", istate->r3, istate->r4, istate->r5);
         
-        printf("r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\tr8 =%#0" PRIx32 "\n",
-            istate->r6, istate->r7, istate->r8);
+        printf("r6 =%0#10" PRIx32 "\tr7 =%0#10" PRIx32 "\t"
+            "r8 =%0#10" PRIx32 "\n", istate->r6, istate->r7, istate->r8);
         
-        printf("r9 =%#0" PRIx32 "\tr10=%#0" PRIx32 "\tr11=%#0" PRIx32 "\n",
-            istate->r9, istate->r10, istate->r11);
+        printf("r9 =%0#10" PRIx32 "\tr10=%0#10" PRIx32 "\t"
+            "r11=%0#10" PRIx32 "\n", istate->r9, istate->r10, istate->r11);
         
-        printf("r12=%#0" PRIx32 "\tr13=%#0" PRIx32 "\tr14=%#0" PRIx32 "\n",
-            istate->r12, istate->r13, istate->r14);
+        printf("r12=%0#10" PRIx32 "\tr13=%0#10" PRIx32 "\t"
+            "r14=%0#10" PRIx32 "\n", istate->r12, istate->r13, istate->r14);
         
-        printf("r15=%#0" PRIx32 "\tr16=%#0" PRIx32 "\tr17=%#0" PRIx32 "\n",
-            istate->r15, istate->r16, istate->r17);
+        printf("r15=%0#10" PRIx32 "\tr16=%0#10" PRIx32 "\t"
+            "r17=%0#10" PRIx32 "\n", istate->r15, istate->r16, istate->r17);
         
-        printf("r18=%#0" PRIx32 "\tr19=%#0" PRIx32 "\tr20=%#0" PRIx32 "\n",
-            istate->r18, istate->r19, istate->r20);
+        printf("r18=%0#10" PRIx32 "\tr19=%0#10" PRIx32 "\t"
+            "r20=%0#10" PRIx32 "\n", istate->r18, istate->r19, istate->r20);
         
-        printf("r21=%#0" PRIx32 "\tr22=%#0" PRIx32 "\tr23=%#0" PRIx32 "\n",
-            istate->r21, istate->r22, istate->r23);
+        printf("r21=%0#10" PRIx32 "\tr22=%0#10" PRIx32 "\t"
+            "r23=%0#10" PRIx32 "\n", istate->r21, istate->r22, istate->r23);
         
-        printf("r24=%#0" PRIx32 "\tr25=%#0" PRIx32 "\tr26=%#0" PRIx32 "\n",
-            istate->r24, istate->r25, istate->r26);
+        printf("r24=%0#10" PRIx32 "\tr25=%0#10" PRIx32 "\t"
+            "r26=%0#10" PRIx32 "\n", istate->r24, istate->r25, istate->r26);
         
-        printf("r27=%#0" PRIx32 "\tr28=%#0" PRIx32 "\tr29=%#0" PRIx32 "\n",
-            istate->r27, istate->r28, istate->r29);
+        printf("r27=%0#10" PRIx32 "\tr28=%0#10" PRIx32 "\t"
+            "r29=%0#10" PRIx32 "\n", istate->r27, istate->r28, istate->r29);
         
-        printf("r30=%#0" PRIx32 "\tr31=%#0" PRIx32 "\n",
+        printf("r30=%0#10" PRIx32 "\tr31=%0#10" PRIx32 "\n",
             istate->r30, istate->r31);
         
-        printf("cr =%#0" PRIx32 "\tpc =%p\tlr =%p\n",
-            istate->cr, (void *) istate->pc, (void *) istate->lr);
+        printf("cr =%0#10" PRIx32 "\tpc =%0#10" PRIx32 "\t"
+            "lr =%0#10" PRIx32 "\n", istate->cr, istate->pc, istate->lr);
         
-        printf("ctr=%#0" PRIx32 "\txer=%#0" PRIx32 "\tdar=%#0" PRIx32 "\n",
-            istate->ctr, istate->xer, istate->dar);
+        printf("ctr=%0#10" PRIx32 "\txer=%0#10" PRIx32 "\t"
+            "dar=%0#10" PRIx32 "\n", istate->ctr, istate->xer, istate->dar);
         
-        printf("srr1=%p\n", (void *) istate->srr1);
+        printf("srr1=%0#10" PRIx32 "\n", istate->srr1);
 }
 
@@ -153 +154 @@
         exc_register(VECTOR_DECREMENTER, "timer", true,
             exception_decrementer);
+        exc_register(VECTOR_ITLB_MISS, "itlb_miss", true,
+            tlb_refill);
+        exc_register(VECTOR_DTLB_MISS_LOAD, "dtlb_miss_load", true,
+            tlb_refill);
+        exc_register(VECTOR_DTLB_MISS_STORE, "dtlb_miss_store", true,
+            tlb_refill);
 }