diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
| commit | 34da58a698e4119876f04d13c337e9974970f49a (patch) | |
| tree | 6dc9940bf89b04ec973ff4b433a015e13cb7f017 /cpu/o3/cpu.hh | |
| parent | 3a362d04b7aed0fa728af9373bad175a096a7de8 (diff) | |
| parent | 96fd6b5c4039c98a1b536ec184126ad75e7d2539 (diff) | |
| download | gem5-34da58a698e4119876f04d13c337e9974970f49a.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
arch/alpha/ev5.cc:
cpu/o3/regfile.hh:
Hand merge.
--HG--
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
extra : convert_revision : c941dd2198851398820b38a66471372ed8454891
Diffstat (limited to 'cpu/o3/cpu.hh')
| -rw-r--r-- | cpu/o3/cpu.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/o3/cpu.hh b/cpu/o3/cpu.hh index 802860ab5..02908887e 100644 --- a/cpu/o3/cpu.hh +++ b/cpu/o3/cpu.hh @@ -152,11 +152,11 @@ class FullO3CPU : public BaseFullCPU /** Get instruction asid. */ int getInstAsid() - { return ITB_ASN_ASN(regFile.getIpr()[TheISA::IPR_ITB_ASN]); } + { return ITB_ASN_ASN(regFile.miscRegs.readReg(TheISA::IPR_ITB_ASN)); } /** Get data asid. */ int getDataAsid() - { return DTB_ASN_ASN(regFile.getIpr()[TheISA::IPR_DTB_ASN]); } + { return DTB_ASN_ASN(regFile.miscRegs.readReg(TheISA::IPR_DTB_ASN)); } #else bool validInstAddr(Addr addr) { return thread[0]->validInstAddr(addr); } |