summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-09-09 02:40:11 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-09-09 02:40:11 -0700
commit49a7ed0397954f555f5fb4272334e606a3048c59 (patch)
treed39633d218de3afdc2417fa0b15748d8411bcbcb /src/arch/x86
parentb7b545bc38bcd9ee54f1b8e45064cd8b7a3070b0 (diff)
downloadgem5-49a7ed0397954f555f5fb4272334e606a3048c59.tar.xz
StaticInst: Merge StaticInst and StaticInstBase.
Having two StaticInst classes, one nominally ISA dependent and the other ISA dependent, has not been historically useful and makes the StaticInst class more complicated that it needs to be. This change merges StaticInstBase into StaticInst.
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/insts/badmicroop.hh2
-rw-r--r--src/arch/x86/isa_traits.hh3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/x86/insts/badmicroop.hh b/src/arch/x86/insts/badmicroop.hh
index 0185af0d9..b9830c56f 100644
--- a/src/arch/x86/insts/badmicroop.hh
+++ b/src/arch/x86/insts/badmicroop.hh
@@ -40,7 +40,7 @@
#ifndef __ARCH_X86_INSTS_BADMICROOP_HH__
#define __ARCH_X86_INSTS_BADMICROOP_HH__
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
namespace X86ISA
{
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index f67b58788..09a280215 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -43,8 +43,7 @@
#include "arch/x86/types.hh"
#include "arch/x86/x86_traits.hh"
#include "base/types.hh"
-
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
namespace LittleEndianGuest {}