From a57838c94e7f37758ca59322f1b31d2da4e9e64c Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Mon, 21 Jun 2021 11:07:44 -0600 Subject: [PATCH] update core --- mupen64plus-core/src/api/vidext.c | 2 - .../src/asm_defines/asm_defines.c | 2 - .../src/device/r4300/cached_interp.c | 5 +- mupen64plus-core/src/device/r4300/cp0.c | 14 +- mupen64plus-core/src/device/r4300/cp0.h | 3 +- mupen64plus-core/src/device/r4300/fpu.h | 48 +- mupen64plus-core/src/device/r4300/interrupt.c | 6 +- .../src/device/r4300/mips_instructions.def | 47 +- .../device/r4300/new_dynarec/arm/assem_arm.c | 1286 +++----- .../r4300/new_dynarec/arm/linkage_arm.S | 149 +- .../r4300/new_dynarec/arm64/assem_arm64.c | 1056 ++----- .../r4300/new_dynarec/arm64/assem_arm64.h | 2 - .../r4300/new_dynarec/arm64/linkage_arm64.S | 162 +- .../device/r4300/new_dynarec/new_dynarec.c | 2663 +++++++++++------ .../device/r4300/new_dynarec/new_dynarec.h | 2 - .../src/device/r4300/new_dynarec/recomp_dbg.c | 27 +- .../device/r4300/new_dynarec/x64/assem_x64.c | 1067 ++----- .../r4300/new_dynarec/x64/linkage_x64.asm | 166 +- .../device/r4300/new_dynarec/x86/assem_x86.c | 1327 +++----- .../r4300/new_dynarec/x86/linkage_x86.asm | 161 +- 20 files changed, 3440 insertions(+), 4755 deletions(-) diff --git a/mupen64plus-core/src/api/vidext.c b/mupen64plus-core/src/api/vidext.c index 04d54d1..b3ca6cb 100644 --- a/mupen64plus-core/src/api/vidext.c +++ b/mupen64plus-core/src/api/vidext.c @@ -313,7 +313,6 @@ EXPORT m64p_error CALL VidExt_SetVideoMode(int Width, int Height, int BitsPerPix if (SDL_GL_SetSwapInterval(l_SwapControl) != 0) { DebugMessage(M64MSG_ERROR, "SDL swap interval (VSync) set failed: %s", SDL_GetError()); - return M64ERR_SYSTEM_FAIL; } #endif @@ -409,7 +408,6 @@ EXPORT m64p_error CALL VidExt_SetVideoModeWithRate(int Width, int Height, int Re if (SDL_GL_SetSwapInterval(l_SwapControl) != 0) { DebugMessage(M64MSG_ERROR, "SDL swap interval (VSync) set failed: %s", SDL_GetError()); - return M64ERR_SYSTEM_FAIL; } l_Fullscreen = (ScreenMode == M64VIDEO_FULLSCREEN); diff --git a/mupen64plus-core/src/asm_defines/asm_defines.c b/mupen64plus-core/src/asm_defines/asm_defines.c index 727057d..6ac2280 100644 --- a/mupen64plus-core/src/asm_defines/asm_defines.c +++ b/mupen64plus-core/src/asm_defines/asm_defines.c @@ -127,7 +127,6 @@ DEFINE(cached_interp, invalid_code); DEFINE(r4300_core, new_dynarec_hot_state); DEFINE(r4300_core, extra_memory); DEFINE(new_dynarec_hot_state, dynarec_local); -DEFINE(new_dynarec_hot_state, next_interrupt); DEFINE(new_dynarec_hot_state, cycle_count); DEFINE(new_dynarec_hot_state, pending_exception); DEFINE(new_dynarec_hot_state, pcaddr); @@ -149,6 +148,5 @@ DEFINE(new_dynarec_hot_state, rs); DEFINE(new_dynarec_hot_state, rt); DEFINE(new_dynarec_hot_state, rd); DEFINE(new_dynarec_hot_state, mini_ht); -DEFINE(new_dynarec_hot_state, restore_candidate); DEFINE(new_dynarec_hot_state, memory_map); #endif diff --git a/mupen64plus-core/src/device/r4300/cached_interp.c b/mupen64plus-core/src/device/r4300/cached_interp.c index 9c685eb..184dac1 100644 --- a/mupen64plus-core/src/device/r4300/cached_interp.c +++ b/mupen64plus-core/src/device/r4300/cached_interp.c @@ -57,7 +57,10 @@ if (r4300->emumode != EMUMODE_DYNAREC) \ (*r4300_pc_struct(r4300)) += x; \ else \ - assert(*r4300_pc_struct(r4300) == &r4300->new_dynarec_hot_state.fake_pc) + { \ + assert(*r4300_pc_struct(r4300) == &r4300->new_dynarec_hot_state.fake_pc); \ + r4300->new_dynarec_hot_state.pcaddr += x*4; \ + } #else #define ADD_TO_PC(x) (*r4300_pc_struct(r4300)) += x; #endif diff --git a/mupen64plus-core/src/device/r4300/cp0.c b/mupen64plus-core/src/device/r4300/cp0.c index fd2cb1a..2241ef6 100644 --- a/mupen64plus-core/src/device/r4300/cp0.c +++ b/mupen64plus-core/src/device/r4300/cp0.c @@ -97,12 +97,7 @@ uint32_t* r4300_cp0_last_addr(struct cp0* cp0) unsigned int* r4300_cp0_next_interrupt(struct cp0* cp0) { -#ifndef NEW_DYNAREC return &cp0->next_interrupt; -#else - /* New dynarec uses a different memory layout */ - return &cp0->new_dynarec_hot_state->next_interrupt; -#endif } int* r4300_cp0_cycle_count(struct cp0* cp0) @@ -144,6 +139,8 @@ void cp0_update_count(struct r4300_core* r4300) cp0->last_addr = *r4300_pc(r4300); #ifdef NEW_DYNAREC } + else + cp0_regs[CP0_COUNT_REG] = *r4300_cp0_next_interrupt(cp0) + *r4300_cp0_cycle_count(cp0); #endif #ifdef COMPARE_CORE @@ -159,17 +156,14 @@ void cp0_update_count(struct r4300_core* r4300) static void exception_epilog(struct r4300_core* r4300) { #ifndef NO_ASM +#ifndef NEW_DYNAREC if (r4300->emumode == EMUMODE_DYNAREC) { -#ifndef NEW_DYNAREC dyna_jump(); if (!r4300->recomp.dyna_interp) { r4300->delay_slot = 0; } -#else - /* ??? for new_dynarec dyna_interp is always 0 so that means delay_slot = 0 path is always taken */ - r4300->delay_slot = 0; -#endif } #endif +#endif #ifndef NEW_DYNAREC if (r4300->emumode != EMUMODE_DYNAREC || r4300->recomp.dyna_interp) diff --git a/mupen64plus-core/src/device/r4300/cp0.h b/mupen64plus-core/src/device/r4300/cp0.h index 14fea6e..beab717 100644 --- a/mupen64plus-core/src/device/r4300/cp0.h +++ b/mupen64plus-core/src/device/r4300/cp0.h @@ -185,9 +185,10 @@ struct cp0 unsigned int interrupt_unsafe_state; struct interrupt_queue q; + unsigned int next_interrupt; + #ifndef NEW_DYNAREC /* New dynarec uses a different memory layout */ - unsigned int next_interrupt; int cycle_count; #endif diff --git a/mupen64plus-core/src/device/r4300/fpu.h b/mupen64plus-core/src/device/r4300/fpu.h index 7d30624..e8da0c4 100644 --- a/mupen64plus-core/src/device/r4300/fpu.h +++ b/mupen64plus-core/src/device/r4300/fpu.h @@ -56,9 +56,9 @@ static __inline float truncf(float x) { return (float)(int)x; } #define FCR31_CMP_BIT UINT32_C(0x800000) -M64P_FPU_INLINE void set_rounding(const uint32_t* fcr31) +M64P_FPU_INLINE void set_rounding(uint32_t fcr31) { - switch(*fcr31 & 3) { + switch(fcr31 & 3) { case 0: /* Round to nearest, or to even if equidistant */ fesetround(FE_TONEAREST); break; @@ -74,7 +74,7 @@ M64P_FPU_INLINE void set_rounding(const uint32_t* fcr31) } } -M64P_FPU_INLINE void cvt_s_w(const uint32_t* fcr31, const int32_t* source, float* dest) +M64P_FPU_INLINE void cvt_s_w(uint32_t fcr31, const int32_t* source, float* dest) { set_rounding(fcr31); *dest = (float)*source; @@ -83,12 +83,12 @@ M64P_FPU_INLINE void cvt_d_w(const int32_t* source, double* dest) { *dest = (double)*source; } -M64P_FPU_INLINE void cvt_s_l(const uint32_t* fcr31, const int64_t* source, float* dest) +M64P_FPU_INLINE void cvt_s_l(uint32_t fcr31, const int64_t* source, float* dest) { set_rounding(fcr31); *dest = (float)*source; } -M64P_FPU_INLINE void cvt_d_l(const uint32_t* fcr31, const int64_t* source, double* dest) +M64P_FPU_INLINE void cvt_d_l(uint32_t fcr31, const int64_t* source, double* dest) { set_rounding(fcr31); *dest = (double)*source; @@ -97,7 +97,7 @@ M64P_FPU_INLINE void cvt_d_s(const float* source, double* dest) { *dest = (double)*source; } -M64P_FPU_INLINE void cvt_s_d(const uint32_t* fcr31, const double* source, float* dest) +M64P_FPU_INLINE void cvt_s_d(uint32_t fcr31, const double* source, float* dest) { set_rounding(fcr31); *dest = (float)*source; @@ -230,9 +230,9 @@ M64P_FPU_INLINE void floor_w_d(const double* source, int32_t* dest) *dest = (int32_t)floor(*source); } -M64P_FPU_INLINE void cvt_w_s(const uint32_t* fcr31, const float* source, int32_t* dest) +M64P_FPU_INLINE void cvt_w_s(uint32_t fcr31, const float* source, int32_t* dest) { - switch(*fcr31 & 3) + switch(fcr31 & 3) { case 0: round_w_s(source, dest); return; case 1: trunc_w_s(source, dest); return; @@ -240,9 +240,9 @@ M64P_FPU_INLINE void cvt_w_s(const uint32_t* fcr31, const float* source, int32_t case 3: floor_w_s(source, dest); return; } } -M64P_FPU_INLINE void cvt_w_d(const uint32_t* fcr31, const double* source, int32_t* dest) +M64P_FPU_INLINE void cvt_w_d(uint32_t fcr31, const double* source, int32_t* dest) { - switch(*fcr31 & 3) + switch(fcr31 & 3) { case 0: round_w_d(source, dest); return; case 1: trunc_w_d(source, dest); return; @@ -250,9 +250,9 @@ M64P_FPU_INLINE void cvt_w_d(const uint32_t* fcr31, const double* source, int32_ case 3: floor_w_d(source, dest); return; } } -M64P_FPU_INLINE void cvt_l_s(const uint32_t* fcr31, const float* source, int64_t* dest) +M64P_FPU_INLINE void cvt_l_s(uint32_t fcr31, const float* source, int64_t* dest) { - switch(*fcr31 & 3) + switch(fcr31 & 3) { case 0: round_l_s(source, dest); return; case 1: trunc_l_s(source, dest); return; @@ -260,9 +260,9 @@ M64P_FPU_INLINE void cvt_l_s(const uint32_t* fcr31, const float* source, int64_t case 3: floor_l_s(source, dest); return; } } -M64P_FPU_INLINE void cvt_l_d(const uint32_t* fcr31, const double* source, int64_t* dest) +M64P_FPU_INLINE void cvt_l_d(uint32_t fcr31, const double* source, int64_t* dest) { - switch(*fcr31 & 3) + switch(fcr31 & 3) { case 0: round_l_d(source, dest); return; case 1: trunc_l_d(source, dest); return; @@ -496,27 +496,27 @@ M64P_FPU_INLINE void c_ngt_d(uint32_t* fcr31, const double* source, const double } -M64P_FPU_INLINE void add_s(const uint32_t* fcr31, const float* source1, const float* source2, float* target) +M64P_FPU_INLINE void add_s(uint32_t fcr31, const float* source1, const float* source2, float* target) { set_rounding(fcr31); *target = *source1 + *source2; } -M64P_FPU_INLINE void sub_s(const uint32_t* fcr31, const float* source1, const float* source2, float* target) +M64P_FPU_INLINE void sub_s(uint32_t fcr31, const float* source1, const float* source2, float* target) { set_rounding(fcr31); *target = *source1 - *source2; } -M64P_FPU_INLINE void mul_s(const uint32_t* fcr31, const float* source1, const float* source2, float* target) +M64P_FPU_INLINE void mul_s(uint32_t fcr31, const float* source1, const float* source2, float* target) { set_rounding(fcr31); *target = *source1 * *source2; } -M64P_FPU_INLINE void div_s(const uint32_t* fcr31, const float* source1, const float* source2, float* target) +M64P_FPU_INLINE void div_s(uint32_t fcr31, const float* source1, const float* source2, float* target) { set_rounding(fcr31); *target = *source1 / *source2; } -M64P_FPU_INLINE void sqrt_s(const uint32_t* fcr31, const float* source, float* target) +M64P_FPU_INLINE void sqrt_s(uint32_t fcr31, const float* source, float* target) { set_rounding(fcr31); *target = sqrtf(*source); @@ -533,27 +533,27 @@ M64P_FPU_INLINE void neg_s(const float* source, float* target) { *target = - *source; } -M64P_FPU_INLINE void add_d(const uint32_t* fcr31, const double* source1, const double* source2, double* target) +M64P_FPU_INLINE void add_d(uint32_t fcr31, const double* source1, const double* source2, double* target) { set_rounding(fcr31); *target = *source1 + *source2; } -M64P_FPU_INLINE void sub_d(const uint32_t* fcr31, const double* source1, const double* source2, double* target) +M64P_FPU_INLINE void sub_d(uint32_t fcr31, const double* source1, const double* source2, double* target) { set_rounding(fcr31); *target = *source1 - *source2; } -M64P_FPU_INLINE void mul_d(const uint32_t* fcr31, const double* source1, const double* source2, double* target) +M64P_FPU_INLINE void mul_d(uint32_t fcr31, const double* source1, const double* source2, double* target) { set_rounding(fcr31); *target = *source1 * *source2; } -M64P_FPU_INLINE void div_d(const uint32_t* fcr31, const double* source1, const double* source2, double* target) +M64P_FPU_INLINE void div_d(uint32_t fcr31, const double* source1, const double* source2, double* target) { set_rounding(fcr31); *target = *source1 / *source2; } -M64P_FPU_INLINE void sqrt_d(const uint32_t* fcr31, const double* source, double* target) +M64P_FPU_INLINE void sqrt_d(uint32_t fcr31, const double* source, double* target) { set_rounding(fcr31); *target = sqrt(*source); diff --git a/mupen64plus-core/src/device/r4300/interrupt.c b/mupen64plus-core/src/device/r4300/interrupt.c index 06b140d..dd37e6c 100644 --- a/mupen64plus-core/src/device/r4300/interrupt.c +++ b/mupen64plus-core/src/device/r4300/interrupt.c @@ -158,15 +158,11 @@ void add_interrupt_event_count(struct cp0* cp0, int type, unsigned int count) { cp0->q.first = event; event->next = NULL; - *cp0_next_interrupt = cp0->q.first->data.count; - *cp0_cycle_count = cp0_regs[CP0_COUNT_REG] - cp0->q.first->data.count; } else if (before_event(cp0, count, cp0->q.first->data.count, cp0->q.first->data.type)) { event->next = cp0->q.first; cp0->q.first = event; - *cp0_next_interrupt = cp0->q.first->data.count; - *cp0_cycle_count = cp0_regs[CP0_COUNT_REG] - cp0->q.first->data.count; } else { @@ -188,6 +184,8 @@ void add_interrupt_event_count(struct cp0* cp0, int type, unsigned int count) e->next = event; } } + *cp0_next_interrupt = cp0->q.first->data.count; + *cp0_cycle_count = cp0_regs[CP0_COUNT_REG] - cp0->q.first->data.count; } void remove_interrupt_event(struct cp0* cp0) diff --git a/mupen64plus-core/src/device/r4300/mips_instructions.def b/mupen64plus-core/src/device/r4300/mips_instructions.def index 6114378..89218aa 100644 --- a/mupen64plus-core/src/device/r4300/mips_instructions.def +++ b/mupen64plus-core/src/device/r4300/mips_instructions.def @@ -720,7 +720,7 @@ DECLARE_INSTRUCTION(MULT) { DECLARE_R4300 int64_t temp; - temp = (uint64_t) rrs * (uint64_t) rrt; + temp = rrs32 * (int64_t)rrt32; *r4300_mult_hi(r4300) = temp >> 32; *r4300_mult_lo(r4300) = SE32(temp); ADD_TO_PC(1); @@ -1296,14 +1296,13 @@ DECLARE_INSTRUCTION(MTC0) set_fpr_pointers(&r4300->cp1, rrt32); cp0_regs[CP0_STATUS_REG] = rrt32; - cp0_update_count(r4300); ADD_TO_PC(1); + cp0_update_count(r4300); r4300_check_interrupt(r4300, CP0_CAUSE_IP2, r4300->mi->regs[MI_INTR_REG] & r4300->mi->regs[MI_INTR_MASK_REG]); // ??? r4300->cp0.interrupt_unsafe_state |= INTR_UNSAFE_R4300; if (*cp0_cycle_count >= 0) { gen_interrupt(r4300); } r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_R4300; - ADD_TO_PC(-1); - break; + return; case CP0_CAUSE_REG: cp0_regs[CP0_CAUSE_REG] &= ~(CP0_CAUSE_IP0 | CP0_CAUSE_IP1); cp0_regs[CP0_CAUSE_REG] |= rrt32 & (CP0_CAUSE_IP0 | CP0_CAUSE_IP1); @@ -1406,11 +1405,11 @@ DECLARE_INSTRUCTION(CFC1) if (check_cop1_unusable(r4300)) { return; } if (rfs==31) { - rrt32 = SE32((*r4300_cp1_fcr31(&r4300->cp1))); + rrt = SE32((*r4300_cp1_fcr31(&r4300->cp1))); } if (rfs==0) { - rrt32 = SE32((*r4300_cp1_fcr0(&r4300->cp1))); + rrt = SE32((*r4300_cp1_fcr0(&r4300->cp1))); } ADD_TO_PC(1); } @@ -1467,7 +1466,7 @@ DECLARE_INSTRUCTION(ADD_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - add_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + add_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1475,7 +1474,7 @@ DECLARE_INSTRUCTION(ADD_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - add_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + add_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1487,7 +1486,7 @@ DECLARE_INSTRUCTION(DIV_S) { DebugMessage(M64MSG_ERROR, "DIV_S by 0"); } - div_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + div_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1504,7 +1503,7 @@ DECLARE_INSTRUCTION(DIV_D) DebugMessage(M64MSG_ERROR, "DIV_D by 0"); //return; } - div_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + div_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1528,7 +1527,7 @@ DECLARE_INSTRUCTION(MUL_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - mul_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + mul_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1536,7 +1535,7 @@ DECLARE_INSTRUCTION(MUL_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - mul_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + mul_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1560,7 +1559,7 @@ DECLARE_INSTRUCTION(SQRT_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - sqrt_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + sqrt_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1568,7 +1567,7 @@ DECLARE_INSTRUCTION(SQRT_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - sqrt_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + sqrt_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1576,7 +1575,7 @@ DECLARE_INSTRUCTION(SUB_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - sub_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + sub_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1584,7 +1583,7 @@ DECLARE_INSTRUCTION(SUB_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - sub_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + sub_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1720,7 +1719,7 @@ DECLARE_INSTRUCTION(CVT_S_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_s_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + cvt_s_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1728,7 +1727,7 @@ DECLARE_INSTRUCTION(CVT_S_W) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_s_w(r4300_cp1_fcr31(&r4300->cp1), (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + cvt_s_w(*r4300_cp1_fcr31(&r4300->cp1), (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1736,7 +1735,7 @@ DECLARE_INSTRUCTION(CVT_S_L) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_s_l(r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + cvt_s_l(*r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1760,7 +1759,7 @@ DECLARE_INSTRUCTION(CVT_D_L) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_d_l(r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + cvt_d_l(*r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1768,7 +1767,7 @@ DECLARE_INSTRUCTION(CVT_W_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_w_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + cvt_w_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1776,7 +1775,7 @@ DECLARE_INSTRUCTION(CVT_W_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_w_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); + cvt_w_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1784,7 +1783,7 @@ DECLARE_INSTRUCTION(CVT_L_S) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_l_s(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + cvt_l_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } @@ -1792,7 +1791,7 @@ DECLARE_INSTRUCTION(CVT_L_D) { DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } - cvt_l_d(r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); + cvt_l_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); ADD_TO_PC(1); } diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/arm/assem_arm.c b/mupen64plus-core/src/device/r4300/new_dynarec/arm/assem_arm.c index d027633..29e2ec3 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/arm/assem_arm.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/arm/assem_arm.c @@ -56,9 +56,7 @@ void invalidate_addr_r8(void); void invalidate_addr_r9(void); void invalidate_addr_r10(void); void invalidate_addr_r12(void); - -static void *dyna_linker(void * src, u_int vaddr); -static void *dyna_linker_ds(void * src, u_int vaddr); +void breakpoint(void); static void invalidate_addr(u_int addr); static u_int literals[1024][2]; @@ -76,11 +74,11 @@ static const u_int jump_vaddr_reg[16] = { (int)jump_vaddr_r8, (int)jump_vaddr_r9, (int)jump_vaddr_r10, - 0, + (int)breakpoint, (int)jump_vaddr_r12, - 0, - 0, - 0}; + (int)breakpoint, + (int)breakpoint, + (int)breakpoint}; static const u_int invalidate_addr_reg[16] = { (int)invalidate_addr_r0, @@ -94,15 +92,19 @@ static const u_int invalidate_addr_reg[16] = { (int)invalidate_addr_r8, (int)invalidate_addr_r9, (int)invalidate_addr_r10, - 0, + (int)breakpoint, (int)invalidate_addr_r12, - 0, - 0, - 0}; + (int)breakpoint, + (int)breakpoint, + (int)breakpoint}; static u_int jump_table_symbols[] = { (int)NULL /*TLBR*/, (int)NULL /*TLBP*/, + (int)NULL /*MULT*/, + (int)NULL /*MULTU*/, + (int)NULL /*DIV*/, + (int)NULL /*DIVU*/, (int)NULL /*DMULT*/, (int)NULL /*DMULTU*/, (int)NULL /*DDIV*/, @@ -113,7 +115,6 @@ static u_int jump_table_symbols[] = { (int)verify_code, (int)cc_interrupt, (int)fp_exception, - (int)fp_exception_ds, (int)jump_syscall, (int)jump_eret, (int)do_interrupt, @@ -227,6 +228,14 @@ static u_int jump_table_symbols[] = { (int)write_hword_new, (int)write_word_new, (int)write_dword_new, + (int)LWL_new, + (int)LWR_new, + (int)LDL_new, + (int)LDR_new, + (int)SWL_new, + (int)SWR_new, + (int)SDL_new, + (int)SDR_new, (int)breakpoint }; @@ -319,15 +328,11 @@ static void *add_pointer(void *src, void* addr) #ifdef ARMv5_ONLY assert((*(int*)((u_int)ptr2)&0x0ff00000)==0x05900000); //ldr assert((*(int*)((u_int)ptr2+4)&0x0ff00000)==0x05900000); //ldr - //assert((*(int*)((u_int)ptr2+8)&0x0f000000)==0x0b000000); //bl - //assert((*(int*)((u_int)ptr2+12)&0x0ff00000)==0x01a00000); //mov #else assert((*(int*)((u_int)ptr2)&0x0ff00000)==0x03000000); //movw assert((*(int*)((u_int)ptr2+4)&0x0ff00000)==0x03400000); //movt assert((*(int*)((u_int)ptr2+8)&0x0ff00000)==0x03000000); //movw assert((*(int*)((u_int)ptr2+12)&0x0ff00000)==0x03400000); //movt - //assert((*(int*)((u_int)ptr2+16)&0x0f000000)==0x0b000000); //bl - //assert((*(int*)((u_int)ptr2+20)&0x0ff00000)==0x01a00000); //mov #endif *ptr=(*ptr&0xFF000000)|((((u_int)addr-(u_int)ptr-8)<<6)>>8); cache_flush((void*)ptr, (void*)((u_int)ptr+4)); @@ -1115,6 +1120,8 @@ static void emit_storereg(int r, int hr) if((r&63)==LOREG) offset=fp_lo+((r&64)>>4); if(r==CCREG) offset=fp_cycle_count; if(r==FSREG) offset=fp_fcr31; + assert((r&63)!=CSREG); + assert((r&63)!=0); assert((r&63)<=CCREG); assert(offset<4096); assem_debug("str %s,fp+%d",regname[hr],offset); @@ -1268,10 +1275,12 @@ static void emit_addimm64_32(int rsh,int rsl,int imm,int rth,int rtl) output_w32(0xe2500000|rd_rn_rm(rtl,rsl,0)|armval); emit_sbcimm(rsh,0,rth); }else if(imm<0) { + assert(rsl!=HOST_TEMPREG); emit_movimm(-imm,HOST_TEMPREG); emit_subs(rsl,HOST_TEMPREG,rtl); emit_sbcimm(rsh,0,rth); }else if(imm>0) { + assert(rsl!=HOST_TEMPREG); emit_movimm(imm,HOST_TEMPREG); emit_adds(rsl,HOST_TEMPREG,rtl); emit_adcimm(rsh,0,rth); @@ -1316,6 +1325,7 @@ static void emit_andimm(int rs,int imm,int rt) output_w32(0xe6ff0070|rd_rn_rm(rt,0,rs)); #endif }else{ + assert(rs!=HOST_TEMPREG); assert(imm>0&&imm<65535); #ifdef ARMv5_ONLY assem_debug("mov r14,#%d",imm&0xFF00); @@ -1474,6 +1484,7 @@ static void emit_cmpimm(int rs,int imm) assem_debug("cmn %s,#%d",regname[rs],imm); output_w32(0xe3700000|rd_rn_rm(0,rs,0)|armval); }else if(imm>0) { + assert(rs!=HOST_TEMPREG); assert(imm<65536); #ifdef ARMv5_ONLY emit_movimm(imm,HOST_TEMPREG); @@ -1483,6 +1494,7 @@ static void emit_cmpimm(int rs,int imm) assem_debug("cmp %s,r14",regname[rs]); output_w32(0xe1500000|rd_rn_rm(0,rs,HOST_TEMPREG)); }else{ + assert(rs!=HOST_TEMPREG); assert(imm>-65536); #ifdef ARMv5_ONLY emit_movimm(-imm,HOST_TEMPREG); @@ -2246,6 +2258,14 @@ static void emit_cmov2imm_e_ne_compact(int imm1,int imm2,u_int rt) } } +// special case for checking pending_exception +static void emit_cmpmem_imm(int addr, int imm) +{ + assert(imm==0); + emit_readword(addr,HOST_TEMPREG); + emit_test(HOST_TEMPREG,HOST_TEMPREG); +} + #if !defined(HOST_IMM8) // special case for checking invalid_code static void emit_cmpmem_indexedsr12_imm(int addr,int r,int imm) @@ -2620,330 +2640,15 @@ static void emit_extjump2(int addr, int target, int linker) u_char *ptr=(u_char *)addr; assert((ptr[3]&0x0e)==0xa); #ifdef ARMv5_ONLY - emit_loadlp(target,1); - emit_loadlp(addr,0); + emit_loadlp(target,1); + emit_loadlp(addr,0); #else - emit_movw(target&0x0000FFFF,1); - emit_movt(target&0xFFFF0000,1); - emit_movw(addr&0x0000FFFF,0); - emit_movt(addr&0xFFFF0000,0); + emit_movw(target&0x0000FFFF,1); + emit_movt(target&0xFFFF0000,1); + emit_movw(addr&0x0000FFFF,0); + emit_movt(addr&0xFFFF0000,0); #endif - //assert(addr>=0x7000000&&addr<0x7FFFFFF); - //assert((target>=0x80000000&&target<0x80800000)||(target>0xA4000000&&target<0xA4001000)); -//DEBUG > -#ifdef DEBUG_CYCLE_COUNT - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.next_interrupt,HOST_TEMPREG); - emit_add(HOST_CCREG,HOST_TEMPREG,HOST_CCREG); - emit_writeword(HOST_CCREG,(u_int)&g_dev.r4300.new_dynarec_hot_state.cp0_regs[CP0_COUNT_REG]); -#endif -//DEBUG < - emit_call(linker); - emit_jmpreg(0); -} - -static void do_readstub(int n) -{ - assem_debug("do_readstub %x",start+stubs[n][3]*4); - literal_pool(256); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt; - - if(itype[i]==C1LS||itype[i]==LOADLR) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,FTEMP); - }else{ - rth=get_reg(i_regmap,rt1[i]|64); - rt=get_reg(i_regmap,rt1[i]); - } - assert(addr>=0); - int ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(int)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(int)read_hword_new; - if(type==LOADW_STUB) - ftable=(int)read_word_new; - if(type==LOADD_STUB) - ftable=(int)read_dword_new; - - emit_writeword(addr,(u_int)&g_dev.r4300.new_dynarec_hot_state.address); - save_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call((int)ftable); - restore_regs(reglist); - - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); - } - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_readstub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - int addr=get_reg(regmap,-1); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - assert(addr>=0); - - int ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(int)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(int)read_hword_new; - if(type==LOADW_STUB) - ftable=(int)read_word_new; - if(type==LOADD_STUB) - ftable=(int)read_dword_new; - - emit_writeword(addr,(u_int)&g_dev.r4300.new_dynarec_hot_state.address); - save_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call((int)ftable); - restore_regs(reglist); - - if((signed int)addr_const>=(signed int)0xC0000000) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); - } - } -} - -static void do_writestub(int n) -{ - assem_debug("do_writestub %x",start+stubs[n][3]*4); - literal_pool(256); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt,r; - - if(itype[i]==C1LS) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,r=FTEMP); - }else{ - rth=get_reg(i_regmap,rs2[i]|64); - rt=get_reg(i_regmap,r=rs2[i]); - } - assert(addr>=0); - assert(rt>=0); - int ftable=0; - emit_writeword(addr,(u_int)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(int)write_byte_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(int)write_hword_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(int)write_word_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(int)write_dword_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(r?rth:rt,((u_int)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - save_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call((int)ftable); - restore_regs(reglist); - - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - - if((cc=get_reg(i_regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_writestub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - int addr=get_reg(regmap,-1); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - assert(addr>=0); - assert(rt>=0); - - int ftable=0; - emit_writeword(addr,(u_int)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(int)write_byte_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(int)write_hword_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(int)write_word_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(int)write_dword_new; - emit_writeword(rt,(u_int)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(target?rth:rt,((u_int)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - save_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call((int)ftable); - restore_regs(reglist); - - if(((signed int)addr_const>=(signed int)0xC0000000)||((addr_const>>16)==0xa430)||((addr_const>>16)==0x8430)) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if((cc=get_reg(regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } -} - -static void do_unalignedwritestub(int n) -{ - set_jump_target(stubs[n][1],(int)out); - output_w32(0xef000000); - emit_jmp(stubs[n][2]); // return address + emit_jmp(linker); } static void do_invstub(int n) @@ -2987,30 +2692,9 @@ static void do_dirty_stub_ds(struct ll_entry * head) emit_call((int)&verify_code); } -static void do_cop1stub(int n) -{ - literal_pool(256); - assem_debug("do_cop1stub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(int)out); - int i=stubs[n][3]; - int rs=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - int ds=stubs[n][6]; - if(!ds) { - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - //if(i_regs!=®s[i]) DebugMessage(M64MSG_VERBOSE, "oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); - } - //else {DebugMessage(M64MSG_ERROR, "fp exception in delay slot");} - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - if(regs[i].regmap_entry[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_movimm(start+(i-ds)*4,0); // Get PC - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*ccadj[i],HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... - emit_jmp(ds?(int)fp_exception_ds:(int)fp_exception); -} - /* TLB */ -static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u_int addr) +static int do_tlb_r(int s,int ar,int map,int cache,int x,int c,u_int addr) { if(c) { if((signed int)addr>=(signed int)0xC0000000) { @@ -3031,8 +2715,6 @@ static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u } // Schedule this while we wait on the load //if(x) emit_xorimm(s,x,ar); - if(shift>=0) emit_shlimm(s,3,shift); - if(~a) emit_andimm(s,a,ar); emit_readword_dualindexedx4(FP,map,map); } return map; @@ -3046,15 +2728,6 @@ static int do_tlb_r_branch(int map, int c, u_int addr, int *jaddr) } return map; } -static int do_tlb_r_branch_debug(int map, int c, u_int addr, int *jaddr) -{ - if(!c) { - emit_test(map,map); - *jaddr=(int)out; - emit_js(0); - } - return map; -} static int do_tlb_w(int s,int ar,int map,int cache,int x,int c,u_int addr) { @@ -3089,14 +2762,6 @@ static void do_tlb_w_branch(int map, int c, u_int addr, int *jaddr) emit_jne(0); } } -static void do_tlb_w_branch_debug(int map, int c, u_int addr, int *jaddr) -{ - if(!c) { - emit_testimm(map,0x40000000); - *jaddr=(int)out; - emit_jne(0); - } -} // Generate the address of the memory_map entry, relative to dynarec_local static void generate_map_const(u_int addr,int reg) { @@ -3104,6 +2769,18 @@ static void generate_map_const(u_int addr,int reg) { emit_movimm((addr>>12)+(fp_memory_map>>2),reg); } +static void set_rounding_mode(int s,int temp) +{ + assert(temp>=0); + emit_andimm(s,3,temp); + emit_addimm(FP,fp_rounding_modes,HOST_TEMPREG); + emit_readword_dualindexedx4(HOST_TEMPREG,temp,temp); + output_w32(0xeef10a10|rd_rn_rm(HOST_TEMPREG,0,0)); /*Read FPSCR*/ + emit_andimm(HOST_TEMPREG,~0xc00000,HOST_TEMPREG); /*Clear RMode*/ + emit_or(temp,HOST_TEMPREG,HOST_TEMPREG); /*Set RMode*/ + output_w32(0xeee10a10|rd_rn_rm(HOST_TEMPREG,0,0)); /*Write FPSCR*/ +} + /* Special assem */ static void shift_assemble_arm(int i,struct regstat *i_regs) @@ -3215,348 +2892,186 @@ static void shift_assemble_arm(int i,struct regstat *i_regs) static void loadlr_assemble_arm(int i,struct regstat *i_regs) { - int s,th,tl,temp,temp2,addr,map=-1,cache=-1; - int offset; - int jaddr=0; - int memtarget,c=0; + signed char s,th,tl,temp,temp2,temp2h,addr,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; + intptr_t jaddr=0; u_int hr,reglist=0; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); temp=get_reg(i_regs->regmap,-1); temp2=get_reg(i_regs->regmap,FTEMP); + temp2h=get_reg(i_regs->regmap,FTEMP|64); addr=get_reg(i_regs->regmap,AGEN1+(i&1)); assert(addr<0); + assert(temp>=0); + assert(temp2>=0); offset=imm[i]; + for(hr=0;hrregmap[hr]>=0) reglist|=1<=0) { c=(i_regs->wasconst>>s)&1; - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } + if(offset||s<0||c) addr=temp2; + else addr=s; + int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg + + switch(opcode[i]) { + case 0x22: type=LOADWL_STUB; break; + case 0x26: type=LOADWR_STUB; break; + case 0x1A: type=LOADDL_STUB; break; + case 0x1B: type=LOADDR_STUB; break; + } + +#ifndef INTERPRET_LOADLR if(!using_tlb) { - if(!c) { - emit_shlimm(addr,3,temp); - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_andimm(addr,0xFFFFFFFC,temp2); // LWL/LWR - }else{ - emit_andimm(addr,0xFFFFFFF8,temp2); // LDL/LDR - } + if(!c) { emit_cmpimm(addr,0x800000); - jaddr=(int)out; + jaddr=(intptr_t)out; emit_jno(0); - #ifdef RAM_OFFSET + } + #ifdef RAM_OFFSET + if(!c&&!dummy) { map=get_reg(i_regs->regmap,ROREG); if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); - #endif - } - else { - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_movimm(((constmap[i][s]+offset)<<3)&24,temp); // LWL/LWR - }else{ - emit_movimm(((constmap[i][s]+offset)<<3)&56,temp); // LDL/LDR - } } + #endif }else{ // using tlb - int a; - if(c) { - a=-1; - }else if (opcode[i]==0x22||opcode[i]==0x26) { - a=0xFFFFFFFC; // LWL/LWR - }else{ - a=0xFFFFFFF8; // LDL/LDR - } map=get_reg(i_regs->regmap,TLREG); - cache=get_reg(i_regs->regmap,MMREG); // Get cached offset to memory_map + cache=get_reg(i_regs->regmap,MMREG); assert(map>=0); reglist&=~(1<regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { + if((!c||memtarget)&&!dummy) { + if(opcode[i]==0x22||opcode[i]==0x26) { // LWL/LWR assert(tl>=0); - emit_andimm(temp,24,temp); - if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR - emit_movimm(-1,HOST_TEMPREG); - if (opcode[i]==0x26) { - emit_shr(temp2,temp,temp2); - emit_bic_lsr(tl,HOST_TEMPREG,temp,tl); - }else{ - emit_shl(temp2,temp,temp2); - emit_bic_lsl(tl,HOST_TEMPREG,temp,tl); - } - emit_or(temp2,tl,tl); - } - //emit_storereg(rt1[i],tl); // DEBUG - } - if (opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR - int temp2h=get_reg(i_regs->regmap,FTEMP|64); - if(!c||memtarget) { - //if(th>=0) emit_readword_indexed((int)g_dev.rdram.dram-0x80000000,temp2,temp2h); - //emit_readword_indexed((int)g_dev.rdram.dram-0x7FFFFFFC,temp2,temp2); - emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); - if(jaddr) add_stub(LOADD_STUB,jaddr,(int)out,i,temp2,(int)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADD_STUB,i,(constmap[i][s]+offset)&0xFFFFFFF8,i_regs->regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { - assert(th>=0); - assert(tl>=0); - emit_testimm(temp,32); - emit_andimm(temp,24,temp); - if (opcode[i]==0x1A) { // LDL - emit_rsbimm(temp,32,HOST_TEMPREG); - emit_shl(temp2h,temp,temp2h); - emit_orrshr(temp2,HOST_TEMPREG,temp2h); + if(!c) { + emit_shlimm(addr,3,temp); + emit_andimm(addr,~3,temp2); + emit_readword_indexed_tlb(0,temp2,map,temp2); + emit_andimm(temp,24,temp); + if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR emit_movimm(-1,HOST_TEMPREG); - emit_shl(temp2,temp,temp2); - emit_cmove_reg(temp2h,th); - emit_biceq_lsl(tl,HOST_TEMPREG,temp,tl); - emit_bicne_lsl(th,HOST_TEMPREG,temp,th); - emit_orreq(temp2,tl,tl); - emit_orrne(temp2,th,th); + if (opcode[i]==0x26) { + emit_shr(temp2,temp,temp2); + emit_bic_lsr(tl,HOST_TEMPREG,temp,tl); + }else{ + emit_shl(temp2,temp,temp2); + emit_bic_lsl(tl,HOST_TEMPREG,temp,tl); + } + emit_or(temp2,tl,tl); } - if (opcode[i]==0x1B) { // LDR - emit_xorimm(temp,24,temp); - emit_rsbimm(temp,32,HOST_TEMPREG); - emit_shr(temp2,temp,temp2); - emit_orrshl(temp2h,HOST_TEMPREG,temp2); - emit_movimm(-1,HOST_TEMPREG); - emit_shr(temp2h,temp,temp2h); - emit_cmovne_reg(temp2,tl); - emit_bicne_lsr(th,HOST_TEMPREG,temp,th); - emit_biceq_lsr(tl,HOST_TEMPREG,temp,tl); - emit_orrne(temp2h,th,th); - emit_orreq(temp2h,tl,tl); - } - } - } -} -#define loadlr_assemble loadlr_assemble_arm - -static void cop0_assemble(int i,struct regstat *i_regs) -{ - u_int hr,reglist=0; - for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,rt1[i]); - char copr=(source[i]>>11)&0x1f; - if(t>=0) { - reglist&=~(1<regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); + else + { + int shift=((constmap[i][s]+offset)&3)<<3; + uint32_t mask=~UINT32_C(0); + if (opcode[i]==0x26) { //LWR + shift^=24; + mask>>=shift; + } else { //LWL + mask<<=shift; } - //Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_RANDOM_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); + if((constmap[i][s]+offset)&3) + emit_andimm(addr,~3,temp2); - emit_call((int)MFC0_new); - restore_regs(reglist); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.rt,t); + if(shift) { + emit_readword_indexed_tlb(0,temp2,map,temp2); + if (opcode[i]==0x26) emit_shrimm(temp2,shift,temp2); + else emit_shlimm(temp2,shift,temp2); + emit_andimm(tl,~mask,tl); + emit_or(temp2,tl,tl); + } + else + emit_readword_indexed_tlb(0,temp2,map,tl); + } + } + if(opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR + assert(tl>=0); + assert(th>=0); + assert(temp2h>=0); + if(!c) { + emit_shlimm(addr,3,temp); + emit_andimm(addr,~7,temp2); + emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); + emit_testimm(temp,32); + emit_andimm(temp,24,temp); + if (opcode[i]==0x1A) { // LDL + emit_rsbimm(temp,32,HOST_TEMPREG); + emit_shl(temp2h,temp,temp2h); + emit_orrshr(temp2,HOST_TEMPREG,temp2h); + emit_movimm(-1,HOST_TEMPREG); + emit_shl(temp2,temp,temp2); + emit_cmove_reg(temp2h,th); + emit_biceq_lsl(tl,HOST_TEMPREG,temp,tl); + emit_bicne_lsl(th,HOST_TEMPREG,temp,th); + emit_orreq(temp2,tl,tl); + emit_orrne(temp2,th,th); + } + if (opcode[i]==0x1B) { // LDR + emit_xorimm(temp,24,temp); + emit_rsbimm(temp,32,HOST_TEMPREG); + emit_shr(temp2,temp,temp2); + emit_orrshl(temp2h,HOST_TEMPREG,temp2); + emit_movimm(-1,HOST_TEMPREG); + emit_shr(temp2h,temp,temp2h); + emit_cmovne_reg(temp2,tl); + emit_bicne_lsr(th,HOST_TEMPREG,temp,th); + emit_biceq_lsr(tl,HOST_TEMPREG,temp,tl); + emit_orrne(temp2h,th,th); + emit_orreq(temp2h,tl,tl); + } + } + else + { + int shift=((constmap[i][s]+offset)&7)<<3; + uint64_t mask=~UINT64_C(0); + if (opcode[i]==0x1B) { //LDR + shift^=56; + mask>>=shift; + } else { //LDL + mask<<=shift; + } + + if((constmap[i][s]+offset)&7) + emit_andimm(addr,~7,temp2); + + if(shift) { + emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); + if (opcode[i]==0x1B) { + emit_shrdimm(temp2h,temp2,shift,temp2h); + emit_shrimm(temp2,shift,temp2); + } else { + emit_shldimm(temp2h,temp2,shift,temp2h); + emit_shlimm(temp2,shift,temp2); + } + emit_andimm(tl,~mask,tl); + emit_andimm(th,~mask>>32,th); + emit_or(temp2,tl,tl); + emit_or(temp2h,th,th); + } + else + emit_readdword_indexed_tlb(0,temp2,map,th,tl); } } } - else if(opcode2[i]==4) // MTC0 - { - signed char s=get_reg(i_regs->regmap,rs1[i]); - char copr=(source[i]>>11)&0x1f; - assert(s>=0); - save_regs(reglist); - emit_writeword(s,(u_int)&g_dev.r4300.new_dynarec_hot_state.rt); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - // Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG) - // Always update the pcaddr even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_movimm(start+i*4+(copr==CP0_STATUS_REG)*4,ARG4_REG); - - emit_call((int)MTC0_new); - restore_regs(reglist); - - if(copr==12||copr==9) { - assert(!is_delayslot); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - int jaddr=(int)out; - emit_jeq(0); - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if(copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG){ - if((cc=get_reg(i_regs->regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - } - - cop1_usable=0; - } - else - { - assert(opcode2[i]==0x10); - if((source[i]&0x3f)==0x08) // TLBP - { - save_regs(reglist); - emit_call((int)cached_interp_TLBP); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x01) // TLBR - { - save_regs(reglist); - emit_call((int)cached_interp_TLBR); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x02) { // TLBWI - assert(!is_delayslot); - save_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - - emit_call((int)TLBWI_new); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x06) { // TLBWR - assert(!is_delayslot); - save_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_call((int)TLBWR_new); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x18) // ERET - { - assert(!is_delayslot); - int count=ccadj[i]; - if(i_regs->regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*count,HOST_CCREG); // TODO: Should there be an extra cycle here? - emit_jmp((int)jump_eret); - } - } -} - -static void cop1_assemble(int i,struct regstat *i_regs) -{ - // Check cop1 unusable - if(!cop1_usable) { - signed char rs=get_reg(i_regs->regmap,CSREG); - assert(rs>=0); - emit_testimm(rs,0x20000000); - int jaddr=(int)out; - emit_jeq(0); - add_stub(FP_STUB,jaddr,(int)out,i,rs,(int)i_regs,is_delayslot,0); - cop1_usable=1; - } - if (opcode2[i]==0) { // MFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],tl); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==1) { // DMFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - signed char th=get_reg(i_regs->regmap,rt1[i]|64); - if(tl>=0) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],tl); - if(th>=0) emit_readword_indexed(4,tl,th); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==4) { // MTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char temp=get_reg(i_regs->regmap,-1); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==5) { // DMTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char sh=rs1[i]>0?get_reg(i_regs->regmap,rs1[i]|64):sl; - signed char temp=get_reg(i_regs->regmap,-1); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sh,4,temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==2) // CFC1 - { - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - u_int copr=(source[i]>>11)&0x1f; - if(copr==0) emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr0,tl); - if(copr==31) emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,tl); - } - } - else if (opcode2[i]==6) // CTC1 - { - signed char sl=get_reg(i_regs->regmap,rs1[i]); - u_int copr=(source[i]>>11)&0x1f; - assert(sl>=0); - if(copr==31) - { - emit_writeword(sl,(u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31); - // Set the rounding mode - //FIXME - //char temp=get_reg(i_regs->regmap,-1); - //emit_andimm(sl,3,temp); - //emit_fldcw_indexed(fp_rounding_modes,temp); - } + if(jaddr) { + add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + } else if(c&&!memtarget) { + inline_readstub(type,i,(constmap[i][s]+offset),addr,i_regs,rt1[i],ccadj[i],reglist); } +#else + inline_readstub(type,i,c?(constmap[i][s]+offset):0,addr,i_regs,rt1[i],ccadj[i],reglist); +#endif } +#define loadlr_assemble loadlr_assemble_arm static void fconv_assemble_arm(int i,struct regstat *i_regs) { @@ -3566,13 +3081,14 @@ static void fconv_assemble_arm(int i,struct regstat *i_regs) if(!cop1_usable) { signed char rs=get_reg(i_regs->regmap,CSREG); assert(rs>=0); - emit_testimm(rs,0x20000000); + emit_testimm(rs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,rs,(int)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCONV #if (defined(__VFP_FP__) && !defined(__SOFTFP__)) if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0d) { // trunc_w_s emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); @@ -3627,6 +3143,7 @@ static void fconv_assemble_arm(int i,struct regstat *i_regs) return; } #endif +#endif // C emulation code @@ -3634,148 +3151,158 @@ static void fconv_assemble_arm(int i,struct regstat *i_regs) for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); save_regs(reglist); if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_s_w); } if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)cvt_d_w); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_s_l); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_d_l); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)cvt_d_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_l_s); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_s_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((int)cvt_l_d); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x08) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)round_l_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x09) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)trunc_l_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0a) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)ceil_l_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0b) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)floor_l_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0c) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)round_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0d) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)trunc_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0e) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)ceil_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0f) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)floor_w_s); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x08) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)round_l_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x09) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)trunc_l_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0a) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)ceil_l_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0b) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)floor_l_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0c) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)round_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0d) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)trunc_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0e) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)ceil_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0f) { - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); emit_call((int)floor_w_d); } @@ -3792,13 +3319,14 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,cs,(int)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCOMP if((source[i]&0x3f)==0x30) { emit_andimm(fs,~0x800000,fs); return; @@ -3858,6 +3386,7 @@ static void fcomp_assemble(int i,struct regstat *i_regs) return; } #endif +#endif // C only @@ -3866,11 +3395,12 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(i_regs->regmap[hr]>=0) reglist|=1<>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); + emit_addimm(FP,fp_fcr31,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); if((source[i]&0x3f)==0x30) emit_call((int)c_f_s); if((source[i]&0x3f)==0x31) emit_call((int)c_un_s); if((source[i]&0x3f)==0x32) emit_call((int)c_eq_s); @@ -3889,9 +3419,9 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_call((int)c_ngt_s); } if(opcode2[i]==0x11) { - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); + emit_addimm(FP,fp_fcr31,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); if((source[i]&0x3f)==0x30) emit_call((int)c_f_d); if((source[i]&0x3f)==0x31) emit_call((int)c_un_d); if((source[i]&0x3f)==0x32) emit_call((int)c_eq_d); @@ -3921,13 +3451,14 @@ static void float_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,cs,(int)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FLOAT #if (defined(__VFP_FP__) && !defined(__SOFTFP__)) if((source[i]&0x3f)==6) // mov { @@ -4055,29 +3586,34 @@ static void float_assemble(int i,struct regstat *i_regs) return; } #endif +#endif u_int hr,reglist=0; for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); if(opcode2[i]==0x10) { // Single precision save_regs(reglist); switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); break; case 0x05: case 0x06: case 0x07: - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG); break; } switch(source[i]&0x3f) @@ -4099,19 +3635,21 @@ static void float_assemble(int i,struct regstat *i_regs) switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_movimm((u_int)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); break; case 0x05: case 0x06: case 0x07: - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); - emit_readword((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG); + emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG); break; } switch(source[i]&0x3f) @@ -4143,7 +3681,8 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) { if((opcode2[i]&4)==0) // 32-bit { - if(opcode2[i]==0x18) // MULT +#ifndef INTERPRET_MULT + if((opcode2[i]==0x18) || (opcode2[i]==0x19)) { signed char m1=get_reg(i_regs->regmap,rs1[i]); signed char m2=get_reg(i_regs->regmap,rs2[i]); @@ -4153,21 +3692,16 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) assert(m2>=0); assert(hi>=0); assert(lo>=0); - emit_smull(m1,m2,hi,lo); + + if(opcode2[i]==0x18) //MULT + emit_smull(m1,m2,hi,lo); + else if(opcode2[i]==0x19) //MULTU + emit_umull(m1,m2,hi,lo); } - else if(opcode2[i]==0x19) // MULTU - { - signed char m1=get_reg(i_regs->regmap,rs1[i]); - signed char m2=get_reg(i_regs->regmap,rs2[i]); - signed char hi=get_reg(i_regs->regmap,HIREG); - signed char lo=get_reg(i_regs->regmap,LOREG); - assert(m1>=0); - assert(m2>=0); - assert(hi>=0); - assert(lo>=0); - emit_umull(m1,m2,hi,lo); - } - else if(opcode2[i]==0x1A) // DIV + else +#endif +#ifndef INTERPRET_DIV + if((opcode2[i]==0x1A) || (opcode2[i]==0x1B)) { signed char d1=get_reg(i_regs->regmap,rs1[i]); // dividend signed char d2=get_reg(i_regs->regmap,rs2[i]); // divisor @@ -4178,74 +3712,107 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) assert(quotient>=0); assert(remainder>=0); - if(arm_cpu_features.IDIVa) + if(opcode2[i]==0x1A) //DIV + { + if(arm_cpu_features.IDIVa) + { + emit_test(d2,d2); + emit_jeq((int)out+16); // Division by zero + emit_sdiv(d1,d2,quotient); + emit_mul(quotient,d2,remainder); + emit_sub(d1,remainder,remainder); + } + else + { + emit_movs(d1,remainder); + emit_negmi(remainder,remainder); + emit_movs(d2,HOST_TEMPREG); + emit_jeq((int)out+52); // Division by zero + emit_negmi(HOST_TEMPREG,HOST_TEMPREG); + emit_clz(HOST_TEMPREG,quotient); + emit_shl(HOST_TEMPREG,quotient,HOST_TEMPREG); + emit_orimm(quotient,1<<31,quotient); + emit_shr(quotient,quotient,quotient); + emit_cmp(remainder,HOST_TEMPREG); + emit_subcs(remainder,HOST_TEMPREG,remainder); + emit_adcs(quotient,quotient,quotient); + emit_shrimm(HOST_TEMPREG,1,HOST_TEMPREG); + emit_jcc((int)out-16); // -4 + emit_teq(d1,d2); + emit_negmi(quotient,quotient); + emit_test(d1,d1); + emit_negmi(remainder,remainder); + } + } + else if(opcode2[i]==0x1B) //DIVU { emit_test(d2,d2); - emit_jeq((int)out+16); // Division by zero - emit_sdiv(d1,d2,quotient); - emit_mul(quotient,d2,remainder); - emit_sub(d1,remainder,remainder); - } - else - { - emit_movs(d1,remainder); - emit_negmi(remainder,remainder); - emit_movs(d2,HOST_TEMPREG); - emit_jeq((int)out+52); // Division by zero - emit_negmi(HOST_TEMPREG,HOST_TEMPREG); - emit_clz(HOST_TEMPREG,quotient); - emit_shl(HOST_TEMPREG,quotient,HOST_TEMPREG); - emit_orimm(quotient,1<<31,quotient); - emit_shr(quotient,quotient,quotient); - emit_cmp(remainder,HOST_TEMPREG); - emit_subcs(remainder,HOST_TEMPREG,remainder); - emit_adcs(quotient,quotient,quotient); - emit_shrimm(HOST_TEMPREG,1,HOST_TEMPREG); - emit_jcc((int)out-16); // -4 - emit_teq(d1,d2); - emit_negmi(quotient,quotient); - emit_test(d1,d1); - emit_negmi(remainder,remainder); + + if(arm_cpu_features.IDIVa) + { + emit_jeq((int)out+16); // Division by zero + emit_udiv(d1,d2,quotient); + emit_mul(quotient,d2,remainder); + emit_sub(d1,remainder,remainder); + } + else + { + emit_jeq((int)out+44); // Division by zero + emit_clz(d2,HOST_TEMPREG); + emit_movimm(1<<31,quotient); + emit_shl(d2,HOST_TEMPREG,d2); + emit_mov(d1,remainder); + emit_shr(quotient,HOST_TEMPREG,quotient); + emit_cmp(remainder,d2); + emit_subcs(remainder,d2,remainder); + emit_adcs(quotient,quotient,quotient); + emit_shrcc_imm(d2,1,d2); + emit_jcc((int)out-16); // -4 + } } } - else if(opcode2[i]==0x1B) // DIVU + else +#endif { - signed char d1=get_reg(i_regs->regmap,rs1[i]); // dividend - signed char d2=get_reg(i_regs->regmap,rs2[i]); // divisor - assert(d1>=0); - assert(d2>=0); - signed char quotient=get_reg(i_regs->regmap,LOREG); - signed char remainder=get_reg(i_regs->regmap,HIREG); - assert(quotient>=0); - assert(remainder>=0); - emit_test(d2,d2); + u_int reglist=0; + signed char r1=get_reg(i_regs->regmap,rs1[i]); + signed char r2=get_reg(i_regs->regmap,rs2[i]); + signed char hi=get_reg(i_regs->regmap,HIREG); + signed char lo=get_reg(i_regs->regmap,LOREG); + assert(r1>=0); + assert(r2>=0); - if(arm_cpu_features.IDIVa) - { - emit_jeq((int)out+16); // Division by zero - emit_udiv(d1,d2,quotient); - emit_mul(quotient,d2,remainder); - emit_sub(d1,remainder,remainder); - } - else - { - emit_jeq((int)out+44); // Division by zero - emit_clz(d2,HOST_TEMPREG); - emit_movimm(1<<31,quotient); - emit_shl(d2,HOST_TEMPREG,d2); - emit_mov(d1,remainder); - emit_shr(quotient,HOST_TEMPREG,quotient); - emit_cmp(remainder,d2); - emit_subcs(remainder,d2,remainder); - emit_adcs(quotient,quotient,quotient); - emit_shrcc_imm(d2,1,d2); - emit_jcc((int)out-16); // -4 + for(int hr=0;hrregmap[hr]>=0) reglist|=1<=0) reglist&=~(1<=0) reglist&=~(1<=0) emit_loadreg(HIREG,hi); + if(lo>=0) emit_loadreg(LOREG,lo); } } else // 64-bit { -#ifndef INTERPRETED_MULT64 +#ifndef INTERPRET_MULT64 if(opcode2[i]==0x1C||opcode2[i]==0x1D) { signed char b_1=get_reg(i_regs->regmap,rs1[i]|64); @@ -4298,14 +3865,14 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) #endif { u_int reglist=0; - char r1h=get_reg(i_regs->regmap,rs1[i]|64); - char r1l=get_reg(i_regs->regmap,rs1[i]); - char r2h=get_reg(i_regs->regmap,rs2[i]|64); - char r2l=get_reg(i_regs->regmap,rs2[i]); - char hih=get_reg(i_regs->regmap,HIREG|64); - char hil=get_reg(i_regs->regmap,HIREG); - char loh=get_reg(i_regs->regmap,LOREG|64); - char lol=get_reg(i_regs->regmap,LOREG); + signed char r1h=get_reg(i_regs->regmap,rs1[i]|64); + signed char r1l=get_reg(i_regs->regmap,rs1[i]); + signed char r2h=get_reg(i_regs->regmap,rs2[i]|64); + signed char r2l=get_reg(i_regs->regmap,rs2[i]); + signed char hih=get_reg(i_regs->regmap,HIREG|64); + signed char hil=get_reg(i_regs->regmap,HIREG); + signed char loh=get_reg(i_regs->regmap,LOREG|64); + signed char lol=get_reg(i_regs->regmap,LOREG); assert(r1h>=0); assert(r2h>=0); assert(r1l>=0); @@ -4431,21 +3998,20 @@ static void wb_sx(signed char pre[],signed char entry[],uint64_t dirty,uint64_t static void wb_valid(signed char pre[],signed char entry[],u_int dirty_pre,u_int dirty,uint64_t is32_pre,uint64_t u,uint64_t uu) { //if(dirty_pre==dirty) return; - int hr,reg,new_hr; + int hr,reg; for(hr=0;hr>(reg&63))&1) { - if(reg>0) { + if(((reg&63)>0)&&((reg&63)>hr)&1) { - if(reg>0&®<36) { + if(reg<64) { emit_storereg(reg,hr); if( ((is32_pre&~uu)>>reg)&1 ) { emit_sarimm(hr,31,HOST_TEMPREG); emit_storereg(reg|64,HOST_TEMPREG); } - } - else if(reg>=64) { + } else { emit_storereg(reg,hr); } } @@ -4562,10 +4128,14 @@ static void arch_init(void) { jump_table_symbols[0] = (int) cached_interp_TLBR; jump_table_symbols[1] = (int) cached_interp_TLBP; - jump_table_symbols[2] = (int) cached_interp_DMULT; - jump_table_symbols[3] = (int) cached_interp_DMULTU; - jump_table_symbols[4] = (int) cached_interp_DDIV; - jump_table_symbols[5] = (int) cached_interp_DDIVU; + jump_table_symbols[2] = (int) cached_interp_MULT; + jump_table_symbols[3] = (int) cached_interp_MULTU; + jump_table_symbols[4] = (int) cached_interp_DIV; + jump_table_symbols[5] = (int) cached_interp_DIVU; + jump_table_symbols[6] = (int) cached_interp_DMULT; + jump_table_symbols[7] = (int) cached_interp_DMULTU; + jump_table_symbols[8] = (int) cached_interp_DDIV; + jump_table_symbols[9] = (int) cached_interp_DDIVU; #ifdef RAM_OFFSET g_dev.r4300.new_dynarec_hot_state.ram_offset=((int)g_dev.rdram.dram-(int)0x80000000)>>2; diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/arm/linkage_arm.S b/mupen64plus-core/src/device/r4300/new_dynarec/arm/linkage_arm.S index 55674a5..adcae2d 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/arm/linkage_arm.S +++ b/mupen64plus-core/src/device/r4300/new_dynarec/arm/linkage_arm.S @@ -72,27 +72,10 @@ device_r4300_new_dynarec_hot_state_dynarec_local = (offsetof_struct_device_r4300 /* Defines offsets for fp addressed variables */ fp_saved_context = offsetof_struct_new_dynarec_hot_state_dynarec_local + 28 -fp_next_interrupt = offsetof_struct_new_dynarec_hot_state_next_interrupt fp_cycle_count = offsetof_struct_new_dynarec_hot_state_cycle_count fp_pending_exception = offsetof_struct_new_dynarec_hot_state_pending_exception fp_pcaddr = offsetof_struct_new_dynarec_hot_state_pcaddr fp_stop = offsetof_struct_new_dynarec_hot_state_stop -fp_invc_ptr = offsetof_struct_new_dynarec_hot_state_invc_ptr -fp_fcr0 = offsetof_struct_new_dynarec_hot_state_fcr0 -fp_fcr31 = offsetof_struct_new_dynarec_hot_state_fcr31 -fp_regs = offsetof_struct_new_dynarec_hot_state_regs -fp_hi = offsetof_struct_new_dynarec_hot_state_hi -fp_lo = offsetof_struct_new_dynarec_hot_state_lo -fp_cp0_regs = offsetof_struct_new_dynarec_hot_state_cp0_regs -fp_cp1_regs_simple = offsetof_struct_new_dynarec_hot_state_cp1_regs_simple -fp_cp1_regs_double = offsetof_struct_new_dynarec_hot_state_cp1_regs_double -fp_rounding_modes = offsetof_struct_new_dynarec_hot_state_rounding_modes -fp_branch_target = offsetof_struct_new_dynarec_hot_state_branch_target -fp_pc = offsetof_struct_new_dynarec_hot_state_pc -fp_fake_pc = offsetof_struct_new_dynarec_hot_state_fake_pc -fp_mini_ht = offsetof_struct_new_dynarec_hot_state_mini_ht -fp_restore_candidate = offsetof_struct_new_dynarec_hot_state_restore_candidate -fp_memory_map = offsetof_struct_new_dynarec_hot_state_memory_map TEXT_SECTION @@ -147,12 +130,7 @@ GLOBAL_FUNCTION(jump_vaddr_r7): add r0, r7, #0 GLOBAL_FUNCTION(jump_vaddr): - str r10, [fp, #fp_cycle_count] - ldr r9, [fp, #fp_next_interrupt] - add r10, r9, r10 /* Count */ - str r10, [fp, #fp_cp0_regs + 36] /* Count */ bl get_addr_ht - ldr r10, [fp, #fp_cycle_count] mov pc, r0 GLOBAL_FUNCTION(verify_code): @@ -165,127 +143,62 @@ GLOBAL_FUNCTION(verify_code): mov pc, r0 GLOBAL_FUNCTION(cc_interrupt): - ldr r0, [fp, #fp_next_interrupt] + str r10, [fp, #fp_cycle_count] mov r1, #0 - mov r2, #0x1fc - add r10, r0, r10 str r1, [fp, #fp_pending_exception] - and r2, r2, r10, lsr #19 -#ifdef ARMv5_ONLY - ldr r3, =fp_restore_candidate -#else - movw r3, #:lower16:fp_restore_candidate - movt r3, #:upper16:fp_restore_candidate -#endif - add r3, fp, r3 - str r10, [fp, #fp_cp0_regs+36] /* Count */ - ldr r4, [r2, r3] mov r10, lr - tst r4, r4 - bne .E4 -.E1: bl dynarec_gen_interrupt mov lr, r10 - ldr r10, [fp, #fp_cp0_regs+36] /* Count */ - ldr r0, [fp, #fp_next_interrupt] + ldr r10, [fp, #fp_cycle_count] ldr r1, [fp, #fp_pending_exception] ldr r2, [fp, #fp_stop] - sub r10, r10, r0 tst r2, r2 - bne .E3 + bne new_dyna_stop tst r1, r1 moveq pc, lr -.E2: +.E1: ldr r0, [fp, #fp_pcaddr] bl get_addr_ht mov pc, r0 -.E3: + +LOCAL_FUNCTION(new_dyna_stop): add r12, fp, #fp_saved_context ldmia r12, {r4, r5, r6, r7, r8, r9, sl, fp, pc} -.E4: - /* Move 'dirty' blocks to the 'clean' list */ - lsl r5, r2, #3 - str r1, [r2, r3] - mov r6, #0 -.E5: - lsrs r4, r4, #1 - add r0, r5, r6 - blcs clean_blocks - add r6, r6, #1 - tst r6, #31 - bne .E5 - b .E1 GLOBAL_FUNCTION(do_interrupt): + ldr r2, [fp, #fp_stop] + tst r2, r2 + bne new_dyna_stop ldr r0, [fp, #fp_pcaddr] bl get_addr_ht - ldr r1, [fp, #fp_next_interrupt] - ldr r10, [fp, #fp_cp0_regs+36] /* Count */ - sub r10, r10, r1 + ldr r10, [fp, #fp_cycle_count] mov pc, r0 GLOBAL_FUNCTION(fp_exception): - mov r2, #0x10000000 - add r2, r2, #0x2c -.E7: - ldr r1, [fp, #fp_cp0_regs+48] /* Status */ - mov r3, #0x80000000 - str r0, [fp, #fp_cp0_regs+56] /* EPC */ - orr r1, #2 - str r1, [fp, #fp_cp0_regs+48] /* Status */ - str r2, [fp, #fp_cp0_regs+52] /* Cause */ - add r0, r3, #0x180 - bl get_addr_ht + str r0, [fp, #fp_pcaddr] + bl cop1_unusable mov pc, r0 -GLOBAL_FUNCTION(fp_exception_ds): - mov r2, #0x90000000 /* Set high bit if delay slot */ - add r2, r2, #0x2c - b .E7 - GLOBAL_FUNCTION(jump_syscall): - mov r2, #0x20 - b .E7 + str r0, [fp, #fp_pcaddr] + bl SYSCALL_new + mov pc, r0 GLOBAL_FUNCTION(jump_eret): - ldr r1, [fp, #fp_cp0_regs+48] /* Status */ - ldr r0, [fp, #fp_next_interrupt] - bic r1, r1, #2 - add r10, r0, r10 - str r1, [fp, #fp_cp0_regs+48] /* Status */ - str r10, [fp, #fp_cp0_regs+36] /* Count */ - bl new_dynarec_check_interrupt - ldr r1, [fp, #fp_next_interrupt] - ldr r0, [fp, #fp_cp0_regs+56] /* EPC */ - subs r10, r10, r1 - bpl .E11 -.E8: - add r6, fp, #fp_regs+256 - mov r5, #248 - mov r1, #0 -.E9: - ldr r2, [r6, #-8]! - ldr r3, [r6, #4] - eor r3, r3, r2, asr #31 - subs r3, r3, #1 - adc r1, r1, r1 - subs r5, r5, #8 - bne .E9 - ldr r2, [fp, #fp_hi] - ldr r3, [fp, #fp_hi+4] - eors r3, r3, r2, asr #31 - ldr r2, [fp, #fp_lo] - ldreq r3, [fp, #fp_lo+4] - eoreq r3, r3, r2, asr #31 - subs r3, r3, #1 - adc r1, r1, r1 - bl get_addr_32 + str r10, [fp, #fp_cycle_count] + bl ERET_new + ldr r10, [fp, #fp_cycle_count] + tst r0, r0 + beq new_dyna_stop + mov pc, r0 + +GLOBAL_FUNCTION(dyna_linker): + bl dynamic_linker + mov pc, r0 + +GLOBAL_FUNCTION(dyna_linker_ds): + bl dynamic_linker_ds mov pc, r0 -.E11: - str r0, [fp, #fp_pcaddr] - bl cc_interrupt - ldr r0, [fp, #fp_pcaddr] - b .E8 GLOBAL_FUNCTION(new_dyna_start): ldr r12, .savedcontextptr_offset @@ -300,9 +213,7 @@ GLOBAL_FUNCTION(new_dyna_start): ldr r4, [r1] add r0, r0, #0x40 bl new_recompile_block - ldr r0, [fp, #fp_next_interrupt] - ldr r10, [fp, #fp_cp0_regs+36] /* Count */ - sub r10, r10, r0 + ldr r10, [fp, #fp_cycle_count] mov pc, r4 GLOBAL_FUNCTION(invalidate_addr_r0): @@ -369,7 +280,7 @@ LOCAL_FUNCTION(invalidate_addr_call): ldmia fp, {r0, r1, r2, r3, r12, pc} GLOBAL_FUNCTION(breakpoint): - /* Set breakpoint here for debugging */ + .inst 0xe7f001f0 mov pc, lr END_SECTION diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.c b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.c index 1297d2b..147e8f6 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.c @@ -68,9 +68,7 @@ void jump_vaddr_x14(void); void jump_vaddr_x15(void); void jump_vaddr_x16(void); void jump_vaddr_x17(void); -void jump_vaddr_x18(void); void jump_vaddr_x19(void); -void jump_vaddr_x20(void); void jump_vaddr_x21(void); void jump_vaddr_x22(void); void jump_vaddr_x23(void); @@ -80,9 +78,6 @@ void jump_vaddr_x26(void); void jump_vaddr_x27(void); void jump_vaddr_x28(void); void breakpoint(void); - -static void *dyna_linker(void * src, u_int vaddr); -static void *dyna_linker_ds(void * src, u_int vaddr); static void invalidate_addr(u_int addr); static uintptr_t literals[1024][2]; @@ -107,9 +102,9 @@ static const uintptr_t jump_vaddr_reg[32] = { (intptr_t)jump_vaddr_x15, (intptr_t)jump_vaddr_x16, (intptr_t)jump_vaddr_x17, - (intptr_t)jump_vaddr_x18, + (intptr_t)breakpoint, /*trampoline jumps uses x18*/ (intptr_t)jump_vaddr_x19, - (intptr_t)jump_vaddr_x20, + (intptr_t)breakpoint, /*cycle count*/ (intptr_t)jump_vaddr_x21, (intptr_t)jump_vaddr_x22, (intptr_t)jump_vaddr_x23, @@ -125,6 +120,10 @@ static const uintptr_t jump_vaddr_reg[32] = { static uintptr_t jump_table_symbols[] = { (intptr_t)NULL /*TLBR*/, (intptr_t)NULL /*TLBP*/, + (intptr_t)NULL /*MULT*/, + (intptr_t)NULL /*MULTU*/, + (intptr_t)NULL /*DIV*/, + (intptr_t)NULL /*DIVU*/, (intptr_t)NULL /*DMULT*/, (intptr_t)NULL /*DMULTU*/, (intptr_t)NULL /*DDIV*/, @@ -135,7 +134,6 @@ static uintptr_t jump_table_symbols[] = { (intptr_t)verify_code, (intptr_t)cc_interrupt, (intptr_t)fp_exception, - (intptr_t)fp_exception_ds, (intptr_t)jump_syscall, (intptr_t)jump_eret, (intptr_t)do_interrupt, @@ -161,9 +159,7 @@ static uintptr_t jump_table_symbols[] = { (intptr_t)jump_vaddr_x15, (intptr_t)jump_vaddr_x16, (intptr_t)jump_vaddr_x17, - (intptr_t)jump_vaddr_x18, (intptr_t)jump_vaddr_x19, - (intptr_t)jump_vaddr_x20, (intptr_t)jump_vaddr_x21, (intptr_t)jump_vaddr_x22, (intptr_t)jump_vaddr_x23, @@ -254,8 +250,14 @@ static uintptr_t jump_table_symbols[] = { (intptr_t)write_hword_new, (intptr_t)write_word_new, (intptr_t)write_dword_new, - (intptr_t)ldl_merge, - (intptr_t)ldr_merge, + (intptr_t)LWL_new, + (intptr_t)LWR_new, + (intptr_t)LDL_new, + (intptr_t)LDR_new, + (intptr_t)SWL_new, + (intptr_t)SWR_new, + (intptr_t)SDL_new, + (intptr_t)SDR_new, (intptr_t)breakpoint }; @@ -337,8 +339,6 @@ static void *add_pointer(void *src, void* addr) assert((ptr2[0]&0xFFE00000)==0x52A00000); //movz assert((ptr2[1]&0xFFE00000)==0x72800000); //movk assert((ptr2[2]&0x9f000000)==0x10000000); //adr - //assert((ptr2[3]&0xfc000000)==0x94000000); //bl - //assert((ptr2[4]&0xfffffc1f)==0xd61f0000); //br set_jump_target((intptr_t)src,(intptr_t)addr); intptr_t ptr_rx=((intptr_t)ptr-(intptr_t)base_addr)+(intptr_t)base_addr_rx; cache_flush((void*)ptr_rx, (void*)(ptr_rx+4)); @@ -1362,6 +1362,8 @@ static void emit_storereg(int r, int hr) if((r&63)==LOREG) offset=fp_lo+((r&64)>>4); if(r==CCREG) offset=fp_cycle_count; if(r==FSREG) offset=fp_fcr31; + assert((r&63)!=CSREG); + assert((r&63)!=0); assert((r&63)<=CCREG); assert(offset<4096); assert(offset%4 == 0); /* 4 bytes aligned */ @@ -1525,10 +1527,12 @@ static void emit_addimm64_32(int rsh,int rsl,int imm,int rth,int rtl) output_w32(0x31000000|(imm&0xfff)<<10|rsl<<5|rtl); emit_adc(rsh,WZR,rth); }else if(imm<0) { + assert(rsl!=HOST_TEMPREG); emit_movimm(-imm,HOST_TEMPREG); emit_subs(rsl,HOST_TEMPREG,rtl); emit_sbc(rsh,WZR,rth); }else if(imm>0) { + assert(rsl!=HOST_TEMPREG); emit_movimm(imm,HOST_TEMPREG); emit_adds(rsl,HOST_TEMPREG,rtl); emit_adc(rsh,WZR,rth); @@ -1563,6 +1567,7 @@ static void emit_andimm(int rs,int imm,int rt) assem_debug("and %s,%s,#%d",regname[rt],regname[rs],imm); output_w32(0x12000000|armval<<10|rs<<5|rt); }else{ + assert(rs!=HOST_TEMPREG); assert(imm>0&&imm<65535); emit_movz(imm,HOST_TEMPREG); assem_debug("and %s,%s,%s",regname[rt],regname[rs],regname[HOST_TEMPREG]); @@ -1588,6 +1593,7 @@ static void emit_orimm(int rs,int imm,int rt) assem_debug("orr %s,%s,#%d",regname[rt],regname[rs],imm); output_w32(0x32000000|armval<<10|rs<<5|rt); }else{ + assert(rs!=HOST_TEMPREG); assert(imm>0&&imm<65536); emit_movz(imm,HOST_TEMPREG); assem_debug("orr %s,%s,%s",regname[rt],regname[rs],regname[HOST_TEMPREG]); @@ -1604,6 +1610,7 @@ static void emit_xorimm(int rs,int imm,int rt) assem_debug("eor %s,%s,#%d",regname[rt],regname[rs],imm); output_w32(0x52000000|armval<<10|rs<<5|rt); }else{ + assert(rs!=HOST_TEMPREG); assert(imm>0&&imm<65536); emit_movz(imm,HOST_TEMPREG); assem_debug("eor %s,%s,%s",regname[rt],regname[rs],regname[HOST_TEMPREG]); @@ -1752,6 +1759,7 @@ static void emit_cmpimm(int rs,int imm) assem_debug("cmn %s,#%d,lsl #12",regname[rs],-imm&0xfff); output_w32(0x31400000|((-imm>>12)&0xfff)<<10|rs<<5|WZR); }else{ + assert(rs!=HOST_TEMPREG); assert(imm>-65536); emit_movz(-imm,HOST_TEMPREG); assem_debug("cmn %s,%s",regname[rs],regname[HOST_TEMPREG]); @@ -1762,6 +1770,7 @@ static void emit_cmpimm(int rs,int imm) assem_debug("cmp %s,#%d,lsl #12",regname[rs],imm&0xfff); output_w32(0x71400000|((imm>>12)&0xfff)<<10|rs<<5|WZR); }else{ + assert(rs!=HOST_TEMPREG); assert(imm<65536); emit_movz(imm,HOST_TEMPREG); assem_debug("cmp %s,%s",regname[rs],regname[HOST_TEMPREG]); @@ -2529,6 +2538,14 @@ static void emit_cmov2imm_e_ne_compact(int imm1,int imm2,u_int rt) } #endif +// special case for checking pending_exception +static void emit_cmpmem_imm(intptr_t addr, int imm) +{ + assert(imm==0); + emit_readword(addr,HOST_TEMPREG); + emit_test(HOST_TEMPREG,HOST_TEMPREG); +} + #ifndef HOST_IMM8 // special case for checking invalid_code static void emit_cmpmem_indexedsr12_imm(int addr,int r,int imm) @@ -3072,22 +3089,21 @@ static void wb_sx(signed char pre[],signed char entry[],uint64_t dirty,uint64_t static void wb_valid(signed char pre[],signed char entry[],u_int dirty_pre,u_int dirty,uint64_t is32_pre,uint64_t u,uint64_t uu) { //if(dirty_pre==dirty) return; - int hr,tr; + int hr,reg; for(hr=0;hr>(tr&63))&1) { - if(tr>0) { + reg=pre[hr]; + if(((~u)>>(reg&63))&1) { + if(((reg&63)>0)&&((reg&63)>hr)&1) { - if(tr>0&&tr<36) { - emit_storereg(tr,hr); - if( ((is32_pre&~uu)>>tr)&1 ) { + if(reg<64) { + emit_storereg(reg,hr); + if( ((is32_pre&~uu)>>reg)&1 ) { emit_sarimm(hr,31,HOST_TEMPREG); - emit_storereg(tr|64,HOST_TEMPREG); + emit_storereg(reg|64,HOST_TEMPREG); } - } - else if(tr>=64) { - emit_storereg(tr,hr); + } else { + emit_storereg(reg,hr); } } } @@ -3158,319 +3174,7 @@ static void emit_extjump2(intptr_t addr, int target, intptr_t linker) //addr is in the current recompiled block (max 256k) //offset shouldn't exceed +/-1MB emit_adr(addr,0); - -#ifdef DEBUG_CYCLE_COUNT - emit_readword((intptr_t)&next_interupt,HOST_TEMPREG); - emit_add(HOST_CCREG,HOST_TEMPREG,HOST_CCREG); - emit_writeword(HOST_CCREG,(intptr_t)&g_cp0_regs[CP0_COUNT_REG]); -#endif - emit_call(linker); - emit_jmpreg(0); -} - -static void do_readstub(int n) -{ - assem_debug("do_readstub %x",start+stubs[n][3]*4); - literal_pool(256); - set_jump_target(stubs[n][1],(intptr_t)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt; - - if(itype[i]==C1LS||itype[i]==LOADLR) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,FTEMP); - }else{ - rth=get_reg(i_regmap,rt1[i]|64); - rt=get_reg(i_regmap,rt1[i]); - } - assert(addr>=0); - intptr_t ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(intptr_t)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(intptr_t)read_hword_new; - if(type==LOADW_STUB) - ftable=(intptr_t)read_word_new; - if(type==LOADD_STUB) - ftable=(intptr_t)read_dword_new; - - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - save_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call((intptr_t)ftable); - restore_regs(reglist); - - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); - } - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_readstub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - int addr=get_reg(regmap,-1); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - assert(addr>=0); - - intptr_t ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(intptr_t)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(intptr_t)read_hword_new; - if(type==LOADW_STUB) - ftable=(intptr_t)read_word_new; - if(type==LOADD_STUB) - ftable=(intptr_t)read_dword_new; - - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - save_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call((intptr_t)ftable); - restore_regs(reglist); - - if((signed int)addr_const>=(signed int)0xC0000000) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); - } - } -} - -static void do_writestub(int n) -{ - assem_debug("do_writestub %x",start+stubs[n][3]*4); - literal_pool(256); - set_jump_target(stubs[n][1],(intptr_t)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt,r; - - if(itype[i]==C1LS) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,r=FTEMP); - }else{ - rth=get_reg(i_regmap,rs2[i]|64); - rt=get_reg(i_regmap,r=rs2[i]); - } - assert(addr>=0); - assert(rt>=0); - intptr_t ftable=0; - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(intptr_t)write_byte_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(intptr_t)write_hword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(intptr_t)write_word_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(intptr_t)write_dword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(r?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - save_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call((intptr_t)ftable); - restore_regs(reglist); - - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - - if((cc=get_reg(i_regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_writestub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - int addr=get_reg(regmap,-1); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - assert(addr>=0); - assert(rt>=0); - - intptr_t ftable=0; - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(intptr_t)write_byte_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(intptr_t)write_hword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(intptr_t)write_word_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(intptr_t)write_dword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(target?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - save_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call((intptr_t)ftable); - restore_regs(reglist); - - if(((signed int)addr_const>=(signed int)0xC0000000)||((addr_const>>16)==0xa430)||((addr_const>>16)==0x8430)) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if((cc=get_reg(regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } -} - -static void do_unalignedwritestub(int n) -{ - set_jump_target(stubs[n][1],(intptr_t)out); - emit_breakpoint(0); - emit_jmp(stubs[n][2]); // return address + emit_jmp(linker); } static void do_invstub(int n) @@ -3529,30 +3233,9 @@ static void do_dirty_stub_ds(struct ll_entry *head) emit_call((intptr_t)verify_code); } -static void do_cop1stub(int n) -{ - literal_pool(256); - assem_debug("do_cop1stub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(intptr_t)out); - int i=stubs[n][3]; - //int rs=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - int ds=stubs[n][6]; - if(!ds) { - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - //if(i_regs!=®s[i]) DebugMessage(M64MSG_VERBOSE, "oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); - } - //else {DebugMessage(M64MSG_ERROR, "fp exception in delay slot");} - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - if(regs[i].regmap_entry[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_movimm(start+(i-ds)*4,EAX); // Get PC - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*ccadj[i],HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... - emit_jmp(ds?(intptr_t)fp_exception_ds:(intptr_t)fp_exception); -} - /* TLB */ -static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u_int addr) +static int do_tlb_r(int s,int ar,int map,int cache,int x,int c,u_int addr) { if(c) { if((signed int)addr>=(signed int)0xC0000000) { @@ -3577,8 +3260,6 @@ static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u } // Schedule this while we wait on the load //if(x) emit_xorimm(s,x,ar); - if(shift>=0) emit_shlimm(s,3,shift); - if(~a) emit_andimm(s,a,ar); emit_readdword_dualindexedx8(FP,map,map); } return map; @@ -3594,16 +3275,6 @@ static int do_tlb_r_branch(int map, int c, u_int addr, intptr_t *jaddr) return map; } -static int do_tlb_r_branch_debug(int map, int c, u_int addr, intptr_t *jaddr) -{ - if(!c) { - emit_test64(map,map); - *jaddr=(intptr_t)out; - emit_js(0); - } - return map; -} - static int do_tlb_w(int s,int ar,int map,int cache,int x,int c,u_int addr) { if(c) { @@ -3639,21 +3310,24 @@ static void do_tlb_w_branch(int map, int c, u_int addr, intptr_t *jaddr) } } -static void do_tlb_w_branch_debug(int map, int c, u_int addr, intptr_t *jaddr) -{ - if(!c) { - emit_testimm64(map,WRITE_PROTECT); - *jaddr=(intptr_t)out; - emit_jne(0); - } -} - // Generate the address of the memory_map entry, relative to dynarec_local static void generate_map_const(u_int addr,int tr) { //DebugMessage(M64MSG_VERBOSE, "generate_map_const(%x,%s)",addr,regname[tr]); emit_movimm((addr>>12)+(fp_memory_map>>3),tr); } +static void set_rounding_mode(int s,int temp) +{ + assert(temp>=0); + emit_andimm(s,3,temp); + emit_addimm64(FP,fp_rounding_modes,HOST_TEMPREG); + emit_readword_dualindexedx4(HOST_TEMPREG,temp,temp); + output_w32(0xd53b4400|HOST_TEMPREG); /*Read FPCR*/ + emit_andimm(HOST_TEMPREG,~0xc00000,HOST_TEMPREG); /*Clear RMode*/ + emit_or(temp,HOST_TEMPREG,HOST_TEMPREG); /*Set RMode*/ + output_w32(0xd51b4400|HOST_TEMPREG); /*Write FPCR*/ +} + /* Special assem */ static void shift_assemble_arm64(int i,struct regstat *i_regs) { @@ -3747,380 +3421,162 @@ static void shift_assemble_arm64(int i,struct regstat *i_regs) static void loadlr_assemble_arm64(int i,struct regstat *i_regs) { - int s,th,tl,temp,temp2,addr,map=-1,cache=-1; - int offset; + signed char s,th,tl,temp,temp2,temp2h,addr,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; intptr_t jaddr=0; - int memtarget=0; - int c=0; u_int hr,reglist=0; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); temp=get_reg(i_regs->regmap,-1); temp2=get_reg(i_regs->regmap,FTEMP); + temp2h=get_reg(i_regs->regmap,FTEMP|64); addr=get_reg(i_regs->regmap,AGEN1+(i&1)); assert(addr<0); + assert(temp>=0); + assert(temp2>=0); offset=imm[i]; + for(hr=0;hrregmap[hr]>=0) reglist|=1<=0) { c=(i_regs->wasconst>>s)&1; - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } + if(offset||s<0||c) addr=temp2; + else addr=s; + int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg + + switch(opcode[i]) { + case 0x22: type=LOADWL_STUB; break; + case 0x26: type=LOADWR_STUB; break; + case 0x1A: type=LOADDL_STUB; break; + case 0x1B: type=LOADDR_STUB; break; + } + +#ifndef INTERPRET_LOADLR + int ldlr=(opcode[i]==0x1A||opcode[i]==0x1B); // LDL/LDR always do inline_readstub if non constant if(!using_tlb) { - if(!c) { - emit_shlimm(addr,3,temp); - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_andimm(addr,0xFFFFFFFC,temp2); // LWL/LWR - }else{ - emit_andimm(addr,0xFFFFFFF8,temp2); // LDL/LDR - } + if(!c&&!ldlr) { emit_cmpimm(addr,0x800000); jaddr=(intptr_t)out; emit_jno(0); } - else { - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_movimm(((constmap[i][s]+offset)<<3)&24,temp); // LWL/LWR - }else{ - emit_movimm(((constmap[i][s]+offset)<<3)&56,temp); // LDL/LDR - } - } #ifdef RAM_OFFSET - map=get_reg(i_regs->regmap,ROREG); - if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + if(((!c&&!ldlr)||memtarget)&&!dummy) { + map=get_reg(i_regs->regmap,ROREG); + if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + } #endif }else{ // using tlb - int a; - if(c) { - a=-1; - }else if (opcode[i]==0x22||opcode[i]==0x26) { - a=0xFFFFFFFC; // LWL/LWR - }else{ - a=0xFFFFFFF8; // LDL/LDR - } map=get_reg(i_regs->regmap,TLREG); - cache=get_reg(i_regs->regmap,MMREG); // Get cached offset to memory_map + cache=get_reg(i_regs->regmap,MMREG); assert(map>=0); reglist&=~(1<regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { + if((!c||memtarget)&&!dummy) { + if(opcode[i]==0x22||opcode[i]==0x26) { // LWL/LWR assert(tl>=0); - emit_andimm(temp,24,temp); - if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR - emit_movimm(-1,HOST_TEMPREG); - if (opcode[i]==0x26) { - emit_shr(temp2,temp,temp2); - emit_shr(HOST_TEMPREG,temp,HOST_TEMPREG); - emit_bic(tl,HOST_TEMPREG,tl); - }else{ - emit_shl(temp2,temp,temp2); - emit_shl(HOST_TEMPREG,temp,HOST_TEMPREG); + if(!c) { + emit_shlimm(addr,3,temp); + emit_andimm(addr,~3,temp2); + emit_readword_indexed_tlb(0,temp2,map,temp2); + emit_andimm(temp,24,temp); + if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR + emit_movimm(-1,HOST_TEMPREG); + if (opcode[i]==0x26) { + emit_shr(temp2,temp,temp2); + emit_shr(HOST_TEMPREG,temp,HOST_TEMPREG); + }else{ + emit_shl(temp2,temp,temp2); + emit_shl(HOST_TEMPREG,temp,HOST_TEMPREG); + } emit_bic(tl,HOST_TEMPREG,tl); + emit_or(temp2,tl,tl); } - emit_or(temp2,tl,tl); - } - //emit_storereg(rt1[i],tl); // DEBUG - } - if (opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR - int temp2h=get_reg(i_regs->regmap,FTEMP|64); - if(!c||memtarget) { - //if(th>=0) emit_readword_indexed((intptr_t)g_dev.rdram.dram-0x80000000,temp2,temp2h); - //emit_readword_indexed((intptr_t)g_dev.rdram.dram-0x7FFFFFFC,temp2,temp2); - emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); - if(jaddr) add_stub(LOADD_STUB,jaddr,(intptr_t)out,i,temp2,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADD_STUB,i,(constmap[i][s]+offset)&0xFFFFFFF8,i_regs->regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { - assert(th>=0); - assert(tl>=0); - assert(temp>=0); - assert(temp2>=0); - assert(temp2h>=0); - reglist&=~(1<=0); - assert(tl>=0); - emit_andimm(temp,56,temp); - if (opcode[i]==0x1A) { // LDL - emit_mov(temp2,HOST_TEMPREG); - emit_orrshlimm64(temp2h,32,HOST_TEMPREG); - emit_mov(tl,temp2); - emit_orrshlimm64(th,32,temp2); - emit_movn64(0,temp2h); - emit_shl64(temp2h,temp,temp2h); - emit_bic64(temp2,temp2h,temp2); - emit_shl64(HOST_TEMPREG,temp,HOST_TEMPREG); - emit_orr64(temp2,HOST_TEMPREG,temp2); - emit_mov(temp2,tl); - emit_shrimm64(temp2,32,th); - } - if (opcode[i]==0x1B) { // LDR - emit_xorimm(temp,56,temp); - emit_mov(temp2,HOST_TEMPREG); - emit_orrshlimm64(temp2h,32,HOST_TEMPREG); - emit_mov(tl,temp2); - emit_orrshlimm64(th,32,temp2); - emit_movn64(0,temp2h); - emit_shr64(temp2h,temp,temp2h); - emit_bic64(temp2,temp2h,temp2); - emit_shr64(HOST_TEMPREG,temp,HOST_TEMPREG); - emit_orr64(temp2,HOST_TEMPREG,temp2); - emit_mov(temp2,tl); - emit_shrimm64(temp2,32,th); - }*/ - } - } -} -#define loadlr_assemble loadlr_assemble_arm64 - -static void cop0_assemble(int i,struct regstat *i_regs) -{ - u_int hr,reglist=0; - for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,rt1[i]); - char copr=(source[i]>>11)&0x1f; - if(t>=0) { - reglist&=~(1<regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); + else + { + int shift=((constmap[i][s]+offset)&3)<<3; + uint32_t mask=~UINT32_C(0); + if (opcode[i]==0x26) { //LWR + shift^=24; + mask>>=shift; + } else { //LWL + mask<<=shift; } - //Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_RANDOM_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); + if((constmap[i][s]+offset)&3) + emit_andimm(addr,~3,temp2); - emit_call((intptr_t)MFC0_new); - restore_regs(reglist); - emit_readword((uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt,t); + if(shift) { + emit_readword_indexed_tlb(0,temp2,map,temp2); + if (opcode[i]==0x26) emit_shrimm(temp2,shift,temp2); + else emit_shlimm(temp2,shift,temp2); + emit_andimm(tl,~mask,tl); + emit_or(temp2,tl,tl); + } + else + emit_readword_indexed_tlb(0,temp2,map,tl); + } + } + if(opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR + assert(tl>=0); + assert(th>=0); + assert(temp2h>=0); + if(!c) { + //TODO: implement recompiled code + inline_readstub(type,i,0,addr,i_regs,rt1[i],ccadj[i],reglist); + } + else + { + int shift=((constmap[i][s]+offset)&7)<<3; + uint64_t mask=~UINT64_C(0); + if (opcode[i]==0x1B) { //LDR + shift^=56; + mask>>=shift; + } else { //LDL + mask<<=shift; + } + + if((constmap[i][s]+offset)&7) + emit_andimm(addr,~7,temp2); + + if(shift) { + emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); + if (opcode[i]==0x1B) { + emit_shrdimm(temp2h,temp2,shift,temp2h); + emit_shrimm(temp2,shift,temp2); + } else { + emit_shldimm(temp2h,temp2,shift,temp2h); + emit_shlimm(temp2,shift,temp2); + } + emit_andimm(tl,~mask,tl); + emit_andimm(th,~mask>>32,th); + emit_or(temp2,tl,tl); + emit_or(temp2h,th,th); + } + else + emit_readdword_indexed_tlb(0,temp2,map,th,tl); } } } - else if(opcode2[i]==4) // MTC0 - { - signed char s=get_reg(i_regs->regmap,rs1[i]); - char copr=(source[i]>>11)&0x1f; - assert(s>=0); - save_regs(reglist); - emit_writeword(s,(uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - // Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG) - // Always update the pcaddr even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_movimm(start+i*4+(copr==CP0_STATUS_REG)*4,ARG4_REG); - - emit_call((intptr_t)MTC0_new); - restore_regs(reglist); - - if(copr==12||copr==9) { - assert(!is_delayslot); - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,HOST_TEMPREG); - emit_test(HOST_TEMPREG,HOST_TEMPREG); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if(copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG){ - if((cc=get_reg(i_regs->regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - } - - cop1_usable=0; - } - else - { - assert(opcode2[i]==0x10); - if((source[i]&0x3f)==0x08) // TLBP - { - save_regs(reglist); - emit_call((intptr_t)cached_interp_TLBP); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x01) // TLBR - { - save_regs(reglist); - emit_call((intptr_t)cached_interp_TLBR); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x02) { // TLBWI - assert(!is_delayslot); - save_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - - emit_call((intptr_t)TLBWI_new); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x06) { // TLBWR - assert(!is_delayslot); - save_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_call((intptr_t)TLBWR_new); - restore_regs(reglist); - } - else if((source[i]&0x3f)==0x18) // ERET - { - assert(!is_delayslot); - int count=ccadj[i]; - if(i_regs->regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*count,HOST_CCREG); // TODO: Should there be an extra cycle here? - emit_jmp((intptr_t)jump_eret); - } - } -} - -static void cop1_assemble(int i,struct regstat *i_regs) -{ - // Check cop1 unusable - if(!cop1_usable) { - signed char rs=get_reg(i_regs->regmap,CSREG); - assert(rs>=0); - emit_testimm(rs,0x20000000); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); - cop1_usable=1; - } - if (opcode2[i]==0) { // MFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],tl); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==1) { // DMFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - signed char th=get_reg(i_regs->regmap,rt1[i]|64); - if(tl>=0) { - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],tl); - if(th>=0) emit_readword_indexed(4,tl,th); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==4) { // MTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char temp=get_reg(i_regs->regmap,-1); - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==5) { // DMTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char sh=rs1[i]>0?get_reg(i_regs->regmap,rs1[i]|64):sl; - signed char temp=get_reg(i_regs->regmap,-1); - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sh,4,temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==2) // CFC1 - { - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - u_int copr=(source[i]>>11)&0x1f; - if(copr==0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr0,tl); - if(copr==31) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,tl); - } - } - else if (opcode2[i]==6) // CTC1 - { - signed char sl=get_reg(i_regs->regmap,rs1[i]); - u_int copr=(source[i]>>11)&0x1f; - assert(sl>=0); - if(copr==31) - { - emit_writeword(sl,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31); - - // Set the rounding mode - signed char temp=get_reg(i_regs->regmap,-1); - assert(temp>=0); - emit_andimm(sl,3,temp); - emit_addimm64(FP,fp_rounding_modes,HOST_TEMPREG); - emit_readword_dualindexedx4(HOST_TEMPREG,temp,temp); - output_w32(0xd53b4400|HOST_TEMPREG); /*Read FPCR*/ - emit_andimm(HOST_TEMPREG,~0xc00000,HOST_TEMPREG); /*Clear RMode*/ - emit_or(temp,HOST_TEMPREG,HOST_TEMPREG); /*Set RMode*/ - output_w32(0xd51b4400|HOST_TEMPREG); /*Write FPCR*/ - } + if(jaddr) { + add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + } else if(c&&!memtarget) { + inline_readstub(type,i,(constmap[i][s]+offset),addr,i_regs,rt1[i],ccadj[i],reglist); } +#else + inline_readstub(type,i,c?(constmap[i][s]+offset):0,addr,i_regs,rt1[i],ccadj[i],reglist); +#endif } +#define loadlr_assemble loadlr_assemble_arm64 static void fconv_assemble_arm64(int i,struct regstat *i_regs) { @@ -4130,13 +3586,14 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs) if(!cop1_usable) { signed char rs=get_reg(i_regs->regmap,CSREG); assert(rs>=0); - emit_testimm(rs,0x20000000); + emit_testimm(rs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCONV /*Single-precision to Integer*/ //TOBEDONE @@ -4352,6 +3809,7 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs) emit_fstd(31,temp); return; } +#endif // C emulation code @@ -4359,10 +3817,13 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs) for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); save_regs(reglist); if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_w); @@ -4373,13 +3834,15 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs) emit_call((intptr_t)cvt_d_w); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_l); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_d_l); @@ -4391,32 +3854,37 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs) emit_call((intptr_t)cvt_d_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_l_s); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) { - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_l_d); @@ -4517,13 +3985,14 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,cs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCOMP if((source[i]&0x3f)==0x30) { emit_andimm(fs,~0x800000,fs); return; @@ -4581,6 +4050,7 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_csel_ls(temp,fs,fs); // c_ngt_d return; } +#endif // C only @@ -4589,6 +4059,7 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(i_regs->regmap[hr]>=0) reglist|=1<regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,cs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FLOAT if((source[i]&0x3f)==6) // mov { if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) { @@ -4776,23 +4248,28 @@ static void float_assemble(int i,struct regstat *i_regs) } return; } +#endif u_int hr,reglist=0; for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); if(opcode2[i]==0x10) { // Single precision save_regs(reglist); switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); break; @@ -4819,13 +4296,15 @@ static void float_assemble(int i,struct regstat *i_regs) switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_addimm64(FP,fp_fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); break; @@ -4863,7 +4342,8 @@ static void multdiv_assemble_arm64(int i,struct regstat *i_regs) { if((opcode2[i]&4)==0) // 32-bit { - if(opcode2[i]==0x18) // MULT +#ifndef INTERPRET_MULT + if((opcode2[i]==0x18) || (opcode2[i]==0x19)) { signed char m1=get_reg(i_regs->regmap,rs1[i]); signed char m2=get_reg(i_regs->regmap,rs2[i]); @@ -4873,25 +4353,19 @@ static void multdiv_assemble_arm64(int i,struct regstat *i_regs) assert(m2>=0); assert(high>=0); assert(low>=0); - emit_smull(m1,m2,high); + + if(opcode2[i]==0x18) //MULT + emit_smull(m1,m2,high); + else if(opcode2[i]==0x19) //MULTU + emit_umull(m1,m2,high); + emit_mov(high,low); emit_shrimm64(high,32,high); } - else if(opcode2[i]==0x19) // MULTU - { - signed char m1=get_reg(i_regs->regmap,rs1[i]); - signed char m2=get_reg(i_regs->regmap,rs2[i]); - signed char high=get_reg(i_regs->regmap,HIREG); - signed char low=get_reg(i_regs->regmap,LOREG); - assert(m1>=0); - assert(m2>=0); - assert(high>=0); - assert(low>=0); - emit_umull(m1,m2,high); - emit_mov(high,low); - emit_shrimm64(high,32,high); - } - else if(opcode2[i]==0x1A) // DIV + else +#endif +#ifndef INTERPRET_DIV + if((opcode2[i]==0x1A) || (opcode2[i]==0x1B)) { signed char numerator=get_reg(i_regs->regmap,rs1[i]); signed char denominator=get_reg(i_regs->regmap,rs2[i]); @@ -4904,31 +4378,57 @@ static void multdiv_assemble_arm64(int i,struct regstat *i_regs) emit_test(denominator,denominator); intptr_t jaddr=(intptr_t)out; emit_jeq(0); // Division by zero - emit_sdiv(numerator,denominator,quotient); + + if(opcode2[i]==0x1A) //DIV + emit_sdiv(numerator,denominator,quotient); + else if(opcode2[i]==0x1B) //DIVU + emit_udiv(numerator,denominator,quotient); + emit_msub(quotient,denominator,numerator,remainder); set_jump_target(jaddr,(intptr_t)out); } - else if(opcode2[i]==0x1B) // DIVU + else +#endif { - signed char numerator=get_reg(i_regs->regmap,rs1[i]); - signed char denominator=get_reg(i_regs->regmap,rs2[i]); - assert(numerator>=0); - assert(denominator>=0); - signed char quotient=get_reg(i_regs->regmap,LOREG); - signed char remainder=get_reg(i_regs->regmap,HIREG); - assert(quotient>=0); - assert(remainder>=0); - emit_test(denominator,denominator); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); // Division by zero - emit_udiv(numerator,denominator,quotient); - emit_msub(quotient,denominator,numerator,remainder); - set_jump_target(jaddr,(intptr_t)out); + u_int reglist=0; + signed char r1=get_reg(i_regs->regmap,rs1[i]); + signed char r2=get_reg(i_regs->regmap,rs2[i]); + signed char hi=get_reg(i_regs->regmap,HIREG); + signed char lo=get_reg(i_regs->regmap,LOREG); + assert(r1>=0); + assert(r2>=0); + + for(int hr=0;hrregmap[hr]>=0) reglist|=1<=0) reglist&=~(1<=0) reglist&=~(1<=0) emit_loadreg(HIREG,hi); + if(lo>=0) emit_loadreg(LOREG,lo); } } else // 64-bit { -#ifndef INTERPRETED_MULT64 +#ifndef INTERPRET_MULT64 if(opcode2[i]==0x1C||opcode2[i]==0x1D) { signed char m1h=get_reg(i_regs->regmap,rs1[i]|64); @@ -4971,7 +4471,7 @@ static void multdiv_assemble_arm64(int i,struct regstat *i_regs) } else #endif -#ifndef INTERPRETED_DIV64 +#ifndef INTERPRET_DIV64 if((opcode2[i]==0x1E)||(opcode2[i]==0x1F)) { signed char numh=get_reg(i_regs->regmap,rs1[i]|64); @@ -5020,14 +4520,14 @@ static void multdiv_assemble_arm64(int i,struct regstat *i_regs) #endif { u_int reglist=0; - char r1h=get_reg(i_regs->regmap,rs1[i]|64); - char r1l=get_reg(i_regs->regmap,rs1[i]); - char r2h=get_reg(i_regs->regmap,rs2[i]|64); - char r2l=get_reg(i_regs->regmap,rs2[i]); - char hih=get_reg(i_regs->regmap,HIREG|64); - char hil=get_reg(i_regs->regmap,HIREG); - char loh=get_reg(i_regs->regmap,LOREG|64); - char lol=get_reg(i_regs->regmap,LOREG); + signed char r1h=get_reg(i_regs->regmap,rs1[i]|64); + signed char r1l=get_reg(i_regs->regmap,rs1[i]); + signed char r2h=get_reg(i_regs->regmap,rs2[i]|64); + signed char r2l=get_reg(i_regs->regmap,rs2[i]); + signed char hih=get_reg(i_regs->regmap,HIREG|64); + signed char hil=get_reg(i_regs->regmap,HIREG); + signed char loh=get_reg(i_regs->regmap,LOREG|64); + signed char lol=get_reg(i_regs->regmap,LOREG); assert(r1h>=0); assert(r2h>=0); assert(r1l>=0); @@ -5177,10 +4677,14 @@ static void arch_init(void) { jump_table_symbols[0] = (intptr_t)cached_interp_TLBR; jump_table_symbols[1] = (intptr_t)cached_interp_TLBP; - jump_table_symbols[2] = (intptr_t)cached_interp_DMULT; - jump_table_symbols[3] = (intptr_t)cached_interp_DMULTU; - jump_table_symbols[4] = (intptr_t)cached_interp_DDIV; - jump_table_symbols[5] = (intptr_t)cached_interp_DDIVU; + jump_table_symbols[2] = (intptr_t)cached_interp_MULT; + jump_table_symbols[3] = (intptr_t)cached_interp_MULTU; + jump_table_symbols[4] = (intptr_t)cached_interp_DIV; + jump_table_symbols[5] = (intptr_t)cached_interp_DIVU; + jump_table_symbols[6] = (intptr_t)cached_interp_DMULT; + jump_table_symbols[7] = (intptr_t)cached_interp_DMULTU; + jump_table_symbols[8] = (intptr_t)cached_interp_DDIV; + jump_table_symbols[9] = (intptr_t)cached_interp_DDIVU; // Trampolines for jumps >128MB intptr_t *ptr,*ptr2,*ptr3; diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.h b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.h index beb3d1e..a57026b 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.h +++ b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/assem_arm64.h @@ -14,8 +14,6 @@ //#define HAVE_CONDITIONAL_CALL 1 #define RAM_OFFSET 1 #define USE_MINI_HT 1 -//#define INTERPRETED_MULT64 1 -//#define INTERPRETED_DIV64 1 /* ARM calling convention: x0-x18: caller-save diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/linkage_arm64.S b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/linkage_arm64.S index 340f740..6c31d7a 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/arm64/linkage_arm64.S +++ b/mupen64plus-core/src/device/r4300/new_dynarec/arm64/linkage_arm64.S @@ -49,27 +49,10 @@ device_r4300_new_dynarec_hot_state_dynarec_local = (offsetof_struct_device_r4300 saved_context = 160 /* Defines offsets for fp addressed variables */ -fp_next_interrupt = offsetof_struct_new_dynarec_hot_state_next_interrupt fp_cycle_count = offsetof_struct_new_dynarec_hot_state_cycle_count fp_pending_exception = offsetof_struct_new_dynarec_hot_state_pending_exception fp_pcaddr = offsetof_struct_new_dynarec_hot_state_pcaddr fp_stop = offsetof_struct_new_dynarec_hot_state_stop -fp_invc_ptr = offsetof_struct_new_dynarec_hot_state_invc_ptr -fp_fcr0 = offsetof_struct_new_dynarec_hot_state_fcr0 -fp_fcr31 = offsetof_struct_new_dynarec_hot_state_fcr31 -fp_regs = offsetof_struct_new_dynarec_hot_state_regs -fp_hi = offsetof_struct_new_dynarec_hot_state_hi -fp_lo = offsetof_struct_new_dynarec_hot_state_lo -fp_cp0_regs = offsetof_struct_new_dynarec_hot_state_cp0_regs -fp_cp1_regs_simple = offsetof_struct_new_dynarec_hot_state_cp1_regs_simple -fp_cp1_regs_double = offsetof_struct_new_dynarec_hot_state_cp1_regs_double -fp_rounding_modes = offsetof_struct_new_dynarec_hot_state_rounding_modes -fp_branch_target = offsetof_struct_new_dynarec_hot_state_branch_target -fp_pc = offsetof_struct_new_dynarec_hot_state_pc -fp_fake_pc = offsetof_struct_new_dynarec_hot_state_fake_pc -fp_mini_ht = offsetof_struct_new_dynarec_hot_state_mini_ht -fp_restore_candidate = offsetof_struct_new_dynarec_hot_state_restore_candidate -fp_memory_map = offsetof_struct_new_dynarec_hot_state_memory_map TEXT_SECTION @@ -140,20 +123,10 @@ GLOBAL_FUNCTION(jump_vaddr_x17): mov w0, w17 b jump_vaddr -GLOBAL_FUNCTION(jump_vaddr_x18): - brk 0 /*trampoline jumps uses x18*/ - mov w0, w18 - b jump_vaddr - GLOBAL_FUNCTION(jump_vaddr_x19): mov w0, w19 b jump_vaddr -GLOBAL_FUNCTION(jump_vaddr_x20): - brk 0 /*address in cycle count*/ - mov w0, w20 - b jump_vaddr - GLOBAL_FUNCTION(jump_vaddr_x21): mov w0, w21 b jump_vaddr @@ -190,12 +163,7 @@ GLOBAL_FUNCTION(jump_vaddr_x7): mov w0, w7 GLOBAL_FUNCTION(jump_vaddr): - str w20, [x29, #fp_cycle_count] - ldr w18, [x29, #fp_next_interrupt] - add w20, w18, w20 /* Count */ - str w20, [x29, #fp_cp0_regs+36] /* Count */ bl get_addr_ht - ldr w20, [x29, #fp_cycle_count] br x0 GLOBAL_FUNCTION(verify_code): @@ -211,36 +179,25 @@ GLOBAL_FUNCTION(verify_code): br x0 GLOBAL_FUNCTION(cc_interrupt): - ldr w0, [x29, #fp_next_interrupt] - add w20, w0, w20 /* Count */ + str w20, [x29, #fp_cycle_count] str wzr, [x29, #fp_pending_exception] - mov w1, #0x1fc - lsr w0, w20, #19 - and w1, w1, w0 - add x0, x29, #fp_restore_candidate - str w20, [x29, #fp_cp0_regs+36] /* Count */ - ldr w22, [x1, x0] mov x20, x30 /* Save link register */ - tst w22, w22 - b.ne .E4 -.E1: bl dynarec_gen_interrupt mov x30, x20 /* Restore link register */ - ldr w20, [x29, #fp_cp0_regs+36] /* Count */ - ldr w0, [x29, #fp_next_interrupt] + ldr w20, [x29, #fp_cycle_count] ldr w1, [x29, #fp_pending_exception] ldr w2, [x29, #fp_stop] - sub w20, w20, w0 tst w2, w2 - b.ne .E3 + b.ne new_dyna_stop tst w1, w1 - b.ne .E2 + b.ne .E1 ret -.E2: +.E1: ldr w0, [x29, #fp_pcaddr] bl get_addr_ht br x0 -.E3: + +LOCAL_FUNCTION(new_dyna_stop): add x16, x29, #saved_context ldp x19,x20,[x16,#0] ldp x21,x22,[x16,#16] @@ -249,98 +206,41 @@ GLOBAL_FUNCTION(cc_interrupt): ldp x27,x28,[x16,#64] ldp x29,x30,[x16,#80] ret -.E4: - /* Move 'dirty' blocks to the 'clean' list */ - str wzr, [x1, x0] - lsl w21, w1, #3 - mov w23, #0 -.E5: - tst w22, #1 - b.eq .E6 - add w0, w21, w23 - bl clean_blocks -.E6: - lsr w22, w22, #1 - add w23, w23, #1 - tst w23, #31 - b.ne .E5 - b .E1 GLOBAL_FUNCTION(do_interrupt): + ldr w2, [x29, #fp_stop] + tst w2, w2 + b.ne new_dyna_stop ldr w0, [x29, #fp_pcaddr] bl get_addr_ht - ldr w1, [x29, #fp_next_interrupt] - ldr w20, [x29, #fp_cp0_regs+36] /* Count */ - sub w20, w20, w1 + ldr w20, [x29, #fp_cycle_count] br x0 GLOBAL_FUNCTION(fp_exception): - mov w2, #0x10000000 - add w2, w2, #0x2c -.E7: - ldr w1, [x29, #fp_cp0_regs+48] /* Status */ - mov w3, #0x80000000 - str w0, [x29, #fp_cp0_regs+56] /* EPC */ - orr w1, w1, #2 - str w1, [x29, #fp_cp0_regs+48] /* Status */ - str w2, [x29, #fp_cp0_regs+52] /* Cause */ - add w0, w3, #0x180 - bl get_addr_ht + str w0, [x29, #fp_pcaddr] + bl cop1_unusable br x0 -GLOBAL_FUNCTION(fp_exception_ds): - mov w2, #0x90000000 /* Set high bit if delay slot */ - add w2, w2, #0x2c - b .E7 - GLOBAL_FUNCTION(jump_syscall): - mov w2, #0x20 - b .E7 + str w0, [x29, #fp_pcaddr] + bl SYSCALL_new + br x0 GLOBAL_FUNCTION(jump_eret): - ldr w1, [x29, #fp_cp0_regs+48] /* Status */ - ldr w0, [x29, #fp_next_interrupt] - bic w1, w1, #2 - add w20, w0, w20 - str w1, [x29, #fp_cp0_regs+48] /* Status */ - str w20, [x29, #fp_cp0_regs+36] /* Count */ - bl new_dynarec_check_interrupt - ldr w1, [x29, #fp_next_interrupt] - ldr w0, [x29, #fp_cp0_regs+56] /* EPC */ - subs w20, w20, w1 - b.pl .E11 -.E8: - add x6, x29, #fp_regs+256 - mov w5, #248 - mov w1, #0 -.E9: - /*TODO: Optimize for 64bit*/ - sub x6, x6, #8 - ldr w2, [x6] - ldr w3, [x6, #4] - eor w3, w3, w2, asr #31 - subs w3, w3, #1 - adc w1, w1, w1 - subs w5, w5, #8 - b.ne .E9 - ldr w2, [x29, #fp_hi] - ldr w3, [x29, #fp_hi+4] - eor w3, w3, w2, asr #31 - tst w3, w3 - b.ne .E10 - ldr w2, [x29, #fp_lo] - ldr w3, [x29, #fp_lo+4] - eor w3, w3, w2, asr #31 -.E10: - subs w3, w3, #1 - adc w1, w1, w1 - bl get_addr_32 + str w20, [x29, #fp_cycle_count] + bl ERET_new + ldr w20, [x29, #fp_cycle_count] + tst w0, w0 + b.eq new_dyna_stop + br x0 + +GLOBAL_FUNCTION(dyna_linker): + bl dynamic_linker + br x0 + +GLOBAL_FUNCTION(dyna_linker_ds): + bl dynamic_linker_ds br x0 -.E11: - str w0, [x29, #fp_pcaddr] - bl cc_interrupt - ldr w0, [x29, #fp_pcaddr] - b .E8 GLOBAL_FUNCTION(new_dyna_start): adrp x16, g_dev @@ -360,9 +260,7 @@ GLOBAL_FUNCTION(new_dyna_start): ldr x19, [x1] add w0, w0, #0x40 bl new_recompile_block - ldr w0, [x29, #fp_next_interrupt] - ldr w20, [x29, #fp_cp0_regs+36] /* Count */ - sub w20, w20, w0 + ldr w20, [x29, #fp_cycle_count] br x19 GLOBAL_FUNCTION(breakpoint): diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c b/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c index 4f4a704..9621db0 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c @@ -74,6 +74,19 @@ void recomp_dbg_block(int addr); #define INV_DEBUG 0 #define COUNT_NOTCOMPILEDS 0 +//#define INTERPRET_LOAD +//#define INTERPRET_STORE +//#define INTERPRET_C1LS +//#define INTERPRET_LOADLR +//#define INTERPRET_STORELR +//#define INTERPRET_MULT +//#define INTERPRET_DIV +//#define INTERPRET_MULT64 +//#define INTERPRET_DIV64 +//#define INTERPRET_FCONV +//#define INTERPRET_FLOAT +//#define INTERPRET_FCOMP + #if ASSEM_DEBUG #define assem_debug(...) DebugMessage(M64MSG_VERBOSE, __VA_ARGS__) #else @@ -152,12 +165,20 @@ void recomp_dbg_block(int addr); #define LOADD_STUB 6 #define LOADBU_STUB 7 #define LOADHU_STUB 8 -#define STOREB_STUB 9 -#define STOREH_STUB 10 -#define STOREW_STUB 11 -#define STORED_STUB 12 -#define STORELR_STUB 13 -#define INVCODE_STUB 14 +#define LOADWU_STUB 9 +#define STOREB_STUB 10 +#define STOREH_STUB 11 +#define STOREW_STUB 12 +#define STORED_STUB 13 +#define LOADWR_STUB 14 +#define LOADWL_STUB 15 +#define LOADDR_STUB 16 +#define LOADDL_STUB 17 +#define STOREWL_STUB 18 +#define STOREWR_STUB 19 +#define STOREDL_STUB 20 +#define STOREDR_STUB 21 +#define INVCODE_STUB 22 /* branch codes */ #define TAKEN 1 @@ -200,26 +221,33 @@ void verify_code(void); void cc_interrupt(void); void do_interrupt(void); void fp_exception(void); -void fp_exception_ds(void); void jump_syscall(void); void jump_eret(void); +void dyna_linker(void); +void dyna_linker_ds(void); void breakpoint(void); /* interpreted opcode */ -static void ldl_merge(void); -static void ldr_merge(void); -static void TLBWI_new(int pcaddr, int count, int diff); -static void TLBWR_new(int pcaddr, int count, int diff); -static void MFC0_new(int copr, int count, int diff); -static void MTC0_new(int copr, int count, int diff, int pcaddr); -static void read_byte_new(int pcaddr, int count, int diff); -static void read_hword_new(int pcaddr, int count, int diff); -static void read_word_new(int pcaddr, int count, int diff); -static void read_dword_new(int pcaddr, int count, int diff); -static void write_byte_new(int pcaddr, int count, int diff); -static void write_hword_new(int pcaddr, int count, int diff); -static void write_word_new(int pcaddr, int count, int diff); -static void write_dword_new(int pcaddr, int count, int diff); +static void TLBWI_new(int pcaddr, int count); +static void TLBWR_new(int pcaddr, int count); +static void MFC0_new(int copr, int count); +static void MTC0_new(int copr, int count, int pcaddr); +static void read_byte_new(int pcaddr, int count); +static void read_hword_new(int pcaddr, int count); +static void read_word_new(int pcaddr, int count); +static void read_dword_new(int pcaddr, int count); +static void write_byte_new(int pcaddr, int count); +static void write_hword_new(int pcaddr, int count); +static void write_word_new(int pcaddr, int count); +static void write_dword_new(int pcaddr, int count); +static void LWL_new(int pcaddr, int count); +static void LWR_new(int pcaddr, int count); +static void LDL_new(int pcaddr, int count); +static void LDR_new(int pcaddr, int count); +static void SWL_new(int pcaddr, int count); +static void SWR_new(int pcaddr, int count); +static void SDL_new(int pcaddr, int count); +static void SDR_new(int pcaddr, int count); int new_recompile_block(int addr); void invalidate_block(u_int block); @@ -229,6 +257,10 @@ static void wb_register(signed char r,signed char regmap[],uint64_t dirty,uint64 static void wb_dirtys(signed char i_regmap[],uint64_t i_is32,uint64_t i_dirty); static void load_regs_entry(int t); static void load_all_consts(signed char regmap[],int is32,u_int dirty,u_int isconst,int i); +static void do_readstub(int n); +static void inline_readstub(int type,int i,u_int addr_const,char addr,struct regstat *i_regs,int target,int adj,u_int reglist); +static void do_writestub(int n); +static void inline_writestub(int type,int i,u_int addr_const,char addr,struct regstat *i_regs,int target,int adj,u_int reglist); void *base_addr; void *base_addr_rx; @@ -291,6 +323,7 @@ static struct ll_entry* hash_table[65536][2]; static struct ll_entry *jump_in[4096]; static struct ll_entry *jump_dirty[4096]; static struct ll_entry *jump_out[4096]; +static unsigned char restore_candidate[512]; #if COUNT_NOTCOMPILEDS static int notcompiledCount = 0; @@ -301,11 +334,6 @@ static signed char regmap[MAXBLOCK][HOST_REGS]; static signed char regmap_entry[MAXBLOCK][HOST_REGS]; #endif -void dynarec_gen_interrupt(void) -{ - gen_interrupt(&g_dev.r4300); -} - static void clear_all_regs(signed char regmap[]) { int hr; @@ -1387,7 +1415,7 @@ static void clean_registers(int istart,int iend,int wr) if(regs[i].regmap[r]!=regmap_pre[i][r]) { temp_will_dirty&=~(1<0 && (regmap_pre[i][r]&63)<34) { + if((regmap_pre[i][r]&63)>0 && (regmap_pre[i][r]&63)>(regmap_pre[i][r]&63))&1)<>(regmap_pre[i][r]&63))&1)<=0) { + else if(regmap_pre[i][r]>=0&&(nr=get_reg(regs[i].regmap,regmap_pre[i][r]))>=0) { // Register moved to a different register will_dirty_i&=~(1<0 && (regmap_pre[i][r]&63)<34) { + if((regmap_pre[i][r]&63)>0 && (regmap_pre[i][r]&63)>(regmap_pre[i][r]&63))&1)<>(regmap_pre[i][r]&63))&1)<cached_interp.invalid_code[r4300->cp0.tlb.LUT_r[vaddr>>12]>>12]=0; r4300->new_dynarec_hot_state.memory_map[r4300->cp0.tlb.LUT_r[vaddr>>12]>>12]|=WRITE_PROTECT; } - r4300->new_dynarec_hot_state.restore_candidate[vpage>>3]|=1<<(vpage&7); + restore_candidate[vpage>>3]|=1<<(vpage&7); } - else r4300->new_dynarec_hot_state.restore_candidate[page>>3]|=1<<(page&7); + else restore_candidate[page>>3]|=1<<(page&7); return head; } } @@ -1955,7 +1983,7 @@ static struct ll_entry *get_dirty(struct r4300_core* r4300,u_int vaddr,u_int fla return NULL; } -static void *dyna_linker(void * src, u_int vaddr) +void *dynamic_linker(void * src, u_int vaddr) { assert((vaddr&1)==0); struct r4300_core* r4300 = &g_dev.r4300; @@ -2005,7 +2033,7 @@ static void *dyna_linker(void * src, u_int vaddr) } int r=new_recompile_block(vaddr); - if(r==0) return dyna_linker(src,vaddr); + if(r==0) return dynamic_linker(src,vaddr); // Execute in unmapped page, generate pagefault execption assert(r4300->cp0.tlb.LUT_r[(vaddr&~1) >> 12] == 0); assert((intptr_t)r4300->new_dynarec_hot_state.memory_map[(vaddr&~1) >> 12] < 0); @@ -2014,7 +2042,7 @@ static void *dyna_linker(void * src, u_int vaddr) return get_addr_ht(r4300->new_dynarec_hot_state.pcaddr); } -static void *dyna_linker_ds(void * src, u_int vaddr) +void *dynamic_linker_ds(void * src, u_int vaddr) { struct r4300_core* r4300 = &g_dev.r4300; struct ll_entry *head; @@ -2063,7 +2091,7 @@ static void *dyna_linker_ds(void * src, u_int vaddr) } int r=new_recompile_block((vaddr&0xFFFFFFF8)+1); - if(r==0) return dyna_linker_ds(src,vaddr); + if(r==0) return dynamic_linker_ds(src,vaddr); // Execute in unmapped page, generate pagefault execption assert(r4300->cp0.tlb.LUT_r[(vaddr&~1) >> 12] == 0); assert((intptr_t)r4300->new_dynarec_hot_state.memory_map[(vaddr&~1) >> 12] < 0); @@ -2319,8 +2347,8 @@ static void invalidate_all_pages(void) for(page=0;page<1048576;page++) { if(!g_dev.r4300.cached_interp.invalid_code[page]) { - g_dev.r4300.new_dynarec_hot_state.restore_candidate[(page&2047)>>3]|=1<<(page&7); - g_dev.r4300.new_dynarec_hot_state.restore_candidate[((page&2047)>>3)+256]|=1<<(page&7); + restore_candidate[(page&2047)>>3]|=1<<(page&7); + restore_candidate[((page&2047)>>3)+256]|=1<<(page&7); } } #if NEW_DYNAREC >= NEW_DYNAREC_ARM @@ -2741,7 +2769,11 @@ static void load_alloc(struct regstat *current,int i) dirty_reg(current,rt1[i]); if(opcode[i]==0x22||opcode[i]==0x26) // LWL/LWR +#if NEW_DYNAREC == NEW_DYNAREC_X86 + alloc_reg64(current,i,FTEMP); // x86 needs another temp register +#else alloc_reg(current,i,FTEMP); +#endif else if(opcode[i]==0x1A||opcode[i]==0x1B) // LDL/LDR alloc_reg64(current,i,FTEMP); @@ -2831,8 +2863,18 @@ void multdiv_alloc(struct regstat *current,int i) { if((opcode2[i]&4)==0) // 32-bit { - current->u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<uu&=~(1LL<u&=~(1LL<uu&=~(1LL<u&=~(1LL<uu&=~(1LL<regmap[hr]>=0) reglist|=1<regmap,rt1[i]); + char copr=(source[i]>>11)&0x1f; + if(t>=0) { + reglist&=~(1<regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + + //Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_RANDOM_REG) +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*ccadj[i]); + emit_pushimm(copr); + emit_call((intptr_t)MFC0_new); + emit_addimm(ESP,8,ESP); +#else + emit_movimm(copr,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG2_REG); + emit_call((intptr_t)MFC0_new); +#endif + + restore_regs(reglist); + emit_readword((uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt,t); + } + } + } + else if(opcode2[i]==4) // MTC0 + { + signed char s=get_reg(i_regs->regmap,rs1[i]); + char copr=(source[i]>>11)&0x1f; + assert(s>=0); + + emit_writeword(s,(uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt); + + int cc=get_reg(i_regs->regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + + // Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG) + // Always update the pcaddr even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(start+i*4); + emit_pushimm(CLOCK_DIVIDER*(ccadj[i]+(copr==CP0_STATUS_REG))); + emit_pushimm(copr); + emit_call((intptr_t)MTC0_new); + emit_addimm(ESP,12,ESP); +#else + emit_movimm(copr,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*(ccadj[i]+(copr==CP0_STATUS_REG)),ARG2_REG); + emit_movimm(start+i*4,ARG3_REG); + emit_call((intptr_t)MTC0_new); +#endif + + restore_regs(reglist); + + if(copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) { + assert(!is_delayslot); + emit_cmpmem_imm((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + emit_jmp((intptr_t)&do_interrupt); + set_jump_target(jaddr,(intptr_t)out); + } + + if(copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG){ + if(cc>=0) { + emit_loadreg(CCREG,cc); + } + } + + cop1_usable=0; + } + else + { + assert(opcode2[i]==0x10); + if((source[i]&0x3f)==0x08) // TLBP + { + save_regs(reglist); + emit_call((intptr_t)cached_interp_TLBP); + restore_regs(reglist); + } + else if((source[i]&0x3f)==0x01) // TLBR + { + save_regs(reglist); + emit_call((intptr_t)cached_interp_TLBR); + restore_regs(reglist); + } + else if((source[i]&0x3f)==0x02) { // TLBWI + assert(!is_delayslot); + + int cc=get_reg(i_regs->regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*ccadj[i]); + emit_pushimm(start+i*4); + emit_call((intptr_t)TLBWI_new); + emit_addimm(ESP,8,ESP); +#else + emit_movimm(start+i*4,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG2_REG); + emit_call((intptr_t)TLBWI_new); +#endif + + restore_regs(reglist); + } + else if((source[i]&0x3f)==0x06) { // TLBWR + assert(!is_delayslot); + + int cc=get_reg(i_regs->regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*ccadj[i]); + emit_pushimm(start+i*4); + emit_call((intptr_t)TLBWR_new); + emit_addimm(ESP,8,ESP); +#else + emit_movimm(start+i*4,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG2_REG); + emit_call((intptr_t)TLBWR_new); +#endif + + restore_regs(reglist); + } + else if((source[i]&0x3f)==0x18) // ERET + { + assert(!is_delayslot); + int count=ccadj[i]; + if(i_regs->regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); + emit_addimm(HOST_CCREG,CLOCK_DIVIDER*count,HOST_CCREG); + emit_jmp((intptr_t)jump_eret); + } + } +} + +static void cop1_assemble(int i,struct regstat *i_regs) +{ + // Check cop1 unusable + if(!cop1_usable) { + signed char rs=get_reg(i_regs->regmap,CSREG); + assert(rs>=0); + emit_testimm(rs,CP0_STATUS_CU1); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); + cop1_usable=1; + } + if (opcode2[i]==0) { // MFC1 + signed char tl=get_reg(i_regs->regmap,rt1[i]); + if(tl>=0) { + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],tl); + emit_readword_indexed(0,tl,tl); + } + } + else if (opcode2[i]==1) { // DMFC1 + signed char tl=get_reg(i_regs->regmap,rt1[i]); + signed char th=get_reg(i_regs->regmap,rt1[i]|64); + if(tl>=0) { + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],tl); + if(th>=0) emit_readword_indexed(4,tl,th); + emit_readword_indexed(0,tl,tl); + } + } + else if (opcode2[i]==4) { // MTC1 + signed char sl=get_reg(i_regs->regmap,rs1[i]); + signed char temp=get_reg(i_regs->regmap,-1); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); + emit_writeword_indexed(sl,0,temp); + } + else if (opcode2[i]==5) { // DMTC1 + signed char sl=get_reg(i_regs->regmap,rs1[i]); + signed char sh=rs1[i]>0?get_reg(i_regs->regmap,rs1[i]|64):sl; + signed char temp=get_reg(i_regs->regmap,-1); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); + emit_writeword_indexed(sh,4,temp); + emit_writeword_indexed(sl,0,temp); + } + else if (opcode2[i]==2) // CFC1 + { + signed char tl=get_reg(i_regs->regmap,rt1[i]); + signed char fs=get_reg(i_regs->regmap,FSREG); + if(tl>=0) { + u_int copr=(source[i]>>11)&0x1f; + if(copr==0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr0,tl); + if(copr==31) + { + if(fs>=0) emit_mov(fs,tl); + else emit_loadreg(FSREG,tl); + } + } + } + else if (opcode2[i]==6) // CTC1 + { + signed char sl=get_reg(i_regs->regmap,rs1[i]); + signed char fs=get_reg(i_regs->regmap,FSREG); + signed char temp=get_reg(i_regs->regmap,-1); + u_int copr=(source[i]>>11)&0x1f; + assert(sl>=0); + if(copr==31) + { + if(fs>=0) emit_mov(sl,fs); + else emit_storereg(FSREG,sl); + set_rounding_mode(sl,temp); + } + } +} + static void alu_assemble(int i,struct regstat *i_regs) { if(opcode2[i]>=0x20&&opcode2[i]<=0x23) { // ADD/ADDU/SUB/SUBU @@ -3848,13 +4134,11 @@ void shift_assemble(int i,struct regstat *i_regs) } #endif -#ifndef load_assemble static void load_assemble(int i,struct regstat *i_regs) { - int s,th,tl,addr,map=-1,cache=-1; - int offset; + signed char s,th,tl,addr,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; intptr_t jaddr=0; - int memtarget=0,c=0; u_int hr,reglist=0; int agr=AGEN1+(i&1); th=get_reg(i_regs->regmap,rt1[i]|64); @@ -3867,18 +4151,30 @@ static void load_assemble(int i,struct regstat *i_regs) if(i_regs->regmap[HOST_CCREG]==CCREG) reglist&=~(1<=0) { c=(i_regs->wasconst>>s)&1; -#ifndef INTERPRET_LOAD - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; -#endif + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } int temp=get_reg(i_regs->regmap,agr); if(temp<0) temp=get_reg(i_regs->regmap,-1); + assert(temp>=0); if(tl<0) tl=temp; if(offset||s<0||c) addr=temp; else addr=s; assert(tl>=0); // Even if the load is a NOP, we must check for pagefaults and I/O + int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg + + switch(opcode[i]) { + case 0x20: type=LOADB_STUB; break; + case 0x21: type=LOADH_STUB; break; + case 0x23: type=LOADW_STUB; break; + case 0x24: type=LOADBU_STUB; break; + case 0x25: type=LOADHU_STUB; break; + case 0x27: type=LOADWU_STUB; break; + case 0x37: type=LOADD_STUB; break; + } + +#ifndef INTERPRET_LOAD if(!using_tlb) { if(!c) { //#define R29_HACK 1 @@ -3887,7 +4183,6 @@ static void load_assemble(int i,struct regstat *i_regs) if(rs1[i]!=29||start<0x80001000||start>=0x80800000) #endif { -#ifndef INTERPRET_LOAD emit_cmpimm(addr,0x800000); jaddr=(intptr_t)out; #ifdef CORTEX_A8_BRANCH_PREDICTION_HACK @@ -3897,21 +4192,19 @@ static void load_assemble(int i,struct regstat *i_regs) else #endif emit_jno(0); -#else - jaddr=(intptr_t)out; - emit_jmp(0); -#endif } } + #ifdef RAM_OFFSET #ifndef NATIVE_64 - if(!c) + if(!c&&!dummy) + #else + if((!c||memtarget)&&!dummy) #endif { - #ifdef RAM_OFFSET map=get_reg(i_regs->regmap,ROREG); if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); - #endif } + #endif }else{ // using tlb int x=0; if (opcode[i]==0x20||opcode[i]==0x24) x=3; // LB/LBU @@ -3920,151 +4213,99 @@ static void load_assemble(int i,struct regstat *i_regs) cache=get_reg(i_regs->regmap,MMREG); assert(map>=0); reglist&=~(1<=0); + #ifdef HOST_IMM_ADDR32 + if(c) + emit_readword_tlb(constmap[i][s]+offset,map,tl); + else + #endif + emit_readword_indexed_tlb(0,addr,map,tl); + emit_zeroreg(th); + } + else if (opcode[i]==0x37) { // LD + #ifdef HOST_IMM_ADDR32 + if(c) + emit_readdword_tlb(constmap[i][s]+offset,map,th,tl); + else + #endif + emit_readdword_indexed_tlb(0,addr,map,th,tl); + } + } + if(jaddr) { + add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + } else if(c&&!memtarget) { + inline_readstub(type,i,constmap[i][s]+offset,addr,i_regs,rt1[i],ccadj[i],reglist); + } #else - do_tlb_r_branch_debug(map,c,constmap[i][s]+offset,&jaddr); + inline_readstub(type,i,c?(constmap[i][s]+offset):0,addr,i_regs,rt1[i],ccadj[i],reglist); #endif - } - int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg - if (opcode[i]==0x20) { // LB - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_movsbl_tlb((constmap[i][s]+offset)^3,map,tl); - else - #endif - { - int x=0; - if(!c) emit_xorimm(addr,3,temp); - else x=((constmap[i][s]+offset)^3)-(constmap[i][s]+offset); - emit_movsbl_indexed_tlb(x,temp,map,tl); - } - } - if(jaddr) - add_stub(LOADB_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADB_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - if (opcode[i]==0x21) { // LH - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_movswl_tlb((constmap[i][s]+offset)^2,map,tl); - else - #endif - { - int x=0; - if(!c) emit_xorimm(addr,2,temp); - else x=((constmap[i][s]+offset)^2)-(constmap[i][s]+offset); - emit_movswl_indexed_tlb(x,temp,map,tl); - } - } - if(jaddr) - add_stub(LOADH_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADH_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - if (opcode[i]==0x23) { // LW - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_readword_tlb(constmap[i][s]+offset,map,tl); - else - #endif - emit_readword_indexed_tlb(0,addr,map,tl); - } - if(jaddr) - add_stub(LOADW_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADW_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - if (opcode[i]==0x24) { // LBU - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_movzbl_tlb((constmap[i][s]+offset)^3,map,tl); - else - #endif - { - int x=0; - if(!c) emit_xorimm(addr,3,temp); - else x=((constmap[i][s]+offset)^3)-(constmap[i][s]+offset); - emit_movzbl_indexed_tlb(x,temp,map,tl); - } - } - if(jaddr) - add_stub(LOADBU_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADBU_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - if (opcode[i]==0x25) { // LHU - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_movzwl_tlb((constmap[i][s]+offset)^2,map,tl); - else - #endif - { - int x=0; - if(!c) emit_xorimm(addr,2,temp); - else x=((constmap[i][s]+offset)^2)-(constmap[i][s]+offset); - emit_movzwl_indexed_tlb(x,temp,map,tl); - } - } - if(jaddr) - add_stub(LOADHU_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADHU_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - if (opcode[i]==0x27) { // LWU - assert(th>=0); - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_readword_tlb(constmap[i][s]+offset,map,tl); - else - #endif - emit_readword_indexed_tlb(0,addr,map,tl); - } - if(jaddr) - add_stub(LOADW_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else { - inline_readstub(LOADW_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } - emit_zeroreg(th); - } - if (opcode[i]==0x37) { // LD - if(!c||memtarget) { - if(!dummy) { - #ifdef HOST_IMM_ADDR32 - if(c) - emit_readdword_tlb(constmap[i][s]+offset,map,th,tl); - else - #endif - emit_readdword_indexed_tlb(0,addr,map,th,tl); - } - if(jaddr) - add_stub(LOADD_STUB,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADD_STUB,i,constmap[i][s]+offset,i_regs->regmap,rt1[i],ccadj[i],reglist); - } } -#endif #ifndef loadlr_assemble static void loadlr_assemble(int i,struct regstat *i_regs) @@ -4074,17 +4315,13 @@ static void loadlr_assemble(int i,struct regstat *i_regs) } #endif -#ifndef store_assemble static void store_assemble(int i,struct regstat *i_regs) { - int s,th,tl,map=-1,cache=-1; - int addr,temp; - int offset; + signed char s,th,tl,real_addr,addr,temp,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; intptr_t jaddr=0; - int type=0; - int memtarget=0,c=0; - int agr=AGEN1+(i&1); u_int hr,reglist=0; + int agr=AGEN1+(i&1); th=get_reg(i_regs->regmap,rs2[i]|64); tl=get_reg(i_regs->regmap,rs2[i]); s=get_reg(i_regs->regmap,rs1[i]); @@ -4093,10 +4330,8 @@ static void store_assemble(int i,struct regstat *i_regs) offset=imm[i]; if(s>=0) { c=(i_regs->wasconst>>s)&1; -#ifndef INTERPRET_STORE - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; -#endif + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } assert(tl>=0); assert(temp>=0); @@ -4106,6 +4341,16 @@ static void store_assemble(int i,struct regstat *i_regs) if(i_regs->regmap[HOST_CCREG]==CCREG) reglist&=~(1<=0x80800000) #endif emit_cmpimm(addr,0x800000); - #ifdef DESTRUCTIVE_SHIFT - if(s==addr) emit_mov(s,temp); - #endif #ifdef R29_HACK if(rs1[i]!=29||start<0x80001000||start>=0x80800000) #endif { -#ifndef INTERPRET_STORE jaddr=(intptr_t)out; #ifdef CORTEX_A8_BRANCH_PREDICTION_HACK // Hint to branch predictor that the branch is unlikely to be taken @@ -4130,15 +4371,16 @@ static void store_assemble(int i,struct regstat *i_regs) else #endif emit_jno(0); -#else - jaddr=(intptr_t)out; - emit_jmp(0); -#endif } + #ifdef DESTRUCTIVE_SHIFT + if(s==addr) emit_mov(s,temp); + #endif } #ifdef RAM_OFFSET - map=get_reg(i_regs->regmap,ROREG); - if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + if(!c||memtarget) { + map=get_reg(i_regs->regmap,ROREG); + if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + } #endif }else{ // using tlb int x=0; @@ -4149,38 +4391,26 @@ static void store_assemble(int i,struct regstat *i_regs) assert(map>=0); reglist&=~(1<=0); emit_writedword_indexed_tlb(th,tl,0,addr,map); @@ -4189,10 +4419,8 @@ static void store_assemble(int i,struct regstat *i_regs) emit_writedword_indexed_tlb(tl,tl,0,addr,map); } } - type=STORED_STUB; - } - if(!using_tlb) { - if(!c||memtarget) { + + if(!using_tlb) { #ifdef DESTRUCTIVE_SHIFT // The x86 shift operation is 'destructive'; it overwrites the // source register, so we need to make a copy first and use that. @@ -4215,27 +4443,22 @@ static void store_assemble(int i,struct regstat *i_regs) } } if(jaddr) { - add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + add_stub(type,jaddr,(intptr_t)out,i,real_addr,(intptr_t)i_regs,ccadj[i],reglist); } else if(c&&!memtarget) { - inline_writestub(type,i,constmap[i][s]+offset,i_regs->regmap,rs2[i],ccadj[i],reglist); + inline_writestub(type,i,constmap[i][s]+offset,real_addr,i_regs,rs2[i],ccadj[i],reglist); } -} +#else + inline_writestub(type,i,c?(constmap[i][s]+offset):0,real_addr,i_regs,rs2[i],ccadj[i],reglist); #endif +} -#ifndef storelr_assemble static void storelr_assemble(int i,struct regstat *i_regs) { - int s,th,tl; - int temp,real_temp; - int temp2; - int map=-1; - int offset; + signed char s,th,tl,real_addr,addr,temp,temp2,map=-1; + int offset,type=0,memtarget=0,c=0; intptr_t jaddr=0; - intptr_t case1,case2,case3; - intptr_t done0,done1,done2; - int memtarget=0,c=0; - int agr=AGEN1+(i&1); u_int hr,reglist=0; + int agr=AGEN1+(i&1); th=get_reg(i_regs->regmap,rs2[i]|64); tl=get_reg(i_regs->regmap,rs2[i]); s=get_reg(i_regs->regmap,rs1[i]); @@ -4244,234 +4467,279 @@ static void storelr_assemble(int i,struct regstat *i_regs) offset=imm[i]; if(s>=0) { c=(i_regs->isconst>>s)&1; - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } assert(tl>=0); + assert(temp>=0); for(hr=0;hrregmap[hr]>=0) reglist|=1<=0); - if(!using_tlb) { - if(!c) { - emit_cmpimm(s<0||offset?temp:s,0x800000); - if(!offset&&s!=temp) emit_mov(s,temp); - jaddr=(intptr_t)out; - emit_jno(0); - } - else - { - if(!memtarget||!rs1[i]) { - jaddr=(intptr_t)out; - emit_jmp(0); - } - } - #ifdef RAM_OFFSET - map=get_reg(i_regs->regmap,ROREG); - if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); - #endif - }else{ // using tlb - map=get_reg(i_regs->regmap,TLREG); - int cache=get_reg(i_regs->regmap,MMREG); - assert(map>=0); - reglist&=~(1<=0) emit_mov(s,temp); - do_tlb_w_branch(map,c,constmap[i][s]+offset,&jaddr); - if(!jaddr&&!memtarget) { - jaddr=(intptr_t)out; - emit_jmp(0); - } - } - real_temp=temp; -#if NEW_DYNAREC >= NEW_DYNAREC_ARM - if(map>=0){ - emit_addsl2(real_temp,map,map); - temp=map; map=-1; - } -#endif + if(offset||s<0||c) addr=temp; + else addr=s; + real_addr=addr; if (opcode[i]==0x2C||opcode[i]==0x2D) { // SDL/SDR temp2=get_reg(i_regs->regmap,FTEMP); if(!rs2[i]) temp2=th=tl; } - emit_testimm(real_temp,2); - case2=(intptr_t)out; - emit_jne(0); - emit_testimm(real_temp,1); - case1=(intptr_t)out; - emit_jne(0); - // 0 - if (opcode[i]==0x2A) { // SWL - emit_writeword_indexed_tlb(tl,0,temp,map); + switch(opcode[i]) { + case 0x2A: type=STOREWL_STUB; break; + case 0x2E: type=STOREWR_STUB; break; + case 0x2C: type=STOREDL_STUB; break; + case 0x2D: type=STOREDR_STUB; break; } - else if (opcode[i]==0x2E) { // SWR - emit_writebyte_indexed_tlb(tl,3,temp,map); - } - else if (opcode[i]==0x2C) { // SDL - emit_writeword_indexed_tlb(th,0,temp,map); - if(rs2[i]) emit_mov(tl,temp2); - } - else if (opcode[i]==0x2D) { // SDR - emit_writebyte_indexed_tlb(tl,3,temp,map); - if(rs2[i]) emit_shldimm(th,tl,24,temp2); - } - done0=(intptr_t)out; - emit_jmp(0); - // 1 - set_jump_target(case1,(intptr_t)out); - if (opcode[i]==0x2A) { // SWL - // Write 3 msb into three least significant bytes - if(rs2[i]) emit_rorimm(tl,8,tl); - emit_writehword_indexed_tlb(tl,-1,temp,map); - if(rs2[i]) emit_rorimm(tl,16,tl); - emit_writebyte_indexed_tlb(tl,1,temp,map); - if(rs2[i]) emit_rorimm(tl,8,tl); - } - else if (opcode[i]==0x2E) { // SWR - // Write two lsb into two most significant bytes - emit_writehword_indexed_tlb(tl,1,temp,map); - } - else if (opcode[i]==0x2C) { // SDL - if(rs2[i]) emit_shrdimm(tl,th,8,temp2); - // Write 3 msb into three least significant bytes - if(rs2[i]) emit_rorimm(th,8,th); - emit_writehword_indexed_tlb(th,-1,temp,map); - if(rs2[i]) emit_rorimm(th,16,th); - emit_writebyte_indexed_tlb(th,1,temp,map); - if(rs2[i]) emit_rorimm(th,8,th); - } - else if (opcode[i]==0x2D) { // SDR - if(rs2[i]) emit_shldimm(th,tl,16,temp2); - // Write two lsb into two most significant bytes - emit_writehword_indexed_tlb(tl,1,temp,map); - } - done1=(intptr_t)out; - emit_jmp(0); - // 2 - set_jump_target(case2,(intptr_t)out); - emit_testimm(real_temp,1); - case3=(intptr_t)out; - emit_jne(0); - if (opcode[i]==0x2A) { // SWL - // Write two msb into two least significant bytes - if(rs2[i]) emit_rorimm(tl,16,tl); - emit_writehword_indexed_tlb(tl,-2,temp,map); - if(rs2[i]) emit_rorimm(tl,16,tl); - } - else if (opcode[i]==0x2E) { // SWR - // Write 3 lsb into three most significant bytes - emit_writebyte_indexed_tlb(tl,-1,temp,map); - if(rs2[i]) emit_rorimm(tl,8,tl); - emit_writehword_indexed_tlb(tl,0,temp,map); - if(rs2[i]) emit_rorimm(tl,24,tl); - } - else if (opcode[i]==0x2C) { // SDL - if(rs2[i]) emit_shrdimm(tl,th,16,temp2); - // Write two msb into two least significant bytes - if(rs2[i]) emit_rorimm(th,16,th); - emit_writehword_indexed_tlb(th,-2,temp,map); - if(rs2[i]) emit_rorimm(th,16,th); - } - else if (opcode[i]==0x2D) { // SDR - if(rs2[i]) emit_shldimm(th,tl,8,temp2); - // Write 3 lsb into three most significant bytes - emit_writebyte_indexed_tlb(tl,-1,temp,map); - if(rs2[i]) emit_rorimm(tl,8,tl); - emit_writehword_indexed_tlb(tl,0,temp,map); - if(rs2[i]) emit_rorimm(tl,24,tl); - } - done2=(intptr_t)out; - emit_jmp(0); - // 3 - set_jump_target(case3,(intptr_t)out); - if (opcode[i]==0x2A) { // SWL - // Write msb into least significant byte - if(rs2[i]) emit_rorimm(tl,24,tl); - emit_writebyte_indexed_tlb(tl,-3,temp,map); - if(rs2[i]) emit_rorimm(tl,8,tl); - } - else if (opcode[i]==0x2E) { // SWR - // Write entire word - emit_writeword_indexed_tlb(tl,-3,temp,map); - } - else if (opcode[i]==0x2C) { // SDL - if(rs2[i]) emit_shrdimm(tl,th,24,temp2); - // Write msb into least significant byte - if(rs2[i]) emit_rorimm(th,24,th); - emit_writebyte_indexed_tlb(th,-3,temp,map); - if(rs2[i]) emit_rorimm(th,8,th); - } - else if (opcode[i]==0x2D) { // SDR - if(rs2[i]) emit_mov(th,temp2); - // Write entire word - emit_writeword_indexed_tlb(tl,-3,temp,map); - } - set_jump_target(done0,(intptr_t)out); - set_jump_target(done1,(intptr_t)out); - set_jump_target(done2,(intptr_t)out); - if (opcode[i]==0x2C) { // SDL - emit_testimm(real_temp,4); - done0=(intptr_t)out; - emit_jne(0); -#if NEW_DYNAREC == NEW_DYNAREC_ARM64 - emit_andimm64(temp,~3,temp); -#else - emit_andimm(temp,~3,temp); -#endif - emit_writeword_indexed_tlb(temp2,4,temp,map); - set_jump_target(done0,(intptr_t)out); - } - else if (opcode[i]==0x2D) { // SDR - emit_testimm(real_temp,4); - done0=(intptr_t)out; - emit_jeq(0); -#if NEW_DYNAREC == NEW_DYNAREC_ARM64 - emit_andimm64(temp,~3,temp); -#else - emit_andimm(temp,~3,temp); -#endif - emit_writeword_indexed_tlb(temp2,-4,temp,map); - set_jump_target(done0,(intptr_t)out); - } - if(!using_tlb) { - #if NEW_DYNAREC >= NEW_DYNAREC_ARM - map=get_reg(i_regs->regmap,ROREG); - if(map>=0) emit_loadreg(ROREG,map); - #endif - #if defined(HOST_IMM8) || defined(NEED_INVC_PTR) - int ir=get_reg(i_regs->regmap,INVCP); - assert(ir>=0); - emit_cmpmem_indexedsr12_reg(ir,real_temp,1); - #else - emit_cmpmem_indexedsr12_imm((intptr_t)g_dev.r4300.cached_interp.invalid_code,real_temp,1); - #endif - #if defined(HAVE_CONDITIONAL_CALL) && !defined(DESTRUCTIVE_SHIFT) - emit_callne(invalidate_addr_reg[real_temp]); - #else - intptr_t jaddr2=(intptr_t)out; - emit_jne(0); - add_stub(INVCODE_STUB,jaddr2,(intptr_t)out,reglist|(1<regmap,ROREG); + if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + } + #endif + }else{ // using tlb + map=get_reg(i_regs->regmap,TLREG); + int cache=get_reg(i_regs->regmap,MMREG); + assert(map>=0); + reglist&=~(1<= NEW_DYNAREC_ARM + assert(map>=0); + emit_addsl2(addr,map,map); + addr=map; map=-1; +#endif + if(!c) { + emit_testimm(real_addr,2); + case2=(intptr_t)out; + emit_jne(0); + emit_testimm(real_addr,1); + case1=(intptr_t)out; + emit_jne(0); + } + if(!c||((constmap[i][s]+offset)&3)==0) { + if (opcode[i]==0x2A) { // SWL + emit_writeword_indexed_tlb(tl,0,addr,map); + } + else if (opcode[i]==0x2E) { // SWR + emit_writebyte_indexed_tlb(tl,3,addr,map); + } + else if (opcode[i]==0x2C) { // SDL + emit_writeword_indexed_tlb(th,0,addr,map); + if(rs2[i]) emit_mov(tl,temp2); + } + else if (opcode[i]==0x2D) { // SDR + emit_writebyte_indexed_tlb(tl,3,addr,map); + if(rs2[i]) emit_shldimm(th,tl,24,temp2); + } + } + if(!c) { + done0=(intptr_t)out; + emit_jmp(0); + set_jump_target(case1,(intptr_t)out); + } + if(!c||((constmap[i][s]+offset)&3)==1) { + if (opcode[i]==0x2A) { // SWL + // Write 3 msb into three least significant bytes + if(rs2[i]) emit_rorimm(tl,8,tl); + emit_writehword_indexed_tlb(tl,-1,addr,map); + if(rs2[i]) emit_rorimm(tl,16,tl); + emit_writebyte_indexed_tlb(tl,1,addr,map); + if(rs2[i]) emit_rorimm(tl,8,tl); + } + else if (opcode[i]==0x2E) { // SWR + // Write two lsb into two most significant bytes + emit_writehword_indexed_tlb(tl,1,addr,map); + } + else if (opcode[i]==0x2C) { // SDL + if(rs2[i]) emit_shrdimm(tl,th,8,temp2); + // Write 3 msb into three least significant bytes + if(rs2[i]) emit_rorimm(th,8,th); + emit_writehword_indexed_tlb(th,-1,addr,map); + if(rs2[i]) emit_rorimm(th,16,th); + emit_writebyte_indexed_tlb(th,1,addr,map); + if(rs2[i]) emit_rorimm(th,8,th); + } + else if (opcode[i]==0x2D) { // SDR + if(rs2[i]) emit_shldimm(th,tl,16,temp2); + // Write two lsb into two most significant bytes + emit_writehword_indexed_tlb(tl,1,addr,map); + } + } + + if(!c) { + done1=(intptr_t)out; + emit_jmp(0); + set_jump_target(case2,(intptr_t)out); + emit_testimm(real_addr,1); + case3=(intptr_t)out; + emit_jne(0); + } + + if(!c||((constmap[i][s]+offset)&3)==2) { + if (opcode[i]==0x2A) { // SWL + // Write two msb into two least significant bytes + if(rs2[i]) emit_rorimm(tl,16,tl); + emit_writehword_indexed_tlb(tl,-2,addr,map); + if(rs2[i]) emit_rorimm(tl,16,tl); + } + else if (opcode[i]==0x2E) { // SWR + // Write 3 lsb into three most significant bytes + emit_writebyte_indexed_tlb(tl,-1,addr,map); + if(rs2[i]) emit_rorimm(tl,8,tl); + emit_writehword_indexed_tlb(tl,0,addr,map); + if(rs2[i]) emit_rorimm(tl,24,tl); + } + else if (opcode[i]==0x2C) { // SDL + if(rs2[i]) emit_shrdimm(tl,th,16,temp2); + // Write two msb into two least significant bytes + if(rs2[i]) emit_rorimm(th,16,th); + emit_writehword_indexed_tlb(th,-2,addr,map); + if(rs2[i]) emit_rorimm(th,16,th); + } + else if (opcode[i]==0x2D) { // SDR + if(rs2[i]) emit_shldimm(th,tl,8,temp2); + // Write 3 lsb into three most significant bytes + emit_writebyte_indexed_tlb(tl,-1,addr,map); + if(rs2[i]) emit_rorimm(tl,8,tl); + emit_writehword_indexed_tlb(tl,0,addr,map); + if(rs2[i]) emit_rorimm(tl,24,tl); + } + } + + if(!c) { + done2=(intptr_t)out; + emit_jmp(0); + set_jump_target(case3,(intptr_t)out); + } + + if(!c||((constmap[i][s]+offset)&3)==3) { + if (opcode[i]==0x2A) { // SWL + // Write msb into least significant byte + if(rs2[i]) emit_rorimm(tl,24,tl); + emit_writebyte_indexed_tlb(tl,-3,addr,map); + if(rs2[i]) emit_rorimm(tl,8,tl); + } + else if (opcode[i]==0x2E) { // SWR + // Write entire word + emit_writeword_indexed_tlb(tl,-3,addr,map); + } + else if (opcode[i]==0x2C) { // SDL + if(rs2[i]) emit_shrdimm(tl,th,24,temp2); + // Write msb into least significant byte + if(rs2[i]) emit_rorimm(th,24,th); + emit_writebyte_indexed_tlb(th,-3,addr,map); + if(rs2[i]) emit_rorimm(th,8,th); + } + else if (opcode[i]==0x2D) { // SDR + if(rs2[i]) emit_mov(th,temp2); + // Write entire word + emit_writeword_indexed_tlb(tl,-3,addr,map); + } + } + + if(!c) { + set_jump_target(done0,(intptr_t)out); + set_jump_target(done1,(intptr_t)out); + set_jump_target(done2,(intptr_t)out); + } + + signed char temp3=(addr==s)?temp:addr; + if (opcode[i]==0x2C) { // SDL + if(!c) { + emit_testimm(real_addr,4); + done0=(intptr_t)out; + emit_jne(0); + } + if(!c||((constmap[i][s]+offset)&4)==0) { + #if NEW_DYNAREC == NEW_DYNAREC_ARM64 + emit_andimm64(addr,~3,temp3); + #else + emit_andimm(addr,~3,temp3); + #endif + emit_writeword_indexed_tlb(temp2,4,temp3,map); + } + } + else if (opcode[i]==0x2D) { // SDR + if(!c) { + emit_testimm(real_addr,4); + done0=(intptr_t)out; + emit_jeq(0); + } + if(!c||((constmap[i][s]+offset)&4)!=0) { + #if NEW_DYNAREC == NEW_DYNAREC_ARM64 + emit_andimm64(addr,~3,temp3); + #else + emit_andimm(addr,~3,temp3); + #endif + emit_writeword_indexed_tlb(temp2,-4,temp3,map); + } + } + + if(!c) + set_jump_target(done0,(intptr_t)out); + + if(!using_tlb) { + #if NEW_DYNAREC >= NEW_DYNAREC_ARM + // Restore ram offset if allocated + map=get_reg(i_regs->regmap,ROREG); + if(map>=0) emit_loadreg(ROREG,map); + #endif + #ifdef DESTRUCTIVE_SHIFT + // The x86 shift operation is 'destructive'; it overwrites the + // source register, so we need to make a copy first and use that. + addr=temp; + #endif + #if defined(HOST_IMM8) || defined(NEED_INVC_PTR) + int ir=get_reg(i_regs->regmap,INVCP); + assert(ir>=0); + emit_cmpmem_indexedsr12_reg(ir,addr,1); + #else + emit_cmpmem_indexedsr12_imm((intptr_t)g_dev.r4300.cached_interp.invalid_code,addr,1); + #endif + #if defined(HAVE_CONDITIONAL_CALL) && !defined(DESTRUCTIVE_SHIFT) + emit_callne(invalidate_addr_reg[addr]); + #else + intptr_t jaddr2=(intptr_t)out; + emit_jne(0); + add_stub(INVCODE_STUB,jaddr2,(intptr_t)out,reglist|(1<regmap,FTEMP|64); tl=get_reg(i_regs->regmap,FTEMP); s=get_reg(i_regs->regmap,rs1[i]); @@ -4494,38 +4762,67 @@ static void c1ls_assemble(int i,struct regstat *i_regs) ar=temp; else // LWC1/LDC1 ar=tl; - //if(s<0) emit_loadreg(rs1[i],ar); //address_generation does this now - //else c=(i_regs->wasconst>>s)&1; - if(s>=0) c=(i_regs->wasconst>>s)&1; + + if(s>=0) { + c=(i_regs->wasconst>>s)&1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + } + if(offset||s<0||c) addr=ar; + else addr=s; + real_addr=addr; + + switch(opcode[i]) { + case 0x31: type=LOADW_STUB; break; + case 0x35: type=LOADD_STUB; break; + case 0x39: type=STOREW_STUB; break; + case 0x3D: type=STORED_STUB; break; + } + // Check cop1 unusable if(!cop1_usable) { signed char rs=get_reg(i_regs->regmap,CSREG); assert(rs>=0); - emit_testimm(rs,0x20000000); + emit_testimm(rs,CP0_STATUS_CU1); jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } if (opcode[i]==0x39) { // SWC1 (get float address) - emit_readptr((intptr_t)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],tl); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],tl); + emit_readword_indexed(0,tl,tl); } - if (opcode[i]==0x3D) { // SDC1 (get double address) - emit_readptr((intptr_t)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],tl); + else if (opcode[i]==0x3D) { // SDC1 (get double address) + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],tl); + emit_readword_indexed(4,tl,th); + emit_readword_indexed(0,tl,tl); } + +#ifndef INTERPRET_C1LS // Generate address + offset if(!using_tlb) { + if(!c) { + emit_cmpimm(addr,0x800000); + jaddr2=(intptr_t)out; + emit_jno(0); + #ifdef DESTRUCTIVE_SHIFT + if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 + if(s==addr) emit_mov(s,temp); + } + #endif + } #ifdef RAM_OFFSET #ifndef NATIVE_64 - if (!c||opcode[i]==0x39||opcode[i]==0x3D) // SWC1/SDC1 + if ((!c&&(opcode[i]==0x31||opcode[i]==0x35))||((!c||memtarget)&&(opcode[i]==0x39||opcode[i]==0x3D))) + #else + if(!c||memtarget) #endif { map=get_reg(i_regs->regmap,ROREG); if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); } #endif - if(!c) - emit_cmpimm(offset||c||s<0?ar:s,0x800000); } else { @@ -4534,106 +4831,86 @@ static void c1ls_assemble(int i,struct regstat *i_regs) assert(map>=0); reglist&=~(1<>16)&0x1f],temp); - } - if (opcode[i]==0x35) { // LDC1 (get target address) - emit_readptr((intptr_t)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],temp); - } - if(!using_tlb) { - if(!c) { - jaddr2=(intptr_t)out; - emit_jno(0); - } - else if(((signed int)(constmap[i][s]+offset))>=(signed int)0x80800000) { - jaddr2=(intptr_t)out; - emit_jmp(0); // inline_readstub/inline_writestub? Very rare case - } - #ifdef DESTRUCTIVE_SHIFT - if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 - if(!offset&&!c&&s>=0) emit_mov(s,ar); - } - #endif - }else{ - if (opcode[i]==0x31||opcode[i]==0x35) { // LWC1/LDC1 + map=do_tlb_r(addr,ar,map,cache,0,c,constmap[i][s]+offset); do_tlb_r_branch(map,c,constmap[i][s]+offset,&jaddr2); } - if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 + else if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 + map=do_tlb_w(addr,ar,map,cache,0,c,constmap[i][s]+offset); do_tlb_w_branch(map,c,constmap[i][s]+offset,&jaddr2); } } - if (opcode[i]==0x31) { // LWC1 - //if(s>=0&&!c&&!offset) emit_mov(s,tl); - #ifdef HOST_IMM_ADDR32 - if(c) emit_readword_tlb(constmap[i][s]+offset,map,tl); - else - #endif - emit_readword_indexed_tlb(0,offset||c||s<0?tl:s,map,tl); - type=LOADW_STUB; - } - if (opcode[i]==0x35) { // LDC1 - assert(th>=0); - //if(s>=0&&!c&&!offset) emit_mov(s,tl); - #ifdef HOST_IMM_ADDR32 - if(c) emit_readdword_tlb(constmap[i][s]+offset,map,th,tl); - else - #endif - emit_readdword_indexed_tlb(0,offset||c||s<0?tl:s,map,th,tl); - type=LOADD_STUB; - } - if (opcode[i]==0x39) { // SWC1 - emit_writeword_indexed_tlb(tl,0,offset||c||s<0?temp:s,map); - type=STOREW_STUB; - } - if (opcode[i]==0x3D) { // SDC1 - assert(th>=0); - emit_writedword_indexed_tlb(th,tl,0,offset||c||s<0?temp:s,map); - type=STORED_STUB; - } - if(!using_tlb) { - if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 - #ifndef DESTRUCTIVE_SHIFT - temp=offset||c||s<0?ar:s; + + if(!c||memtarget) { + if (opcode[i]==0x31) { // LWC1 + #ifdef HOST_IMM_ADDR32 + if(c) emit_readword_tlb(constmap[i][s]+offset,map,tl); + else #endif - #if defined(HOST_IMM8) || defined(NEED_INVC_PTR) - int ir=get_reg(i_regs->regmap,INVCP); - assert(ir>=0); - emit_cmpmem_indexedsr12_reg(ir,temp,1); - #else - emit_cmpmem_indexedsr12_imm((intptr_t)g_dev.r4300.cached_interp.invalid_code,temp,1); - #endif - #if defined(HAVE_CONDITIONAL_CALL) && !defined(DESTRUCTIVE_SHIFT) - emit_callne(invalidate_addr_reg[temp]); - #else - intptr_t jaddr3=(intptr_t)out; - emit_jne(0); - add_stub(INVCODE_STUB,jaddr3,(intptr_t)out,reglist|(1<=0); + #ifdef HOST_IMM_ADDR32 + if(c) emit_readdword_tlb(constmap[i][s]+offset,map,th,tl); + else #endif + emit_readdword_indexed_tlb(0,addr,map,th,tl); + } + else if (opcode[i]==0x39) { // SWC1 + emit_writeword_indexed_tlb(tl,0,addr,map); + } + else if (opcode[i]==0x3D) { // SDC1 + assert(th>=0); + emit_writedword_indexed_tlb(th,tl,0,addr,map); + } + + if(!using_tlb) { + if (opcode[i]==0x39||opcode[i]==0x3D) { // SWC1/SDC1 + #ifdef DESTRUCTIVE_SHIFT + addr=temp; + #endif + #if defined(HOST_IMM8) || defined(NEED_INVC_PTR) + int ir=get_reg(i_regs->regmap,INVCP); + assert(ir>=0); + emit_cmpmem_indexedsr12_reg(ir,addr,1); + #else + emit_cmpmem_indexedsr12_imm((intptr_t)g_dev.r4300.cached_interp.invalid_code,addr,1); + #endif + #if defined(HAVE_CONDITIONAL_CALL) && !defined(DESTRUCTIVE_SHIFT) + emit_callne(invalidate_addr_reg[addr]); + #else + intptr_t jaddr3=(intptr_t)out; + emit_jne(0); + add_stub(INVCODE_STUB,jaddr3,(intptr_t)out,reglist|(1<>16)&0x1f],temp); emit_writeword_indexed(tl,0,temp); } - if (opcode[i]==0x35) { // LDC1 (write double) + else if (opcode[i]==0x35) { // LDC1 (write double) + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],temp); emit_writeword_indexed(th,4,temp); emit_writeword_indexed(tl,0,temp); } } -#endif #ifndef multdiv_assemble void multdiv_assemble(int i,struct regstat *i_regs) @@ -4928,13 +5205,7 @@ static void address_generation(int i,struct regstat *i_regs,signed char entry[]) } // else did it in the previous cycle }*/ if(!entry||entry[ra]!=agr) { - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_movimm(offset&0xFFFFFFFC,ra); // LWL/LWR - }else if (opcode[i]==0x1a||opcode[i]==0x1b) { - emit_movimm(offset&0xFFFFFFF8,ra); // LDL/LDR - }else{ - emit_movimm(offset,ra); - } + emit_movimm(offset,ra); } // else did it in the previous cycle } else if(rs<0) { @@ -4960,66 +5231,37 @@ static void address_generation(int i,struct regstat *i_regs,signed char entry[]) } if(!entry||entry[ra]!=agr) { - if (opcode[i]==0x22||opcode[i]==0x26) { // LWL/LWR - // on x86 when source reg is constant - // address generation is always required - // ROREG not required - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - // on arm when source reg is constant - // address generation is always required - // When loading from rdram, add rdram address to load address to avoid loading ROREG - // ROREG only required when not loading from rdram (eg: using tlb) - if((signed int)constmap[i][rs]+offset<(signed int)0x80800000) - emit_movimm(((constmap[i][rs]+offset)&0xFFFFFFFC)+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - // on arm64 and x64 when source reg is constant - // address generation is always required - // ROREG is always required - #endif - emit_movimm((constmap[i][rs]+offset)&0xFFFFFFFC,ra); - }else if (opcode[i]==0x1a||opcode[i]==0x1b) { // LDL/LDR - // on x86 when source reg is constant - // address generation is always required - // ROREG not required - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - // on arm when source reg is constant - // address generation is always required - // When loading from rdram, add rdram address to load address to avoid loading ROREG - // ROREG only required when not loading from rdram (eg: using tlb) - if((signed int)constmap[i][rs]+offset<(signed int)0x80800000) - emit_movimm(((constmap[i][rs]+offset)&0xFFFFFFF8)+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - // on arm64 and x64 when source reg is constant - // address generation is always required - // ROREG is always required - #endif - emit_movimm((constmap[i][rs]+offset)&0xFFFFFFF8,ra); - }else{ - #ifdef HOST_IMM_ADDR32 - // on x86 when source reg is constant - // LB/LBU/LH/LHU/LW/LWU/LD/LWC1/LDC1 doesn't need address generation when not using tlb (avoid allocating temp register for address generation?) - // SDL/SDR/SB/SH/SW/SD/SWC1/SDC1 always need address generation - // ROREG not required - if((itype[i]!=LOAD&&opcode[i]!=0x31&&opcode[i]!=0x35) || - (using_tlb&&((signed int)constmap[i][rs]+offset)>=(signed int)0xC0000000)) - #endif - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - // address generation is always required - // When LB/LBU/LH/LHU/LW/LWU/LD/LWC1/LDC1 loading from rdram, add rdram address to load address to avoid loading ROREG - // ROREG only required for SDL/SDR/SB/SH/SW/SD/SWC1/SDC1 and when not loading from rdram (eg: using tlb) - #ifndef INTERPRET_LOAD - if((itype[i]==LOAD||opcode[i]==0x31||opcode[i]==0x35)&&(signed int)constmap[i][rs]+offset<(signed int)0x80800000) - #else - if((opcode[i]==0x31||opcode[i]==0x35)&&(signed int)constmap[i][rs]+offset<(signed int)0x80800000) - #endif - emit_movimm(constmap[i][rs]+offset+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - #endif - // on arm64 and x64 when source reg is constant - // address generation is always required - // ROREG is always required - emit_movimm(constmap[i][rs]+offset,ra); - } + int load=0; + #ifndef INTERPRET_LOAD + load|=(itype[i]==LOAD); + #endif + #ifndef INTERPRET_C1LS + load|=(opcode[i]==0x31||opcode[i]==0x35); + #endif + #ifndef INTERPRET_LOADLR + load|=(opcode[i]==0x22||opcode[i]==0x26||opcode[i]==0x1a||opcode[i]==0x1b); + #endif + + #ifdef HOST_IMM_ADDR32 + // on x86 when source reg is constant + // LB/LBU/LH/LHU/LW/LWU/LD/LWC1/LDC1 doesn't need address generation when not using tlb + // SDL/SDR/SB/SH/SW/SD/SWC1/SDC1 always need address generation + // ROREG not required + if(!load||(using_tlb&&((signed int)constmap[i][rs]+offset)>=(signed int)0xC0000000)) + #endif + #if defined(RAM_OFFSET) && !defined(NATIVE_64) + // on arm address generation is always required + // When LB/LBU/LH/LHU/LW/LWU/LD/LWC1/LDC1 loading from rdram, add rdram address to load address to avoid loading ROREG + // ROREG only required for SDL/SDR/SB/SH/SW/SD/SWC1/SDC1 and when not loading from rdram + if(load&&(signed int)constmap[i][rs]+offset<(signed int)0x80800000) + emit_movimm(constmap[i][rs]+offset+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); + else + #endif + // on arm64 and x64 when source reg is constant + // address generation is always required + // ROREG is always required + emit_movimm(constmap[i][rs]+offset,ra); + } // else did it in the previous cycle } if(offset&&!c&&rs1[i]) { @@ -5067,46 +5309,30 @@ static void address_generation(int i,struct regstat *i_regs,signed char entry[]) int offset=imm[i+1]; int c=(regs[i+1].wasconst>>rs)&1; if(c) { - if (opcode[i+1]==0x22||opcode[i+1]==0x26) { // LWL/LWR - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - if((signed int)constmap[i+1][rs]+offset<(signed int)0x80800000) - emit_movimm(((constmap[i+1][rs]+offset)&0xFFFFFFFC)+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - #endif - emit_movimm((constmap[i+1][rs]+offset)&0xFFFFFFFC,ra); - }else if (opcode[i+1]==0x1a||opcode[i+1]==0x1b) { // LDL/LDR - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - if((signed int)constmap[i+1][rs]+offset<(signed int)0x80800000) - emit_movimm(((constmap[i+1][rs]+offset)&0xFFFFFFF8)+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - #endif - emit_movimm((constmap[i+1][rs]+offset)&0xFFFFFFF8,ra); - }else{ - #ifdef HOST_IMM_ADDR32 - if((itype[i+1]!=LOAD&&opcode[i+1]!=0x31&&opcode[i+1]!=0x35) || - (using_tlb&&((signed int)constmap[i+1][rs]+offset)>=(signed int)0xC0000000)) - #endif - #if defined(RAM_OFFSET) && !defined(NATIVE_64) - #ifndef INTERPRET_LOAD - if((itype[i+1]==LOAD||opcode[i+1]==0x31||opcode[i+1]==0x35)&&(signed int)constmap[i+1][rs]+offset<(signed int)0x80800000) - #else - if((opcode[i+1]==0x31||opcode[i+1]==0x35)&&(signed int)constmap[i+1][rs]+offset<(signed int)0x80800000) - #endif - emit_movimm(constmap[i+1][rs]+offset+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); - else - #endif - emit_movimm(constmap[i+1][rs]+offset,ra); - } + int load=0; + #ifndef INTERPRET_LOAD + load|=(itype[i+1]==LOAD); + #endif + #ifndef INTERPRET_C1LS + load|=(opcode[i+1]==0x31||opcode[i+1]==0x35); + #endif + #ifndef INTERPRET_LOADLR + load|=(opcode[i+1]==0x22||opcode[i+1]==0x26||opcode[i+1]==0x1a||opcode[i+1]==0x1b); + #endif + + #ifdef HOST_IMM_ADDR32 + if(!load||(using_tlb&&((signed int)constmap[i+1][rs]+offset)>=(signed int)0xC0000000)) + #endif + #if defined(RAM_OFFSET) && !defined(NATIVE_64) + if(load&&(signed int)constmap[i+1][rs]+offset<(signed int)0x80800000) + emit_movimm(constmap[i+1][rs]+offset+(intptr_t)g_dev.rdram.dram-(intptr_t)0x80000000,ra); + else + #endif + emit_movimm(constmap[i+1][rs]+offset,ra); } else if(rs1[i+1]==0) { // Using r0 as a base address - if (opcode[i+1]==0x22||opcode[i+1]==0x26) { - emit_movimm(offset&0xFFFFFFFC,ra); // LWL/LWR - }else if (opcode[i+1]==0x1a||opcode[i+1]==0x1b) { - emit_movimm(offset&0xFFFFFFF8,ra); // LDL/LDR - }else{ - emit_movimm(offset,ra); - } + emit_movimm(offset,ra); } } } @@ -5235,24 +5461,22 @@ static void wb_dirtys(signed char i_regmap[],uint64_t i_is32,uint64_t i_dirty) int hr; for(hr=0;hr0) { - if(i_regmap[hr]!=CCREG) { - if((i_dirty>>hr)&1) { - if((i_regmap[hr]<64)&&((i_regmap[hr]&63)0)&&((i_regmap[hr]&63)>hr)&1) { + if(i_regmap[hr]<64) { + emit_storereg(i_regmap[hr],hr); + if(((i_is32>>i_regmap[hr])&1)) { + #ifdef DESTRUCTIVE_WRITEBACK + emit_sarimm(hr,31,hr); + emit_storereg(i_regmap[hr]|64,hr); + #else + emit_sarimm(hr,31,HOST_TEMPREG); + emit_storereg(i_regmap[hr]|64,HOST_TEMPREG); + #endif + } + }else{ + if(!((i_is32>>(i_regmap[hr]&63))&1)) { emit_storereg(i_regmap[hr],hr); - if( ((i_is32>>i_regmap[hr])&1) ) { - #ifdef DESTRUCTIVE_WRITEBACK - emit_sarimm(hr,31,hr); - emit_storereg(i_regmap[hr]|64,hr); - #else - emit_sarimm(hr,31,HOST_TEMPREG); - emit_storereg(i_regmap[hr]|64,HOST_TEMPREG); - #endif - } - }else if((i_regmap[hr]&63)>(i_regmap[hr]&63))&1) ) { - emit_storereg(i_regmap[hr],hr); - } } } } @@ -5268,25 +5492,23 @@ static void wb_needed_dirtys(signed char i_regmap[],uint64_t i_is32,uint64_t i_d int t=(addr-start)>>2; for(hr=0;hr0) { - if(i_regmap[hr]!=CCREG) { - if(i_regmap[hr]==regs[t].regmap_entry[hr] && ((regs[t].dirty>>hr)&1) && !(((i_is32&~regs[t].was32&~unneeded_reg_upper[t])>>(i_regmap[hr]&63))&1)) { - if((i_dirty>>hr)&1) { - if(i_regmap[hr]<64) { + if(((i_regmap[hr]&63)>0)&&((i_regmap[hr]&63)>hr)&1) && !(((i_is32&~regs[t].was32&~unneeded_reg_upper[t])>>(i_regmap[hr]&63))&1)) { + if((i_dirty>>hr)&1) { + if(i_regmap[hr]<64) { + emit_storereg(i_regmap[hr],hr); + if(((i_is32>>i_regmap[hr])&1)) { + #ifdef DESTRUCTIVE_WRITEBACK + emit_sarimm(hr,31,hr); + emit_storereg(i_regmap[hr]|64,hr); + #else + emit_sarimm(hr,31,HOST_TEMPREG); + emit_storereg(i_regmap[hr]|64,HOST_TEMPREG); + #endif + } + }else{ + if(!((i_is32>>(i_regmap[hr]&63))&1)) { emit_storereg(i_regmap[hr],hr); - if( ((i_is32>>i_regmap[hr])&1) ) { - #ifdef DESTRUCTIVE_WRITEBACK - emit_sarimm(hr,31,hr); - emit_storereg(i_regmap[hr]|64,hr); - #else - emit_sarimm(hr,31,HOST_TEMPREG); - emit_storereg(i_regmap[hr]|64,HOST_TEMPREG); - #endif - } - }else{ - if( !((i_is32>>(i_regmap[hr]&63))&1) ) { - emit_storereg(i_regmap[hr],hr); - } } } } @@ -5386,13 +5608,13 @@ static void store_regs_bt(signed char i_regmap[],uint64_t i_is32,uint64_t i_dirt int hr; for(hr=0;hr0 && i_regmap[hr]!=CCREG) { + if(((i_regmap[hr]&63)>0)&&((i_regmap[hr]&63)>hr)&1) || (((i_is32&~regs[t].was32&~unneeded_reg_upper[t])>>(i_regmap[hr]&63))&1)) { if((i_dirty>>hr)&1) { if(i_regmap[hr]<64) { if(!((unneeded_reg[t]>>i_regmap[hr])&1)) { emit_storereg(i_regmap[hr],hr); - if( ((i_is32>>i_regmap[hr])&1) && !((unneeded_reg_upper[t]>>i_regmap[hr])&1) ) { + if(((i_is32>>i_regmap[hr])&1) && !((unneeded_reg_upper[t]>>i_regmap[hr])&1)) { #ifdef DESTRUCTIVE_WRITEBACK emit_sarimm(hr,31,hr); emit_storereg(i_regmap[hr]|64,hr); @@ -5403,7 +5625,7 @@ static void store_regs_bt(signed char i_regmap[],uint64_t i_is32,uint64_t i_dirt } } }else{ - if( !((i_is32>>(i_regmap[hr]&63))&1) && !((unneeded_reg_upper[t]>>(i_regmap[hr]&63))&1) ) { + if(!((i_is32>>(i_regmap[hr]&63))&1) && !((unneeded_reg_upper[t]>>(i_regmap[hr]&63))&1)) { emit_storereg(i_regmap[hr],hr); } } @@ -5589,6 +5811,8 @@ static void ds_assemble_entry(int i) load_regs(regs[t].regmap_entry,regs[t].regmap,regs[t].was32,INVCP,INVCP); cop1_usable=0; is_delayslot=0; + int cc=ccadj[t]; + ccadj[t]=-1; switch(itype[t]) { case ALU: alu_assemble(t,®s[t]);break; @@ -5640,6 +5864,7 @@ static void ds_assemble_entry(int i) assert(internal_branch(regs[t].is32,ba[i]+4)); add_to_linker((intptr_t)out,ba[i]+4,internal_branch(regs[t].is32,ba[i]+4)); emit_jmp(0); + ccadj[t]=cc; } static void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int invert) @@ -5665,10 +5890,14 @@ static void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int i count=ccadj[i]; if(taken==TAKEN && i==(ba[i]-start)>>2 && source[i+1]==0) { // Idle loop - if(count&1) emit_addimm_and_set_flags(2*(count+2),HOST_CCREG); idle=(intptr_t)out; - //emit_subfrommem(&idlecount,HOST_CCREG); // Count idle cycles - emit_andimm(HOST_CCREG,3,HOST_CCREG); + emit_test(HOST_CCREG,HOST_CCREG); +#if NEW_DYNAREC >= NEW_DYNAREC_ARM + emit_cmovs_imm(0,HOST_CCREG); +#else + emit_cmovs(&const_zero,HOST_CCREG); +#endif + emit_addimm(HOST_CCREG,CLOCK_DIVIDER*2,HOST_CCREG); jaddr=(intptr_t)out; emit_jmp(0); } @@ -5937,7 +6166,7 @@ static void do_ccstub(int n) emit_jmp(stubs[n][2]); // return address /* This works but uses a lot of memory... - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.next_interrupt,ECX); + emit_readword((intptr_t)&g_dev.r4300.cp0.next_interrupt,ECX); emit_add(HOST_CCREG,ECX,EAX); emit_writeword(EAX,(intptr_t)&r4300_cp0_regs(&g_dev.r4300.cp0)[CP0_COUNT_REG]); emit_call((intptr_t)dynarec_gen_interrupt); @@ -6030,18 +6259,20 @@ static void ujump_assemble(int i,struct regstat *i_regs) if(rt1[i]==31&&temp>=0) emit_prefetchreg(temp); #endif do_cc(i,branch_regs[i].regmap,&adj,ba[i],TAKEN,0); - if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); - load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); - if(internal_branch(branch_regs[i].is32,ba[i])) - assem_debug("branch: internal"); - else - assem_debug("branch: external"); - if(internal_branch(branch_regs[i].is32,ba[i])&&is_ds[(ba[i]-start)>>2]) { - ds_assemble_entry(i); - } - else { - add_to_linker((intptr_t)out,ba[i],internal_branch(branch_regs[i].is32,ba[i])); - emit_jmp(0); + if(i!=(ba[i]-start)>>2 || source[i+1]!=0) { + if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); + load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); + if(internal_branch(branch_regs[i].is32,ba[i])) + assem_debug("branch: internal"); + else + assem_debug("branch: external"); + if(internal_branch(branch_regs[i].is32,ba[i])&&is_ds[(ba[i]-start)>>2]) { + ds_assemble_entry(i); + } + else { + add_to_linker((intptr_t)out,ba[i],internal_branch(branch_regs[i].is32,ba[i])); + emit_jmp(0); + } } } @@ -6499,19 +6730,21 @@ static void cjump_assemble(int i,struct regstat *i_regs) assert(cc==HOST_CCREG); store_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); do_cc(i,i_regmap,&adj,ba[i],TAKEN,0); - assem_debug("cycle count (adj)"); - if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); - load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); - if(branch_internal) - assem_debug("branch: internal"); - else - assem_debug("branch: external"); - if(branch_internal&&is_ds[(ba[i]-start)>>2]) { - ds_assemble_entry(i); - } - else { - add_to_linker((intptr_t)out,ba[i],branch_internal); - emit_jmp(0); + if(i!=(ba[i]-start)>>2 || source[i+1]!=0) { + assem_debug("cycle count (adj)"); + if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); + load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); + if(branch_internal) + assem_debug("branch: internal"); + else + assem_debug("branch: external"); + if(branch_internal&&is_ds[(ba[i]-start)>>2]) { + ds_assemble_entry(i); + } + else { + add_to_linker((intptr_t)out,ba[i],branch_internal); + emit_jmp(0); + } } } // branch not taken @@ -6818,19 +7051,21 @@ static void sjump_assemble(int i,struct regstat *i_regs) assert(cc==HOST_CCREG); store_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); do_cc(i,i_regmap,&adj,ba[i],TAKEN,0); - assem_debug("cycle count (adj)"); - if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); - load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); - if(branch_internal) - assem_debug("branch: internal"); - else - assem_debug("branch: external"); - if(branch_internal&&is_ds[(ba[i]-start)>>2]) { - ds_assemble_entry(i); - } - else { - add_to_linker((intptr_t)out,ba[i],branch_internal); - emit_jmp(0); + if(i!=(ba[i]-start)>>2 || source[i+1]!=0) { + assem_debug("cycle count (adj)"); + if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); + load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); + if(branch_internal) + assem_debug("branch: internal"); + else + assem_debug("branch: external"); + if(branch_internal&&is_ds[(ba[i]-start)>>2]) { + ds_assemble_entry(i); + } + else { + add_to_linker((intptr_t)out,ba[i],branch_internal); + emit_jmp(0); + } } } // branch not taken @@ -6897,7 +7132,7 @@ static void fjump_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { cs=get_reg(i_regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); eaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,eaddr,(intptr_t)out,i,cs,(intptr_t)i_regs,0,0); @@ -7024,19 +7259,21 @@ static void fjump_assemble(int i,struct regstat *i_regs) assert(cc==HOST_CCREG); store_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); do_cc(i,i_regmap,&adj,ba[i],TAKEN,0); - assem_debug("cycle count (adj)"); - if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); - load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); - if(branch_internal) - assem_debug("branch: internal"); - else - assem_debug("branch: external"); - if(branch_internal&&is_ds[(ba[i]-start)>>2]) { - ds_assemble_entry(i); - } - else { - add_to_linker((intptr_t)out,ba[i],branch_internal); - emit_jmp(0); + if(i!=(ba[i]-start)>>2 || source[i+1]!=0) { + assem_debug("cycle count (adj)"); + if(adj) emit_addimm(cc,CLOCK_DIVIDER*(ccadj[i]+2-adj),cc); + load_regs_bt(branch_regs[i].regmap,branch_regs[i].is32,branch_regs[i].dirty,ba[i]); + if(branch_internal) + assem_debug("branch: internal"); + else + assem_debug("branch: external"); + if(branch_internal&&is_ds[(ba[i]-start)>>2]) { + ds_assemble_entry(i); + } + else { + add_to_linker((intptr_t)out,ba[i],branch_internal); + emit_jmp(0); + } } // branch not taken @@ -7082,6 +7319,7 @@ static void pagespan_assemble(int i,struct regstat *i_regs) intptr_t taken=0; intptr_t nottaken=0; int unconditional=0; + assert(!(i==(ba[i]-start)>>2 && source[i+1]==0)); //FIXME: Idle loop if(rs1[i]==0) { s1l=s2l;s1h=s2h; @@ -7136,7 +7374,6 @@ static void pagespan_assemble(int i,struct regstat *i_regs) if((opcode[i]&0x2e)==4||opcode[i]==0x11) { // BEQ/BNE/BEQL/BNEL/BC1 load_regs(regs[i].regmap_entry,regs[i].regmap,regs[i].was32,CCREG,CCREG); } - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*(ccadj[i]+2),HOST_CCREG); if(opcode[i]==2) // J { unconditional=1; @@ -7272,6 +7509,7 @@ static void pagespan_assemble(int i,struct regstat *i_regs) //FIXME: Check CSREG if(opcode[i]==0x11 && opcode2[i]==0x08 ) { + assert(0); if((source[i]&0x30000)==0) // BC1F { emit_mov2imm_compact(ba[i],addr,start+i*4+8,alt); @@ -7299,6 +7537,7 @@ static void pagespan_assemble(int i,struct regstat *i_regs) } assert(i_regs->regmap[HOST_CCREG]==CCREG); + emit_addimm(HOST_CCREG,CLOCK_DIVIDER*(ccadj[i]+1),HOST_CCREG); wb_dirtys(regs[i].regmap,regs[i].is32,regs[i].dirty); if(likely[i]||unconditional) { @@ -7325,7 +7564,15 @@ static void pagespan_assemble(int i,struct regstat *i_regs) if(likely[i]) { // Not-taken path set_jump_target((intptr_t)nottaken,(intptr_t)out); + emit_addimm(HOST_CCREG,CLOCK_DIVIDER*(ccadj[i]+2),HOST_CCREG); wb_dirtys(regs[i].regmap,regs[i].is32,regs[i].dirty); + emit_test(HOST_CCREG,HOST_CCREG); + intptr_t jaddr=(intptr_t)out; + emit_js(0); + emit_movimm(start+i*4+8,0); + emit_writeword(0,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.pcaddr); + emit_call((intptr_t)cc_interrupt); + set_jump_target((intptr_t)jaddr,(intptr_t)out); void *branch_addr=out; emit_jmp(0); int target_addr=start+i*4+8; @@ -7360,6 +7607,7 @@ static void pagespan_ds(void) head->clean_addr=(void *)out; (void)ll_add(jump_in+page,vaddr,(void *)out,(void *)out,start,copy,slen*4); assert(regs[0].regmap_entry[HOST_CCREG]==CCREG); + emit_addimm(HOST_CCREG,CLOCK_DIVIDER,HOST_CCREG); if(regs[0].regmap[HOST_CCREG]!=CCREG) wb_register(CCREG,regs[0].regmap_entry,regs[0].wasdirty,regs[0].was32); if(regs[0].regmap[HOST_BTREG]!=BTREG) @@ -7421,6 +7669,14 @@ static void pagespan_ds(void) } assert(btaddr!=HOST_CCREG); if(regs[0].regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); + emit_test(HOST_CCREG,HOST_CCREG); + intptr_t jaddr=(intptr_t)out; + emit_js(0); + wb_dirtys(regs[0].regmap,regs[0].is32,regs[0].dirty); + emit_writeword(btaddr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.pcaddr); + emit_call((intptr_t)cc_interrupt); + load_all_regs(regs[0].regmap); + set_jump_target((intptr_t)jaddr,(intptr_t)out); #ifdef HOST_IMM8 emit_movimm(start+4,HOST_TEMPREG); emit_cmp(btaddr,HOST_TEMPREG); @@ -7443,6 +7699,448 @@ static void pagespan_ds(void) load_regs_bt(regs[0].regmap,regs[0].is32,regs[0].dirty,start+4); } +static void do_cop1stub(int n) +{ + literal_pool(256); + assem_debug("do_cop1stub %x",start+stubs[n][3]*4); + set_jump_target(stubs[n][1],(intptr_t)out); + int i=stubs[n][3]; + struct regstat *i_regs=(struct regstat *)stubs[n][5]; + int ds=stubs[n][6]; + if(!ds) { + load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + //if(i_regs!=®s[i]) DebugMessage(M64MSG_VERBOSE, "oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); + } + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + + if(get_reg(i_regs->regmap,CCREG)<0) { + emit_loadreg(CCREG,HOST_CCREG); + } + + emit_movimm(start+(i*4)+ds,0); // Get PC + emit_addimm(HOST_CCREG,CLOCK_DIVIDER*ccadj[i],HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... + emit_jmp((intptr_t)fp_exception); +} + +static void do_readstub(int n) +{ + assem_debug("do_readstub %x",start+stubs[n][3]*4); + literal_pool(256); + set_jump_target(stubs[n][1],(intptr_t)out); + int type=stubs[n][0]; + int i=stubs[n][3]; + int addr=stubs[n][4]; + struct regstat *i_regs=(struct regstat *)stubs[n][5]; + u_int reglist=stubs[n][7]; + signed char *i_regmap=i_regs->regmap; + int rth,rt; + + if(itype[i]==C1LS) { + rth=get_reg(i_regmap,FTEMP|64); + rt=get_reg(i_regmap,FTEMP); + }else{ + rth=get_reg(i_regmap,rt1[i]|64); + rt=get_reg(i_regmap,rt1[i]); + } + + assert(addr>=0); + emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + + intptr_t ftable=0; + if(type==LOADB_STUB||type==LOADBU_STUB) + ftable=(intptr_t)read_byte_new; + else if(type==LOADH_STUB||type==LOADHU_STUB) + ftable=(intptr_t)read_hword_new; + else if(type==LOADW_STUB||type==LOADWU_STUB) + ftable=(intptr_t)read_word_new; + else if(type==LOADD_STUB) + ftable=(intptr_t)read_dword_new; + else if(type==LOADWL_STUB) + { + assert(rt>=0); + ftable=(intptr_t)LWL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==LOADWR_STUB) + { + assert(rt>=0); + ftable=(intptr_t)LWR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==LOADDL_STUB) + { + assert(rt>=0); + assert(rth>=0); + ftable=(intptr_t)LDL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(rth,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==LOADDR_STUB) + { + assert(rt>=0); + assert(rth>=0); + ftable=(intptr_t)LDR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(rth,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + + int cc=get_reg(i_regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + int ds=i_regs!=®s[i]; + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*(stubs[n][6]+1)); + emit_pushimm((start+(i+1)*4)+ds); + emit_call((intptr_t)ftable); + emit_addimm(ESP,8,ESP); +#else + emit_movimm((start+(i+1)*4)+ds,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG2_REG); + emit_call((intptr_t)ftable); +#endif + + restore_regs(reglist); + + emit_cmpmem_imm((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + + if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + + emit_jmp((intptr_t)&do_interrupt); + set_jump_target(jaddr,(intptr_t)out); + + if(rt>=0) { + if(type==LOADB_STUB) + emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADBU_STUB) + emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADH_STUB) + emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADHU_STUB) + emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADW_STUB||type==LOADWU_STUB||type==LOADWL_STUB||type==LOADWR_STUB) { + emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + if(type==LOADWU_STUB) emit_zeroreg(rth); + } + else if(type==LOADD_STUB||type==LOADDL_STUB||type==LOADDR_STUB) { + emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + if(rth>=0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); + } + } + emit_jmp(stubs[n][2]); // return address +} + +static void inline_readstub(int type, int i, u_int addr_const, char addr, struct regstat *i_regs, int target, int adj, u_int reglist) +{ + assem_debug("inline_readstub"); + int rth=get_reg(i_regs->regmap,target|64); + int rt=get_reg(i_regs->regmap,target); + +#if NEW_DYNAREC <= NEW_DYNAREC_X64 + if(addr_const) + emit_writeword_imm(addr_const,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + else +#endif + { + assert(addr>=0); + emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + } + + intptr_t ftable=0; + if(type==LOADB_STUB||type==LOADBU_STUB) + ftable=(intptr_t)read_byte_new; + else if(type==LOADH_STUB||type==LOADHU_STUB) + ftable=(intptr_t)read_hword_new; + else if(type==LOADW_STUB||type==LOADWU_STUB) + ftable=(intptr_t)read_word_new; + else if(type==LOADD_STUB) + ftable=(intptr_t)read_dword_new; + else if(type==LOADWL_STUB) + { + assert(rt>=0); + ftable=(intptr_t)LWL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==LOADWR_STUB) + { + assert(rt>=0); + ftable=(intptr_t)LWR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==LOADDL_STUB) + { + assert(rt>=0); + assert(rth>=0); + ftable=(intptr_t)LDL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(rth,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==LOADDR_STUB) + { + assert(rt>=0); + assert(rth>=0); + ftable=(intptr_t)LDR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(rth,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + + int cc=get_reg(i_regs->regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + int ds=i_regs!=®s[i]; + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*(adj+1)); + emit_pushimm((start+(i+1)*4)+ds); + emit_call((intptr_t)ftable); + emit_addimm(ESP,8,ESP); +#else + emit_movimm((start+(i+1)*4)+ds,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*(adj+1),ARG2_REG); + emit_call((intptr_t)ftable); +#endif + + restore_regs(reglist); + + if((signed int)addr_const>=(signed int)0xC0000000) { + // Theoretically we can have a pagefault here, if the TLB has never + // been enabled and the address is outside the range 80000000..BFFFFFFF + // Write out the registers so the pagefault can be handled. This is + // a very rare case and likely represents a bug. + emit_cmpmem_imm((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + + if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + + emit_jmp((intptr_t)&do_interrupt); + set_jump_target(jaddr,(intptr_t)out); + } + + if(rt>=0) { + if(type==LOADB_STUB) + emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADBU_STUB) + emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADH_STUB) + emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADHU_STUB) + emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + else if(type==LOADW_STUB||type==LOADWU_STUB||type==LOADWL_STUB||type==LOADWR_STUB) { + emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + if(type==LOADWU_STUB) emit_zeroreg(rth); + } + else if(type==LOADD_STUB||type==LOADDL_STUB||type==LOADDR_STUB) { + emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); + if(rth>=0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword+4,rth); + } + } +} + +static void do_writestub(int n) +{ + assem_debug("do_writestub %x",start+stubs[n][3]*4); + literal_pool(256); + set_jump_target(stubs[n][1],(intptr_t)out); + int type=stubs[n][0]; + int i=stubs[n][3]; + int addr=stubs[n][4]; + struct regstat *i_regs=(struct regstat *)stubs[n][5]; + u_int reglist=stubs[n][7]; + signed char *i_regmap=i_regs->regmap; + int rth,rt,r; + + if(itype[i]==C1LS) { + rth=get_reg(i_regmap,FTEMP|64); + rt=get_reg(i_regmap,r=FTEMP); + }else{ + rth=get_reg(i_regmap,rs2[i]|64); + rt=get_reg(i_regmap,r=rs2[i]); + } + assert(addr>=0); + assert(rt>=0); + emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + + intptr_t ftable=0; + if(type==STOREB_STUB){ + ftable=(intptr_t)write_byte_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREH_STUB){ + ftable=(intptr_t)write_hword_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREW_STUB){ + ftable=(intptr_t)write_word_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STORED_STUB){ + ftable=(intptr_t)write_dword_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(r?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==STOREWL_STUB){ + ftable=(intptr_t)SWL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREWR_STUB){ + ftable=(intptr_t)SWR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREDL_STUB){ + ftable=(intptr_t)SDL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(r?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==STOREDR_STUB){ + ftable=(intptr_t)SDR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(r?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + + int cc=get_reg(i_regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + int ds=i_regs!=®s[i]; + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*(stubs[n][6]+1)); + emit_pushimm((start+(i+1)*4)+ds); + emit_call((intptr_t)ftable); + emit_addimm(ESP,8,ESP); +#else + emit_movimm((start+(i+1)*4)+ds,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG2_REG); + emit_call((intptr_t)ftable); +#endif + + restore_regs(reglist); + + emit_cmpmem_imm((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + + if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + + emit_jmp((intptr_t)&do_interrupt); + set_jump_target(jaddr,(intptr_t)out); + + if(cc>=0) { + emit_loadreg(CCREG,cc); + } + emit_jmp(stubs[n][2]); // return address +} + +static void inline_writestub(int type, int i, u_int addr_const, char addr, struct regstat *i_regs, int target, int adj, u_int reglist) +{ + assem_debug("inline_writestub"); + int rth=get_reg(i_regs->regmap,target|64); + int rt=get_reg(i_regs->regmap,target); + assert(rt>=0); + +#if NEW_DYNAREC <= NEW_DYNAREC_X64 + if(addr_const) + emit_writeword_imm(addr_const,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + else +#endif + { + assert(addr>=0); + emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); + } + + intptr_t ftable=0; + if(type==STOREB_STUB){ + ftable=(intptr_t)write_byte_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREH_STUB){ + ftable=(intptr_t)write_hword_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREW_STUB){ + ftable=(intptr_t)write_word_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STORED_STUB){ + ftable=(intptr_t)write_dword_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(target?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==STOREWL_STUB){ + ftable=(intptr_t)SWL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREWR_STUB){ + ftable=(intptr_t)SWR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); + } + else if(type==STOREDL_STUB){ + ftable=(intptr_t)SDL_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(target?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + else if(type==STOREDR_STUB){ + ftable=(intptr_t)SDR_new; + emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); + emit_writeword(target?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); + } + + int cc=get_reg(i_regs->regmap,CCREG); + if(cc>=0) { + emit_storereg(CCREG,cc); + } + + save_regs(reglist); + int ds=i_regs!=®s[i]; + +#if NEW_DYNAREC == NEW_DYNAREC_X86 + emit_pushimm(CLOCK_DIVIDER*(adj+1)); + emit_pushimm((start+(i+1)*4)+ds); + emit_call((intptr_t)ftable); + emit_addimm(ESP,8,ESP); +#else + emit_movimm((start+(i+1)*4)+ds,ARG1_REG); + emit_movimm(CLOCK_DIVIDER*(adj+1),ARG2_REG); + emit_call((intptr_t)ftable); +#endif + + restore_regs(reglist); + + if(((signed int)addr_const>=(signed int)0xC0000000)||((addr_const>>16)==0xa430)||((addr_const>>16)==0x8430)) { + // Theoretically we can have a pagefault here, if the TLB has never + // been enabled and the address is outside the range 80000000..BFFFFFFF + // Write out the registers so the pagefault can be handled. This is + // a very rare case and likely represents a bug. + emit_cmpmem_imm((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); + intptr_t jaddr=(intptr_t)out; + emit_jeq(0); + + if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); + wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); + + emit_jmp((intptr_t)&do_interrupt); + set_jump_target(jaddr,(intptr_t)out); + } + + if(cc>=0) { + emit_loadreg(CCREG,cc); + } +} + /* disassembly */ static void disassemble_inst(int i) { @@ -7605,7 +8303,7 @@ void new_dynarec_init(void) for(n=0;n<65536;n++) hash_table[n][0]=hash_table[n][1]=NULL; memset(g_dev.r4300.new_dynarec_hot_state.mini_ht,-1,sizeof(g_dev.r4300.new_dynarec_hot_state.mini_ht)); - memset(g_dev.r4300.new_dynarec_hot_state.restore_candidate,0,sizeof(g_dev.r4300.new_dynarec_hot_state.restore_candidate)); + memset(restore_candidate,0,sizeof(restore_candidate)); copy_size=0; expirep=16384; // Expiry pointer, +2 blocks g_dev.r4300.new_dynarec_hot_state.pending_exception=0; @@ -8298,6 +8996,7 @@ int new_recompile_block(int addr) } current.isconst=0; } + memcpy(regmap_pre[i],current.regmap,sizeof(current.regmap)); if(i>1) { if((opcode[i-2]&0x2f)==0x05) // BNE/BNEL @@ -8352,7 +9051,6 @@ int new_recompile_block(int addr) current.is32=temp_is32; } } - memcpy(regmap_pre[i],current.regmap,sizeof(current.regmap)); regs[i].wasconst=current.isconst; regs[i].was32=current.is32; regs[i].wasdirty=current.dirty; @@ -8498,7 +9196,8 @@ int new_recompile_block(int addr) regs[i].regmap_entry[hr]=-1; regs[i].regmap[hr]=-1; //Don't clear regs in the delay slot as the branch might need them - //current.regmap[hr]=-1; + if(!ooo[i-1]) + current.regmap[hr]=-1; }else regs[i].regmap_entry[hr]=r; } @@ -8507,7 +9206,8 @@ int new_recompile_block(int addr) regs[i].regmap_entry[hr]=-1; regs[i].regmap[hr]=-1; //Don't clear regs in the delay slot as the branch might need them - //current.regmap[hr]=-1; + if(!ooo[i-1]) + current.regmap[hr]=-1; }else regs[i].regmap_entry[hr]=r; } @@ -8618,7 +9318,7 @@ int new_recompile_block(int addr) if(rs2[i]) alloc_reg64(¤t,i,rs2[i]); } } - else + else if((i!=(ba[i]-start)>>2 || source[i+1]!=0)) { ooo[i]=1; delayslot_alloc(¤t,i+1); @@ -8646,7 +9346,7 @@ int new_recompile_block(int addr) if(rs1[i]) alloc_reg64(¤t,i,rs1[i]); } } - else + else if((i!=(ba[i]-start)>>2 || source[i+1]!=0)) { ooo[i]=1; delayslot_alloc(¤t,i+1); @@ -8723,7 +9423,7 @@ int new_recompile_block(int addr) if(rs1[i]) alloc_reg64(¤t,i,rs1[i]); } } - else + else if((i!=(ba[i]-start)>>2 || source[i+1]!=0)) { ooo[i]=1; delayslot_alloc(¤t,i+1); @@ -8770,7 +9470,7 @@ int new_recompile_block(int addr) alloc_reg(¤t,i,CSREG); alloc_reg(¤t,i,FSREG); } - else { + else if((i!=(ba[i]-start)>>2 || source[i+1]!=0)) { ooo[i]=1; delayslot_alloc(¤t,i+1); alloc_reg(¤t,i+1,CSREG); @@ -9531,7 +10231,7 @@ int new_recompile_block(int addr) { if(itype[i]==UJUMP||itype[i]==CJUMP||itype[i]==SJUMP||itype[i]==FJUMP) { - if(ba[i]>=start && ba[i]<(start+i*4)) + if(ba[i]=(start+i*4)) continue; // jump out of this block or forward branch if(itype[i+1]==NOP||itype[i+1]==MOV||itype[i+1]==ALU ||itype[i+1]==SHIFTIMM||itype[i+1]==IMM16||itype[i+1]==LOAD ||itype[i+1]==STORE||itype[i+1]==STORELR||itype[i+1]==C1LS @@ -9539,8 +10239,8 @@ int new_recompile_block(int addr) ||itype[i+1]==FCOMP||itype[i+1]==FCONV) { int t=(ba[i]-start)>>2; - if(t>0&&(itype[t-1]!=UJUMP&&itype[t-1]!=RJUMP&&itype[t-1]!=CJUMP&&itype[t-1]!=SJUMP&&itype[t-1]!=FJUMP)) // loop_preload can't handle jumps into delay slots - if(t<2||(itype[t-2]!=UJUMP&&itype[t-2]!=RJUMP)||rt1[t-2]!=31) // call/ret assumes no registers allocated + if(t<=0||(itype[t-1]==UJUMP||itype[t-1]==RJUMP||itype[t-1]==CJUMP||itype[t-1]==SJUMP||itype[t-1]==FJUMP)) continue; // loop_preload can't handle jumps into delay slots + if(t>=2&&(itype[t-2]==UJUMP||itype[t-2]==RJUMP)&&rt1[t-2]==31) continue; // call/ret assumes no registers allocated for(hr=0;hr64) { @@ -9615,6 +10315,8 @@ int new_recompile_block(int addr) //DebugMessage(M64MSG_VERBOSE, "Hit %x -> %x, %x %d/%d",start+i*4,ba[i],start+j*4,hr,r); int k; if(regs[i].regmap[hr]==-1&&branch_regs[i].regmap[hr]==-1) { + if(get_reg(regs[i].regmap,f_regmap[hr])>=0) break; + if(get_reg(branch_regs[i].regmap,f_regmap[hr])>=0) break; if(get_reg(regs[i+2].regmap,f_regmap[hr])>=0) break; if(r>63) { if(get_reg(regs[i].regmap,r&63)<0) break; @@ -9750,6 +10452,8 @@ int new_recompile_block(int addr) } if(itype[j]==CJUMP||itype[j]==SJUMP||itype[j]==FJUMP) { + if(branch_regs[j].regmap[hr]>=0) + break; if(ooo[j]) { if(count_free_regs(regs[j].regmap)<=minimum_free_regs[j+1]) break; @@ -10605,8 +11309,13 @@ int new_recompile_block(int addr) wb_valid(regmap_pre[i],regs[i].regmap_entry,dirty_pre,regs[i].wasdirty,is32_pre, unneeded_reg[i],unneeded_reg_upper[i]); } - is32_pre=regs[i].is32; - dirty_pre=regs[i].dirty; + if((itype[i]==CJUMP||itype[i]==SJUMP||itype[i]==FJUMP)&&!likely[i]) { + is32_pre=branch_regs[i].is32; + dirty_pre=branch_regs[i].dirty; + }else{ + is32_pre=regs[i].is32; + dirty_pre=regs[i].dirty; + } #endif // write back if(i<2||(itype[i-2]!=UJUMP&&itype[i-2]!=RJUMP&&(source[i-2]>>16)!=0x1000)) @@ -10758,11 +11467,20 @@ int new_recompile_block(int addr) case LOADD_STUB: case LOADBU_STUB: case LOADHU_STUB: + case LOADWU_STUB: + case LOADWL_STUB: + case LOADWR_STUB: + case LOADDL_STUB: + case LOADDR_STUB: do_readstub(i);break; case STOREB_STUB: case STOREH_STUB: case STOREW_STUB: case STORED_STUB: + case STOREWL_STUB: + case STOREWR_STUB: + case STOREDL_STUB: + case STOREDR_STUB: do_writestub(i);break; case CC_STUB: do_ccstub(i);break; @@ -10770,8 +11488,6 @@ int new_recompile_block(int addr) do_invstub(i);break; case FP_STUB: do_cop1stub(i);break; - case STORELR_STUB: - do_unalignedwritestub(i);break; } } @@ -10963,53 +11679,109 @@ int new_recompile_block(int addr) } /* interpreted opcode */ -static void ldl_merge(void) +void* cop1_unusable(void) { - struct new_dynarec_hot_state* state = &g_dev.r4300.new_dynarec_hot_state; - uint64_t original = state->rt; - uint64_t loaded = state->rs; - u_int bits = state->rd; - if(bits) { - original<<=64-bits; - original>>=64-bits; - loaded<<=bits; - original|=loaded; - } - else original=loaded; - state->rt=original; -} -static void ldr_merge(void) -{ - struct new_dynarec_hot_state* state = &g_dev.r4300.new_dynarec_hot_state; - uint64_t original = state->rt; - uint64_t loaded = state->rs; - u_int bits = state->rd; - if(bits^56) { - original>>=64-(bits^56); - original<<=64-(bits^56); - loaded>>=bits^56; - original|=loaded; - } - else original=loaded; - state->rt=original; + struct r4300_core* r4300 = &g_dev.r4300; + struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; + r4300->delay_slot = state->pcaddr & 1; + state->pcaddr &= ~1; + state->cp0_regs[CP0_CAUSE_REG] = CP0_CAUSE_EXCCODE_CPU | CP0_CAUSE_CE1; + exception_general(r4300); + return get_addr_ht(state->pcaddr); } -static void TLBWI_new(int pcaddr, int count, int diff) +void* SYSCALL_new(void) +{ + struct r4300_core* r4300 = &g_dev.r4300; + struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; + r4300->delay_slot = 0; + cached_interp_SYSCALL(); + return get_addr_ht(state->pcaddr); +} + +void* ERET_new(void) +{ + struct r4300_core* r4300 = &g_dev.r4300; + struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; + + cp0_update_count(r4300); + if (state->cp0_regs[CP0_STATUS_REG] & CP0_STATUS_ERL) + { + DebugMessage(M64MSG_ERROR, "error in ERET"); + state->stop = 1; + } + else + { + state->cp0_regs[CP0_STATUS_REG] &= ~CP0_STATUS_EXL; + state->pcaddr = state->cp0_regs[CP0_EPC_REG]; + } + r4300->llbit = 0; + r4300->delay_slot = 0; + r4300_check_interrupt(r4300, CP0_CAUSE_IP2, r4300->mi->regs[MI_INTR_REG] & r4300->mi->regs[MI_INTR_MASK_REG]); // ??? + r4300->cp0.last_addr = state->pcaddr; + state->pending_exception = 0; + if (state->cycle_count >= 0) { gen_interrupt(r4300); } + + if(state->stop) + return NULL; + + if(state->pending_exception) + return get_addr_ht(state->pcaddr); + else + { + uint32_t is64 = 0; + for(int i=0;i<32;i++) + is64 = (((int)(state->regs[i]>>32)^((int)state->regs[i]>>31))!=0)<hi>>32)^((int)state->hi>>31))!=0); + is64 |= (((int)(state->lo>>32)^((int)state->lo>>31))!=0); + return get_addr_32(state->pcaddr, is64); + } +} + +void dynarec_gen_interrupt(void) +{ + struct r4300_core* r4300 = &g_dev.r4300; + struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; + cp0_update_count(r4300); + uint32_t page = ((state->cp0_regs[CP0_COUNT_REG]>>19)&0x1fc); + unsigned int *candidate = (unsigned int *)&restore_candidate[page]; + page <<= 3; + r4300->delay_slot = 0; + + if(*candidate) + { + for(int i=0;i<32;i++) + { + if((*candidate>>i)&1) + clean_blocks(page+i); + } + *candidate = 0; + } + + gen_interrupt(r4300); +} + +#define UPDATE_COUNT_IN \ + struct r4300_core* r4300 = &g_dev.r4300; \ + struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; \ + state->cycle_count += count; \ + state->pending_exception = 0; + +#define UPDATE_COUNT_OUT \ + state->cycle_count -= !state->pending_exception * count; + +static void TLBWI_new(int pcaddr, int count) { unsigned int i; - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - - /* Update count + pcaddr*/ - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr; /* Remove old entries */ - unsigned int old_start_even=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_even; - unsigned int old_end_even=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_even; - unsigned int old_start_odd=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_odd; - unsigned int old_end_odd=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_odd; + unsigned int old_start_even=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_even; + unsigned int old_end_even=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_even; + unsigned int old_start_odd=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_odd; + unsigned int old_end_odd=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_odd; for (i=old_start_even>>12; i<=old_end_even>>12; i++) { if(i<0x80000||i>0xBFFFF) @@ -11027,12 +11799,12 @@ static void TLBWI_new(int pcaddr, int count, int diff) } } cached_interp_TLBWI(); - //DebugMessage(M64MSG_VERBOSE, "TLBWI: index=%d",r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]); - //DebugMessage(M64MSG_VERBOSE, "TLBWI: start_even=%x end_even=%x phys_even=%x v=%d d=%d",r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_even,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_even,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].phys_even,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].v_even,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].d_even); - //DebugMessage(M64MSG_VERBOSE, "TLBWI: start_odd=%x end_odd=%x phys_odd=%x v=%d d=%d",r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_odd,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_odd,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].phys_odd,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].v_odd,r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].d_odd); + //DebugMessage(M64MSG_VERBOSE, "TLBWI: index=%d",state->cp0_regs[CP0_INDEX_REG]); + //DebugMessage(M64MSG_VERBOSE, "TLBWI: start_even=%x end_even=%x phys_even=%x v=%d d=%d",r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_even,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_even,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].phys_even,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].v_even,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].d_even); + //DebugMessage(M64MSG_VERBOSE, "TLBWI: start_odd=%x end_odd=%x phys_odd=%x v=%d d=%d",r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_odd,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_odd,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].phys_odd,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].v_odd,r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].d_odd); /* Combine r4300->cp0.tlb.LUT_r, r4300->cp0.tlb.LUT_w, and invalid_code into a single table for fast look up. */ - for (i=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_even>>12; i<=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_even>>12; i++) + for (i=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_even>>12; i<=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_even>>12; i++) { //DebugMessage(M64MSG_VERBOSE, "%x: r:%8x w:%8x",i,r4300->cp0.tlb.LUT_r[i],r4300->cp0.tlb.LUT_w[i]); if(i<0x80000||i>0xBFFFF) @@ -11053,7 +11825,7 @@ static void TLBWI_new(int pcaddr, int count, int diff) } //DebugMessage(M64MSG_VERBOSE, "memory_map[%x]: %8x (+%8x)",i,state->memory_map[i],state->memory_map[i]<<2); } - for (i=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].start_odd>>12; i<=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_INDEX_REG]&0x3F].end_odd>>12; i++) + for (i=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].start_odd>>12; i<=r4300->cp0.tlb.entries[state->cp0_regs[CP0_INDEX_REG]&0x3F].end_odd>>12; i++) { //DebugMessage(M64MSG_VERBOSE, "%x: r:%8x w:%8x",i,r4300->cp0.tlb.LUT_r[i],r4300->cp0.tlb.LUT_w[i]); if(i<0x80000||i>0xBFFFF) @@ -11074,26 +11846,21 @@ static void TLBWI_new(int pcaddr, int count, int diff) } //DebugMessage(M64MSG_VERBOSE, "memory_map[%x]: %8x (+%8x)",i,state->memory_map[i],state->memory_map[i]<<2); } - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void TLBWR_new(int pcaddr, int count, int diff) +static void TLBWR_new(int pcaddr, int count) { unsigned int i; - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - - /* Update count + pcaddr*/ - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr; - - r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG] = (r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG]/r4300->cp0.count_per_op % (32 - r4300_cp0_regs(&r4300->cp0)[CP0_WIRED_REG])) + r4300_cp0_regs(&r4300->cp0)[CP0_WIRED_REG]; + cp0_update_count(r4300); + state->cp0_regs[CP0_RANDOM_REG] = (state->cp0_regs[CP0_COUNT_REG]/r4300->cp0.count_per_op % (32 - state->cp0_regs[CP0_WIRED_REG])) + state->cp0_regs[CP0_WIRED_REG]; /* Remove old entries */ - unsigned int old_start_even=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].start_even; - unsigned int old_end_even=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].end_even; - unsigned int old_start_odd=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].start_odd; - unsigned int old_end_odd=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].end_odd; + unsigned int old_start_even=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].start_even; + unsigned int old_end_even=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].end_even; + unsigned int old_start_odd=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].start_odd; + unsigned int old_end_odd=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].end_odd; for (i=old_start_even>>12; i<=old_end_even>>12; i++) { if(i<0x80000||i>0xBFFFF) @@ -11113,7 +11880,7 @@ static void TLBWR_new(int pcaddr, int count, int diff) cached_interp_TLBWR(); /* Combine r4300->cp0.tlb.LUT_r, r4300->cp0.tlb.LUT_w, and invalid_code into a single table for fast look up. */ - for (i=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].start_even>>12; i<=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].end_even>>12; i++) + for (i=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].start_even>>12; i<=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].end_even>>12; i++) { //DebugMessage(M64MSG_VERBOSE, "%x: r:%8x w:%8x",i,r4300->cp0.tlb.LUT_r[i],r4300->cp0.tlb.LUT_w[i]); if(i<0x80000||i>0xBFFFF) @@ -11134,7 +11901,7 @@ static void TLBWR_new(int pcaddr, int count, int diff) } //DebugMessage(M64MSG_VERBOSE, "memory_map[%x]: %8x (+%8x)",i,state->memory_map[i],state->memory_map[i]<<2); } - for (i=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].start_odd>>12; i<=r4300->cp0.tlb.entries[r4300_cp0_regs(&r4300->cp0)[CP0_RANDOM_REG]&0x3F].end_odd>>12; i++) + for (i=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].start_odd>>12; i<=r4300->cp0.tlb.entries[state->cp0_regs[CP0_RANDOM_REG]&0x3F].end_odd>>12; i++) { //DebugMessage(M64MSG_VERBOSE, "%x: r:%8x w:%8x",i,r4300->cp0.tlb.LUT_r[i],r4300->cp0.tlb.LUT_w[i]); if(i<0x80000||i>0xBFFFF) @@ -11155,40 +11922,32 @@ static void TLBWR_new(int pcaddr, int count, int diff) } //DebugMessage(M64MSG_VERBOSE, "memory_map[%x]: %8x (+%8x)",i,state->memory_map[i],state->memory_map[i]<<2); } - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void MFC0_new(int copr, int count, int diff) +static void MFC0_new(int copr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; + UPDATE_COUNT_IN state->fake_pc.f.r.nrd = copr; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; cached_interp_MFC0(); - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void MTC0_new(int copr, int count, int diff, int pcaddr) +static void MTC0_new(int copr, int count, int pcaddr) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - state->fake_pc.f.r.nrd = copr; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr; - state->pending_exception = 0; + r4300->delay_slot = 0; + state->fake_pc.f.r.nrd = copr; cached_interp_MTC0(); - // Add one cycle if an exception occured while writing to status register - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] += ((copr == 12) && state->pending_exception) * g_dev.r4300.cp0.count_per_op; - state->cycle_count = r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] - state->next_interrupt - diff; + UPDATE_COUNT_OUT } -/* used in assembler files */ -void new_dynarec_check_interrupt(void) -{ - r4300_check_interrupt(&g_dev.r4300, CP0_CAUSE_IP2, g_dev.mi.regs[MI_INTR_REG] & g_dev.mi.regs[MI_INTR_MASK_REG]); // ??? -} +#define BITS_BELOW_MASK32(x) ((UINT32_C(1) << (x)) - 1) +#define BITS_ABOVE_MASK32(x) (~(BITS_BELOW_MASK32((x)))) + +#define BITS_BELOW_MASK64(x) ((UINT64_C(1) << (x)) - 1) +#define BITS_ABOVE_MASK64(x) (~(BITS_BELOW_MASK64((x)))) static unsigned int bshift(uint32_t address) { @@ -11200,130 +11959,198 @@ static unsigned int hshift(uint32_t address) return ((address & 2) ^ 2) << 3; } -static void read_byte_new(int pcaddr, int count, int diff) +static void read_byte_new(int pcaddr, int count) { uint32_t value; - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; unsigned int shift = bshift(state->address); if (r4300_read_aligned_word(r4300, state->address, &value)) { state->rdword = (uint64_t)((value >> shift) & 0xff); } - r4300->delay_slot = 0; - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void read_hword_new(int pcaddr, int count, int diff) +static void read_hword_new(int pcaddr, int count) { uint32_t value; - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; unsigned int shift = hshift(state->address); if (r4300_read_aligned_word(r4300, state->address, &value)) { state->rdword = (uint64_t)((value >> shift) & 0xffff); } - r4300->delay_slot = 0; - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void read_word_new(int pcaddr, int count, int diff) +static void read_word_new(int pcaddr, int count) { uint32_t value; - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; if (r4300_read_aligned_word(r4300, state->address, &value)) { state->rdword = (uint64_t)(value); } - r4300->delay_slot = 0; - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void read_dword_new(int pcaddr, int count, int diff) +static void read_dword_new(int pcaddr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; r4300_read_aligned_dword(r4300, state->address, (uint64_t*)&state->rdword); - r4300->delay_slot = 0; - assert(r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] == (state->next_interrupt + cycle_count)); // Make sure count was not modified + UPDATE_COUNT_OUT } -static void write_byte_new(int pcaddr, int count, int diff) +static void write_byte_new(int pcaddr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; unsigned int shift = bshift(state->address); state->wword <<= shift; r4300_write_aligned_word(r4300, state->address, state->wword, UINT32_C(0xff) << shift); - r4300->delay_slot = 0; - state->cycle_count = r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] - state->next_interrupt - diff; + UPDATE_COUNT_OUT } -static void write_hword_new(int pcaddr, int count, int diff) +static void write_hword_new(int pcaddr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; unsigned int shift = hshift(state->address); state->wword <<= shift; r4300_write_aligned_word(r4300, state->address, state->wword, UINT32_C(0xffff) << shift); - r4300->delay_slot = 0; - state->cycle_count = r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] - state->next_interrupt - diff; + UPDATE_COUNT_OUT } -static void write_word_new(int pcaddr, int count, int diff) +static void write_word_new(int pcaddr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; r4300_write_aligned_word(r4300, state->address, state->wword, UINT32_C(0xffffffff)); - r4300->delay_slot = 0; - state->cycle_count = r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] - state->next_interrupt - diff; + UPDATE_COUNT_OUT } -static void write_dword_new(int pcaddr, int count, int diff) +static void write_dword_new(int pcaddr, int count) { - struct r4300_core* r4300 = &g_dev.r4300; - struct new_dynarec_hot_state* state = &r4300->new_dynarec_hot_state; - int cycle_count = count + diff; - r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] = state->next_interrupt + cycle_count; + UPDATE_COUNT_IN state->pcaddr = pcaddr&~1; r4300->delay_slot = pcaddr & 1; - state->pending_exception = 0; /* NOTE: in dynarec, we only need an all-one mask */ r4300_write_aligned_dword(r4300, state->address, state->wdword, ~UINT64_C(0)); - r4300->delay_slot = 0; - state->cycle_count = r4300_cp0_regs(&r4300->cp0)[CP0_COUNT_REG] - state->next_interrupt - diff; + UPDATE_COUNT_OUT } + +static void LWL_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + uint32_t value; + unsigned int n = (state->address & 3); + unsigned int shift = 8 * n; + uint32_t mask = BITS_BELOW_MASK32(8 * n); + if (r4300_read_aligned_word(r4300, state->address & ~UINT32_C(0x3), &value)) { + state->rdword = (uint64_t)((state->wword & mask) | (value << shift)); + } + UPDATE_COUNT_OUT +} + +static void LWR_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + uint32_t value; + unsigned int n = (state->address & 3); + unsigned int shift = 8 * (3 - n); + uint32_t mask = (n == 3) ? UINT32_C(0) : BITS_ABOVE_MASK32(8 * (n + 1)); + if (r4300_read_aligned_word(r4300, state->address & ~UINT32_C(0x3), &value)) { + state->rdword = (uint64_t)((state->wword & mask) | (value >> shift)); + } + UPDATE_COUNT_OUT +} + +static void LDL_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + uint64_t value; + unsigned int n = (state->address & 7); + unsigned int shift = 8 * n; + uint64_t mask = BITS_BELOW_MASK64(8 * n); + if(r4300_read_aligned_dword(r4300, state->address & ~UINT32_C(7), &value)) { + state->rdword = (state->wdword & mask) | (value << shift); + } + UPDATE_COUNT_OUT +} + +static void LDR_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + uint64_t value; + unsigned int n = (state->address & 7); + unsigned int shift = 8 * (7 - n); + uint64_t mask = (n == 7) ? UINT64_C(0) : BITS_ABOVE_MASK64(8 * (n + 1)); + if(r4300_read_aligned_dword(r4300, state->address & ~UINT32_C(7), &value)){ + state->rdword = (state->wdword & mask) | (value >> shift); + } + UPDATE_COUNT_OUT +} + +static void SWL_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + unsigned int n = (state->address & 3); + unsigned int shift = 8 * n; + uint32_t mask = (n == 0) ? ~UINT32_C(0) : BITS_BELOW_MASK32(8 * (4 - n)); + r4300_write_aligned_word(r4300, state->address & ~UINT32_C(0x3), state->wword >> shift, mask); + UPDATE_COUNT_OUT +} + +static void SWR_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + unsigned int n = (state->address & 3); + unsigned int shift = 8 * (3 - n); + uint32_t mask = BITS_ABOVE_MASK32(8 * (3 - n)); + r4300_write_aligned_word(r4300, state->address & ~UINT32_C(0x3), state->wword << shift, mask); + UPDATE_COUNT_OUT +} + +static void SDL_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + unsigned int n = (state->address & 7); + unsigned int shift = 8 * n; + uint64_t mask = (n == 0) ? ~UINT64_C(0) : BITS_BELOW_MASK64(8 * (8 - n)); + r4300_write_aligned_dword(r4300, state->address & ~UINT32_C(0x7), state->wdword >> shift, mask); + UPDATE_COUNT_OUT +} + +static void SDR_new(int pcaddr, int count) +{ + UPDATE_COUNT_IN + state->pcaddr = pcaddr&~1; + r4300->delay_slot = pcaddr & 1; + unsigned int n = (state->address & 7); + unsigned int shift = 8 * (7 - n); + uint64_t mask = BITS_ABOVE_MASK64(8 * (7 - n)); + r4300_write_aligned_dword(r4300, state->address & ~UINT32_C(0x7), state->wdword << shift, mask); + UPDATE_COUNT_OUT +} \ No newline at end of file diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.h b/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.h index e1e7ae0..f1e5d3e 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.h +++ b/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.h @@ -52,7 +52,6 @@ struct new_dynarec_hot_state #else uint32_t dynarec_local[16]; #endif - unsigned int next_interrupt; int cycle_count; int pending_exception; int pcaddr; @@ -79,7 +78,6 @@ struct new_dynarec_hot_state int64_t rd; intptr_t ram_offset; uintptr_t mini_ht[32][2]; - unsigned char restore_candidate[512]; uintptr_t memory_map[1048576]; #else char dummy; diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/recomp_dbg.c b/mupen64plus-core/src/device/r4300/new_dynarec/recomp_dbg.c index bdff995..d12e95a 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/recomp_dbg.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/recomp_dbg.c @@ -60,8 +60,12 @@ #define new_dynarec_cleanup recomp_dbg_new_dynarec_cleanup #define new_dynarec_init recomp_dbg_new_dynarec_init #define new_recompile_block recomp_dbg_new_recompile_block -#define new_dynarec_check_interrupt recomp_dbg_new_dynarec_check_interrupt +#define ERET_new recomp_dbg_ERET_new #define dynarec_gen_interrupt recomp_dbg_dynarec_gen_interrupt +#define SYSCALL_new recomp_dbg_SYSCALL_new +#define cop1_unusable recomp_dbg_cop1_unusable +#define dynamic_linker recomp_dbg_dynamic_linker +#define dynamic_linker_ds recomp_dbg_dynamic_linker_ds #if RECOMPILER_DEBUG == 3 //ARM static void jump_vaddr_r0(void){} @@ -114,9 +118,7 @@ void jump_vaddr_x14(void){} void jump_vaddr_x15(void){} void jump_vaddr_x16(void){} void jump_vaddr_x17(void){} -void jump_vaddr_x18(void){} void jump_vaddr_x19(void){} -void jump_vaddr_x20(void){} void jump_vaddr_x21(void){} void jump_vaddr_x22(void){} void jump_vaddr_x23(void){} @@ -178,7 +180,6 @@ static Variable_t var[] = { {(intptr_t)NULL /*RDRAM*/, 0, "rdram - 0x80000000"}, {(intptr_t)g_dev.r4300.cached_interp.invalid_code, sizeof(g_dev.r4300.cached_interp.invalid_code), "invalid_code"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.dynarec_local, sizeof(g_dev.r4300.new_dynarec_hot_state.dynarec_local), "dynarec_local"}, - {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.next_interrupt, sizeof(g_dev.r4300.new_dynarec_hot_state.next_interrupt), "next_interrupt"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.cycle_count, sizeof(g_dev.r4300.new_dynarec_hot_state.cycle_count), "cycle_count"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception, sizeof(g_dev.r4300.new_dynarec_hot_state.pending_exception), "pending_exception"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.pcaddr, sizeof(g_dev.r4300.new_dynarec_hot_state.pcaddr), "pcaddr"}, @@ -341,7 +342,6 @@ static Variable_t var[] = { {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.rd, sizeof(g_dev.r4300.new_dynarec_hot_state.rd), "rd"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.ram_offset, sizeof(g_dev.r4300.new_dynarec_hot_state.ram_offset), "ram_offset"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.mini_ht, sizeof(g_dev.r4300.new_dynarec_hot_state.mini_ht), "mini_ht"}, - {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.restore_candidate, sizeof(g_dev.r4300.new_dynarec_hot_state.restore_candidate), "restore_candidate"}, {(intptr_t)&g_dev.r4300.new_dynarec_hot_state.memory_map, sizeof(g_dev.r4300.new_dynarec_hot_state.memory_map), "memory_map"}, {-1, -1, NULL} }; @@ -356,6 +356,10 @@ static Function_t func[] = { {(intptr_t)MTC0_new, "MTC0"}, {(intptr_t)cached_interp_TLBR, "TLBR"}, {(intptr_t)cached_interp_TLBP, "TLBP"}, + {(intptr_t)cached_interp_MULT, "MULT"}, + {(intptr_t)cached_interp_MULTU, "MULTU"}, + {(intptr_t)cached_interp_DIV, "DIV"}, + {(intptr_t)cached_interp_DIVU, "DIVU"}, {(intptr_t)cached_interp_DMULT, "DMULT"}, {(intptr_t)cached_interp_DMULTU, "DMULTU"}, {(intptr_t)cached_interp_DDIV, "DDIV"}, @@ -420,9 +424,7 @@ static Function_t func[] = { {(intptr_t)jump_vaddr_x15, "jump_vaddr_x15"}, {(intptr_t)jump_vaddr_x16, "jump_vaddr_x16"}, {(intptr_t)jump_vaddr_x17, "jump_vaddr_x17"}, - {(intptr_t)jump_vaddr_x18, "jump_vaddr_x18"}, {(intptr_t)jump_vaddr_x19, "jump_vaddr_x19"}, - {(intptr_t)jump_vaddr_x20, "jump_vaddr_x20"}, {(intptr_t)jump_vaddr_x21, "jump_vaddr_x21"}, {(intptr_t)jump_vaddr_x22, "jump_vaddr_x22"}, {(intptr_t)jump_vaddr_x23, "jump_vaddr_x23"}, @@ -439,7 +441,6 @@ static Function_t func[] = { {(intptr_t)verify_code, "verify_code"}, {(intptr_t)cc_interrupt, "cc_interrupt"}, {(intptr_t)fp_exception, "fp_exception"}, - {(intptr_t)fp_exception_ds, "fp_exception_ds"}, {(intptr_t)jump_syscall, "jump_syscall"}, {(intptr_t)jump_eret, "jump_eret"}, {(intptr_t)do_interrupt, "do_interrupt"}, @@ -451,6 +452,14 @@ static Function_t func[] = { {(intptr_t)write_hword_new, "write_hword_new"}, {(intptr_t)write_word_new, "write_word_new"}, {(intptr_t)write_dword_new, "write_dword_new"}, + {(intptr_t)LWL_new, "LWL_new"}, + {(intptr_t)LWR_new, "LWR_new"}, + {(intptr_t)LDL_new, "LDL_new"}, + {(intptr_t)LDR_new, "LDR_new"}, + {(intptr_t)SWL_new, "SWL_new"}, + {(intptr_t)SWR_new, "SWR_new"}, + {(intptr_t)SDL_new, "SDL_new"}, + {(intptr_t)SDR_new, "SDR_new"}, {(intptr_t)cvt_s_w, "cvt_s_w"}, {(intptr_t)cvt_d_w, "cvt_d_w"}, {(intptr_t)cvt_s_l, "cvt_s_l"}, @@ -588,7 +597,7 @@ static void disassemble(int i, FILE * pFile) fprintf (pFile, " %x: %s r%d,cpr0[%d]\n",start+i*4,insn[i],rt1[i],(source[i]>>11)&0x1f); // MFC0 else if(opcode2[i]==4) fprintf (pFile, " %x: %s r%d,cpr0[%d]\n",start+i*4,insn[i],rs1[i],(source[i]>>11)&0x1f); // MTC0 - else fprintf (pFile, " %x: %s",start+i*4,insn[i]); + else fprintf (pFile, " %x: %s\n",start+i*4,insn[i]); break; case COP1: if(opcode2[i]<3) diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/x64/assem_x64.c b/mupen64plus-core/src/device/r4300/new_dynarec/x64/assem_x64.c index 5d1513c..f3c268a 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/x64/assem_x64.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/x64/assem_x64.c @@ -95,7 +95,6 @@ static void *add_pointer(void *src, void* addr) int *ptr2=(int*)((uintptr_t)ptr+(uintptr_t)*ptr+4); u_char *ptr3=(u_char*)ptr2; assert((*(ptr3+1)&0xFF)==0x8d); //lea - assert((*(ptr3+12)&0xFF)==0xe8); //call u_int offset=(uintptr_t)addr-(uintptr_t)ptr-4; *ptr=offset; return (void*)ptr2; @@ -638,10 +637,26 @@ static void multdiv_alloc_x64(struct regstat *current,int i) { if((opcode2[i]&4)==0) // 32-bit { - current->u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<is32|=1LL<=8) output_rex(0,0,0,rt>>3); + if(rs>=8||rt>=8) output_rex(0,rs>>3,0,rt>>3); output_byte(0x89); - output_modrm(3,rt&7,rs); + output_modrm(3,rt&7,rs&7); } static void emit_mov64(int rs,int rt) @@ -932,6 +947,8 @@ static void emit_storereg(int r, int hr) if((r&63)==LOREG) addr=(intptr_t)&g_dev.r4300.new_dynarec_hot_state.lo+((r&64)>>4); if(r==CCREG) addr=(intptr_t)&g_dev.r4300.new_dynarec_hot_state.cycle_count; if(r==FSREG) addr=(intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31; + assert((r&63)!=CSREG); + assert((r&63)!=0); assert((r&63)<=CCREG); assert(addr-(intptr_t)out>=-2147483648LL&&addr-(intptr_t)out<2147483647LL); assem_debug("mov %%%s,%llx+%d",regname[hr],addr,r); @@ -1478,14 +1495,16 @@ static void emit_shrdimm(int rs,int rs2,u_int imm,int rt) static void emit_shlcl(int r) { assem_debug("shl %%%s,%%cl",regname[r]); + if(r>=8)output_rex(0,0,0,r>>3); output_byte(0xD3); - output_modrm(3,r,4); + output_modrm(3,r&7,4); } static void emit_shrcl(int r) { assem_debug("shr %%%s,%%cl",regname[r]); + if(r>=8)output_rex(0,0,0,r>>3); output_byte(0xD3); - output_modrm(3,r,5); + output_modrm(3,r&7,5); } static void emit_sarcl(int r) { @@ -2562,12 +2581,12 @@ static void emit_mov2imm_compact(int imm1,u_int rt1,int imm2,u_int rt2) } // special case for checking pending_exception -static void emit_cmpmem_imm_byte(intptr_t addr,int imm) +static void emit_cmpmem_imm(intptr_t addr, int imm) { assert((intptr_t)addr-(intptr_t)out>=-2147483648LL&&(intptr_t)addr-(intptr_t)out<2147483647LL); assert(imm<128&&imm>=-127); - assem_debug("cmpb $%d,%llx",imm,addr); - output_byte(0x80); + assem_debug("cmp $%d,%llx",imm,addr); + output_byte(0x83); output_modrm(0,5,7); output_w32(addr-(intptr_t)out-5); // Note: rip-relative in 64-bit mode output_byte(imm); @@ -2941,7 +2960,7 @@ static unsigned int count_bits(u_int reglist) // This code is executed infrequently so we try to minimize code size // by pushing registers onto the stack instead of writing them to their // usual locations -static void save_regs(u_int reglist) +static void save_regs2(u_int reglist) { int hr; reglist&=~(1< -#ifdef DEBUG_CYCLE_COUNT - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.last_count,ECX); - emit_add(HOST_CCREG,ECX,HOST_CCREG); - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.next_interrupt,ECX); - emit_writeword(HOST_CCREG,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp0_regs[CP0_COUNT_REG]); - emit_sub(HOST_CCREG,ECX,HOST_CCREG); - emit_writeword(ECX,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.last_count); -#endif -//DEBUG < - emit_call(linker); - emit_jmpreg(RAX); -} - -static void do_readstub(int n) -{ - assem_debug("do_readstub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(intptr_t)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt; - if(itype[i]==C1LS||itype[i]==LOADLR) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,FTEMP); - }else{ - rth=get_reg(i_regmap,rt1[i]|64); - rt=get_reg(i_regmap,rt1[i]); - } - assert(addr>=0); - - intptr_t ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(intptr_t)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(intptr_t)read_hword_new; - if(type==LOADW_STUB) - ftable=(intptr_t)read_word_new; - if(type==LOADD_STUB) - ftable=(intptr_t)read_dword_new; - - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - - // When always writing back dirty registers, do not push only caller saved register if DESTRUCTIVE_WRITEBACK == 1 - save_caller_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call(ftable); - restore_caller_regs(reglist); - - emit_cmpmem_imm_byte((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword(((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword)+4,rth); - } - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_readstub(int type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist) -{ - assem_debug("inline_readstub"); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - - intptr_t ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(intptr_t)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(intptr_t)read_hword_new; - if(type==LOADW_STUB) - ftable=(intptr_t)read_word_new; - if(type==LOADD_STUB) - ftable=(intptr_t)read_dword_new; - - emit_writeword_imm(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - - // When always writing back dirty registers, do not push only caller saved register if DESTRUCTIVE_WRITEBACK == 1 - save_caller_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call(ftable); - restore_caller_regs(reglist); - - if((signed int)addr>=(signed int)0xC0000000) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_cmpmem_imm_byte((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword(((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rdword)+4,rth); - } - } -} - -static void do_writestub(int n) -{ - assem_debug("do_writestub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(intptr_t)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; - signed char *i_regmap=i_regs->regmap; - int rth,rt,r; - - if(itype[i]==C1LS) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,r=FTEMP); - }else{ - rth=get_reg(i_regmap,rs2[i]|64); - rt=get_reg(i_regmap,r=rs2[i]); - } - assert(addr>=0); - assert(rt>=0); - - intptr_t ftable=0; - emit_writeword(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(intptr_t)write_byte_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(intptr_t)write_hword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(intptr_t)write_word_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(intptr_t)write_dword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(r?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - // When always writing back dirty registers, do not push only caller saved register if DESTRUCTIVE_WRITEBACK == 1 - save_caller_regs(reglist); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(stubs[n][6]+1),ARG3_REG); - emit_call(ftable); - restore_caller_regs(reglist); - - emit_cmpmem_imm_byte((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - - if((cc=get_reg(i_regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_writestub(int type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist) -{ - assem_debug("inline_writestub"); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - assert(rt>=0); - - intptr_t ftable=0; - emit_writeword_imm(addr,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(intptr_t)write_byte_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(intptr_t)write_hword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(intptr_t)write_word_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(intptr_t)write_dword_new; - emit_writeword(rt,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(target?rth:rt,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - // When always writing back dirty registers, do not push only caller saved register if DESTRUCTIVE_WRITEBACK == 1 - save_caller_regs(reglist); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_movimm((start+(i+1)*4)+ds,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*(adj+1),ARG3_REG); - emit_call(ftable); - restore_caller_regs(reglist); - - if(((signed int)addr>=(signed int)0xC0000000)||((addr>>16)==0xa430)||((addr>>16)==0x8430)) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_cmpmem_imm_byte((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if((cc=get_reg(regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } -} - -static void do_unalignedwritestub(int n) -{ - set_jump_target(stubs[n][1],(intptr_t)out); - output_byte(0xCC); - emit_jmp(stubs[n][2]); // return address + emit_jmp(linker); } static void do_invstub(int n) { u_int reglist=stubs[n][3]; set_jump_target(stubs[n][1],(intptr_t)out); - save_caller_regs(reglist); + save_regs(reglist); emit_call((intptr_t)invalidate_block_reg[stubs[n][4]]); - restore_caller_regs(reglist); + restore_regs(reglist); emit_jmp(stubs[n][2]); // return address } @@ -3353,28 +3057,9 @@ static void do_dirty_stub_ds(struct ll_entry *head) emit_call((intptr_t)verify_code); } -static void do_cop1stub(int n) -{ - assem_debug("do_cop1stub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(intptr_t)out); - int i=stubs[n][3]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - int ds=stubs[n][6]; - if(!ds) { - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - //if(i_regs!=®s[i]) DebugMessage(M64MSG_VERBOSE, "oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); - } - //else {DebugMessage(M64MSG_VERBOSE, "fp exception in delay slot");} - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - if(regs[i].regmap_entry[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_movimm(start+(i-ds)*4,EAX); // Get PC - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*ccadj[i],HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... - emit_jmp(ds?(intptr_t)fp_exception_ds:(intptr_t)fp_exception); -} - /* TLB */ -static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u_int addr) +static int do_tlb_r(int s,int ar,int map,int cache,int x,int c,u_int addr) { if(c) { // Stores to memory go thru the mapper to detect self-modifying @@ -3402,8 +3087,6 @@ static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u emit_shrimm(s,12,map); // Schedule this while we wait on the load //if(x) emit_xorimm(addr,x,addr); - if(shift>=0) emit_lea8(s,shift); - if(~a) emit_andimm(s,a,ar); emit_readdword_dualindexedx8(cache,map,map); } return map; @@ -3418,16 +3101,6 @@ static int do_tlb_r_branch(int map, int c, u_int addr, intptr_t *jaddr) } return map; } -static int do_tlb_r_branch_debug(int map, int c, u_int addr, intptr_t *jaddr) -{ - if(!c) { - emit_test64(map,map); - *jaddr=(intptr_t)out; - emit_js(0); - emit_shlimm64(map,2,map); - } - return map; -} static int do_tlb_w(int s,int ar,int map,int cache,int x,int c,u_int addr) { @@ -3460,19 +3133,21 @@ static void do_tlb_w_branch(int map, int c, u_int addr, intptr_t *jaddr) emit_jc(0); } } -static void do_tlb_w_branch_debug(int map, int c, u_int addr, intptr_t *jaddr) -{ - if(!c) { - *jaddr=(intptr_t)out; - emit_jc(0); - } -} // We don't need this for x64 static void generate_map_const(u_int addr,int reg) { // void *mapaddr=g_dev.r4300.new_dynarec_hot_state.memory_map+(addr>>12); } +static void set_rounding_mode(int s,int temp) +{ + assert(temp>=0); + emit_movimm(3,temp); + emit_and(s,temp,temp); + emit_lea_rip((intptr_t)g_dev.r4300.new_dynarec_hot_state.rounding_modes, HOST_TEMPREG); + emit_fldcw_indexedx4(HOST_TEMPREG, temp); +} + /* Special assem */ static void shift_assemble_x64(int i,struct regstat *i_regs) @@ -3480,7 +3155,7 @@ static void shift_assemble_x64(int i,struct regstat *i_regs) if(rt1[i]) { if(opcode2[i]<=0x07) // SLLV/SRLV/SRAV { - char s,t,shift; + signed char s,t,shift; t=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); shift=get_reg(i_regs->regmap,rs2[i]); @@ -3496,7 +3171,7 @@ static void shift_assemble_x64(int i,struct regstat *i_regs) } else { - char temp=get_reg(i_regs->regmap,-1); + signed char temp=get_reg(i_regs->regmap,-1); assert(s>=0); if(t==ECX&&s!=ECX) { if(shift!=ECX) emit_mov(shift,ECX); @@ -3541,7 +3216,7 @@ static void shift_assemble_x64(int i,struct regstat *i_regs) } } } else { // DSLLV/DSRLV/DSRAV - char sh,sl,th,tl,shift; + signed char sh,sl,th,tl,shift; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); sh=get_reg(i_regs->regmap,rs1[i]|64); @@ -3651,368 +3326,167 @@ static void shift_assemble_x64(int i,struct regstat *i_regs) static void loadlr_assemble_x64(int i,struct regstat *i_regs) { - int s,th,tl,temp,temp2,addr,map=-1; - int offset; + signed char s,th,tl,temp,temp2,temp2h,addr,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; intptr_t jaddr=0; - int memtarget=0,c=0; u_int hr,reglist=0; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); temp=get_reg(i_regs->regmap,-1); temp2=get_reg(i_regs->regmap,FTEMP); + temp2h=get_reg(i_regs->regmap,FTEMP|64); addr=get_reg(i_regs->regmap,AGEN1+(i&1)); assert(addr<0); + assert(temp>=0); + assert(temp2>=0); offset=imm[i]; + for(hr=0;hrregmap[hr]>=0) reglist|=1<=0) { c=(i_regs->wasconst>>s)&1; - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } + if(offset||s<0||c) addr=temp2; + else addr=s; + int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg + + switch(opcode[i]) { + case 0x22: type=LOADWL_STUB; break; + case 0x26: type=LOADWR_STUB; break; + case 0x1A: type=LOADDL_STUB; break; + case 0x1B: type=LOADDR_STUB; break; + } + +#ifndef INTERPRET_LOADLR + int ldlr=(opcode[i]==0x1A||opcode[i]==0x1B); // LDL/LDR always do inline_readstub if non constant if(!using_tlb) { - if(!c) { - emit_lea8(addr,temp); - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_andimm(addr,0xFFFFFFFC,temp2); // LWL/LWR - }else{ - emit_andimm(addr,0xFFFFFFF8,temp2); // LDL/LDR - } + if(!c&&!ldlr) { emit_cmpimm(addr,0x800000); jaddr=(intptr_t)out; emit_jno(0); } - else { - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_movimm(((constmap[i][s]+offset)<<3)&24,temp); // LWL/LWR - }else{ - emit_movimm(((constmap[i][s]+offset)<<3)&56,temp); // LDL/LDR - } - } #ifdef RAM_OFFSET - map=get_reg(i_regs->regmap,ROREG); - if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + if(((!c&&!ldlr)||memtarget)&&!dummy) { + map=get_reg(i_regs->regmap,ROREG); + if(map<0) emit_loadreg(ROREG,map=HOST_TEMPREG); + } #endif }else{ // using tlb - int a; - if(c) { - a=-1; - }else if (opcode[i]==0x22||opcode[i]==0x26) { - a=0xFFFFFFFC; // LWL/LWR - }else{ - a=0xFFFFFFF8; // LDL/LDR - } map=get_reg(i_regs->regmap,TLREG); + cache=get_reg(i_regs->regmap,MMREG); assert(map>=0); reglist&=~(1<regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { + if((!c||memtarget)&&!dummy) { + if(opcode[i]==0x22||opcode[i]==0x26) { // LWL/LWR assert(tl>=0); - emit_andimm(temp,24,temp); - if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR - if(temp==ECX) - { - int temp3=EDX; - if(temp3==temp2) temp3++; - emit_pushreg(temp3); - emit_movimm(-1,temp3); + if(!c) { + emit_lea8(addr,temp); + emit_andimm(addr,~3,temp2); + emit_readword_indexed_tlb(0,temp2,map,temp2); + emit_andimm(temp,24,temp); + if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR + if(temp!=ECX) emit_xchg64(ECX,temp); + emit_movimm(-1,HOST_TEMPREG); if (opcode[i]==0x26) { - emit_shrcl(temp3); - emit_shrcl(temp2); + emit_shrcl(HOST_TEMPREG); + emit_shrcl(temp2==ECX?temp:temp2); }else{ - emit_shlcl(temp3); - emit_shlcl(temp2); + emit_shlcl(HOST_TEMPREG); + emit_shlcl(temp2==ECX?temp:temp2); } - emit_mov(temp3,ECX); + emit_mov(HOST_TEMPREG,ECX); emit_not(ECX,ECX); - emit_popreg(temp3); + if(temp!=ECX) emit_xchg64(temp,ECX); + emit_and(temp,tl,tl); + emit_or(temp2,tl,tl); } else { - int temp3=EBP; - if(temp3==temp) temp3++; - if(temp3==temp2) temp3++; - if(temp3==temp) temp3++; - emit_xchg64(ECX,temp); - emit_pushreg(temp3); - emit_movimm(-1,temp3); - if (opcode[i]==0x26) { - emit_shrcl(temp3); - emit_shrcl(temp2==ECX?temp:temp2); - }else{ - emit_shlcl(temp3); - emit_shlcl(temp2==ECX?temp:temp2); + int shift=((constmap[i][s]+offset)&3)<<3; + uint32_t mask=~UINT32_C(0); + if (opcode[i]==0x26) { //LWR + shift^=24; + mask>>=shift; + } else { //LWL + mask<<=shift; } - emit_not(temp3,temp3); - emit_mov64(temp,ECX); - emit_mov(temp3,temp); - emit_popreg(temp3); + + if((constmap[i][s]+offset)&3) + emit_andimm(addr,~3,temp2); + + if(shift) { + emit_readword_indexed_tlb(0,temp2,map,temp2); + if (opcode[i]==0x26) emit_shrimm(temp2,shift,temp2); + else emit_shlimm(temp2,shift,temp2); + emit_andimm(tl,~mask,tl); + emit_or(temp2,tl,tl); + } + else + emit_readword_indexed_tlb(0,temp2,map,tl); } - emit_and(temp,tl,tl); - emit_or(temp2,tl,tl); } - } - if (opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR - int temp2h=get_reg(i_regs->regmap,FTEMP|64); - if(!c||memtarget) { - emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); - if(jaddr) add_stub(LOADD_STUB,jaddr,(intptr_t)out,i,temp2,(intptr_t)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADD_STUB,i,(constmap[i][s]+offset)&0xFFFFFFF8,i_regs->regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { - assert(th>=0); + if(opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR assert(tl>=0); - assert(temp>=0); - assert(temp2>=0); + assert(th>=0); assert(temp2h>=0); - reglist&=~(1<>=shift; + } else { //LDL + mask<<=shift; + } + + if((constmap[i][s]+offset)&7) + emit_andimm(addr,~7,temp2); + + if(shift) { + emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); + if (opcode[i]==0x1B) { + emit_shrdimm(temp2h,temp2,shift,temp2h); + emit_shrimm(temp2,shift,temp2); + } else { + emit_shldimm(temp2h,temp2,shift,temp2h); + emit_shlimm(temp2,shift,temp2); + } + emit_andimm(tl,~mask,tl); + emit_andimm(th,~mask>>32,th); + emit_or(temp2,tl,tl); + emit_or(temp2h,th,th); + } + else + emit_readdword_indexed_tlb(0,temp2,map,th,tl); + } } } + if(jaddr) { + add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + } else if(c&&!memtarget) { + inline_readstub(type,i,(constmap[i][s]+offset),addr,i_regs,rt1[i],ccadj[i],reglist); + } +#else + inline_readstub(type,i,c?(constmap[i][s]+offset):0,addr,i_regs,rt1[i],ccadj[i],reglist); +#endif } #define loadlr_assemble loadlr_assemble_x64 -static void cop0_assemble(int i,struct regstat *i_regs) -{ - u_int hr,reglist=0; - for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,rt1[i]); - char copr=(source[i]>>11)&0x1f; - if(t>=0) { - reglist&=~(1<regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - //Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_RANDOM_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - - emit_call((intptr_t)MFC0_new); - restore_caller_regs(reglist); - emit_readword((uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt,t); - } - } - } - else if(opcode2[i]==4) // MTC0 - { - signed char s=get_reg(i_regs->regmap,rs1[i]); - char copr=(source[i]>>11)&0x1f; - assert(s>=0); - save_caller_regs(reglist); - emit_writeword(s,(uintptr_t)&g_dev.r4300.new_dynarec_hot_state.rt); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - // Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG) - // Always update the pcaddr even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) - emit_movimm(copr,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_movimm(start+i*4+(copr==CP0_STATUS_REG)*4,ARG4_REG); - - emit_call((intptr_t)MTC0_new); - restore_caller_regs(reglist); - - if(copr==12||copr==9) { - assert(!is_delayslot); - emit_cmpmem_imm_byte((intptr_t)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - emit_jmp((intptr_t)&do_interrupt); - set_jump_target(jaddr,(intptr_t)out); - } - - if(copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG){ - if((cc=get_reg(i_regs->regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - } - - cop1_usable=0; - } - else - { - assert(opcode2[i]==0x10); - if((source[i]&0x3f)==0x08) // TLBP - { - save_caller_regs(reglist); - emit_call((intptr_t)cached_interp_TLBP); - restore_caller_regs(reglist); - } - else if((source[i]&0x3f)==0x01) // TLBR - { - save_caller_regs(reglist); - emit_call((intptr_t)cached_interp_TLBR); - restore_caller_regs(reglist); - } - else if((source[i]&0x3f)==0x02) { // TLBWI - assert(!is_delayslot); - save_caller_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - - emit_call((intptr_t)TLBWI_new); - restore_caller_regs(reglist); - } - else if((source[i]&0x3f)==0x06) { // TLBWR - assert(!is_delayslot); - save_caller_regs(reglist); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=ARG2_REG; - emit_loadreg(CCREG,cc); - } - - emit_movimm(start+i*4,ARG1_REG); - if(cc!=ARG2_REG) emit_mov(cc,ARG2_REG); - emit_movimm(CLOCK_DIVIDER*ccadj[i],ARG3_REG); - emit_call((intptr_t)TLBWR_new); - restore_caller_regs(reglist); - } - else if((source[i]&0x3f)==0x18) // ERET - { - assert(!is_delayslot); - int count=ccadj[i]; - if(i_regs->regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*count,HOST_CCREG); // TODO: Should there be an extra cycle here? - emit_jmp((intptr_t)jump_eret); - } - } -} - -static void cop1_assemble(int i,struct regstat *i_regs) -{ - // Check cop1 unusable - if(!cop1_usable) { - signed char rs=get_reg(i_regs->regmap,CSREG); - assert(rs>=0); - emit_testimm(rs,0x20000000); - intptr_t jaddr=(intptr_t)out; - emit_jeq(0); - add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); - cop1_usable=1; - } - if (opcode2[i]==0) { // MFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],tl); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==1) { // DMFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - signed char th=get_reg(i_regs->regmap,rt1[i]|64); - if(tl>=0) { - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],tl); - if(th>=0) emit_readword_indexed(4,tl,th); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==4) { // MTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char temp=get_reg(i_regs->regmap,-1); - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==5) { // DMTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char sh=rs1[i]>0?get_reg(i_regs->regmap,rs1[i]|64):sl; - signed char temp=get_reg(i_regs->regmap,-1); - emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sh,4,temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==2) // CFC1 - { - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - u_int copr=(source[i]>>11)&0x1f; - if(copr==0) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr0,tl); - if(copr==31) emit_readword((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,tl); - } - } - else if (opcode2[i]==6) // CTC1 - { - signed char sl=get_reg(i_regs->regmap,rs1[i]); - u_int copr=(source[i]>>11)&0x1f; - assert(sl>=0); - if(copr==31) - { - emit_writeword(sl,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31); - // Set the rounding mode - char temp=get_reg(i_regs->regmap,-1); - emit_movimm(3,temp); - emit_and(sl,temp,temp); - emit_lea_rip((intptr_t)g_dev.r4300.new_dynarec_hot_state.rounding_modes, HOST_TEMPREG); - emit_fldcw_indexedx4(HOST_TEMPREG, temp); - } - } -} - static void fconv_assemble_x64(int i,struct regstat *i_regs) { signed char temp=get_reg(i_regs->regmap,-1); @@ -4021,12 +3495,14 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) if(!cop1_usable) { signed char rs=get_reg(i_regs->regmap,CSREG); assert(rs>=0); - emit_testimm(rs,0x20000000); + emit_testimm(rs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,rs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } + +#ifndef INTERPRET_FCONV if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0d) { // trunc_w_s emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_movss_load(temp,0); @@ -4120,6 +3596,7 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) emit_fldcw_stack(); } return; +#endif // C emulation code @@ -4127,10 +3604,12 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); + save_regs(reglist); if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_w); @@ -4141,13 +3620,15 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) emit_call((intptr_t)cvt_d_w); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_l); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_d_l); @@ -4159,32 +3640,37 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) emit_call((intptr_t)cvt_d_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_w_s); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_l_s); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_s_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_w_d); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) { - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); emit_call((intptr_t)cvt_l_d); @@ -4272,7 +3758,7 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs) emit_call((intptr_t)floor_w_d); } - restore_caller_regs(reglist); + restore_regs(reglist); return; } #define fconv_assemble fconv_assemble_x64 @@ -4286,13 +3772,14 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,cs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCOMP if((source[i]&0x3f)==0x30) { emit_andimm(fs,~0x800000,fs); return; @@ -4354,6 +3841,7 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_cmova_reg(temp,fs); // c_ngt_d return; } +#endif // C only @@ -4362,11 +3850,12 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(i_regs->regmap[hr]>=0) reglist|=1<>11)&0x1f],ARG2_REG); - emit_readptr((intptr_t)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],ARG3_REG); + emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); if((source[i]&0x3f)==0x30) emit_call((intptr_t)c_f_s); if((source[i]&0x3f)==0x31) emit_call((intptr_t)c_un_s); if((source[i]&0x3f)==0x32) emit_call((intptr_t)c_eq_s); @@ -4385,9 +3874,9 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_call((intptr_t)c_ngt_s); } if(opcode2[i]==0x11) { - emit_lea_rip((intptr_t)r4300_cp1_fcr31(&g_dev.r4300.cp1),ARG1_REG); - emit_readptr((intptr_t)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],ARG2_REG); - emit_readptr((intptr_t)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],ARG3_REG); + emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); if((source[i]&0x3f)==0x30) emit_call((intptr_t)c_f_d); if((source[i]&0x3f)==0x31) emit_call((intptr_t)c_un_d); if((source[i]&0x3f)==0x32) emit_call((intptr_t)c_eq_d); @@ -4405,7 +3894,7 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3e) emit_call((intptr_t)c_le_d); if((source[i]&0x3f)==0x3f) emit_call((intptr_t)c_ngt_d); } - restore_caller_regs(reglist); + restore_regs(reglist); emit_loadreg(FSREG,fs); } @@ -4417,13 +3906,14 @@ static void float_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); intptr_t jaddr=(intptr_t)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(intptr_t)out,i,cs,(intptr_t)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FLOAT if((source[i]&0x3f)==6) // mov { if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) { @@ -4519,23 +4009,27 @@ static void float_assemble(int i,struct regstat *i_regs) } return; } - +#endif + u_int hr,reglist=0; for(hr=0;hrregmap[hr]>=0) reglist|=1<regmap,FSREG); if(opcode2[i]==0x10) { // Single precision - save_caller_regs(reglist); + save_regs(reglist); switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],ARG3_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG3_REG); break; @@ -4555,21 +4049,23 @@ static void float_assemble(int i,struct regstat *i_regs) case 0x06: emit_call((intptr_t)mov_s);break; case 0x07: emit_call((intptr_t)neg_s);break; } - restore_caller_regs(reglist); + restore_regs(reglist); } if(opcode2[i]==0x11) { // Double precision - save_caller_regs(reglist); + save_regs(reglist); switch(source[i]&0x3f) { case 0x00: case 0x01: case 0x02: case 0x03: - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],ARG3_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG); break; case 0x04: - emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.fcr31,ARG1_REG); + if(fs>=0) emit_mov(fs,ARG1_REG); + else emit_loadreg(FSREG,ARG1_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG2_REG); emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG3_REG); break; @@ -4589,7 +4085,7 @@ static void float_assemble(int i,struct regstat *i_regs) case 0x06: emit_call((intptr_t)mov_d);break; case 0x07: emit_call((intptr_t)neg_d);break; } - restore_caller_regs(reglist); + restore_regs(reglist); } } @@ -4607,60 +4103,96 @@ static void multdiv_assemble_x64(int i,struct regstat *i_regs) { if((opcode2[i]&4)==0) // 32-bit { - if(opcode2[i]==0x18) // MULT +#ifndef INTERPRET_MULT + if((opcode2[i]==0x18) || (opcode2[i]==0x19)) { - char m1=get_reg(i_regs->regmap,rs1[i]); - char m2=get_reg(i_regs->regmap,rs2[i]); + signed char m1=get_reg(i_regs->regmap,rs1[i]); + signed char m2=get_reg(i_regs->regmap,rs2[i]); assert(m1>=0); assert(m2>=0); emit_mov(m1,EAX); - emit_imul(m2); + + if(opcode2[i]==0x18) //MULT + emit_imul(m2); + else if(opcode2[i]==0x19) //MULTU + emit_mul(m2); } - else if(opcode2[i]==0x19) // MULTU + else +#endif +#ifndef INTERPRET_DIV + if((opcode2[i]==0x1A) || (opcode2[i]==0x1B)) { - char m1=get_reg(i_regs->regmap,rs1[i]); - char m2=get_reg(i_regs->regmap,rs2[i]); - assert(m1>=0); - assert(m2>=0); - emit_mov(m1,EAX); - emit_mul(m2); - } - else if(opcode2[i]==0x1A) // DIV - { - char d1=get_reg(i_regs->regmap,rs1[i]); - char d2=get_reg(i_regs->regmap,rs2[i]); + signed char d1=get_reg(i_regs->regmap,rs1[i]); + signed char d2=get_reg(i_regs->regmap,rs2[i]); assert(d1>=0); assert(d2>=0); emit_mov(d1,EAX); - emit_cdq(); - emit_test(d2,d2); - emit_jeq((intptr_t)out+8); - emit_idiv(d2); + + if(opcode2[i]==0x1A) //DIV + { + emit_cdq(); + emit_test(d2,d2); + emit_jeq((intptr_t)out+8); + emit_idiv(d2); + } + else if(opcode2[i]==0x1B) //DIVU + { + emit_zeroreg(EDX); + emit_test(d2,d2); + emit_jeq((intptr_t)out+8); + emit_div(d2); + } } - else if(opcode2[i]==0x1B) // DIVU + else +#endif { - char d1=get_reg(i_regs->regmap,rs1[i]); - char d2=get_reg(i_regs->regmap,rs2[i]); - assert(d1>=0); - assert(d2>=0); - emit_mov(d1,EAX); - emit_zeroreg(EDX); - emit_test(d2,d2); - emit_jeq((intptr_t)out+8); - emit_div(d2); + u_int reglist=0; + signed char r1=get_reg(i_regs->regmap,rs1[i]); + signed char r2=get_reg(i_regs->regmap,rs2[i]); + signed char hi=get_reg(i_regs->regmap,HIREG); + signed char lo=get_reg(i_regs->regmap,LOREG); + assert(r1>=0); + assert(r2>=0); + + for(int hr=0;hrregmap[hr]>=0) reglist|=1<=0) reglist&=~(1<=0) reglist&=~(1<=0) emit_loadreg(HIREG,hi); + if(lo>=0) emit_loadreg(LOREG,lo); } } else // 64-bit { u_int reglist=0; - char r1h=get_reg(i_regs->regmap,rs1[i]|64); - char r1l=get_reg(i_regs->regmap,rs1[i]); - char r2h=get_reg(i_regs->regmap,rs2[i]|64); - char r2l=get_reg(i_regs->regmap,rs2[i]); - char hih=get_reg(i_regs->regmap,HIREG|64); - char hil=get_reg(i_regs->regmap,HIREG); - char loh=get_reg(i_regs->regmap,LOREG|64); - char lol=get_reg(i_regs->regmap,LOREG); + signed char r1h=get_reg(i_regs->regmap,rs1[i]|64); + signed char r1l=get_reg(i_regs->regmap,rs1[i]); + signed char r2h=get_reg(i_regs->regmap,rs2[i]|64); + signed char r2l=get_reg(i_regs->regmap,rs2[i]); + signed char hih=get_reg(i_regs->regmap,HIREG|64); + signed char hil=get_reg(i_regs->regmap,HIREG); + signed char loh=get_reg(i_regs->regmap,LOREG|64); + signed char lol=get_reg(i_regs->regmap,LOREG); assert(r1h>=0); assert(r2h>=0); assert(r1l>=0); @@ -4681,7 +4213,7 @@ static void multdiv_assemble_x64(int i,struct regstat *i_regs) emit_writeword(r2l,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.rt); emit_writeword(r2h,((intptr_t)&g_dev.r4300.new_dynarec_hot_state.rt)+4); - save_caller_regs(reglist); + save_regs(reglist); if(opcode2[i]==0x1C) // DMULT emit_call((intptr_t)cached_interp_DMULT); @@ -4692,7 +4224,7 @@ static void multdiv_assemble_x64(int i,struct regstat *i_regs) else if(opcode2[i]==0x1F) // DDIVU emit_call((intptr_t)cached_interp_DDIVU); - restore_caller_regs(reglist); + restore_regs(reglist); if(hih>=0) emit_loadreg(HIREG|64,hih); if(hil>=0) emit_loadreg(HIREG,hil); if(loh>=0) emit_loadreg(LOREG|64,loh); @@ -4704,8 +4236,8 @@ static void multdiv_assemble_x64(int i,struct regstat *i_regs) // Multiply by zero is zero. // MIPS does not have a divide by zero exception. // The result is undefined, we return zero. - char hr=get_reg(i_regs->regmap,HIREG); - char lr=get_reg(i_regs->regmap,LOREG); + signed char hr=get_reg(i_regs->regmap,HIREG); + signed char lr=get_reg(i_regs->regmap,LOREG); if(hr>=0) emit_zeroreg(hr); if(lr>=0) emit_zeroreg(lr); } @@ -4777,16 +4309,15 @@ static void wb_valid(signed char pre[],signed char entry[],u_int dirty_pre,u_int if(hr!=EXCLUDE_REG) { reg=pre[hr]; if(((~u)>>(reg&63))&1) { - if(reg>0) { + if(((reg&63)>0)&&((reg&63)>hr)&1) { - if(reg>0&®<36) { + if(reg<64) { emit_storereg(reg,hr); if( ((is32_pre&~uu)>>reg)&1 ) { emit_sarimm(hr,31,HOST_TEMPREG); emit_storereg(reg|64,HOST_TEMPREG); } - } - else if(reg>=64) { + } else { emit_storereg(reg,hr); } } diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/x64/linkage_x64.asm b/mupen64plus-core/src/device/r4300/new_dynarec/x64/linkage_x64.asm index 1de84e2..6f6a25c 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/x64/linkage_x64.asm +++ b/mupen64plus-core/src/device/r4300/new_dynarec/x64/linkage_x64.asm @@ -58,7 +58,6 @@ section .note.GNU-stack noalloc noexec nowrite progbits %define ARG3_REG64 r8 %define ARG4_REG64 r9 %define CCREG esi -%define CCREG64 rsi %else %define ARG1_REG edi %define ARG2_REG esi @@ -69,22 +68,12 @@ section .note.GNU-stack noalloc noexec nowrite progbits %define ARG3_REG64 rdx %define ARG4_REG64 rcx %define CCREG ebx -%define CCREG64 rbx %endif -%define g_dev_r4300_cached_interp_invalid_code (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_cached_interp + offsetof_struct_cached_interp_invalid_code) %define g_dev_r4300_new_dynarec_hot_state_stop (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_stop) -%define g_dev_r4300_new_dynarec_hot_state_regs (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_regs) -%define g_dev_r4300_new_dynarec_hot_state_hi (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_hi) -%define g_dev_r4300_new_dynarec_hot_state_lo (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_lo) -%define g_dev_r4300_new_dynarec_hot_state_cp0_regs (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_cp0_regs) -%define g_dev_r4300_new_dynarec_hot_state_next_interrupt (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_next_interrupt) %define g_dev_r4300_new_dynarec_hot_state_cycle_count (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_cycle_count) %define g_dev_r4300_new_dynarec_hot_state_pending_exception (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_pending_exception) %define g_dev_r4300_new_dynarec_hot_state_pcaddr (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_pcaddr) -%define g_dev_r4300_new_dynarec_hot_state_branch_target (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_branch_target) -%define g_dev_r4300_new_dynarec_hot_state_restore_candidate (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_restore_candidate) -%define g_dev_r4300_new_dynarec_hot_state_memory_map (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_memory_map) cglobal jump_vaddr_eax cglobal jump_vaddr_ecx @@ -97,7 +86,6 @@ cglobal verify_code cglobal cc_interrupt cglobal do_interrupt cglobal fp_exception -cglobal fp_exception_ds cglobal jump_syscall cglobal jump_eret cglobal new_dyna_start @@ -109,6 +97,8 @@ cglobal invalidate_block_ebp cglobal invalidate_block_esi cglobal invalidate_block_edi cglobal breakpoint +cglobal dyna_linker +cglobal dyna_linker_ds cextern base_addr cextern new_recompile_block @@ -117,10 +107,14 @@ cextern get_addr cextern dynarec_gen_interrupt cextern clean_blocks cextern invalidate_block -cextern new_dynarec_check_interrupt +cextern ERET_new cextern get_addr_32 cextern g_dev cextern verify_dirty +cextern cop1_unusable +cextern SYSCALL_new +cextern dynamic_linker +cextern dynamic_linker_ds section .bss align 4 @@ -164,14 +158,9 @@ jump_vaddr_ecx: mov ARG1_REG, ecx jump_vaddr: - mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count], CCREG - add CCREG, [rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36], CCREG call get_addr_ht - mov CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count] jmp rax - verify_code: ;ARG1_REG64 = head add rsp, -8 @@ -187,38 +176,30 @@ _D1: jmp rax cc_interrupt: - add CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] + mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count], CCREG add rsp, -56 ;Align stack - mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36], CCREG - shr CCREG, 19 mov DWORD [rel g_dev_r4300_new_dynarec_hot_state_pending_exception], 0 - and CCREG, 01fch - lea r10, [rel g_dev_r4300_new_dynarec_hot_state_restore_candidate] - cmp DWORD [r10+CCREG64], 0 - jne _E4 -_E1: call dynarec_gen_interrupt - mov CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36] - mov eax, DWORD[rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] + mov CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count] mov ecx, DWORD[rel g_dev_r4300_new_dynarec_hot_state_pending_exception] mov edx, DWORD[rel g_dev_r4300_new_dynarec_hot_state_stop] add rsp, 56 - sub CCREG, eax test edx, edx - jne _E3 - test ecx, ecx jne _E2 + test ecx, ecx + jne _E1 ret -_E2: +_E1: add rsp, -8 mov ARG1_REG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_pcaddr] - mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count], CCREG call get_addr_ht - mov CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count] add rsp, 16 jmp rax -_E3: - add rsp, 64 ;pop return address +_E2: + add rsp, 8 ;pop return address + +new_dyna_stop: + add rsp, 56 ;restore callee-save registers pop rbp pop r15 @@ -231,102 +212,41 @@ _E3: pop rdi %endif ret ;exit dynarec -_E4: - ;Move 'dirty' blocks to the 'clean' list - mov edx, DWORD[r10+CCREG64] - mov DWORD [r10+CCREG64], 0 - shl CCREG, 3 - mov ebp, 0 -_E5: - shr edx, 1 - jnc _E6 - mov ARG1_REG, CCREG - add ARG1_REG, ebp - call clean_blocks -_E6: - inc ebp - test ebp, 31 - jne _E5 - jmp _E1 do_interrupt: + mov edx, DWORD[rel g_dev_r4300_new_dynarec_hot_state_stop] + test edx, edx + jne new_dyna_stop mov ARG1_REG, [rel g_dev_r4300_new_dynarec_hot_state_pcaddr] call get_addr_ht - mov CCREG, [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36] - mov edx, [rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] - sub CCREG, edx + mov CCREG, [rel g_dev_r4300_new_dynarec_hot_state_cycle_count] jmp rax fp_exception: - mov edx, 01000002ch -_E7: - ;EAX = pcaddr - mov ecx, [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+48] - or ecx, 2 - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+48], ecx ;Status - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+52], edx ;Cause - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+56], eax ;EPC - mov ARG1_REG, 080000180h - call get_addr_ht + mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_pcaddr], eax + call cop1_unusable jmp rax -fp_exception_ds: - mov edx, 09000002ch ;Set high bit if delay slot - jmp _E7 - jump_syscall: - mov edx, 020h - jmp _E7 + mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_pcaddr], eax + call SYSCALL_new + jmp rax jump_eret: - mov ecx, [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+48] ;Status - add CCREG, [rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] - and ecx, 0FFFFFFFDh - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36], CCREG ;Count - mov [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+48], ecx ;Status - call new_dynarec_check_interrupt - mov eax, [rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] - mov CCREG, [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36] - sub CCREG, eax - mov [rel g_dev_r4300_new_dynarec_hot_state_cycle_count], CCREG - mov eax, [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+56] ;EPC - jns _E11 -_E8: - mov r9, 248 - xor r10d, r10d -_E9: - lea r8, [rel g_dev_r4300_new_dynarec_hot_state_regs] - mov ecx, [r8+r9] - mov edx, [r8+r9+4] - sar ecx, 31 - xor edx, ecx - neg edx - adc r10d, r10d - sub r9, 8 - jne _E9 - lea r8, [rel g_dev_r4300_new_dynarec_hot_state_hi] - mov ecx, [r8+r9] - mov edx, [r8+r9+4] - sar ecx, 31 - xor edx, ecx - jne _E10 - lea r8, [rel g_dev_r4300_new_dynarec_hot_state_lo] - mov ecx, [r8+r9] - mov edx, [r8+r9+4] - sar ecx, 31 - xor edx, ecx -_E10: - neg edx - adc ARG2_REG, r10d - mov ARG1_REG, eax - call get_addr_32 - mov CCREG, [rel g_dev_r4300_new_dynarec_hot_state_cycle_count] + mov DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count], CCREG + call ERET_new + mov CCREG, DWORD[rel g_dev_r4300_new_dynarec_hot_state_cycle_count] + test rax, rax + je new_dyna_stop + jmp rax + +dyna_linker: + call dynamic_linker + jmp rax + +dyna_linker_ds: + call dynamic_linker_ds jmp rax -_E11: - mov [rel g_dev_r4300_new_dynarec_hot_state_pcaddr], eax - call cc_interrupt - mov eax, [rel g_dev_r4300_new_dynarec_hot_state_pcaddr] - jmp _E8 new_dyna_start: ;we must push an even # of registers to keep stack 16-byte aligned @@ -343,9 +263,7 @@ new_dyna_start: add rsp, -56 mov ARG1_REG, 0a4000040h call new_recompile_block - mov eax, DWORD [rel g_dev_r4300_new_dynarec_hot_state_next_interrupt] - mov CCREG, DWORD [rel g_dev_r4300_new_dynarec_hot_state_cp0_regs+36] - sub CCREG, eax + mov CCREG, DWORD [rel g_dev_r4300_new_dynarec_hot_state_cycle_count] mov rax, QWORD[rel base_addr] jmp rax @@ -377,9 +295,9 @@ invalidate_block_ecx: mov ARG1_REG, ecx invalidate_block_call: - add rsp, -8 + add rsp, -56 call invalidate_block - add rsp, 8 + add rsp, 56 ret breakpoint: diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/x86/assem_x86.c b/mupen64plus-core/src/device/r4300/new_dynarec/x86/assem_x86.c index 8c4de5a..c67e99d 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/x86/assem_x86.c +++ b/mupen64plus-core/src/device/r4300/new_dynarec/x86/assem_x86.c @@ -84,7 +84,6 @@ static void *add_pointer(void *src, void* addr) int *ptr2=(int*)((u_int)ptr+(u_int)*ptr+4); assert((*ptr2&0xFF)==0x68); //push assert((*(int*)((u_int)ptr2+5)&0xFF)==0x68); //push - //assert((*(int*)((u_int)ptr2+10)&0xFF)==0xE8); //call u_int offset=(u_int)addr-(u_int)ptr-4; *ptr=offset; return (void*)ptr2; @@ -624,10 +623,26 @@ static void multdiv_alloc_x86(struct regstat *current,int i) { if((opcode2[i]&4)==0) // 32-bit { - current->u&=~(1LL<u&=~(1LL<u&=~(1LL<u&=~(1LL<is32|=1LL<u&=~(1LL<>4); - if((r&63)==HIREG) addr=(int)r4300_mult_hi(&g_dev.r4300)+((r&64)>>4); - if((r&63)==LOREG) addr=(int)r4300_mult_lo(&g_dev.r4300)+((r&64)>>4); + int addr=((int)g_dev.r4300.new_dynarec_hot_state.regs)+((r&63)<<3)+((r&64)>>4); + if((r&63)==HIREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.hi+((r&64)>>4); + if((r&63)==LOREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.lo+((r&64)>>4); if(r==CCREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.cycle_count; - if(r==CSREG) addr=(int)&r4300_cp0_regs(&g_dev.r4300.cp0)[CP0_STATUS_REG]; - if(r==FSREG) addr=(int)r4300_cp1_fcr31(&g_dev.r4300.cp1); + if(r==CSREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.cp0_regs[CP0_STATUS_REG]; + if(r==FSREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.fcr31; assem_debug("mov %x+%d,%%%s",addr,r,regname[hr]); output_byte(0x8B); output_modrm(0,5,hr); @@ -871,11 +886,13 @@ static void emit_loadreg(int r, int hr) } static void emit_storereg(int r, int hr) { - int addr=((int)r4300_regs(&g_dev.r4300))+((r&63)<<3)+((r&64)>>4); - if((r&63)==HIREG) addr=(int)r4300_mult_hi(&g_dev.r4300)+((r&64)>>4); - if((r&63)==LOREG) addr=(int)r4300_mult_lo(&g_dev.r4300)+((r&64)>>4); + int addr=((int)g_dev.r4300.new_dynarec_hot_state.regs)+((r&63)<<3)+((r&64)>>4); + if((r&63)==HIREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.hi+((r&64)>>4); + if((r&63)==LOREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.lo+((r&64)>>4); if(r==CCREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.cycle_count; - if(r==FSREG) addr=(int)r4300_cp1_fcr31(&g_dev.r4300.cp1); + if(r==FSREG) addr=(int)&g_dev.r4300.new_dynarec_hot_state.fcr31; + assert((r&63)!=CSREG); + assert((r&63)!=0); assert((r&63)<=CCREG); assem_debug("mov %%%s,%x+%d",regname[hr],addr,r); output_byte(0x89); @@ -2300,11 +2317,11 @@ static void emit_mov2imm_compact(int imm1,u_int rt1,int imm2,u_int rt2) } // special case for checking pending_exception -static void emit_cmpmem_imm_byte(int addr,int imm) +static void emit_cmpmem_imm(int addr, int imm) { assert(imm<128&&imm>=-127); - assem_debug("cmpb $%d,%x",imm,addr); - output_byte(0x80); + assem_debug("cmp $%d,%x",imm,addr); + output_byte(0x83); output_modrm(0,5,7); output_w32(addr); output_byte(imm); @@ -2613,6 +2630,18 @@ static void emit_cvttpd2dq(u_int ssereg1,u_int ssereg2) } #endif +static void save_regs(u_int reglist) +{ + (void)reglist; + emit_pusha(); +} + +static void restore_regs(u_int reglist) +{ + (void)reglist; + emit_popa(); +} + /* Stubs/epilogue */ static void emit_extjump2(int addr, int target, int linker) @@ -2630,318 +2659,7 @@ static void emit_extjump2(int addr, int target, int linker) } emit_pushimm(target); emit_pushimm(addr); - //assert(addr>=0x7000000&&addr<0x7FFFFFF); - //assert((target>=0x80000000&&target<0x80800000)||(target>0xA4000000&&target<0xA4001000)); -//DEBUG > -#ifdef DEBUG_CYCLE_COUNT - emit_readword((int)r4300_cp0_next_interrupt(&g_dev.r4300.cp0),ECX); - emit_add(HOST_CCREG,ECX,HOST_CCREG); - emit_writeword(HOST_CCREG,(int)&r4300_cp0_regs(&g_dev.r4300.cp0)[CP0_COUNT_REG]); -#endif -//DEBUG < - emit_call(linker); - emit_addimm(ESP,8,ESP); - emit_jmpreg(EAX); -} - -static void do_readstub(int n) -{ - assem_debug("do_readstub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - signed char *i_regmap=i_regs->regmap; - int rth,rt; - if(itype[i]==C1LS||itype[i]==LOADLR) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,FTEMP); - }else{ - rth=get_reg(i_regmap,rt1[i]|64); - rt=get_reg(i_regmap,rt1[i]); - } - assert(addr>=0); - - int ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(int)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(int)read_hword_new; - if(type==LOADW_STUB) - ftable=(int)read_word_new; - if(type==LOADD_STUB) - ftable=(int)read_dword_new; - - emit_writeword(addr,(int)&g_dev.r4300.new_dynarec_hot_state.address); - emit_pusha(); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_pushimm(CLOCK_DIVIDER*(stubs[n][6]+1)); - emit_pushreg(cc); - emit_pushimm((start+(i+1)*4)+ds); - emit_call(ftable); - emit_addimm(ESP,12,ESP); - emit_popa(); - - emit_cmpmem_imm_byte((int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword(((int)&g_dev.r4300.new_dynarec_hot_state.rdword)+4,rth); - } - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_readstub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - assem_debug("inline_readstub"); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(agr<0); - - int ftable=0; - if(type==LOADB_STUB||type==LOADBU_STUB) - ftable=(int)read_byte_new; - if(type==LOADH_STUB||type==LOADHU_STUB) - ftable=(int)read_hword_new; - if(type==LOADW_STUB) - ftable=(int)read_word_new; - if(type==LOADD_STUB) - ftable=(int)read_dword_new; - - emit_writeword_imm(addr_const,(int)&g_dev.r4300.new_dynarec_hot_state.address); - emit_pusha(); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_pushimm(CLOCK_DIVIDER*(adj+1)); - emit_pushreg(cc); - emit_pushimm((start+(i+1)*4)+ds); - emit_call(ftable); - emit_addimm(ESP,12,ESP); - emit_popa(); - - if((signed int)addr_const>=(signed int)0xC0000000) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_cmpmem_imm_byte((int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if(rt>=0) { - if(type==LOADB_STUB) - emit_movsbl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADBU_STUB) - emit_movzbl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADH_STUB) - emit_movswl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADHU_STUB) - emit_movzwl((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADW_STUB) - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(type==LOADD_STUB) { - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rdword,rt); - if(rth>=0) emit_readword(((int)&g_dev.r4300.new_dynarec_hot_state.rdword)+4,rth); - } - } -} - -static void do_writestub(int n) -{ - assem_debug("do_writestub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int addr=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - signed char *i_regmap=i_regs->regmap; - int rth,rt,r; - - if(itype[i]==C1LS) { - rth=get_reg(i_regmap,FTEMP|64); - rt=get_reg(i_regmap,r=FTEMP); - }else{ - rth=get_reg(i_regmap,rs2[i]|64); - rt=get_reg(i_regmap,r=rs2[i]); - } - assert(addr>=0); - assert(rt>=0); - - int ftable=0; - emit_writeword(addr,(int)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(int)write_byte_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(int)write_hword_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(int)write_word_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(int)write_dword_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(r?rth:rt,((int)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - emit_pusha(); - - int cc=get_reg(i_regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - int ds=i_regs!=®s[i]; - - emit_pushimm(CLOCK_DIVIDER*(stubs[n][6]+1)); - emit_pushreg(cc); - emit_pushimm((start+(i+1)*4)+ds); - emit_call(ftable); - emit_addimm(ESP,12,ESP); - emit_popa(); - - emit_cmpmem_imm_byte((int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - - if((cc=get_reg(i_regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - emit_jmp(stubs[n][2]); // return address -} - -static void inline_writestub(int type, int i, u_int addr_const, signed char regmap[], int target, int adj, u_int reglist) -{ - assem_debug("inline_writestub"); - int rth=get_reg(regmap,target|64); - int rt=get_reg(regmap,target); - int agr=get_reg(regmap,AGEN1+(i&1)); - assert(rt>=0); - assert(agr<0); - - int ftable=0; - emit_writeword_imm(addr_const,(int)&g_dev.r4300.new_dynarec_hot_state.address); - if(type==STOREB_STUB){ - ftable=(int)write_byte_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREH_STUB){ - ftable=(int)write_hword_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STOREW_STUB){ - ftable=(int)write_word_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wword); - } - if(type==STORED_STUB){ - ftable=(int)write_dword_new; - emit_writeword(rt,(int)&g_dev.r4300.new_dynarec_hot_state.wdword); - emit_writeword(target?rth:rt,((int)&g_dev.r4300.new_dynarec_hot_state.wdword)+4); - } - - emit_pusha(); - - int cc=get_reg(regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - int ds=regmap!=regs[i].regmap; - struct regstat *i_regs; - if(!ds) i_regs=®s[i]; - else i_regs=&branch_regs[i-1]; - - emit_pushimm(CLOCK_DIVIDER*(adj+1)); - emit_pushreg(cc); - emit_pushimm((start+(i+1)*4)+ds); - emit_call(ftable); - emit_addimm(ESP,12,ESP); - emit_popa(); - - if(((signed int)addr_const>=(signed int)0xC0000000)||((addr_const>>16)==0xa430)||((addr_const>>16)==0x8430)) { - // Theoretically we can have a pagefault here, if the TLB has never - // been enabled and the address is outside the range 80000000..BFFFFFFF - // Write out the registers so the pagefault can be handled. This is - // a very rare case and likely represents a bug. - emit_cmpmem_imm_byte((int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - int jaddr=(int)out; - emit_jeq(0); - - if(!ds) load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if((cc=get_reg(regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } -} - -static void do_unalignedwritestub(int n) -{ - set_jump_target(stubs[n][1],(int)out); - output_byte(0xCC); - emit_jmp(stubs[n][2]); // return address + emit_jmp(linker); } static void do_invstub(int n) @@ -2970,28 +2688,9 @@ static void do_dirty_stub_ds(struct ll_entry * head) emit_call((int)&verify_code); } -static void do_cop1stub(int n) -{ - assem_debug("do_cop1stub %x",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(int)out); - int i=stubs[n][3]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - int ds=stubs[n][6]; - if(!ds) { - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - //if(i_regs!=®s[i]) DebugMessage(M64MSG_VERBOSE, "oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); - } - //else {DebugMessage(M64MSG_VERBOSE, "fp exception in delay slot");} - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - if(regs[i].regmap_entry[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_movimm(start+(i-ds)*4,EAX); // Get PC - emit_addimm(HOST_CCREG,CLOCK_DIVIDER*ccadj[i],HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... - emit_jmp(ds?(int)fp_exception_ds:(int)fp_exception); -} - /* TLB */ -static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u_int addr) +static int do_tlb_r(int s,int ar,int map,int cache,int x,int c,u_int addr) { if(c) { if((signed int)addr>=(signed int)0xC0000000) { @@ -3005,8 +2704,6 @@ static int do_tlb_r(int s,int ar,int map,int cache,int x,int a,int shift,int c,u emit_shrimm(map,12,map); // Schedule this while we wait on the load //if(x) emit_xorimm(addr,x,addr); - if(shift>=0) emit_lea8(s,shift); - if(~a) emit_andimm(s,a,ar); emit_movmem_indexedx4((int)g_dev.r4300.new_dynarec_hot_state.memory_map,map,map); } return map; @@ -3020,15 +2717,6 @@ static int do_tlb_r_branch(int map, int c, u_int addr, int *jaddr) } return map; } -static int do_tlb_r_branch_debug(int map, int c, u_int addr, int *jaddr) -{ - if(!c) { - emit_test(map,map); - *jaddr=(int)out; - emit_js(0); - } - return map; -} static int do_tlb_w(int s,int ar,int map,int cache,int x,int c,u_int addr) { @@ -3057,19 +2745,20 @@ static void do_tlb_w_branch(int map, int c, u_int addr, int *jaddr) emit_jc(0); } } -static void do_tlb_w_branch_debug(int map, int c, u_int addr, int *jaddr) -{ - if(!c) { - *jaddr=(int)out; - emit_jc(0); - } -} // We don't need this for x86 static void generate_map_const(u_int addr,int reg) { // void *mapaddr=g_dev.r4300.new_dynarec_hot_state.memory_map+(addr>>12); } +static void set_rounding_mode(int s,int temp) +{ + assert(temp>=0); + emit_movimm(3,temp); + emit_and(s,temp,temp); + emit_fldcw_indexed((int)&g_dev.r4300.new_dynarec_hot_state.rounding_modes,temp); +} + /* Special assem */ static void shift_assemble_x86(int i,struct regstat *i_regs) @@ -3077,7 +2766,7 @@ static void shift_assemble_x86(int i,struct regstat *i_regs) if(rt1[i]) { if(opcode2[i]<=0x07) // SLLV/SRLV/SRAV { - char s,t,shift; + signed char s,t,shift; t=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); shift=get_reg(i_regs->regmap,rs2[i]); @@ -3093,7 +2782,7 @@ static void shift_assemble_x86(int i,struct regstat *i_regs) } else { - char temp=get_reg(i_regs->regmap,-1); + signed char temp=get_reg(i_regs->regmap,-1); assert(s>=0); if(t==ECX&&s!=ECX) { if(shift!=ECX) emit_mov(shift,ECX); @@ -3127,7 +2816,7 @@ static void shift_assemble_x86(int i,struct regstat *i_regs) } } } else { // DSLLV/DSRLV/DSRAV - char sh,sl,th,tl,shift; + signed char sh,sl,th,tl,shift; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); sh=get_reg(i_regs->regmap,rs1[i]|64); @@ -3230,355 +2919,155 @@ static void shift_assemble_x86(int i,struct regstat *i_regs) static void loadlr_assemble_x86(int i,struct regstat *i_regs) { - int s,th,tl,temp,temp2,addr,map=-1; - int offset; - int jaddr=0; - int memtarget=0,c=0; + signed char s,th,tl,temp,temp2,temp2h,addr,map=-1,cache=-1; + int offset,type=0,memtarget=0,c=0; + intptr_t jaddr=0; u_int hr,reglist=0; th=get_reg(i_regs->regmap,rt1[i]|64); tl=get_reg(i_regs->regmap,rt1[i]); s=get_reg(i_regs->regmap,rs1[i]); temp=get_reg(i_regs->regmap,-1); temp2=get_reg(i_regs->regmap,FTEMP); + temp2h=get_reg(i_regs->regmap,FTEMP|64); addr=get_reg(i_regs->regmap,AGEN1+(i&1)); assert(addr<0); + assert(temp>=0); + assert(temp2>=0); + assert(temp2h>=0); offset=imm[i]; + for(hr=0;hrregmap[hr]>=0) reglist|=1<=0) { c=(i_regs->wasconst>>s)&1; - memtarget=((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; - if(using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; + memtarget=c&&((signed int)(constmap[i][s]+offset))<(signed int)0x80800000; + if(c&&using_tlb&&((signed int)(constmap[i][s]+offset))>=(signed int)0xC0000000) memtarget=1; } + if(offset||s<0||c) addr=temp2; + else addr=s; + int dummy=(rt1[i]==0)||(tl!=get_reg(i_regs->regmap,rt1[i])); // ignore loads to r0 and unneeded reg + + switch(opcode[i]) { + case 0x22: type=LOADWL_STUB; break; + case 0x26: type=LOADWR_STUB; break; + case 0x1A: type=LOADDL_STUB; break; + case 0x1B: type=LOADDR_STUB; break; + } + +#ifndef INTERPRET_LOADLR + int ldlr=(opcode[i]==0x1A||opcode[i]==0x1B); // LDL/LDR always do inline_readstub if non constant if(!using_tlb) { - if(!c) { - emit_lea8(addr,temp); - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_andimm(addr,0xFFFFFFFC,temp2); // LWL/LWR - }else{ - emit_andimm(addr,0xFFFFFFF8,temp2); // LDL/LDR - } + if(!c&&!ldlr) { emit_cmpimm(addr,0x800000); - jaddr=(int)out; + jaddr=(intptr_t)out; emit_jno(0); } - else { - if (opcode[i]==0x22||opcode[i]==0x26) { - emit_movimm(((constmap[i][s]+offset)<<3)&24,temp); // LWL/LWR - }else{ - emit_movimm(((constmap[i][s]+offset)<<3)&56,temp); // LDL/LDR - } - } }else{ // using tlb - int a; - if(c) { - a=-1; - }else if (opcode[i]==0x22||opcode[i]==0x26) { - a=0xFFFFFFFC; // LWL/LWR - }else{ - a=0xFFFFFFF8; // LDL/LDR - } map=get_reg(i_regs->regmap,TLREG); + cache=get_reg(i_regs->regmap,MMREG); assert(map>=0); reglist&=~(1<regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { + if((!c||memtarget)&&!dummy) { + if(opcode[i]==0x22||opcode[i]==0x26) { // LWL/LWR assert(tl>=0); - emit_andimm(temp,24,temp); - if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR - if(temp==ECX) - { - int temp3=EDX; - if(temp3==temp2) temp3++; - emit_pushreg(temp3); - emit_movimm(-1,temp3); + if(!c) { + emit_lea8(addr,temp); + emit_andimm(addr,~3,temp2); + emit_readword_indexed_tlb(0,temp2,map,temp2); + emit_andimm(temp,24,temp); + if (opcode[i]==0x26) emit_xorimm(temp,24,temp); // LWR + if(temp!=ECX) emit_xchg(ECX,temp); + emit_movimm(-1,temp2h==ECX?temp:temp2h); if (opcode[i]==0x26) { - emit_shrcl(temp3); - emit_shrcl(temp2); + emit_shrcl(temp2h==ECX?temp:temp2h); + emit_shrcl(temp2==ECX?temp:temp2); }else{ - emit_shlcl(temp3); - emit_shlcl(temp2); + emit_shlcl(temp2h==ECX?temp:temp2h); + emit_shlcl(temp2==ECX?temp:temp2); } - emit_mov(temp3,ECX); + emit_mov(temp2h==ECX?temp:temp2h,ECX); emit_not(ECX,ECX); - emit_popreg(temp3); + if(temp!=ECX) emit_xchg(temp,ECX); + emit_and(temp,tl,tl); + emit_or(temp2,tl,tl); } else { - int temp3=EBP; - if(temp3==temp) temp3++; - if(temp3==temp2) temp3++; - if(temp3==temp) temp3++; - emit_xchg(ECX,temp); - emit_pushreg(temp3); - emit_movimm(-1,temp3); - if (opcode[i]==0x26) { - emit_shrcl(temp3); - emit_shrcl(temp2==ECX?temp:temp2); - }else{ - emit_shlcl(temp3); - emit_shlcl(temp2==ECX?temp:temp2); + int shift=((constmap[i][s]+offset)&3)<<3; + uint32_t mask=~UINT32_C(0); + if (opcode[i]==0x26) { //LWR + shift^=24; + mask>>=shift; + } else { //LWL + mask<<=shift; } - emit_not(temp3,temp3); - emit_mov(temp,ECX); - emit_mov(temp3,temp); - emit_popreg(temp3); + + if(shift) { + emit_readword_tlb((constmap[i][s]+offset)&~3,map,temp2); + if (opcode[i]==0x26) emit_shrimm(temp2,shift,temp2); + else emit_shlimm(temp2,shift,temp2); + emit_andimm(tl,~mask,tl); + emit_or(temp2,tl,tl); + } + else + emit_readword_tlb((constmap[i][s]+offset)&~3,map,tl); } - emit_and(temp,tl,tl); - emit_or(temp2,tl,tl); } - } - if (opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR - int temp2h=get_reg(i_regs->regmap,FTEMP|64); - if(!c||memtarget) { - emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); - if(jaddr) add_stub(LOADD_STUB,jaddr,(int)out,i,temp2,(int)i_regs,ccadj[i],reglist); - } - else - inline_readstub(LOADD_STUB,i,(constmap[i][s]+offset)&0xFFFFFFF8,i_regs->regmap,FTEMP,ccadj[i],reglist); - if(rt1[i]) { - assert(th>=0); + if(opcode[i]==0x1A||opcode[i]==0x1B) { // LDL/LDR assert(tl>=0); - assert(temp>=0); - assert(temp2>=0); - assert(temp2h>=0); - emit_andimm(temp,56,temp); - emit_pusha(); - emit_writeword(temp,(int)&g_dev.r4300.new_dynarec_hot_state.rd); - emit_writeword(temp2,(int)&g_dev.r4300.new_dynarec_hot_state.rs); - emit_writeword(temp2h,((int)&g_dev.r4300.new_dynarec_hot_state.rs)+4); - emit_writeword(tl,(int)&g_dev.r4300.new_dynarec_hot_state.rt); - emit_writeword(th,((int)&g_dev.r4300.new_dynarec_hot_state.rt)+4); - if(opcode[i]==0x1A) emit_call((int)ldl_merge); - if(opcode[i]==0x1B) emit_call((int)ldr_merge); - emit_popa(); - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rt,tl); - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rt+4,th); + assert(th>=0); + if(!c) { + //TODO: implement recompiled code + inline_readstub(type,i,0,addr,i_regs,rt1[i],ccadj[i],reglist); + } + else + { + int shift=((constmap[i][s]+offset)&7)<<3; + uint64_t mask=~UINT64_C(0); + if (opcode[i]==0x1B) { //LDR + shift^=56; + mask>>=shift; + } else { //LDL + mask<<=shift; + } + + if(shift) { + emit_readdword_tlb((constmap[i][s]+offset)&~7,map,temp2h,temp2); + if (opcode[i]==0x1B) { + emit_shrdimm(temp2h,temp2,shift,temp2h); + emit_shrimm(temp2,shift,temp2); + } else { + emit_shldimm(temp2h,temp2,shift,temp2h); + emit_shlimm(temp2,shift,temp2); + } + emit_andimm(tl,~mask,tl); + emit_andimm(th,~mask>>32,th); + emit_or(temp2,tl,tl); + emit_or(temp2h,th,th); + } + else + emit_readdword_tlb((constmap[i][s]+offset)&~7,map,th,tl); + } } } + if(jaddr) { + add_stub(type,jaddr,(intptr_t)out,i,addr,(intptr_t)i_regs,ccadj[i],reglist); + } else if(c&&!memtarget) { + inline_readstub(type,i,(constmap[i][s]+offset),addr,i_regs,rt1[i],ccadj[i],reglist); + } +#else + inline_readstub(type,i,c?(constmap[i][s]+offset):0,addr,i_regs,rt1[i],ccadj[i],reglist); +#endif } #define loadlr_assemble loadlr_assemble_x86 -static void cop0_assemble(int i,struct regstat *i_regs) -{ - if(opcode2[i]==0) // MFC0 - { - if(rt1[i]) { - signed char t=get_reg(i_regs->regmap,rt1[i]); - char copr=(source[i]>>11)&0x1f; - if(t>=0) { - emit_pusha(); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - //Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_RANDOM_REG) - emit_pushimm(CLOCK_DIVIDER*ccadj[i]); - emit_pushreg(cc); - emit_pushimm(copr); - - emit_call((int)MFC0_new); - emit_addimm(ESP,12,ESP); - emit_popa(); - emit_readword((int)&g_dev.r4300.new_dynarec_hot_state.rt,t); - } - } - } - else if(opcode2[i]==4) // MTC0 - { - signed char s=get_reg(i_regs->regmap,rs1[i]); - char copr=(source[i]>>11)&0x1f; - assert(s>=0); - emit_pusha(); - emit_writeword(s,(int)&g_dev.r4300.new_dynarec_hot_state.rt); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - // Always update the count even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG) - // Always update the pcaddr even if it's only necessary when (copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) - emit_pushimm(start+i*4+(copr==CP0_STATUS_REG)*4); - emit_pushimm(CLOCK_DIVIDER*ccadj[i]); - emit_pushreg(cc); - emit_pushimm(copr); - - emit_call((int)MTC0_new); - emit_addimm(ESP,16,ESP); - emit_popa(); - - if(copr==CP0_COUNT_REG||copr==CP0_STATUS_REG) { - assert(!is_delayslot); - emit_cmpmem_imm_byte((int)&g_dev.r4300.new_dynarec_hot_state.pending_exception,0); - int jaddr=(int)out; - emit_jeq(0); - load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,regs[i].wasconst,i); - wb_dirtys(i_regs->regmap_entry,i_regs->was32,i_regs->wasdirty); - emit_jmp((int)&do_interrupt); - set_jump_target(jaddr,(int)out); - } - - if(copr==CP0_COUNT_REG||copr==CP0_COMPARE_REG||copr==CP0_STATUS_REG){ - if((cc=get_reg(i_regs->regmap,CCREG))>=0) { - emit_loadreg(CCREG,cc); - } - } - - cop1_usable=0; - } - else - { - assert(opcode2[i]==0x10); - if((source[i]&0x3f)==0x08) // TLBP - { - emit_pusha(); - emit_call((int)cached_interp_TLBP); - emit_popa(); - } - else if((source[i]&0x3f)==0x01) // TLBR - { - emit_pusha(); - emit_call((int)cached_interp_TLBR); - emit_popa(); - } - else if((source[i]&0x3f)==0x02) { // TLBWI - assert(!is_delayslot); - emit_pusha(); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - emit_pushimm(CLOCK_DIVIDER*ccadj[i]); - emit_pushreg(cc); - emit_pushimm(start+i*4); - emit_call((int)TLBWI_new); - emit_addimm(ESP,12,ESP); - emit_popa(); - } - else if((source[i]&0x3f)==0x06) { // TLBWR - assert(!is_delayslot); - emit_pusha(); - - int cc=get_reg(i_regs->regmap,CCREG); - if(cc<0) { - cc=HOST_CCREG; - emit_loadreg(CCREG,cc); - } - - emit_pushimm(CLOCK_DIVIDER*ccadj[i]); - emit_pushreg(cc); - emit_pushimm(start+i*4); - emit_call((int)TLBWR_new); - emit_addimm(ESP,12,ESP); - emit_popa(); - } - else if((source[i]&0x3f)==0x18) // ERET - { - assert(!is_delayslot); - int count=ccadj[i]; - if(i_regs->regmap[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); - emit_addimm_and_set_flags(CLOCK_DIVIDER*count,HOST_CCREG); // TODO: Should there be an extra cycle here? - emit_jmp((int)jump_eret); - } - } -} - -static void cop1_assemble(int i,struct regstat *i_regs) -{ - // Check cop1 unusable - if(!cop1_usable) { - signed char rs=get_reg(i_regs->regmap,CSREG); - assert(rs>=0); - emit_testimm(rs,0x20000000); - int jaddr=(int)out; - emit_jeq(0); - add_stub(FP_STUB,jaddr,(int)out,i,rs,(int)i_regs,is_delayslot,0); - cop1_usable=1; - } - if (opcode2[i]==0) { // MFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],tl); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==1) { // DMFC1 - signed char tl=get_reg(i_regs->regmap,rt1[i]); - signed char th=get_reg(i_regs->regmap,rt1[i]|64); - if(tl>=0) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],tl); - if(th>=0) emit_readword_indexed(4,tl,th); - emit_readword_indexed(0,tl,tl); - } - } - else if (opcode2[i]==4) { // MTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char temp=get_reg(i_regs->regmap,-1); - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==5) { // DMTC1 - signed char sl=get_reg(i_regs->regmap,rs1[i]); - signed char sh=rs1[i]>0?get_reg(i_regs->regmap,rs1[i]|64):sl; - signed char temp=get_reg(i_regs->regmap,-1); - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); - emit_writeword_indexed(sh,4,temp); - emit_writeword_indexed(sl,0,temp); - } - else if (opcode2[i]==2) // CFC1 - { - signed char tl=get_reg(i_regs->regmap,rt1[i]); - if(tl>=0) { - u_int copr=(source[i]>>11)&0x1f; - if(copr==0) emit_readword((int)r4300_cp1_fcr0(&g_dev.r4300.cp1),tl); - if(copr==31) emit_readword((int)r4300_cp1_fcr31(&g_dev.r4300.cp1),tl); - } - } - else if (opcode2[i]==6) // CTC1 - { - signed char sl=get_reg(i_regs->regmap,rs1[i]); - u_int copr=(source[i]>>11)&0x1f; - assert(sl>=0); - if(copr==31) - { - emit_writeword(sl,(int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); - // Set the rounding mode - char temp=get_reg(i_regs->regmap,-1); - emit_movimm(3,temp); - emit_and(sl,temp,temp); - emit_fldcw_indexed((int)&g_dev.r4300.new_dynarec_hot_state.rounding_modes,temp); - } - } -} - static void fconv_assemble_x86(int i,struct regstat *i_regs) { signed char temp=get_reg(i_regs->regmap,-1); @@ -3587,84 +3076,86 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs) if(!cop1_usable) { signed char rs=get_reg(i_regs->regmap,CSREG); assert(rs>=0); - emit_testimm(rs,0x20000000); + emit_testimm(rs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,rs,(int)i_regs,is_delayslot,0); cop1_usable=1; } + +#ifndef INTERPRET_FCONV #ifdef __SSE__ if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0d) { // trunc_w_s - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_movss_load(temp,0); emit_cvttps2dq(0,0); // float->int, truncate if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_movd_store(0,temp); return; } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0d) { // trunc_w_d - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_movsd_load(temp,0); emit_cvttpd2dq(0,0); // double->int, truncate - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_movd_store(0,temp); return; } #endif if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) { // cvt_s_w - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_fildl(temp); if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_fstps(temp); return; } if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) { // cvt_d_w - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_fildl(temp); - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); emit_fstpl(temp); return; } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) { // cvt_s_l - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fildll(temp); - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_fstps(temp); return; } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) { // cvt_d_l - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fildll(temp); if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); emit_fstpl(temp); return; } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) { // cvt_d_s - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); emit_fstpl(temp); return; } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) { // cvt_s_d - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_fstps(temp); return; } if(opcode2[i]==0x10) { // cvt_*_s - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); } if(opcode2[i]==0x11) { // cvt_*_d - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); } if((source[i]&0x3f)<0x10) { @@ -3676,167 +3167,202 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs) } if((source[i]&0x3f)==0x24||(source[i]&0x3c)==0x0c) { // cvt_w_* if(opcode2[i]!=0x10||((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_fistpl(temp); } if((source[i]&0x3f)==0x25||(source[i]&0x3c)==0x08) { // cvt_l_* if(opcode2[i]!=0x11||((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); emit_fistpll(temp); } if((source[i]&0x3f)<0x10) { emit_fldcw_stack(); } return; +#endif // C emulation code for debugging + signed char fs=get_reg(i_regs->regmap,FSREG); emit_pusha(); if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_s_w); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)cvt_d_w); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_s_l); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_d_l); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)cvt_d_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_w_s); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_l_s); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_s_d); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_w_d); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); emit_call((int)cvt_l_d); + emit_addimm(ESP,12,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x08) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)round_l_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x09) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)trunc_l_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0a) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)ceil_l_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0b) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)floor_l_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0c) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)round_w_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0d) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)trunc_w_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0e) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)ceil_w_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x10&&(source[i]&0x3f)==0x0f) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); emit_call((int)floor_w_s); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x08) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)round_l_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x09) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)trunc_l_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0a) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)ceil_l_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0b) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)floor_l_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0c) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)round_w_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0d) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)trunc_w_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0e) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)ceil_w_d); + emit_addimm(ESP,8,ESP); } if(opcode2[i]==0x11&&(source[i]&0x3f)==0x0f) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); emit_call((int)floor_w_d); + emit_addimm(ESP,8,ESP); } - emit_addimm(ESP,8,ESP); emit_popa(); //emit_loadreg(CSREG,rs); return; @@ -3852,13 +3378,14 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,cs,(int)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FCOMP if((source[i]&0x3f)==0x30) { emit_andimm(fs,~0x800000,fs); return; @@ -3871,9 +3398,9 @@ static void fcomp_assemble(int i,struct regstat *i_regs) } if(opcode2[i]==0x10) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],temp); emit_flds(temp); - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); emit_movimm(0x800000,temp); emit_or(fs,temp,fs); @@ -3896,9 +3423,9 @@ static void fcomp_assemble(int i,struct regstat *i_regs) return; } if(opcode2[i]==0x11) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],temp); emit_fldl(temp); - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); emit_movimm(0x800000,temp); emit_or(fs,temp,fs); @@ -3920,12 +3447,14 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_cmova_reg(temp,fs); // c_ngt_d return; } - +#endif + + emit_storereg(FSREG, fs); emit_pusha(); if(opcode2[i]==0x10) { - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushimm((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); + emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); if((source[i]&0x3f)==0x30) emit_call((int)c_f_s); if((source[i]&0x3f)==0x31) emit_call((int)c_un_s); if((source[i]&0x3f)==0x32) emit_call((int)c_eq_s); @@ -3944,9 +3473,9 @@ static void fcomp_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)==0x3f) emit_call((int)c_ngt_s); } if(opcode2[i]==0x11) { - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - emit_pushimm((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); + emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); if((source[i]&0x3f)==0x30) emit_call((int)c_f_d); if((source[i]&0x3f)==0x31) emit_call((int)c_un_d); if((source[i]&0x3f)==0x32) emit_call((int)c_eq_d); @@ -3978,26 +3507,27 @@ static void float_assemble(int i,struct regstat *i_regs) if(!cop1_usable) { signed char cs=get_reg(i_regs->regmap,CSREG); assert(cs>=0); - emit_testimm(cs,0x20000000); + emit_testimm(cs,CP0_STATUS_CU1); int jaddr=(int)out; emit_jeq(0); add_stub(FP_STUB,jaddr,(int)out,i,cs,(int)i_regs,is_delayslot,0); cop1_usable=1; } +#ifndef INTERPRET_FLOAT if((source[i]&0x3f)==6) // mov { if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) { if(opcode2[i]==0x10) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); emit_fstps(temp); } if(opcode2[i]==0x11) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); emit_fstpl(temp); } } @@ -4007,17 +3537,17 @@ static void float_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)>3) { if(opcode2[i]==0x10) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); } } if(opcode2[i]==0x11) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); if(((source[i]>>11)&0x1f)!=((source[i]>>6)&0x1f)) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); } } if((source[i]&0x3f)==4) // sqrt @@ -4037,23 +3567,23 @@ static void float_assemble(int i,struct regstat *i_regs) if((source[i]&0x3f)<4) { if(opcode2[i]==0x10) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],temp); emit_flds(temp); } if(opcode2[i]==0x11) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],temp); emit_fldl(temp); } if(((source[i]>>11)&0x1f)!=((source[i]>>16)&0x1f)) { if(opcode2[i]==0x10) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f],temp); if((source[i]&0x3f)==0) emit_fadds(temp); if((source[i]&0x3f)==1) emit_fsubs(temp); if((source[i]&0x3f)==2) emit_fmuls(temp); if((source[i]&0x3f)==3) emit_fdivs(temp); } else if(opcode2[i]==0x11) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f],temp); if((source[i]&0x3f)==0) emit_faddl(temp); if((source[i]&0x3f)==1) emit_fsubl(temp); if((source[i]&0x3f)==2) emit_fmull(temp); @@ -4068,61 +3598,114 @@ static void float_assemble(int i,struct regstat *i_regs) } if(opcode2[i]==0x10) { if(((source[i]>>16)&0x1f)!=((source[i]>>6)&0x1f)) { - emit_readword((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>6)&0x1f],temp); } emit_fstps(temp); } if(opcode2[i]==0x11) { if(((source[i]>>16)&0x1f)!=((source[i]>>6)&0x1f)) { - emit_readword((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>6)&0x1f],temp); + emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>6)&0x1f],temp); } emit_fstpl(temp); } return; } +#endif + signed char fs=get_reg(i_regs->regmap,FSREG); if(opcode2[i]==0x10) { // Single precision emit_pusha(); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f]); if((source[i]&0x3f)<4) - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_simple(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); - if((source[i]&0x3f)<=4) - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>16)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f]); + if((source[i]&0x3f)<=4) { + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); + } switch(source[i]&0x3f) { - case 0x00: emit_call((int)add_s);break; - case 0x01: emit_call((int)sub_s);break; - case 0x02: emit_call((int)mul_s);break; - case 0x03: emit_call((int)div_s);break; - case 0x04: emit_call((int)sqrt_s);break; - case 0x05: emit_call((int)abs_s);break; - case 0x06: emit_call((int)mov_s);break; - case 0x07: emit_call((int)neg_s);break; + case 0x00: + emit_call((int)add_s); + emit_addimm(ESP,16,ESP); + break; + case 0x01: + emit_call((int)sub_s); + emit_addimm(ESP,16,ESP); + break; + case 0x02: + emit_call((int)mul_s); + emit_addimm(ESP,16,ESP); + break; + case 0x03: + emit_call((int)div_s); + emit_addimm(ESP,16,ESP); + break; + case 0x04: + emit_call((int)sqrt_s); + emit_addimm(ESP,12,ESP); + break; + case 0x05: + emit_call((int)abs_s); + emit_addimm(ESP,8,ESP); + break; + case 0x06: + emit_call((int)mov_s); + emit_addimm(ESP,8,ESP); + break; + case 0x07: + emit_call((int)neg_s); + emit_addimm(ESP,8,ESP); + break; } - emit_addimm(ESP,(source[i]&0x3f)<4?12:8,ESP); emit_popa(); } if(opcode2[i]==0x11) { // Double precision emit_pusha(); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>> 6)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f]); if((source[i]&0x3f)<4) - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>16)&0x1f]); - emit_pushmem((int)&r4300_cp1_regs_double(&g_dev.r4300.cp1)[(source[i]>>11)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>16)&0x1f]); + emit_pushmem((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f]); if((source[i]&0x3f)<=4) - emit_pushmem((int)r4300_cp1_fcr31(&g_dev.r4300.cp1)); + { + if(fs>=0) emit_pushreg(fs); + else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.fcr31); + } switch(source[i]&0x3f) { - case 0x00: emit_call((int)add_d);break; - case 0x01: emit_call((int)sub_d);break; - case 0x02: emit_call((int)mul_d);break; - case 0x03: emit_call((int)div_d);break; - case 0x04: emit_call((int)sqrt_d);break; - case 0x05: emit_call((int)abs_d);break; - case 0x06: emit_call((int)mov_d);break; - case 0x07: emit_call((int)neg_d);break; + case 0x00: + emit_call((int)add_d); + emit_addimm(ESP,16,ESP); + break; + case 0x01: + emit_call((int)sub_d); + emit_addimm(ESP,16,ESP); + break; + case 0x02: + emit_call((int)mul_d); + emit_addimm(ESP,16,ESP); + break; + case 0x03: + emit_call((int)div_d); + emit_addimm(ESP,16,ESP); + break; + case 0x04: + emit_call((int)sqrt_d); + emit_addimm(ESP,12,ESP); + break; + case 0x05: + emit_call((int)abs_d); + emit_addimm(ESP,8,ESP); + break; + case 0x06: + emit_call((int)mov_d); + emit_addimm(ESP,8,ESP); + break; + case 0x07: + emit_call((int)neg_d); + emit_addimm(ESP,8,ESP); + break; } - emit_addimm(ESP,(source[i]&0x3f)<4?12:8,ESP); emit_popa(); } } @@ -4141,59 +3724,85 @@ static void multdiv_assemble_x86(int i,struct regstat *i_regs) { if((opcode2[i]&4)==0) // 32-bit { - if(opcode2[i]==0x18) // MULT +#ifndef INTERPRET_MULT + if((opcode2[i]==0x18) || (opcode2[i]==0x19)) { - char m1=get_reg(i_regs->regmap,rs1[i]); - char m2=get_reg(i_regs->regmap,rs2[i]); + signed char m1=get_reg(i_regs->regmap,rs1[i]); + signed char m2=get_reg(i_regs->regmap,rs2[i]); assert(m1>=0); assert(m2>=0); emit_mov(m1,EAX); - emit_imul(m2); + + if(opcode2[i]==0x18) //MULT + emit_imul(m2); + else if(opcode2[i]==0x19) //MULTU + emit_mul(m2); } - else if(opcode2[i]==0x19) // MULTU + else +#endif +#ifndef INTERPRET_DIV + if((opcode2[i]==0x1A) || (opcode2[i]==0x1B)) { - char m1=get_reg(i_regs->regmap,rs1[i]); - char m2=get_reg(i_regs->regmap,rs2[i]); - assert(m1>=0); - assert(m2>=0); - emit_mov(m1,EAX); - emit_mul(m2); - } - else if(opcode2[i]==0x1A) // DIV - { - char d1=get_reg(i_regs->regmap,rs1[i]); - char d2=get_reg(i_regs->regmap,rs2[i]); + signed char d1=get_reg(i_regs->regmap,rs1[i]); + signed char d2=get_reg(i_regs->regmap,rs2[i]); assert(d1>=0); assert(d2>=0); emit_mov(d1,EAX); - emit_cdq(); - emit_test(d2,d2); - emit_jeq((int)out+8); - emit_idiv(d2); + + if(opcode2[i]==0x1A) //DIV + { + emit_cdq(); + emit_test(d2,d2); + emit_jeq((int)out+8); + emit_idiv(d2); + } + else if(opcode2[i]==0x1B) //DIVU + { + emit_zeroreg(EDX); + emit_test(d2,d2); + emit_jeq((int)out+8); + emit_div(d2); + } } - else if(opcode2[i]==0x1B) // DIVU + else +#endif { - char d1=get_reg(i_regs->regmap,rs1[i]); - char d2=get_reg(i_regs->regmap,rs2[i]); - assert(d1>=0); - assert(d2>=0); - emit_mov(d1,EAX); - emit_zeroreg(EDX); - emit_test(d2,d2); - emit_jeq((int)out+8); - emit_div(d2); + u_int reglist=0; + signed char r1=get_reg(i_regs->regmap,rs1[i]); + signed char r2=get_reg(i_regs->regmap,rs2[i]); + signed char hi=get_reg(i_regs->regmap,HIREG); + signed char lo=get_reg(i_regs->regmap,LOREG); + assert(r1>=0); + assert(r2>=0); + + emit_writeword(r1,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.rs); + emit_writeword(r2,(intptr_t)&g_dev.r4300.new_dynarec_hot_state.rt); + emit_pusha(); + + if(opcode2[i]==0x18) + emit_call((intptr_t)cached_interp_MULT); + else if(opcode2[i]==0x19) + emit_call((intptr_t)cached_interp_MULTU); + else if(opcode2[i]==0x1A) + emit_call((intptr_t)cached_interp_DIV); + else if(opcode2[i]==0x1B) + emit_call((intptr_t)cached_interp_DIVU); + + emit_popa(); + if(hi>=0) emit_loadreg(HIREG,hi); + if(lo>=0) emit_loadreg(LOREG,lo); } } else // 64-bit { -#ifndef INTERPRETED_MULT64 +#ifndef INTERPRET_MULT64 if(opcode2[i]==0x1C||opcode2[i]==0x1D) { - char m1h=get_reg(i_regs->regmap,rs1[i]|64); - char m1l=get_reg(i_regs->regmap,rs1[i]); - char m2h=get_reg(i_regs->regmap,rs2[i]|64); - char m2l=get_reg(i_regs->regmap,rs2[i]); - char temp=get_reg(i_regs->regmap,-1); + signed char m1h=get_reg(i_regs->regmap,rs1[i]|64); + signed char m1l=get_reg(i_regs->regmap,rs1[i]); + signed char m2h=get_reg(i_regs->regmap,rs2[i]|64); + signed char m2l=get_reg(i_regs->regmap,rs2[i]); + signed char temp=get_reg(i_regs->regmap,-1); assert((m1h>=0)&&(m1h!=EAX)&&(m1h!=EDX)); assert((m2h>=0)&&(m2h!=EAX)&&(m2h!=EDX)); @@ -4281,14 +3890,14 @@ static void multdiv_assemble_x86(int i,struct regstat *i_regs) else #endif { - char r1h=get_reg(i_regs->regmap,rs1[i]|64); - char r1l=get_reg(i_regs->regmap,rs1[i]); - char r2h=get_reg(i_regs->regmap,rs2[i]|64); - char r2l=get_reg(i_regs->regmap,rs2[i]); - char hih=get_reg(i_regs->regmap,HIREG|64); - char hil=get_reg(i_regs->regmap,HIREG); - char loh=get_reg(i_regs->regmap,LOREG|64); - char lol=get_reg(i_regs->regmap,LOREG); + signed char r1h=get_reg(i_regs->regmap,rs1[i]|64); + signed char r1l=get_reg(i_regs->regmap,rs1[i]); + signed char r2h=get_reg(i_regs->regmap,rs2[i]|64); + signed char r2l=get_reg(i_regs->regmap,rs2[i]); + signed char hih=get_reg(i_regs->regmap,HIREG|64); + signed char hil=get_reg(i_regs->regmap,HIREG); + signed char loh=get_reg(i_regs->regmap,LOREG|64); + signed char lol=get_reg(i_regs->regmap,LOREG); assert(r1h>=0); assert(r2h>=0); assert(r1l>=0); @@ -4322,8 +3931,8 @@ static void multdiv_assemble_x86(int i,struct regstat *i_regs) // Multiply by zero is zero. // MIPS does not have a divide by zero exception. // The result is undefined, we return zero. - char hr=get_reg(i_regs->regmap,HIREG); - char lr=get_reg(i_regs->regmap,LOREG); + signed char hr=get_reg(i_regs->regmap,HIREG); + signed char lr=get_reg(i_regs->regmap,LOREG); if(hr>=0) emit_zeroreg(hr); if(lr>=0) emit_zeroreg(lr); } diff --git a/mupen64plus-core/src/device/r4300/new_dynarec/x86/linkage_x86.asm b/mupen64plus-core/src/device/r4300/new_dynarec/x86/linkage_x86.asm index 0500122..9b8d247 100644 --- a/mupen64plus-core/src/device/r4300/new_dynarec/x86/linkage_x86.asm +++ b/mupen64plus-core/src/device/r4300/new_dynarec/x86/linkage_x86.asm @@ -65,19 +65,10 @@ section .note.GNU-stack noalloc noexec nowrite progbits %define find_extern_data(a) a %endif -%define g_dev_r4300_cached_interp_invalid_code (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_cached_interp + offsetof_struct_cached_interp_invalid_code) %define g_dev_r4300_new_dynarec_hot_state_stop (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_stop) -%define g_dev_r4300_new_dynarec_hot_state_regs (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_regs) -%define g_dev_r4300_new_dynarec_hot_state_hi (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_hi) -%define g_dev_r4300_new_dynarec_hot_state_lo (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_lo) -%define g_dev_r4300_new_dynarec_hot_state_cp0_regs (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_cp0_regs) -%define g_dev_r4300_new_dynarec_hot_state_next_interrupt (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_next_interrupt) %define g_dev_r4300_new_dynarec_hot_state_cycle_count (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_cycle_count) %define g_dev_r4300_new_dynarec_hot_state_pending_exception (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_pending_exception) %define g_dev_r4300_new_dynarec_hot_state_pcaddr (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_pcaddr) -%define g_dev_r4300_new_dynarec_hot_state_branch_target (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_branch_target) -%define g_dev_r4300_new_dynarec_hot_state_restore_candidate (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_restore_candidate) -%define g_dev_r4300_new_dynarec_hot_state_memory_map (g_dev + offsetof_struct_device_r4300 + offsetof_struct_r4300_core_new_dynarec_hot_state + offsetof_struct_new_dynarec_hot_state_memory_map) cglobal jump_vaddr_eax cglobal jump_vaddr_ecx @@ -89,7 +80,6 @@ cglobal verify_code cglobal cc_interrupt cglobal do_interrupt cglobal fp_exception -cglobal fp_exception_ds cglobal jump_syscall cglobal jump_eret cglobal new_dyna_start @@ -101,6 +91,8 @@ cglobal invalidate_block_ebp cglobal invalidate_block_esi cglobal invalidate_block_edi cglobal breakpoint +cglobal dyna_linker +cglobal dyna_linker_ds cextern base_addr cextern new_recompile_block @@ -109,10 +101,14 @@ cextern get_addr cextern dynarec_gen_interrupt cextern clean_blocks cextern invalidate_block -cextern new_dynarec_check_interrupt +cextern ERET_new cextern get_addr_32 cextern g_dev cextern verify_dirty +cextern cop1_unusable +cextern SYSCALL_new +cextern dynamic_linker +cextern dynamic_linker_ds %ifdef PIC cextern _GLOBAL_OFFSET_TABLE_ @@ -147,14 +143,9 @@ jump_vaddr_edi: mov eax, edi jump_vaddr: - get_got_address add esp, -12 push edi - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)], esi ;CCREG - add esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)], esi ;Count call get_addr_ht - mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] add esp, 16 jmp eax @@ -176,148 +167,80 @@ _D1: cc_interrupt: get_got_address - add esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] + mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)], esi ;Count add esp, -28 ;Align stack - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)], esi ;Count - shr esi, 19 mov DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_pending_exception)], 0 - and esi, 01fch - cmp DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_restore_candidate+esi)], 0 - jne _E4 -_E1: call dynarec_gen_interrupt - mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)] - mov eax, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] + mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] mov edx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_pending_exception)] mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_stop)] add esp, 28 - sub esi, eax test ecx, ecx - jne _E3 - test edx, edx jne _E2 + test edx, edx + jne _E1 ret -_E2: +_E1: add esp, -8 mov edi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)] - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)], esi ;CCREG push edi call get_addr_ht - mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] add esp, 16 jmp eax -_E3: - add esp, 16 ;pop stack +_E2: + add esp, 4 ;pop return address + +new_dyna_stop: + add esp, 12 ;pop stack pop edi ;restore edi pop esi ;restore esi pop ebx ;restore ebx pop ebp ;restore ebp ret ;exit dynarec -_E4: - ;Move 'dirty' blocks to the 'clean' list - mov edi, DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_restore_candidate+esi)] - mov DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_restore_candidate+esi)], 0 - shl esi, 3 - mov ebp, 0 -_E5: - shr edi, 1 - jnc _E6 - mov ecx, esi - add ecx, ebp - push ecx - call clean_blocks - pop ecx -_E6: - inc ebp - test ebp, 31 - jne _E5 - jmp _E1 do_interrupt: get_got_address + mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_stop)] + test ecx, ecx + jne new_dyna_stop mov edi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)] add esp, -12 push edi call get_addr_ht add esp, 16 - mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)] - mov edx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] - sub esi, edx + mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] jmp eax fp_exception: - mov edx, 01000002ch -_E7: get_got_address - mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+48)] - add esp, -12 - or ecx, 2 - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+48)], ecx ;Status - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+52)], edx ;Cause - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+56)], eax ;EPC - push 080000180h - call get_addr_ht - add esp, 16 + mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)], eax + call cop1_unusable jmp eax -fp_exception_ds: - mov edx, 09000002ch ;Set high bit if delay slot - jmp _E7 - jump_syscall: - mov edx, 020h - jmp _E7 + get_got_address + mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)], eax + call SYSCALL_new + jmp eax jump_eret: get_got_address - mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+48)] ;Status - add esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] - and ecx, 0FFFFFFFDh - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)], esi ;Count - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+48)], ecx ;Status - call new_dynarec_check_interrupt - mov eax, [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] - mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)] - sub esi, eax mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)], esi - mov eax, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+56)] ;EPC - jns _E11 -_E8: - mov esi, 248 - xor edi, edi -_E9: - mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_regs + esi)] - mov edx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_regs + esi + 4)] - sar ecx, 31 - xor edx, ecx - neg edx - adc edi, edi - sub esi, 8 - jne _E9 - mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_hi + esi)] - mov edx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_hi + esi + 4)] - sar ecx, 31 - xor edx, ecx - jne _E10 - mov ecx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_lo + esi)] - mov edx, [find_local_data(g_dev_r4300_new_dynarec_hot_state_lo + esi + 4)] - sar ecx, 31 - xor edx, ecx -_E10: - neg edx - adc edi, edi - add esp, -8 - push edi - push eax - call get_addr_32 + call ERET_new mov esi, [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] - add esp, 16 + test eax, eax + je new_dyna_stop + jmp eax + +dyna_linker: + call dynamic_linker + add esp, 8 + jmp eax + +dyna_linker_ds: + call dynamic_linker_ds + add esp, 8 jmp eax -_E11: - mov [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)], eax - call cc_interrupt - mov eax, [find_local_data(g_dev_r4300_new_dynarec_hot_state_pcaddr)] - jmp _E8 new_dyna_start: push ebp @@ -328,9 +251,7 @@ new_dyna_start: push 0a4000040h call new_recompile_block get_got_address - mov edi, DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_next_interrupt)] - mov esi, DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_cp0_regs+36)] - sub esi, edi + mov esi, DWORD [find_local_data(g_dev_r4300_new_dynarec_hot_state_cycle_count)] jmp DWORD [find_local_data(base_addr)] invalidate_block_eax: