diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-21 20:35:25 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-21 20:35:25 +0000 |
| commit | 49490b334af3bc145071a9a81f37012e7693af59 (patch) | |
| tree | 7f07517e6d03bc004955f6a40a6c9dd3e02f7488 /src/cpu/o3/sparc/dyn_inst.hh | |
| parent | 470a6a9a74eb28a5052e6492c0a3aa9724c57500 (diff) | |
| parent | afd00820004984de085a727e60e25742a69d9c51 (diff) | |
| download | gem5-49490b334af3bc145071a9a81f37012e7693af59.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-micro
src/cpu/o3/fetch_impl.hh:
hand merge
--HG--
extra : convert_revision : 3f71f3ac2035eec8b6f7bceb6906edb4dd09c045
Diffstat (limited to 'src/cpu/o3/sparc/dyn_inst.hh')
| -rw-r--r-- | src/cpu/o3/sparc/dyn_inst.hh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cpu/o3/sparc/dyn_inst.hh b/src/cpu/o3/sparc/dyn_inst.hh index 72242b161..a7ab6cd79 100644 --- a/src/cpu/o3/sparc/dyn_inst.hh +++ b/src/cpu/o3/sparc/dyn_inst.hh @@ -56,8 +56,14 @@ class SparcDynInst : public BaseDynInst<Impl> public: /** BaseDynInst constructor given a binary instruction. */ - SparcDynInst(TheISA::ExtMachInst inst, Addr PC, Addr NPC, - Addr Pred_PC, Addr Pred_NPC, InstSeqNum seq_num, O3CPU *cpu); + SparcDynInst(StaticInstPtr staticInst, Addr PC, Addr NPC, Addr microPC, + Addr Pred_PC, Addr Pred_NPC, Addr Pred_MicroPC, + InstSeqNum seq_num, O3CPU *cpu); + + /** BaseDynInst constructor given a binary instruction. */ + SparcDynInst(TheISA::ExtMachInst inst, Addr PC, Addr NPC, Addr microPC, + Addr Pred_PC, Addr Pred_NPC, Addr Pred_MicroPC, + InstSeqNum seq_num, O3CPU *cpu); /** BaseDynInst constructor given a static inst pointer. */ SparcDynInst(StaticInstPtr &_staticInst); |