new_dynarec: moved x86 and ARM files to new_dynarec\x86 and new_dynar…

…ec\arm
mupen64plus · Mar 2, 2015 · bdb8a88 · bdb8a88 · gizmo98 · Mar 5, 2015
1 parent b962810
commit bdb8a88
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 5 deletions.
diff --git a/src/r4300/new_dynarec/arm_cpu_features.c → src/r4300/new_dynarec/arm/arm_cpu_features.c b/src/r4300/new_dynarec/arm_cpu_features.c → src/r4300/new_dynarec/arm/arm_cpu_features.c
diff --git a/src/r4300/new_dynarec/arm_cpu_features.h → src/r4300/new_dynarec/arm/arm_cpu_features.h b/src/r4300/new_dynarec/arm_cpu_features.h → src/r4300/new_dynarec/arm/arm_cpu_features.h
diff --git a/src/r4300/new_dynarec/assem_arm.c → src/r4300/new_dynarec/arm/assem_arm.c b/src/r4300/new_dynarec/assem_arm.c → src/r4300/new_dynarec/arm/assem_arm.c
diff --git a/src/r4300/new_dynarec/assem_arm.h → src/r4300/new_dynarec/arm/assem_arm.h b/src/r4300/new_dynarec/assem_arm.h → src/r4300/new_dynarec/arm/assem_arm.h
diff --git a/src/r4300/new_dynarec/linkage_arm.S → src/r4300/new_dynarec/arm/linkage_arm.S b/src/r4300/new_dynarec/linkage_arm.S → src/r4300/new_dynarec/arm/linkage_arm.S
diff --git a/src/r4300/new_dynarec/new_dynarec.c b/src/r4300/new_dynarec/new_dynarec.c
@@ -38,6 +38,7 @@ extern "C" {
 #include "../recomph.h" //include for function prototypes
 #include "../cp0_private.h"
 #include "../cp1.h"
+#include "../cp1_private.h"
 #include "../r4300.h"
 #include "../ops.h"
 #include "../tlb.h"
@@ -56,10 +57,10 @@ extern "C" {
 #endif
 
 #if NEW_DYNAREC == NEW_DYNAREC_X86
-#include "assem_x86.h"
+#include "x86/assem_x86.h"
 #elif NEW_DYNAREC == NEW_DYNAREC_ARM
-#include "arm_cpu_features.h"
-#include "assem_arm.h"
+#include "arm/arm_cpu_features.h"
+#include "arm/assem_arm.h"
 #else
 #error Unsupported dynarec architecture
 #endif
@@ -1008,9 +1009,9 @@ static uint64_t ldr_merge(uint64_t original,uint64_t loaded,u_int bits)
 }
 
 #if NEW_DYNAREC == NEW_DYNAREC_X86
-#include "assem_x86.c"
+#include "x86/assem_x86.c"
 #elif NEW_DYNAREC == NEW_DYNAREC_ARM
-#include "assem_arm.c"
+#include "arm/assem_arm.c"
 #else
 #error Unsupported dynarec architecture
 #endif

diff --git a/src/r4300/new_dynarec/assem_x86.c → src/r4300/new_dynarec/x86/assem_x86.c b/src/r4300/new_dynarec/assem_x86.c → src/r4300/new_dynarec/x86/assem_x86.c
diff --git a/src/r4300/new_dynarec/assem_x86.h → src/r4300/new_dynarec/x86/assem_x86.h b/src/r4300/new_dynarec/assem_x86.h → src/r4300/new_dynarec/x86/assem_x86.h
diff --git a/src/r4300/new_dynarec/linkage_x86.asm → src/r4300/new_dynarec/x86/linkage_x86.asm b/src/r4300/new_dynarec/linkage_x86.asm → src/r4300/new_dynarec/x86/linkage_x86.asm