From 2b1e12dafd022b8a3627092d07f5cdf9059c8f64 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Thu, 16 Sep 2021 20:54:40 +0200
Subject: Fixed 66 0F 3A 22 opcode for REX.W ([DYNAREC] too) (should help #81)

---
 src/dynarec/dynarec_arm64_660f.c | 6 +++++-
 src/emu/x64run660f.c             | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/dynarec/dynarec_arm64_660f.c b/src/dynarec/dynarec_arm64_660f.c
index b1049e96..8f7882d5 100755
--- a/src/dynarec/dynarec_arm64_660f.c
+++ b/src/dynarec/dynarec_arm64_660f.c
@@ -532,7 +532,11 @@ uintptr_t dynarec64_660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int n
                     GETGX(q0);
                     GETED(1);
                     u8 = F8;
-                    VMOVQSfrom(q0, (u8&3), ed);
+                    if(rex.w) {
+                        VMOVQDfrom(q0, (u8&1), ed);
+                    } else {
+                        VMOVQSfrom(q0, (u8&3), ed);
+                    }
                     break;
 
                 default:
diff --git a/src/emu/x64run660f.c b/src/emu/x64run660f.c
index 6f0a4d9d..1e7fcdf8 100644
--- a/src/emu/x64run660f.c
+++ b/src/emu/x64run660f.c
@@ -647,7 +647,10 @@ int Run660F(x64emu_t *emu, rex_t rex)
                 GETED(1);
                 GETGX;
                 tmp8u = F8;
-                GX->ud[tmp8u&0x3] = ED->dword[0];
+                if(rex.w)
+                    GX->q[tmp8u&0x1] = ED->q[0];
+                else
+                    GX->ud[tmp8u&0x3] = ED->dword[0];
                 break;
 
             case 0x40:  /* DPPS Gx, Ex, Ib */
-- 
cgit 1.4.1