From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:03 +0000 (-0500)
Subject: ARM: Remove unnecessary cruft from includes.isa.
X-Git-Tag: stable_2012_02_02~1327
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c175f1b99383c2e9ff73faa31ec6f31c71f8726b;p=gem5.git

ARM: Remove unnecessary cruft from includes.isa.
---

diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index 4db7279d2..03849aaa1 100644
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -48,7 +48,6 @@
 output header {{
 #include <sstream>
 #include <iostream>
-#include <iomanip>
 
 #include "arch/arm/insts/branch.hh"
 #include "arch/arm/insts/macromem.hh"
@@ -57,16 +56,10 @@ output header {{
 #include "arch/arm/insts/pred_inst.hh"
 #include "arch/arm/insts/static_inst.hh"
 #include "arch/arm/isa_traits.hh"
-#include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 }};
 
 output decoder {{
-#include <cmath>
-#if defined(linux)
-#include <fenv.h>
-#endif
-
 #include "arch/arm/faults.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
@@ -75,7 +68,6 @@ output decoder {{
 #include "cpu/thread_context.hh"
 
 using namespace ArmISA;
-using std::isnan;
 }};
 
 output exec {{
@@ -89,8 +81,6 @@ output exec {{
 #include <fenv.h>
 #endif
 
-#include "cpu/base.hh"
-#include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/sim_exit.hh"