Clean up where files are included, and get rid of some cruft.

src/arch/x86/isa/main.isa:
    Clean up where files are included.

--HG--
extra : convert_revision : 0528359432bf0fb9198b63de9611176bc78e07c7

1 files changed, 7 insertions, 15 deletions

diff --git a/src/arch/x86/isa/main.isa b/src/arch/x86/isa/main.isa
index 509f4e222..d28390bd1 100644
--- a/src/arch/x86/isa/main.isa
+++ b/src/arch/x86/isa/main.isa
@@ -72,23 +72,18 @@
 
 namespace X86ISA;
 
-//Include the base class for x86 instructions, and some support code.
-##include "base.isa"
-
-//Include the definitions for the instruction formats
-##include "formats/formats.isa"
-
 //Include the operand_types and operand definitions. These are needed by
 //the microop definitions.
 ##include "operands.isa"
 
-//Include the definitions of the micro ops.
-//These are StaticInst classes which stand on their own and make up an
-//internal instruction set.
-##include "microops/microops.isa"
+//Include the bitfield definitions
+##include "bitfields.isa"
+
+//Include the base class for x86 instructions, and some support code.
+##include "base.isa"
 
-//Include code to build macroops.
-##include "macroop.isa"
+//Include the definitions for the instruction formats
+##include "formats/formats.isa"
 
 //Include the simple microcode assembler. This will hopefully stay
 //unspecialized for x86 and can later be made available to other ISAs.
@@ -99,8 +94,5 @@ namespace X86ISA;
 //microcode ISA.
 ##include "specialize.isa"
 
-//Include the bitfield definitions
-##include "bitfields.isa"
-
 //Include the decoder definition
 ##include "decoder/decoder.isa"