sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

CPU: Fix O3 and possible InOrder segfaults in FS.

Browse source
This commit is contained in:
Gabe Black 2010-09-20 02:46:42 -07:00
parent 3f9f4bf3d6
commit ab8d7eee76
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/inorder/cpu.cc
View file

@ -633,7 +633,9 @@ InOrderCPU::processInterrupts(Fault interrupt)
this->interrupts->updateIntrInfo(this->threadContexts[0]); this->interrupts->updateIntrInfo(this->threadContexts[0]);
DPRINTF(InOrderCPU, "Interrupt %s being handled\n", interrupt->name()); DPRINTF(InOrderCPU, "Interrupt %s being handled\n", interrupt->name());
this->trap(interrupt, 0); static StaticInstPtr dummyStatic(TheISA::NoopMachInst, 0);
static DynInstPtr dummyDyn = new Impl::DynInst(dummyStatic);
this->trap(interrupt, dummyDyn);
} }

2
src/cpu/o3/commit_impl.hh
View file

@ -1062,7 +1062,7 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num)
// needed to update the state as soon as possible. This // needed to update the state as soon as possible. This
// prevents external agents from changing any specific state // prevents external agents from changing any specific state
// that the trap need. // that the trap need.
cpu->trap(inst_fault, tid, head_inst); cpu->trap(inst_fault, tid, head_inst->staticInst);
// Exit state update mode to avoid accidental updating. // Exit state update mode to avoid accidental updating.
thread[tid]->inSyscall = false; thread[tid]->inSyscall = false;

7
src/cpu/o3/cpu.cc
View file

@ -926,8 +926,7 @@ FullO3CPU<Impl>::processInterrupts(Fault interrupt)
this->interrupts->updateIntrInfo(this->threadContexts[0]); this->interrupts->updateIntrInfo(this->threadContexts[0]);
DPRINTF(O3CPU, "Interrupt %s being handled\n", interrupt->name()); DPRINTF(O3CPU, "Interrupt %s being handled\n", interrupt->name());
DynInstPtr dummyInst; this->trap(interrupt, 0, NULL);
this->trap(interrupt, 0, dummyInst);
} }
template <class Impl> template <class Impl>
@ -944,10 +943,10 @@ FullO3CPU<Impl>::updateMemPorts()
template <class Impl> template <class Impl>
void 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. // 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 #if !FULL_SYSTEM

2
src/cpu/o3/cpu.hh
View file

@ -367,7 +367,7 @@ class FullO3CPU : public BaseO3CPU
{ return globalSeqNum++; } { return globalSeqNum++; }
/** Traps to handle given fault. */ /** Traps to handle given fault. */
void trap(Fault fault, ThreadID tid, DynInstPtr inst); void trap(Fault fault, ThreadID tid, StaticInstPtr inst);
#if FULL_SYSTEM #if FULL_SYSTEM
/** HW return from error interrupt. */ /** HW return from error interrupt. */

2
src/cpu/o3/dyn_inst_impl.hh
View file

@ -155,7 +155,7 @@ template <class Impl>
void void
BaseO3DynInst<Impl>::trap(Fault fault) BaseO3DynInst<Impl>::trap(Fault fault)
{ {
this->cpu->trap(fault, this->threadNumber, this); this->cpu->trap(fault, this->threadNumber, this->staticInst);
} }
template <class Impl> template <class Impl>