diff options
author | Steve Reinhardt <steve.reinhardt@amd.com> | 2016-02-06 17:21:20 -0800 |
---|---|---|
committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2016-02-06 17:21:20 -0800 |
commit | 2d91e741e8ffc8ae3d40f1e849db87e69af7bfa9 (patch) | |
tree | 7516d86052480e28009bb772083ddd7b9eb72415 /src/arch/x86/isa.cc | |
parent | 4e65e25e257f30f2185bc4c4bd06e5b1fdb9688d (diff) | |
download | gem5-2d91e741e8ffc8ae3d40f1e849db87e69af7bfa9.tar.xz |
x86: create function to check miscreg validity
In the process of trying to get rid of an '== false' comparison,
it became apparent that a slightly more involved solution was
needed. Split this out into its own changeset since it's not
a totally trivial local change like the others.
Diffstat (limited to 'src/arch/x86/isa.cc')
-rw-r--r-- | src/arch/x86/isa.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc index 213a9e2e3..ad7248841 100644 --- a/src/arch/x86/isa.cc +++ b/src/arch/x86/isa.cc @@ -129,13 +129,7 @@ ISA::readMiscRegNoEffect(int miscReg) const // Make sure we're not dealing with an illegal control register. // Instructions should filter out these indexes, and nothing else should // attempt to read them directly. - assert(miscReg >= MISCREG_CR0 && - miscReg < NUM_MISCREGS && - miscReg != MISCREG_CR1 && - !(miscReg > MISCREG_CR4 && - miscReg < MISCREG_CR8) && - !(miscReg > MISCREG_CR8 && - miscReg <= MISCREG_CR15)); + assert(isValidMiscReg(miscReg)); return regVal[miscReg]; } @@ -162,13 +156,7 @@ ISA::setMiscRegNoEffect(int miscReg, MiscReg val) // Make sure we're not dealing with an illegal control register. // Instructions should filter out these indexes, and nothing else should // attempt to write to them directly. - assert(miscReg >= MISCREG_CR0 && - miscReg < NUM_MISCREGS && - miscReg != MISCREG_CR1 && - !(miscReg > MISCREG_CR4 && - miscReg < MISCREG_CR8) && - !(miscReg > MISCREG_CR8 && - miscReg <= MISCREG_CR15)); + assert(isValidMiscReg(miscReg)); HandyM5Reg m5Reg = readMiscRegNoEffect(MISCREG_M5_REG); switch (miscReg) { |