diff --git a/src/arch/alpha/isa.hh b/src/arch/alpha/isa.hh index 35a26c108c..36515b520e 100644 --- a/src/arch/alpha/isa.hh +++ b/src/arch/alpha/isa.hh @@ -96,26 +96,26 @@ namespace AlphaISA void unserialize(Checkpoint *cp, const std::string §ion); int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { return reg; } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { return reg; } // dummy int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { return reg; } diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc index 2b67e6cf61..86be2803de 100644 --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -177,7 +177,7 @@ ISA::clear() } MiscReg -ISA::readMiscRegNoEffect(int misc_reg) +ISA::readMiscRegNoEffect(int misc_reg) const { assert(misc_reg < NumMiscRegs); diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh index 6fd57549ad..c747fc7704 100644 --- a/src/arch/arm/isa.hh +++ b/src/arch/arm/isa.hh @@ -96,13 +96,13 @@ namespace ArmISA public: void clear(); - MiscReg readMiscRegNoEffect(int misc_reg); + MiscReg readMiscRegNoEffect(int misc_reg) const; MiscReg readMiscReg(int misc_reg, ThreadContext *tc); void setMiscRegNoEffect(int misc_reg, const MiscReg &val); void setMiscReg(int misc_reg, const MiscReg &val, ThreadContext *tc); int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { assert(reg >= 0); if (reg < NUM_ARCH_INTREGS) { @@ -135,20 +135,20 @@ namespace ArmISA } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { return reg; } // dummy int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { if (reg == MISCREG_SPSR) { int spsr_idx = NUM_MISCREGS; diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh index eddf752729..d361d43711 100644 --- a/src/arch/mips/isa.hh +++ b/src/arch/mips/isa.hh @@ -167,26 +167,26 @@ namespace MipsISA ISA(Params *p); int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { return reg; } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { return reg; } // dummy int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { return reg; } diff --git a/src/arch/power/isa.hh b/src/arch/power/isa.hh index 028142b507..d19410037d 100644 --- a/src/arch/power/isa.hh +++ b/src/arch/power/isa.hh @@ -87,26 +87,26 @@ class ISA : public SimObject } int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { return reg; } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { return reg; } // dummy int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { return reg; } diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh index 31cb09c7eb..536deb69c1 100644 --- a/src/arch/sparc/isa.hh +++ b/src/arch/sparc/isa.hh @@ -191,7 +191,7 @@ class ISA : public SimObject ThreadContext *tc); int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { assert(reg < TotalInstIntRegs); RegIndex flatIndex = intRegMap[reg]; @@ -200,20 +200,20 @@ class ISA : public SimObject } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { return reg; } // dummy int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { return reg; } diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh index 14c8e98c9f..3ca771c61c 100644 --- a/src/arch/x86/isa.hh +++ b/src/arch/x86/isa.hh @@ -70,13 +70,13 @@ namespace X86ISA void setMiscReg(int miscReg, MiscReg val, ThreadContext *tc); int - flattenIntIndex(int reg) + flattenIntIndex(int reg) const { return reg & ~IntFoldBit; } int - flattenFloatIndex(int reg) + flattenFloatIndex(int reg) const { if (reg >= NUM_FLOATREGS) { reg = FLOATREG_STACK(reg - NUM_FLOATREGS, @@ -86,13 +86,13 @@ namespace X86ISA } int - flattenCCIndex(int reg) + flattenCCIndex(int reg) const { return reg; } int - flattenMiscIndex(int reg) + flattenMiscIndex(int reg) const { return reg; }