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.4 by gbeauche, 2003-09-29T20:30:19Z vs.
Revision 1.21 by gbeauche, 2006-05-08T23:32:58Z

#	Line 1 | Line 1
1		/*
2		*  rsrc_patches.cpp - Resource patches
3		*
4	<	*  SheepShaver (C) 1997-2002 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 31 | Line 31
31		#include "rom_patches.h"
32		#include "main.h"
33		#include "audio.h"
34	+	#include "audio_defs.h"
35	+	#include "thunks.h"
36
37		#define DEBUG 0
38		#include "debug.h"
#	Line 115 | 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 134 | 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 177 | 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 203 | 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 239 | 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 319 | 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"));
325	–	} else if (PM(0,0x6c00) && PM(1,0x016a) && PM(2,0x2278) && PM(3,0x0134)) {
326	–	// We don't have SonyVars (8.6)
327	–	p[-4] = htons(0x21fc);  // move.l $40810000,($0000)
328	–	p[-3] = htons(0x4081);
329	–	p[-2] = htons(0x0000);
330	–	p[-1] = htons(0x0000);
331	–	p[0] = htons(0x6000);
332	–	D(bug(" patch 4 applied\n"));
358		}
359		p++;
360		}
#	Line 420 | 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] == 0x7c08 && p[(0x37a + 0x570) >> 1] == 0x02a6) {
449	<	// Don't overwrite our serial drivers (8.0, 8.1)
450	<	p[(0x378 + 0x570) >> 1] = 0x4e80;               // blr
451	<	p[(0x37a + 0x570) >> 1] = 0x0020;
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 + 0x6c0) >> 1] == 0x7c08 && p[(0x37a + 0x6c0) >> 1] == 0x02a6) {
454	<	// Don't overwrite our serial drivers (8.5, 8.6)
455	<	p[(0x378 + 0x6c0) >> 1] = 0x4e80;               // blr
456	<	p[(0x37a + 0x6c0) >> 1] = 0x0020;
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 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 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 437 | 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)
476	<	p[5] = htons((p[5] & 0xff) | 0x6000);           // beq
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;
479		}
#	Line 447 | Line 482 | void CheckLoad(uint32 type, int16 id, ui
482
483		} else if (type == FOURCC('t','h','n','g')) {
484		// Collect info about used audio sifters
485	<	uint32 c_type = 0[(uint32 *)p];
486	<	uint32 sub_type = 1[(uint32 *)p];
485	>	uint32 thing = Host2MacAddr((uint8 *)p);
486	>	uint32 c_type = ReadMacInt32(thing);
487	>	uint32 sub_type = ReadMacInt32(thing + 4);
488		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
489	<	1[(uint32 *)p] = FOURCC('a','w','g','c');
489	>	WriteMacInt32(thing + 4, FOURCC('a','w','g','c'));
490		D(bug("thng %d, type %c%c%c%c (%08x), sub type %c%c%c%c (%08x), data %p\n", id, c_type >> 24, (c_type >> 16) & 0xff, (c_type >> 8) & 0xff, c_type & 0xff, c_type, sub_type >> 24, (sub_type >> 16) & 0xff, (sub_type >> 8) & 0xff, sub_type & 0xff, sub_type, p));
491	<	AddSifter(*(uint32 *)(((uintptr)p)+20), p[12]);
492	<	if (p[28])                                                              // componentPFCount
493	<	AddSifter(*(uint32 *)(((uintptr)p)+62), p[33]);
491	>	AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID));
492	>	if (ReadMacInt32(thing + componentPFCount))
493	>	AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID));
494		}
495
496		} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) {
#	Line 495 | 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 504 | Line 540 | void CheckLoad(uint32 type, int16 id, ui
540		p16[1] = htons(M68K_RTS);
541		D(bug(" patch 1 applied\n"));
542		}
543	+
544	+	} else if (type == FOURCC('N','O','b','j') && id == 100) {
545	+	D(bug("NObj 100 found\n"));
546	+
547	+	// Don't access VIA registers in MacBench 5.0
548	+	static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
549	+	base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
550	+	if (base) {
551	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
552	+	p[(base + 0x02) >> 1] = htons(0x0000);
553	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
554	+	p[(base + 0x06) >> 1] = htons(0x0020);
555	+	D(bug(" patch 1 applied\n"));
556	+	}
557	+	static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
558	+	base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
559	+	if (base) {
560	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
561	+	p[(base + 0x02) >> 1] = htons(0x0000);
562	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
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	+	} else if (type == FOURCC('i','n','f','n') && (id == 129 || id == 200)) {
584	+	D(bug("infn %d found\n", id));
585	+	size >>= 1;
586	+	while (size--) {
587	+	if (PM(0,0x203c) && PM(1,0xf800) && PM(2,0x0000) && PM(4,0x2040) && PM(5,0x1028) && PM(6,0x0090)) {
588	+	// Don't read from 0xf8000090 during MacOS (8.5, 9.0) installation
589	+	p[0] = htons(M68K_NOP);
590	+	p[1] = htons(M68K_NOP);
591	+	p[2] = htons(M68K_NOP);
592	+	p[3] = htons(M68K_NOP);
593	+	p[4] = htons(M68K_NOP);
594	+	p[5] = htons(M68K_NOP);
595	+	p[6] = htons(0x7000);   // moveq #0,d0
596	+	D(bug(" patch 1 applied\n"));
597	+	break;
598	+	}
599	+	p++;
600	+	}
601	+
602	+	}
603	+	}
604	+
605	+
606	+	/*
607	+	*  Resource patches via GetNamedResource() and Get1NamedResource()
608	+	*/
609	+
610	+	void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
611	+	{
612	+	uint16 *p16;
613	+	uint32 base;
614	+	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));
615	+
616	+	// Don't modify resources in ROM
617	+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
618	+	return;
619	+
620	+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
621	+	D(bug(" DRVR .AFPTranslator found\n"));
622	+
623	+	// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
624	+	static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
625	+	base = find_rsrc_data(p, size, dat, sizeof(dat));
626	+	if (base) {
627	+	p16 = (uint16 *)(p + base + 4);
628	+	*p16++ = htons(0x303c);         // move.l       #ROM85,%d0
629	+	*p16++ = htons(0x028e);
630	+	*p16++ = htons(M68K_NOP);
631	+	*p16++ = htons(M68K_NOP);
632	+	D(bug("  patch 1 applied\n"));
633	+	}
634		}
635		}
636
#	Line 517 | Line 644 | static
644		#else
645		extern "C"
646		#endif
647	<	void check_load_invoc(uint32 type, int16 id, uint16 **h)
647	>	void check_load_invoc(uint32 type, int16 id, uint32 h)
648	>	{
649	>	if (h == 0)
650	>	return;
651	>	uint32 p = ReadMacInt32(h);
652	>	if (p == 0)
653	>	return;
654	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
655	>
656	>	CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
657	>	}
658	>
659	>	#ifdef __BEOS__
660	>	static
661	>	#else
662	>	extern "C"
663	>	#endif
664	>	void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
665		{
666	<	if (h == NULL)
666	>	if (h == 0)
667		return;
668	<	uint16 *p = *h;
669	<	if (p == NULL)
668	>	uint32 p = ReadMacInt32(h);
669	>	if (p == 0)
670		return;
671	<	uint32 size = ((uint32 *)p)[-2] & 0xffffff;
671	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
672
673	<	CheckLoad(type, id, p, size);
673	>	CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
674		}
675
676		#ifdef __BEOS__
#	Line 694 | Line 838 | static asm void **r_get_resource(registe
838		addi    r1,r1,56+12
839		blr
840		}
841	+
842	+	static asm void **get_named_resource(register uint32 type, register uint32 name)
843	+	{
844	+	// Create stack frame
845	+	mflr    r0
846	+	stw             r0,8(r1)
847	+	stwu    r1,-(56+12)(r1)
848	+
849	+	// Save type/ID
850	+	stw             r3,56(r1)
851	+	stw             r4,56+4(r1)
852	+
853	+	// Call old routine
854	+	lwz             r0,XLM_GET_NAMED_RESOURCE
855	+	lwz             r2,XLM_RES_LIB_TOC
856	+	mtctr   r0
857	+	bctrl
858	+	lwz             r2,XLM_TOC              // Get TOC
859	+	stw             r3,56+8(r1)             // Save handle
860	+
861	+	// Call CheckLoad
862	+	lwz             r3,56(r1)
863	+	lwz             r4,56+4(r1)
864	+	lwz             r5,56+8(r1)
865	+	bl              named_check_load_invoc
866	+	lwz             r3,56+8(r1)             // Restore handle
867	+
868	+	// Return to caller
869	+	lwz             r0,56+12+8(r1)
870	+	mtlr    r0
871	+	addi    r1,r1,56+12
872	+	blr
873	+	}
874	+
875	+	static asm void **get_1_named_resource(register uint32 type, register uint32 name)
876	+	{
877	+	// Create stack frame
878	+	mflr    r0
879	+	stw             r0,8(r1)
880	+	stwu    r1,-(56+12)(r1)
881	+
882	+	// Save type/ID
883	+	stw             r3,56(r1)
884	+	stw             r4,56+4(r1)
885	+
886	+	// Call old routine
887	+	lwz             r0,XLM_GET_1_NAMED_RESOURCE
888	+	lwz             r2,XLM_RES_LIB_TOC
889	+	mtctr   r0
890	+	bctrl
891	+	lwz             r2,XLM_TOC              // Get TOC
892	+	stw             r3,56+8(r1)             // Save handle
893	+
894	+	// Call CheckLoad
895	+	lwz             r3,56(r1)
896	+	lwz             r4,56+4(r1)
897	+	lwz             r5,56+8(r1)
898	+	bl              named_check_load_invoc
899	+	lwz             r3,56+8(r1)             // Restore handle
900	+
901	+	// Return to caller
902	+	lwz             r0,56+12+8(r1)
903	+	mtlr    r0
904	+	addi    r1,r1,56+12
905	+	blr
906	+	}
907		#else
908		// Routines in asm_linux.S
909		extern "C" void get_resource(void);
#	Line 701 | Line 911 | extern "C" void get_1_resource(void);
911		extern "C" void get_ind_resource(void);
912		extern "C" void get_1_ind_resource(void);
913		extern "C" void r_get_resource(void);
914	+	extern "C" void get_named_resource(void);
915	+	extern "C" void get_1_named_resource(void);
916		#endif
917
918		void PatchNativeResourceManager(void)
#	Line 708 | Line 920 | void PatchNativeResourceManager(void)
920		D(bug("PatchNativeResourceManager\n"));
921
922		// Patch native GetResource()
923	<	uint32 **upp = (uint32 **)(uintptr)ReadMacInt32(0x1480);
924	<	if (((uint32)upp & 0xffc00000) == ROM_BASE)
923	>	uint32 upp = ReadMacInt32(0x1480);
924	>	if ((upp & 0xffc00000) == ROM_BASE)
925		return;
926	<	uint32 *tvec = upp[5];
927	<	D(bug(" GetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
928	<	*(uint32 *)XLM_RES_LIB_TOC = tvec[1];
929	<	*(uint32 *)XLM_GET_RESOURCE = tvec[0];
926	>	uint32 tvec = ReadMacInt32(upp + 5 * 4);
927	>	D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
928	>	WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
929	>	WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
930		#if EMULATED_PPC
931	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_RESOURCE);
931	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
932		#else
933		#ifdef __BEOS__
934		uint32 *tvec2 = (uint32 *)get_resource;
935	<	tvec[0] = tvec2[0];
936	<	tvec[1] = tvec2[1];
935	>	WriteMacInt32(tvec, tvec2[0]);
936	>	WriteMacInt32(tvec + 4, tvec2[1]);
937		#else
938	<	tvec[0] = (uint32)get_resource;
938	>	WriteMacInt32(tvec, (uint32)get_resource);
939		#endif
940		#endif
941
942		// Patch native Get1Resource()
943	<	upp = *(uint32 ***)0xe7c;
944	<	tvec = upp[5];
945	<	D(bug(" Get1Resource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
946	<	*(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
943	>	upp = ReadMacInt32(0x0e7c);
944	>	tvec = ReadMacInt32(upp + 5 * 4);
945	>	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
946	>	WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
947		#if EMULATED_PPC
948	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_RESOURCE);
948	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
949		#else
950		#ifdef __BEOS__
951		tvec2 = (uint32 *)get_1_resource;
952	<	tvec[0] = tvec2[0];
953	<	tvec[1] = tvec2[1];
952	>	WriteMacInt32(tvec, tvec2[0]);
953	>	WriteMacInt32(tvec + 4, tvec2[1]);
954		#else
955	<	tvec[0] = (uint32)get_1_resource;
955	>	WriteMacInt32(tvec, (uint32)get_1_resource);
956		#endif
957		#endif
958
959		// Patch native GetIndResource()
960	<	upp = *(uint32 ***)0x1474;
961	<	tvec = upp[5];
962	<	D(bug(" GetIndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
963	<	*(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
960	>	upp = ReadMacInt32(0x1474);
961	>	tvec = ReadMacInt32(upp + 5 * 4);
962	>	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
963	>	WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
964		#if EMULATED_PPC
965	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_IND_RESOURCE);
965	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
966		#else
967		#ifdef __BEOS__
968		tvec2 = (uint32 *)get_ind_resource;
969	<	tvec[0] = tvec2[0];
970	<	tvec[1] = tvec2[1];
969	>	WriteMacInt32(tvec, tvec2[0]);
970	>	WriteMacInt32(tvec + 4, tvec2[1]);
971		#else
972	<	tvec[0] = (uint32)get_ind_resource;
972	>	WriteMacInt32(tvec, (uint32)get_ind_resource);
973		#endif
974		#endif
975
976		// Patch native Get1IndResource()
977	<	upp = *(uint32 ***)0xe38;
978	<	tvec = upp[5];
979	<	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
980	<	*(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
977	>	upp = ReadMacInt32(0x0e38);
978	>	tvec = ReadMacInt32(upp + 5 * 4);
979	>	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
980	>	WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
981		#if EMULATED_PPC
982	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_IND_RESOURCE);
982	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
983		#else
984		#ifdef __BEOS__
985		tvec2 = (uint32 *)get_1_ind_resource;
986	<	tvec[0] = tvec2[0];
987	<	tvec[1] = tvec2[1];
986	>	WriteMacInt32(tvec, tvec2[0]);
987	>	WriteMacInt32(tvec + 4, tvec2[1]);
988		#else
989	<	tvec[0] = (uint32)get_1_ind_resource;
989	>	WriteMacInt32(tvec, (uint32)get_1_ind_resource);
990		#endif
991		#endif
992
993		// Patch native RGetResource()
994	<	upp = *(uint32 ***)0xe30;
995	<	tvec = upp[5];
996	<	D(bug(" RGetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
997	<	*(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
994	>	upp = ReadMacInt32(0x0e30);
995	>	tvec = ReadMacInt32(upp + 5 * 4);
996	>	D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
997	>	WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
998		#if EMULATED_PPC
999	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_R_GET_RESOURCE);
999	>	WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
1000		#else
1001		#ifdef __BEOS__
1002		tvec2 = (uint32 *)r_get_resource;
1003	<	tvec[0] = tvec2[0];
1004	<	tvec[1] = tvec2[1];
1003	>	WriteMacInt32(tvec, tvec2[0]);
1004	>	WriteMacInt32(tvec + 4, tvec2[1]);
1005	>	#else
1006	>	WriteMacInt32(tvec, (uint32)r_get_resource);
1007	>	#endif
1008	>	#endif
1009	>
1010	>	// Patch native GetNamedResource()
1011	>	upp = ReadMacInt32(0x1484);
1012	>	tvec = ReadMacInt32(upp + 5 * 4);
1013	>	D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1014	>	WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
1015	>	#if EMULATED_PPC
1016	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
1017	>	#else
1018	>	#ifdef __BEOS__
1019	>	tvec2 = (uint32 *)get_named_resource;
1020	>	WriteMacInt32(tvec, tvec2[0]);
1021	>	WriteMacInt32(tvec + 4, tvec2[1]);
1022	>	#else
1023	>	WriteMacInt32(tvec, (uint32)get_named_resource);
1024	>	#endif
1025	>	#endif
1026	>
1027	>	// Patch native Get1NamedResource()
1028	>	upp = ReadMacInt32(0x0e80);
1029	>	tvec = ReadMacInt32(upp + 5 * 4);
1030	>	D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1031	>	WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
1032	>	#if EMULATED_PPC
1033	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
1034	>	#else
1035	>	#ifdef __BEOS__
1036	>	tvec2 = (uint32 *)get_1_named_resource;
1037	>	WriteMacInt32(tvec, tvec2[0]);
1038	>	WriteMacInt32(tvec + 4, tvec2[1]);
1039		#else
1040	<	tvec[0] = (uint32)r_get_resource;
1040	>	WriteMacInt32(tvec, (uint32)get_1_named_resource);
1041		#endif
1042		#endif
1043		}

Diff Legend

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