RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sh2 drc, fix symbol clash

Browse source
This commit is contained in:
kub 2020-09-17 23:50:18 +02:00
parent dc56ca2ede
commit 48b648070b
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
cpu/sh2/compiler.c
View file

@ -3004,12 +3004,12 @@ static uint32_t REGPARM(2) sh2_drc_divu32(uint32_t dv, uint32_t ds)
// bad case: use the sh2 algo to get the right result // bad case: use the sh2 algo to get the right result
int q = 0, t = 0, s = 16; int q = 0, t = 0, s = 16;
while (s--) { while (s--) {
uint32_t _ = dv>>31; uint32_t v = dv>>31;
dv = (dv<<1) | t; dv = (dv<<1) | t;
t = _; t = v;
_ = dv; v = dv;
if (q) dv += ds, q = dv < _; if (q) dv += ds, q = dv < v;
else dv -= ds, q = !(dv < _); else dv -= ds, q = !(dv < v);
q ^= t, t = !q; q ^= t, t = !q;
} }
return (dv<<1) | t; return (dv<<1) | t;
@ -3030,12 +3030,12 @@ static uint32_t REGPARM(3) sh2_drc_divu64(uint32_t dh, uint32_t *dl, uint32_t ds
uint64_t dv = *dl | ((uint64_t)dh << 32); uint64_t dv = *dl | ((uint64_t)dh << 32);
int q = 0, t = 0, s = 32; int q = 0, t = 0, s = 32;
while (s--) { while (s--) {
uint64_t _ = dv>>63; uint64_t v = dv>>63;
dv = (dv<<1) | t; dv = (dv<<1) | t;
t = _; t = v;
_ = dv; v = dv;
if (q) dv += ((uint64_t)ds << 32), q = dv < _; if (q) dv += ((uint64_t)ds << 32), q = dv < v;
else dv -= ((uint64_t)ds << 32), q = !(dv < _); else dv -= ((uint64_t)ds << 32), q = !(dv < v);
q ^= t, t = !q; q ^= t, t = !q;
} }
*dl = (dv<<1) | t; *dl = (dv<<1) | t;
@ -3058,12 +3058,12 @@ static uint32_t REGPARM(2) sh2_drc_divs32(int32_t dv, int32_t ds)
// bad case: use the sh2 algo to get the right result // bad case: use the sh2 algo to get the right result
int m = (uint32_t)ds>>31, q = (uint32_t)dv>>31, t = m^q, s = 16; int m = (uint32_t)ds>>31, q = (uint32_t)dv>>31, t = m^q, s = 16;
while (s--) { while (s--) {
uint32_t _ = (uint32_t)dv>>31; uint32_t v = (uint32_t)dv>>31;
dv = (dv<<1) | t; dv = (dv<<1) | t;
t = _; t = v;
_ = dv; v = dv;
if (m^q) dv += ds, q = (uint32_t)dv < _; if (m^q) dv += ds, q = (uint32_t)dv < v;
else dv -= ds, q = !((uint32_t)dv < _); else dv -= ds, q = !((uint32_t)dv < v);
q ^= m^t, t = !(m^q); q ^= m^t, t = !(m^q);
} }
return (dv<<1) | t; return (dv<<1) | t;
@ -3089,12 +3089,12 @@ static uint32_t REGPARM(3) sh2_drc_divs64(int32_t dh, uint32_t *dl, int32_t ds)
uint64_t dv = *dl | ((uint64_t)dh << 32); uint64_t dv = *dl | ((uint64_t)dh << 32);
int m = (uint32_t)ds>>31, q = (uint64_t)dv>>63, t = m^q, s = 32; int m = (uint32_t)ds>>31, q = (uint64_t)dv>>63, t = m^q, s = 32;
while (s--) { while (s--) {
int64_t _ = (uint64_t)dv>>63; int64_t v = (uint64_t)dv>>63;
dv = (dv<<1) | t; dv = (dv<<1) | t;
t = _; t = v;
_ = dv; v = dv;
if (m^q) dv += ((uint64_t)ds << 32), q = dv < _; if (m^q) dv += ((uint64_t)ds << 32), q = dv < v;
else dv -= ((uint64_t)ds << 32), q = !(dv < _); else dv -= ((uint64_t)ds << 32), q = !(dv < v);
q ^= m^t, t = !(m^q); q ^= m^t, t = !(m^q);
} }
*dl = (dv<<1) | t; *dl = (dv<<1) | t;