ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #926 from reicast/ftrc-fix 

ftrc fix - revert back to nulldc defaults
This commit is contained in:
Twinaphex 2016-05-14 04:44:24 +02:00
parent 3d7d73e1e5 7c5e49a6d2
commit 3cb39268a9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hw/sh4/dyna/shil_canonical.h
View File

@ -677,6 +677,8 @@ shil_opc(cvt_f2i_t)
shil_canonical
(
u32,f1,(f32 f1),
if (f1 > 0x7FFFFFBF)
f1 = 0x7FFFFFBF;
return (s32)f1;
)

2
core/hw/sh4/interpr/sh4_fpu.cpp
View File

@ -628,7 +628,7 @@ sh4op(i1111_nnnn_0011_1101)
if (fpscr.PR == 0)
{
u32 n = GetN(op);
fpul = (u32)(s32)fr[n];
fpul = (u32)(s32)min(fr[n],(float)0x7FFFFFBF);
if (fpul==0x80000000) //this is actually a x86-specific fix. I think ARM saturates
{

10
core/rec-x86/rec_x86_il.cpp
View File

@ -1448,13 +1448,17 @@ void ngen_opcode(RuntimeBlockInfo* block, shil_opcode* op,x86_block* x86e, bool
break;
case shop_cvt_f2i_t:
{
verify(op->rd.is_r32i());
verify(op->rs1.is_r32f());
verify(reg.IsAllocg(op->rd));
verify(reg.IsAllocf(op->rs1));
x86e->Emit(op_cvttss2si,reg.mapg(op->rd),reg.mapf(op->rs1));
break;
static f32 sse_ftrc_saturate = 0x7FFFFFBF;//1.11111111111111111111111 << 31
x86e->Emit(op_movaps, XMM0, reg.mapf(op->rs1));
x86e->Emit(op_minss, XMM0, &sse_ftrc_saturate);
x86e->Emit(op_cvttss2si, reg.mapg(op->rd), XMM0);
}
break;
//i hope that the round mode bit is set properly here :p
case shop_cvt_i2f_n: