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

LLE Int: (addr add/sub/inc/dec) 

Adjusted the code work without ToMask.
This code should be functionally identical for all inputs to the previous code.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6691 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
mylek4 2010-12-30 15:36:28 +00:00
parent 2c4f9825ca
commit 6cf9b3688d
1 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
Source/Core/DSPCore/Src/DSPIntUtil.h
View File

@ -52,55 +52,74 @@ inline bool dsp_SR_is_flag_set(int flag)
// --- AR increments, decrements // --- AR increments, decrements
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
// NextPowerOf2()-1 inline u16 dsp_increase_addr_reg(u16 reg, s16 _ix)
inline u16 ToMask(u16 a)
{ {
a = a | (a >> 8); u32 ar = g_dsp.r.ar[reg];
a = a | (a >> 4); u32 wr = g_dsp.r.wr[reg];
a = a | (a >> 2); s32 ix = _ix;
return a | (a >> 1);
u32 mx = (wr | 1) << 1;
u32 nar = ar + ix;
u32 dar = (nar ^ ar ^ ix) & mx;
if (ix >= 0)
{
if (dar > wr) //overflow
nar -= wr + 1;
}
else
{
if ((((nar + wr + 1) ^ nar) & dar) <= wr) //underflow or below min for mask
nar += wr + 1;
}
return nar;
} }
inline u16 dsp_increase_addr_reg(u16 reg, s16 ix) inline u16 dsp_decrease_addr_reg(u16 reg, s16 _ix)
{ {
u16 ar = g_dsp.r.ar[reg]; u32 ar = g_dsp.r.ar[reg];
u16 wr = g_dsp.r.wr[reg]; u32 wr = g_dsp.r.wr[reg];
u16 m = ToMask(wr) | 1; s32 ix = _ix;
u16 nar = ar+ix;
if (ix >= 0) {
if((ar&m) + (int)(ix&m) -(int)m-1 >= 0)
nar -= wr+1;
} else {
if((ar&m) + (int)(ix&m) -(int)m-1 < m-wr)
nar += wr+1;
}
return nar;
}
inline u16 dsp_decrease_addr_reg(u16 reg, s16 ix) u32 mx = (wr | 1) << 1;
{ u32 nar = ar - ix;
u16 ar = g_dsp.r.ar[reg]; u32 dar = (nar ^ ar ^ ~ix) & mx;
u16 wr = g_dsp.r.wr[reg];
u16 m = ToMask(wr) | 1; if ((u32)ix > 0xFFFF8000) //(ix < 0 && ix != -0x8000)
u16 nar = ar-ix; {
if ((u16)ix > 0x8000) { // equiv: ix < 0 && ix != -0x8000 if (dar > wr) //overflow
if((ar&m) - (int)(ix&m) >= 0) nar -= wr + 1;
nar -= wr+1; }
} else { else
if((ar&m) - (int)(ix&m) < m-wr) {
nar += wr+1; if ((((nar + wr + 1) ^ nar) & dar) <= wr) //underflow or below min for mask
} nar += wr + 1;
return nar; }
return nar;
} }
inline u16 dsp_increment_addr_reg(u16 reg) inline u16 dsp_increment_addr_reg(u16 reg)
{ {
return dsp_increase_addr_reg(reg, 1); u32 ar = g_dsp.r.ar[reg];
u32 wr = g_dsp.r.wr[reg];
u32 nar = ar + 1;
if (((nar ^ ar) & ((wr | 1) << 1)) > wr)
nar -= wr + 1;
return nar;
} }
inline u16 dsp_decrement_addr_reg(u16 reg) inline u16 dsp_decrement_addr_reg(u16 reg)
{ {
return dsp_decrease_addr_reg(reg, 1); u32 ar = g_dsp.r.ar[reg];
u32 wr = g_dsp.r.wr[reg];
u32 nar = ar + wr;
if (((nar ^ ar) & ((wr | 1) << 1)) > wr)
nar -= wr + 1;
return nar;
} }