From b5e65245948647b94dfd60c1288f030a76c69a83 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 10 Sep 2014 21:27:14 -0400 Subject: [PATCH] ARM: Reorganized file structure to move shared SkyEye code to a more common area. Removed s_ prefix --- src/citra_qt/debugger/disassembler.cpp | 2 +- src/core/CMakeLists.txt | 30 ++++++++--------- src/core/arm/interpreter/arm_interpreter.cpp | 4 +-- src/core/arm/interpreter/arm_interpreter.h | 4 +-- src/core/arm/interpreter/armcopro.cpp | 8 ++--- src/core/arm/interpreter/armemu.cpp | 6 ++-- src/core/arm/interpreter/arminit.cpp | 4 +-- src/core/arm/interpreter/armmmu.cpp | 4 +-- src/core/arm/interpreter/armos.cpp | 8 ++--- src/core/arm/interpreter/armvirt.cpp | 4 +-- .../arm/interpreter/mmu/arm1176jzf_s_mmu.cpp | 4 +-- src/core/arm/interpreter/mmu/cache.cpp | 2 +- src/core/arm/interpreter/mmu/maverick.cpp | 4 +-- src/core/arm/interpreter/mmu/rb.cpp | 2 +- src/core/arm/interpreter/mmu/sa_mmu.cpp | 2 +- src/core/arm/interpreter/mmu/tlb.cpp | 2 +- src/core/arm/interpreter/mmu/wb.cpp | 2 +- src/core/arm/interpreter/mmu/xscale_copro.cpp | 4 +-- src/core/arm/interpreter/thumbemu.cpp | 8 ++--- .../arm_regformat.h | 0 .../{interpreter => skyeye_common}/armcpu.h | 0 .../{interpreter => skyeye_common}/armdefs.h | 4 +-- .../{interpreter => skyeye_common}/armemu.h | 2 +- .../{interpreter => skyeye_common}/armmmu.h | 0 .../{interpreter => skyeye_common}/armos.h | 0 .../skyeye_defs.h | 0 .../vfp/asm_vfp.h | 0 .../vfp/vfp.cpp | 32 +++++++++---------- .../{interpreter => skyeye_common}/vfp/vfp.h | 2 +- .../vfp/vfp_helper.h | 2 +- .../vfp/vfpdouble.cpp | 6 ++-- .../vfp/vfpinstr.cpp | 0 .../vfp/vfpsingle.cpp | 6 ++-- src/core/core.h | 2 +- 34 files changed, 80 insertions(+), 80 deletions(-) rename src/core/arm/{interpreter => skyeye_common}/arm_regformat.h (100%) rename src/core/arm/{interpreter => skyeye_common}/armcpu.h (100%) rename src/core/arm/{interpreter => skyeye_common}/armdefs.h (99%) rename src/core/arm/{interpreter => skyeye_common}/armemu.h (99%) rename src/core/arm/{interpreter => skyeye_common}/armmmu.h (100%) rename src/core/arm/{interpreter => skyeye_common}/armos.h (100%) rename src/core/arm/{interpreter => skyeye_common}/skyeye_defs.h (100%) rename src/core/arm/{interpreter => skyeye_common}/vfp/asm_vfp.h (100%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfp.cpp (91%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfp.h (97%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfp_helper.h (99%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfpdouble.cpp (99%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfpinstr.cpp (100%) rename src/core/arm/{interpreter => skyeye_common}/vfp/vfpsingle.cpp (99%) diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 856baf63d..2ee877743 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -9,7 +9,7 @@ #include "core/core.h" #include "common/break_points.h" #include "common/symbols.h" -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" #include "core/arm/disassembler/arm_disasm.h" DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) { diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 06df9a677..d87e5ad49 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -9,10 +9,6 @@ set(SRCS arm/interpreter/mmu/tlb.cpp arm/interpreter/mmu/wb.cpp arm/interpreter/mmu/xscale_copro.cpp - arm/interpreter/vfp/vfp.cpp - arm/interpreter/vfp/vfpdouble.cpp - arm/interpreter/vfp/vfpinstr.cpp - arm/interpreter/vfp/vfpsingle.cpp arm/interpreter/arm_interpreter.cpp arm/interpreter/armcopro.cpp arm/interpreter/armemu.cpp @@ -22,6 +18,10 @@ set(SRCS arm/interpreter/armsupp.cpp arm/interpreter/armvirt.cpp arm/interpreter/thumbemu.cpp + arm/skyeye_common/vfp/vfp.cpp + arm/skyeye_common/vfp/vfpdouble.cpp + arm/skyeye_common/vfp/vfpinstr.cpp + arm/skyeye_common/vfp/vfpsingle.cpp file_sys/archive_romfs.cpp file_sys/archive_sdmc.cpp file_sys/file_romfs.cpp @@ -63,23 +63,23 @@ set(SRCS set(HEADERS arm/disassembler/arm_disasm.h arm/disassembler/load_symbol_map.h + arm/interpreter/arm_interpreter.h arm/interpreter/mmu/arm1176jzf_s_mmu.h arm/interpreter/mmu/cache.h arm/interpreter/mmu/rb.h arm/interpreter/mmu/sa_mmu.h arm/interpreter/mmu/tlb.h arm/interpreter/mmu/wb.h - arm/interpreter/vfp/asm_vfp.h - arm/interpreter/vfp/vfp.h - arm/interpreter/vfp/vfp_helper.h - arm/interpreter/arm_interpreter.h - arm/interpreter/arm_regformat.h - arm/interpreter/armcpu.h - arm/interpreter/armdefs.h - arm/interpreter/armemu.h - arm/interpreter/armmmu.h - arm/interpreter/armos.h - arm/interpreter/skyeye_defs.h + arm/skyeye_common/vfp/asm_vfp.h + arm/skyeye_common/vfp/vfp.h + arm/skyeye_common/vfp/vfp_helper.h + arm/skyeye_common/arm_regformat.h + arm/skyeye_common/armcpu.h + arm/skyeye_common/armdefs.h + arm/skyeye_common/armemu.h + arm/skyeye_common/armmmu.h + arm/skyeye_common/armos.h + arm/skyeye_common/skyeye_defs.h arm/arm_interface.h file_sys/archive.h file_sys/archive_romfs.h diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp index 0842d2f8e..6f6a5913c 100644 --- a/src/core/arm/interpreter/arm_interpreter.cpp +++ b/src/core/arm/interpreter/arm_interpreter.cpp @@ -4,7 +4,7 @@ #include "core/arm/interpreter/arm_interpreter.h" -const static cpu_config_t s_arm11_cpu_info = { +const static cpu_config_t arm11_cpu_info = { "armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE }; @@ -17,7 +17,7 @@ ARM_Interpreter::ARM_Interpreter() { ARMul_NewState(state); state->abort_model = 0; - state->cpu = (cpu_config_t*)&s_arm11_cpu_info; + state->cpu = (cpu_config_t*)&arm11_cpu_info; state->bigendSig = LOW; ARMul_SelectProcessor(state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop); diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 1e82883a2..64760500c 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -7,8 +7,8 @@ #include "common/common.h" #include "core/arm/arm_interface.h" -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armemu.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" class ARM_Interpreter : virtual public ARM_Interface { public: diff --git a/src/core/arm/interpreter/armcopro.cpp b/src/core/arm/interpreter/armcopro.cpp index 6a75e6601..ee9fa255a 100644 --- a/src/core/arm/interpreter/armcopro.cpp +++ b/src/core/arm/interpreter/armcopro.cpp @@ -16,10 +16,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armos.h" -#include "core/arm/interpreter/armemu.h" -#include "core/arm/interpreter/vfp/vfp.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armos.h" +#include "core/arm/skyeye_common/armemu.h" +#include "core/arm/skyeye_common/vfp/vfp.h" //chy 2005-07-08 //#include "ansidecl.h" diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index f9130ef88..7ffc16429 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -18,9 +18,9 @@ //#include // DEBUG() -#include "arm_regformat.h" -#include "armdefs.h" -#include "armemu.h" +#include "core/arm/skyeye_common/arm_regformat.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" #include "core/hle/hle.h" //#include "svc.h" diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index 6fbab3bfb..03bca2870 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -17,8 +17,8 @@ //#include -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armemu.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" /***************************************************************************\ * Definitions for the emulator architecture * diff --git a/src/core/arm/interpreter/armmmu.cpp b/src/core/arm/interpreter/armmmu.cpp index 242e6a83c..98fc17ddb 100644 --- a/src/core/arm/interpreter/armmmu.cpp +++ b/src/core/arm/interpreter/armmmu.cpp @@ -20,10 +20,10 @@ #include #include -#include "armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" /* two header for arm disassemble */ //#include "skyeye_arch.h" -#include "armcpu.h" +#include "core/arm/skyeye_common/armcpu.h" extern mmu_ops_t xscale_mmu_ops; diff --git a/src/core/arm/interpreter/armos.cpp b/src/core/arm/interpreter/armos.cpp index 43484ee5f..90eb20acc 100644 --- a/src/core/arm/interpreter/armos.cpp +++ b/src/core/arm/interpreter/armos.cpp @@ -28,7 +28,7 @@ fun, and definign VAILDATE will define SWI 1 to enter SVC mode, and SWI #include #include #include -#include "skyeye_defs.h" +#include "core/arm/skyeye_common/skyeye_defs.h" #ifndef __USE_LARGEFILE64 #define __USE_LARGEFILE64 /* When use 64 bit large file need define it! for stat64*/ #endif @@ -74,9 +74,9 @@ extern int _fisatty (FILE *); #endif #endif -#include "armdefs.h" -#include "armos.h" -#include "armemu.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armos.h" +#include "core/arm/skyeye_common/armemu.h" #ifndef NOOS #ifndef VALIDATE diff --git a/src/core/arm/interpreter/armvirt.cpp b/src/core/arm/interpreter/armvirt.cpp index a072b73be..eb3c86cb4 100644 --- a/src/core/arm/interpreter/armvirt.cpp +++ b/src/core/arm/interpreter/armvirt.cpp @@ -23,8 +23,8 @@ table. The routines PutWord and GetWord implement this. Pages are never freed as they might be needed again. A single area of memory may be defined to generate aborts. */ -#include "armdefs.h" -#include "skyeye_defs.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/skyeye_defs.h" //#include "code_cov.h" #ifdef VALIDATE /* for running the validate suite */ diff --git a/src/core/arm/interpreter/mmu/arm1176jzf_s_mmu.cpp b/src/core/arm/interpreter/mmu/arm1176jzf_s_mmu.cpp index a32f076b9..07951e0e6 100644 --- a/src/core/arm/interpreter/mmu/arm1176jzf_s_mmu.cpp +++ b/src/core/arm/interpreter/mmu/arm1176jzf_s_mmu.cpp @@ -24,9 +24,9 @@ #include "core/mem_map.h" -#include "core/arm/interpreter/skyeye_defs.h" +#include "core/arm/skyeye_common/skyeye_defs.h" -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" //#include "bank_defs.h" #if 0 #define TLB_SIZE 1024 * 1024 diff --git a/src/core/arm/interpreter/mmu/cache.cpp b/src/core/arm/interpreter/mmu/cache.cpp index f3c4e0531..cfbc31f1e 100644 --- a/src/core/arm/interpreter/mmu/cache.cpp +++ b/src/core/arm/interpreter/mmu/cache.cpp @@ -1,4 +1,4 @@ -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" /* mmu cache init * diff --git a/src/core/arm/interpreter/mmu/maverick.cpp b/src/core/arm/interpreter/mmu/maverick.cpp index adcc2efb5..a07d4742b 100644 --- a/src/core/arm/interpreter/mmu/maverick.cpp +++ b/src/core/arm/interpreter/mmu/maverick.cpp @@ -18,8 +18,8 @@ #include -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armemu.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" /*#define CIRRUS_DEBUG 1 */ diff --git a/src/core/arm/interpreter/mmu/rb.cpp b/src/core/arm/interpreter/mmu/rb.cpp index 07b11e311..600c9d8c8 100644 --- a/src/core/arm/interpreter/mmu/rb.cpp +++ b/src/core/arm/interpreter/mmu/rb.cpp @@ -1,4 +1,4 @@ -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" /*chy 2004-06-06, fix bug found by wenye@cs.ucsb.edu*/ ARMword rb_masks[] = { diff --git a/src/core/arm/interpreter/mmu/sa_mmu.cpp b/src/core/arm/interpreter/mmu/sa_mmu.cpp index eff5002de..27f9ec8e0 100644 --- a/src/core/arm/interpreter/mmu/sa_mmu.cpp +++ b/src/core/arm/interpreter/mmu/sa_mmu.cpp @@ -21,7 +21,7 @@ #include #include -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" /** * The interface of read data from bus diff --git a/src/core/arm/interpreter/mmu/tlb.cpp b/src/core/arm/interpreter/mmu/tlb.cpp index ca60ac1a1..88c2a8bc5 100644 --- a/src/core/arm/interpreter/mmu/tlb.cpp +++ b/src/core/arm/interpreter/mmu/tlb.cpp @@ -1,6 +1,6 @@ #include -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" ARMword tlb_masks[] = { 0x00000000, /* TLB_INVALID */ diff --git a/src/core/arm/interpreter/mmu/wb.cpp b/src/core/arm/interpreter/mmu/wb.cpp index 82c0cec02..5ddda41ee 100644 --- a/src/core/arm/interpreter/mmu/wb.cpp +++ b/src/core/arm/interpreter/mmu/wb.cpp @@ -1,4 +1,4 @@ -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" /* wb_init * @wb_t :wb_t to init diff --git a/src/core/arm/interpreter/mmu/xscale_copro.cpp b/src/core/arm/interpreter/mmu/xscale_copro.cpp index 433ce8e02..cf91fd933 100644 --- a/src/core/arm/interpreter/mmu/xscale_copro.cpp +++ b/src/core/arm/interpreter/mmu/xscale_copro.cpp @@ -21,8 +21,8 @@ #include #include -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armemu.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" /*#include "pxa.h" */ diff --git a/src/core/arm/interpreter/thumbemu.cpp b/src/core/arm/interpreter/thumbemu.cpp index 032d84b65..f7f11f714 100644 --- a/src/core/arm/interpreter/thumbemu.cpp +++ b/src/core/arm/interpreter/thumbemu.cpp @@ -19,7 +19,7 @@ instruction into its corresponding ARM instruction, and using the existing ARM simulator. */ -#include "skyeye_defs.h" +#include "core/arm/skyeye_common/skyeye_defs.h" #ifndef MODET /* required for the Thumb instruction support */ #if 1 @@ -29,9 +29,9 @@ existing ARM simulator. */ #endif #endif -#include "armdefs.h" -#include "armemu.h" -#include "armos.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" +#include "core/arm/skyeye_common/armos.h" /* Decode a 16bit Thumb instruction. The instruction is in the low diff --git a/src/core/arm/interpreter/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h similarity index 100% rename from src/core/arm/interpreter/arm_regformat.h rename to 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 similarity index 100% rename from src/core/arm/interpreter/armcpu.h rename to src/core/arm/skyeye_common/armcpu.h diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/skyeye_common/armdefs.h similarity index 99% rename from src/core/arm/interpreter/armdefs.h rename to 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 similarity index 99% rename from src/core/arm/interpreter/armemu.h rename to 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 similarity index 100% rename from src/core/arm/interpreter/armmmu.h rename to src/core/arm/skyeye_common/armmmu.h diff --git a/src/core/arm/interpreter/armos.h b/src/core/arm/skyeye_common/armos.h similarity index 100% rename from src/core/arm/interpreter/armos.h rename to 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 similarity index 100% rename from src/core/arm/interpreter/skyeye_defs.h rename to 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 similarity index 100% rename from src/core/arm/interpreter/vfp/asm_vfp.h rename to 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 similarity index 91% rename from src/core/arm/interpreter/vfp/vfp.cpp rename to 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 similarity index 97% rename from src/core/arm/interpreter/vfp/vfp.h rename to 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 similarity index 99% rename from src/core/arm/interpreter/vfp/vfp_helper.h rename to 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 #include -#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 similarity index 99% rename from src/core/arm/interpreter/vfp/vfpdouble.cpp rename to 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 similarity index 100% rename from src/core/arm/interpreter/vfp/vfpinstr.cpp rename to 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 similarity index 99% rename from src/core/arm/interpreter/vfp/vfpsingle.cpp rename to 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, diff --git a/src/core/core.h b/src/core/core.h index 9c72c8b3f..87da252b8 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -5,7 +5,7 @@ #pragma once #include "core/arm/arm_interface.h" -#include "core/arm/interpreter/armdefs.h" +#include "core/arm/skyeye_common/armdefs.h" ////////////////////////////////////////////////////////////////////////////////////////////////////