Changeset 9d47440 in mainline for kernel/arch/ppc32/src/exception.S

Timestamp:

2011-05-21T16:23:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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/exception.S (modified) (6 diffs)

kernel/arch/ppc32/src/exception.S

@@ -142 +142 @@
         CONTEXT_STORE
         
-        b data_storage
+        li r3, 2
+        b jump_to_kernel
 
 .org 0x400
@@ -149 +150 @@
         CONTEXT_STORE
         
-        b instruction_storage
+        li r3, 3
+        b jump_to_kernel
 
 .org 0x500
@@ -227 +229 @@
         CONTEXT_STORE
         
-        b tlb_miss
+        li r3, 13
+        b jump_to_kernel
 
 .org 0x1100
@@ -234 +237 @@
         CONTEXT_STORE
         
-        b tlb_miss
+        li r3, 14
+        b jump_to_kernel
 
 .org 0x1200
@@ -241 +245 @@
         CONTEXT_STORE
         
-        b tlb_miss
+        li r3, 15
+        b jump_to_kernel
 
 .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
@@ -313 +283 @@
         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