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

Timestamp:

2006-05-02T16:03:58Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

738ad2e

Parents:

9417cdc

Message:

ppc32 work:
(hopefully) final exception entry and exit rewrite
don't use FPU instructions in the kernel
syscall support

File:

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

arch/ppc32/src/exception.S

@@ -34 +34 @@
 .macro CONTEXT_STORE
         
-        # save SP in SPRG1
-        # save R12 in SPRG2, backup CR in R12
-
-        mtsprg1 sp
-        mtsprg2 r12
+        # save R12 in SPRG1, backup CR in R12
+        # save SP in SPRG2
+
+        mtsprg1 r12
         mfcr r12
+        mtsprg2 sp
         
         # check whether SP is in kernel
@@ -56 +56 @@
                 # stack is in kernel
                 
-                mfsprg1 sp
+                mfsprg2 sp
                 subis sp, sp, 0x8000
         
         2:
         
-        subi sp, sp, 140
+        subi sp, sp, 148
         stw r0, 0(sp)
         stw r2, 4(sp)
@@ -93 +93 @@
         stw r31, 116(sp)
         
-        mfsrr0 r3
-        stw r3, 120(sp)
-        
-        mfsrr1 r3
-        stw r3, 124(sp)
-        
-        mflr r3
-        stw r3, 128(sp)
-        
+        stw r12, 120(sp)
+        
+        mfsrr0 r12
+        stw r12, 124(sp)
+        
+        mfsrr1 r12
+        stw r12, 128(sp)
+        
+        mflr r12
         stw r12, 132(sp)
         
-        mfctr r3
-        stw r3, 136(sp)
-        
-        mfxer r3
-        stw r3, 140(sp)
+        mfctr r12
+        stw r12, 136(sp)
+        
+        mfxer r12
+        stw r12, 140(sp)
+        
+        mfsprg1 r12
+        stw r12, 144(sp)
+        
+        mfsprg2 r12
+        stw r12, 148(sp)
 .endm
+
+.org 0x060
+jump_to_kernel:
+        lis r12, iret@ha
+        addi r12, r12, iret@l
+        mtlr r12
+
+        mfmsr r12
+        ori r12, r12, (msr_ir | msr_dr)@l
+        mtsrr1 r12
+        
+        addis sp, sp, 0x8000
+        mr r4, sp
+        rfi
+
+jump_to_kernel_syscall:
+        lis r12, syscall_handler@ha
+        addi r12, r12, syscall_handler@l
+        mtsrr0 r12
+        
+        lis r12, iret_syscall@ha
+        addi r12, r12, iret_syscall@l
+        mtlr r12
+
+        mfmsr r12
+        ori r12, r12, (msr_ir | msr_dr)@l
+        mtsrr1 r12
+        
+        addis sp, sp, 0x8000
+        rfi
 
 .org 0x100
@@ -126 +162 @@
         CONTEXT_STORE
         
-        lis r3, pht_refill@ha
-        addi r3, r3, pht_refill@l
-        mtsrr0 r3
-        
-        mfmsr r3
-        ori r3, r3, (msr_ir | msr_dr)@l
-        mtsrr1 r3
-        
-        lis r3, iret@ha
-        addi r3, r3, iret@l
-        mtlr r3
-        
-        addis sp, sp, 0x8000
+        lis r12, pht_refill@ha
+        addi r12, r12, pht_refill@l
+        mtsrr0 r12
+        
         li r3, 1
-        mr r4, sp
-        rfi
+        b jump_to_kernel
 
 .org 0x400
@@ -148 +174 @@
         CONTEXT_STORE
         
-        lis r3, pht_refill@ha
-        addi r3, r3, pht_refill@l
-        mtsrr0 r3
-        
-        mfmsr r3
-        ori r3, r3, (msr_ir | msr_dr)@l
-        mtsrr1 r3
-        
-        lis r3, iret@ha
-        addi r3, r3, iret@l
-        mtlr r3
-        
-        addis sp, sp, 0x8000
+        lis r12, pht_refill@ha
+        addi r12, r12, pht_refill@l
+        mtsrr0 r12
+        
         li r3, 0
-        mr r4, sp
-        rfi
+        b jump_to_kernel
 
 .org 0x500
@@ -190 +206 @@
         CONTEXT_STORE   
 
-        lis r3, exc_dispatch@ha
-        addi r3, r3, exc_dispatch@l
-        mtsrr0 r3
-        
-        mfmsr r3
-        ori r3, r3, (msr_ir | msr_dr)@l
-        mtsrr1 r3
-        
-        lis r3, iret@ha
-        addi r3, r3, iret@l
-        mtlr r3
-        
-        addis sp, sp, 0x8000
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
         li r3, 10
-        mr r4, sp
-        rfi
+        b jump_to_kernel
 
 .org 0xa00
@@ -220 +226 @@
 .global exc_syscall
 exc_syscall:
-        b exc_syscall
+        CONTEXT_STORE   
+        
+        b jump_to_kernel_syscall
 
 .org 0xd00