Introduced box64cpu.h for exported interpreter and dynarec functions (#2490)

50 files changed, 21 insertions, 131 deletions

diff --git a/src/emu/x64emu.c b/src/emu/x64emu.c
index 05ff1393..a2117176 100644
--- a/src/emu/x64emu.c
+++ b/src/emu/x64emu.c
@@ -11,10 +11,11 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
+#include "box64cpu.h"
+#include "box64cpu_util.h"
 #include "x64emu_private.h"
 #include "x87emu_private.h"
 #include "box64context.h"
-#include "x64run.h"
 #include "x64run_private.h"
 #include "callback.h"
 #include "bridge.h"
diff --git a/src/emu/x64int3.c b/src/emu/x64int3.c
index 6c1d5d92..9ae93f99 100644
--- a/src/emu/x64int3.c
+++ b/src/emu/x64int3.c
@@ -17,7 +17,7 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
+#include "box64cpu.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x87emu_private.h"
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index ad1db962..f55084c5 100644
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -11,8 +11,8 @@
 #include "os.h"
 #include "debug.h"
 #include "box64stack.h"
+#include "box64cpu_util.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run0f.c b/src/emu/x64run0f.c
index 556ad1f8..2a5df329 100644
--- a/src/emu/x64run0f.c
+++ b/src/emu/x64run0f.c
@@ -11,8 +11,8 @@
 

 #include "debug.h"

 #include "box64stack.h"

+#include "box64cpu_util.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run64.c b/src/emu/x64run64.c
index 33f1e806..bfecc778 100644
--- a/src/emu/x64run64.c
+++ b/src/emu/x64run64.c
@@ -10,8 +10,8 @@
 

 #include "debug.h"

 #include "box64stack.h"

+#include "box64cpu_util.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run66.c b/src/emu/x64run66.c
index e1abf3b7..5a1b377f 100644
--- a/src/emu/x64run66.c
+++ b/src/emu/x64run66.c
@@ -10,8 +10,8 @@
 

 #include "debug.h"

 #include "box64stack.h"

+#include "box64cpu_util.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run660f.c b/src/emu/x64run660f.c
index 44d63bdb..a6271775 100644
--- a/src/emu/x64run660f.c
+++ b/src/emu/x64run660f.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run6664.c b/src/emu/x64run6664.c
index 299f7f7d..35dda42d 100644
--- a/src/emu/x64run6664.c
+++ b/src/emu/x64run6664.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run66d9.c b/src/emu/x64run66d9.c
index 84b554df..a7b1a331 100644
--- a/src/emu/x64run66d9.c
+++ b/src/emu/x64run66d9.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run66dd.c b/src/emu/x64run66dd.c
index 7f768aad..b1673064 100644
--- a/src/emu/x64run66dd.c
+++ b/src/emu/x64run66dd.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64run66f0.c b/src/emu/x64run66f0.c
index 7e6fc5db..4401d260 100644
--- a/src/emu/x64run66f0.c
+++ b/src/emu/x64run66f0.c
@@ -11,7 +11,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run66f20f.c b/src/emu/x64run66f20f.c
index a4ad4438..bc6c0732 100644
--- a/src/emu/x64run66f20f.c
+++ b/src/emu/x64run66f20f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run66f30f.c b/src/emu/x64run66f30f.c
index 878fc01a..91a772c2 100644
--- a/src/emu/x64run66f30f.c
+++ b/src/emu/x64run66f30f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run67.c b/src/emu/x64run67.c
index 5d0eea0f..c64bf630 100644
--- a/src/emu/x64run67.c
+++ b/src/emu/x64run67.c
@@ -10,8 +10,8 @@
 

 #include "debug.h"

 #include "box64stack.h"

+#include "box64cpu_util.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -580,4 +580,4 @@ uintptr_t Run67(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
         return 0;

     }

     return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64run670f.c b/src/emu/x64run670f.c
index 87b89f84..8d074a1d 100644
--- a/src/emu/x64run670f.c
+++ b/src/emu/x64run670f.c
@@ -11,7 +11,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run6764_32.c b/src/emu/x64run6764_32.c
index c17481cc..bb53498e 100644
--- a/src/emu/x64run6764_32.c
+++ b/src/emu/x64run6764_32.c
@@ -10,8 +10,8 @@
 
 #include "debug.h"
 #include "box64stack.h"
+#include "box64cpu_util.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run6766.c b/src/emu/x64run6766.c
index 080abf91..d7fd39be 100644
--- a/src/emu/x64run6766.c
+++ b/src/emu/x64run6766.c
@@ -11,7 +11,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run67660f.c b/src/emu/x64run67660f.c
index 0369b82a..4e1a3f90 100644
--- a/src/emu/x64run67660f.c
+++ b/src/emu/x64run67660f.c
@@ -11,7 +11,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run67_32.c b/src/emu/x64run67_32.c
index 4b7afbea..73459143 100644
--- a/src/emu/x64run67_32.c
+++ b/src/emu/x64run67_32.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -112,4 +111,4 @@ uintptr_t Run67_32(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
         return 0;

     }

     return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64run67avx.c b/src/emu/x64run67avx.c
index bfc99e9c..de275c92 100644
--- a/src/emu/x64run67avx.c
+++ b/src/emu/x64run67avx.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64run_private.c b/src/emu/x64run_private.c
index 4f3d5b4c..9d520e59 100644
--- a/src/emu/x64run_private.c
+++ b/src/emu/x64run_private.c
@@ -12,11 +12,11 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
+#include "box64cpu.h"
+#include "box64cpu_util.h"
 #include "x64run_private.h"
 #include "x64emu_private.h"
 #include "box64context.h"
-#include "x64run.h"
 #include "librarian.h"
 #include "elfloader.h"
 #ifdef HAVE_TRACE
diff --git a/src/emu/x64run_private.h b/src/emu/x64run_private.h
index 35fa99bb..53b1bf74 100644
--- a/src/emu/x64run_private.h
+++ b/src/emu/x64run_private.h
@@ -5,7 +5,6 @@
 #include "regs.h"
 #include "x64emu_private.h"
 #include "box64context.h"
-typedef struct x64emu_s x64emu_t;
 
 typedef struct rex_s {
     union {
@@ -37,79 +36,6 @@ typedef struct vex_s {
     uint16_t    m:5;    // opcode map
 } vex_t;
 
-static inline uint8_t Peek(x64emu_t *emu, int offset){return *(uint8_t*)(R_RIP + offset);}
-
-#ifdef TEST_INTERPRETER
-#define Push16(E, V)  do{E->regs[_SP].q[0] -=2; test->memsize = 2; *(uint16_t*)test->mem = (V); test->memaddr = E->regs[_SP].q[0];}while(0)
-#define Push32(E, V)  do{E->regs[_SP].q[0] -=4; test->memsize = 4; *(uint32_t*)test->mem = (V); test->memaddr = E->regs[_SP].q[0];}while(0)
-#define Push64(E, V)  do{E->regs[_SP].q[0] -=8; test->memsize = 8; *(uint64_t*)test->mem = (V); test->memaddr = E->regs[_SP].q[0];}while(0)
-#else
-static inline void Push16(x64emu_t *emu, uint16_t v)
-{
-    R_RSP -= 2;
-    *((uint16_t*)R_RSP) = v;
-}
-
-static inline void Push_32(x64emu_t *emu, uint32_t v)
-{
-    R_ESP -= 4;
-    *((uint32_t*)(uintptr_t)R_ESP) = v;
-}
-
-static inline void Push32(x64emu_t *emu, uint32_t v)
-{
-    R_RSP -= 4;
-    *((uint32_t*)R_RSP) = v;
-}
-
-static inline void Push64(x64emu_t *emu, uint64_t v)
-{
-    R_RSP -= 8;
-    *((uint64_t*)R_RSP) = v;
-}
-#endif
-
-static inline uint16_t Pop16(x64emu_t *emu)
-{
-    uint16_t* st = (uint16_t*)R_RSP;
-    R_RSP += 2;
-    return *st;
-}
-
-static inline uint32_t Pop_32(x64emu_t *emu)
-{
-    uint32_t* st = (uint32_t*)(uintptr_t)R_RSP;
-    R_ESP += 4;
-    return *st;
-}
-
-static inline uint32_t Pop32(x64emu_t *emu)
-{
-    uint32_t* st = (uint32_t*)R_RSP;
-    R_RSP += 4;
-    return *st;
-}
-
-static inline uint64_t Pop64(x64emu_t *emu)
-{
-    uint64_t* st = (uint64_t*)R_RSP;
-    R_RSP += 8;
-    return *st;
-}
-
-static inline void PushExit(x64emu_t* emu)
-{
-    R_RSP -= 8;
-    *((uint64_t*)R_RSP) = my_context->exit_bridge;
-}
-
-#ifdef BOX32
-static inline void PushExit_32(x64emu_t* emu)
-{
-    R_ESP -= 4;
-    *((ptr_t*)(uintptr_t)R_ESP) = my_context->exit_bridge;
-}
-#endif
 // the op code definition can be found here: http://ref.x86asm.net/geek32.html
 
 reg64_t* GetECommon(x64emu_t* emu, uintptr_t* addr, rex_t rex, uint8_t m, uint8_t delta);
diff --git a/src/emu/x64runavx.c b/src/emu/x64runavx.c
index a4e3fc35..9651e924 100644
--- a/src/emu/x64runavx.c
+++ b/src/emu/x64runavx.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavx0f.c b/src/emu/x64runavx0f.c
index 49786f8b..4ca1cb5e 100644
--- a/src/emu/x64runavx0f.c
+++ b/src/emu/x64runavx0f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavx0f38.c b/src/emu/x64runavx0f38.c
index 011491c4..015167c5 100644
--- a/src/emu/x64runavx0f38.c
+++ b/src/emu/x64runavx0f38.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavx660f.c b/src/emu/x64runavx660f.c
index 45aaf043..26c36bbb 100644
--- a/src/emu/x64runavx660f.c
+++ b/src/emu/x64runavx660f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavx660f38.c b/src/emu/x64runavx660f38.c
index d7d4b914..1766168d 100644
--- a/src/emu/x64runavx660f38.c
+++ b/src/emu/x64runavx660f38.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavx660f3a.c b/src/emu/x64runavx660f3a.c
index 4a5ea456..d81f6a84 100644
--- a/src/emu/x64runavx660f3a.c
+++ b/src/emu/x64runavx660f3a.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf20f.c b/src/emu/x64runavxf20f.c
index 9dc26b01..4cbd1af5 100644
--- a/src/emu/x64runavxf20f.c
+++ b/src/emu/x64runavxf20f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf20f38.c b/src/emu/x64runavxf20f38.c
index 05754092..276ccbfd 100644
--- a/src/emu/x64runavxf20f38.c
+++ b/src/emu/x64runavxf20f38.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf20f3a.c b/src/emu/x64runavxf20f3a.c
index 186d35cc..f9691fe4 100644
--- a/src/emu/x64runavxf20f3a.c
+++ b/src/emu/x64runavxf20f3a.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf30f.c b/src/emu/x64runavxf30f.c
index d712b105..08d746cf 100644
--- a/src/emu/x64runavxf30f.c
+++ b/src/emu/x64runavxf30f.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf30f38.c b/src/emu/x64runavxf30f38.c
index a2ed5225..4dbdbbd5 100644
--- a/src/emu/x64runavxf30f38.c
+++ b/src/emu/x64runavxf30f38.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64runavxf30f3a.c b/src/emu/x64runavxf30f3a.c
index c5dc9a17..0100c3c8 100644
--- a/src/emu/x64runavxf30f3a.c
+++ b/src/emu/x64runavxf30f3a.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64rund8.c b/src/emu/x64rund8.c
index fd5ccf66..44413c10 100644
--- a/src/emu/x64rund8.c
+++ b/src/emu/x64rund8.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -199,4 +198,4 @@ uintptr_t RunD8(x64emu_t *emu, rex_t rex, uintptr_t addr, uintptr_t offs)
         }

     fesetround(oldround);

     return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64rund9.c b/src/emu/x64rund9.c
index c7b8d308..a4f6cc2b 100644
--- a/src/emu/x64rund9.c
+++ b/src/emu/x64rund9.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -347,4 +346,4 @@ uintptr_t RunD9(x64emu_t *emu, rex_t rex, uintptr_t addr, uintptr_t offs)
                 return 0;

         }

     return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64runda.c b/src/emu/x64runda.c
index 056937e7..f8a1b70e 100644
--- a/src/emu/x64runda.c
+++ b/src/emu/x64runda.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -136,4 +135,4 @@ uintptr_t RunDA(x64emu_t *emu, rex_t rex, uintptr_t addr)
         fesetround(oldround);

     }

    return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64rundb.c b/src/emu/x64rundb.c
index b6ba0ff1..5e12fa6d 100644
--- a/src/emu/x64rundb.c
+++ b/src/emu/x64rundb.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64rundc.c b/src/emu/x64rundc.c
index c9ffe738..00775698 100644
--- a/src/emu/x64rundc.c
+++ b/src/emu/x64rundc.c
@@ -11,7 +11,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x64rundd.c b/src/emu/x64rundd.c
index 5aa23395..d7e6f748 100644
--- a/src/emu/x64rundd.c
+++ b/src/emu/x64rundd.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

@@ -161,4 +160,4 @@ uintptr_t RunDD(x64emu_t *emu, rex_t rex, uintptr_t addr)
                 return 0;

         }

    return addr;

-}
\ No newline at end of file
+}

diff --git a/src/emu/x64runde.c b/src/emu/x64runde.c
index 8b082aa5..782edcc7 100644
--- a/src/emu/x64runde.c
+++ b/src/emu/x64runde.c
@@ -12,7 +12,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
@@ -163,4 +162,4 @@ uintptr_t RunDE(x64emu_t *emu, rex_t rex, uintptr_t addr)
         }
     fesetround(oldround);
     return addr;
-}
\ No newline at end of file
+}
diff --git a/src/emu/x64rundf.c b/src/emu/x64rundf.c
index dfedb293..dbf48007 100644
--- a/src/emu/x64rundf.c
+++ b/src/emu/x64rundf.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64runf0.c b/src/emu/x64runf0.c
index 22f19566..2764db5c 100644
--- a/src/emu/x64runf0.c
+++ b/src/emu/x64runf0.c
@@ -11,7 +11,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64runf20f.c b/src/emu/x64runf20f.c
index 32c2b050..1886543b 100644
--- a/src/emu/x64runf20f.c
+++ b/src/emu/x64runf20f.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64runf30f.c b/src/emu/x64runf30f.c
index ce69411d..7332032f 100644
--- a/src/emu/x64runf30f.c
+++ b/src/emu/x64runf30f.c
@@ -12,7 +12,6 @@
 #include "debug.h"

 #include "box64stack.h"

 #include "x64emu.h"

-#include "x64run.h"

 #include "x64emu_private.h"

 #include "x64run_private.h"

 #include "x64primop.h"

diff --git a/src/emu/x64syscall.c b/src/emu/x64syscall.c
index f3d80b03..f7d6a6d7 100644
--- a/src/emu/x64syscall.c
+++ b/src/emu/x64syscall.c
@@ -26,7 +26,7 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
+#include "box64cpu.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 //#include "x64primop.h"
diff --git a/src/emu/x64test.c b/src/emu/x64test.c
index 84f2e503..4ac4eeff 100644
--- a/src/emu/x64test.c
+++ b/src/emu/x64test.c
@@ -12,7 +12,7 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
+#include "x64test.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x64primop.h"
diff --git a/src/emu/x86int3.c b/src/emu/x86int3.c
index 24887f37..f3b232c6 100755
--- a/src/emu/x86int3.c
+++ b/src/emu/x86int3.c
@@ -15,7 +15,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64run_private.h"
 #include "x87emu_private.h"
diff --git a/src/emu/x86syscall.c b/src/emu/x86syscall.c
index 0ab60e4f..6b0625ac 100755
--- a/src/emu/x86syscall.c
+++ b/src/emu/x86syscall.c
@@ -26,7 +26,6 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
 #include "x64emu_private.h"
 #include "x64trace.h"
 #include "myalign.h"
diff --git a/src/emu/x86syscall_32.c b/src/emu/x86syscall_32.c
index b8c4e1cb..b4ed24d2 100644
--- a/src/emu/x86syscall_32.c
+++ b/src/emu/x86syscall_32.c
@@ -28,7 +28,7 @@
 #include "debug.h"
 #include "box64stack.h"
 #include "x64emu.h"
-#include "x64run.h"
+#include "box64cpu.h"
 #include "x64emu_private.h"
 #include "x64trace.h"
 #include "myalign32.h"