From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:10 +0000 (-0500)
Subject: ARM: Set CPSR.E to SCTLR.EE on faults.
X-Git-Tag: stable_2012_02_02~1191
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=524a8195e18f17ee6e57bfbcb2752ac6bfa2d8ee;p=gem5.git

ARM: Set CPSR.E to SCTLR.EE on faults.
---

diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 8428931a7..528fc32a5 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -111,6 +111,7 @@ ArmFaultBase::invoke(ThreadContext *tc)
     cpsr.a = cpsr.a | abortDisable();
     cpsr.f = cpsr.f | fiqDisable();
     cpsr.i = 1;
+    cpsr.e = sctlr.ee;
     tc->setMiscReg(MISCREG_CPSR, cpsr);
     tc->setIntReg(INTREG_LR, tc->readPC() + 
             (saved_cpsr.t ? thumbPcOffset() : armPcOffset()));