diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-19 18:54:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-19 18:54:40 -0700 |
| commit | 5c48a0581338226ee2f56a4ed99c6d68abb69613 (patch) | |
| tree | f8d6e32036d4c58f69b48f60e5e5a6b3f1192b05 /src/cpu/o3/mips/dyn_inst.hh | |
| parent | 053c715f213a6532b5644e46a5d04ef9e092139e (diff) | |
| parent | debf04aef1b0f662e981507545cdac956dd22a47 (diff) | |
| download | gem5-5c48a0581338226ee2f56a4ed99c6d68abb69613.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into doughnut.hpl.hp.com:/home/gblack/newmem-o3-micro
src/cpu/base_dyn_inst_impl.hh:
src/cpu/o3/fetch_impl.hh:
Hand merge
--HG--
extra : convert_revision : 0c0692033ac30133672d8dfe1f1a27e9d9e95a3d
Diffstat (limited to 'src/cpu/o3/mips/dyn_inst.hh')
| -rwxr-xr-x | src/cpu/o3/mips/dyn_inst.hh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cpu/o3/mips/dyn_inst.hh b/src/cpu/o3/mips/dyn_inst.hh index 366b4bb23..cf78c0941 100755 --- a/src/cpu/o3/mips/dyn_inst.hh +++ b/src/cpu/o3/mips/dyn_inst.hh @@ -70,9 +70,15 @@ class MipsDynInst : public BaseDynInst<Impl> public: /** BaseDynInst constructor given a binary instruction. */ + MipsDynInst(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. */ MipsDynInst(ExtMachInst inst, - Addr PC, Addr NPC, - Addr Pred_PC, Addr Pred_NPC, + 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. */ |