summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa/main.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-03-29 00:51:34 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-03-29 00:51:34 -0700
commit14a7cda195db9fcc6accca62bf2b8dfdb2218e0e (patch)
tree3b60f655c35e373597b5002064f1a208280d0440 /src/arch/x86/isa/main.isa
parent8a674bed5ca845294412f4736f5ac38b42864801 (diff)
parent77ce05f47842606169e7575ef82e65da65bd6c6e (diff)
downloadgem5-14a7cda195db9fcc6accca62bf2b8dfdb2218e0e.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : 849b63ae1300e240082da19dfeb283cdeeb80aef
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 146f714a7..e4103dea0 100644
--- a/src/arch/x86/isa/main.isa
+++ b/src/arch/x86/isa/main.isa
@@ -84,5 +84,8 @@ namespace X86ISA;
//Include the definitions for the instruction formats
##include "formats/formats.isa"
+//Include the definitions of the micro ops
+##include "microops/microops.isa"
+
//Include the decoder definition
##include "decoder/decoder.isa"