Commit 7439b37e authored by LEROY Christophe's avatar LEROY Christophe Committed by Scott Wood

powerpc/8xx: exception InstructionAccess does not exist on MPC8xx

Exception InstructionAccess does not exist on MPC8xx. No need to branch there from somewhere else.
Handling can be done directly in InstructionTLBError Exception.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 0df1f248
...@@ -234,15 +234,10 @@ DataAccess: ...@@ -234,15 +234,10 @@ DataAccess:
EXC_XFER_LITE(0x300, handle_page_fault) EXC_XFER_LITE(0x300, handle_page_fault)
/* Instruction access exception. /* Instruction access exception.
* This is "never generated" by the MPC8xx. We jump to it for other * This is "never generated" by the MPC8xx.
* translation errors.
*/ */
. = 0x400 . = 0x400
InstructionAccess: InstructionAccess:
EXCEPTION_PROLOG
mr r4,r12
mr r5,r9
EXC_XFER_LITE(0x400, handle_page_fault)
/* External interrupt */ /* External interrupt */
EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
...@@ -382,7 +377,7 @@ InstructionTLBMiss: ...@@ -382,7 +377,7 @@ InstructionTLBMiss:
#endif #endif
mfspr r10, SPRN_SPRG_SCRATCH2 mfspr r10, SPRN_SPRG_SCRATCH2
EXCEPTION_EPILOG_0 EXCEPTION_EPILOG_0
b InstructionAccess b InstructionTLBError
. = 0x1200 . = 0x1200
DataStoreTLBMiss: DataStoreTLBMiss:
...@@ -477,7 +472,11 @@ DataStoreTLBMiss: ...@@ -477,7 +472,11 @@ DataStoreTLBMiss:
*/ */
. = 0x1300 . = 0x1300
InstructionTLBError: InstructionTLBError:
b InstructionAccess EXCEPTION_PROLOG
mr r4,r12
mr r5,r9
/* 0x400 is InstructionAccess exception, needed by bad_page_fault() */
EXC_XFER_LITE(0x400, handle_page_fault)
/* This is the data TLB error on the MPC8xx. This could be due to /* This is the data TLB error on the MPC8xx. This could be due to
* many reasons, including a dirty update to a pte. We bail out to * many reasons, including a dirty update to a pte. We bail out to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment