LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

If Blizzard RAM allocation fails in non-JIT compatible special case mode, halve memory size and try again instead of crashing.

Browse Source
This commit is contained in:
Toni Wilen 2015-11-19 16:43:11 +02:00
parent 8895ba420e
commit 540f628384
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpuboard.cpp
View File

@ -1521,6 +1521,8 @@ void cpuboard_init(void)
mapped_malloc(&blizzardea_bank);
} else if (is_blizzard() || is_blizzardppc()) {
retry:
cpuboard_size = currprefs.cpuboardmem1_size;
if (cpuboard_size < 256 * 1024 * 1024) {
blizzardram_bank.start = BLIZZARD_RAM_BASE_48;
blizzardram_bank.allocated = cpuboard_size;
@ -1559,8 +1561,16 @@ void cpuboard_init(void)
blizzardram_bank.allocated, UAE_VM_32BIT, UAE_VM_READ_WRITE);
#else
blizzardram_bank.baseaddr = xmalloc(uae_u8, blizzardram_bank.allocated);
if (!blizzardram_bank.baseaddr) {
write_log(_T("MMAN: blizzardram_bank %d MB allocation failed\n"), blizzardram_bank.allocated / (1024 * 1024));
if (currprefs.cpuboardmem1_size > 16 * 1024 * 1024) {
currprefs.cpuboardmem1_size /= 2;
changed_prefs.cpuboardmem1_size = currprefs.cpuboardmem1_size;
goto retry;
}
}
#endif
write_log("MMAN: Allocated %d bytes (%d MB) for blizzardram_bank at %p\n",
write_log(_T("MMAN: Allocated %d bytes (%d MB) for blizzardram_bank at %p\n"),
blizzardram_bank.allocated,
blizzardram_bank.allocated / (1024 * 1024),
blizzardram_bank.baseaddr);