diff options
| author | Korey Sewell <ksewell@umich.edu> | 2011-06-19 21:43:36 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2011-06-19 21:43:36 -0400 |
| commit | 7dea79535c87b68b5fc6143190d09b8fc364f2aa (patch) | |
| tree | 3f30f0716de709f86b9adaa746f0b3e312203cef /src/cpu/inorder/resource.cc | |
| parent | 061b369d288ba4e3fdb145c025fb4d80378cb851 (diff) | |
| download | gem5-7dea79535c87b68b5fc6143190d09b8fc364f2aa.tar.xz | |
inorder: implement trap handling
Diffstat (limited to 'src/cpu/inorder/resource.cc')
| -rw-r--r-- | src/cpu/inorder/resource.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cpu/inorder/resource.cc b/src/cpu/inorder/resource.cc index 23d33afbe..836335510 100644 --- a/src/cpu/inorder/resource.cc +++ b/src/cpu/inorder/resource.cc @@ -290,10 +290,8 @@ Resource::deactivateThread(ThreadID tid) void Resource::setupSquash(DynInstPtr inst, int stage_num, ThreadID tid) { - assert(inst->isControl() && "Function Assumes Squash From A Branch"); - // Squash In Pipeline Stage - cpu->pipelineStage[stage_num]->squashDueToBranch(inst, tid); + cpu->pipelineStage[stage_num]->setupSquash(inst, tid); // Schedule Squash Through-out Resource Pool cpu->resPool->scheduleEvent( |