| /trunk/kernel/arch/ppc32/include/exception.h |
|---|
| 75,6 → 75,7 |
| uint32_t lr; |
| uint32_t ctr; |
| uint32_t xer; |
| uint32_t dar; |
| uint32_t r12; |
| uint32_t sp; |
| } istate_t; |
| /trunk/kernel/arch/ppc32/src/exception.S |
|---|
| 60,7 → 60,7 |
| 2: |
| subi sp, sp, 160 |
| subi sp, sp, 164 |
| stw r0, 8(sp) |
| stw r2, 12(sp) |
| stw r3, 16(sp) |
| 109,11 → 109,14 |
| mfxer r12 |
| stw r12, 148(sp) |
| mfsprg1 r12 |
| mfdar r12 |
| stw r12, 152(sp) |
| mfsprg1 r12 |
| stw r12, 156(sp) |
| mfsprg2 r12 |
| stw r12, 156(sp) |
| stw r12, 160(sp) |
| .endm |
| .org 0x100 |
| 137,16 → 140,7 |
| exc_data_storage: |
| CONTEXT_STORE |
| li r3, 2 |
| mr r4, sp |
| addi r4, r4, 8 |
| bl pht_real_refill |
| cmpwi r3, 0 |
| bne iret_real |
| li r3, 2 |
| b jump_to_kernel |
| b data_storage |
| .org 0x400 |
| .global exc_instruction_storage |
| 153,17 → 147,8 |
| exc_instruction_storage: |
| CONTEXT_STORE |
| li r3, 3 |
| mr r4, sp |
| addi r4, r4, 8 |
| bl pht_real_refill |
| cmpwi r3, 0 |
| bne iret_real |
| b instruction_storage |
| li r3, 3 |
| b jump_to_kernel |
| .org 0x500 |
| .global exc_external |
| exc_external: |
| 236,6 → 221,30 |
| b jump_to_kernel |
| .org 0x4000 |
| data_storage: |
| li r3, 2 |
| mr r4, sp |
| addi r4, r4, 8 |
| bl pht_real_refill |
| 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_real_refill |
| cmpwi r3, 0 |
| bne iret_real |
| li r3, 3 |
| b jump_to_kernel |
| jump_to_kernel: |
| lis r12, iret@ha |
| addi r12, r12, iret@l |
| 322,7 → 331,7 |
| lwz r12, 148(sp) |
| mtxer r12 |
| lwz r12, 152(sp) |
| lwz sp, 156(sp) |
| lwz r12, 156(sp) |
| lwz sp, 160(sp) |
| rfi |
| /trunk/kernel/arch/ppc32/src/asm.S |
|---|
| 131,8 → 131,8 |
| lwz r12, 148(sp) |
| mtxer r12 |
| lwz r12, 152(sp) |
| lwz sp, 156(sp) |
| lwz r12, 156(sp) |
| lwz sp, 160(sp) |
| rfi |
| 197,8 → 197,8 |
| lwz r12, 148(sp) |
| mtxer r12 |
| lwz r12, 152(sp) |
| lwz sp, 156(sp) |
| lwz r12, 156(sp) |
| lwz sp, 160(sp) |
| rfi |
| /trunk/kernel/arch/ppc32/src/mm/tlb.c |
|---|
| 111,16 → 111,15 |
| char *symbol = ""; |
| char *sym2 = ""; |
| char *s = get_symtab_entry(istate->pc); |
| if (s) |
| symbol = s; |
| s = get_symtab_entry(istate->lr); |
| if (s) |
| sym2 = s; |
| char *str = get_symtab_entry(istate->pc); |
| if (str) |
| symbol = str; |
| str = get_symtab_entry(istate->lr); |
| if (str) |
| sym2 = str; |
| fault_if_from_uspace(istate, |
| "%p: PHT Refill Exception at %p (%s<-%s).", badvaddr, |
| istate->pc, symbol, sym2); |
| "PHT Refill Exception on %p.", badvaddr); |
| panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr, |
| istate->pc, symbol, sym2); |
| } |
| 291,12 → 290,9 |
| lock = true; |
| } |
| if (n == VECTOR_DATA_STORAGE) { |
| asm volatile ( |
| "mfdar %0\n" |
| : "=r" (badvaddr) |
| ); |
| } else |
| if (n == VECTOR_DATA_STORAGE) |
| badvaddr = istate->dar; |
| else |
| badvaddr = istate->pc; |
| page_table_lock(as, lock); |
| 342,12 → 338,9 |
| { |
| uintptr_t badvaddr; |
| if (n == VECTOR_DATA_STORAGE) { |
| asm volatile ( |
| "mfdar %0\n" |
| : "=r" (badvaddr) |
| ); |
| } else |
| if (n == VECTOR_DATA_STORAGE) |
| badvaddr = istate->dar; |
| else |
| badvaddr = istate->pc; |
| uint32_t physmem; |