[DYNAREC] Refactored dynarec to ease the future adding of new target architecture

42 files changed, 211 insertions, 169 deletions

diff --git a/src/dynarec/arm64_emitter.h b/src/dynarec/arm64/arm64_emitter.h
index b69ef087..b69ef087 100755
--- a/src/dynarec/arm64_emitter.h
+++ b/src/dynarec/arm64/arm64_emitter.h
diff --git a/src/dynarec/arm64_epilog.S b/src/dynarec/arm64/arm64_epilog.S
index 4b73803a..4b73803a 100755
--- a/src/dynarec/arm64_epilog.S
+++ b/src/dynarec/arm64/arm64_epilog.S
diff --git a/src/dynarec/arm64_lock.S b/src/dynarec/arm64/arm64_lock.S
index 9d097ff5..9d097ff5 100755
--- a/src/dynarec/arm64_lock.S
+++ b/src/dynarec/arm64/arm64_lock.S
diff --git a/src/dynarec/arm64_lock.h b/src/dynarec/arm64/arm64_lock.h
index 8f6bd14d..8f6bd14d 100755
--- a/src/dynarec/arm64_lock.h
+++ b/src/dynarec/arm64/arm64_lock.h
diff --git a/src/dynarec/arm64_next.S b/src/dynarec/arm64/arm64_next.S
index 5e890137..5e890137 100755
--- a/src/dynarec/arm64_next.S
+++ b/src/dynarec/arm64/arm64_next.S
diff --git a/src/dynarec/arm64_printer.c b/src/dynarec/arm64/arm64_printer.c
index b07d40a4..b07d40a4 100755
--- a/src/dynarec/arm64_printer.c
+++ b/src/dynarec/arm64/arm64_printer.c
diff --git a/src/dynarec/arm64_printer.h b/src/dynarec/arm64/arm64_printer.h
index 2475f631..2475f631 100644
--- a/src/dynarec/arm64_printer.h
+++ b/src/dynarec/arm64/arm64_printer.h
diff --git a/src/dynarec/arm64_prolog.S b/src/dynarec/arm64/arm64_prolog.S
index 21961e5b..21961e5b 100755
--- a/src/dynarec/arm64_prolog.S
+++ b/src/dynarec/arm64/arm64_prolog.S
diff --git a/src/dynarec/dynarec_arm64_00.c b/src/dynarec/arm64/dynarec_arm64_00.c
index 28720e31..3e6098de 100755
--- a/src/dynarec/dynarec_arm64_00.c
+++ b/src/dynarec/arm64/dynarec_arm64_00.c
@@ -17,10 +17,10 @@
 #include "bridge.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
@@ -644,12 +644,12 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
             GETFLAGS;   \
             if(dyn->insts[ninst].x64.jmp_insts==-1) {   \
                 /* out of the block */                  \
-                i32 = dyn->insts[ninst+1].address-(dyn->arm_size); \
+                i32 = dyn->insts[ninst+1].address-(dyn->native_size); \
                 Bcond(NO, i32);     \
                 jump_to_next(dyn, addr+i8, 0, ninst); \
             } else {    \
                 /* inside the block */  \
-                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->arm_size);    \
+                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->native_size);    \
                 Bcond(YES, i32);    \
             }
 
@@ -2001,12 +2001,12 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
             JUMP(addr+i8);                                              \
             if(dyn->insts[ninst].x64.jmp_insts==-1) {               \
                 /* out of the block */                              \
-                i32 = dyn->insts[ninst+1].address-(dyn->arm_size);  \
+                i32 = dyn->insts[ninst+1].address-(dyn->native_size);  \
                 if(Z) {CBNZx(xRCX, i32);} else {CBZx(xRCX, i32);};  \
                 jump_to_next(dyn, addr+i8, 0, ninst);               \
             } else {                                                \
                 /* inside the block */                              \
-                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->arm_size);    \
+                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->native_size);    \
                 if(Z) {CBZx(xRCX, i32);} else {CBNZx(xRCX, i32);};  \
             }
         case 0xE0:
@@ -2129,7 +2129,7 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                 jump_to_next(dyn, addr+i32, 0, ninst);
             } else {
                 // inside the block
-                tmp = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->arm_size);
+                tmp = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->native_size);
                 if(tmp==4) {
                     NOP;
                 } else {
diff --git a/src/dynarec/dynarec_arm64_0f.c b/src/dynarec/arm64/dynarec_arm64_0f.c
index 0a204193..b726db9a 100755
--- a/src/dynarec/dynarec_arm64_0f.c
+++ b/src/dynarec/arm64/dynarec_arm64_0f.c
@@ -15,12 +15,12 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 #include "my_cpuid.h"

 #include "emu/x87emu_private.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_functions.h"

 #include "dynarec_arm64_helper.h"

 

@@ -1018,12 +1018,12 @@ uintptr_t dynarec64_0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
             GETFLAGS;   \

             if(dyn->insts[ninst].x64.jmp_insts==-1) {   \

                 /* out of the block */                  \

-                i32 = dyn->insts[ninst+1].address-(dyn->arm_size); \

+                i32 = dyn->insts[ninst+1].address-(dyn->native_size); \

                 Bcond(NO, i32);     \

                 jump_to_next(dyn, addr+i32_, 0, ninst); \

             } else {    \

                 /* inside the block */  \

-                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->arm_size);    \

+                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->native_size);    \

                 Bcond(YES, i32);    \

             }   \

 

diff --git a/src/dynarec/dynarec_arm64_64.c b/src/dynarec/arm64/dynarec_arm64_64.c
index 871d0e20..d604047c 100644
--- a/src/dynarec/dynarec_arm64_64.c
+++ b/src/dynarec/arm64/dynarec_arm64_64.c
@@ -15,10 +15,10 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_66.c b/src/dynarec/arm64/dynarec_arm64_66.c
index 1715d845..6e8c3b65 100755
--- a/src/dynarec/dynarec_arm64_66.c
+++ b/src/dynarec/arm64/dynarec_arm64_66.c
@@ -15,10 +15,10 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_helper.h"

 #include "dynarec_arm64_functions.h"

 

diff --git a/src/dynarec/dynarec_arm64_660f.c b/src/dynarec/arm64/dynarec_arm64_660f.c
index fd0fd355..39143bf9 100755
--- a/src/dynarec/dynarec_arm64_660f.c
+++ b/src/dynarec/arm64/dynarec_arm64_660f.c
@@ -15,10 +15,10 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_functions.h"

 #include "dynarec_arm64_helper.h"

 

diff --git a/src/dynarec/dynarec_arm64_6664.c b/src/dynarec/arm64/dynarec_arm64_6664.c
index 9d65c104..422c673b 100644
--- a/src/dynarec/dynarec_arm64_6664.c
+++ b/src/dynarec/arm64/dynarec_arm64_6664.c
@@ -15,10 +15,10 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_67.c b/src/dynarec/arm64/dynarec_arm64_67.c
index 4e0e0a26..0e846784 100755
--- a/src/dynarec/dynarec_arm64_67.c
+++ b/src/dynarec/arm64/dynarec_arm64_67.c
@@ -15,10 +15,10 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_helper.h"

 #include "dynarec_arm64_functions.h"

 

@@ -229,12 +229,12 @@ uintptr_t dynarec64_67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
             JUMP(addr+i8);\

             if(dyn->insts[ninst].x64.jmp_insts==-1) {   \

                 /* out of the block */                  \

-                i32 = dyn->insts[ninst+1].address-(dyn->arm_size); \

+                i32 = dyn->insts[ninst+1].address-(dyn->native_size); \

                 Bcond(NO, i32);     \

                 jump_to_next(dyn, addr+i8, 0, ninst); \

             } else {    \

                 /* inside the block */  \

-                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->arm_size);    \

+                i32 = dyn->insts[dyn->insts[ninst].x64.jmp_insts].address-(dyn->native_size);    \

                 Bcond(YES, i32);    \

             }

         case 0xE0:

diff --git a/src/dynarec/dynarec_arm64_d8.c b/src/dynarec/arm64/dynarec_arm64_d8.c
index 9b65f764..2a963bb4 100644
--- a/src/dynarec/dynarec_arm64_d8.c
+++ b/src/dynarec/arm64/dynarec_arm64_d8.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_d9.c b/src/dynarec/arm64/dynarec_arm64_d9.c
index 8089b68d..cd11b6f2 100644
--- a/src/dynarec/dynarec_arm64_d9.c
+++ b/src/dynarec/arm64/dynarec_arm64_d9.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_db.c b/src/dynarec/arm64/dynarec_arm64_db.c
index 52204ffe..cbc2c0ef 100644
--- a/src/dynarec/dynarec_arm64_db.c
+++ b/src/dynarec/arm64/dynarec_arm64_db.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_dc.c b/src/dynarec/arm64/dynarec_arm64_dc.c
index 0fa8ddb2..3877bcc9 100644
--- a/src/dynarec/dynarec_arm64_dc.c
+++ b/src/dynarec/arm64/dynarec_arm64_dc.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_dd.c b/src/dynarec/arm64/dynarec_arm64_dd.c
index 4068af44..4b73cc97 100644
--- a/src/dynarec/dynarec_arm64_dd.c
+++ b/src/dynarec/arm64/dynarec_arm64_dd.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_df.c b/src/dynarec/arm64/dynarec_arm64_df.c
index c1ace798..a90f3331 100644
--- a/src/dynarec/dynarec_arm64_df.c
+++ b/src/dynarec/arm64/dynarec_arm64_df.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
 #include "emu/x87emu_private.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_emit_logic.c b/src/dynarec/arm64/dynarec_arm64_emit_logic.c
index 5255f47c..24453b44 100755
--- a/src/dynarec/dynarec_arm64_emit_logic.c
+++ b/src/dynarec/arm64/dynarec_arm64_emit_logic.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 #include "../tools/bridge_private.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
diff --git a/src/dynarec/dynarec_arm64_emit_math.c b/src/dynarec/arm64/dynarec_arm64_emit_math.c
index 97eedfe9..eb55a249 100755
--- a/src/dynarec/dynarec_arm64_emit_math.c
+++ b/src/dynarec/arm64/dynarec_arm64_emit_math.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 #include "../tools/bridge_private.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
diff --git a/src/dynarec/dynarec_arm64_emit_shift.c b/src/dynarec/arm64/dynarec_arm64_emit_shift.c
index 4382794d..51903720 100755
--- a/src/dynarec/dynarec_arm64_emit_shift.c
+++ b/src/dynarec/arm64/dynarec_arm64_emit_shift.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 #include "../tools/bridge_private.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
diff --git a/src/dynarec/dynarec_arm64_emit_tests.c b/src/dynarec/arm64/dynarec_arm64_emit_tests.c
index 14fb366e..301ab2f2 100755
--- a/src/dynarec/dynarec_arm64_emit_tests.c
+++ b/src/dynarec/arm64/dynarec_arm64_emit_tests.c
@@ -15,11 +15,11 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 #include "../tools/bridge_private.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
diff --git a/src/dynarec/dynarec_arm64_f0.c b/src/dynarec/arm64/dynarec_arm64_f0.c
index dbcf18ea..b127b0b3 100644
--- a/src/dynarec/dynarec_arm64_f0.c
+++ b/src/dynarec/arm64/dynarec_arm64_f0.c
@@ -15,10 +15,10 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_helper.h"
 #include "dynarec_arm64_functions.h"
 
diff --git a/src/dynarec/dynarec_arm64_f20f.c b/src/dynarec/arm64/dynarec_arm64_f20f.c
index 2c2e5c63..cf047a10 100755
--- a/src/dynarec/dynarec_arm64_f20f.c
+++ b/src/dynarec/arm64/dynarec_arm64_f20f.c
@@ -15,10 +15,10 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_functions.h"

 #include "dynarec_arm64_helper.h"

 

diff --git a/src/dynarec/dynarec_arm64_f30f.c b/src/dynarec/arm64/dynarec_arm64_f30f.c
index b4413a60..5f489168 100755
--- a/src/dynarec/dynarec_arm64_f30f.c
+++ b/src/dynarec/arm64/dynarec_arm64_f30f.c
@@ -15,10 +15,10 @@
 #include "callback.h"

 #include "emu/x64run_private.h"

 #include "x64trace.h"

-#include "dynarec_arm64.h"

-#include "dynarec_arm64_private.h"

-#include "arm64_printer.h"

+#include "dynarec_native.h"

 

+#include "arm64_printer.h"

+#include "dynarec_arm64_private.h"

 #include "dynarec_arm64_functions.h"

 #include "dynarec_arm64_helper.h"

 

diff --git a/src/dynarec/dynarec_arm64_functions.c b/src/dynarec/arm64/dynarec_arm64_functions.c
index 5e6ecfd2..32bea7d6 100755
--- a/src/dynarec/dynarec_arm64_functions.c
+++ b/src/dynarec/arm64/dynarec_arm64_functions.c
@@ -22,7 +22,7 @@
 #include "emu/x87emu_private.h"
 #include "x64trace.h"
 #include "signals.h"
-#include "dynarec_arm64.h"
+#include "dynarec_native.h"
 #include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "custommem.h"
diff --git a/src/dynarec/dynarec_arm64_functions.h b/src/dynarec/arm64/dynarec_arm64_functions.h
index d4c861c9..d4c861c9 100755
--- a/src/dynarec/dynarec_arm64_functions.h
+++ b/src/dynarec/arm64/dynarec_arm64_functions.h
diff --git a/src/dynarec/dynarec_arm64_helper.c b/src/dynarec/arm64/dynarec_arm64_helper.c
index 8c65ac32..fc28663c 100755
--- a/src/dynarec/dynarec_arm64_helper.c
+++ b/src/dynarec/arm64/dynarec_arm64_helper.c
@@ -15,13 +15,13 @@
 #include "callback.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "dynablock_private.h"
-#include "arm64_printer.h"
+#include "dynarec_native.h"
+#include "../dynablock_private.h"
 #include "../tools/bridge_private.h"
 #include "custommem.h"
 
+#include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
 
diff --git a/src/dynarec/dynarec_arm64_helper.h b/src/dynarec/arm64/dynarec_arm64_helper.h
index d15902f4..e1bbd5b9 100755
--- a/src/dynarec/dynarec_arm64_helper.h
+++ b/src/dynarec/arm64/dynarec_arm64_helper.h
@@ -312,138 +312,138 @@
 // R0 will not be pushed/popd if ret is -2. Flags are not save/restored
 #define CALL_S(F, ret) call_c(dyn, ninst, F, x7, ret, 0, 0)
 
-#define MARK    dyn->insts[ninst].mark = dyn->arm_size
+#define MARK    dyn->insts[ninst].mark = dyn->native_size
 #define GETMARK dyn->insts[ninst].mark
-#define MARK2   dyn->insts[ninst].mark2 = dyn->arm_size
+#define MARK2   dyn->insts[ninst].mark2 = dyn->native_size
 #define GETMARK2 dyn->insts[ninst].mark2
-#define MARK3   dyn->insts[ninst].mark3 = dyn->arm_size
+#define MARK3   dyn->insts[ninst].mark3 = dyn->native_size
 #define GETMARK3 dyn->insts[ninst].mark3
-#define MARKF   dyn->insts[ninst].markf = dyn->arm_size
+#define MARKF   dyn->insts[ninst].markf = dyn->native_size
 #define GETMARKF dyn->insts[ninst].markf
-#define MARKSEG dyn->insts[ninst].markseg = dyn->arm_size
+#define MARKSEG dyn->insts[ninst].markseg = dyn->native_size
 #define GETMARKSEG dyn->insts[ninst].markseg
-#define MARKLOCK dyn->insts[ninst].marklock = dyn->arm_size
+#define MARKLOCK dyn->insts[ninst].marklock = dyn->native_size
 #define GETMARKLOCK dyn->insts[ninst].marklock
 
 // Branch to MARK if cond (use j64)
 #define B_MARK(cond)                \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     Bcond(cond, j64)
 // Branch to MARK unconditionnal (use j64)
 #define B_MARK_nocond               \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     B(j64)
 // Branch to MARK if reg is 0 (use j64)
 #define CBZxw_MARK(reg)             \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     CBZxw(reg, j64)
 // Branch to MARK if reg is not 0 (use j64)
 #define CBNZx_MARK(reg)             \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     CBNZx(reg, j64)
 // Branch to MARK if reg is not 0 (use j64)
 #define CBNZw_MARK(reg)             \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     CBNZw(reg, j64)
 // Test bit N of A and branch to MARK if not set
 #define TBZ_MARK(A, N)              \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     TBZ(A, N, j64)
 // Test bit N of A and branch to MARK if set
 #define TBNZ_MARK(A, N)             \
-    j64 = GETMARK-(dyn->arm_size);  \
+    j64 = GETMARK-(dyn->native_size);  \
     TBNZ(A, N, j64)
 // Branch to MARK2 if cond (use j64)
 #define B_MARK2(cond)               \
-    j64 = GETMARK2-(dyn->arm_size); \
+    j64 = GETMARK2-(dyn->native_size); \
     Bcond(cond, j64)
 // Branch to MARK2 unconditionnal (use j64)
 #define B_MARK2_nocond              \
-    j64 = GETMARK2-(dyn->arm_size); \
+    j64 = GETMARK2-(dyn->native_size); \
     B(j64)
 // Branch to MARK2 if reg is not 0 (use j64)
 #define CBNZx_MARK2(reg)            \
-    j64 = GETMARK2-(dyn->arm_size); \
+    j64 = GETMARK2-(dyn->native_size); \
     CBNZx(reg, j64)
 // Test bit N of A and branch to MARK2 if set
 #define TBNZ_MARK2(A, N)            \
-    j64 = GETMARK2-(dyn->arm_size); \
+    j64 = GETMARK2-(dyn->native_size); \
     TBNZ(A, N, j64)
 // Branch to MARK3 if cond (use j64)
 #define B_MARK3(cond)               \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     Bcond(cond, j64)
 // Test bit N of A and branch to MARK3 if not set
 #define TBZ_MARK2(A, N)            \
-    j64 = GETMARK2-(dyn->arm_size); \
+    j64 = GETMARK2-(dyn->native_size); \
     TBZ(A, N, j64)
 // Branch to MARK3 unconditionnal (use j64)
 #define B_MARK3_nocond              \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     B(j64)
 // Branch to MARK3 if reg is not 0 (use j64)
 #define CBNZx_MARK3(reg)            \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     CBNZx(reg, j64)
 // Branch to MARK3 if reg is 0 (use j64)
 #define CBZx_MARK3(reg)             \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     CBZx(reg, j64)
 // Test bit N of A and branch to MARK3 if not set
 #define TBZ_MARK3(A, N)             \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     TBZ(A, N, j64)
 // Test bit N of A and branch to MARK3 if set
 #define TBNZ_MARK3(A, N)            \
-    j64 = GETMARK3-(dyn->arm_size); \
+    j64 = GETMARK3-(dyn->native_size); \
     TBNZ(A, N, j64)
 // Branch to next instruction if cond (use j64)
 #define B_NEXT(cond)     \
-    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     Bcond(cond, j64)
 // Branch to next instruction unconditionnal (use j64)
 #define B_NEXT_nocond                                               \
-    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0;\
+    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0;\
     B(j64)
 // Branch to next instruction if reg is 0 (use j64)
 #define CBZw_NEXT(reg)    \
-    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     CBZw(reg, j64)
 // Branch to next instruction if reg is 0 (use j64)
 #define CBZx_NEXT(reg)    \
-    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     CBZx(reg, j64)
 // Branch to next instruction if reg is not 0 (use j64)
 #define CBNZx_NEXT(reg)   \
-    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 =  (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     CBNZx(reg, j64)
 // Test bit N of A and branch to next instruction if not set
 #define TBZ_NEXT(A, N)              \
-    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     TBZ(A, N, j64)
 // Test bit N of A and branch to next instruction if set
 #define TBNZ_NEXT(A, N)             \
-    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->arm_size)):0; \
+    j64 = (dyn->insts)?(dyn->insts[ninst].epilog-(dyn->native_size)):0; \
     TBNZ(A, N, j64)
 // Branch to MARKSEG if cond (use j64)
 #define B_MARKSEG(cond)    \
-    j64 = GETMARKSEG-(dyn->arm_size);   \
+    j64 = GETMARKSEG-(dyn->native_size);   \
     Bcond(cond, j64)
 // Branch to MARKSEG if reg is 0 (use j64)
 #define CBZw_MARKSEG(reg)    \
-    j64 = GETMARKSEG-(dyn->arm_size);   \
+    j64 = GETMARKSEG-(dyn->native_size);   \
     CBZw(reg, j64)
 // Branch to MARKSEG if reg is not 0 (use j64)
 #define CBNZw_MARKSEG(reg)              \
-    j64 = GETMARKSEG-(dyn->arm_size);   \
+    j64 = GETMARKSEG-(dyn->native_size);   \
     CBNZw(reg, j64)
 // Branch to MARKLOCK if cond (use j64)
 #define B_MARKLOCK(cond)    \
-    j64 = GETMARKLOCK-(dyn->arm_size);   \
+    j64 = GETMARKLOCK-(dyn->native_size);   \
     Bcond(cond, j64)
 // Branch to MARKLOCK if reg is not 0 (use j64)
 #define CBNZx_MARKLOCK(reg)             \
-    j64 = GETMARKLOCK-(dyn->arm_size);  \
+    j64 = GETMARKLOCK-(dyn->native_size);  \
     CBNZx(reg, j64)
 
 #define IFX(A)  if((dyn->insts[ninst].x64.need_flags&(A)))
@@ -579,7 +579,7 @@
     if(((A)!=X_PEND) && dyn->state_flags!=SF_SET && dyn->state_flags!=SF_SET_PENDING) { \
         if(dyn->state_flags!=SF_PENDING) {              \
             LDRw_U12(x3, xEmu, offsetof(x64emu_t, df)); \
-            j64 = (GETMARKF)-(dyn->arm_size);           \
+            j64 = (GETMARKF)-(dyn->native_size);           \
             CBZw(x3, j64);                              \
         }                                               \
         CALL_(UpdateFlags, -1, 0);                      \
diff --git a/src/dynarec/dynarec_arm64_pass.c b/src/dynarec/arm64/dynarec_arm64_pass.c
index c4a31aaf..5492df01 100755
--- a/src/dynarec/dynarec_arm64_pass.c
+++ b/src/dynarec/arm64/dynarec_arm64_pass.c
@@ -16,12 +16,13 @@
 #include "emu/x64run_private.h"
 #include "x64trace.h"
 #include "dynablock.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
+#include "dynarec_native.h"
+#include "custommem.h"
+
 #include "arm64_printer.h"
+#include "dynarec_arm64_private.h"
 #include "dynarec_arm64_functions.h"
 #include "dynarec_arm64_helper.h"
-#include "custommem.h"
 
 #ifndef STEP
 #error No STEP defined
diff --git a/src/dynarec/dynarec_arm64_pass0.h b/src/dynarec/arm64/dynarec_arm64_pass0.h
index d4818ac5..d4818ac5 100755
--- a/src/dynarec/dynarec_arm64_pass0.h
+++ b/src/dynarec/arm64/dynarec_arm64_pass0.h
diff --git a/src/dynarec/dynarec_arm64_pass1.h b/src/dynarec/arm64/dynarec_arm64_pass1.h
index a4abcf19..a4abcf19 100755
--- a/src/dynarec/dynarec_arm64_pass1.h
+++ b/src/dynarec/arm64/dynarec_arm64_pass1.h
diff --git a/src/dynarec/dynarec_arm64_pass2.h b/src/dynarec/arm64/dynarec_arm64_pass2.h
index 1be5a0de..3d4b6f03 100755
--- a/src/dynarec/dynarec_arm64_pass2.h
+++ b/src/dynarec/arm64/dynarec_arm64_pass2.h
@@ -1,10 +1,10 @@
-#define INIT        dyn->arm_size = 0
+#define INIT        dyn->native_size = 0
 #define FINI        if(ninst) {dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);}
 
 #define MESSAGE(A, ...)  
-#define EMIT(A)     dyn->insts[ninst].size+=4; dyn->arm_size+=4
+#define EMIT(A)     dyn->insts[ninst].size+=4; dyn->native_size+=4
 #define NEW_INST    if(ninst) {dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);}
-#define INST_EPILOG dyn->insts[ninst].epilog = dyn->arm_size; 
+#define INST_EPILOG dyn->insts[ninst].epilog = dyn->native_size; 
 #define INST_NAME(name) 
 #define NEW_BARRIER_INST    if(ninst) ++dyn->sons_size
 #define TABLE64(A, V)   {Table64(dyn, (V)); EMIT(0);}
diff --git a/src/dynarec/dynarec_arm64_pass3.h b/src/dynarec/arm64/dynarec_arm64_pass3.h
index 25b852e3..00f39f74 100755
--- a/src/dynarec/dynarec_arm64_pass3.h
+++ b/src/dynarec/arm64/dynarec_arm64_pass3.h
@@ -3,7 +3,7 @@
 #define EMIT(A)     \
     if(box64_dynarec_dump) {dynarec_log(LOG_NONE, "\t%08x\t%s\n", (uint32_t)(A), arm64_print(A, (uintptr_t)dyn->block));} \
     *(uint32_t*)(dyn->block) = (uint32_t)(A);       \
-    dyn->block += 4; dyn->arm_size += 4;\
+    dyn->block += 4; dyn->native_size += 4;         \
     dyn->insts[ninst].size2 += 4
 
 #define MESSAGE(A, ...)  if(box64_dynarec_dump) dynarec_log(LOG_NONE, __VA_ARGS__)
@@ -14,7 +14,7 @@
         printf_x64_instruction(my_context->dec, &dyn->insts[ninst].x64, name); \
         dynarec_log(LOG_NONE, "%s%p: %d emited opcodes, state=%d/%d, set=%X, use=%X, need=%X%s\n", \
             (box64_dynarec_dump>1)?"\e[32m":"", \
-            (void*)(dyn->arm_start+dyn->insts[ninst].address),  \
+            (void*)(dyn->native_start+dyn->insts[ninst].address),  \
             dyn->insts[ninst].size/4,           \
             dyn->insts[ninst].x64.state_flags,  \
             dyn->state_flags,                   \
@@ -27,7 +27,7 @@
 #define NEW_BARRIER_INST                            \
     if(ninst) {                                     \
     dyn->sons_x64[dyn->sons_size] = (uintptr_t)ip;  \
-    dyn->sons_arm[dyn->sons_size] = dyn->block;     \
+    dyn->sons_native[dyn->sons_size] = dyn->block;  \
     MESSAGE(LOG_DUMP, "----> potential Son here\n");\
     ++dyn->sons_size;                               \
     }
diff --git a/src/dynarec/dynarec_arm64_private.h b/src/dynarec/arm64/dynarec_arm64_private.h
index cae1b4bd..252901a9 100755
--- a/src/dynarec/dynarec_arm64_private.h
+++ b/src/dynarec/arm64/dynarec_arm64_private.h
@@ -1,7 +1,7 @@
 #ifndef __DYNAREC_ARM_PRIVATE_H_
 #define __DYNAREC_ARM_PRIVATE_H_
 
-#include "dynarec_private.h"
+#include "../dynarec_private.h"
 
 typedef struct x64emu_s x64emu_t;
 typedef struct dynablock_s dynablock_t;
@@ -28,8 +28,8 @@ typedef struct dynarec_arm_s {
     uintptr_t           start;      // start of the block
     uint32_t            isize;      // size in byte of x64 instructions included
     void*               block;      // memory pointer where next instruction is emited
-    uintptr_t           arm_start;  // start of the arm code
-    size_t              arm_size;   // size of emitted arm code
+    uintptr_t           native_start;  // start of the arm code
+    size_t              native_size;   // size of emitted arm code
     int                 state_flags;// actual state for on-demand flags
     uintptr_t           last_ip;    // last set IP in RIP (or NULL if unclean state)
     int8_t              x87cache[8];// cache status for the 8 x87 register behind the fpu stack
@@ -49,7 +49,7 @@ typedef struct dynarec_arm_s {
     int                 next_sz;
     int                 next_cap;
     uintptr_t*          sons_x64;   // the x64 address of potential dynablock sons
-    void**              sons_arm;   // the arm address of potential dynablock sons
+    void**              sons_native;   // the arm address of potential dynablock sons
     int                 sons_size;  // number of potential dynablock sons
     dynablock_t*        dynablock;
 } dynarec_arm_t;
diff --git a/src/dynarec/dynablock.c b/src/dynarec/dynablock.c
index 8906db51..6bc61bf3 100755
--- a/src/dynarec/dynablock.c
+++ b/src/dynarec/dynablock.c
@@ -19,12 +19,10 @@
 #include "dynablock_private.h"
 #include "dynarec_private.h"
 #include "elfloader.h"
-#ifdef ARM64
-#include "dynarec_arm64.h"
-#include "arm64_lock.h"
-#else
-#error Unsupported architecture!
-#endif
+
+#include "dynarec_native.h"
+#include "native_lock.h"
+
 #include "custommem.h"
 #include "khash.h"
 
@@ -74,13 +72,13 @@ void FreeDynablock(dynablock_t* db, int need_lock)
         if(db->parent->direct) {
             uintptr_t addr = (uintptr_t)db->x64_addr;
             if(addr>=startdb && addr<enddb)
-                arm64_lock_xchg(&db->parent->direct[addr-startdb], 0);   // secured write
+                native_lock_xchg(&db->parent->direct[addr-startdb], 0);   // secured write
         }
         // remove jumptable
         setJumpTableDefault64(db->x64_addr);
         // remove and free the sons
         for (int i=0; i<db->sons_size; ++i) {
-            dynablock_t *son = (dynablock_t*)arm64_lock_xchg(&db->sons[i], 0);
+            dynablock_t *son = (dynablock_t*)native_lock_xchg(&db->sons[i], 0);
             FreeDynablock(son, 0);
         }
         // only the father free the DynarecMap
@@ -189,7 +187,7 @@ int FreeRangeDynablock(dynablocklist_t* dynablocks, uintptr_t addr, uintptr_t si
             end = enddb;
         if(end>startdb && start<enddb)
             for(uintptr_t i = start; i<end; ++i) {
-                db = (dynablock_t*)arm64_lock_xchg(&dynablocks->direct[i-startdb], 0);
+                db = (dynablock_t*)native_lock_xchg(&dynablocks->direct[i-startdb], 0);
                 if(db) {
                     if(db->father)
                         db = db->father;
@@ -274,7 +272,7 @@ dynablock_t *AddNewDynablock(dynablocklist_t* dynablocks, uintptr_t addr, int* c
     pthread_mutex_lock(&my_context->mutex_dyndump);
     if(!dynablocks->direct) {
         dynablock_t** p = (dynablock_t**)calloc(dynablocks->textsz, sizeof(dynablock_t*));
-        if(arm64_lock_storeifnull(&dynablocks->direct, p)!=p)
+        if(native_lock_storeifnull(&dynablocks->direct, p)!=p)
             free(p);    // someone already create the direct array, too late...
     }
 
@@ -283,7 +281,7 @@ dynablock_t *AddNewDynablock(dynablocklist_t* dynablocks, uintptr_t addr, int* c
 
     block = (dynablock_t*)calloc(1, sizeof(dynablock_t));
     block->parent = dynablocks; 
-    dynablock_t* tmp = (dynablock_t*)arm64_lock_storeifnull(&dynablocks->direct[addr-dynablocks->text], block);
+    dynablock_t* tmp = (dynablock_t*)native_lock_storeifnull(&dynablocks->direct[addr-dynablocks->text], block);
     if(tmp !=  block) {
         // a block appeard!
         pthread_mutex_unlock(&my_context->mutex_dyndump);
@@ -353,7 +351,7 @@ static dynablock_t* internalDBGetBlock(x64emu_t* emu, uintptr_t addr, uintptr_t
         pthread_mutex_unlock(&my_context->mutex_dyndump);
     if(!ret) {
         dynarec_log(LOG_DEBUG, "Fillblock of block %p for %p returned an error\n", block, (void*)addr);
-        void* old = (void*)arm64_lock_storeifref(&dynablocks->direct[addr-dynablocks->text], 0, block);
+        void* old = (void*)native_lock_storeifref(&dynablocks->direct[addr-dynablocks->text], 0, block);
         if(old!=block && old) {// put it back in place, strange things are happening here!
             dynarec_log(LOG_INFO, "Warning, a wild block appeared at %p: %p\n", (void*)addr, old);
             // doing nothing else, the block has not be writen
diff --git a/src/dynarec/dynarec_arch.h b/src/dynarec/dynarec_arch.h
new file mode 100755
index 00000000..ba059a90
--- /dev/null
+++ b/src/dynarec/dynarec_arch.h
@@ -0,0 +1,24 @@
+#ifndef __DYNAREC_ARCH__H_

+#define __DYNAREC_ARCH__H_

+

+#ifdef ARM64

+#include "arm64/dynarec_arm64_private.h"

+#include "arm64/dynarec_arm64_functions.h"

+

+#define instruction_native_t        instruction_arm64_t

+

+uintptr_t arm_pass0(dynarec_arm_t* dyn, uintptr_t addr);

+uintptr_t arm_pass1(dynarec_arm_t* dyn, uintptr_t addr);

+uintptr_t arm_pass2(dynarec_arm_t* dyn, uintptr_t addr);

+uintptr_t arm_pass3(dynarec_arm_t* dyn, uintptr_t addr);

+

+#define native_pass0    arm_pass0

+#define native_pass1    arm_pass1

+#define native_pass2    arm_pass2

+#define native_pass3    arm_pass3

+

+#else

+#error Unsupported platform

+#endif

+

+#endif //__DYNAREC_ARCH__H_
\ No newline at end of file
diff --git a/src/dynarec/dynarec_arm64.c b/src/dynarec/dynarec_native.c
index 18e05bce..2424e5ca 100755
--- a/src/dynarec/dynarec_arm64.c
+++ b/src/dynarec/dynarec_native.c
@@ -18,11 +18,11 @@
 #include "x64trace.h"
 #include "dynablock.h"
 #include "dynablock_private.h"
-#include "dynarec_arm64.h"
-#include "dynarec_arm64_private.h"
-#include "dynarec_arm64_functions.h"
 #include "elfloader.h"
 
+#include "dynarec_native.h"
+#include "dynarec_arch.h"
+
 void printf_x64_instruction(zydis_dec_t* dec, instruction_x64_t* inst, const char* name) {
     uint8_t *ip = (uint8_t*)inst->addr;
     if(ip[0]==0xcc && ip[1]=='S' && ip[2]=='C') {
@@ -278,14 +278,14 @@ uint32_t needed_flags(dynarec_arm_t *dyn, int ninst, uint32_t setf, int recurse)
     return needed;
 }
 
-instsize_t* addInst(instsize_t* insts, size_t* size, size_t* cap, int x64_size, int arm_size)
+instsize_t* addInst(instsize_t* insts, size_t* size, size_t* cap, int x64_size, int native_size)
 {
     // x64 instruction is <16 bytes
     int toadd;
-    if(x64_size>arm_size)
+    if(x64_size>native_size)
         toadd = 1 + x64_size/15;
     else
-        toadd = 1 + arm_size/15;
+        toadd = 1 + native_size/15;
     if((*size)+toadd>(*cap)) {
         *cap = (*size)+toadd;
         insts = (instsize_t*)realloc(insts, (*cap)*sizeof(instsize_t));
@@ -296,11 +296,11 @@ instsize_t* addInst(instsize_t* insts, size_t* size, size_t* cap, int x64_size,
         else
             insts[*size].x64 = x64_size;
         x64_size -= insts[*size].x64;
-        if(arm_size>15)
+        if(native_size>15)
             insts[*size].nat = 15;
         else
-            insts[*size].nat = arm_size;
-        arm_size -= insts[*size].nat;
+            insts[*size].nat = native_size;
+        native_size -= insts[*size].nat;
         ++(*size);
         --toadd;
     }
@@ -329,12 +329,6 @@ int Table64(dynarec_arm_t *dyn, uint64_t val)
     return delta;
 }
 
-
-uintptr_t arm_pass0(dynarec_arm_t* dyn, uintptr_t addr);
-uintptr_t arm_pass1(dynarec_arm_t* dyn, uintptr_t addr);
-uintptr_t arm_pass2(dynarec_arm_t* dyn, uintptr_t addr);
-uintptr_t arm_pass3(dynarec_arm_t* dyn, uintptr_t addr);
-
 __thread void* current_helper = NULL;
 
 void CancelBlock64()
@@ -347,7 +341,7 @@ void CancelBlock64()
     free(helper->insts);
     free(helper->table64);
     free(helper->sons_x64);
-    free(helper->sons_arm);
+    free(helper->sons_native);
     if(helper->dynablock && helper->dynablock->block)
         FreeDynarecMap(helper->dynablock, (uintptr_t)helper->dynablock->block, helper->dynablock->size);
 }
@@ -370,9 +364,9 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
     helper.start = addr;
     uintptr_t start = addr;
     helper.cap = 64; // needs epilog handling
-    helper.insts = (instruction_arm64_t*)calloc(helper.cap, sizeof(instruction_arm64_t));
+    helper.insts = (instruction_native_t*)calloc(helper.cap, sizeof(instruction_native_t));
     // pass 0, addresses, x86 jump addresses, overall size of the block
-    uintptr_t end = arm_pass0(&helper, addr);
+    uintptr_t end = native_pass0(&helper, addr);
     // no need for next anymore
     free(helper.next);
     helper.next_sz = helper.next_cap = 0;
@@ -413,7 +407,7 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
             }
         }
     // pass 1, flags
-    arm_pass1(&helper, addr);
+    native_pass1(&helper, addr);
     for(int i=0; i<helper.size; ++i)
         if(helper.insts[i].x64.set_flags && !helper.insts[i].x64.need_flags) {
             helper.insts[i].x64.need_flags = needed_flags(&helper, i+1, helper.insts[i].x64.set_flags, 0);
@@ -422,9 +416,9 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
         }
     
     // pass 2, instruction size
-    arm_pass2(&helper, addr);
+    native_pass2(&helper, addr);
     // ok, now allocate mapped memory, with executable flag on
-    size_t sz = helper.arm_size + helper.table64size*sizeof(uint64_t);
+    size_t sz = helper.native_size + helper.table64size*sizeof(uint64_t);
     void* p = (void*)AllocDynarecMap(block, sz);
     if(p==NULL) {
         dynarec_log(LOG_INFO, "AllocDynarecMap(%p, %zu) failed, cancelling block\n", block, sz);
@@ -432,25 +426,25 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
         return NULL;
     }
     helper.block = p;
-    helper.arm_start = (uintptr_t)p;
-    helper.tablestart = helper.arm_start + helper.arm_size;
+    helper.native_start = (uintptr_t)p;
+    helper.tablestart = helper.native_start + helper.native_size;
     if(helper.sons_size) {
         helper.sons_x64 = (uintptr_t*)calloc(helper.sons_size, sizeof(uintptr_t));
-        helper.sons_arm = (void**)calloc(helper.sons_size, sizeof(void*));
+        helper.sons_native = (void**)calloc(helper.sons_size, sizeof(void*));
     }
     // pass 3, emit (log emit arm opcode)
     if(box64_dynarec_dump) {
-        dynarec_log(LOG_NONE, "%s%04d|Emitting %zu bytes for %u x64 bytes", (box64_dynarec_dump>1)?"\e[01;36m":"", GetTID(), helper.arm_size, helper.isize); 
+        dynarec_log(LOG_NONE, "%s%04d|Emitting %zu bytes for %u x64 bytes", (box64_dynarec_dump>1)?"\e[01;36m":"", GetTID(), helper.native_size, helper.isize); 
         printFunctionAddr(helper.start, " => ");
         dynarec_log(LOG_NONE, "%s\n", (box64_dynarec_dump>1)?"\e[m":"");
     }
     int oldtable64size = helper.table64size;
-    size_t oldarmsize = helper.arm_size;
-    helper.arm_size = 0;
+    size_t oldarmsize = helper.native_size;
+    helper.native_size = 0;
     helper.table64size = 0; // reset table64 (but not the cap)
-    arm_pass3(&helper, addr);
-    if((oldarmsize!=helper.arm_size) || (oldtable64size<helper.table64size)) {
-        printf_log(LOG_NONE, "BOX64: Warning, size difference in block between pass2 (%zu) & pass3 (%zu)!\n", sz, helper.arm_size+helper.table64size*8);
+    native_pass3(&helper, addr);
+    if((oldarmsize!=helper.native_size) || (oldtable64size<helper.table64size)) {
+        printf_log(LOG_NONE, "BOX64: Warning, size difference in block between pass2 (%zu) & pass3 (%zu)!\n", sz, helper.native_size+helper.table64size*8);
         uint8_t *dump = (uint8_t*)helper.start;
         printf_log(LOG_NONE, "Dump of %d x64 opcodes:\n", helper.size);
         for(int i=0; i<helper.size; ++i) {
@@ -512,7 +506,7 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
             int created = 1;
             dynablock_t *son = AddNewDynablock(block->parent, helper.sons_x64[i], &created);
             if(created) {    // avoid breaking a working block!
-                son->block = helper.sons_arm[i];
+                son->block = helper.sons_native[i];
                 son->x64_addr = (void*)helper.sons_x64[i];
                 son->x64_size = end-helper.sons_x64[i];
                 if(!son->x64_size) {printf_log(LOG_NONE, "Warning, son with null x64 size! (@%p / ARM=%p)", son->x64_addr, son->block);}
@@ -533,8 +527,8 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr) {
     }
     free(helper.sons_x64);
     helper.sons_x64 = NULL;
-    free(helper.sons_arm);
-    helper.sons_arm = NULL;
+    free(helper.sons_native);
+    helper.sons_native = NULL;
     current_helper = NULL;
     //block->done = 1;
     return (void*)block;
diff --git a/src/dynarec/native_lock.h b/src/dynarec/native_lock.h
new file mode 100755
index 00000000..056947fd
--- /dev/null
+++ b/src/dynarec/native_lock.h
@@ -0,0 +1,25 @@
+#ifndef __NATIVE_LOCK__H__

+#define __NATIVE_LOCK__H__

+

+#ifdef ARM64

+#include "arm64/arm64_lock.h"

+

+#define native_lock_read_b(A)               arm64_lock_read_b(A)

+#define native_lock_write_b(A, B)           arm64_lock_write_b(A, B)

+#define native_lock_read_h(A)               arm64_lock_read_h(A)

+#define native_lock_write_h(A, B)           arm64_lock_write_h(A, B)

+#define native_lock_read_d(A)               arm64_lock_read_d(A)

+#define native_lock_write_d(A, B)           arm64_lock_write_d(A, B)

+#define native_lock_read_dd(A)              arm64_lock_read_dd(A)

+#define native_lock_write_dd(A, B)          arm64_lock_write_dd(A, B)

+#define native_lock_read_dq(A, B, C)        arm64_lock_read_dq(A, B, C)

+#define native_lock_write_dq(A, B, C)       arm64_lock_write_dq(A, B, C)

+#define native_lock_xchg(A, B)              arm64_lock_xchg(A, B)

+#define native_lock_storeifref(A, B, C)     arm64_lock_storeifref(A, B, C)

+#define native_lock_storeifnull(A, B)       arm64_lock_storeifnull(A, B)

+

+#else

+#error Unsupported architecture

+#endif

+

+#endif //#define __NATIVE_LOCK__H__
\ No newline at end of file