mirror of
https://github.com/simple64/simple64.git
synced 2026-11-17 17:24:02 +01:00
update core
This commit is contained in:
1 parent
e66f5a29d9
commit
a57838c94e
20 files changed
+3440
-4755
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user