ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/rsrc_patches.cpp

Comparing SheepShaver/src/rsrc_patches.cpp (file contents):
Revision 1.12 by gbeauche, 2004-11-13T14:09:15Z vs.
Revision 1.20 by gbeauche, 2006-05-06T09:23:28Z

#	Line 1 | Line 1
1		/*
2		*  rsrc_patches.cpp - Resource patches
3		*
4	<	*  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 124 | Line 124 | void CheckLoad(uint32 type, int16 id, ui
124		D(bug("boot 3 found\n"));
125		size >>= 1;
126		while (size--) {
127	<	if (PM(0,0x2e49)) {
128	<	// Set boot stack pointer (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
129	<	p[0] = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
127	>	if (PM(0,0x51c9) && PM(2,0x2e49)) {
128	>	// Set boot stack pointer (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
129	>	p[2] = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
130		D(bug(" patch 1 applied\n"));
131		} else if (PM(0,0x4267) && PM(1,0x3f01) && PM(2,0x3f2a) && PM(3,0x0006) && PM(4,0x6100)) {
132		// Check when ntrb 17 is installed (for native Resource Manager patch) (7.5.3, 7.5.5)
#	Line 144 | Line 144 | void CheckLoad(uint32 type, int16 id, ui
144		// Check when ntrb 17 is installed (for native Resource Manager patch) (9.0)
145		p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH4);
146		p[8] = htons(ntohs(p[8]) & 0xf0ff); // bra
147	<	D(bug(" patch 8 applied\n"));
147	>	D(bug(" patch 5 applied\n"));
148		} else if (PM(0,0x0c39) && PM(1,0x0001) && PM(2,0xf800) && PM(3,0x0008) && PM(4,0x6f00)) {
149	<	// Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6)
149	>	// Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6, 9.0)
150		p[0] = htons(M68K_NOP);
151		p[1] = htons(M68K_NOP);
152		p[2] = htons(M68K_NOP);
153		p[3] = htons(M68K_NOP);
154		p[4] = htons(0x6000);   // bra
155	<	D(bug(" patch 5 applied\n"));
155	>	D(bug(" patch 6 applied\n"));
156		} else if (PM(0,0x2f3c) && PM(1,0x6b72) && PM(2,0x6e6c) && PM(3,0x4267) && PM(4,0xa9a0) && PM(5,0x265f) && PM(6,0x200b) && PM(7,0x6700)) {
157	<	// Don't replace nanokernel ("krnl" resource) (8.6)
157	>	// Don't replace nanokernel ("krnl" resource) (8.6, 9.0)
158		p[0] = htons(M68K_NOP);
159		p[1] = htons(M68K_NOP);
160		p[2] = htons(M68K_NOP);
161		p[3] = htons(M68K_NOP);
162		p[4] = htons(M68K_NOP);
163		p[7] = htons(0x6000);   // bra
164	<	D(bug(" patch 6 applied\n"));
164	>	D(bug(" patch 7 applied\n"));
165		} else if (PM(0,0xa8fe) && PM(1,0x3038) && PM(2,0x017a) && PM(3,0x0c40) && PM(4,0x8805) && PM(5,0x6710)) {
166		// No SCSI (calls via 0x205c jump vector which is not initialized in NewWorld ROM 1.6) (8.6)
167		if (ROMType == ROMTYPE_NEWWORLD) {
168		p[5] = htons(0x6010);   // bra
169	<	D(bug(" patch 7 applied\n"));
169	>	D(bug(" patch 8 applied\n"));
170		}
171	+	} 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)) {
172	+	// Check when vers 1 is installed (for safe abort if MacOS < 8.1 is used with a NewWorld ROM)
173	+	p[10] = htons(M68K_EMUL_OP_CHECK_SYSV);
174	+	p[11] = htons(0x4a81);  // tst.l        d1
175	+	p[12] = htons(0x670e);  // beq.s        <SysError #dsOldSystem>
176	+	D(bug(" patch 9 applied\n"));
177		}
178		p++;
179		}
#	Line 224 | Line 230 | void CheckLoad(uint32 type, int16 id, ui
230		D(bug(" patch 2 applied\n"));
231		break;
232		} else if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x7000) && PM(3,0x302e) && PM(4,0xfecc) && PM(5,0x323c) && PM(6,0x0100)) {
233	<	// Disable VM (8.5, 8.6)
233	>	// Disable VM (8.5, 8.6, 9.0)
234		p[8] = htons(M68K_NOP);
235		p[15] = htons(M68K_NOP);
236		D(bug(" patch 3 applied\n"));
#	Line 260 | Line 266 | void CheckLoad(uint32 type, int16 id, ui
266		p[-3] = htons(M68K_NOP);
267		p[0] = htons(0x6018);
268		D(bug(" patch 2 applied\n"));
269	+	} else if (PM(0,0x6660) && PM(1,0x2278) && PM(2,0x0134)) {
270	+	// We don't have SonyVars (7.5.3 Revision 2.2)
271	+	p[-6] = htons(M68K_NOP);
272	+	p[-3] = htons(M68K_NOP);
273	+	p[0] = htons(0x6060);
274	+	D(bug(" patch 3 applied\n"));
275		} else if (PM(0,0x666e) && PM(1,0x2278) && PM(2,0x0134)) {
276		// We don't have SonyVars (7.5.5)
277		p[-6] = htons(M68K_NOP);
278		p[-3] = htons(M68K_NOP);
279		p[0] = htons(0x606e);
280	<	D(bug(" patch 3 applied\n"));
280	>	D(bug(" patch 4 applied\n"));
281		} else if (PM(0,0x6400) && PM(1,0x011c) && PM(2,0x2278) && PM(3,0x0134)) {
282	<	// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6)
282	>	// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
283		p[0] = htons(0x6000);
284	<	D(bug(" patch 4 applied\n"));
284	>	D(bug(" patch 5 applied\n"));
285		} else if (PM(0,0x6400) && PM(1,0x00e6) && PM(2,0x2278) && PM(3,0x0134)) {
286		// We don't have SonyVars (7.6)
287		p[0] = htons(0x6000);
288	<	D(bug(" patch 5 applied\n"));
288	>	D(bug(" patch 6 applied\n"));
289		}
290		p++;
291		}
#	Line 340 | Line 352 | void CheckLoad(uint32 type, int16 id, ui
352		p[2] = htons(M68K_NOP);
353		D(bug(" patch 2 applied\n"));
354		} else if (PM(0,0x700a) && PM(1,0xfe0a)) {
355	<	// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
356	<	p[1] = htons(0x7000);
355	>	// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
356	>	p[1] = htons(0x2008);   // move.l a0,d0
357		D(bug(" patch 3 applied\n"));
346	–	} else if (PM(0,0x6c00) && PM(1,0x016a) && PM(2,0x2278) && PM(3,0x0134)) {
347	–	// We don't have SonyVars (8.6)
348	–	p[-4] = htons(0x21fc);  // move.l $40810000,($0000)
349	–	p[-3] = htons(0x4081);
350	–	p[-2] = htons(0x0000);
351	–	p[-1] = htons(0x0000);
352	–	p[0] = htons(0x6000);
353	–	D(bug(" patch 4 applied\n"));
358		}
359		p++;
360		}
#	Line 441 | Line 445 | void CheckLoad(uint32 type, int16 id, ui
445
446		} else if (type == FOURCC('n','s','r','d') && id == 1) {
447		D(bug("nsrd 1 found\n"));
448	<	if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) {
448	>	if (p[(0x378 + 0x460) >> 1] == htons(0x7c08) && p[(0x37a + 0x460) >> 1] == htons(0x02a6)) {
449	>	// Don't overwrite our serial drivers (7.5.3 Revision 2.2)
450	>	p[(0x378 + 0x460) >> 1] = htons(0x4e80);                // blr
451	>	p[(0x37a + 0x460) >> 1] = htons(0x0020);
452	>	D(bug(" patch 1 applied\n"));
453	>	} else if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) {
454		// Don't overwrite our serial drivers (8.0, 8.1)
455		p[(0x378 + 0x570) >> 1] = htons(0x4e80);                // blr
456		p[(0x37a + 0x570) >> 1] = htons(0x0020);
457	<	D(bug(" patch 1 applied\n"));
457	>	D(bug(" patch 2 applied\n"));
458		} else if (p[(0x378 + 0x6c0) >> 1] == htons(0x7c08) && p[(0x37a + 0x6c0) >> 1] == htons(0x02a6)) {
459		// Don't overwrite our serial drivers (8.5, 8.6)
460		p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
461		p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
462	<	D(bug(" patch 2 applied\n"));
462	>	D(bug(" patch 3 applied\n"));
463	>	} else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) {
464	>	// Don't overwrite our serial drivers (9.0)
465	>	p[(0x374 + 0x510) >> 1] = htons(0x4e80);                // blr
466	>	p[(0x376 + 0x510) >> 1] = htons(0x0020);
467	>	D(bug(" patch 4 applied\n"));
468		}
469
470		} else if (type == FOURCC('c','i','t','t') && id == 45) {
#	Line 458 | Line 472 | void CheckLoad(uint32 type, int16 id, ui
472		size >>= 1;
473		while (size--) {
474		if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
475	<	// Don't replace SCSI Manager (8.1, 8.5, 8.6)
475	>	// Don't replace SCSI Manager (8.1, 8.5, 8.6, 9.0)
476		p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);            // beq
477		D(bug(" patch 1 applied\n"));
478		break;
#	Line 517 | Line 531 | void CheckLoad(uint32 type, int16 id, ui
531		} else if (type == FOURCC('s','c','o','d') && id == -16465) {
532		D(bug("scod -16465 found\n"));
533
534	<	// Don't crash in Process Manager on reset/shutdown (8.6)
534	>	// Don't crash in Process Manager on reset/shutdown (8.6, 9.0)
535		static const uint8 dat[] = {0x4e, 0x56, 0x00, 0x00, 0x48, 0xe7, 0x03, 0x18, 0x2c, 0x2e, 0x00, 0x10};
536		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
537		if (base) {
#	Line 549 | Line 563 | void CheckLoad(uint32 type, int16 id, ui
563		p[(base + 0x06) >> 1] = htons(0x0020);
564		D(bug(" patch 2 applied\n"));
565		}
566	+
567	+	} else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) {
568	+	D(bug("CODE 27 found [Apple Personal Diagnostics]\n"));
569	+
570	+	// Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9)
571	+	// FIXME: this should not be called in the first place, use UTResolveFCB?
572	+	static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8};
573	+	base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
574	+	if (base
575	+	&& ReadMacInt16(0x3f6) == 4 /* FSFCBLen */
576	+	&& p[(base + 0x1a) >> 1] == htons(0x605e)
577	+	&& p[(base + 0x80) >> 1] == htons(0x7000))
578	+	{
579	+	p[(base + 0x1a) >> 1] = htons(0x6064);
580	+	D(bug(" patch1 applied\n"));
581	+	}
582	+	}
583	+	}
584	+
585	+
586	+	/*
587	+	*  Resource patches via GetNamedResource() and Get1NamedResource()
588	+	*/
589	+
590	+	void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
591	+	{
592	+	uint16 *p16;
593	+	uint32 base;
594	+	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));
595	+
596	+	// Don't modify resources in ROM
597	+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
598	+	return;
599	+
600	+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
601	+	D(bug(" DRVR .AFPTranslator found\n"));
602	+
603	+	// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
604	+	static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
605	+	base = find_rsrc_data(p, size, dat, sizeof(dat));
606	+	if (base) {
607	+	p16 = (uint16 *)(p + base + 4);
608	+	*p16++ = htons(0x303c);         // move.l       #ROM85,%d0
609	+	*p16++ = htons(0x028e);
610	+	*p16++ = htons(M68K_NOP);
611	+	*p16++ = htons(M68K_NOP);
612	+	D(bug("  patch 1 applied\n"));
613	+	}
614		}
615		}
616
#	Line 575 | Line 637 | void check_load_invoc(uint32 type, int16
637		}
638
639		#ifdef __BEOS__
640	+	static
641	+	#else
642	+	extern "C"
643	+	#endif
644	+	void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
645	+	{
646	+	if (h == 0)
647	+	return;
648	+	uint32 p = ReadMacInt32(h);
649	+	if (p == 0)
650	+	return;
651	+	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
652	+
653	+	CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
654	+	}
655	+
656	+	#ifdef __BEOS__
657		static asm void **get_resource(register uint32 type, register int16 id)
658		{
659		// Create stack frame
#	Line 739 | Line 818 | static asm void **r_get_resource(registe
818		addi    r1,r1,56+12
819		blr
820		}
821	+
822	+	static asm void **get_named_resource(register uint32 type, register uint32 name)
823	+	{
824	+	// Create stack frame
825	+	mflr    r0
826	+	stw             r0,8(r1)
827	+	stwu    r1,-(56+12)(r1)
828	+
829	+	// Save type/ID
830	+	stw             r3,56(r1)
831	+	stw             r4,56+4(r1)
832	+
833	+	// Call old routine
834	+	lwz             r0,XLM_GET_NAMED_RESOURCE
835	+	lwz             r2,XLM_RES_LIB_TOC
836	+	mtctr   r0
837	+	bctrl
838	+	lwz             r2,XLM_TOC              // Get TOC
839	+	stw             r3,56+8(r1)             // Save handle
840	+
841	+	// Call CheckLoad
842	+	lwz             r3,56(r1)
843	+	lwz             r4,56+4(r1)
844	+	lwz             r5,56+8(r1)
845	+	bl              named_check_load_invoc
846	+	lwz             r3,56+8(r1)             // Restore handle
847	+
848	+	// Return to caller
849	+	lwz             r0,56+12+8(r1)
850	+	mtlr    r0
851	+	addi    r1,r1,56+12
852	+	blr
853	+	}
854	+
855	+	static asm void **get_1_named_resource(register uint32 type, register uint32 name)
856	+	{
857	+	// Create stack frame
858	+	mflr    r0
859	+	stw             r0,8(r1)
860	+	stwu    r1,-(56+12)(r1)
861	+
862	+	// Save type/ID
863	+	stw             r3,56(r1)
864	+	stw             r4,56+4(r1)
865	+
866	+	// Call old routine
867	+	lwz             r0,XLM_GET_1_NAMED_RESOURCE
868	+	lwz             r2,XLM_RES_LIB_TOC
869	+	mtctr   r0
870	+	bctrl
871	+	lwz             r2,XLM_TOC              // Get TOC
872	+	stw             r3,56+8(r1)             // Save handle
873	+
874	+	// Call CheckLoad
875	+	lwz             r3,56(r1)
876	+	lwz             r4,56+4(r1)
877	+	lwz             r5,56+8(r1)
878	+	bl              named_check_load_invoc
879	+	lwz             r3,56+8(r1)             // Restore handle
880	+
881	+	// Return to caller
882	+	lwz             r0,56+12+8(r1)
883	+	mtlr    r0
884	+	addi    r1,r1,56+12
885	+	blr
886	+	}
887		#else
888		// Routines in asm_linux.S
889		extern "C" void get_resource(void);
#	Line 746 | Line 891 | extern "C" void get_1_resource(void);
891		extern "C" void get_ind_resource(void);
892		extern "C" void get_1_ind_resource(void);
893		extern "C" void r_get_resource(void);
894	+	extern "C" void get_named_resource(void);
895	+	extern "C" void get_1_named_resource(void);
896		#endif
897
898		void PatchNativeResourceManager(void)
#	Line 839 | Line 986 | void PatchNativeResourceManager(void)
986		WriteMacInt32(tvec, (uint32)r_get_resource);
987		#endif
988		#endif
989	+
990	+	// Patch native GetNamedResource()
991	+	upp = ReadMacInt32(0x1484);
992	+	tvec = ReadMacInt32(upp + 5 * 4);
993	+	D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
994	+	WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
995	+	#if EMULATED_PPC
996	+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
997	+	#else
998	+	#ifdef __BEOS__
999	+	tvec2 = (uint32 *)get_named_resource;
1000	+	WriteMacInt32(tvec, tvec2[0]);
1001	+	WriteMacInt32(tvec + 4, tvec2[1]);
1002	+	#else
1003	+	WriteMacInt32(tvec, (uint32)get_named_resource);
1004	+	#endif
1005	+	#endif
1006	+
1007	+	// Patch native Get1NamedResource()
1008	+	upp = ReadMacInt32(0x0e80);
1009	+	tvec = ReadMacInt32(upp + 5 * 4);
1010	+	D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1011	+	WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
1012	+	#if EMULATED_PPC
1013	+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
1014	+	#else
1015	+	#ifdef __BEOS__
1016	+	tvec2 = (uint32 *)get_1_named_resource;
1017	+	WriteMacInt32(tvec, tvec2[0]);
1018	+	WriteMacInt32(tvec + 4, tvec2[1]);
1019	+	#else
1020	+	WriteMacInt32(tvec, (uint32)get_1_named_resource);
1021	+	#endif
1022	+	#endif
1023		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines