diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
commit | 67732a7b2816929e41a52998c25eb008217041a5 (patch) | |
tree | e4f51373195cab0f88e7f727d3837255a6909614 /cpu/o3/cpu.hh | |
parent | 4d44e53736507de176e48cbf99b064ffa0ae5a7a (diff) | |
parent | 0df85fd8d8b7a8c8d11b1b3da5b6277e4a5e54ec (diff) | |
download | gem5-67732a7b2816929e41a52998c25eb008217041a5.tar.xz |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166
Diffstat (limited to 'cpu/o3/cpu.hh')
-rw-r--r-- | cpu/o3/cpu.hh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpu/o3/cpu.hh b/cpu/o3/cpu.hh index 8f29a25fb..6577e46e4 100644 --- a/cpu/o3/cpu.hh +++ b/cpu/o3/cpu.hh @@ -49,11 +49,6 @@ #include "cpu/o3/cpu_policy.hh" #include "sim/process.hh" -#if FULL_SYSTEM -#include "arch/ev5.hh" -using namespace EV5; -#endif - class ExecContext; class FunctionalMemory; class Process; @@ -153,11 +148,11 @@ class FullO3CPU : public BaseFullCPU /** Get instruction asid. */ int getInstAsid() - { return ITB_ASN_ASN(regFile.miscRegs.readReg(TheISA::IPR_ITB_ASN)); } + { return regFile.miscRegs.getInstAsid(); } /** Get data asid. */ int getDataAsid() - { return DTB_ASN_ASN(regFile.miscRegs.readReg(TheISA::IPR_DTB_ASN)); } + { return regFile.miscRegs.getDataAsid(); } #else bool validInstAddr(Addr addr) { return thread[0]->validInstAddr(addr); } |