diff options
Diffstat (limited to 'cpu/static_inst.hh')
| -rw-r--r-- | cpu/static_inst.hh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index b5022af5b..25c98b12a 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __STATIC_INST_HH__ -#define __STATIC_INST_HH__ +#ifndef __CPU_STATIC_INST_HH__ +#define __CPU_STATIC_INST_HH__ #include <bitset> #include <string> @@ -41,11 +41,16 @@ // forward declarations struct AlphaSimpleImpl; +struct OoOImpl; class ExecContext; class DynInst; + template <class Impl> class AlphaDynInst; +template <class Impl> +class OoODynInst; + class FastCPU; class SimpleCPU; class InorderCPU; @@ -255,7 +260,7 @@ class StaticInst : public StaticInstBase * obtain the dependence info (numSrcRegs and srcRegIdx[]) for * just the EA computation. */ - virtual const + virtual StaticInstPtr<ISA> &eaCompInst() const { return nullStaticInstPtr; } /** @@ -264,7 +269,7 @@ class StaticInst : public StaticInstBase * obtain the dependence info (numSrcRegs and srcRegIdx[]) for * just the memory access (not the EA computation). */ - virtual const + virtual StaticInstPtr<ISA> &memAccInst() const { return nullStaticInstPtr; } /// The binary machine instruction. @@ -445,4 +450,4 @@ class StaticInstPtr : public RefCountingPtr<StaticInst<ISA> > } }; -#endif // __STATIC_INST_HH__ +#endif // __CPU_STATIC_INST_HH__ |