X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Farch%2Fx86%2Fisa%2Fincludes.isa;h=6b1fda93f3c2593af1798aa2235cb712abf5eb38;hb=31d29ee3f8209a43e325cfe0373e9081a263ad36;hp=269233c079768fd5d3639266bb212d199223a996;hpb=5f0d82baeb08cd6ca1cf102f6b436c2fbb709152;p=gem5.git

diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 269233c07..6b1fda93f 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -26,7 +26,7 @@
 //
 // Authors: Gabe Black
 
-// Copyright (c) 2007 The Hewlett-Packard Development Company
+// Copyright (c) 2007-2008 The Hewlett-Packard Development Company
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -96,22 +96,34 @@ output header {{
 #include <sstream>
 #include <iostream>
 
-#include "arch/x86/faults.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/isa_traits.hh"
-#include "arch/x86/regfile.hh"
+#include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
 #include "base/misc.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
-#include "mem/request.hh"  // some constructors use MemReq flags
+#include "sim/faults.hh"
+
+using X86ISA::InstRegIndex;
 }};
 
 output decoder {{
-
-namespace X86Macroop {
-};
+#include "arch/x86/faults.hh"
+#include "arch/x86/floatregs.hh"
+#include "arch/x86/microcode_rom.hh"
+#include "arch/x86/miscregs.hh"
+#include "arch/x86/segmentregs.hh"
+#include "arch/x86/tlb.hh"
 #include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/misc.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
 
@@ -139,12 +151,19 @@ output exec {{
 #include <limits>
 
 #include <cmath>
+#include "arch/x86/cpuid.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/miscregs.hh"
+#include "arch/x86/tlb.hh"
 #include "base/bigint.hh"
+#include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "mem/request.hh"
+#include "sim/pseudo_inst.hh"
 
 using namespace X86ISA;
 using namespace std;