Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41353 )
Change subject: arch: Stop including unnecessary FP headers.
......................................................................
arch: Stop including unnecessary FP headers.
Nothing is used from them. They're probably there as copy/paste from
other ISAs, or old code that's been replaced. This also gets rid of some
#if guarded includes which is a nice cleanup.
Change-Id: Icd84300fb7531ec203ce4acbdae1d311e56cc873
---
M src/arch/mips/isa/includes.isa
M src/arch/power/isa/includes.isa
M src/arch/x86/isa/includes.isa
3 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa
index 34922e4..d17bcf6 100644
--- a/src/arch/mips/isa/includes.isa
+++ b/src/arch/mips/isa/includes.isa
@@ -41,6 +41,7 @@
#include "arch/mips/pra_constants.hh"
#include "cpu/static_inst.hh"
#include "mem/packet.hh"
+
}};
output decoder {{
@@ -56,14 +57,11 @@
#include "arch/mips/pra_constants.hh"
#include "arch/mips/tlb.hh"
#include "arch/mips/utility.hh"
-#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
#include "cpu/thread_context.hh"
#include "mem/packet.hh"
#include "sim/full_system.hh"
-#if defined(linux)
-#include <fenv.h>
-#endif
using namespace MipsISA;
}};
@@ -83,10 +81,6 @@
#include "arch/mips/pra_constants.hh"
#include "arch/mips/tlb.hh"
#include "arch/mips/utility.hh"
-#if defined(linux)
-#include <fenv.h>
-#endif
-
#include "base/condcodes.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
diff --git a/src/arch/power/isa/includes.isa
b/src/arch/power/isa/includes.isa
index ac7756c..c97aba9 100644
--- a/src/arch/power/isa/includes.isa
+++ b/src/arch/power/isa/includes.isa
@@ -52,9 +52,6 @@
output decoder {{
#include <cmath>
-#if defined(linux)
-#include <fenv.h>
-#endif
#include "arch/power/decoder.hh"
#include "arch/power/faults.hh"
@@ -69,9 +66,6 @@
output exec {{
#include <cmath>
-#if defined(linux)
-#include <fenv.h>
-#endif
#include "arch/generic/memhelpers.hh"
#include "arch/power/faults.hh"
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 3bd7872..27ef988 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -53,13 +53,13 @@
#include <sstream>
#include "arch/generic/debugfaults.hh"
+#include "arch/x86/emulenv.hh"
#include "arch/x86/insts/macroop.hh"
#include "arch/x86/insts/microfpop.hh"
#include "arch/x86/insts/microldstop.hh"
#include "arch/x86/insts/micromediaop.hh"
#include "arch/x86/insts/microregop.hh"
#include "arch/x86/insts/static_inst.hh"
-#include "arch/x86/emulenv.hh"
#include "arch/x86/isa_traits.hh"
#include "arch/x86/registers.hh"
#include "arch/x86/types.hh"
@@ -73,46 +73,35 @@
}};
output decoder {{
+#include <algorithm>
+
#include "arch/x86/decoder.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/microcode_rom.hh"
#include "arch/x86/regs/float.hh"
#include "arch/x86/regs/misc.hh"
#include "arch/x86/regs/segment.hh"
-#include "arch/x86/faults.hh"
-#include "arch/x86/microcode_rom.hh"
#include "arch/x86/tlb.hh"
-#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
#include "base/logging.hh"
#include "cpu/thread_context.hh" // for Jump::branchTarget()
#include "mem/packet.hh"
#include "sim/full_system.hh"
-#if defined(linux) || defined(__APPLE__)
-#include <fenv.h>
-#endif
-#include <algorithm>
-
using namespace X86ISA;
}};
output exec {{
-#if defined(linux) || defined(__APPLE__)
-#include <fenv.h>
-#endif
-
-#if defined(__sun) || defined (__OpenBSD__)
-#include <ieeefp.h>
-#endif
-
#include <cmath>
#include <limits>
#include "arch/generic/debugfaults.hh"
-#include "arch/x86/regs/misc.hh"
#include "arch/x86/cpuid.hh"
#include "arch/x86/faults.hh"
#include "arch/x86/memhelpers.hh"
#include "arch/x86/pseudo_inst_abi.hh"
+#include "arch/x86/regs/misc.hh"
#include "arch/x86/tlb.hh"
#include "base/compiler.hh"
#include "base/condcodes.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41353
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Icd84300fb7531ec203ce4acbdae1d311e56cc873
Gerrit-Change-Number: 41353
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
