diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-05 11:35:31 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-05 11:35:31 +0000 |
commit | 077183f7ece6aa7fcb009fb078e2e1a3370f9327 (patch) | |
tree | 3e9d50d4583a196f54b166ab1d92577f8f6cabaa /src/arch/x86/isa/main.isa | |
parent | 3d2a434e42b10ef30bbb590722e72ed104be669a (diff) | |
parent | ff7b89beeeabec340d5b84ed813466682a93f928 (diff) | |
download | gem5-077183f7ece6aa7fcb009fb078e2e1a3370f9327.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : efdbf9787383dc1df544b7276f8120285e69bf69
Diffstat (limited to 'src/arch/x86/isa/main.isa')
-rw-r--r-- | src/arch/x86/isa/main.isa | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/x86/isa/main.isa b/src/arch/x86/isa/main.isa index fe1d4e515..cc3a9bee4 100644 --- a/src/arch/x86/isa/main.isa +++ b/src/arch/x86/isa/main.isa @@ -84,6 +84,9 @@ namespace X86ISA; //Include the base class for x86 instructions, and some support code ##include "base.isa" +//Include the instruction definitions +##include "insts/insts.isa" + //Include the definitions for the instruction formats ##include "formats/formats.isa" |