sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Accidently "cleaned" away the NPC parameter to the constructor.

Browse source 
--HG--
extra : convert_revision : 46670ee86000dfb171d327eb8f58555a4afb2360
This commit is contained in:
Gabe Black 2006-12-16 07:47:33 -05:00
parent f410d5f4e0
commit a6eb16adb4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cpu/base_dyn_inst.hh
View file

@ -346,7 +346,7 @@ class BaseDynInst : public FastAlloc, public RefCounted
* @param seq_num The sequence number of the instruction. * @param seq_num The sequence number of the instruction.
* @param cpu Pointer to the instruction's CPU. * @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, Addr pred_PC, Addr pred_NPC,
InstSeqNum seq_num, ImplCPU *cpu); InstSeqNum seq_num, ImplCPU *cpu);

5
src/cpu/base_dyn_inst_impl.hh
View file

@ -62,7 +62,8 @@ my_hash_t thishash;
#endif #endif
template <class Impl> 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, Addr pred_PC, Addr pred_NPC,
InstSeqNum seq_num, ImplCPU *cpu) InstSeqNum seq_num, ImplCPU *cpu)
: staticInst(machInst), traceData(NULL), cpu(cpu) : staticInst(machInst), traceData(NULL), cpu(cpu)
@ -70,7 +71,7 @@ BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC,
seqNum = seq_num; seqNum = seq_num;
PC = inst_PC; PC = inst_PC;
nextPC = PC + sizeof(TheISA::MachInst); nextPC = inst_NPC;
nextNPC = nextPC + sizeof(TheISA::MachInst); nextNPC = nextPC + sizeof(TheISA::MachInst);
predPC = pred_PC; predPC = pred_PC;
predNPC = pred_NPC; predNPC = pred_NPC;