summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2010-03-08 22:17:26 +0000
committerKevin Enderby <enderby@apple.com>2010-03-08 22:17:26 +0000
commitd2030e38a63867c0186b77d200b7512cefb5a44a (patch)
tree36f52d4e93ad036ff0c1719a65bcbd70369b693d
parent3a3f472cb457eab29563ff4afd3ae61511eed71a (diff)
downloadbcm5719-llvm-d2030e38a63867c0186b77d200b7512cefb5a44a.tar.gz
bcm5719-llvm-d2030e38a63867c0186b77d200b7512cefb5a44a.zip
Fix the vmxon entry in the X86InstrInfo.td so it has the correct prefix bytes
for the encoding and is not the same as vmptrld. llvm-svn: 97992
-rw-r--r--llvm/lib/Target/X86/X86InstrInfo.td2
-rw-r--r--llvm/test/MC/Disassembler/simple-tests.txt11
2 files changed, 11 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td
index 52aa8082d67..4589b59e50a 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.td
+++ b/llvm/lib/Target/X86/X86InstrInfo.td
@@ -4252,7 +4252,7 @@ def VMWRITE32rr : I<0x79, MRMSrcReg, (outs GR32:$dst), (ins GR32:$src),
// 0F 01 C4
def VMXOFF : I<0x01, MRM_C4, (outs), (ins), "vmxoff", []>, TB;
def VMXON : I<0xC7, MRM6m, (outs), (ins i64mem:$vmxon),
- "vmxon\t{$vmxon}", []>, XD;
+ "vmxon\t{$vmxon}", []>, XS;
//===----------------------------------------------------------------------===//
// Non-Instruction Patterns
diff --git a/llvm/test/MC/Disassembler/simple-tests.txt b/llvm/test/MC/Disassembler/simple-tests.txt
index 11c077d8929..b6bb35dc56a 100644
--- a/llvm/test/MC/Disassembler/simple-tests.txt
+++ b/llvm/test/MC/Disassembler/simple-tests.txt
@@ -41,4 +41,13 @@
0x0f 0x01 0xf8
# CHECK: rdtscp
-0x0f 0x01 0xf9 \ No newline at end of file
+0x0f 0x01 0xf9
+
+# CHECK: vmxon
+0xf3 0x0f 0xc7 0x30
+
+# CHECK: vmptrld
+0x0f 0xc7 0x30
+
+# CHECK: vmptrst
+0x0f 0xc7 0x38
OpenPOWER on IntegriCloud