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

inorder: handle faults at writeback stage

Browse source 
call trap function when a fault is received
This commit is contained in:
Korey Sewell 2011-06-19 21:43:34 -04:00
parent 17f5749dbb
commit ee7062d94d
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,6 +141,7 @@ InOrderCPU::CPUEvent::process()
break;
case Trap:
DPRINTF(InOrderCPU, "Trapping CPU\n");
cpu->trapCPU(fault, tid, inst);
break;

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

@ -64,8 +64,8 @@ DecodeUnit::execute(int slot_num)
if (inst->backSked != NULL) {
DPRINTF(InOrderDecode,
"[tid:%i]: Setting Destination Register(s) for [sn:%i].\n",
tid, inst->seqNum);
"[tid:%i]: %s Setting Destination Register(s) for [sn:%i].\n",
tid, inst->instName(), inst->seqNum);
regDepMap[tid]->insert(inst);
//inst->printSked();

5
src/cpu/inorder/resources/execution_unit.cc
View file

@ -249,8 +249,9 @@ ExecutionUnit::execute(int slot_num)
exec_req->done();
} else {
warn("inst [sn:%i] had a %s fault",
seq_num, fault->name());
warn("inst [sn:%i] had a %s fault", seq_num, fault->name());
exec_req->done();
}
} else {
// Regular ALU instruction

6
src/cpu/inorder/resources/graduation_unit.cc
View file

@ -68,13 +68,11 @@ GraduationUnit::execute(int slot_num)
// Handle Any Faults Before Graduating Instruction
if (inst->fault != NoFault) {
cpu->trap(inst->fault, tid, inst);
grad_req->setCompleted(false);
return;
}
DPRINTF(InOrderGraduation,
"[tid:%i] Graduating instruction [sn:%i].\n",
tid, inst->seqNum);
"[tid:%i] Graduating instruction %s [sn:%i].\n",
tid, inst->instName(), inst->seqNum);
// Release Non-Speculative "Block" on instructions that could not
// execute because there was a non-speculative inst. active.

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

@ -148,11 +148,11 @@ UseDefUnit::execute(int slot_idx)
// If there is a non-speculative instruction
// in the pipeline then stall instructions here
if (*nonSpecInstActive[tid] == true &&
seq_num > *nonSpecSeqNum[tid]) {
if (*nonSpecInstActive[tid] == true && seq_num > *nonSpecSeqNum[tid]) {
DPRINTF(InOrderUseDef, "[tid:%i]: [sn:%i] cannot execute because"
"there is non-speculative instruction [sn:%i] has not "
"graduated.\n", tid, seq_num, *nonSpecSeqNum[tid]);
ud_req->done(false);
return;
} else if (inst->isNonSpeculative()) {
*nonSpecInstActive[tid] = true;