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.9 by cebix, 2004-01-12T15:37:19Z vs.
Revision 1.19 by gbeauche, 2006-05-05T19:05:24Z

#	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 117 | Line 117 | void CheckLoad(uint32 type, int16 id, ui
117		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));
118
119		// Don't modify resources in ROM
120	<	if ((uintptr)p >= ROM_BASE && (uintptr)p <= (ROM_BASE + ROM_SIZE))
120	>	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
121		return;
122
123		if (type == FOURCC('b','o','o','t') && id == 3) {
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 136 | Line 136 | void CheckLoad(uint32 type, int16 id, ui
136		// Check when ntrb 17 is installed (for native Resource Manager patch) (7.6, 7.6.1, 8.0, 8.1)
137		p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
138		D(bug(" patch 3 applied\n"));
139	<	} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff)) {
139	>	} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(8,0x245f)) {
140		// Check when ntrb 17 is installed (for native Resource Manager patch) (8.5, 8.6)
141		p[8] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
142		D(bug(" patch 4 applied\n"));
143	+	} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(7,0x301f)) {
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 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 179 | Line 190 | void CheckLoad(uint32 type, int16 id, ui
190		D(bug(" patch 1 applied\n"));
191		}
192
193	+	} else if (type == FOURCC('p','t','c','h') && id == 156) {
194	+	D(bug("ptch 156 found\n"));
195	+	size >>= 1;
196	+	while (size--) {
197	+	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)) {
198	+	// Don't call FE0A opcode (9.0)
199	+	p[0] = htons(0x7000);           // moveq #0,d0
200	+	p[1] = htons(M68K_RTS);
201	+	D(bug(" patch 1 applied\n"));
202	+	break;
203	+	}
204	+	p++;
205	+	}
206	+
207		} else if (type == FOURCC('p','t','c','h') && id == 420) {
208		D(bug("ptch 420 found\n"));
209		size >>= 1;
#	Line 205 | 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 248 | Line 273 | void CheckLoad(uint32 type, int16 id, ui
273		p[0] = htons(0x606e);
274		D(bug(" patch 3 applied\n"));
275		} else if (PM(0,0x6400) && PM(1,0x011c) && PM(2,0x2278) && PM(3,0x0134)) {
276	<	// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6)
276	>	// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
277		p[0] = htons(0x6000);
278		D(bug(" patch 4 applied\n"));
279		} else if (PM(0,0x6400) && PM(1,0x00e6) && PM(2,0x2278) && PM(3,0x0134)) {
#	Line 321 | Line 346 | void CheckLoad(uint32 type, int16 id, ui
346		p[2] = htons(M68K_NOP);
347		D(bug(" patch 2 applied\n"));
348		} else if (PM(0,0x700a) && PM(1,0xfe0a)) {
349	<	// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
350	<	p[1] = htons(0x7000);
349	>	// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
350	>	p[1] = htons(0x2008);   // move.l a0,d0
351		D(bug(" patch 3 applied\n"));
327	–	} else if (PM(0,0x6c00) && PM(1,0x016a) && PM(2,0x2278) && PM(3,0x0134)) {
328	–	// We don't have SonyVars (8.6)
329	–	p[-4] = htons(0x21fc);  // move.l $40810000,($0000)
330	–	p[-3] = htons(0x4081);
331	–	p[-2] = htons(0x0000);
332	–	p[-1] = htons(0x0000);
333	–	p[0] = htons(0x6000);
334	–	D(bug(" patch 4 applied\n"));
352		}
353		p++;
354		}
#	Line 432 | Line 449 | void CheckLoad(uint32 type, int16 id, ui
449		p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
450		p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
451		D(bug(" patch 2 applied\n"));
452	+	} else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) {
453	+	// Don't overwrite our serial drivers (9.0)
454	+	p[(0x374 + 0x510) >> 1] = htons(0x4e80);                // blr
455	+	p[(0x376 + 0x510) >> 1] = htons(0x0020);
456	+	D(bug(" patch 3 applied\n"));
457		}
458
459		} else if (type == FOURCC('c','i','t','t') && id == 45) {
#	Line 439 | Line 461 | void CheckLoad(uint32 type, int16 id, ui
461		size >>= 1;
462		while (size--) {
463		if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
464	<	// Don't replace SCSI Manager (8.1, 8.5, 8.6)
464	>	// Don't replace SCSI Manager (8.1, 8.5, 8.6, 9.0)
465		p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);            // beq
466		D(bug(" patch 1 applied\n"));
467		break;
#	Line 449 | Line 471 | void CheckLoad(uint32 type, int16 id, ui
471
472		} else if (type == FOURCC('t','h','n','g')) {
473		// Collect info about used audio sifters
474	<	uint32 thing = (uintptr)p;
474	>	uint32 thing = Host2MacAddr((uint8 *)p);
475		uint32 c_type = ReadMacInt32(thing);
476		uint32 sub_type = ReadMacInt32(thing + 4);
477		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
#	Line 498 | Line 520 | void CheckLoad(uint32 type, int16 id, ui
520		} else if (type == FOURCC('s','c','o','d') && id == -16465) {
521		D(bug("scod -16465 found\n"));
522
523	<	// Don't crash in Process Manager on reset/shutdown (8.6)
523	>	// Don't crash in Process Manager on reset/shutdown (8.6, 9.0)
524		static const uint8 dat[] = {0x4e, 0x56, 0x00, 0x00, 0x48, 0xe7, 0x03, 0x18, 0x2c, 0x2e, 0x00, 0x10};
525		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
526		if (base) {
#	Line 507 | Line 529 | void CheckLoad(uint32 type, int16 id, ui
529		p16[1] = htons(M68K_RTS);
530		D(bug(" patch 1 applied\n"));
531		}
532	+
533	+	} else if (type == FOURCC('N','O','b','j') && id == 100) {
534	+	D(bug("NObj 100 found\n"));
535	+
536	+	// Don't access VIA registers in MacBench 5.0
537	+	static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
538	+	base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
539	+	if (base) {
540	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
541	+	p[(base + 0x02) >> 1] = htons(0x0000);
542	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
543	+	p[(base + 0x06) >> 1] = htons(0x0020);
544	+	D(bug(" patch 1 applied\n"));
545	+	}
546	+	static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
547	+	base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
548	+	if (base) {
549	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
550	+	p[(base + 0x02) >> 1] = htons(0x0000);
551	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
552	+	p[(base + 0x06) >> 1] = htons(0x0020);
553	+	D(bug(" patch 2 applied\n"));
554	+	}
555	+
556	+	} else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) {
557	+	D(bug("CODE 27 found [Apple Personal Diagnostics]\n"));
558	+
559	+	// Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9)
560	+	// FIXME: this should not be called in the first place, use UTResolveFCB?
561	+	static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8};
562	+	base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
563	+	if (base
564	+	&& ReadMacInt16(0x3f6) == 4 /* FSFCBLen */
565	+	&& p[(base + 0x1a) >> 1] == htons(0x605e)
566	+	&& p[(base + 0x80) >> 1] == htons(0x7000))
567	+	{
568	+	p[(base + 0x1a) >> 1] = htons(0x6064);
569	+	D(bug(" patch1 applied\n"));
570	+	}
571	+	}
572	+	}
573	+
574	+
575	+	/*
576	+	*  Resource patches via GetNamedResource() and Get1NamedResource()
577	+	*/
578	+
579	+	void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
580	+	{
581	+	uint16 *p16;
582	+	uint32 base;
583	+	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));
584	+
585	+	// Don't modify resources in ROM
586	+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
587	+	return;
588	+
589	+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
590	+	D(bug(" DRVR .AFPTranslator found\n"));
591	+
592	+	// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
593	+	static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
594	+	base = find_rsrc_data(p, size, dat, sizeof(dat));
595	+	if (base) {
596	+	p16 = (uint16 *)(p + base + 4);
597	+	*p16++ = htons(0x303c);         // move.l       #ROM85,%d0
598	+	*p16++ = htons(0x028e);
599	+	*p16++ = htons(M68K_NOP);
600	+	*p16++ = htons(M68K_NOP);
601	+	D(bug("  patch 1 applied\n"));
602	+	}
603		}
604		}
605
#	Line 529 | Line 622 | void check_load_invoc(uint32 type, int16
622		return;
623		uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
624
625	<	CheckLoad(type, id, (uint16 *)p, size);
625	>	CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
626	>	}
627	>
628	>	#ifdef __BEOS__
629	>	static
630	>	#else
631	>	extern "C"
632	>	#endif
633	>	void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
634	>	{
635	>	if (h == 0)
636	>	return;
637	>	uint32 p = ReadMacInt32(h);
638	>	if (p == 0)
639	>	return;
640	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
641	>
642	>	CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
643		}
644
645		#ifdef __BEOS__
#	Line 697 | Line 807 | static asm void **r_get_resource(registe
807		addi    r1,r1,56+12
808		blr
809		}
810	+
811	+	static asm void **get_named_resource(register uint32 type, register uint32 name)
812	+	{
813	+	// Create stack frame
814	+	mflr    r0
815	+	stw             r0,8(r1)
816	+	stwu    r1,-(56+12)(r1)
817	+
818	+	// Save type/ID
819	+	stw             r3,56(r1)
820	+	stw             r4,56+4(r1)
821	+
822	+	// Call old routine
823	+	lwz             r0,XLM_GET_NAMED_RESOURCE
824	+	lwz             r2,XLM_RES_LIB_TOC
825	+	mtctr   r0
826	+	bctrl
827	+	lwz             r2,XLM_TOC              // Get TOC
828	+	stw             r3,56+8(r1)             // Save handle
829	+
830	+	// Call CheckLoad
831	+	lwz             r3,56(r1)
832	+	lwz             r4,56+4(r1)
833	+	lwz             r5,56+8(r1)
834	+	bl              named_check_load_invoc
835	+	lwz             r3,56+8(r1)             // Restore handle
836	+
837	+	// Return to caller
838	+	lwz             r0,56+12+8(r1)
839	+	mtlr    r0
840	+	addi    r1,r1,56+12
841	+	blr
842	+	}
843	+
844	+	static asm void **get_1_named_resource(register uint32 type, register uint32 name)
845	+	{
846	+	// Create stack frame
847	+	mflr    r0
848	+	stw             r0,8(r1)
849	+	stwu    r1,-(56+12)(r1)
850	+
851	+	// Save type/ID
852	+	stw             r3,56(r1)
853	+	stw             r4,56+4(r1)
854	+
855	+	// Call old routine
856	+	lwz             r0,XLM_GET_1_NAMED_RESOURCE
857	+	lwz             r2,XLM_RES_LIB_TOC
858	+	mtctr   r0
859	+	bctrl
860	+	lwz             r2,XLM_TOC              // Get TOC
861	+	stw             r3,56+8(r1)             // Save handle
862	+
863	+	// Call CheckLoad
864	+	lwz             r3,56(r1)
865	+	lwz             r4,56+4(r1)
866	+	lwz             r5,56+8(r1)
867	+	bl              named_check_load_invoc
868	+	lwz             r3,56+8(r1)             // Restore handle
869	+
870	+	// Return to caller
871	+	lwz             r0,56+12+8(r1)
872	+	mtlr    r0
873	+	addi    r1,r1,56+12
874	+	blr
875	+	}
876		#else
877		// Routines in asm_linux.S
878		extern "C" void get_resource(void);
#	Line 704 | Line 880 | extern "C" void get_1_resource(void);
880		extern "C" void get_ind_resource(void);
881		extern "C" void get_1_ind_resource(void);
882		extern "C" void r_get_resource(void);
883	+	extern "C" void get_named_resource(void);
884	+	extern "C" void get_1_named_resource(void);
885		#endif
886
887		void PatchNativeResourceManager(void)
#	Line 714 | Line 892 | void PatchNativeResourceManager(void)
892		uint32 upp = ReadMacInt32(0x1480);
893		if ((upp & 0xffc00000) == ROM_BASE)
894		return;
895	<	uint32 *tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
896	<	D(bug(" GetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
897	<	*(uint32 *)XLM_RES_LIB_TOC = tvec[1];
898	<	*(uint32 *)XLM_GET_RESOURCE = tvec[0];
895	>	uint32 tvec = ReadMacInt32(upp + 5 * 4);
896	>	D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
897	>	WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
898	>	WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
899		#if EMULATED_PPC
900	<	tvec[0] = htonl(NativeFunction(NATIVE_GET_RESOURCE));
900	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
901		#else
902		#ifdef __BEOS__
903		uint32 *tvec2 = (uint32 *)get_resource;
904	<	tvec[0] = tvec2[0];
905	<	tvec[1] = tvec2[1];
904	>	WriteMacInt32(tvec, tvec2[0]);
905	>	WriteMacInt32(tvec + 4, tvec2[1]);
906		#else
907	<	tvec[0] = (uint32)get_resource;
907	>	WriteMacInt32(tvec, (uint32)get_resource);
908		#endif
909		#endif
910
911		// Patch native Get1Resource()
912		upp = ReadMacInt32(0x0e7c);
913	<	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
914	<	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
915	<	*(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
913	>	tvec = ReadMacInt32(upp + 5 * 4);
914	>	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
915	>	WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
916		#if EMULATED_PPC
917	<	tvec[0] = htonl(NativeFunction(NATIVE_GET_1_RESOURCE));
917	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
918		#else
919		#ifdef __BEOS__
920		tvec2 = (uint32 *)get_1_resource;
921	<	tvec[0] = tvec2[0];
922	<	tvec[1] = tvec2[1];
921	>	WriteMacInt32(tvec, tvec2[0]);
922	>	WriteMacInt32(tvec + 4, tvec2[1]);
923		#else
924	<	tvec[0] = (uint32)get_1_resource;
924	>	WriteMacInt32(tvec, (uint32)get_1_resource);
925		#endif
926		#endif
927
928		// Patch native GetIndResource()
929		upp = ReadMacInt32(0x1474);
930	<	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
931	<	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
932	<	*(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
930	>	tvec = ReadMacInt32(upp + 5 * 4);
931	>	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
932	>	WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
933		#if EMULATED_PPC
934	<	tvec[0] = htonl(NativeFunction(NATIVE_GET_IND_RESOURCE));
934	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
935		#else
936		#ifdef __BEOS__
937		tvec2 = (uint32 *)get_ind_resource;
938	<	tvec[0] = tvec2[0];
939	<	tvec[1] = tvec2[1];
938	>	WriteMacInt32(tvec, tvec2[0]);
939	>	WriteMacInt32(tvec + 4, tvec2[1]);
940		#else
941	<	tvec[0] = (uint32)get_ind_resource;
941	>	WriteMacInt32(tvec, (uint32)get_ind_resource);
942		#endif
943		#endif
944
945		// Patch native Get1IndResource()
946		upp = ReadMacInt32(0x0e38);
947	<	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
948	<	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
949	<	*(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
947	>	tvec = ReadMacInt32(upp + 5 * 4);
948	>	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
949	>	WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
950		#if EMULATED_PPC
951	<	tvec[0] = htonl(NativeFunction(NATIVE_GET_1_IND_RESOURCE));
951	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
952		#else
953		#ifdef __BEOS__
954		tvec2 = (uint32 *)get_1_ind_resource;
955	<	tvec[0] = tvec2[0];
956	<	tvec[1] = tvec2[1];
955	>	WriteMacInt32(tvec, tvec2[0]);
956	>	WriteMacInt32(tvec + 4, tvec2[1]);
957		#else
958	<	tvec[0] = (uint32)get_1_ind_resource;
958	>	WriteMacInt32(tvec, (uint32)get_1_ind_resource);
959		#endif
960		#endif
961
962		// Patch native RGetResource()
963		upp = ReadMacInt32(0x0e30);
964	<	tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
965	<	D(bug(" RGetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
966	<	*(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
964	>	tvec = ReadMacInt32(upp + 5 * 4);
965	>	D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
966	>	WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
967		#if EMULATED_PPC
968	<	tvec[0] = htonl(NativeFunction(NATIVE_R_GET_RESOURCE));
968	>	WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
969		#else
970		#ifdef __BEOS__
971		tvec2 = (uint32 *)r_get_resource;
972	<	tvec[0] = tvec2[0];
973	<	tvec[1] = tvec2[1];
972	>	WriteMacInt32(tvec, tvec2[0]);
973	>	WriteMacInt32(tvec + 4, tvec2[1]);
974	>	#else
975	>	WriteMacInt32(tvec, (uint32)r_get_resource);
976	>	#endif
977	>	#endif
978	>
979	>	// Patch native GetNamedResource()
980	>	upp = ReadMacInt32(0x1484);
981	>	tvec = ReadMacInt32(upp + 5 * 4);
982	>	D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
983	>	WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
984	>	#if EMULATED_PPC
985	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
986	>	#else
987	>	#ifdef __BEOS__
988	>	tvec2 = (uint32 *)get_named_resource;
989	>	WriteMacInt32(tvec, tvec2[0]);
990	>	WriteMacInt32(tvec + 4, tvec2[1]);
991	>	#else
992	>	WriteMacInt32(tvec, (uint32)get_named_resource);
993	>	#endif
994	>	#endif
995	>
996	>	// Patch native Get1NamedResource()
997	>	upp = ReadMacInt32(0x0e80);
998	>	tvec = ReadMacInt32(upp + 5 * 4);
999	>	D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1000	>	WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
1001	>	#if EMULATED_PPC
1002	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
1003	>	#else
1004	>	#ifdef __BEOS__
1005	>	tvec2 = (uint32 *)get_1_named_resource;
1006	>	WriteMacInt32(tvec, tvec2[0]);
1007	>	WriteMacInt32(tvec + 4, tvec2[1]);
1008		#else
1009	<	tvec[0] = (uint32)r_get_resource;
1009	>	WriteMacInt32(tvec, (uint32)get_1_named_resource);
1010		#endif
1011		#endif
1012		}

Diff Legend

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