summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa/formats/formats.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-10-22 00:24:15 -0700
committerGabe Black <gblack@eecs.umich.edu>2010-10-22 00:24:15 -0700
commit2eae11be6499effbcf33e4f3ea747a7280adf86c (patch)
tree957658d9253c19dc940f041316dcaccd90b035cc /src/arch/x86/isa/formats/formats.isa
parent23f6196d61c4f96d5b8f25e3dc8b266d541ecd67 (diff)
downloadgem5-2eae11be6499effbcf33e4f3ea747a7280adf86c.tar.xz
X86: Make nop a regular, non-microcoded instruction.
Code in the CPUs that need a nop to carry a fault can't easily deal with a microcoded nop. This instruction format provides for one that isn't. --HG-- rename : src/arch/x86/isa/formats/syscall.isa => src/arch/x86/isa/formats/nop.isa
Diffstat (limited to 'src/arch/x86/isa/formats/formats.isa')
-rw-r--r--src/arch/x86/isa/formats/formats.isa3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/x86/isa/formats/formats.isa b/src/arch/x86/isa/formats/formats.isa
index df567a6c6..cc0eb9acf 100644
--- a/src/arch/x86/isa/formats/formats.isa
+++ b/src/arch/x86/isa/formats/formats.isa
@@ -59,6 +59,9 @@
//thing on a variety of inputs
##include "multi.isa"
+//Include a format for a non-microcoded nop.
+##include "nop.isa"
+
//Include a format which implements an extra layer of decoding to handle the
//repe and repne prefixes
##include "string.isa"