Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-18 02:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix SCC initialization code detection. Move up AddrMap patch space since

Browse Source 
we clobber 40 bytes below it and it may intersect with GetScrap patch space.
This commit is contained in:
gbeauche 2003-12-15 15:23:59 +00:00
parent ae8c08b260
commit 24c4ae354c
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SheepShaver/src/rom_patches.cpp
View File

@ -62,7 +62,7 @@
const uint32 CHECK_LOAD_PATCH_SPACE = 0x2fcf00; const uint32 CHECK_LOAD_PATCH_SPACE = 0x2fcf00;
const uint32 PUT_SCRAP_PATCH_SPACE = 0x2fcf80; const uint32 PUT_SCRAP_PATCH_SPACE = 0x2fcf80;
const uint32 GET_SCRAP_PATCH_SPACE = 0x2fcfc0; const uint32 GET_SCRAP_PATCH_SPACE = 0x2fcfc0;
const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd000; const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd100;
// Global variables // Global variables
int ROMType; // ROM type int ROMType; // ROM type
@ -310,6 +310,23 @@ static uint32 find_rom_powerpc_branch(uint32 start, uint32 end, uint32 target)
} }
/*
* Check that requested ROM patch space is really available
*/
static bool check_rom_patch_space(uint32 base, uint32 size)
{
size = (size + 3) & -4;
for (int i = 0; i < size; i += 4) {
uint32 x = ntohl(*(uint32 *)(ROM_BASE + base + i));
printf("%08x\n", x);
if (x != 0x6b636b63 && x != 0)
return false;
}
return true;
}
/* /*
* List of audio sifters installed in ROM and System file * List of audio sifters installed in ROM and System file
*/ */
@ -697,13 +714,13 @@ bool PatchROM(void)
return false; return false;
// Check that other ROM addresses point to really free regions // Check that other ROM addresses point to really free regions
if (ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE)) != 0x6b636b63) if (!check_rom_patch_space(CHECK_LOAD_PATCH_SPACE, 0x40))
return false; return false;
if (ntohl(*(uint32 *)(ROM_BASE + PUT_SCRAP_PATCH_SPACE)) != 0x6b636b63) if (!check_rom_patch_space(PUT_SCRAP_PATCH_SPACE, 0x40))
return false; return false;
if (ntohl(*(uint32 *)(ROM_BASE + GET_SCRAP_PATCH_SPACE)) != 0x6b636b63) if (!check_rom_patch_space(GET_SCRAP_PATCH_SPACE, 0x40))
return false; return false;
if (ntohl(*(uint32 *)(ROM_BASE + ADDR_MAP_PATCH_SPACE)) != 0x6b636b63) if (!check_rom_patch_space(ADDR_MAP_PATCH_SPACE - 10 * 4, 0x100))
return false; return false;
// Apply patches // Apply patches
@ -1646,7 +1663,7 @@ static bool patch_68k(void)
D(bug("scc_init_caller %08lx\n", base + 12)); D(bug("scc_init_caller %08lx\n", base + 12));
wp = (uint16 *)(ROM_BASE + base + 12); wp = (uint16 *)(ROM_BASE + base + 12);
loc = ntohs(wp[1]) + ((uintptr)wp - ROM_BASE) + 2; loc = ntohs(wp[1]) + ((uintptr)wp - ROM_BASE) + 2;
static const uint8 scc_init_dat[] = {0x08, 0x38, 0x00, 0x03, 0x0d, 0xd3, 0x67, 0x12, 0x20, 0x78, 0x01, 0xdc, 0x22, 0x78, 0x01, 0xd8}; static const uint8 scc_init_dat[] = {0x20, 0x78, 0x01, 0xdc, 0x22, 0x78, 0x01, 0xd8};
if ((base = find_rom_data(loc, loc + 0x80, scc_init_dat, sizeof(scc_init_dat))) != loc) return false; if ((base = find_rom_data(loc, loc + 0x80, scc_init_dat, sizeof(scc_init_dat))) != loc) return false;
D(bug("scc_init %08lx\n", base)); D(bug("scc_init %08lx\n", base));
wp = (uint16 *)(ROM_BASE + base); wp = (uint16 *)(ROM_BASE + base);