summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa/main.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-04-06 14:37:46 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-04-06 14:37:46 +0000
commit3c9768e6448b72689e9edb250dd0ee3e5eadb9d7 (patch)
treef950d270e92348f95e3464cf51de4003510c9f07 /src/arch/x86/isa/main.isa
parenta664017c2a839279f8b8eea1076bba47d1863b88 (diff)
parent077183f7ece6aa7fcb009fb078e2e1a3370f9327 (diff)
downloadgem5-3c9768e6448b72689e9edb250dd0ee3e5eadb9d7.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec --HG-- extra : convert_revision : b7e89d32df946ea24c438292308f5fc8248f8bd9
Diffstat (limited to 'src/arch/x86/isa/main.isa')
-rw-r--r--src/arch/x86/isa/main.isa3
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"