summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorDavid Hashe <david.hashe@amd.com>2015-07-20 09:15:18 -0500
committerDavid Hashe <david.hashe@amd.com>2015-07-20 09:15:18 -0500
commita2d9aae3c3dae1ffdd62eb91d2318758772684dc (patch)
tree84a3cd2212175939cb6589547f89858d48e7bb55 /src/arch
parent9560893f0d2e74d1c6c22fee501cd24d4f6e13d7 (diff)
downloadgem5-a2d9aae3c3dae1ffdd62eb91d2318758772684dc.tar.xz
x86: x86 instruction-implementation bug fixes
Added explicit data sizes and an opcode type for correct execution.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/isa/decoder/two_byte_opcodes.isa6
-rw-r--r--src/arch/x86/isa/insts/general_purpose/control_transfer/jump.py7
-rw-r--r--src/arch/x86/isa/insts/system/segmentation.py5
3 files changed, 13 insertions, 5 deletions
diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
index dfc328c4b..0ba7434e8 100644
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
@@ -1,4 +1,5 @@
// Copyright (c) 2007-2008 The Hewlett-Packard Development Company
+// Copyright (c) 2012-2013 AMD
// All rights reserved.
//
// The license below extends only to copyright in the software and shall
@@ -361,6 +362,11 @@
0x3: MOV(Dd,Rd);
default: UD2();
}
+ // operand size (0x66)
+ 0x1: decode OPCODE_OP_BOTTOM3 {
+ 0x0: MOV(Rd,Cd);
+ 0x2: MOV(Cd,Rd);
+ }
default: UD2();
}
0x05: decode LEGACY_DECODEVAL {
diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/jump.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/jump.py
index 3bb2d3e87..6f419ce8d 100644
--- a/src/arch/x86/isa/insts/general_purpose/control_transfer/jump.py
+++ b/src/arch/x86/isa/insts/general_purpose/control_transfer/jump.py
@@ -1,4 +1,5 @@
# Copyright (c) 2007 The Hewlett-Packard Development Company
+# Copyright (c) 2012-2013 AMD
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -127,9 +128,9 @@ farJmpProcessDescriptor:
rcri t0, t4, 13, flags=(ECF,), dataSize=2
br rom_local_label("farJmpSystemDescriptor"), flags=(nCECF,)
chks t2, t4, CSCheck, dataSize=8
- wrdl cs, t4, t2
- wrsel cs, t2
- wrip t0, t1
+ wrdl cs, t4, t2, dataSize=4
+ wrsel cs, t2, dataSize=4
+ wrip t0, t1, dataSize=4
eret
farJmpSystemDescriptor:
diff --git a/src/arch/x86/isa/insts/system/segmentation.py b/src/arch/x86/isa/insts/system/segmentation.py
index 53b6908ed..3c8648127 100644
--- a/src/arch/x86/isa/insts/system/segmentation.py
+++ b/src/arch/x86/isa/insts/system/segmentation.py
@@ -1,4 +1,5 @@
# Copyright (c) 2007 The Hewlett-Packard Development Company
+# Copyright (c) 2012-2013 AMD
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -78,7 +79,7 @@ def macroop LGDT_16_M
# Get the base
ld t2, seg, sib, 'adjustedDisp + 2', dataSize=4
zexti t2, t2, 23, dataSize=8
- wrbase tsg, t2
+ wrbase tsg, t2, dataSize=8
wrlimit tsg, t1
};
@@ -139,7 +140,7 @@ def macroop LIDT_16_M
# Get the base
ld t2, seg, sib, 'adjustedDisp + 2', dataSize=4
zexti t2, t2, 23, dataSize=8
- wrbase idtr, t2
+ wrbase idtr, t2, dataSize=8
wrlimit idtr, t1
};