From 63bf0d58266e918a7d969ffdd08e7136bb5a58e9 Mon Sep 17 00:00:00 2001
From: Lioncache <mai.iam2048@gmail.com>
Date: Wed, 8 Feb 2023 15:45:13 -0500
Subject: [PATCH] OpcodeDispatcher: Handle VEXTRACTI128

---
 .../Interface/Core/OpcodeDispatcher.cpp       |  1 +
 .../Interface/Core/X86Tables/VEXTables.cpp    |  2 +-
 unittests/ASM/VEX/vextracti128.asm            | 57 +++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 unittests/ASM/VEX/vextracti128.asm

diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp b/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
index a85ff5a4a..a425735e8 100644
--- a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
+++ b/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
@@ -6114,6 +6114,7 @@ void OpDispatchBuilder::InstallHostSpecificOpcodeHandlers() {
     {OPD(3, 0b01, 0x21), 1, &OpDispatchBuilder::VINSERTPSOp},
 
     {OPD(3, 0b01, 0x38), 1, &OpDispatchBuilder::VINSERTOp},
+    {OPD(3, 0b01, 0x39), 1, &OpDispatchBuilder::VEXTRACT128Op},
 
     {OPD(3, 0b01, 0x40), 1, &OpDispatchBuilder::VDPPOp<4>},
     {OPD(3, 0b01, 0x41), 1, &OpDispatchBuilder::VDPPOp<8>},
diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp b/External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp
index 9760aa8f1..79e2565ae 100644
--- a/External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp
+++ b/External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp
@@ -435,7 +435,7 @@ void InitializeVEXTables() {
     {OPD(3, 0b01, 0x22), 1, X86InstInfo{"VPINSRD", TYPE_UNDEC, FLAGS_NONE, 0, nullptr}},
 
     {OPD(3, 0b01, 0x38), 1, X86InstInfo{"VINSERTI128", TYPE_INST, GenFlagsSameSize(SIZE_256BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 1, nullptr}},
-    {OPD(3, 0b01, 0x39), 1, X86InstInfo{"VEXTRACTI128", TYPE_UNDEC, FLAGS_NONE, 0, nullptr}},
+    {OPD(3, 0b01, 0x39), 1, X86InstInfo{"VEXTRACTI128", TYPE_INST, GenFlagsSizes(SIZE_128BIT, SIZE_256BIT) | FLAGS_MODRM | FLAGS_SF_MOD_DST | FLAGS_XMM_FLAGS, 1, nullptr}},
 
     {OPD(3, 0b01, 0x40), 1, X86InstInfo{"VDPPS", TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 1, nullptr}},
     {OPD(3, 0b01, 0x41), 1, X86InstInfo{"VDPPD", TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 1, nullptr}},
diff --git a/unittests/ASM/VEX/vextracti128.asm b/unittests/ASM/VEX/vextracti128.asm
new file mode 100644
index 000000000..091747886
--- /dev/null
+++ b/unittests/ASM/VEX/vextracti128.asm
@@ -0,0 +1,57 @@
+%ifdef CONFIG
+{
+  "HostFeatures": ["AVX"],
+  "RegData": {
+    "XMM2":  ["0xAAAAAAAABBBBBBBB", "0xCCCCCCCCDDDDDDDD", "0x0000000000000000", "0x0000000000000000"],
+    "XMM3":  ["0xEEEEEEEEFFFFFFFF", "0x9999999988888888", "0x0000000000000000", "0x0000000000000000"],
+    "XMM14": ["0x1111111122222222", "0x3333333344444444", "0xAAAABBBBCCCCDDDD", "0xEEEEFFFF99998888"],
+    "XMM15": ["0x5555555566666666", "0x7777777788888888", "0x4444333322221111", "0x8888777766665555"]
+  },
+  "MemoryRegions": {
+    "0x100000000": "4096"
+  }
+}
+%endif
+
+lea rdx, [rel .data]
+
+vmovapd ymm0, [rdx]
+vmovapd ymm1, [rdx + 32]
+
+; Load junk and overwrite register
+vmovapd ymm2, [rdx + 32]
+vmovapd ymm3, [rdx + 32]
+vextracti128 xmm2, ymm0, 0
+vextracti128 xmm3, ymm0, 1
+
+; Store into memory
+vextracti128 [rel .scratch1], ymm1, 0
+vextracti128 [rel .scratch2], ymm1, 1
+vmovapd ymm14, [rel .scratch1]
+vmovapd ymm15, [rel .scratch2]
+
+hlt
+
+align 32
+.data:
+dq 0xAAAAAAAABBBBBBBB
+dq 0xCCCCCCCCDDDDDDDD
+dq 0xEEEEEEEEFFFFFFFF
+dq 0x9999999988888888
+
+dq 0x1111111122222222
+dq 0x3333333344444444
+dq 0x5555555566666666
+dq 0x7777777788888888
+
+.scratch1:
+dq 0x8888777766665555
+dq 0x4444333322221111
+dq 0xAAAABBBBCCCCDDDD
+dq 0xEEEEFFFF99998888
+
+.scratch2:
+dq 0xEEEEFFFF99998888
+dq 0xAAAABBBBCCCCDDDD
+dq 0x4444333322221111
+dq 0x8888777766665555