diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-09-15 00:59:39 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-09-15 00:59:39 -0400 |
| commit | 8abab05c833bcba09ef0093a5fbfb77398c10bf3 (patch) | |
| tree | 7b4b1a00873bc1674d229100d8e5cf24bb11fdbf /src/cpu/o3 | |
| parent | 44c6f953b0a448bd27b8354de90db8934b3ca799 (diff) | |
| parent | b11018ca12ddd8557bddbadaf649253aa5fd8c47 (diff) | |
| download | gem5-8abab05c833bcba09ef0093a5fbfb77398c10bf3.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 91aacb435c223e8c37f6ba0a458b0dee55edcaf2
Diffstat (limited to 'src/cpu/o3')
| -rw-r--r-- | src/cpu/o3/fetch_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh index bf9a73902..1e080181c 100644 --- a/src/cpu/o3/fetch_impl.hh +++ b/src/cpu/o3/fetch_impl.hh @@ -1129,9 +1129,9 @@ DefaultFetch<Impl>::fetch(bool &status_change) tid, instruction->staticInst->disassemble(fetch_PC)); instruction->traceData = - Trace::getInstRecord(curTick, cpu->tcBase(tid), cpu, + Trace::getInstRecord(curTick, cpu->tcBase(tid), instruction->staticInst, - instruction->readPC(),tid); + instruction->readPC()); predicted_branch = lookupAndUpdateNextPC(instruction, next_PC, next_NPC); |