Fixes to get the ozone cpu to compile.

--HG--
extra : convert_revision : d3654fca7ae1ae0fbe8842fed98ccf8c56bce8c7
This commit is contained in:
Gabe Black 2006-09-30 02:58:34 -04:00
parent 76708a9a6c
commit d512d0aec0
3 changed files with 6 additions and 4 deletions

View file

@ -257,8 +257,8 @@ class OzoneCPU : public BaseCPU
void setFuncExeInst(Counter new_val) void setFuncExeInst(Counter new_val)
{ thread->funcExeInst = new_val; } { thread->funcExeInst = new_val; }
#endif #endif
void changeRegFileContext(TheISA::RegFile::ContextParam param, void changeRegFileContext(TheISA::RegContextParam param,
TheISA::RegFile::ContextVal val) TheISA::RegContextVal val)
{ panic("Not supported on Alpha!"); } { panic("Not supported on Alpha!"); }
}; };

View file

@ -35,6 +35,7 @@
#include "arch/isa_traits.hh" // For MachInst #include "arch/isa_traits.hh" // For MachInst
#include "base/trace.hh" #include "base/trace.hh"
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/checker/cpu.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
#include "cpu/exetrace.hh" #include "cpu/exetrace.hh"
#include "cpu/ozone/cpu.hh" #include "cpu/ozone/cpu.hh"
@ -53,6 +54,7 @@
//#include "base/remote_gdb.hh" //#include "base/remote_gdb.hh"
#include "cpu/profile.hh" #include "cpu/profile.hh"
#include "kern/kernel_stats.hh" #include "kern/kernel_stats.hh"
#include "mem/physical.hh"
#include "sim/faults.hh" #include "sim/faults.hh"
#include "sim/sim_events.hh" #include "sim/sim_events.hh"
#include "sim/sim_exit.hh" #include "sim/sim_exit.hh"

View file

@ -215,14 +215,14 @@ OzoneDynInst<Impl>::clearMemDependents()
} }
template <class Impl> template <class Impl>
MiscReg TheISA::MiscReg
OzoneDynInst<Impl>::readMiscReg(int misc_reg) OzoneDynInst<Impl>::readMiscReg(int misc_reg)
{ {
return this->thread->readMiscReg(misc_reg); return this->thread->readMiscReg(misc_reg);
} }
template <class Impl> template <class Impl>
MiscReg TheISA::MiscReg
OzoneDynInst<Impl>::readMiscRegWithEffect(int misc_reg, Fault &fault) OzoneDynInst<Impl>::readMiscRegWithEffect(int misc_reg, Fault &fault)
{ {
return this->thread->readMiscRegWithEffect(misc_reg, fault); return this->thread->readMiscRegWithEffect(misc_reg, fault);