From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 15 Nov 2013 08:47:10 +0000 (-0500)
Subject: cpu: Fix Checker register index use
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f028da7af7792bec226372ef23c1d103ad68ad30;p=gem5.git

cpu: Fix Checker register index use

This patch fixes an issue in the checker CPU register indexing. The
code will not even compile using LTO as deep inlining causes the used
index to be outside the array bounds.
---

diff --git a/src/cpu/checker/cpu_impl.hh b/src/cpu/checker/cpu_impl.hh
index 73bacdc05..23e9c103e 100644
--- a/src/cpu/checker/cpu_impl.hh
+++ b/src/cpu/checker/cpu_impl.hh
@@ -607,10 +607,10 @@ Checker<Impl>::copyResult(DynInstPtr &inst, uint64_t mismatch_val,
             thread->setIntReg(idx, mismatch_val);
             break;
           case FloatRegClass:
-            thread->setFloatRegBits(idx, mismatch_val);
+            thread->setFloatRegBits(idx - TheISA::FP_Reg_Base, mismatch_val);
             break;
           case CCRegClass:
-            thread->setCCReg(idx, mismatch_val);
+            thread->setCCReg(idx - TheISA::CC_Reg_Base, mismatch_val);
             break;
           case MiscRegClass:
             thread->setMiscReg(idx - TheISA::Misc_Reg_Base,
@@ -628,10 +628,10 @@ Checker<Impl>::copyResult(DynInstPtr &inst, uint64_t mismatch_val,
             thread->setIntReg(idx, res);
             break;
           case FloatRegClass:
-            thread->setFloatRegBits(idx, res);
+            thread->setFloatRegBits(idx - TheISA::FP_Reg_Base, res);
             break;
           case CCRegClass:
-            thread->setCCReg(idx, res);
+            thread->setCCReg(idx - TheISA::CC_Reg_Base, res);
             break;
           case MiscRegClass:
             // Try to get the proper misc register index for ARM here...