diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 18:35:28 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 18:35:28 -0500 |
| commit | 872bbdfc33cb82bf32576db3a57d3055a04acbac (patch) | |
| tree | 837dd214bd682ac7efa515b18857bec7d4d35bef /cpu/o3/iew_impl.hh | |
| parent | 3adb45144aca819c9796168ecde7a263169d9d4d (diff) | |
| parent | 7b283dbc090d1197593b00fd1279b92f7c2e693e (diff) | |
| download | gem5-872bbdfc33cb82bf32576db3a57d3055a04acbac.tar.xz | |
Hand merge. Stuff probably doesn't compile.
--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8
Diffstat (limited to 'cpu/o3/iew_impl.hh')
| -rw-r--r-- | cpu/o3/iew_impl.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/o3/iew_impl.hh b/cpu/o3/iew_impl.hh index b8a2b4dc9..85217dd10 100644 --- a/cpu/o3/iew_impl.hh +++ b/cpu/o3/iew_impl.hh @@ -256,7 +256,7 @@ SimpleIEW<Impl>::squashDueToBranch(DynInstPtr &inst) toCommit->branchMispredict = true; // Prediction was incorrect, so send back inverse. toCommit->branchTaken = inst->readNextPC() != - (inst->readPC() + sizeof(MachInst)); + (inst->readPC() + sizeof(TheISA::MachInst)); } template<class Impl> |