psxbios: Add checks for memmove.

[pcsx_rearmed.git] / libpcsxcore / psxbios.c

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index c362a75..399df9a 100644 (file)
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -788,22 +788,48 @@ void psxBios_bcmp() { // 0x29
 
 void psxBios_memcpy() { // 0x2a
        char *p1 = (char *)Ra0, *p2 = (char *)Ra1;
-       while ((s32)a2-- > 0) *p1++ = *p2++;
-
-       v0 = a0; pc0 = ra;
+       s32 n=0;
+       v0 = a0;
+       if (a0 == 0 || a2 > 0x7FFFFFFF)
+       {
+               pc0 = ra;
+               return;
+       }
+       while ((s32)a2-- > 0) {
+               n++;
+               *p1++ = *p2++;
+       }
+       a2 = 0;
+       pc0 = ra;
 }
 
 void psxBios_memset() { // 0x2b
        char *p = (char *)Ra0;
+       v0 = a0;
+       if (a2 > 0x7FFFFFFF || a2 == 0)
+       {
+               v0 = 0;
+               pc0 = ra;
+               return;
+       }
+       if (a0 == 0)
+       {
+               pc0 = ra;
+               return;
+       }
        while ((s32)a2-- > 0) *p++ = (char)a1;
-
        a2 = 0;
        v0 = a0; pc0 = ra;
 }
 
 void psxBios_memmove() { // 0x2c
        char *p1 = (char *)Ra0, *p2 = (char *)Ra1;
-
+       v0 = a0;
+       if (a0 == 0 || a2 > 0x7FFFFFFF)
+       {
+               pc0 = ra;
+               return;
+       }
        if (p2 <= p1 && p2 + a2 > p1) {
                a2++; // BUG: copy one more byte here
                p1 += a2;
@@ -812,8 +838,7 @@ void psxBios_memmove() { // 0x2c
        } else {
                while ((s32)a2-- > 0) *p1++ = *p2++;
        }
-
-       v0 = a0; pc0 = ra;
+       pc0 = ra;
 }
 
 void psxBios_memcmp() { // 0x2d