summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-28 18:05:23 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-28 18:05:23 -0700
commit163e5874d905f17c2f28c96166e8d58c0cb86ad2 (patch)
tree908fae5623871cb579a00db68bf8068ce5b89e01
parent5e7d6f1105917d5ef490078a2444aa8523e2d85b (diff)
downloadnasm-163e5874d905f17c2f28c96166e8d58c0cb86ad2.tar.gz
Accept implicit memory size for VMREAD/VMWRITE
-rw-r--r--insns.dat8
-rw-r--r--test/vmread.asm4
2 files changed, 8 insertions, 4 deletions
diff --git a/insns.dat b/insns.dat
index 1f7f8ef2..94046ba5 100644
--- a/insns.dat
+++ b/insns.dat
@@ -1735,13 +1735,13 @@ VMLOAD void \3\x0F\x01\xDA X64,VMX
VMMCALL void \3\x0F\x01\xD9 X64,VMX
VMPTRLD mem \2\x0F\xC7\206 VMX
VMPTRST mem \2\x0F\xC7\207 VMX
-VMREAD rm32,reg32 \360\2\x0F\x78\101 VMX,NOLONG
-VMREAD rm64,reg64 \323\360\2\x0F\x78\101 X64,VMX
+VMREAD rm32,reg32 \360\2\x0F\x78\101 VMX,NOLONG,SD
+VMREAD rm64,reg64 \323\360\2\x0F\x78\101 X64,VMX,SQ
VMRESUME void \3\x0F\x01\xC3 VMX
VMRUN void \3\x0F\x01\xD8 X64,VMX
VMSAVE void \3\x0F\x01\xDB X64,VMX
-VMWRITE reg32,rm32 \360\2\x0F\x79\110 VMX,NOLONG
-VMWRITE reg64,rm64 \323\360\2\x0F\x79\110 X64,VMX
+VMWRITE reg32,rm32 \360\2\x0F\x79\110 VMX,NOLONG,SD
+VMWRITE reg64,rm64 \323\360\2\x0F\x79\110 X64,VMX,SQ
VMXOFF void \3\x0F\x01\xC4 VMX
VMXON mem \363\2\x0F\xC7\206 VMX
;# Extended Page Tables VMX instructions
diff --git a/test/vmread.asm b/test/vmread.asm
index 1b6ac708..fa559265 100644
--- a/test/vmread.asm
+++ b/test/vmread.asm
@@ -3,10 +3,14 @@
bits 32
vmread dword [0], eax
vmwrite eax, dword [0]
+ vmread [0], eax
+ vmwrite eax, [0]
bits 64
vmread qword [0], rax
vmwrite rax, qword [0]
+ vmread [0], rax
+ vmwrite rax, [0]
%ifdef ERROR
bits 32