aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authorgameblabla2019-07-18 02:42:41 +0200
committergameblabla2019-07-18 02:42:41 +0200
commita85ffa0ee71d19e297cd8bc3710d4c24330881e1 (patch)
treec79d78fec3f40be405bf22b13160b10dcf3ccefc /libpcsxcore
parent832f0c3ce33b886112c7277700dd3b9f6bfdb549 (diff)
downloadpcsx_rearmed-a85ffa0ee71d19e297cd8bc3710d4c24330881e1.tar.gz
pcsx_rearmed-a85ffa0ee71d19e297cd8bc3710d4c24330881e1.tar.bz2
pcsx_rearmed-a85ffa0ee71d19e297cd8bc3710d4c24330881e1.zip
psxbios: Merge heap fix from PCSX4ALL.
Diffstat (limited to 'libpcsxcore')
-rw-r--r--libpcsxcore/psxbios.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index ebb5957..856d561 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -1219,8 +1219,10 @@ void psxBios_InitHeap() { // 0x39
size &= 0xfffffffc;
heap_addr = (u32 *)Ra0;
- heap_end = (u32 *)((u8 *)heap_addr + size);
- *heap_addr = SWAP32(size | 1);
+ heap_size = size;
+ heap_end = (u32 *)((u8 *)heap_addr + heap_size);
+ /* HACKFIX: Commenting out this line fixes GTA2 crash */
+ //*heap_addr = SWAP32(size | 1);
SysPrintf("InitHeap %x,%x : %x %x\n",a0,a1, (int)((uptr)heap_addr-(uptr)psxM), size);