diff options
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/skyeye_common/arm_regformat.h (renamed from src/core/arm/interpreter/arm_regformat.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armcpu.h (renamed from src/core/arm/interpreter/armcpu.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armdefs.h (renamed from src/core/arm/interpreter/armdefs.h) | 4 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armemu.h (renamed from src/core/arm/interpreter/armemu.h) | 2 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armmmu.h (renamed from src/core/arm/interpreter/armmmu.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armos.h (renamed from src/core/arm/interpreter/armos.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/skyeye_defs.h (renamed from src/core/arm/interpreter/skyeye_defs.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/asm_vfp.h (renamed from src/core/arm/interpreter/vfp/asm_vfp.h) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp.cpp (renamed from src/core/arm/interpreter/vfp/vfp.cpp) | 32 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp.h (renamed from src/core/arm/interpreter/vfp/vfp.h) | 2 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp_helper.h (renamed from src/core/arm/interpreter/vfp/vfp_helper.h) | 2 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpdouble.cpp (renamed from src/core/arm/interpreter/vfp/vfpdouble.cpp) | 6 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpinstr.cpp (renamed from src/core/arm/interpreter/vfp/vfpinstr.cpp) | 0 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpsingle.cpp (renamed from src/core/arm/interpreter/vfp/vfpsingle.cpp) | 6 |
14 files changed, 27 insertions, 27 deletions
diff --git a/src/core/arm/interpreter/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h index 0ca62780b..0ca62780b 100644 --- a/src/core/arm/interpreter/arm_regformat.h +++ b/src/core/arm/skyeye_common/arm_regformat.h diff --git a/src/core/arm/interpreter/armcpu.h b/src/core/arm/skyeye_common/armcpu.h index 6b5ea8566..6b5ea8566 100644 --- a/src/core/arm/interpreter/armcpu.h +++ b/src/core/arm/skyeye_common/armcpu.h diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index dd5983be3..fd574a7a1 100644 --- a/src/core/arm/interpreter/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -31,7 +31,7 @@ #include "arm_regformat.h" #include "common/platform.h" -#include "skyeye_defs.h" +#include "core/arm/skyeye_common/skyeye_defs.h" //AJ2D-------------------------------------------------------------------------- @@ -130,7 +130,7 @@ typedef unsigned long long uint64_t; #endif */ -#include "armmmu.h" +#include "core/arm/skyeye_common/armmmu.h" //#include "lcd/skyeye_lcd.h" diff --git a/src/core/arm/interpreter/armemu.h b/src/core/arm/skyeye_common/armemu.h index 36fb2d09b..c0f0270fe 100644 --- a/src/core/arm/interpreter/armemu.h +++ b/src/core/arm/skyeye_common/armemu.h @@ -18,7 +18,7 @@ #define __ARMEMU_H__ -#include "armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" //#include "skyeye.h" //extern ARMword isize; diff --git a/src/core/arm/interpreter/armmmu.h b/src/core/arm/skyeye_common/armmmu.h index 818108c9c..818108c9c 100644 --- a/src/core/arm/interpreter/armmmu.h +++ b/src/core/arm/skyeye_common/armmmu.h diff --git a/src/core/arm/interpreter/armos.h b/src/core/arm/skyeye_common/armos.h index 4b58801ad..4b58801ad 100644 --- a/src/core/arm/interpreter/armos.h +++ b/src/core/arm/skyeye_common/armos.h diff --git a/src/core/arm/interpreter/skyeye_defs.h b/src/core/arm/skyeye_common/skyeye_defs.h index b6713ebad..b6713ebad 100644 --- a/src/core/arm/interpreter/skyeye_defs.h +++ b/src/core/arm/skyeye_common/skyeye_defs.h diff --git a/src/core/arm/interpreter/vfp/asm_vfp.h b/src/core/arm/skyeye_common/vfp/asm_vfp.h index f4ab34fd4..f4ab34fd4 100644 --- a/src/core/arm/interpreter/vfp/asm_vfp.h +++ b/src/core/arm/skyeye_common/vfp/asm_vfp.h diff --git a/src/core/arm/interpreter/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp index eea5e24a9..e4fa3c20a 100644 --- a/src/core/arm/interpreter/vfp/vfp.cpp +++ b/src/core/arm/skyeye_common/vfp/vfp.cpp @@ -25,8 +25,8 @@ #include "common/common.h" -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/vfp/vfp.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/vfp/vfp.h" //ARMul_State* persistent_state; /* function calls from SoftFloat lib don't have an access to ARMul_state. */ @@ -62,7 +62,7 @@ VFPMRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value) if (CoProc == 10 || CoProc == 11) { #define VFP_MRC_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MRC_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n", @@ -88,7 +88,7 @@ VFPMCR (ARMul_State * state, unsigned type, ARMword instr, ARMword value) if (CoProc == 10 || CoProc == 11) { #define VFP_MCR_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MCR_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n", @@ -110,7 +110,7 @@ VFPMRRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value1, AR if (CoProc == 10 || CoProc == 11) { #define VFP_MRRC_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MRRC_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n", @@ -136,7 +136,7 @@ VFPMCRR (ARMul_State * state, unsigned type, ARMword instr, ARMword value1, ARMw if (CoProc == 11 || CoProc == 10) { #define VFP_MCRR_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MCRR_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n", @@ -179,7 +179,7 @@ VFPSTC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value) #endif #define VFP_STC_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_STC_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n", @@ -210,7 +210,7 @@ VFPLDC (ARMul_State * state, unsigned type, ARMword instr, ARMword value) if (CoProc == 10 || CoProc == 11) { #define VFP_LDC_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_LDC_TRANS } DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n", @@ -237,7 +237,7 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr) if (CoProc == 10 || CoProc == 11) { #define VFP_CDP_TRANS - #include "core/arm/interpreter/vfp/vfpinstr.cpp" + #include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_CDP_TRANS int exceptions = 0; @@ -257,21 +257,21 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr) /* ----------- MRC ------------ */ #define VFP_MRC_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MRC_IMPL #define VFP_MRRC_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MRRC_IMPL /* ----------- MCR ------------ */ #define VFP_MCR_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MCR_IMPL #define VFP_MCRR_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_MCRR_IMPL /* Memory operation are not inlined, as old Interpreter and Fast interpreter @@ -283,19 +283,19 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr) /* ----------- STC ------------ */ #define VFP_STC_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_STC_IMPL /* ----------- LDC ------------ */ #define VFP_LDC_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_LDC_IMPL /* ----------- CDP ------------ */ #define VFP_CDP_IMPL -#include "core/arm/interpreter/vfp/vfpinstr.cpp" +#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #undef VFP_CDP_IMPL /* Miscellaneous functions */ diff --git a/src/core/arm/interpreter/vfp/vfp.h b/src/core/arm/skyeye_common/vfp/vfp.h index bbf4caeb0..ed627d41f 100644 --- a/src/core/arm/interpreter/vfp/vfp.h +++ b/src/core/arm/skyeye_common/vfp/vfp.h @@ -25,7 +25,7 @@ #define vfpdebug //printf -#include "core/arm/interpreter/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */ +#include "core/arm/skyeye_common/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */ unsigned VFPInit (ARMul_State *state); unsigned VFPMRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value); diff --git a/src/core/arm/interpreter/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h index b222e79f1..a55bf875c 100644 --- a/src/core/arm/interpreter/vfp/vfp_helper.h +++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h @@ -38,7 +38,7 @@ #include <stdint.h> #include <stdio.h> -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" #define u16 uint16_t #define u32 uint32_t diff --git a/src/core/arm/interpreter/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp index 5ae99b88a..13411ad80 100644 --- a/src/core/arm/interpreter/vfp/vfpdouble.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp @@ -51,9 +51,9 @@ * =========================================================================== */ -#include "core/arm/interpreter/vfp/vfp.h" -#include "core/arm/interpreter/vfp/vfp_helper.h" -#include "core/arm/interpreter/vfp/asm_vfp.h" +#include "core/arm/skyeye_common/vfp/vfp.h" +#include "core/arm/skyeye_common/vfp/vfp_helper.h" +#include "core/arm/skyeye_common/vfp/asm_vfp.h" static struct vfp_double vfp_double_default_qnan = { //.exponent = 2047, diff --git a/src/core/arm/interpreter/vfp/vfpinstr.cpp b/src/core/arm/skyeye_common/vfp/vfpinstr.cpp index a57047911..a57047911 100644 --- a/src/core/arm/interpreter/vfp/vfpinstr.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpinstr.cpp diff --git a/src/core/arm/interpreter/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp index 0fcc85266..8bcbd4fe9 100644 --- a/src/core/arm/interpreter/vfp/vfpsingle.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp @@ -51,9 +51,9 @@ * =========================================================================== */ -#include "core/arm/interpreter/vfp/vfp_helper.h" -#include "core/arm/interpreter/vfp/asm_vfp.h" -#include "core/arm/interpreter/vfp/vfp.h" +#include "core/arm/skyeye_common/vfp/vfp_helper.h" +#include "core/arm/skyeye_common/vfp/asm_vfp.h" +#include "core/arm/skyeye_common/vfp/vfp.h" static struct vfp_single vfp_single_default_qnan = { //.exponent = 255, |