34a35
> #include "arch/isa.hh"
93d93
< typedef TheISA::MiscRegFile MiscRegFile;
101a102
> TheISA::ISA isa; // one "instance" of the current ISA.
167,168c168,169
< int getInstAsid() { return regs.instAsid(); }
< int getDataAsid() { return regs.dataAsid(); }
---
> int getInstAsid() { return isa.instAsid(); }
> int getDataAsid() { return isa.dataAsid(); }
232c233
< int flatIndex = TheISA::flattenIntIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenIntIndex(reg_idx);
238c239
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
244c245
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
250c251
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
256c257
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
262c263
< int flatIndex = TheISA::flattenIntIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenIntIndex(reg_idx);
268c269
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
274c275
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
280c281
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
286c287
< int flatIndex = TheISA::flattenFloatIndex(getTC(), reg_idx);
---
> int flatIndex = isa.flattenFloatIndex(reg_idx);
343c344
< return regs.readMiscRegNoEffect(misc_reg);
---
> return isa.readMiscRegNoEffect(misc_reg);
349c350
< return regs.readMiscReg(misc_reg, tc);
---
> return isa.readMiscReg(misc_reg, tc);
355c356
< return regs.setMiscRegNoEffect(misc_reg, val);
---
> return isa.setMiscRegNoEffect(misc_reg, val);
361c362
< return regs.setMiscReg(misc_reg, val, tc);
---
> return isa.setMiscReg(misc_reg, val, tc);
363a365,376
> int
> flattenIntIndex(int reg)
> {
> return isa.flattenIntIndex(reg);
> }
>
> int
> flattenFloatIndex(int reg)
> {
> return isa.flattenFloatIndex(reg);
> }
>