From: Gabe Black <gabeblack@google.com>
Date: Tue, 14 Jan 2020 01:15:22 +0000 (-0800)
Subject: fastmodel: Set itstate when building a PCState from IRIS.
X-Git-Tag: v20.0.0.0~471
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fadda2dbe5ad2ee25ba792b0782ee56b1ea2936c;p=gem5.git

fastmodel: Set itstate when building a PCState from IRIS.

These bits are probably never going to be non-zero since we'd have to
take a checkpoint part way through an if/then construct in thumb, but
they're easy to extract and we might as well store them properly.

Change-Id: Ifc5c34063dd23f72cc106c0d77d90c5e6ee871be
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24328
Reviewed-by: Chun-Chen TK Hsu <chunchenhsu@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc b/src/arch/arm/fastmodel/iris/thread_context.cc
index 261491d45..3f7102f90 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -443,6 +443,8 @@ ThreadContext::pcState() const
     pc.aarch64(!cpsr.width);
     pc.nextAArch64(!cpsr.width);
     pc.illegalExec(false);
+    pc.itstate(itState(cpsr));
+    pc.nextItstate(0);
 
     iris::ResourceReadResult result;
     call().resource_read(_instId, result, pcRscId);