diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-09-20 02:46:42 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-09-20 02:46:42 -0700 |
| commit | ab8d7eee76e9d439070fe116fb23e0afe7aa74c3 (patch) | |
| tree | 2fc54a18e5233e875c664b4897368805b425a174 /src/cpu/o3/cpu.cc | |
| parent | 3f9f4bf3d6ce9080adb03966599e0f1a98b091eb (diff) | |
| download | gem5-ab8d7eee76e9d439070fe116fb23e0afe7aa74c3.tar.xz | |
CPU: Fix O3 and possible InOrder segfaults in FS.
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 7eea04ce6..8e9f3ef5d 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -926,8 +926,7 @@ FullO3CPU<Impl>::processInterrupts(Fault interrupt) this->interrupts->updateIntrInfo(this->threadContexts[0]); DPRINTF(O3CPU, "Interrupt %s being handled\n", interrupt->name()); - DynInstPtr dummyInst; - this->trap(interrupt, 0, dummyInst); + this->trap(interrupt, 0, NULL); } template <class Impl> @@ -944,10 +943,10 @@ FullO3CPU<Impl>::updateMemPorts() template <class Impl> void -FullO3CPU<Impl>::trap(Fault fault, ThreadID tid, DynInstPtr inst) +FullO3CPU<Impl>::trap(Fault fault, ThreadID tid, StaticInstPtr inst) { // Pass the thread's TC into the invoke method. - fault->invoke(this->threadContexts[tid], inst->staticInst); + fault->invoke(this->threadContexts[tid], inst); } #if !FULL_SYSTEM |