From 83aa47adca17be33d53da6734ea422e1e0e2a07c Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 19 Sep 2011 02:40:19 -0700
Subject: PseudoInst: Remove the now unnecessary #if FULL_SYSTEMs around
 pseudoinsts.

---
 src/arch/sparc/isa/decoder.isa  | 2 --
 src/arch/sparc/isa/includes.isa | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/arch/sparc')

diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 82c712eb0..0e515ea2b 100644
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@ -975,7 +975,6 @@ decode OP default Unknown::unknown()
             }
             // M5 special opcodes use the reserved IMPDEP2A opcode space
             0x37: decode M5FUNC {
-#if FULL_SYSTEM
                 format BasicOperate {
                     // we have 7 bits of space here to play with...
                     0x21: m5exit({{
@@ -991,7 +990,6 @@ decode OP default Unknown::unknown()
                         panic("M5 panic instruction called at pc = %#x.", PC);
                     }}, No_OpClass, IsNonSpeculative);
                 }
-#endif
                 default: Trap::impdep2({{fault = new IllegalInstruction;}});
             }
             0x38: Branch::jmpl({{
diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index db3677752..0c49cee16 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -63,10 +63,6 @@ using namespace SparcISA;
 output exec {{
 #include "base/fenv.hh"
 
-#if FULL_SYSTEM
-#include "sim/pseudo_inst.hh"
-#endif
-
 #include <cmath>
 #include <limits>
 
@@ -78,6 +74,7 @@ output exec {{
 #include "debug/Sparc.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/pseudo_inst.hh"
 #include "sim/sim_exit.hh"
 
 using namespace SparcISA;
-- 
cgit v1.2.3