diff options
author | Gabe Black <gabeblack@google.com> | 2019-11-04 16:27:34 -0800 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2019-11-26 03:01:32 +0000 |
commit | 57e951f6eae1de88988a9b13035c07985a0bcd73 (patch) | |
tree | e0eebcc48ab14e7106f1a41b09d82f8390357c34 /src/cpu/thread_context.cc | |
parent | 97a6a64f286fb07557843d88776fbc69606b9d88 (diff) | |
download | gem5-57e951f6eae1de88988a9b13035c07985a0bcd73.tar.xz |
arch,cpu: Get rid of ISA_HAS_CC_REGS and its associated ifdefs.
This conditional compilation was unnecessary and makes gem5 more
brittle and harder to understand.
Change-Id: I63abaf2668252c988cdd4626ff6a462eb6f54b04
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22544
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/cpu/thread_context.cc')
-rw-r--r-- | src/cpu/thread_context.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc index dea39015f..f8c422c98 100644 --- a/src/cpu/thread_context.cc +++ b/src/cpu/thread_context.cc @@ -191,12 +191,12 @@ serialize(const ThreadContext &tc, CheckpointOut &cp) intRegs[i] = tc.readIntRegFlat(i); SERIALIZE_ARRAY(intRegs, NumIntRegs); -#ifdef ISA_HAS_CC_REGS - RegVal ccRegs[NumCCRegs]; - for (int i = 0; i < NumCCRegs; ++i) - ccRegs[i] = tc.readCCRegFlat(i); - SERIALIZE_ARRAY(ccRegs, NumCCRegs); -#endif + if (NumCCRegs) { + RegVal ccRegs[NumCCRegs]; + for (int i = 0; i < NumCCRegs; ++i) + ccRegs[i] = tc.readCCRegFlat(i); + SERIALIZE_ARRAY(ccRegs, NumCCRegs); + } tc.pcState().serialize(cp); @@ -232,12 +232,12 @@ unserialize(ThreadContext &tc, CheckpointIn &cp) for (int i = 0; i < NumIntRegs; ++i) tc.setIntRegFlat(i, intRegs[i]); -#ifdef ISA_HAS_CC_REGS - RegVal ccRegs[NumCCRegs]; - UNSERIALIZE_ARRAY(ccRegs, NumCCRegs); - for (int i = 0; i < NumCCRegs; ++i) - tc.setCCRegFlat(i, ccRegs[i]); -#endif + if (NumCCRegs) { + RegVal ccRegs[NumCCRegs]; + UNSERIALIZE_ARRAY(ccRegs, NumCCRegs); + for (int i = 0; i < NumCCRegs; ++i) + tc.setCCRegFlat(i, ccRegs[i]); + } PCState pcState; pcState.unserialize(cp); |