--- SheepShaver/src/rsrc_patches.cpp	2004/01/12 15:37:19	1.9
+++ SheepShaver/src/rsrc_patches.cpp	2006/05/03 21:53:33	1.18
@@ -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
@@ -117,7 +117,7 @@ void CheckLoad(uint32 type, int16 id, ui
 	D(bug("vCheckLoad %c%c%c%c (%08x) ID %d, data %p, size %d\n", type >> 24, (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, type, id, p, size));
 
 	// Don't modify resources in ROM
-	if ((uintptr)p >= ROM_BASE && (uintptr)p <= (ROM_BASE + ROM_SIZE))
+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
 		return;
 
 	if (type == FOURCC('b','o','o','t') && id == 3) {
@@ -136,10 +136,15 @@ void CheckLoad(uint32 type, int16 id, ui
 				// Check when ntrb 17 is installed (for native Resource Manager patch) (7.6, 7.6.1, 8.0, 8.1)
 				p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
 				D(bug(" patch 3 applied\n"));
-			} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff)) {
+			} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(8,0x245f)) {
 				// Check when ntrb 17 is installed (for native Resource Manager patch) (8.5, 8.6)
 				p[8] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
 				D(bug(" patch 4 applied\n"));
+			} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(7,0x301f)) {
+				// Check when ntrb 17 is installed (for native Resource Manager patch) (9.0)
+				p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH4);
+				p[8] = htons(ntohs(p[8]) & 0xf0ff); // bra
+				D(bug(" patch 8 applied\n"));
 			} else if (PM(0,0x0c39) && PM(1,0x0001) && PM(2,0xf800) && PM(3,0x0008) && PM(4,0x6f00)) {
 				// Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6)
 				p[0] = htons(M68K_NOP);
@@ -163,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	<SysError #dsOldSystem>
+				D(bug(" patch 9 applied\n"));
 			}
 			p++;
 		}
@@ -179,6 +190,20 @@ void CheckLoad(uint32 type, int16 id, ui
 			D(bug(" patch 1 applied\n"));
 		}
 
+	} else if (type == FOURCC('p','t','c','h') && id == 156) {
+		D(bug("ptch 156 found\n"));
+		size >>= 1;
+		while (size--) {
+			if (PM(0,0x4e56) && PM(1,0xfffa) && PM(2,0x48e7) && PM(3,0x1f18) && PM(4,0x7800) && PM(5,0x267c) && PM(6,0x6900) && PM(7,0x0000)) {
+				// Don't call FE0A opcode (9.0)
+				p[0] = htons(0x7000);		// moveq #0,d0
+				p[1] = htons(M68K_RTS);
+				D(bug(" patch 1 applied\n"));
+				break;
+			}
+			p++;
+		}
+
 	} else if (type == FOURCC('p','t','c','h') && id == 420) {
 		D(bug("ptch 420 found\n"));
 		size >>= 1;
@@ -432,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) {
@@ -449,7 +479,7 @@ void CheckLoad(uint32 type, int16 id, ui
 
 	} else if (type == FOURCC('t','h','n','g')) {
 		// Collect info about used audio sifters
-		uint32 thing = (uintptr)p;
+		uint32 thing = Host2MacAddr((uint8 *)p);
 		uint32 c_type = ReadMacInt32(thing);
 		uint32 sub_type = ReadMacInt32(thing + 4);
 		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
@@ -507,6 +537,77 @@ void CheckLoad(uint32 type, int16 id, ui
 			p16[1] = htons(M68K_RTS);
 			D(bug(" patch 1 applied\n"));
 		}
+
+	} else if (type == FOURCC('N','O','b','j') && id == 100) {
+		D(bug("NObj 100 found\n"));
+
+		// Don't access VIA registers in MacBench 5.0
+		static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
+		base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
+		if (base) {
+			p[(base + 0x00) >> 1] = htons(0x3860);		// li r3,0
+			p[(base + 0x02) >> 1] = htons(0x0000);
+			p[(base + 0x04) >> 1] = htons(0x4e80);		// blr
+			p[(base + 0x06) >> 1] = htons(0x0020);
+			D(bug(" patch 1 applied\n"));
+		}
+		static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
+		base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
+		if (base) {
+			p[(base + 0x00) >> 1] = htons(0x3860);		// li r3,0
+			p[(base + 0x02) >> 1] = htons(0x0000);
+			p[(base + 0x04) >> 1] = htons(0x4e80);		// blr
+			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;
+
+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
+		D(bug(" DRVR .AFPTranslator found\n"));
+		
+		// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
+		static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
+		base = find_rsrc_data(p, size, dat, sizeof(dat));
+		if (base) {
+			p16 = (uint16 *)(p + base + 4);
+			*p16++ = htons(0x303c);		// move.l	#ROM85,%d0
+			*p16++ = htons(0x028e);
+			*p16++ = htons(M68K_NOP);
+			*p16++ = htons(M68K_NOP);
+			D(bug("  patch 1 applied\n"));
+		}
 	}
 }
 
@@ -529,7 +630,24 @@ void check_load_invoc(uint32 type, int16
 		return;
 	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
 
-	CheckLoad(type, id, (uint16 *)p, size);
+	CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
+}
+
+#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__
@@ -697,6 +815,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);
@@ -704,6 +888,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)
@@ -714,87 +900,121 @@ void PatchNativeResourceManager(void)
 	uint32 upp = ReadMacInt32(0x1480);
 	if ((upp & 0xffc00000) == ROM_BASE)
 		return;
-	uint32 *tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
-	D(bug(" GetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
-	*(uint32 *)XLM_RES_LIB_TOC = tvec[1];
-	*(uint32 *)XLM_GET_RESOURCE = tvec[0];
+	uint32 tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
+	WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
 #if EMULATED_PPC
-	tvec[0] = htonl(NativeFunction(NATIVE_GET_RESOURCE));
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
 #else
 #ifdef __BEOS__
 	uint32 *tvec2 = (uint32 *)get_resource;
-	tvec[0] = tvec2[0];
-	tvec[1] = tvec2[1];
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
 #else
-	tvec[0] = (uint32)get_resource;
+	WriteMacInt32(tvec, (uint32)get_resource);
 #endif
 #endif
 
 	// Patch native Get1Resource()
 	upp = ReadMacInt32(0x0e7c);
-	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
-	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
-	*(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
 #if EMULATED_PPC
-	tvec[0] = htonl(NativeFunction(NATIVE_GET_1_RESOURCE));
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
 #else
 #ifdef __BEOS__
 	tvec2 = (uint32 *)get_1_resource;
-	tvec[0] = tvec2[0];
-	tvec[1] = tvec2[1];
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
 #else
-	tvec[0] = (uint32)get_1_resource;
+	WriteMacInt32(tvec, (uint32)get_1_resource);
 #endif
 #endif
 
 	// Patch native GetIndResource()
 	upp = ReadMacInt32(0x1474);
-	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
-	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
-	*(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
 #if EMULATED_PPC
-	tvec[0] = htonl(NativeFunction(NATIVE_GET_IND_RESOURCE));
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
 #else
 #ifdef __BEOS__
 	tvec2 = (uint32 *)get_ind_resource;
-	tvec[0] = tvec2[0];
-	tvec[1] = tvec2[1];
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
 #else
-	tvec[0] = (uint32)get_ind_resource;
+	WriteMacInt32(tvec, (uint32)get_ind_resource);
 #endif
 #endif
 
 	// Patch native Get1IndResource()
 	upp = ReadMacInt32(0x0e38);
-	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
-	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
-	*(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
 #if EMULATED_PPC
-	tvec[0] = htonl(NativeFunction(NATIVE_GET_1_IND_RESOURCE));
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
 #else
 #ifdef __BEOS__
 	tvec2 = (uint32 *)get_1_ind_resource;
-	tvec[0] = tvec2[0];
-	tvec[1] = tvec2[1];
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
 #else
-	tvec[0] = (uint32)get_1_ind_resource;
+	WriteMacInt32(tvec, (uint32)get_1_ind_resource);
 #endif
 #endif
 
 	// Patch native RGetResource()
 	upp = ReadMacInt32(0x0e30);
-	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
-	D(bug(" RGetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
-	*(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
 #if EMULATED_PPC
-	tvec[0] = htonl(NativeFunction(NATIVE_R_GET_RESOURCE));
+	WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
 #else
 #ifdef __BEOS__
 	tvec2 = (uint32 *)r_get_resource;
-	tvec[0] = tvec2[0];
-	tvec[1] = tvec2[1];
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
+#else
+	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
-	tvec[0] = (uint32)r_get_resource;
+	WriteMacInt32(tvec, (uint32)get_1_named_resource);
 #endif
 #endif
 }