diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 16:39:47 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 16:39:47 +0000 |
commit | a3ed19f82a34626231ae7b5a024331b24645c01c (patch) | |
tree | e5b0f9ce26c276998f64dd4d66aa6d81d5fb466c /src/arch/x86/isa/main.isa | |
parent | 3c9768e6448b72689e9edb250dd0ee3e5eadb9d7 (diff) | |
parent | 59df95c7e6e5d1e0bee48946aea08e436785b298 (diff) | |
download | gem5-a3ed19f82a34626231ae7b5a024331b24645c01c.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 8e624bb95cb9f478ca7ac1dbbd64e20674e3e224
Diffstat (limited to 'src/arch/x86/isa/main.isa')
-rw-r--r-- | src/arch/x86/isa/main.isa | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/arch/x86/isa/main.isa b/src/arch/x86/isa/main.isa index cc3a9bee4..d9e90689d 100644 --- a/src/arch/x86/isa/main.isa +++ b/src/arch/x86/isa/main.isa @@ -72,26 +72,34 @@ namespace X86ISA; -//Include the simple microcode assembler +//Include the simple microcode assembler. This will hopefully stay +//unspecialized for x86 and can later be made available to other ISAs. ##include "microasm.isa" -//Include the bitfield definitions -##include "bitfields.isa" - -//Include the operand_types and operand definitions -##include "operands.isa" +//Include code to build macroops. +##include "macroop.isa" //Include the base class for x86 instructions, and some support code +//Code in this file should be general and useful everywhere ##include "base.isa" -//Include the instruction definitions -##include "insts/insts.isa" - //Include the definitions for the instruction formats ##include "formats/formats.isa" -//Include the definitions of the micro ops +//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 instruction definitions which are microop assembler programs. +##include "insts/insts.isa" + +//Include the bitfield definitions +##include "bitfields.isa" + //Include the decoder definition ##include "decoder/decoder.isa" |