From 563db6cb990a0dd5442b51b507152904e7bbd152 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:17 -0500
Subject: ARM: Make sure the upc is zeroed when vectoring to a fault.

---
 src/arch/arm/faults.cc | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3