base_dyn_inst_impl.hh (3794:647d6bb9539a) | base_dyn_inst_impl.hh (3801:5ea378e2bccd) |
---|---|
1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 48 unchanged lines hidden (view full) --- 57 58typedef m5::hash_map<const BaseDynInst *, const BaseDynInst *, MyHashFunc> 59my_hash_t; 60 61my_hash_t thishash; 62#endif 63 64template <class Impl> | 1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 48 unchanged lines hidden (view full) --- 57 58typedef m5::hash_map<const BaseDynInst *, const BaseDynInst *, MyHashFunc> 59my_hash_t; 60 61my_hash_t thishash; 62#endif 63 64template <class Impl> |
65BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC, | 65BaseDynInst 66 Addr inst_PC, Addr inst_NPC, |
66 Addr pred_PC, Addr pred_NPC, 67 InstSeqNum seq_num, ImplCPU *cpu) 68 : staticInst(machInst), traceData(NULL), cpu(cpu) 69{ 70 seqNum = seq_num; 71 72 PC = inst_PC; | 67 Addr pred_PC, Addr pred_NPC, 68 InstSeqNum seq_num, ImplCPU *cpu) 69 : staticInst(machInst), traceData(NULL), cpu(cpu) 70{ 71 seqNum = seq_num; 72 73 PC = inst_PC; |
73 nextPC = PC + sizeof(TheISA::MachInst); | 74 nextPC = inst_NPC; |
74 nextNPC = nextPC + sizeof(TheISA::MachInst); 75 predPC = pred_PC; 76 predNPC = pred_NPC; 77 predTaken = false; 78 79 initVars(); 80} 81 --- 219 unchanged lines hidden --- | 75 nextNPC = nextPC + sizeof(TheISA::MachInst); 76 predPC = pred_PC; 77 predNPC = pred_NPC; 78 predTaken = false; 79 80 initVars(); 81} 82 --- 219 unchanged lines hidden --- |