52a53
> #include "cpu/exec_context.hh"
82c83
< class BaseSimpleCPU : public BaseCPU
---
> class BaseSimpleCPU : public BaseCPU, public ExecContext
296,297c297
< Addr getEA() { panic("BaseSimpleCPU::getEA() not implemented\n");
< M5_DUMMY_RETURN}
---
> Addr getEA() const { panic("BaseSimpleCPU::getEA() not implemented\n"); }
310c310
< uint64_t readIntRegOperand(const StaticInst *si, int idx)
---
> IntReg readIntRegOperand(const StaticInst *si, int idx)
337c337
< void setIntRegOperand(const StaticInst *si, int idx, uint64_t val)
---
> void setIntRegOperand(const StaticInst *si, int idx, IntReg val)
373c373
< TheISA::PCState pcState() { return thread->pcState(); }
---
> TheISA::PCState pcState() const { return thread->pcState(); }
426c426
< unsigned readStCondFailures() {
---
> unsigned int readStCondFailures() const {
430c430
< void setStCondFailures(unsigned sc_failures) {
---
> void setStCondFailures(unsigned int sc_failures) {
434,435c434,435
< MiscReg readRegOtherThread(int regIdx, ThreadID tid = InvalidThreadID)
< {
---
> MiscReg readRegOtherThread(int regIdx, ThreadID tid = InvalidThreadID)
> {
438c438
< }
---
> }
440,442c440,442
< void setRegOtherThread(int regIdx, const MiscReg &val,
< ThreadID tid = InvalidThreadID)
< {
---
> void setRegOtherThread(int regIdx, MiscReg val,
> ThreadID tid = InvalidThreadID)
> {
445c445
< }
---
> }