From: Min Kyu Jeong <MinKyu.Jeong@arm.com>
Date: Wed, 2 Jun 2010 17:58:18 +0000 (-0500)
Subject: ARM: Fix IT state not updating when an instruction memory instruction faults.
X-Git-Tag: stable_2012_02_02~1053
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d5bf8cbc7c0e388a1af80530601ec0422aab60a;p=gem5.git

ARM: Fix IT state not updating when an instruction memory instruction faults.
---

diff --git a/src/arch/arm/isa/templates/mem.isa b/src/arch/arm/isa/templates/mem.isa
index 4f1235b03..ea66ce2a6 100644
--- a/src/arch/arm/isa/templates/mem.isa
+++ b/src/arch/arm/isa/templates/mem.isa
@@ -342,6 +342,8 @@ def template LoadInitiateAcc {{
             if (fault == NoFault) {
                 fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags);
             }
+        } else if (fault == NoFault && machInst.itstateMask != 0) {
+            xc->setMiscReg(MISCREG_ITSTATE, machInst.newItstate);
         }
 
         return fault;