about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2021-03-20 16:49:02 +0100
committerptitSeb <sebastien.chev@gmail.com>2021-03-20 16:49:02 +0100
commitdfb1cd487616cdcee38488eb1f6f30b76942bc69 (patch)
tree806df99832feddc40b05a787f6a03658a1005e02
parentc2c34ccba37109ffe7c8d5fbc39ce64f8769fa67 (diff)
downloadbox64-dfb1cd487616cdcee38488eb1f6f30b76942bc69.tar.gz
box64-dfb1cd487616cdcee38488eb1f6f30b76942bc69.zip
Renamed arm64_lock_helper to arm64_lock
-rwxr-xr-xCMakeLists.txt2
-rw-r--r--src/custommem.c2
-rwxr-xr-xsrc/dynarec/arm64_lock.S (renamed from src/dynarec/arm64_lock_helper.S)0
-rwxr-xr-xsrc/dynarec/arm64_lock.h (renamed from src/dynarec/arm64_lock_helper.h)6
-rwxr-xr-xsrc/dynarec/dynablock.c2
-rwxr-xr-xsrc/emu/x64run.c2
-rw-r--r--src/emu/x64run0f.c2
-rw-r--r--src/emu/x64run66.c2
-rw-r--r--src/emu/x64runf0.c2
9 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e20fd74..10000e92 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ if(ARM_DYNAREC)
         "${BOX64_ROOT}/src/dynarec/arm64_prolog.S"
         "${BOX64_ROOT}/src/dynarec/arm64_epilog.S"
         "${BOX64_ROOT}/src/dynarec/arm64_next.S"
-        "${BOX64_ROOT}/src/dynarec/arm64_lock_helper.S"
+        "${BOX64_ROOT}/src/dynarec/arm64_lock.S"
     )
 
     set(DYNAREC_PASS
diff --git a/src/custommem.c b/src/custommem.c
index d3dc4b62..6b245112 100644
--- a/src/custommem.c
+++ b/src/custommem.c
@@ -23,7 +23,7 @@
 #include "khash.h"
 #ifdef DYNAREC
 #include "dynablock.h"
-#include "dynarec/arm64_lock_helper.h"
+#include "dynarec/arm64_lock.h"
 
 //#define USE_MMAP
 
diff --git a/src/dynarec/arm64_lock_helper.S b/src/dynarec/arm64_lock.S
index ebe7f8ec..ebe7f8ec 100755
--- a/src/dynarec/arm64_lock_helper.S
+++ b/src/dynarec/arm64_lock.S
diff --git a/src/dynarec/arm64_lock_helper.h b/src/dynarec/arm64_lock.h
index a6879bea..12a57e7a 100755
--- a/src/dynarec/arm64_lock_helper.h
+++ b/src/dynarec/arm64_lock.h
@@ -1,5 +1,5 @@
-#ifndef __ARM64_LOCK_HELPER__H__
-#define __ARM64_LOCK_HELPER__H__
+#ifndef __ARM64_LOCK__H__
+#define __ARM64_LOCK__H__
 #include <stdint.h>
 
 // LDAXRB of ADDR
@@ -28,4 +28,4 @@ extern uintptr_t arm64_lock_xchg(void* p, uintptr_t val);
 // Atomicaly store value to [p] only if [p] is NULL. Return new [p] value (so val or old)
 extern void* arm64_lock_storeifnull(void*p, void* val);
 
-#endif  //__ARM64_LOCK_HELPER__H__
\ No newline at end of file
+#endif  //__ARM64_LOCK__H__
\ No newline at end of file
diff --git a/src/dynarec/dynablock.c b/src/dynarec/dynablock.c
index 06694e06..e92b7f0b 100755
--- a/src/dynarec/dynablock.c
+++ b/src/dynarec/dynablock.c
@@ -20,7 +20,7 @@
 #include "elfloader.h"
 #ifdef ARM64
 #include "dynarec_arm64.h"
-#include "arm64_lock_helper.h"
+#include "arm64_lock.h"
 #else
 #error Unsupported architecture!
 #endif
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index 19fa56e5..629bfe71 100755
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -21,7 +21,7 @@
 #include "bridge.h"
 #include "signals.h"
 #ifdef DYNAREC
-#include "../dynarec/arm64_lock_helper.h"
+#include "../dynarec/arm64_lock.h"
 #endif
 
 #include "modrm.h"
diff --git a/src/emu/x64run0f.c b/src/emu/x64run0f.c
index ec0048f4..45df3e22 100644
--- a/src/emu/x64run0f.c
+++ b/src/emu/x64run0f.c
@@ -22,7 +22,7 @@
 #include "bridge.h"

 #include "signals.h"

 #ifdef DYNAREC

-#include "../dynarec/arm64_lock_helper.h"

+#include "../dynarec/arm64_lock.h"

 #endif

 

 #include "modrm.h"

diff --git a/src/emu/x64run66.c b/src/emu/x64run66.c
index 377ece8c..73eb5417 100644
--- a/src/emu/x64run66.c
+++ b/src/emu/x64run66.c
@@ -20,7 +20,7 @@
 #include "box64context.h"

 #include "bridge.h"

 #ifdef DYNAREC

-#include "../dynarec/arm64_lock_helper.h"

+#include "../dynarec/arm64_lock.h"

 #endif

 

 #include "modrm.h"

diff --git a/src/emu/x64runf0.c b/src/emu/x64runf0.c
index faf1a109..b09fd3aa 100644
--- a/src/emu/x64runf0.c
+++ b/src/emu/x64runf0.c
@@ -21,7 +21,7 @@
 #include "my_cpuid.h"

 #include "bridge.h"

 #ifdef DYNAREC

-#include "../dynarec/arm64_lock_helper.h"

+#include "../dynarec/arm64_lock.h"

 #endif

 

 #include "modrm.h"