diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
| commit | adeb458b878d0768fd4de82bc1997512dc65e6d3 (patch) | |
| tree | d7b27950803618125f7c2fcfa3353e4e40e0166c /kern/system_events.cc | |
| parent | 5c79eb04104e6e3dd2fd957c071fef3ceb47b722 (diff) | |
| parent | 5936c79ba0f3fd29ef2bbf41fcaddc78fcd9c75c (diff) | |
| download | gem5-adeb458b878d0768fd4de82bc1997512dc65e6d3.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 08ae5e999d9b313e3e40cb6d58863905b70ca781
Diffstat (limited to 'kern/system_events.cc')
| -rw-r--r-- | kern/system_events.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kern/system_events.cc b/kern/system_events.cc index 9b9861497..fd5c12e44 100644 --- a/kern/system_events.cc +++ b/kern/system_events.cc @@ -26,8 +26,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "encumbered/cpu/full/cpu.hh" +#include "cpu/base.hh" +#include "cpu/cpu_exec_context.hh" #include "kern/kernel_stats.hh" +#include "kern/system_events.hh" +#include "sim/system.hh" using namespace TheISA; @@ -41,11 +44,12 @@ SkipFuncEvent::process(ExecContext *xc) xc->setPC(newpc); xc->setNextPC(xc->readPC() + sizeof(TheISA::MachInst)); - +/* BranchPred *bp = xc->getCpuPtr()->getBranchPred(); if (bp != NULL) { bp->popRAS(xc->getThreadNum()); } +*/ } |