summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-12-16 07:47:33 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-12-16 07:47:33 -0500
commita6eb16adb424bca1a1a1d13604def2f15c8624d1 (patch)
treea3b9603aeff3480484dde305422a7e490b148ec8 /src/cpu
parentf410d5f4e0348b4499f313fb3870a48183772c20 (diff)
downloadgem5-a6eb16adb424bca1a1a1d13604def2f15c8624d1.tar.xz
Accidently "cleaned" away the NPC parameter to the constructor.
--HG-- extra : convert_revision : 46670ee86000dfb171d327eb8f58555a4afb2360
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/base_dyn_inst.hh2
-rw-r--r--src/cpu/base_dyn_inst_impl.hh5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh
index 40e780695..07d53d278 100644
--- a/src/cpu/base_dyn_inst.hh
+++ b/src/cpu/base_dyn_inst.hh
@@ -346,7 +346,7 @@ class BaseDynInst : public FastAlloc, public RefCounted
* @param seq_num The sequence number of the instruction.
* @param cpu Pointer to the instruction's CPU.
*/
- BaseDynInst(TheISA::ExtMachInst inst, Addr PC,
+ BaseDynInst(TheISA::ExtMachInst inst, Addr PC, Addr NPC,
Addr pred_PC, Addr pred_NPC,
InstSeqNum seq_num, ImplCPU *cpu);
diff --git a/src/cpu/base_dyn_inst_impl.hh b/src/cpu/base_dyn_inst_impl.hh
index d47384871..c3d71e428 100644
--- a/src/cpu/base_dyn_inst_impl.hh
+++ b/src/cpu/base_dyn_inst_impl.hh
@@ -62,7 +62,8 @@ my_hash_t thishash;
#endif
template <class Impl>
-BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC,
+BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst,
+ Addr inst_PC, Addr inst_NPC,
Addr pred_PC, Addr pred_NPC,
InstSeqNum seq_num, ImplCPU *cpu)
: staticInst(machInst), traceData(NULL), cpu(cpu)
@@ -70,7 +71,7 @@ BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC,
seqNum = seq_num;
PC = inst_PC;
- nextPC = PC + sizeof(TheISA::MachInst);
+ nextPC = inst_NPC;
nextNPC = nextPC + sizeof(TheISA::MachInst);
predPC = pred_PC;
predNPC = pred_NPC;