ISA: Back-out NoopMachInst as a StaticInstPtr change.

[gem5.git] / src / arch / sparc / isa_traits.hh

diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 620d9c40221301acd5fbae20f1c9199e3a99e321..9b02a4d80f619d7caebec08a1cb641e09ed18970 100644 (file)
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -35,7 +35,6 @@
 #include "arch/sparc/sparc_traits.hh"
 #include "arch/sparc/types.hh"
 #include "base/types.hh"
-#include "config/full_system.hh"
 #include "cpu/static_inst_fwd.hh"
 
 namespace BigEndianGuest {}
@@ -78,7 +77,6 @@ const Addr VAddrAMask = ULL(0xFFFFFFFF);
 const Addr PAddrImplMask = ULL(0x000000FFFFFFFFFF);
 const Addr BytesInPageMask = ULL(0x1FFF);
 
-#if FULL_SYSTEM
 enum InterruptTypes
 {
     IT_TRAP_LEVEL_ZERO,
@@ -91,8 +89,6 @@ enum InterruptTypes
     NumInterruptTypes
 };
 
-#endif
-
 // Memory accesses cannot be unaligned
 const bool HasUnalignedMemAcc = false;
 }