--- SheepShaver/src/rsrc_patches.cpp 2004/11/13 14:09:15 1.12 +++ SheepShaver/src/rsrc_patches.cpp 2006/05/03 21:45:14 1.17 @@ -1,7 +1,7 @@ /* * rsrc_patches.cpp - Resource patches * - * SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig + * SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -168,6 +168,12 @@ void CheckLoad(uint32 type, int16 id, ui p[5] = htons(0x6010); // bra D(bug(" patch 7 applied\n")); } + } else if (PM(0,0x2f3c) && PM(1,0x7665) && PM(2,0x7273) && PM(3,0x3f3c) && PM(4,0x0001) && PM(10,0x2041) && PM(11,0x2248) && PM(12,0x2050) && PM(20,0x7066) && PM(21,0xa9c9)) { + // Check when vers 1 is installed (for safe abort if MacOS < 8.1 is used with a NewWorld ROM) + p[10] = htons(M68K_EMUL_OP_CHECK_SYSV); + p[11] = htons(0x4a81); // tst.l d1 + p[12] = htons(0x670e); // beq.s + D(bug(" patch 9 applied\n")); } p++; } @@ -451,6 +457,11 @@ void CheckLoad(uint32 type, int16 id, ui p[(0x378 + 0x6c0) >> 1] = htons(0x4e80); // blr p[(0x37a + 0x6c0) >> 1] = htons(0x0020); D(bug(" patch 2 applied\n")); + } else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) { + // Don't overwrite our serial drivers (9.0) + p[(0x374 + 0x510) >> 1] = htons(0x4e80); // blr + p[(0x376 + 0x510) >> 1] = htons(0x0020); + D(bug(" patch 3 applied\n")); } } else if (type == FOURCC('c','i','t','t') && id == 45) { @@ -549,11 +560,43 @@ void CheckLoad(uint32 type, int16 id, ui p[(base + 0x06) >> 1] = htons(0x0020); D(bug(" patch 2 applied\n")); } + + } else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) { + D(bug("CODE 27 found [Apple Personal Diagnostics]\n")); + + // Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9) + // FIXME: this should not be called in the first place, use UTResolveFCB? + static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8}; + base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat)); + if (base + && ReadMacInt16(0x3f6) == 4 /* FSFCBLen */ + && p[(base + 0x1a) >> 1] == htons(0x605e) + && p[(base + 0x80) >> 1] == htons(0x7000)) + { + p[(base + 0x1a) >> 1] = htons(0x6064); + D(bug(" patch1 applied\n")); + } } } /* + * Resource patches via GetNamedResource() and Get1NamedResource() + */ + +void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size) +{ + uint16 *p16; + uint32 base; + D(bug("vCheckLoad %c%c%c%c (%08x) name \"%*s\", data %p, size %d\n", type >> 24, (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, type, name[0], &name[1], p, size)); + + // Don't modify resources in ROM + if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE)) + return; +} + + +/* * Native Resource Manager patches */ @@ -575,6 +618,23 @@ void check_load_invoc(uint32 type, int16 } #ifdef __BEOS__ +static +#else +extern "C" +#endif +void named_check_load_invoc(uint32 type, uint32 name, uint32 h) +{ + if (h == 0) + return; + uint32 p = ReadMacInt32(h); + if (p == 0) + return; + uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff; + + CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size); +} + +#ifdef __BEOS__ static asm void **get_resource(register uint32 type, register int16 id) { // Create stack frame @@ -739,6 +799,72 @@ static asm void **r_get_resource(registe addi r1,r1,56+12 blr } + +static asm void **get_named_resource(register uint32 type, register uint32 name) +{ + // Create stack frame + mflr r0 + stw r0,8(r1) + stwu r1,-(56+12)(r1) + + // Save type/ID + stw r3,56(r1) + stw r4,56+4(r1) + + // Call old routine + lwz r0,XLM_GET_NAMED_RESOURCE + lwz r2,XLM_RES_LIB_TOC + mtctr r0 + bctrl + lwz r2,XLM_TOC // Get TOC + stw r3,56+8(r1) // Save handle + + // Call CheckLoad + lwz r3,56(r1) + lwz r4,56+4(r1) + lwz r5,56+8(r1) + bl named_check_load_invoc + lwz r3,56+8(r1) // Restore handle + + // Return to caller + lwz r0,56+12+8(r1) + mtlr r0 + addi r1,r1,56+12 + blr +} + +static asm void **get_1_named_resource(register uint32 type, register uint32 name) +{ + // Create stack frame + mflr r0 + stw r0,8(r1) + stwu r1,-(56+12)(r1) + + // Save type/ID + stw r3,56(r1) + stw r4,56+4(r1) + + // Call old routine + lwz r0,XLM_GET_1_NAMED_RESOURCE + lwz r2,XLM_RES_LIB_TOC + mtctr r0 + bctrl + lwz r2,XLM_TOC // Get TOC + stw r3,56+8(r1) // Save handle + + // Call CheckLoad + lwz r3,56(r1) + lwz r4,56+4(r1) + lwz r5,56+8(r1) + bl named_check_load_invoc + lwz r3,56+8(r1) // Restore handle + + // Return to caller + lwz r0,56+12+8(r1) + mtlr r0 + addi r1,r1,56+12 + blr +} #else // Routines in asm_linux.S extern "C" void get_resource(void); @@ -746,6 +872,8 @@ extern "C" void get_1_resource(void); extern "C" void get_ind_resource(void); extern "C" void get_1_ind_resource(void); extern "C" void r_get_resource(void); +extern "C" void get_named_resource(void); +extern "C" void get_1_named_resource(void); #endif void PatchNativeResourceManager(void) @@ -839,4 +967,38 @@ void PatchNativeResourceManager(void) WriteMacInt32(tvec, (uint32)r_get_resource); #endif #endif + + // Patch native GetNamedResource() + upp = ReadMacInt32(0x1484); + tvec = ReadMacInt32(upp + 5 * 4); + D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4))); + WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec)); +#if EMULATED_PPC + WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE)); +#else +#ifdef __BEOS__ + tvec2 = (uint32 *)get_named_resource; + WriteMacInt32(tvec, tvec2[0]); + WriteMacInt32(tvec + 4, tvec2[1]); +#else + WriteMacInt32(tvec, (uint32)get_named_resource); +#endif +#endif + + // Patch native Get1NamedResource() + upp = ReadMacInt32(0x0e80); + tvec = ReadMacInt32(upp + 5 * 4); + D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4))); + WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec)); +#if EMULATED_PPC + WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE)); +#else +#ifdef __BEOS__ + tvec2 = (uint32 *)get_1_named_resource; + WriteMacInt32(tvec, tvec2[0]); + WriteMacInt32(tvec + 4, tvec2[1]); +#else + WriteMacInt32(tvec, (uint32)get_1_named_resource); +#endif +#endif }