From 5d5bf8cbc7c0e388a1af80530601ec0422aab60a Mon Sep 17 00:00:00 2001
From: Min Kyu Jeong <MinKyu.Jeong@arm.com>
Date: Wed, 2 Jun 2010 12:58:18 -0500
Subject: ARM: Fix IT state not updating when an instruction memory instruction
 faults.

---
 src/arch/arm/isa/templates/mem.isa | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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