From 2d303b6121e318e30572dd1134ddb0cf12bd0776 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sat, 16 Dec 2023 14:47:02 -0800
Subject: fix incorrect register selection for `vpmovm2*` with `rex.b` set
---
test/long_mode/mod.rs | 6 ++++++
test/protected_mode/mod.rs | 5 +++++
test/real_mode/mod.rs | 6 ++++++
3 files changed, 17 insertions(+)
(limited to 'test')
diff --git a/test/long_mode/mod.rs b/test/long_mode/mod.rs
index 6b04be2..c7a4788 100644
--- a/test/long_mode/mod.rs
+++ b/test/long_mode/mod.rs
@@ -1465,6 +1465,12 @@ fn evex() {
test_display(&[0x62, 0xf2, 0x7d, 0x48, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa zmm0, zmmword [rax + rax * 2 + 0x40]");
test_display(&[0x62, 0xf2, 0x7d, 0x08, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa xmm0, xmmword [rax + rax * 2 + 0x10]");
test_invalid(&[0x62, 0xf2, 0x7d, 0x1d, 0x66, 0x50, 0x01, 0x11]);
+
+ // vpmovm2b (and larger forms). for some reason the source operand is a mask register but uses
+ // modrm bits as a register selector. out-of-range `k` seem to just get masked down..
+ test_display(&[0x62, 0xd2, 0x7e, 0x08, 0x28, 0xc2], "vpmovm2b xmm0, k2");
+ test_display(&[0x62, 0xf2, 0x7e, 0x08, 0x28, 0xc1], "vpmovm2b xmm0, k1");
+
test_display(&[0x62, 0x12, 0x7d, 0x06, 0xa0, 0x04, 0x2f], "vpscatterdd dword [r15 + xmm29 * 1], k6, xmm8");
test_display(&[0x62, 0x12, 0x7d, 0x06, 0xa0, 0x14, 0x0f], "vpscatterdd dword [r15 + xmm25 * 1], k6, xmm10");
test_display(&[0x62, 0x12, 0x7d, 0x26, 0xa0, 0x14, 0x0f], "vpscatterdd dword [r15 + ymm25 * 1], k6, ymm10");
diff --git a/test/protected_mode/mod.rs b/test/protected_mode/mod.rs
index 752c9df..e843c7a 100644
--- a/test/protected_mode/mod.rs
+++ b/test/protected_mode/mod.rs
@@ -1332,6 +1332,11 @@ fn test_misc() {
#[test]
fn evex() {
+ // vpmovm2b (and larger forms). for some reason the source operand is a mask register but uses
+ // modrm bits as a register selector. out-of-range `k` seem to just get masked down..
+ test_display(&[0x62, 0xd2, 0x7e, 0x08, 0x28, 0xc2], "vpmovm2b xmm0, k2");
+ test_display(&[0x62, 0xf2, 0x7e, 0x08, 0x28, 0xc1], "vpmovm2b xmm0, k1");
+
test_display(&[0x62, 0xf2, 0x7d, 0x48, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa zmm0, zmmword [eax + eax * 2 + 0x40]");
test_display(&[0x62, 0xf2, 0x7d, 0x08, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa xmm0, xmmword [eax + eax * 2 + 0x10]");
}
diff --git a/test/real_mode/mod.rs b/test/real_mode/mod.rs
index 1b1a378..a321e64 100644
--- a/test/real_mode/mod.rs
+++ b/test/real_mode/mod.rs
@@ -18400,6 +18400,12 @@ fn test_invalid_sequences() {
test_invalid(&[0xf3, 0x67, 0x0f, 0x3a, 0xf0, 0xfb, 0xb4]);
test_invalid(&[0xf3, 0xf2, 0x0f, 0xae, 0x8f, 0x54, 0x3c, 0x58, 0xb7]);
test_invalid(&[0xff, 0xd8]);
+
+ // vpmovm2b (and larger forms). for some reason the source operand is a mask register but uses
+ // modrm bits as a register selector. out-of-range `k` seem to just get masked down..
+ test_display(&[0x62, 0xd2, 0x7e, 0x08, 0x28, 0xc2], "vpmovm2b xmm0, k2");
+ test_display(&[0x62, 0xf2, 0x7e, 0x08, 0x28, 0xc1], "vpmovm2b xmm0, k1");
+
}
#[test]
--
cgit v1.1