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

Merge pull request #109 from negativeExponent/silence_bios_sign_compare_warnings 

HLE: Fix sign-compare warnings
This commit is contained in:
LibretroAdmin 2022-10-07 10:59:16 +02:00 committed by GitHub
parent 09bb3c3acf 12f39b86b1
commit 7e30b03889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gba/bios.cpp
View File

@ -1194,14 +1194,14 @@ static void BIOS_SndDriver_b4c(uint32_t r0, uint32_t r1, uint32_t r2) // 0xb4c
static int32_t BIOS_SndDriver_3e4(uint32_t const r0a, uint32_t const r1a) // 0x3e4 static int32_t BIOS_SndDriver_3e4(uint32_t const r0a, uint32_t const r1a) // 0x3e4
{ {
int32_t r0 = r1a; int32_t r0 = (int32_t)r1a;
int32_t r1 = r0a; int32_t r1 = (int32_t)r0a;
uint32_t v5 = r0 & 0x80000000; uint32_t v5 = r0 & 0x80000000;
int32_t r12; int32_t r12;
int32_t r2; int32_t r2;
bool gtr; bool gtr;
if ((r1 & 0x80000000 & 0x80000000) != 0) if ((r1 & 0x80000000) != 0)
r1 = -r1; r1 = -r1;
r12 = r0; //v5 ^ (r0 >> 32); r12 = r0; //v5 ^ (r0 >> 32);
if (r0 < 0) if (r0 < 0)
@ -1209,24 +1209,25 @@ static int32_t BIOS_SndDriver_3e4(uint32_t const r0a, uint32_t const r1a) // 0x3
r2 = r1; r2 = r1;
do { do {
gtr = (r2 >= r0 >> 1); int32_t r0_rsh = ((uint32_t)r0 >> 1);
if (r2 <= r0 >> 1) gtr = (r2 >= r0_rsh);
if (r2 <= r0_rsh)
r2 *= 2; r2 *= 2;
} while (!gtr); } while (!gtr);
while (1) { while (1) {
v5 += (r0 >= (uint32_t)r2) + v5; v5 += (r0 >= r2) + v5;
if (r0 >= (uint32_t)r2) if (r0 >= r2)
r0 -= r2; r0 -= r2;
if (r2 == r1) if (r2 == r1)
break; break;
r2 = (uint32_t)r2 >> 1; r2 = ((uint32_t)r2 >> 1);
} }
if (!(r12 << 1)) if ((r12 << 1) == 0)
return -v5; return -v5;
else
return v5; return v5;
} }
static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a
@ -1488,8 +1489,8 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
//0x1ea2 //0x1ea2
uint32_t r4 = puser1; // apparenty ch ptr? uint32_t r4 = puser1; // apparenty ch ptr?
int r9 = CPUReadMemory(r4 + 0x14); uint32_t r9 = CPUReadMemory(r4 + 0x14);
int r12 = CPUReadMemory(r4 + 0x18); uint32_t r12 = CPUReadMemory(r4 + 0x18);
uint32_t i = CPUReadByte(r4 + 0x6); uint32_t i = CPUReadByte(r4 + 0x6);
for (r4 += 0x10; i > 0; i--) { for (r4 += 0x10; i > 0; i--) {