Emulation/mupen64plus-core
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-core.git synced 2024-05-20 12:57:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1027 from Rosalie241/fix-dynarec

Browse source 
new_dynarec: fix FPU crashes
This commit is contained in:
Richard Goedeken 2023-08-18 18:58:23 -07:00 committed by GitHub
parent e21d0e8c8c 29e7414f02
commit a2add5d48f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/device/r4300/new_dynarec/arm/assem_arm.c
View file

@ -3125,69 +3125,63 @@ static void fconv_assemble_arm(int i,struct regstat *i_regs)
save_regs(reglist);
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_s_w);
}
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) {
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],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) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_s_l);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_d_l);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) {
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],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) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_w_s);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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_double[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_l_s);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_s_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_w_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
emit_call((int)cvt_l_d);
@ -3568,19 +3562,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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);
emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
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],ARG1_REG);
emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG);
break;
@ -3604,19 +3597,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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);
emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
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],ARG1_REG);
emit_readptr((u_int)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
break;

40
src/device/r4300/new_dynarec/arm64/assem_arm64.c
View file

@ -3740,69 +3740,63 @@ static void fconv_assemble_arm64(int i,struct regstat *i_regs)
save_regs(reglist);
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_w);
}
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) {
emit_addimm64(FP,fp_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
emit_call((intptr_t)cvt_d_w);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_l);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_d_l);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) {
emit_addimm64(FP,fp_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
emit_call((intptr_t)cvt_d_s);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_w_s);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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_double[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_l_s);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_w_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_l_d);
@ -4179,19 +4173,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
emit_addimm64(FP,fp_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG);
break;
@ -4214,19 +4207,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_addimm64(FP,fp_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
emit_addimm64(FP,fp_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
break;

40
src/device/r4300/new_dynarec/x64/assem_x64.c
View file

@ -3617,69 +3617,63 @@ static void fconv_assemble_x64(int i,struct regstat *i_regs)
save_regs(reglist);
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_w);
}
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x21) {
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
emit_call((intptr_t)cvt_d_w);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_l);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_d_l);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x21) {
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
emit_call((intptr_t)cvt_d_s);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_w_s);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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_double[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_l_s);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_s_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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_simple[(source[i]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_w_d);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) {
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
emit_call((intptr_t)cvt_l_d);
@ -4030,19 +4024,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_simple[(source[i]>> 6)&0x1f],ARG2_REG);
break;
@ -4066,19 +4059,18 @@ static void float_assemble(int i,struct regstat *i_regs)
switch(source[i]&0x3f)
{
case 0x00: case 0x01: case 0x02: case 0x03:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG4_REG);
break;
case 0x04:
if(fs>=0) emit_mov(fs,ARG1_REG);
else emit_loadreg(FSREG,ARG1_REG);
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_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]>> 6)&0x1f],ARG3_REG);
break;
case 0x05: case 0x06: case 0x07:
emit_lea_rip((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31,ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>>11)&0x1f],ARG1_REG);
emit_readptr((intptr_t)&g_dev.r4300.new_dynarec_hot_state.cp1_regs_double[(source[i]>> 6)&0x1f],ARG2_REG);
break;

35
src/device/r4300/new_dynarec/x86/assem_x86.c
View file

@ -3196,8 +3196,7 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs)
if(opcode2[i]==0x14&&(source[i]&0x3f)==0x20) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_s_w);
emit_addimm(ESP,12,ESP);
}
@ -3210,16 +3209,14 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs)
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x20) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_s_l);
emit_addimm(ESP,12,ESP);
}
if(opcode2[i]==0x15&&(source[i]&0x3f)==0x21) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_d_l);
emit_addimm(ESP,12,ESP);
}
@ -3233,16 +3230,14 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs)
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x24) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_w_s);
emit_addimm(ESP,12,ESP);
}
if(opcode2[i]==0x10&&(source[i]&0x3f)==0x25) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_l_s);
emit_addimm(ESP,12,ESP);
}
@ -3250,24 +3245,21 @@ static void fconv_assemble_x86(int i,struct regstat *i_regs)
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x20) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_s_d);
emit_addimm(ESP,12,ESP);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x24) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_w_d);
emit_addimm(ESP,12,ESP);
}
if(opcode2[i]==0x11&&(source[i]&0x3f)==0x25) {
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.cp1_fcr31);
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
emit_call((int)cvt_l_d);
emit_addimm(ESP,12,ESP);
}
@ -3626,10 +3618,7 @@ static void float_assemble(int i,struct regstat *i_regs)
if((source[i]&0x3f)<4)
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.cp1_fcr31);
}
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
switch(source[i]&0x3f)
{
case 0x00:
@ -3673,11 +3662,7 @@ static void float_assemble(int i,struct regstat *i_regs)
if((source[i]&0x3f)<4)
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)
{
if(fs>=0) emit_pushreg(fs);
else emit_pushmem((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
}
emit_pushimm((int)&g_dev.r4300.new_dynarec_hot_state.cp1_fcr31);
switch(source[i]&0x3f)
{
case 0x00: