Moved emit functions to seperate files from signals.h (#2516)

15 files changed, 18 insertions, 17 deletions

diff --git a/src/emu/modrm.h b/src/emu/modrm.h
index 4a1abd3e..cd2c3636 100644
--- a/src/emu/modrm.h
+++ b/src/emu/modrm.h
@@ -11,9 +11,9 @@
 #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 && !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)++;

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

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

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

 #else

 #define STEP

 #define STEP2

diff --git a/src/emu/x64int3.c b/src/emu/x64int3.c
index 82bfcb26..96776ce8 100644
--- a/src/emu/x64int3.c
+++ b/src/emu/x64int3.c
@@ -27,7 +27,7 @@
 #include "wrapper.h"
 #include "box64context.h"
 #include "librarian.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "tools/bridge_private.h"
 
 #include <elf.h>
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index 7694ec13..05b3dd3f 100644
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -20,7 +20,7 @@
 #include "x87emu_private.h"
 #include "box64context.h"
 #include "alternate.h"
-#include "signals.h"
+#include "emit_signals.h"
 #ifdef DYNAREC
 #include "../dynarec/native_lock.h"
 #endif
@@ -67,7 +67,7 @@ int Run(x64emu_t *emu, int step)
 #ifdef TEST_INTERPRETER
     test->memsize = 0;
 #else
-    check_exec(emu, R_RIP);
+    CheckExec(emu, R_RIP);
 x64emurun:
     while(1) 
 #endif
diff --git a/src/emu/x64run0f.c b/src/emu/x64run0f.c
index cd0affa8..94cd858a 100644
--- a/src/emu/x64run0f.c
+++ b/src/emu/x64run0f.c
@@ -22,7 +22,7 @@
 #include "box64context.h"

 #include "my_cpuid.h"

 #include "bridge.h"

-#include "signals.h"

+#include "emit_signals.h"

 #include "x64shaext.h"

 #ifdef DYNAREC

 #include "custommem.h"

diff --git a/src/emu/x64run64.c b/src/emu/x64run64.c
index 79ad60ae..62a94f26 100644
--- a/src/emu/x64run64.c
+++ b/src/emu/x64run64.c
@@ -19,7 +19,7 @@
 #include "x87emu_private.h"

 #include "box64context.h"

 #include "alternate.h"

-#include "signals.h"

+#include "emit_signals.h"

 

 #include "modrm.h"

 

diff --git a/src/emu/x64run660f.c b/src/emu/x64run660f.c
index 27dc7af0..557b34a9 100644
--- a/src/emu/x64run660f.c
+++ b/src/emu/x64run660f.c
@@ -19,7 +19,7 @@
 #include "x64trace.h"

 #include "x87emu_private.h"

 #include "box64context.h"

-#include "signals.h"

+#include "emit_signals.h"

 #include "bridge.h"

 #ifdef DYNAREC

 #include "custommem.h"

diff --git a/src/emu/x64run670f.c b/src/emu/x64run670f.c
index 72a5865e..870c8fac 100644
--- a/src/emu/x64run670f.c
+++ b/src/emu/x64run670f.c
@@ -19,7 +19,7 @@
 #include "x87emu_private.h"
 #include "box64context.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #ifdef DYNAREC
 #include "../dynarec/native_lock.h"
 #endif
diff --git a/src/emu/x64runavx0f.c b/src/emu/x64runavx0f.c
index 81be8027..3da790c8 100644
--- a/src/emu/x64runavx0f.c
+++ b/src/emu/x64runavx0f.c
@@ -21,7 +21,7 @@
 #include "box64context.h"
 #include "my_cpuid.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "x64shaext.h"
 #ifdef DYNAREC
 #include "custommem.h"
diff --git a/src/emu/x64runavx0f38.c b/src/emu/x64runavx0f38.c
index 178d95ac..2d647ec4 100644
--- a/src/emu/x64runavx0f38.c
+++ b/src/emu/x64runavx0f38.c
@@ -21,7 +21,7 @@
 #include "box64context.h"
 #include "my_cpuid.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #ifdef DYNAREC
 #include "custommem.h"
 #include "../dynarec/native_lock.h"
diff --git a/src/emu/x64runavx660f.c b/src/emu/x64runavx660f.c
index 1597b63f..189cae05 100644
--- a/src/emu/x64runavx660f.c
+++ b/src/emu/x64runavx660f.c
@@ -21,7 +21,7 @@
 #include "box64context.h"
 #include "my_cpuid.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "x64shaext.h"
 #ifdef DYNAREC
 #include "custommem.h"
diff --git a/src/emu/x64runavx660f38.c b/src/emu/x64runavx660f38.c
index 2fec0afb..fdde1d6c 100644
--- a/src/emu/x64runavx660f38.c
+++ b/src/emu/x64runavx660f38.c
@@ -21,7 +21,7 @@
 #include "box64context.h"
 #include "my_cpuid.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "x64shaext.h"
 #ifdef DYNAREC
 #include "custommem.h"
diff --git a/src/emu/x64runavx660f3a.c b/src/emu/x64runavx660f3a.c
index 3985668e..c17d0e6f 100644
--- a/src/emu/x64runavx660f3a.c
+++ b/src/emu/x64runavx660f3a.c
@@ -21,7 +21,7 @@
 #include "box64context.h"
 #include "my_cpuid.h"
 #include "bridge.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "x64shaext.h"
 #include "x64compstrings.h"
 #ifdef DYNAREC
diff --git a/src/emu/x64runf20f.c b/src/emu/x64runf20f.c
index dc86c70f..0367d873 100644
--- a/src/emu/x64runf20f.c
+++ b/src/emu/x64runf20f.c
@@ -20,7 +20,7 @@
 #include "x87emu_private.h"

 #include "box64context.h"

 #include "bridge.h"

-#include "signals.h"

+#include "emit_signals.h"

 

 #include "modrm.h"

 

diff --git a/src/emu/x64syscall.c b/src/emu/x64syscall.c
index 376809a7..2f418285 100644
--- a/src/emu/x64syscall.c
+++ b/src/emu/x64syscall.c
@@ -35,6 +35,7 @@
 #include "box64context.h"
 #include "callback.h"
 #include "signals.h"
+#include "emit_signals.h"
 #include "x64tls.h"
 #include "elfloader.h"
 
diff --git a/src/emu/x86int3.c b/src/emu/x86int3.c
index c9e5d190..7a2ea9f6 100755
--- a/src/emu/x86int3.c
+++ b/src/emu/x86int3.c
@@ -23,7 +23,7 @@
 #include "wrapper32.h"
 #include "box32context.h"
 #include "librarian.h"
-#include "signals.h"
+#include "emit_signals.h"
 #include "tools/bridge_private.h"
 
 #include <elf.h>