58a59
> #include "cpu/exec_context.hh"
76c77
< class BaseDynInst : public RefCounted
---
> class BaseDynInst : public ExecContext, public RefCounted
85,88d85
< // Integer register type.
< typedef TheISA::IntReg IntReg;
< // Floating point register type.
< typedef TheISA::FloatReg FloatReg;
637c634
< void setIntRegOperand(const StaticInst *si, int idx, uint64_t val)
---
> void setIntRegOperand(const StaticInst *si, int idx, IntReg val)
643c640
< void setCCRegOperand(const StaticInst *si, int idx, uint64_t val)
---
> void setCCRegOperand(const StaticInst *si, int idx, CCReg val)
649,659d645
< void setFloatRegOperand(const StaticInst *si, int idx, FloatReg val,
< int width)
< {
< if (width == 32 || width == 64) {
< setResult<double>(val);
< } else {
< panic("Unsupported width!");
< }
< }
<
< /** Records an fp register being set to a value. */
666,667c652
< void setFloatRegOperandBits(const StaticInst *si, int idx, uint64_t val,
< int width)
---
> void setFloatRegOperandBits(const StaticInst *si, int idx, FloatRegBits val)
672,677d656
< /** Records an fp register being set to an integer value. */
< void setFloatRegOperandBits(const StaticInst *si, int idx, uint64_t val)
< {
< setResult<uint64_t>(val);
< }
<
805c784
< const TheISA::PCState pcState() const { return pc; }
---
> TheISA::PCState pcState() const { return pc; }
808c787
< const void pcState(const TheISA::PCState &val) { pc = val; }
---
> void pcState(const TheISA::PCState &val) { pc = val; }
847c826
< void setEA(Addr &ea) { instEffAddr = ea; instFlags[EACalcDone] = true; }
---
> void setEA(Addr ea) { instEffAddr = ea; instFlags[EACalcDone] = true; }
850c829
< const Addr &getEA() const { return instEffAddr; }
---
> Addr getEA() const { return instEffAddr; }
872c851
< unsigned readStCondFailures()
---
> unsigned int readStCondFailures() const
876c855
< void setStCondFailures(unsigned sc_failures)
---
> void setStCondFailures(unsigned int sc_failures)