diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-05-31 11:45:02 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-05-31 11:45:02 -0400 |
| commit | a514bf21508f4398f5cf7322f5f2a1ed212bbcaa (patch) | |
| tree | e41f2e45926a5724765f762fe8c4b34e9e4d5c56 /cpu/base_dyn_inst.cc | |
| parent | 94eff2f4854ce23900bcc3d694ff4c290111bea7 (diff) | |
| download | gem5-a514bf21508f4398f5cf7322f5f2a1ed212bbcaa.tar.xz | |
Comments and code cleanup.
cpu/activity.cc:
cpu/activity.hh:
cpu/o3/alpha_cpu.hh:
Updates to include comments.
cpu/base_dyn_inst.cc:
Remove call to thread->misspeculating(), as it's never actually misspeculating.
--HG--
extra : convert_revision : 86574d684770fac9b480475acca048ea418cdac3
Diffstat (limited to 'cpu/base_dyn_inst.cc')
| -rw-r--r-- | cpu/base_dyn_inst.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/base_dyn_inst.cc b/cpu/base_dyn_inst.cc index 7ab760ae3..64a995689 100644 --- a/cpu/base_dyn_inst.cc +++ b/cpu/base_dyn_inst.cc @@ -166,6 +166,8 @@ BaseDynInst<Impl>::~BaseDynInst() delete traceData; } + fault = NoFault; + --instcount; DPRINTF(DynInst, "DynInst: [sn:%lli] Instruction destroyed. Instcount=%i\n", @@ -289,7 +291,7 @@ BaseDynInst<Impl>::copy(Addr dest) { uint8_t data[64]; FunctionalMemory *mem = thread->mem; - assert(thread->copySrcPhysAddr || thread->misspeculating()); + assert(thread->copySrcPhysAddr); MemReqPtr req = new MemReq(dest, thread->getXCProxy(), 64); req->asid = asid; |