citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

ARM: Updated dyncom core to use fast label lookup table on clang.

This commit is contained in:
bunnei 2014-10-07 17:55:26 -04:00
parent 53a22b84da
commit 130efd461d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -3751,7 +3751,9 @@ void InterpreterMainLoop(ARMul_State* state)
inst_base = (arm_inst *)&inst_buf[ptr] inst_base = (arm_inst *)&inst_buf[ptr]
#define INC_PC(l) ptr += sizeof(arm_inst) + l #define INC_PC(l) ptr += sizeof(arm_inst) + l
#ifdef __GNUC__ // GCC and Clang have a C++ extension to support a lookup table of labels. Otherwise, fallback to a
// clunky switch statement.
#if defined __GNUC__ || defined __clang__
#define GOTO_NEXT_INST goto *InstLabel[inst_base->idx] #define GOTO_NEXT_INST goto *InstLabel[inst_base->idx]
#else #else
#define GOTO_NEXT_INST switch(inst_base->idx) { \ #define GOTO_NEXT_INST switch(inst_base->idx) { \
@ -3996,7 +3998,9 @@ void InterpreterMainLoop(ARMul_State* state)
//arm_processor *cpu = (arm_processor *)get_cast_conf_obj(core->cpu_data, "arm_core_t"); //arm_processor *cpu = (arm_processor *)get_cast_conf_obj(core->cpu_data, "arm_core_t");
arm_processor *cpu = state; //(arm_processor *)(core->cpu_data->obj); arm_processor *cpu = state; //(arm_processor *)(core->cpu_data->obj);
#if __GNUC__ // GCC and Clang have a C++ extension to support a lookup table of labels. Otherwise, fallback
// to a clunky switch statement.
#if defined __GNUC__ || defined __clang__
void *InstLabel[] = { void *InstLabel[] = {
#define VFP_INTERPRETER_LABEL #define VFP_INTERPRETER_LABEL
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp" #include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
@ -6543,7 +6547,7 @@ void InterpreterMainLoop(ARMul_State* state)
DEBUG_LOG(ARM11, "[%llx]\n", InstLabel[i]); DEBUG_LOG(ARM11, "[%llx]\n", InstLabel[i]);
DEBUG_LOG(ARM11, "InstLabel:%d\n", sizeof(InstLabel)); DEBUG_LOG(ARM11, "InstLabel:%d\n", sizeof(InstLabel));
#endif #endif
#ifdef __GNUC__ #if defined __GNUC__ || defined __clang__
InterpreterInitInstLength((unsigned long long int *)InstLabel, sizeof(InstLabel)); InterpreterInitInstLength((unsigned long long int *)InstLabel, sizeof(InstLabel));
#endif #endif
#if 0 #if 0