aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/psxbios.c
diff options
context:
space:
mode:
authorgameblabla2019-07-18 02:19:07 +0200
committergameblabla2019-07-18 02:19:07 +0200
commit112dddf5f26989d55b257f51bdcb9236bc7c1de0 (patch)
treef5677af5934a832db62c55f0f53b82e420575ab2 /libpcsxcore/psxbios.c
parent3f28b64fb1baeedec76a150ee40eaec0b9095d92 (diff)
downloadpcsx_rearmed-112dddf5f26989d55b257f51bdcb9236bc7c1de0.tar.gz
pcsx_rearmed-112dddf5f26989d55b257f51bdcb9236bc7c1de0.tar.bz2
pcsx_rearmed-112dddf5f26989d55b257f51bdcb9236bc7c1de0.zip
psxbios: Add checks for memmove.
Always returns dst per documentation.
Diffstat (limited to 'libpcsxcore/psxbios.c')
-rw-r--r--libpcsxcore/psxbios.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 97c7951..399df9a 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -824,7 +824,12 @@ void psxBios_memset() { // 0x2b
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;
@@ -833,8 +838,7 @@ void psxBios_memmove() { // 0x2c
} else {
while ((s32)a2-- > 0) *p1++ = *p2++;
}
-
- v0 = a0; pc0 = ra;
+ pc0 = ra;
}
void psxBios_memcmp() { // 0x2d