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.3 by gbeauche, 2003-09-07T14:33:51Z vs.
Revision 1.18 by gbeauche, 2006-05-03T21:53:33Z

#	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 105 | Line 107 | static uint32 find_rsrc_data(const uint8
107		*  Resource patches via vCheckLoad
108		*/
109
110	+	// 680x0 code pattern matching helper
111	+	#define PM(N, V) (p[N] == htons(V))
112	+
113		void CheckLoad(uint32 type, int16 id, uint16 *p, uint32 size)
114		{
115		uint16 *p16;
#	Line 112 | 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 ((uint32)p >= ROM_BASE && (uint32)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 (p[0] == 0x2e49) {
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] = M68K_EMUL_OP_FIX_BOOTSTACK;
129	>	p[0] = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
130		D(bug(" patch 1 applied\n"));
131	<	} else if (p[0] == 0x4267 && p[1] == 0x3f01 && p[2] == 0x3f2a && p[3] == 0x0006 && p[4] == 0x6100) {
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)
133	<	p[7] = M68K_EMUL_OP_NTRB_17_PATCH3;
133	>	p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH3);
134		D(bug(" patch 2 applied\n"));
135	<	} else if (p[0] == 0x3f2a && p[1] == 0x0006 && p[2] == 0x3f2a && p[3] == 0x0002 && p[4] == 0x6100) {
135	>	} else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x6100)) {
136		// Check when ntrb 17 is installed (for native Resource Manager patch) (7.6, 7.6.1, 8.0, 8.1)
137	<	p[7] = M68K_EMUL_OP_NTRB_17_PATCH;
137	>	p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
138		D(bug(" patch 3 applied\n"));
139	<	} else if (p[0] == 0x3f2a && p[1] == 0x0006 && p[2] == 0x3f2a && p[3] == 0x0002 && p[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] = M68K_EMUL_OP_NTRB_17_PATCH;
141	>	p[8] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
142		D(bug(" patch 4 applied\n"));
143	<	} else if (p[0] == 0x0c39 && p[1] == 0x0001 && p[2] == 0xf800 && p[3] == 0x0008 && p[4] == 0x6f00) {
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 8 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)
150	<	p[0] = M68K_NOP;
151	<	p[1] = M68K_NOP;
152	<	p[2] = M68K_NOP;
153	<	p[3] = M68K_NOP;
154	<	p[4] = 0x6000;  // bra
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"));
156	<	} else if (p[0] == 0x2f3c && p[1] == 0x6b72 && p[2] == 0x6e6c && p[3] == 0x4267 && p[4] == 0xa9a0 && p[5] == 0x265f && p[6] == 0x200b && p[7] == 0x6700) {
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)
158	<	p[0] = M68K_NOP;
159	<	p[1] = M68K_NOP;
160	<	p[2] = M68K_NOP;
161	<	p[3] = M68K_NOP;
162	<	p[4] = M68K_NOP;
163	<	p[7] = 0x6000;  // bra
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"));
165	<	} else if (p[0] == 0xa8fe && p[1] == 0x3038 && p[2] == 0x017a && p[3] == 0x0c40 && p[4] == 0x8805 && p[5] == 0x6710) {
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] = 0x6010;  // bra
168	>	p[5] = htons(0x6010);   // bra
169		D(bug(" patch 7 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 169 | Line 185 | void CheckLoad(uint32 type, int16 id, ui
185		static const uint8 dat[] = {0x4e, 0xba, 0x00, 0x9e, 0x3e, 0x00, 0x50, 0x4f, 0x67, 0x04};
186		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
187		if (base) {
188	<	p16 = (uint16 *)((uint32)p + base + 6);
188	>	p16 = (uint16 *)((uintptr)p + base + 6);
189		*p16 = htons(M68K_EMUL_OP_NTRB_17_PATCH2);
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;
210		while (size--) {
211	<	if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x303c && p[3] == 0x0100 && p[4] == 0xc06e && p[5] == 0xfef6) {
211	>	if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x303c) && PM(3,0x0100) && PM(4,0xc06e) && PM(5,0xfef6)) {
212		// Disable VM (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1)
213	<	p[1] = M68K_NOP;
214	<	p[2] = M68K_NOP;
215	<	p[3] = M68K_NOP;
216	<	p[4] = M68K_NOP;
217	<	p[5] = M68K_NOP;
218	<	p[6] = M68K_NOP;
219	<	p[7] = M68K_NOP;
220	<	p[8] = M68K_NOP;
221	<	p[9] = M68K_NOP;
222	<	p[10] = M68K_NOP;
223	<	p[11] = M68K_NOP;
213	>	p[1] = htons(M68K_NOP);
214	>	p[2] = htons(M68K_NOP);
215	>	p[3] = htons(M68K_NOP);
216	>	p[4] = htons(M68K_NOP);
217	>	p[5] = htons(M68K_NOP);
218	>	p[6] = htons(M68K_NOP);
219	>	p[7] = htons(M68K_NOP);
220	>	p[8] = htons(M68K_NOP);
221	>	p[9] = htons(M68K_NOP);
222	>	p[10] = htons(M68K_NOP);
223	>	p[11] = htons(M68K_NOP);
224		D(bug(" patch 1 applied\n"));
225		break;
226	<	} else if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x7000 && p[3] == 0x302e && p[4] == 0xfef6 && p[5] == 0x323c && p[6] == 0x0100) {
226	>	} else if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x7000) && PM(3,0x302e) && PM(4,0xfef6) && PM(5,0x323c) && PM(6,0x0100)) {
227		// Disable VM (8.0, 8.1)
228	<	p[8] = M68K_NOP;
229	<	p[15] = M68K_NOP;
228	>	p[8] = htons(M68K_NOP);
229	>	p[15] = htons(M68K_NOP);
230		D(bug(" patch 2 applied\n"));
231		break;
232	<	} else if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x7000 && p[3] == 0x302e && p[4] == 0xfecc && p[5] == 0x323c && p[6] == 0x0100) {
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)
234	<	p[8] = M68K_NOP;
235	<	p[15] = M68K_NOP;
234	>	p[8] = htons(M68K_NOP);
235	>	p[15] = htons(M68K_NOP);
236		D(bug(" patch 3 applied\n"));
237		break;
238		}
#	Line 213 | Line 243 | void CheckLoad(uint32 type, int16 id, ui
243		D(bug("gpch 16 found\n"));
244		size >>= 1;
245		while (size--) {
246	<	if (p[0] == 0x6700 && p[13] == 0x7013 && p[14] == 0xfe0a) {
246	>	if (PM(0,0x6700) && PM(13,0x7013) && PM(14,0xfe0a)) {
247		// Don't call FE0A in Shutdown Manager (7.6.1, 8.0, 8.1, 8.5)
248	<	p[0] = 0x6000;
248	>	p[0] = htons(0x6000);
249		D(bug(" patch 1 applied\n"));
250		break;
251		}
#	Line 226 | Line 256 | void CheckLoad(uint32 type, int16 id, ui
256		D(bug("gpch 650 found\n"));
257		size >>= 1;
258		while (size--) {
259	<	if (p[0] == 0x6600 && p[1] == 0x001a && p[2] == 0x2278 && p[3] == 0x0134) {
259	>	if (PM(0,0x6600) && PM(1,0x001a) && PM(2,0x2278) && PM(3,0x0134)) {
260		// We don't have SonyVars (7.5.2)
261	<	p[0] = 0x6000;
261	>	p[0] = htons(0x6000);
262		D(bug(" patch 1 applied\n"));
263	<	} else if (p[0] == 0x6618 && p[1] == 0x2278 && p[2] == 0x0134) {
263	>	} else if (PM(0,0x6618) && PM(1,0x2278) && PM(2,0x0134)) {
264		// We don't have SonyVars (7.5.3)
265	<	p[-6] = M68K_NOP;
266	<	p[-3] = M68K_NOP;
267	<	p[0] = 0x6018;
265	>	p[-6] = htons(M68K_NOP);
266	>	p[-3] = htons(M68K_NOP);
267	>	p[0] = htons(0x6018);
268		D(bug(" patch 2 applied\n"));
269	<	} else if (p[0] == 0x666e && p[1] == 0x2278 && p[2] == 0x0134) {
269	>	} else if (PM(0,0x666e) && PM(1,0x2278) && PM(2,0x0134)) {
270		// We don't have SonyVars (7.5.5)
271	<	p[-6] = M68K_NOP;
272	<	p[-3] = M68K_NOP;
273	<	p[0] = 0x606e;
271	>	p[-6] = htons(M68K_NOP);
272	>	p[-3] = htons(M68K_NOP);
273	>	p[0] = htons(0x606e);
274		D(bug(" patch 3 applied\n"));
275	<	} else if (p[0] == 0x6400 && p[1] == 0x011c && p[2] == 0x2278 && p[3] == 0x0134) {
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)
277	<	p[0] = 0x6000;
277	>	p[0] = htons(0x6000);
278		D(bug(" patch 4 applied\n"));
279	<	} else if (p[0] == 0x6400 && p[1] == 0x00e6 && p[2] == 0x2278 && p[3] == 0x0134) {
279	>	} else if (PM(0,0x6400) && PM(1,0x00e6) && PM(2,0x2278) && PM(3,0x0134)) {
280		// We don't have SonyVars (7.6)
281	<	p[0] = 0x6000;
281	>	p[0] = htons(0x6000);
282		D(bug(" patch 5 applied\n"));
283		}
284		p++;
#	Line 258 | Line 288 | void CheckLoad(uint32 type, int16 id, ui
288		D(bug("gpch 655 found\n"));
289		size >>= 1;
290		while (size--) {
291	<	if (p[0] == 0x83a8 && p[1] == 0x0024 && p[2] == 0x4e71) {
291	>	if (PM(0,0x83a8) && PM(1,0x0024) && PM(2,0x4e71)) {
292		// Don't write to GC interrupt mask (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
293	<	p[0] = M68K_NOP;
294	<	p[1] = M68K_NOP;
293	>	p[0] = htons(M68K_NOP);
294	>	p[1] = htons(M68K_NOP);
295		D(bug(" patch 1 applied\n"));
296	<	} else if (p[0] == 0x207c && p[1] == 0xf300 && p[2] == 0x0034) {
296	>	} else if (PM(0,0x207c) && PM(1,0xf300) && PM(2,0x0034)) {
297		// Don't read PowerMac ID (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
298	<	p[0] = 0x303c;          // move.w #id,d0
299	<	p[1] = 0x3020;
300	<	p[2] = M68K_RTS;
298	>	p[0] = htons(0x303c);           // move.w #id,d0
299	>	p[1] = htons(0x3020);
300	>	p[2] = htons(M68K_RTS);
301		D(bug(" patch 2 applied\n"));
302	<	} else if (p[0] == 0x13fc && p[1] == 0x0081 && p[2] == 0xf130 && p[3] == 0xa030) {
302	>	} else if (PM(0,0x13fc) && PM(1,0x0081) && PM(2,0xf130) && PM(3,0xa030)) {
303		// Don't write to hardware (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
304	<	p[0] = M68K_NOP;
305	<	p[1] = M68K_NOP;
306	<	p[2] = M68K_NOP;
307	<	p[3] = M68K_NOP;
304	>	p[0] = htons(M68K_NOP);
305	>	p[1] = htons(M68K_NOP);
306	>	p[2] = htons(M68K_NOP);
307	>	p[3] = htons(M68K_NOP);
308		D(bug(" patch 3 applied\n"));
309	<	} else if (p[0] == 0x4e56 && p[1] == 0x0000 && p[2] == 0x227c && p[3] == 0xf800 && p[4] == 0x0000) {
309	>	} else if (PM(0,0x4e56) && PM(1,0x0000) && PM(2,0x227c) && PM(3,0xf800) && PM(4,0x0000)) {
310		// OpenFirmare? (7.6.1, 8.0, 8.1 with Zanzibar ROM)
311	<	p[0] = M68K_RTS;
311	>	p[0] = htons(M68K_RTS);
312		D(bug(" patch 4 applied\n"));
313	<	} else if (p[0] == 0x4e56 && p[1] == 0xfffc && p[2] == 0x48e7 && p[3] == 0x0300 && p[4] == 0x598f && p[5] == 0x2eb8 && p[6] == 0x01dc) {
313	>	} else if (PM(0,0x4e56) && PM(1,0xfffc) && PM(2,0x48e7) && PM(3,0x0300) && PM(4,0x598f) && PM(5,0x2eb8) && PM(6,0x01dc)) {
314		// Don't write to SCC (7.6.1, 8.0, 8.1 with Zanzibar ROM)
315	<	p[0] = M68K_RTS;
315	>	p[0] = htons(M68K_RTS);
316		D(bug(" patch 5 applied\n"));
317	<	} else if (p[0] == 0x4e56 && p[1] == 0x0000 && p[2] == 0x227c && p[3] == 0xf300 && p[4] == 0x0034) {
317	>	} else if (PM(0,0x4e56) && PM(1,0x0000) && PM(2,0x227c) && PM(3,0xf300) && PM(4,0x0034)) {
318		// Don't write to GC (7.6.1, 8.0, 8.1 with Zanzibar ROM)
319	<	p[0] = M68K_RTS;
319	>	p[0] = htons(M68K_RTS);
320		D(bug(" patch 6 applied\n"));
321	<	} else if (p[0] == 0x40e7 && p[1] == 0x007c && p[2] == 0x0700 && p[3] == 0x48e7 && p[4] == 0x00c0 && p[5] == 0x2078 && p[6] == 0x0dd8 && p[7] == 0xd1e8 && p[8] == 0x0044 && p[9] == 0x8005 && p[11] == 0x93c8 && p[12] == 0x2149 && p[13] == 0x0024) {
321	>	} else if (PM(0,0x40e7) && PM(1,0x007c) && PM(2,0x0700) && PM(3,0x48e7) && PM(4,0x00c0) && PM(5,0x2078) && PM(6,0x0dd8) && PM(7,0xd1e8) && PM(8,0x0044) && PM(9,0x8005) && PM(11,0x93c8) && PM(12,0x2149) && PM(13,0x0024)) {
322		// Don't replace NVRAM routines (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
323	<	p[0] = M68K_RTS;
323	>	p[0] = htons(M68K_RTS);
324		D(bug(" patch 7 applied\n"));
325	<	} else if (p[0] == 0x207c && p[1] == 0x50f1 && p[2] == 0xa101 && (p[3] == 0x08d0 || p[3] == 0x0890)) {
325	>	} else if (PM(0,0x207c) && PM(1,0x50f1) && PM(2,0xa101) && (PM(3,0x08d0) || PM(3,0x0890))) {
326		// Don't write to 0x50f1a101 (8.1 with Zanzibar ROM)
327	<	p[3] = M68K_NOP;
328	<	p[4] = M68K_NOP;
327	>	p[3] = htons(M68K_NOP);
328	>	p[4] = htons(M68K_NOP);
329		D(bug(" patch 8 applied\n"));
330		}
331		p++;
#	Line 305 | Line 335 | void CheckLoad(uint32 type, int16 id, ui
335		D(bug("gpch 750 found\n"));
336		size >>= 1;
337		while (size--) {
338	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
338	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
339		// Don't read from 0xf3019100 (MACE ENET) (7.6, 7.6.1, 8.0, 8.1)
340	<	p[2] = M68K_NOP;
341	<	p[3] = M68K_NOP;
342	<	p[4] = 0x6026;
340	>	p[2] = htons(M68K_NOP);
341	>	p[3] = htons(M68K_NOP);
342	>	p[4] = htons(0x6026);
343		D(bug(" patch 1 applied\n"));
344	<	} else if (p[0] == 0x41e8 && p[1] == 0x0374 && p[2] == 0xfc1e) {
344	>	} else if (PM(0,0x41e8) && PM(1,0x0374) && PM(2,0xfc1e)) {
345		// Don't call FC1E opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
346	<	p[2] = M68K_NOP;
346	>	p[2] = htons(M68K_NOP);
347		D(bug(" patch 2 applied\n"));
348	<	} else if (p[0] == 0x700a && p[1] == 0xfe0a) {
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] = 0x7000;
350	>	p[1] = htons(0x7000);
351		D(bug(" patch 3 applied\n"));
352	<	} else if (p[0] == 0x6c00 && p[1] == 0x016a && p[2] == 0x2278 && p[3] == 0x0134) {
352	>	} else if (PM(0,0x6c00) && PM(1,0x016a) && PM(2,0x2278) && PM(3,0x0134)) {
353		// We don't have SonyVars (8.6)
354	<	p[-4] = 0x21fc; // move.l $40810000,($0000)
355	<	p[-3] = 0x4081;
356	<	p[-2] = 0x0000;
357	<	p[-1] = 0x0000;
358	<	p[0] = 0x6000;
354	>	p[-4] = htons(0x21fc);  // move.l $40810000,($0000)
355	>	p[-3] = htons(0x4081);
356	>	p[-2] = htons(0x0000);
357	>	p[-1] = htons(0x0000);
358	>	p[0] = htons(0x6000);
359		D(bug(" patch 4 applied\n"));
360		}
361		p++;
#	Line 335 | Line 365 | void CheckLoad(uint32 type, int16 id, ui
365		D(bug("gpch 999 found\n"));
366		size >>= 1;
367		while (size--) {
368	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
368	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
369		// Don't read from 0xf3019100 (MACE ENET) (8.5, 8.6)
370	<	p[2] = M68K_NOP;
371	<	p[3] = M68K_NOP;
372	<	p[4] = 0x6026;
370	>	p[2] = htons(M68K_NOP);
371	>	p[3] = htons(M68K_NOP);
372	>	p[4] = htons(0x6026);
373		D(bug(" patch 1 applied\n"));
374		}
375		p++;
#	Line 349 | Line 379 | void CheckLoad(uint32 type, int16 id, ui
379		D(bug("gpch 3000 found\n"));
380		size >>= 1;
381		while (size--) {
382	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
382	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
383		// Don't read from 0xf3019100 (MACE ENET) (8.1 with NewWorld ROM)
384	<	p[2] = M68K_NOP;
385	<	p[3] = M68K_NOP;
386	<	p[4] = 0x6026;
384	>	p[2] = htons(M68K_NOP);
385	>	p[3] = htons(M68K_NOP);
386	>	p[4] = htons(0x6026);
387		D(bug(" patch 1 applied\n"));
388		}
389		p++;
#	Line 364 | Line 394 | void CheckLoad(uint32 type, int16 id, ui
394		#if 1
395		size >>= 1;
396		while (size--) {
397	<	if (p[0] == 0xc2fc && p[1] == 0x0fa0 && p[2] == 0x82c5) {
397	>	if (PM(0,0xc2fc) && PM(1,0x0fa0) && PM(2,0x82c5)) {
398		// Prevent division by 0 in speed test (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
399	<	p[2] = 0x7200;
399	>	p[2] = htons(0x7200);
400		WriteMacInt32(0x1d8, 0x2c00);
401		WriteMacInt32(0x1dc, 0x2c00);
402		D(bug(" patch 1 applied\n"));
403	<	} else if (p[0] == 0x1418 && p[1] == 0x84c1) {
403	>	} else if (PM(0,0x1418) && PM(1,0x84c1)) {
404		// Prevent division by 0 (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
405	<	p[1] = 0x7400;
405	>	p[1] = htons(0x7400);
406		D(bug(" patch 2 applied\n"));
407	<	} else if (p[0] == 0x2678 && p[1] == 0x01dc && p[2] == 0x3018 && p[3] == 0x6708 && p[4] == 0x1680 && p[5] == 0xe058 && p[6] == 0x1680) {
407	>	} else if (PM(0,0x2678) && PM(1,0x01dc) && PM(2,0x3018) && PM(3,0x6708) && PM(4,0x1680) && PM(5,0xe058) && PM(6,0x1680)) {
408		// Don't write to SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
409	<	p[4] = M68K_NOP;
410	<	p[6] = M68K_NOP;
409	>	p[4] = htons(M68K_NOP);
410	>	p[6] = htons(M68K_NOP);
411		D(bug(" patch 3 applied\n"));
412	<	} else if (p[0] == 0x2278 && p[1] == 0x01dc && p[2] == 0x12bc && p[3] == 0x0006 && p[4] == 0x4e71 && p[5] == 0x1292) {
412	>	} else if (PM(0,0x2278) && PM(1,0x01dc) && PM(2,0x12bc) && PM(3,0x0006) && PM(4,0x4e71) && PM(5,0x1292)) {
413		// Don't write to SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
414	<	p[2] = M68K_NOP;
415	<	p[3] = M68K_NOP;
416	<	p[5] = M68K_NOP;
414	>	p[2] = htons(M68K_NOP);
415	>	p[3] = htons(M68K_NOP);
416	>	p[5] = htons(M68K_NOP);
417		D(bug(" patch 4 applied\n"));
418	<	} else if (p[0] == 0x2278 && p[1] == 0x01dc && p[2] == 0x12bc && p[3] == 0x0003 && p[4] == 0x4e71 && p[5] == 0x1281) {
418	>	} else if (PM(0,0x2278) && PM(1,0x01dc) && PM(2,0x12bc) && PM(3,0x0003) && PM(4,0x4e71) && PM(5,0x1281)) {
419		// Don't write to SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
420	<	p[2] = M68K_NOP;
421	<	p[3] = M68K_NOP;
422	<	p[5] = M68K_NOP;
420	>	p[2] = htons(M68K_NOP);
421	>	p[3] = htons(M68K_NOP);
422	>	p[5] = htons(M68K_NOP);
423		D(bug(" patch 5 applied\n"));
424	<	} else if (p[0] == 0x0811 && p[1] == 0x0000 && p[2] == 0x51c8 && p[3] == 0xfffa) {
424	>	} else if (PM(0,0x0811) && PM(1,0x0000) && PM(2,0x51c8) && PM(3,0xfffa)) {
425		// Don't test SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
426	<	p[0] = M68K_NOP;
427	<	p[1] = M68K_NOP;
426	>	p[0] = htons(M68K_NOP);
427	>	p[1] = htons(M68K_NOP);
428		D(bug(" patch 6 applied\n"));
429	<	} else if (p[0] == 0x4a2a && p[1] == 0x063e && p[2] == 0x66fa) {
429	>	} else if (PM(0,0x4a2a) && PM(1,0x063e) && PM(2,0x66fa)) {
430		// Don't wait for SCC (7.5.2, 7.5.3, 7.5.5)
431	<	p[2] = M68K_NOP;
431	>	p[2] = htons(M68K_NOP);
432		D(bug(" patch 7 applied\n"));
433	<	} else if (p[0] == 0x4a2a && p[1] == 0x03a6 && p[2] == 0x66fa) {
433	>	} else if (PM(0,0x4a2a) && PM(1,0x03a6) && PM(2,0x66fa)) {
434		// Don't wait for SCC (7.6, 7.6.1, 8.0, 8.1)
435	<	p[2] = M68K_NOP;
435	>	p[2] = htons(M68K_NOP);
436		D(bug(" patch 8 applied\n"));
437		}
438		p++;
439		}
440		#else
441		// Disable LocalTalk
442	<	p[0] = M68K_JMP_A0;
443	<	p[1] = 0x7000;          // moveq #0,d0
444	<	p[2] = M68K_RTS;
442	>	p[0] = htons(M68K_JMP_A0);
443	>	p[1] = htons(0x7000);           // moveq #0,d0
444	>	p[2] = htons(M68K_RTS);
445		D(bug(" patch 1 applied\n"));
446		#endif
447
448		} else if (type == FOURCC('n','s','r','d') && id == 1) {
449		D(bug("nsrd 1 found\n"));
450	<	if (p[(0x378 + 0x570) >> 1] == 0x7c08 && p[(0x37a + 0x570) >> 1] == 0x02a6) {
450	>	if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) {
451		// Don't overwrite our serial drivers (8.0, 8.1)
452	<	p[(0x378 + 0x570) >> 1] = 0x4e80;               // blr
453	<	p[(0x37a + 0x570) >> 1] = 0x0020;
452	>	p[(0x378 + 0x570) >> 1] = htons(0x4e80);                // blr
453	>	p[(0x37a + 0x570) >> 1] = htons(0x0020);
454		D(bug(" patch 1 applied\n"));
455	<	} else if (p[(0x378 + 0x6c0) >> 1] == 0x7c08 && p[(0x37a + 0x6c0) >> 1] == 0x02a6) {
455	>	} else if (p[(0x378 + 0x6c0) >> 1] == htons(0x7c08) && p[(0x37a + 0x6c0) >> 1] == htons(0x02a6)) {
456		// Don't overwrite our serial drivers (8.5, 8.6)
457	<	p[(0x378 + 0x6c0) >> 1] = 0x4e80;               // blr
458	<	p[(0x37a + 0x6c0) >> 1] = 0x0020;
457	>	p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
458	>	p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
459		D(bug(" patch 2 applied\n"));
460	+	} else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) {
461	+	// Don't overwrite our serial drivers (9.0)
462	+	p[(0x374 + 0x510) >> 1] = htons(0x4e80);                // blr
463	+	p[(0x376 + 0x510) >> 1] = htons(0x0020);
464	+	D(bug(" patch 3 applied\n"));
465		}
466
467		} else if (type == FOURCC('c','i','t','t') && id == 45) {
468		D(bug("citt 45 found\n"));
469		size >>= 1;
470		while (size--) {
471	<	if (p[0] == 0x203c && p[1] == 0x0100 && p[2] == 0x0000 && p[3] == 0xc0ae && p[4] == 0xfffc) {
471	>	if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
472		// Don't replace SCSI Manager (8.1, 8.5, 8.6)
473	<	p[5] = (p[5] & 0xff) | 0x6000;          // beq
473	>	p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);            // beq
474		D(bug(" patch 1 applied\n"));
475		break;
476		}
#	Line 444 | Line 479 | void CheckLoad(uint32 type, int16 id, ui
479
480		} else if (type == FOURCC('t','h','n','g')) {
481		// Collect info about used audio sifters
482	<	uint32 c_type = 0[(uint32 *)p];
483	<	uint32 sub_type = 1[(uint32 *)p];
482	>	uint32 thing = Host2MacAddr((uint8 *)p);
483	>	uint32 c_type = ReadMacInt32(thing);
484	>	uint32 sub_type = ReadMacInt32(thing + 4);
485		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
486	<	1[(uint32 *)p] = FOURCC('a','w','g','c');
486	>	WriteMacInt32(thing + 4, FOURCC('a','w','g','c'));
487		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));
488	<	AddSifter(*(uint32 *)(((uint32)p)+20), p[12]);
489	<	if (p[28])                                                              // componentPFCount
490	<	AddSifter(*(uint32 *)(((uint32)p)+62), p[33]);
488	>	AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID));
489	>	if (ReadMacInt32(thing + componentPFCount))
490	>	AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID));
491		}
492
493		} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) {
494		// Patch audio sifters
495		if (FindSifter(type, id)) {
496		D(bug("sifter found\n"));
497	<	p[0] = 0x4e56; p[1] = 0x0000;   // link a6,#0
498	<	p[2] = 0x48e7; p[3] = 0x8018;   // movem.l d0/a3-a4,-(a7)
499	<	p[4] = 0x266e; p[5] = 0x000c;   // movea.l $c(a6),a3
500	<	p[6] = 0x286e; p[7] = 0x0008;   // movea.l $8(a6),a4
501	<	p[8] = M68K_EMUL_OP_AUDIO_DISPATCH;
502	<	p[9] = 0x2d40; p[10] = 0x0010;  // move.l d0,$10(a6)
503	<	p[11] = 0x4cdf; p[12] = 0x1801; // movem.l (a7)+,d0/a3-a4
504	<	p[13] = 0x4e5e;                                 // unlk a6
505	<	p[14] = 0x4e74; p[15] = 0x0008; // rtd #8
497	>	p[0] = htons(0x4e56); p[1] = htons(0x0000);             // link a6,#0
498	>	p[2] = htons(0x48e7); p[3] = htons(0x8018);             // movem.l d0/a3-a4,-(a7)
499	>	p[4] = htons(0x266e); p[5] = htons(0x000c);             // movea.l $c(a6),a3
500	>	p[6] = htons(0x286e); p[7] = htons(0x0008);             // movea.l $8(a6),a4
501	>	p[8] = htons(M68K_EMUL_OP_AUDIO_DISPATCH);
502	>	p[9] = htons(0x2d40); p[10] = htons(0x0010);    // move.l d0,$10(a6)
503	>	p[11] = htons(0x4cdf); p[12] = htons(0x1801);   // movem.l (a7)+,d0/a3-a4
504	>	p[13] = htons(0x4e5e);                                                  // unlk a6
505	>	p[14] = htons(0x4e74); p[15] = htons(0x0008);   // rtd #8
506		D(bug(" patch applied\n"));
507		}
508
#	Line 480 | Line 516 | void CheckLoad(uint32 type, int16 id, ui
516		D(bug("INIT 1 (size 2416) found\n"));
517		size >>= 1;
518		while (size--) {
519	<	if (p[0] == 0x247c && p[1] == 0xf301 && p[2] == 0x9000) {
519	>	if (PM(0,0x247c) && PM(1,0xf301) && PM(2,0x9000)) {
520		// Prevent "MacOS Licensing Extension" from accessing hardware (7.6)
521	<	p[22] = 0x6028;
521	>	p[22] = htons(0x6028);
522		D(bug(" patch 1 applied\n"));
523		break;
524		}
#	Line 496 | Line 532 | void CheckLoad(uint32 type, int16 id, ui
532		static const uint8 dat[] = {0x4e, 0x56, 0x00, 0x00, 0x48, 0xe7, 0x03, 0x18, 0x2c, 0x2e, 0x00, 0x10};
533		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
534		if (base) {
535	<	p16 = (uint16 *)((uint32)p + base);
536	<	p16[0] = 0x7000;        // moveq #0,d0
537	<	p16[1] = M68K_RTS;
535	>	p16 = (uint16 *)((uintptr)p + base);
536	>	p16[0] = htons(0x7000); // moveq #0,d0
537	>	p16[1] = htons(M68K_RTS);
538	>	D(bug(" patch 1 applied\n"));
539	>	}
540	>
541	>	} else if (type == FOURCC('N','O','b','j') && id == 100) {
542	>	D(bug("NObj 100 found\n"));
543	>
544	>	// Don't access VIA registers in MacBench 5.0
545	>	static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
546	>	base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
547	>	if (base) {
548	>	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
549	>	p[(base + 0x02) >> 1] = htons(0x0000);
550	>	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
551	>	p[(base + 0x06) >> 1] = htons(0x0020);
552		D(bug(" patch 1 applied\n"));
553		}
554	+	static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
555	+	base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
556	+	if (base) {
557	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
558	+	p[(base + 0x02) >> 1] = htons(0x0000);
559	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
560	+	p[(base + 0x06) >> 1] = htons(0x0020);
561	+	D(bug(" patch 2 applied\n"));
562	+	}
563	+
564	+	} else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) {
565	+	D(bug("CODE 27 found [Apple Personal Diagnostics]\n"));
566	+
567	+	// Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9)
568	+	// FIXME: this should not be called in the first place, use UTResolveFCB?
569	+	static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8};
570	+	base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
571	+	if (base
572	+	&& ReadMacInt16(0x3f6) == 4 /* FSFCBLen */
573	+	&& p[(base + 0x1a) >> 1] == htons(0x605e)
574	+	&& p[(base + 0x80) >> 1] == htons(0x7000))
575	+	{
576	+	p[(base + 0x1a) >> 1] = htons(0x6064);
577	+	D(bug(" patch1 applied\n"));
578	+	}
579	+	}
580	+	}
581	+
582	+
583	+	/*
584	+	*  Resource patches via GetNamedResource() and Get1NamedResource()
585	+	*/
586	+
587	+	void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
588	+	{
589	+	uint16 *p16;
590	+	uint32 base;
591	+	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));
592	+
593	+	// Don't modify resources in ROM
594	+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
595	+	return;
596	+
597	+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
598	+	D(bug(" DRVR .AFPTranslator found\n"));
599	+
600	+	// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
601	+	static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
602	+	base = find_rsrc_data(p, size, dat, sizeof(dat));
603	+	if (base) {
604	+	p16 = (uint16 *)(p + base + 4);
605	+	*p16++ = htons(0x303c);         // move.l       #ROM85,%d0
606	+	*p16++ = htons(0x028e);
607	+	*p16++ = htons(M68K_NOP);
608	+	*p16++ = htons(M68K_NOP);
609	+	D(bug("  patch 1 applied\n"));
610	+	}
611		}
612		}
613
#	Line 514 | Line 621 | static
621		#else
622		extern "C"
623		#endif
624	<	void check_load_invoc(uint32 type, int16 id, uint16 **h)
624	>	void check_load_invoc(uint32 type, int16 id, uint32 h)
625		{
626	<	if (h == NULL)
626	>	if (h == 0)
627		return;
628	<	uint16 *p = *h;
629	<	if (p == NULL)
628	>	uint32 p = ReadMacInt32(h);
629	>	if (p == 0)
630		return;
631	<	uint32 size = ((uint32 *)p)[-2] & 0xffffff;
631	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
632
633	<	CheckLoad(type, id, p, size);
633	>	CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
634	>	}
635	>
636	>	#ifdef __BEOS__
637	>	static
638	>	#else
639	>	extern "C"
640	>	#endif
641	>	void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
642	>	{
643	>	if (h == 0)
644	>	return;
645	>	uint32 p = ReadMacInt32(h);
646	>	if (p == 0)
647	>	return;
648	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
649	>
650	>	CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
651		}
652
653		#ifdef __BEOS__
#	Line 691 | Line 815 | static asm void **r_get_resource(registe
815		addi    r1,r1,56+12
816		blr
817		}
818	+
819	+	static asm void **get_named_resource(register uint32 type, register uint32 name)
820	+	{
821	+	// Create stack frame
822	+	mflr    r0
823	+	stw             r0,8(r1)
824	+	stwu    r1,-(56+12)(r1)
825	+
826	+	// Save type/ID
827	+	stw             r3,56(r1)
828	+	stw             r4,56+4(r1)
829	+
830	+	// Call old routine
831	+	lwz             r0,XLM_GET_NAMED_RESOURCE
832	+	lwz             r2,XLM_RES_LIB_TOC
833	+	mtctr   r0
834	+	bctrl
835	+	lwz             r2,XLM_TOC              // Get TOC
836	+	stw             r3,56+8(r1)             // Save handle
837	+
838	+	// Call CheckLoad
839	+	lwz             r3,56(r1)
840	+	lwz             r4,56+4(r1)
841	+	lwz             r5,56+8(r1)
842	+	bl              named_check_load_invoc
843	+	lwz             r3,56+8(r1)             // Restore handle
844	+
845	+	// Return to caller
846	+	lwz             r0,56+12+8(r1)
847	+	mtlr    r0
848	+	addi    r1,r1,56+12
849	+	blr
850	+	}
851	+
852	+	static asm void **get_1_named_resource(register uint32 type, register uint32 name)
853	+	{
854	+	// Create stack frame
855	+	mflr    r0
856	+	stw             r0,8(r1)
857	+	stwu    r1,-(56+12)(r1)
858	+
859	+	// Save type/ID
860	+	stw             r3,56(r1)
861	+	stw             r4,56+4(r1)
862	+
863	+	// Call old routine
864	+	lwz             r0,XLM_GET_1_NAMED_RESOURCE
865	+	lwz             r2,XLM_RES_LIB_TOC
866	+	mtctr   r0
867	+	bctrl
868	+	lwz             r2,XLM_TOC              // Get TOC
869	+	stw             r3,56+8(r1)             // Save handle
870	+
871	+	// Call CheckLoad
872	+	lwz             r3,56(r1)
873	+	lwz             r4,56+4(r1)
874	+	lwz             r5,56+8(r1)
875	+	bl              named_check_load_invoc
876	+	lwz             r3,56+8(r1)             // Restore handle
877	+
878	+	// Return to caller
879	+	lwz             r0,56+12+8(r1)
880	+	mtlr    r0
881	+	addi    r1,r1,56+12
882	+	blr
883	+	}
884		#else
885		// Routines in asm_linux.S
886		extern "C" void get_resource(void);
#	Line 698 | Line 888 | extern "C" void get_1_resource(void);
888		extern "C" void get_ind_resource(void);
889		extern "C" void get_1_ind_resource(void);
890		extern "C" void r_get_resource(void);
891	+	extern "C" void get_named_resource(void);
892	+	extern "C" void get_1_named_resource(void);
893		#endif
894
895		void PatchNativeResourceManager(void)
#	Line 705 | Line 897 | void PatchNativeResourceManager(void)
897		D(bug("PatchNativeResourceManager\n"));
898
899		// Patch native GetResource()
900	<	uint32 **upp = (uint32 **)(uintptr)ReadMacInt32(0x1480);
901	<	if (((uint32)upp & 0xffc00000) == ROM_BASE)
900	>	uint32 upp = ReadMacInt32(0x1480);
901	>	if ((upp & 0xffc00000) == ROM_BASE)
902		return;
903	<	uint32 *tvec = upp[5];
904	<	D(bug(" GetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
905	<	*(uint32 *)XLM_RES_LIB_TOC = tvec[1];
906	<	*(uint32 *)XLM_GET_RESOURCE = tvec[0];
903	>	uint32 tvec = ReadMacInt32(upp + 5 * 4);
904	>	D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
905	>	WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
906	>	WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
907		#if EMULATED_PPC
908	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_RESOURCE);
908	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
909		#else
910		#ifdef __BEOS__
911		uint32 *tvec2 = (uint32 *)get_resource;
912	<	tvec[0] = tvec2[0];
913	<	tvec[1] = tvec2[1];
912	>	WriteMacInt32(tvec, tvec2[0]);
913	>	WriteMacInt32(tvec + 4, tvec2[1]);
914		#else
915	<	tvec[0] = (uint32)get_resource;
915	>	WriteMacInt32(tvec, (uint32)get_resource);
916		#endif
917		#endif
918
919		// Patch native Get1Resource()
920	<	upp = *(uint32 ***)0xe7c;
921	<	tvec = upp[5];
922	<	D(bug(" Get1Resource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
923	<	*(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
920	>	upp = ReadMacInt32(0x0e7c);
921	>	tvec = ReadMacInt32(upp + 5 * 4);
922	>	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
923	>	WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
924		#if EMULATED_PPC
925	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_RESOURCE);
925	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
926		#else
927		#ifdef __BEOS__
928		tvec2 = (uint32 *)get_1_resource;
929	<	tvec[0] = tvec2[0];
930	<	tvec[1] = tvec2[1];
929	>	WriteMacInt32(tvec, tvec2[0]);
930	>	WriteMacInt32(tvec + 4, tvec2[1]);
931		#else
932	<	tvec[0] = (uint32)get_1_resource;
932	>	WriteMacInt32(tvec, (uint32)get_1_resource);
933		#endif
934		#endif
935
936		// Patch native GetIndResource()
937	<	upp = *(uint32 ***)0x1474;
938	<	tvec = upp[5];
939	<	D(bug(" GetIndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
940	<	*(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
937	>	upp = ReadMacInt32(0x1474);
938	>	tvec = ReadMacInt32(upp + 5 * 4);
939	>	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
940	>	WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
941		#if EMULATED_PPC
942	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_IND_RESOURCE);
942	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
943		#else
944		#ifdef __BEOS__
945		tvec2 = (uint32 *)get_ind_resource;
946	<	tvec[0] = tvec2[0];
947	<	tvec[1] = tvec2[1];
946	>	WriteMacInt32(tvec, tvec2[0]);
947	>	WriteMacInt32(tvec + 4, tvec2[1]);
948		#else
949	<	tvec[0] = (uint32)get_ind_resource;
949	>	WriteMacInt32(tvec, (uint32)get_ind_resource);
950		#endif
951		#endif
952
953		// Patch native Get1IndResource()
954	<	upp = *(uint32 ***)0xe38;
955	<	tvec = upp[5];
956	<	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
957	<	*(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
954	>	upp = ReadMacInt32(0x0e38);
955	>	tvec = ReadMacInt32(upp + 5 * 4);
956	>	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
957	>	WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
958		#if EMULATED_PPC
959	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_IND_RESOURCE);
959	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
960		#else
961		#ifdef __BEOS__
962		tvec2 = (uint32 *)get_1_ind_resource;
963	<	tvec[0] = tvec2[0];
964	<	tvec[1] = tvec2[1];
963	>	WriteMacInt32(tvec, tvec2[0]);
964	>	WriteMacInt32(tvec + 4, tvec2[1]);
965		#else
966	<	tvec[0] = (uint32)get_1_ind_resource;
966	>	WriteMacInt32(tvec, (uint32)get_1_ind_resource);
967		#endif
968		#endif
969
970		// Patch native RGetResource()
971	<	upp = *(uint32 ***)0xe30;
972	<	tvec = upp[5];
973	<	D(bug(" RGetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
974	<	*(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
971	>	upp = ReadMacInt32(0x0e30);
972	>	tvec = ReadMacInt32(upp + 5 * 4);
973	>	D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
974	>	WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
975		#if EMULATED_PPC
976	<	tvec[0] = POWERPC_NATIVE_OP_FUNC(NATIVE_R_GET_RESOURCE);
976	>	WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
977		#else
978		#ifdef __BEOS__
979		tvec2 = (uint32 *)r_get_resource;
980	<	tvec[0] = tvec2[0];
981	<	tvec[1] = tvec2[1];
980	>	WriteMacInt32(tvec, tvec2[0]);
981	>	WriteMacInt32(tvec + 4, tvec2[1]);
982	>	#else
983	>	WriteMacInt32(tvec, (uint32)r_get_resource);
984	>	#endif
985	>	#endif
986	>
987	>	// Patch native GetNamedResource()
988	>	upp = ReadMacInt32(0x1484);
989	>	tvec = ReadMacInt32(upp + 5 * 4);
990	>	D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
991	>	WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
992	>	#if EMULATED_PPC
993	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
994	>	#else
995	>	#ifdef __BEOS__
996	>	tvec2 = (uint32 *)get_named_resource;
997	>	WriteMacInt32(tvec, tvec2[0]);
998	>	WriteMacInt32(tvec + 4, tvec2[1]);
999	>	#else
1000	>	WriteMacInt32(tvec, (uint32)get_named_resource);
1001	>	#endif
1002	>	#endif
1003	>
1004	>	// Patch native Get1NamedResource()
1005	>	upp = ReadMacInt32(0x0e80);
1006	>	tvec = ReadMacInt32(upp + 5 * 4);
1007	>	D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1008	>	WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
1009	>	#if EMULATED_PPC
1010	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
1011	>	#else
1012	>	#ifdef __BEOS__
1013	>	tvec2 = (uint32 *)get_1_named_resource;
1014	>	WriteMacInt32(tvec, tvec2[0]);
1015	>	WriteMacInt32(tvec + 4, tvec2[1]);
1016		#else
1017	<	tvec[0] = (uint32)r_get_resource;
1017	>	WriteMacInt32(tvec, (uint32)get_1_named_resource);
1018		#endif
1019		#endif
1020		}

Diff Legend

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