summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
commit563db6cb990a0dd5442b51b507152904e7bbd152 (patch)
treeb2fb7d0535d3d912112de689186925fe5e39aa35 /src
parent5d67be7b1e60eeebdc66b213d5e59e83fe10a920 (diff)
downloadgem5-563db6cb990a0dd5442b51b507152904e7bbd152.tar.xz
ARM: Make sure the upc is zeroed when vectoring to a fault.
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/faults.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 0de5db527..3dd0b7f2f 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -143,6 +143,7 @@ ArmFault::invoke(ThreadContext *tc)
tc->setPC(newPc);
tc->setNextPC(newPc + cpsr.t ? 2 : 4 );
tc->setMicroPC(0);
+ tc->setNextMicroPC(1);
}
void
@@ -189,6 +190,8 @@ SupervisorCall::invoke(ThreadContext *tc)
// Advance the PC since that won't happen automatically.
tc->setPC(tc->readNextPC());
tc->setNextPC(tc->readNextNPC());
+ tc->setMicroPC(0);
+ tc->setNextMicroPC(1);
}
#endif // FULL_SYSTEM