diff options
Diffstat (limited to 'src/cpu/o3/cpu.hh')
-rw-r--r-- | src/cpu/o3/cpu.hh | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index 4c4677615..431eb0f2f 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -382,26 +382,24 @@ class FullO3CPU : public BaseO3CPU /** Register accessors. Index refers to the physical register index. */ /** Reads a miscellaneous register. */ - TheISA::MiscReg readMiscRegNoEffect(int misc_reg, ThreadID tid) const; + RegVal readMiscRegNoEffect(int misc_reg, ThreadID tid) const; /** Reads a misc. register, including any side effects the read * might have as defined by the architecture. */ - TheISA::MiscReg readMiscReg(int misc_reg, ThreadID tid); + RegVal readMiscReg(int misc_reg, ThreadID tid); /** Sets a miscellaneous register. */ - void setMiscRegNoEffect(int misc_reg, const TheISA::MiscReg &val, - ThreadID tid); + void setMiscRegNoEffect(int misc_reg, const RegVal &val, ThreadID tid); /** Sets a misc. register, including any side effects the write * might have as defined by the architecture. */ - void setMiscReg(int misc_reg, const TheISA::MiscReg &val, - ThreadID tid); + void setMiscReg(int misc_reg, const RegVal &val, ThreadID tid); - uint64_t readIntReg(PhysRegIdPtr phys_reg); + RegVal readIntReg(PhysRegIdPtr phys_reg); - TheISA::FloatRegBits readFloatRegBits(PhysRegIdPtr phys_reg); + RegVal readFloatRegBits(PhysRegIdPtr phys_reg); const VecRegContainer& readVecReg(PhysRegIdPtr reg_idx) const; @@ -445,9 +443,9 @@ class FullO3CPU : public BaseO3CPU TheISA::CCReg readCCReg(PhysRegIdPtr phys_reg); - void setIntReg(PhysRegIdPtr phys_reg, uint64_t val); + void setIntReg(PhysRegIdPtr phys_reg, RegVal val); - void setFloatRegBits(PhysRegIdPtr phys_reg, TheISA::FloatRegBits val); + void setFloatRegBits(PhysRegIdPtr phys_reg, RegVal val); void setVecReg(PhysRegIdPtr reg_idx, const VecRegContainer& val); @@ -455,9 +453,9 @@ class FullO3CPU : public BaseO3CPU void setCCReg(PhysRegIdPtr phys_reg, TheISA::CCReg val); - uint64_t readArchIntReg(int reg_idx, ThreadID tid); + RegVal readArchIntReg(int reg_idx, ThreadID tid); - uint64_t readArchFloatRegBits(int reg_idx, ThreadID tid); + RegVal readArchFloatRegBits(int reg_idx, ThreadID tid); const VecRegContainer& readArchVecReg(int reg_idx, ThreadID tid) const; /** Read architectural vector register for modification. */ @@ -494,9 +492,9 @@ class FullO3CPU : public BaseO3CPU * architected register first, then accesses that physical * register. */ - void setArchIntReg(int reg_idx, uint64_t val, ThreadID tid); + void setArchIntReg(int reg_idx, RegVal val, ThreadID tid); - void setArchFloatRegBits(int reg_idx, uint64_t val, ThreadID tid); + void setArchFloatRegBits(int reg_idx, RegVal val, ThreadID tid); void setArchVecReg(int reg_idx, const VecRegContainer& val, ThreadID tid); |