Changeset fbb8b2b in mainline for arch/ppc32/src/exception.S

Timestamp:

2006-06-17T17:26:14Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e3bf3e2

Parents:

74b22cc5

Message:

ppc32: more generic page hash table handling
(preliminary code, will be fixed properly later)

File:

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

arch/ppc32/src/exception.S

@@ -122 +122 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 0
         b jump_to_kernel
@@ -134 +130 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 1
         b jump_to_kernel
@@ -146 +138 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
+#       li r3, 2
+#       mr r4, sp
+#       addi r4, r4, 8
+#       bl pht_real_refill
+        
+#       cmpwi r3, 0
+#       bne iret_real
         
         li r3, 2
@@ -158 +154 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
+#       li r3, 3
+#       mr r4, sp
+#       addi r4, r4, 8
+#       bl pht_real_refill
+        
+#       cmpwi r3, 0
+#       bne iret_real
+
         li r3, 3
         b jump_to_kernel
@@ -170 +170 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 4
         b jump_to_kernel
@@ -182 +178 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 5
         b jump_to_kernel
@@ -194 +186 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 6
         b jump_to_kernel
@@ -206 +194 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 7
         b jump_to_kernel
@@ -217 +201 @@
 exc_decrementer:
         CONTEXT_STORE
-
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
         
         li r3, 8
@@ -230 +210 @@
         CONTEXT_STORE
         
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
-        
         li r3, 9
         b jump_to_kernel
@@ -241 +217 @@
 exc_reserved1:
         CONTEXT_STORE
-        
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
         
         li r3, 10
@@ -260 +232 @@
 exc_trace:
         CONTEXT_STORE
-        
-        lis r12, exc_dispatch@ha
-        addi r12, r12, exc_dispatch@l
-        mtsrr0 r12
         
         li r3, 12
@@ -273 +241 @@
         addi r12, r12, iret@l
         mtlr r12
-
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
         mfmsr r12
         ori r12, r12, (msr_ir | msr_dr)@l
@@ -292 +264 @@
         addi r12, r12, iret_syscall@l
         mtlr r12
-
+        
         mfmsr r12
         ori r12, r12, (msr_ir | msr_dr)@l
@@ -299 +271 @@
         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, 152(sp)
+        lwz sp, 156(sp)
+        
+        rfi