diff options
author | Gabe Black <gabeblack@google.com> | 2018-11-21 16:20:57 -0800 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2019-02-01 01:22:19 +0000 |
commit | a119a963240a35ab66a5baee3f77cfcd99c6bbbb (patch) | |
tree | c883d37ed479e92c23d881a48b8f2abec469faf7 /src/cpu/thread_context.cc | |
parent | fbdf0b689eb31543292f52c71d14152d8ff1156a (diff) | |
download | gem5-a119a963240a35ab66a5baee3f77cfcd99c6bbbb.tar.xz |
cpu, arch: Replace the CCReg type with RegVal.
Most architectures weren't using the CCReg type, and in x86 and arm
it was already a uint64_t.
Change-Id: I0b3d5e690e6b31db6f2627f449c89bde0f6750a6
Reviewed-on: https://gem5-review.googlesource.com/c/14515
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/cpu/thread_context.cc')
-rw-r--r-- | src/cpu/thread_context.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc index 3f5781b32..d122dd612 100644 --- a/src/cpu/thread_context.cc +++ b/src/cpu/thread_context.cc @@ -108,8 +108,8 @@ ThreadContext::compare(ThreadContext *one, ThreadContext *two) // loop through the Condition Code registers. for (int i = 0; i < TheISA::NumCCRegs; ++i) { - TheISA::CCReg t1 = one->readCCReg(i); - TheISA::CCReg t2 = two->readCCReg(i); + RegVal t1 = one->readCCReg(i); + RegVal t2 = two->readCCReg(i); if (t1 != t2) panic("CC reg idx %d doesn't match, one: %#x, two: %#x", i, t1, t2); @@ -192,7 +192,7 @@ serialize(ThreadContext &tc, CheckpointOut &cp) SERIALIZE_ARRAY(intRegs, NumIntRegs); #ifdef ISA_HAS_CC_REGS - CCReg ccRegs[NumCCRegs]; + RegVal ccRegs[NumCCRegs]; for (int i = 0; i < NumCCRegs; ++i) ccRegs[i] = tc.readCCRegFlat(i); SERIALIZE_ARRAY(ccRegs, NumCCRegs); @@ -233,7 +233,7 @@ unserialize(ThreadContext &tc, CheckpointIn &cp) tc.setIntRegFlat(i, intRegs[i]); #ifdef ISA_HAS_CC_REGS - CCReg ccRegs[NumCCRegs]; + RegVal ccRegs[NumCCRegs]; UNSERIALIZE_ARRAY(ccRegs, NumCCRegs); for (int i = 0; i < NumCCRegs; ++i) tc.setCCRegFlat(i, ccRegs[i]); |