Changes in kernel/arch/ppc32/src/exception.S [6c3106f:ffe276f] in mainline

File:

• kernel/arch/ppc32/src/exception.S (modified) (6 diffs)

kernel/arch/ppc32/src/exception.S

@@ -142 +142 @@
         CONTEXT_STORE
         
-        li r3, 2
-        b jump_to_kernel
+        b data_storage
 
 .org 0x400
@@ -150 +149 @@
         CONTEXT_STORE
         
-        li r3, 3
-        b jump_to_kernel
+        b instruction_storage
 
 .org 0x500
@@ -229 +227 @@
         CONTEXT_STORE
         
-        li r3, 13
-        b jump_to_kernel
+        b tlb_miss
 
 .org 0x1100
@@ -237 +234 @@
         CONTEXT_STORE
         
-        li r3, 14
-        b jump_to_kernel
+        b tlb_miss
 
 .org 0x1200
@@ -245 +241 @@
         CONTEXT_STORE
         
-        li r3, 15
-        b jump_to_kernel
+        b tlb_miss
 
 .org 0x4000
+data_storage:
+        li r3, 2
+        mr r4, sp
+        addi r4, r4, 8
+        bl pht_refill_real
+        
+        cmpwi r3, 0
+        bne iret_real
+        
+        li r3, 2
+        b jump_to_kernel
+
+instruction_storage:
+        li r3, 3
+        mr r4, sp
+        addi r4, r4, 8
+        bl pht_refill_real
+        
+        cmpwi r3, 0
+        bne iret_real
+        
+        li r3, 3
+        b jump_to_kernel
+
+tlb_miss:
+        li r3, 16
+        mfspr r4, tlbmiss
+        mfspr r5, ptehi
+        mfspr r6, ptelo
+        mr r7, sp
+        addi r7, r7, 20
+        
+        bl tlb_refill_real
+        b iret_real
+
 jump_to_kernel:
         lis r12, iret@ha
@@ -283 +313 @@
         addis sp, sp, 0x8000
         rfi
+
+iret_real:
+        lwz r0, 8(sp)
+        lwz r2, 12(sp)
+        lwz r3, 16(sp)
+        lwz r4, 20(sp)
+        lwz r5, 24(sp)
+        lwz r6, 28(sp)
+        lwz r7, 32(sp)
+        lwz r8, 36(sp)
+        lwz r9, 40(sp)
+        lwz r10, 44(sp)
+        lwz r11, 48(sp)
+        lwz r13, 52(sp)
+        lwz r14, 56(sp)
+        lwz r15, 60(sp)
+        lwz r16, 64(sp)
+        lwz r17, 68(sp)
+        lwz r18, 72(sp)
+        lwz r19, 76(sp)
+        lwz r20, 80(sp)
+        lwz r21, 84(sp)
+        lwz r22, 88(sp)
+        lwz r23, 92(sp)
+        lwz r24, 96(sp)
+        lwz r25, 100(sp)
+        lwz r26, 104(sp)
+        lwz r27, 108(sp)
+        lwz r28, 112(sp)
+        lwz r29, 116(sp)
+        lwz r30, 120(sp)
+        lwz r31, 124(sp)
+        
+        lwz r12, 128(sp)
+        mtcr r12
+        
+        lwz r12, 132(sp)
+        mtsrr0 r12
+        
+        lwz r12, 136(sp)
+        mtsrr1 r12
+        
+        lwz r12, 140(sp)
+        mtlr r12
+        
+        lwz r12, 144(sp)
+        mtctr r12
+        
+        lwz r12, 148(sp)
+        mtxer r12
+        
+        lwz r12, 156(sp)
+        lwz sp, 160(sp)
+        
+        rfi