about summary refs log tree commit diff stats
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/modrm.h5
-rw-r--r--src/emu/x64emu.c6
-rw-r--r--src/emu/x64run.c29
-rw-r--r--src/emu/x64run64.c4
-rw-r--r--src/emu/x64run67_32.c15
-rw-r--r--src/emu/x64run_private.c8
-rw-r--r--src/emu/x64run_private.h2
7 files changed, 51 insertions, 18 deletions
diff --git a/src/emu/modrm.h b/src/emu/modrm.h
index fcfc7dc6..d62d13c6 100644
--- a/src/emu/modrm.h
+++ b/src/emu/modrm.h
@@ -11,8 +11,8 @@
 #define F64S    *(int64_t*)(addr+=8, addr-8)

 #define PK(a)   *(uint8_t*)(addr+a)

 #ifdef DYNAREC

-#define STEP  check_exec(emu, addr); if(step) return 0;

-#define STEP2 check_exec(emu, addr); if(step) {R_RIP = addr; return 0;}

+#define STEP  check_exec(emu, addr); if(step && !ACCESS_FLAG(F_TF)) return 0;

+#define STEP2 check_exec(emu, addr); if(step && !ACCESS_FLAG(F_TF)) {R_RIP = addr; return 0;}

 #define STEP3 check_exec(emu, addr); if(*step) (*step)++;

 #else

 #define STEP

@@ -110,6 +110,7 @@
 #define FAKEED32(D)         GetEd32O(emu, &addr, rex, nextop, D, 0)

 #define GETEA(D)            GetEA(emu, &addr, rex, nextop, D)

 #define GETEA32(D)          GetEA32(emu, &addr, rex, nextop, D)

+#define GETEA32_16(D)       GetEA32_16(emu, &addr, rex, nextop, D)

 #define _GETED(D)           oped=GetEd(emu, &addr, rex, nextop, D)

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

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

diff --git a/src/emu/x64emu.c b/src/emu/x64emu.c
index 8eec238b..4441ba53 100644
--- a/src/emu/x64emu.c
+++ b/src/emu/x64emu.c
@@ -578,15 +578,15 @@ void UnimpOpcode(x64emu_t* emu, int is32bits)
     R_RIP = emu->old_ip;
 
     int tid = syscall(SYS_gettid);
-    printf_log(LOG_NONE, "%04d|%p: Unimplemented %sOpcode (%02X %02X %02X %02X) %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", 
+    printf_log(LOG_INFO, "%04d|%p: Unimplemented %sOpcode (%02X %02X %02X %02X) %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", 
         tid, (void*)emu->old_ip, is32bits?"32bits ":"",
         Peek(emu, -4), Peek(emu, -3), Peek(emu, -2), Peek(emu, -1),
         Peek(emu, 0), Peek(emu, 1), Peek(emu, 2), Peek(emu, 3),
         Peek(emu, 4), Peek(emu, 5), Peek(emu, 6), Peek(emu, 7),
         Peek(emu, 8), Peek(emu, 9), Peek(emu,10), Peek(emu,11),
         Peek(emu,12), Peek(emu,13), Peek(emu,14));
-    emu->quit=1;
-    emu->error |= ERR_UNIMPL;
+    //emu->quit=1;
+    //emu->error |= ERR_UNIMPL;
 }
 
 void EmuCall(x64emu_t* emu, uintptr_t addr)
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index 51380c8b..a0939a92 100644
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -245,6 +245,8 @@ x64emurun:
             }
             emu->segs[_SS] = Pop32(emu);    // no check, no use....
             emu->segs_serial[_SS] = 0;
+            if(ACCESS_FLAG(F_TF))
+                tf_next = 1;
             break;
 
         case 0x1E:                      /* PUSH DS */
@@ -590,10 +592,8 @@ x64emurun:
 #ifndef TEST_INTERPRETER
             if(rex.is32bits && box64_ignoreint3)
             {
-                F8;
             } else {
-                F8;
-                emit_signal(emu, SIGSEGV, (void*)R_RIP, 0);
+                emit_signal(emu, SIGSEGV, (void*)R_RIP, 0xbad0);
             }
             STEP;
             #endif
@@ -826,6 +826,8 @@ x64emurun:
             GETED(0);
             emu->segs[((nextop&0x38)>>3)] = ED->word[0];
             emu->segs_serial[((nextop&0x38)>>3)] = 0;
+            if(((nextop&0x38)>>3)==_SS && ACCESS_FLAG(F_TF))
+                tf_next = 1;
             break;
         case 0x8F:                      /* POP Ed */
             nextop = F8;
@@ -1544,6 +1546,8 @@ x64emurun:
                 emit_interruption(emu, 0x29, (void*)R_RIP);
             } else if (tmp8u==0x80) {
                 R_RIP = addr;
+                if(ACCESS_FLAG(F_TF))
+                    tf_next = 1;
                 // 32bits syscall
                 #ifndef TEST_INTERPRETER
                 x86Syscall(emu);
@@ -1556,6 +1560,9 @@ x64emurun:
                 STEP2;
                 #endif
             } else {
+                if(rex.is32bits && tmp8u==0x04) {
+                    R_RIP = addr;
+                }
                 #ifndef TEST_INTERPRETER
                 emit_interruption(emu, tmp8u, (void*)R_RIP);
                 STEP2;
@@ -1572,7 +1579,7 @@ x64emurun:
             #ifndef TEST_INTERPRETER
             CHECK_FLAGS(emu);
             if(ACCESS_FLAG(F_OF))
-                emit_signal(emu, SIGSEGV, (void*)R_RIP, 128);
+                emit_interruption(emu, 4, (void*)R_RIP);
             STEP2;
             #endif
             break;
@@ -1954,12 +1961,12 @@ x64emurun:
                     break;
                 case 6:                 /* DIV Eb */
                     if(!EB->byte[0])
-                        emit_div0(emu, (void*)R_RIP, 0);
+                        emit_div0(emu, (void*)R_RIP, 1);
                     div8(emu, EB->byte[0]);
                     break;
                 case 7:                 /* IDIV Eb */
                     if(!EB->byte[0])
-                        emit_div0(emu, (void*)R_RIP, 0);
+                        emit_div0(emu, (void*)R_RIP, 1);
                     idiv8(emu, EB->byte[0]);
                     break;
             }
@@ -1989,12 +1996,12 @@ x64emurun:
                         break;
                     case 6:                 /* DIV Ed */
                         if(!ED->q[0])
-                            emit_div0(emu, (void*)R_RIP, 0);
+                            emit_div0(emu, (void*)R_RIP, 1);
                         div64(emu, ED->q[0]);
                         break;
                     case 7:                 /* IDIV Ed */
                         if(!ED->q[0])
-                            emit_div0(emu, (void*)R_RIP, 0);
+                            emit_div0(emu, (void*)R_RIP, 1);
                         idiv64(emu, ED->q[0]);
                         break;
                 }
@@ -2029,14 +2036,14 @@ x64emurun:
                         break;
                     case 6:                 /* DIV Ed */
                         if(!ED->dword[0])
-                            emit_div0(emu, (void*)R_RIP, 0);
+                            emit_div0(emu, (void*)R_RIP, 1);
                         div32(emu, ED->dword[0]);
                         //emu->regs[_AX].dword[1] = 0;  // already put high regs to 0
                         //emu->regs[_DX].dword[1] = 0;
                         break;
                     case 7:                 /* IDIV Ed */
                         if(!ED->dword[0])
-                            emit_div0(emu, (void*)R_RIP, 0);
+                            emit_div0(emu, (void*)R_RIP, 1);
                         idiv32(emu, ED->dword[0]);
                         //emu->regs[_AX].dword[1] = 0;
                         //emu->regs[_DX].dword[1] = 0;
@@ -2256,7 +2263,7 @@ if(emu->segs[_CS]!=0x33 && emu->segs[_CS]!=0x23) printf_log(LOG_NONE, "Warning,
 #ifndef TEST_INTERPRETER
     printf_log(LOG_DEBUG, "End of X86 run (%p), RIP=%p, Stack=%p, unimp=%d, emu->fork=%d, emu->uc_link=%p, emu->quit=%d\n", emu, (void*)R_RIP, (void*)R_RSP, unimp, emu->fork, emu->uc_link, emu->quit);
     if(unimp) {
-        emu->quit = 1;
+        //emu->quit = 1;
         UnimpOpcode(emu, is32bits);
         emit_signal(emu, SIGILL, (void*)R_RIP, 0);
     }
diff --git a/src/emu/x64run64.c b/src/emu/x64run64.c
index 5433319d..00278e3b 100644
--- a/src/emu/x64run64.c
+++ b/src/emu/x64run64.c
@@ -792,12 +792,12 @@ uintptr_t Run64(x64emu_t *emu, rex_t rex, int seg, uintptr_t addr)
                     break;

                 case 6:                 /* DIV Eb */

                     if(!EB->byte[0])

-                        emit_div0(emu, (void*)R_RIP, 0);

+                        emit_div0(emu, (void*)R_RIP, 1);

                     div8(emu, EB->byte[0]);

                     break;

                 case 7:                 /* IDIV Eb */

                     if(!EB->byte[0])

-                        emit_div0(emu, (void*)R_RIP, 0);

+                        emit_div0(emu, (void*)R_RIP, 1);

                     idiv8(emu, EB->byte[0]);

                     break;

             }

diff --git a/src/emu/x64run67_32.c b/src/emu/x64run67_32.c
index a1df3ba0..4b7afbea 100644
--- a/src/emu/x64run67_32.c
+++ b/src/emu/x64run67_32.c
@@ -66,6 +66,21 @@ uintptr_t Run67_32(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
         return Run6764_32(emu, rex, rep, _GS, addr);

         #endif

         break;

+    case 0x66:

+        opcode = F8;

+        switch(opcode) {

+

+            case 0x8D:                              /* LEA Gw,M */

+                nextop = F8;

+                GETGW;

+                tmp32u = GETEA32_16(0);

+                GW->word[0] = (uint16_t)tmp32u;

+                break;

+

+            default:

+                return 0;

+        }

+        break;

 

     case 0xE0:                      /* LOOPNZ */

         CHECK_FLAGS(emu);

diff --git a/src/emu/x64run_private.c b/src/emu/x64run_private.c
index a2bc6020..1d80e76a 100644
--- a/src/emu/x64run_private.c
+++ b/src/emu/x64run_private.c
@@ -1701,6 +1701,14 @@ uintptr_t GetEA32(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t
     } else return (uintptr_t)GetECommon32O(emu, addr, rex, m, delta, 0);
 }
 
+uintptr_t GetEA32_16(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta)
+{
+    uint8_t m = v&0xC7;    // filter Ed
+    if(m>=0xC0) {
+         return (uintptr_t)&emu->regs[(m&0x07)+(rex.b<<3)];
+    } else return (uintptr_t)GetEw16off(emu, addr, rex, m, delta);
+}
+
 reg64_t* GetEdO(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta, uintptr_t offset)
 {
     uint8_t m = v&0xC7;    // filter Ed
diff --git a/src/emu/x64run_private.h b/src/emu/x64run_private.h
index e7416b19..35fa99bb 100644
--- a/src/emu/x64run_private.h
+++ b/src/emu/x64run_private.h
@@ -115,6 +115,7 @@ static inline void PushExit_32(x64emu_t* emu)
 reg64_t* GetECommon(x64emu_t* emu, uintptr_t* addr, rex_t rex, uint8_t m, uint8_t delta);
 reg64_t* GetECommonO(x64emu_t* emu, uintptr_t* addr, rex_t rex, uint8_t m, uint8_t delta, uintptr_t offset);
 reg64_t* GetECommon32O(x64emu_t* emu, uintptr_t* addr, rex_t rex, uint8_t m, uint8_t delta, uintptr_t offset);
+reg64_t* GetECommon32O_16(x64emu_t* emu, uintptr_t* addr, rex_t rex, uint8_t m, uint8_t delta, uintptr_t offset);
 reg64_t* GetEb(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
 reg64_t* TestEb(x64test_t *test, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
 reg64_t* GetEbO(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta, uintptr_t offset);
@@ -129,6 +130,7 @@ reg64_t* TestEd8xw(x64test_t *test, int w, uintptr_t* addr, rex_t rex, uint8_t v
 reg64_t* TestEdt(x64test_t *test, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
 uintptr_t GetEA(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
 uintptr_t GetEA32(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
+uintptr_t GetEA32_16(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta);
 reg64_t* GetEdO(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta, uintptr_t offset);
 reg64_t* TestEdO(x64test_t *test, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta, uintptr_t offset);
 reg64_t* GetEd32O(x64emu_t *emu, uintptr_t* addr, rex_t rex, uint8_t v, uint8_t delta, uintptr_t offset);