diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 16:18:10 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 16:18:10 -0500 |
| commit | f720029e97358b2f69ea0ecaace89d5c2ccc6bfe (patch) | |
| tree | 49f739cbc78b842fc303c1a1296d293ca03ec961 /src/cpu/ozone | |
| parent | 5b90922ad59189f5967dc97a00bbfead062f4ba3 (diff) | |
| parent | 74745cfeac4f4de4613d8faed77aa7e3c06cbca4 (diff) | |
| download | gem5-f720029e97358b2f69ea0ecaace89d5c2ccc6bfe.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0
Diffstat (limited to 'src/cpu/ozone')
| -rw-r--r-- | src/cpu/ozone/cpu.hh | 4 | ||||
| -rw-r--r-- | src/cpu/ozone/thread_state.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh index 2b2ed7b3e..c1373944d 100644 --- a/src/cpu/ozone/cpu.hh +++ b/src/cpu/ozone/cpu.hh @@ -361,8 +361,8 @@ class OzoneCPU : public BaseCPU bool interval_stats; - AlphaITB *itb; - AlphaDTB *dtb; + TheISA::ITB *itb; + TheISA::DTB *dtb; System *system; PhysicalMemory *physmem; #endif diff --git a/src/cpu/ozone/thread_state.hh b/src/cpu/ozone/thread_state.hh index c4d16b3af..a71795851 100644 --- a/src/cpu/ozone/thread_state.hh +++ b/src/cpu/ozone/thread_state.hh @@ -122,7 +122,7 @@ struct OzoneThreadState : public ThreadState { MiscReg readMiscRegWithEffect(int misc_reg) { - return miscRegFile.readRegWithEffect(misc_reg, fault, tc); + return miscRegFile.readRegWithEffect(misc_reg, tc); } void setMiscReg(int misc_reg, const MiscReg &val) |