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

Timestamp:

2006-06-06T13:33:54Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e269c53

Parents:

8333801

Message:

generalize ppc32 exception handling

File:

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

arch/ppc32/src/exception.S

@@ -152 +152 @@
 .global exc_system_reset
 exc_system_reset:
-        b exc_system_reset
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 0
+        b jump_to_kernel
 
 .org 0x200
 .global exc_machine_check
 exc_machine_check:
-        b exc_machine_check
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 1
+        b jump_to_kernel
 
 .org 0x300
@@ -164 +178 @@
         CONTEXT_STORE
         
-        lis r12, pht_refill@ha
-        addi r12, r12, pht_refill@l
-        mtsrr0 r12
-        
-        li r3, 1
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 2
         b jump_to_kernel
 
@@ -176 +190 @@
         CONTEXT_STORE
         
-        lis r12, pht_refill@ha
-        addi r12, r12, pht_refill@l
-        mtsrr0 r12
-        
-        li r3, 0
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 3
         b jump_to_kernel
 
@@ -187 +201 @@
 exc_external:
         CONTEXT_STORE
-
-        lis r12, extint_handler@ha
-        addi r12, r12, extint_handler@l
-        mtsrr0 r12
-
-        li r3, 0
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 4
         b jump_to_kernel
 
@@ -198 +212 @@
 .global exc_alignment
 exc_alignment:
-        b exc_alignment
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 5
+        b jump_to_kernel
 
 .org 0x700
 .global exc_program
 exc_program:
-        b exc_program
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 6
+        b jump_to_kernel
 
 .org 0x800
 .global exc_fp_unavailable
 exc_fp_unavailable:
-        b exc_fp_unavailable
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 7
+        b jump_to_kernel
 
 .org 0x900
@@ -219 +254 @@
         mtsrr0 r12
         
-        li r3, 10
+        li r3, 8
         b jump_to_kernel
 
@@ -225 +260 @@
 .global exc_reserved0
 exc_reserved0:
-        b exc_reserved0
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 9
+        b jump_to_kernel
 
 .org 0xb00
 .global exc_reserved1
 exc_reserved1:
-        b exc_reserved1
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 10
+        b jump_to_kernel
 
 .org 0xc00
@@ -242 +291 @@
 .global exc_trace
 exc_trace:
-        b exc_trace
+        CONTEXT_STORE
+        
+        lis r12, exc_dispatch@ha
+        addi r12, r12, exc_dispatch@l
+        mtsrr0 r12
+        
+        li r3, 12
+        b jump_to_kernel