[INTERP] Added 64/65 67 89/8B 64bits opcodes

5 files changed, 105 insertions, 2 deletions

diff --git a/src/emu/modrm.h b/src/emu/modrm.h
index bbad2e81..d8c68889 100644
--- a/src/emu/modrm.h
+++ b/src/emu/modrm.h
@@ -32,6 +32,7 @@
 #define GETE8xw(D)          oped=TestEd8xw(test, rex.w, &addr, rex, nextop, D)

 #define GETED32(D)          oped=TestEd32O(test, &addr, rex, nextop, D, 0)

 #define GETED_OFFS(D, O)    oped=TestEdO(test, &addr, rex, nextop, D, O)

+#define GETED_OFFS_32(D, O) oped=TestEd32O(test, &addr, rex, nextop, D, O)

 #define GETED_OFFS_16(O)    oped=TestEd16off(test, &addr, rex, nextop, O)

 #define GETGD               opgd=GetGd(test->emu, &addr, rex, nextop)

 #define GETEB(D)            oped=TestEb(test, &addr, rex, nextop, D)

@@ -67,6 +68,7 @@
 #define GETE8xw(D)          GETED(D)

 #define GETED32(D)          oped=GetEd32O(emu, &addr, rex, nextop, D, 0)

 #define GETED_OFFS(D, O)    oped=GetEdO(emu, &addr, rex, nextop, D, O)

+#define GETED_OFFS_32(D, O) oped=GetEd32O(emu, &addr, rex, nextop, D, O)

 #define GETED_OFFS_16(O)    oped=GetEd16off(emu, &addr, rex, nextop, O)

 #define GETGD               opgd=GetGd(emu, &addr, rex, nextop)

 #define GETEB(D)            oped=GetEb(emu, &addr, rex, nextop, D)

diff --git a/src/emu/x64run64.c b/src/emu/x64run64.c
index 62a94f26..9e8747ce 100644
--- a/src/emu/x64run64.c
+++ b/src/emu/x64run64.c
@@ -500,7 +500,7 @@ uintptr_t Run64(x64emu_t *emu, rex_t rex, int seg, uintptr_t addr)
             if(rex.is32bits)

                 return Run6764_32(emu, rex, seg, seg, addr);

             else

-                return 0;

+                return Run6764(emu, rex, seg, seg, addr);

 

         case 0x69:                      /* IMUL Gd,Ed,Id */

             nextop = F8;

diff --git a/src/emu/x64run67.c b/src/emu/x64run67.c
index 6de9c6af..4d5fbb81 100644
--- a/src/emu/x64run67.c
+++ b/src/emu/x64run67.c
@@ -199,7 +199,20 @@ uintptr_t Run67(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
             else

                 GD->sdword[0] = ED->sdword[0];  // meh?

         break;

-

+    case 0x64:                      /* FS: prefix */

+        #ifdef TEST_INTERPRETER

+        return Test6764(test, rex, rep, _FS, addr);

+        #else

+        return Run6764(emu, rex, rep, _FS, addr);

+        #endif

+        break;

+    case 0x65:                      /* GS: prefix */

+        #ifdef TEST_INTERPRETER

+        return Test6764(test, rex, rep, _GS, addr);

+        #else

+        return Run6764(emu, rex, rep, _GS, addr);

+        #endif

+        break;

     case 0x66:

         #ifdef TEST_INTERPRETER

         return Test6766(test, rex, rep, addr);

diff --git a/src/emu/x64run6764.c b/src/emu/x64run6764.c
new file mode 100644
index 00000000..e8d22ea9
--- /dev/null
+++ b/src/emu/x64run6764.c
@@ -0,0 +1,86 @@
+#define _GNU_SOURCE
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "debug.h"
+#include "box64stack.h"
+#include "box64cpu_util.h"
+#include "x64emu.h"
+#include "x64emu_private.h"
+#include "x64run_private.h"
+#include "x64primop.h"
+#include "x64trace.h"
+#include "x87emu_private.h"
+#include "box64context.h"
+#include "bridge.h"
+
+#include "modrm.h"
+
+#ifdef TEST_INTERPRETER
+uintptr_t Test6764(x64test_t *test, rex_t rex, int rep, int seg, uintptr_t addr)
+#else
+uintptr_t Run6764(x64emu_t *emu, rex_t rex, int rep, int seg, uintptr_t addr)
+#endif
+{
+    (void)rep;
+    uint8_t opcode;
+    uint8_t nextop;
+    int8_t tmp8s;
+    uint8_t tmp8u;
+    uint32_t tmp32u;
+    int32_t tmp32s;
+    uint64_t tmp64u;
+    reg64_t *oped, *opgd;
+    #ifdef TEST_INTERPRETER
+    x64emu_t* emu = test->emu;
+    #endif
+    uintptr_t tlsdata = GetSegmentBaseEmu(emu, seg);
+    opcode = F8;
+
+    while(opcode==0x67)
+        opcode = F8;
+
+    rex.rex = 0;
+    while((opcode==0xF2) || (opcode==0xF3)) {
+        rep = opcode-0xF1;
+        opcode = F8;
+    }
+
+    switch(opcode) {
+
+        case 0x89:                      /* MOV FS:Ed, Gd */
+            nextop = F8;
+            GETED_OFFS_32(0, tlsdata);
+            GETGD;
+            if(rex.w) {
+                ED->q[0] = GD->q[0];
+            } else {
+                //if ED is a reg, than the opcode works like movzx
+                if(MODREG)
+                    ED->q[0] = GD->dword[0];
+                else
+                    ED->dword[0] = GD->dword[0];
+            }
+            break;
+
+        case 0x8B:                      /* MOV Gd, FS:Ed */
+            nextop = F8;
+            GETED_OFFS_32(0, tlsdata);
+            GETGD;
+            if(rex.w)
+                GD->q[0] = ED->q[0];
+            else
+                GD->q[0] = ED->dword[0];
+            break;
+
+    default:
+        return 0;
+    }
+    return addr;
+}
diff --git a/src/emu/x64run_private.h b/src/emu/x64run_private.h
index e493f189..b1a1a567 100644
--- a/src/emu/x64run_private.h
+++ b/src/emu/x64run_private.h
@@ -107,6 +107,7 @@ uintptr_t Run66D9(x64emu_t *emu, rex_t rex, uintptr_t addr);
 uintptr_t Run66DD(x64emu_t *emu, rex_t rex, uintptr_t addr);
 uintptr_t Run66F0(x64emu_t *emu, rex_t rex, uintptr_t addr);
 uintptr_t Run67(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr);
+uintptr_t Run6764(x64emu_t *emu, rex_t rex, int rep, int seg, uintptr_t addr);
 uintptr_t Run67AVX(x64emu_t *emu, vex_t vex, uintptr_t addr);
 uintptr_t Run67_32(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr);
 uintptr_t Run6764_32(x64emu_t *emu, rex_t rex, int rep, int seg, uintptr_t addr);
@@ -148,6 +149,7 @@ uintptr_t Test66D9(x64test_t *test, rex_t rex, uintptr_t addr);
 uintptr_t Test66DD(x64test_t *test, rex_t rex, uintptr_t addr);
 uintptr_t Test66F0(x64test_t *test, rex_t rex, uintptr_t addr);
 uintptr_t Test67(x64test_t *test, rex_t rex, int rep, uintptr_t addr);
+uintptr_t Test6764(x64test_t *test, rex_t rex, int rep, int seg, uintptr_t addr);
 uintptr_t Test67AVX(x64test_t *test, vex_t vex, uintptr_t addr);
 uintptr_t Test67_32(x64test_t *test, rex_t rex, int rep, uintptr_t addr);
 uintptr_t Test6764_32(x64test_t *test, rex_t rex, int rep, int seg, uintptr_t addr);