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.2 by gbeauche, 2003-04-12T10:14:07Z vs.
Revision 1.15 by gbeauche, 2005-01-30T21:48:19Z

#	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		}
#	Line 169 | Line 179 | void CheckLoad(uint32 type, int16 id, ui
179		static const uint8 dat[] = {0x4e, 0xba, 0x00, 0x9e, 0x3e, 0x00, 0x50, 0x4f, 0x67, 0x04};
180		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
181		if (base) {
182	<	p16 = (uint16 *)((uint32)p + base + 6);
182	>	p16 = (uint16 *)((uintptr)p + base + 6);
183		*p16 = htons(M68K_EMUL_OP_NTRB_17_PATCH2);
184		D(bug(" patch 1 applied\n"));
185		}
186
187	+	} else if (type == FOURCC('p','t','c','h') && id == 156) {
188	+	D(bug("ptch 156 found\n"));
189	+	size >>= 1;
190	+	while (size--) {
191	+	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)) {
192	+	// Don't call FE0A opcode (9.0)
193	+	p[0] = htons(0x7000);           // moveq #0,d0
194	+	p[1] = htons(M68K_RTS);
195	+	D(bug(" patch 1 applied\n"));
196	+	break;
197	+	}
198	+	p++;
199	+	}
200	+
201		} else if (type == FOURCC('p','t','c','h') && id == 420) {
202		D(bug("ptch 420 found\n"));
203		size >>= 1;
204		while (size--) {
205	<	if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x303c && p[3] == 0x0100 && p[4] == 0xc06e && p[5] == 0xfef6) {
205	>	if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x303c) && PM(3,0x0100) && PM(4,0xc06e) && PM(5,0xfef6)) {
206		// Disable VM (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1)
207	<	p[1] = M68K_NOP;
208	<	p[2] = M68K_NOP;
209	<	p[3] = M68K_NOP;
210	<	p[4] = M68K_NOP;
211	<	p[5] = M68K_NOP;
212	<	p[6] = M68K_NOP;
213	<	p[7] = M68K_NOP;
214	<	p[8] = M68K_NOP;
215	<	p[9] = M68K_NOP;
216	<	p[10] = M68K_NOP;
217	<	p[11] = M68K_NOP;
207	>	p[1] = htons(M68K_NOP);
208	>	p[2] = htons(M68K_NOP);
209	>	p[3] = htons(M68K_NOP);
210	>	p[4] = htons(M68K_NOP);
211	>	p[5] = htons(M68K_NOP);
212	>	p[6] = htons(M68K_NOP);
213	>	p[7] = htons(M68K_NOP);
214	>	p[8] = htons(M68K_NOP);
215	>	p[9] = htons(M68K_NOP);
216	>	p[10] = htons(M68K_NOP);
217	>	p[11] = htons(M68K_NOP);
218		D(bug(" patch 1 applied\n"));
219		break;
220	<	} else if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x7000 && p[3] == 0x302e && p[4] == 0xfef6 && p[5] == 0x323c && p[6] == 0x0100) {
220	>	} else if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x7000) && PM(3,0x302e) && PM(4,0xfef6) && PM(5,0x323c) && PM(6,0x0100)) {
221		// Disable VM (8.0, 8.1)
222	<	p[8] = M68K_NOP;
223	<	p[15] = M68K_NOP;
222	>	p[8] = htons(M68K_NOP);
223	>	p[15] = htons(M68K_NOP);
224		D(bug(" patch 2 applied\n"));
225		break;
226	<	} else if (p[0] == 0xa030 && p[1] == 0x5240 && p[2] == 0x7000 && p[3] == 0x302e && p[4] == 0xfecc && p[5] == 0x323c && p[6] == 0x0100) {
226	>	} else if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x7000) && PM(3,0x302e) && PM(4,0xfecc) && PM(5,0x323c) && PM(6,0x0100)) {
227		// Disable VM (8.5, 8.6)
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 3 applied\n"));
231		break;
232		}
#	Line 213 | Line 237 | void CheckLoad(uint32 type, int16 id, ui
237		D(bug("gpch 16 found\n"));
238		size >>= 1;
239		while (size--) {
240	<	if (p[0] == 0x6700 && p[13] == 0x7013 && p[14] == 0xfe0a) {
240	>	if (PM(0,0x6700) && PM(13,0x7013) && PM(14,0xfe0a)) {
241		// Don't call FE0A in Shutdown Manager (7.6.1, 8.0, 8.1, 8.5)
242	<	p[0] = 0x6000;
242	>	p[0] = htons(0x6000);
243		D(bug(" patch 1 applied\n"));
244		break;
245		}
#	Line 226 | Line 250 | void CheckLoad(uint32 type, int16 id, ui
250		D(bug("gpch 650 found\n"));
251		size >>= 1;
252		while (size--) {
253	<	if (p[0] == 0x6600 && p[1] == 0x001a && p[2] == 0x2278 && p[3] == 0x0134) {
253	>	if (PM(0,0x6600) && PM(1,0x001a) && PM(2,0x2278) && PM(3,0x0134)) {
254		// We don't have SonyVars (7.5.2)
255	<	p[0] = 0x6000;
255	>	p[0] = htons(0x6000);
256		D(bug(" patch 1 applied\n"));
257	<	} else if (p[0] == 0x6618 && p[1] == 0x2278 && p[2] == 0x0134) {
257	>	} else if (PM(0,0x6618) && PM(1,0x2278) && PM(2,0x0134)) {
258		// We don't have SonyVars (7.5.3)
259	<	p[-6] = M68K_NOP;
260	<	p[-3] = M68K_NOP;
261	<	p[0] = 0x6018;
259	>	p[-6] = htons(M68K_NOP);
260	>	p[-3] = htons(M68K_NOP);
261	>	p[0] = htons(0x6018);
262		D(bug(" patch 2 applied\n"));
263	<	} else if (p[0] == 0x666e && p[1] == 0x2278 && p[2] == 0x0134) {
263	>	} else if (PM(0,0x666e) && PM(1,0x2278) && PM(2,0x0134)) {
264		// We don't have SonyVars (7.5.5)
265	<	p[-6] = M68K_NOP;
266	<	p[-3] = M68K_NOP;
267	<	p[0] = 0x606e;
265	>	p[-6] = htons(M68K_NOP);
266	>	p[-3] = htons(M68K_NOP);
267	>	p[0] = htons(0x606e);
268		D(bug(" patch 3 applied\n"));
269	<	} else if (p[0] == 0x6400 && p[1] == 0x011c && p[2] == 0x2278 && p[3] == 0x0134) {
269	>	} else if (PM(0,0x6400) && PM(1,0x011c) && PM(2,0x2278) && PM(3,0x0134)) {
270		// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6)
271	<	p[0] = 0x6000;
271	>	p[0] = htons(0x6000);
272		D(bug(" patch 4 applied\n"));
273	<	} else if (p[0] == 0x6400 && p[1] == 0x00e6 && p[2] == 0x2278 && p[3] == 0x0134) {
273	>	} else if (PM(0,0x6400) && PM(1,0x00e6) && PM(2,0x2278) && PM(3,0x0134)) {
274		// We don't have SonyVars (7.6)
275	<	p[0] = 0x6000;
275	>	p[0] = htons(0x6000);
276		D(bug(" patch 5 applied\n"));
277		}
278		p++;
#	Line 258 | Line 282 | void CheckLoad(uint32 type, int16 id, ui
282		D(bug("gpch 655 found\n"));
283		size >>= 1;
284		while (size--) {
285	<	if (p[0] == 0x83a8 && p[1] == 0x0024 && p[2] == 0x4e71) {
285	>	if (PM(0,0x83a8) && PM(1,0x0024) && PM(2,0x4e71)) {
286		// Don't write to GC interrupt mask (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
287	<	p[0] = M68K_NOP;
288	<	p[1] = M68K_NOP;
287	>	p[0] = htons(M68K_NOP);
288	>	p[1] = htons(M68K_NOP);
289		D(bug(" patch 1 applied\n"));
290	<	} else if (p[0] == 0x207c && p[1] == 0xf300 && p[2] == 0x0034) {
290	>	} else if (PM(0,0x207c) && PM(1,0xf300) && PM(2,0x0034)) {
291		// Don't read PowerMac ID (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
292	<	p[0] = 0x303c;          // move.w #id,d0
293	<	p[1] = 0x3020;
294	<	p[2] = M68K_RTS;
292	>	p[0] = htons(0x303c);           // move.w #id,d0
293	>	p[1] = htons(0x3020);
294	>	p[2] = htons(M68K_RTS);
295		D(bug(" patch 2 applied\n"));
296	<	} else if (p[0] == 0x13fc && p[1] == 0x0081 && p[2] == 0xf130 && p[3] == 0xa030) {
296	>	} else if (PM(0,0x13fc) && PM(1,0x0081) && PM(2,0xf130) && PM(3,0xa030)) {
297		// Don't write to hardware (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
298	<	p[0] = M68K_NOP;
299	<	p[1] = M68K_NOP;
300	<	p[2] = M68K_NOP;
301	<	p[3] = M68K_NOP;
298	>	p[0] = htons(M68K_NOP);
299	>	p[1] = htons(M68K_NOP);
300	>	p[2] = htons(M68K_NOP);
301	>	p[3] = htons(M68K_NOP);
302		D(bug(" patch 3 applied\n"));
303	<	} else if (p[0] == 0x4e56 && p[1] == 0x0000 && p[2] == 0x227c && p[3] == 0xf800 && p[4] == 0x0000) {
303	>	} else if (PM(0,0x4e56) && PM(1,0x0000) && PM(2,0x227c) && PM(3,0xf800) && PM(4,0x0000)) {
304		// OpenFirmare? (7.6.1, 8.0, 8.1 with Zanzibar ROM)
305	<	p[0] = M68K_RTS;
305	>	p[0] = htons(M68K_RTS);
306		D(bug(" patch 4 applied\n"));
307	<	} else if (p[0] == 0x4e56 && p[1] == 0xfffc && p[2] == 0x48e7 && p[3] == 0x0300 && p[4] == 0x598f && p[5] == 0x2eb8 && p[6] == 0x01dc) {
307	>	} else if (PM(0,0x4e56) && PM(1,0xfffc) && PM(2,0x48e7) && PM(3,0x0300) && PM(4,0x598f) && PM(5,0x2eb8) && PM(6,0x01dc)) {
308		// Don't write to SCC (7.6.1, 8.0, 8.1 with Zanzibar ROM)
309	<	p[0] = M68K_RTS;
309	>	p[0] = htons(M68K_RTS);
310		D(bug(" patch 5 applied\n"));
311	<	} else if (p[0] == 0x4e56 && p[1] == 0x0000 && p[2] == 0x227c && p[3] == 0xf300 && p[4] == 0x0034) {
311	>	} else if (PM(0,0x4e56) && PM(1,0x0000) && PM(2,0x227c) && PM(3,0xf300) && PM(4,0x0034)) {
312		// Don't write to GC (7.6.1, 8.0, 8.1 with Zanzibar ROM)
313	<	p[0] = M68K_RTS;
313	>	p[0] = htons(M68K_RTS);
314		D(bug(" patch 6 applied\n"));
315	<	} 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) {
315	>	} 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)) {
316		// Don't replace NVRAM routines (7.6, 7.6.1, 8.0, 8.1 with Zanzibar ROM)
317	<	p[0] = M68K_RTS;
317	>	p[0] = htons(M68K_RTS);
318		D(bug(" patch 7 applied\n"));
319	<	} else if (p[0] == 0x207c && p[1] == 0x50f1 && p[2] == 0xa101 && (p[3] == 0x08d0 || p[3] == 0x0890)) {
319	>	} else if (PM(0,0x207c) && PM(1,0x50f1) && PM(2,0xa101) && (PM(3,0x08d0) || PM(3,0x0890))) {
320		// Don't write to 0x50f1a101 (8.1 with Zanzibar ROM)
321	<	p[3] = M68K_NOP;
322	<	p[4] = M68K_NOP;
321	>	p[3] = htons(M68K_NOP);
322	>	p[4] = htons(M68K_NOP);
323		D(bug(" patch 8 applied\n"));
324		}
325		p++;
#	Line 305 | Line 329 | void CheckLoad(uint32 type, int16 id, ui
329		D(bug("gpch 750 found\n"));
330		size >>= 1;
331		while (size--) {
332	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
332	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
333		// Don't read from 0xf3019100 (MACE ENET) (7.6, 7.6.1, 8.0, 8.1)
334	<	p[2] = M68K_NOP;
335	<	p[3] = M68K_NOP;
336	<	p[4] = 0x6026;
334	>	p[2] = htons(M68K_NOP);
335	>	p[3] = htons(M68K_NOP);
336	>	p[4] = htons(0x6026);
337		D(bug(" patch 1 applied\n"));
338	<	} else if (p[0] == 0x41e8 && p[1] == 0x0374 && p[2] == 0xfc1e) {
338	>	} else if (PM(0,0x41e8) && PM(1,0x0374) && PM(2,0xfc1e)) {
339		// Don't call FC1E opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
340	<	p[2] = M68K_NOP;
340	>	p[2] = htons(M68K_NOP);
341		D(bug(" patch 2 applied\n"));
342	<	} else if (p[0] == 0x700a && p[1] == 0xfe0a) {
342	>	} else if (PM(0,0x700a) && PM(1,0xfe0a)) {
343		// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
344	<	p[1] = 0x7000;
344	>	p[1] = htons(0x7000);
345		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"));
354		}
355		p++;
356		}
#	Line 327 | Line 359 | void CheckLoad(uint32 type, int16 id, ui
359		D(bug("gpch 999 found\n"));
360		size >>= 1;
361		while (size--) {
362	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
362	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
363		// Don't read from 0xf3019100 (MACE ENET) (8.5, 8.6)
364	<	p[2] = M68K_NOP;
365	<	p[3] = M68K_NOP;
366	<	p[4] = 0x6026;
364	>	p[2] = htons(M68K_NOP);
365	>	p[3] = htons(M68K_NOP);
366	>	p[4] = htons(0x6026);
367		D(bug(" patch 1 applied\n"));
368		}
369		p++;
#	Line 341 | Line 373 | void CheckLoad(uint32 type, int16 id, ui
373		D(bug("gpch 3000 found\n"));
374		size >>= 1;
375		while (size--) {
376	<	if (p[0] == 0xf301 && p[1] == 0x9100 && p[2] == 0x0c11 && p[3] == 0x0044) {
376	>	if (PM(0,0xf301) && PM(1,0x9100) && PM(2,0x0c11) && PM(3,0x0044)) {
377		// Don't read from 0xf3019100 (MACE ENET) (8.1 with NewWorld ROM)
378	<	p[2] = M68K_NOP;
379	<	p[3] = M68K_NOP;
380	<	p[4] = 0x6026;
378	>	p[2] = htons(M68K_NOP);
379	>	p[3] = htons(M68K_NOP);
380	>	p[4] = htons(0x6026);
381		D(bug(" patch 1 applied\n"));
382		}
383		p++;
#	Line 356 | Line 388 | void CheckLoad(uint32 type, int16 id, ui
388		#if 1
389		size >>= 1;
390		while (size--) {
391	<	if (p[0] == 0xc2fc && p[1] == 0x0fa0 && p[2] == 0x82c5) {
391	>	if (PM(0,0xc2fc) && PM(1,0x0fa0) && PM(2,0x82c5)) {
392		// 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)
393	<	p[2] = 0x7200;
393	>	p[2] = htons(0x7200);
394		WriteMacInt32(0x1d8, 0x2c00);
395		WriteMacInt32(0x1dc, 0x2c00);
396		D(bug(" patch 1 applied\n"));
397	<	} else if (p[0] == 0x1418 && p[1] == 0x84c1) {
397	>	} else if (PM(0,0x1418) && PM(1,0x84c1)) {
398		// Prevent division by 0 (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
399	<	p[1] = 0x7400;
399	>	p[1] = htons(0x7400);
400		D(bug(" patch 2 applied\n"));
401	<	} else if (p[0] == 0x2678 && p[1] == 0x01dc && p[2] == 0x3018 && p[3] == 0x6708 && p[4] == 0x1680 && p[5] == 0xe058 && p[6] == 0x1680) {
401	>	} else if (PM(0,0x2678) && PM(1,0x01dc) && PM(2,0x3018) && PM(3,0x6708) && PM(4,0x1680) && PM(5,0xe058) && PM(6,0x1680)) {
402		// Don't write to SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
403	<	p[4] = M68K_NOP;
404	<	p[6] = M68K_NOP;
403	>	p[4] = htons(M68K_NOP);
404	>	p[6] = htons(M68K_NOP);
405		D(bug(" patch 3 applied\n"));
406	<	} else if (p[0] == 0x2278 && p[1] == 0x01dc && p[2] == 0x12bc && p[3] == 0x0006 && p[4] == 0x4e71 && p[5] == 0x1292) {
406	>	} else if (PM(0,0x2278) && PM(1,0x01dc) && PM(2,0x12bc) && PM(3,0x0006) && PM(4,0x4e71) && PM(5,0x1292)) {
407		// Don't write to SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
408	<	p[2] = M68K_NOP;
409	<	p[3] = M68K_NOP;
410	<	p[5] = M68K_NOP;
408	>	p[2] = htons(M68K_NOP);
409	>	p[3] = htons(M68K_NOP);
410	>	p[5] = htons(M68K_NOP);
411		D(bug(" patch 4 applied\n"));
412	<	} else if (p[0] == 0x2278 && p[1] == 0x01dc && p[2] == 0x12bc && p[3] == 0x0003 && p[4] == 0x4e71 && p[5] == 0x1281) {
412	>	} else if (PM(0,0x2278) && PM(1,0x01dc) && PM(2,0x12bc) && PM(3,0x0003) && PM(4,0x4e71) && PM(5,0x1281)) {
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 5 applied\n"));
418	<	} else if (p[0] == 0x0811 && p[1] == 0x0000 && p[2] == 0x51c8 && p[3] == 0xfffa) {
418	>	} else if (PM(0,0x0811) && PM(1,0x0000) && PM(2,0x51c8) && PM(3,0xfffa)) {
419		// Don't test SCC (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1)
420	<	p[0] = M68K_NOP;
421	<	p[1] = M68K_NOP;
420	>	p[0] = htons(M68K_NOP);
421	>	p[1] = htons(M68K_NOP);
422		D(bug(" patch 6 applied\n"));
423	<	} else if (p[0] == 0x4a2a && p[1] == 0x063e && p[2] == 0x66fa) {
423	>	} else if (PM(0,0x4a2a) && PM(1,0x063e) && PM(2,0x66fa)) {
424		// Don't wait for SCC (7.5.2, 7.5.3, 7.5.5)
425	<	p[2] = M68K_NOP;
425	>	p[2] = htons(M68K_NOP);
426		D(bug(" patch 7 applied\n"));
427	<	} else if (p[0] == 0x4a2a && p[1] == 0x03a6 && p[2] == 0x66fa) {
427	>	} else if (PM(0,0x4a2a) && PM(1,0x03a6) && PM(2,0x66fa)) {
428		// Don't wait for SCC (7.6, 7.6.1, 8.0, 8.1)
429	<	p[2] = M68K_NOP;
429	>	p[2] = htons(M68K_NOP);
430		D(bug(" patch 8 applied\n"));
431		}
432		p++;
433		}
434		#else
435		// Disable LocalTalk
436	<	p[0] = M68K_JMP_A0;
437	<	p[1] = 0x7000;          // moveq #0,d0
438	<	p[2] = M68K_RTS;
436	>	p[0] = htons(M68K_JMP_A0);
437	>	p[1] = htons(0x7000);           // moveq #0,d0
438	>	p[2] = htons(M68K_RTS);
439		D(bug(" patch 1 applied\n"));
440		#endif
441
442		} else if (type == FOURCC('n','s','r','d') && id == 1) {
443		D(bug("nsrd 1 found\n"));
444	<	if (p[(0x378 + 0x570) >> 1] == 0x7c08 && p[(0x37a + 0x570) >> 1] == 0x02a6) {
444	>	if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) {
445		// Don't overwrite our serial drivers (8.0, 8.1)
446	<	p[(0x378 + 0x570) >> 1] = 0x4e80;               // blr
447	<	p[(0x37a + 0x570) >> 1] = 0x0020;
446	>	p[(0x378 + 0x570) >> 1] = htons(0x4e80);                // blr
447	>	p[(0x37a + 0x570) >> 1] = htons(0x0020);
448		D(bug(" patch 1 applied\n"));
449	<	} else if (p[(0x378 + 0x6c0) >> 1] == 0x7c08 && p[(0x37a + 0x6c0) >> 1] == 0x02a6) {
449	>	} else if (p[(0x378 + 0x6c0) >> 1] == htons(0x7c08) && p[(0x37a + 0x6c0) >> 1] == htons(0x02a6)) {
450		// Don't overwrite our serial drivers (8.5, 8.6)
451	<	p[(0x378 + 0x6c0) >> 1] = 0x4e80;               // blr
452	<	p[(0x37a + 0x6c0) >> 1] = 0x0020;
451	>	p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
452	>	p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
453		D(bug(" patch 2 applied\n"));
454	+	} else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) {
455	+	// Don't overwrite our serial drivers (9.0)
456	+	p[(0x374 + 0x510) >> 1] = htons(0x4e80);                // blr
457	+	p[(0x376 + 0x510) >> 1] = htons(0x0020);
458	+	D(bug(" patch 3 applied\n"));
459		}
460
461		} else if (type == FOURCC('c','i','t','t') && id == 45) {
462		D(bug("citt 45 found\n"));
463		size >>= 1;
464		while (size--) {
465	<	if (p[0] == 0x203c && p[1] == 0x0100 && p[2] == 0x0000 && p[3] == 0xc0ae && p[4] == 0xfffc) {
465	>	if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
466		// Don't replace SCSI Manager (8.1, 8.5, 8.6)
467	<	p[5] = (p[5] & 0xff) | 0x6000;          // beq
467	>	p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);            // beq
468		D(bug(" patch 1 applied\n"));
469		break;
470		}
#	Line 436 | Line 473 | void CheckLoad(uint32 type, int16 id, ui
473
474		} else if (type == FOURCC('t','h','n','g')) {
475		// Collect info about used audio sifters
476	<	uint32 c_type = 0[(uint32 *)p];
477	<	uint32 sub_type = 1[(uint32 *)p];
476	>	uint32 thing = Host2MacAddr((uint8 *)p);
477	>	uint32 c_type = ReadMacInt32(thing);
478	>	uint32 sub_type = ReadMacInt32(thing + 4);
479		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
480	<	1[(uint32 *)p] = FOURCC('a','w','g','c');
480	>	WriteMacInt32(thing + 4, FOURCC('a','w','g','c'));
481		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));
482	<	AddSifter(*(uint32 *)(((uint32)p)+20), p[12]);
483	<	if (p[28])                                                              // componentPFCount
484	<	AddSifter(*(uint32 *)(((uint32)p)+62), p[33]);
482	>	AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID));
483	>	if (ReadMacInt32(thing + componentPFCount))
484	>	AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID));
485		}
486
487		} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) {
488		// Patch audio sifters
489		if (FindSifter(type, id)) {
490		D(bug("sifter found\n"));
491	<	p[0] = 0x4e56; p[1] = 0x0000;   // link a6,#0
492	<	p[2] = 0x48e7; p[3] = 0x8018;   // movem.l d0/a3-a4,-(a7)
493	<	p[4] = 0x266e; p[5] = 0x000c;   // movea.l $c(a6),a3
494	<	p[6] = 0x286e; p[7] = 0x0008;   // movea.l $8(a6),a4
495	<	p[8] = M68K_EMUL_OP_AUDIO_DISPATCH;
496	<	p[9] = 0x2d40; p[10] = 0x0010;  // move.l d0,$10(a6)
497	<	p[11] = 0x4cdf; p[12] = 0x1801; // movem.l (a7)+,d0/a3-a4
498	<	p[13] = 0x4e5e;                                 // unlk a6
499	<	p[14] = 0x4e74; p[15] = 0x0008; // rtd #8
491	>	p[0] = htons(0x4e56); p[1] = htons(0x0000);             // link a6,#0
492	>	p[2] = htons(0x48e7); p[3] = htons(0x8018);             // movem.l d0/a3-a4,-(a7)
493	>	p[4] = htons(0x266e); p[5] = htons(0x000c);             // movea.l $c(a6),a3
494	>	p[6] = htons(0x286e); p[7] = htons(0x0008);             // movea.l $8(a6),a4
495	>	p[8] = htons(M68K_EMUL_OP_AUDIO_DISPATCH);
496	>	p[9] = htons(0x2d40); p[10] = htons(0x0010);    // move.l d0,$10(a6)
497	>	p[11] = htons(0x4cdf); p[12] = htons(0x1801);   // movem.l (a7)+,d0/a3-a4
498	>	p[13] = htons(0x4e5e);                                                  // unlk a6
499	>	p[14] = htons(0x4e74); p[15] = htons(0x0008);   // rtd #8
500		D(bug(" patch applied\n"));
501		}
502
#	Line 472 | Line 510 | void CheckLoad(uint32 type, int16 id, ui
510		D(bug("INIT 1 (size 2416) found\n"));
511		size >>= 1;
512		while (size--) {
513	<	if (p[0] == 0x247c && p[1] == 0xf301 && p[2] == 0x9000) {
513	>	if (PM(0,0x247c) && PM(1,0xf301) && PM(2,0x9000)) {
514		// Prevent "MacOS Licensing Extension" from accessing hardware (7.6)
515	<	p[22] = 0x6028;
515	>	p[22] = htons(0x6028);
516		D(bug(" patch 1 applied\n"));
517		break;
518		}
519		p++;
520		}
521	+
522	+	} else if (type == FOURCC('s','c','o','d') && id == -16465) {
523	+	D(bug("scod -16465 found\n"));
524	+
525	+	// Don't crash in Process Manager on reset/shutdown (8.6)
526	+	static const uint8 dat[] = {0x4e, 0x56, 0x00, 0x00, 0x48, 0xe7, 0x03, 0x18, 0x2c, 0x2e, 0x00, 0x10};
527	+	base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
528	+	if (base) {
529	+	p16 = (uint16 *)((uintptr)p + base);
530	+	p16[0] = htons(0x7000); // moveq #0,d0
531	+	p16[1] = htons(M68K_RTS);
532	+	D(bug(" patch 1 applied\n"));
533	+	}
534	+
535	+	} else if (type == FOURCC('N','O','b','j') && id == 100) {
536	+	D(bug("NObj 100 found\n"));
537	+
538	+	// Don't access VIA registers in MacBench 5.0
539	+	static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
540	+	base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
541	+	if (base) {
542	+	p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
543	+	p[(base + 0x02) >> 1] = htons(0x0000);
544	+	p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
545	+	p[(base + 0x06) >> 1] = htons(0x0020);
546	+	D(bug(" patch 1 applied\n"));
547	+	}
548	+	static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
549	+	base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
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 2 applied\n"));
556	+	}
557	+
558	+	} else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) {
559	+	D(bug("CODE 27 found [Apple Personal Diagnostics]\n"));
560	+
561	+	// Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9)
562	+	// FIXME: this should not be called in the first place, use UTResolveFCB?
563	+	static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8};
564	+	base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
565	+	if (base
566	+	&& ReadMacInt16(0x3f6) == 4 /* FSFCBLen */
567	+	&& p[(base + 0x1a) >> 1] == htons(0x605e)
568	+	&& p[(base + 0x80) >> 1] == htons(0x7000))
569	+	{
570	+	p[(base + 0x1a) >> 1] = htons(0x6064);
571	+	D(bug(" patch1 applied\n"));
572	+	}
573		}
574		}
575
#	Line 493 | Line 583 | static
583		#else
584		extern "C"
585		#endif
586	<	void check_load_invoc(uint32 type, int16 id, uint16 **h)
586	>	void check_load_invoc(uint32 type, int16 id, uint32 h)
587		{
588	<	if (h == NULL)
588	>	if (h == 0)
589		return;
590	<	uint16 *p = *h;
591	<	if (p == NULL)
590	>	uint32 p = ReadMacInt32(h);
591	>	if (p == 0)
592		return;
593	<	uint32 size = ((uint32 *)p)[-2] & 0xffffff;
593	>	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
594
595	<	CheckLoad(type, id, p, size);
595	>	CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
596		}
597
598		#ifdef __BEOS__
#	Line 684 | Line 774 | void PatchNativeResourceManager(void)
774		D(bug("PatchNativeResourceManager\n"));
775
776		// Patch native GetResource()
777	<	uint32 **upp = *(uint32 ***)0x1480;
778	<	if (((uint32)upp & 0xffc00000) == ROM_BASE)
777	>	uint32 upp = ReadMacInt32(0x1480);
778	>	if ((upp & 0xffc00000) == ROM_BASE)
779		return;
780	<	uint32 *tvec = upp[5];
781	<	D(bug(" GetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
782	<	*(uint32 *)XLM_RES_LIB_TOC = tvec[1];
783	<	*(uint32 *)XLM_GET_RESOURCE = tvec[0];
780	>	uint32 tvec = ReadMacInt32(upp + 5 * 4);
781	>	D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
782	>	WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
783	>	WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
784	>	#if EMULATED_PPC
785	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
786	>	#else
787		#ifdef __BEOS__
788		uint32 *tvec2 = (uint32 *)get_resource;
789	<	tvec[0] = tvec2[0];
790	<	tvec[1] = tvec2[1];
789	>	WriteMacInt32(tvec, tvec2[0]);
790	>	WriteMacInt32(tvec + 4, tvec2[1]);
791		#else
792	<	tvec[0] = (uint32)get_resource;
792	>	WriteMacInt32(tvec, (uint32)get_resource);
793	>	#endif
794		#endif
795
796		// Patch native Get1Resource()
797	<	upp = *(uint32 ***)0xe7c;
798	<	tvec = upp[5];
799	<	D(bug(" Get1Resource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
800	<	*(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
797	>	upp = ReadMacInt32(0x0e7c);
798	>	tvec = ReadMacInt32(upp + 5 * 4);
799	>	D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
800	>	WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
801	>	#if EMULATED_PPC
802	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
803	>	#else
804		#ifdef __BEOS__
805		tvec2 = (uint32 *)get_1_resource;
806	<	tvec[0] = tvec2[0];
807	<	tvec[1] = tvec2[1];
806	>	WriteMacInt32(tvec, tvec2[0]);
807	>	WriteMacInt32(tvec + 4, tvec2[1]);
808		#else
809	<	tvec[0] = (uint32)get_1_resource;
809	>	WriteMacInt32(tvec, (uint32)get_1_resource);
810	>	#endif
811		#endif
812
813		// Patch native GetIndResource()
814	<	upp = *(uint32 ***)0x1474;
815	<	tvec = upp[5];
816	<	D(bug(" GetIndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
817	<	*(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
814	>	upp = ReadMacInt32(0x1474);
815	>	tvec = ReadMacInt32(upp + 5 * 4);
816	>	D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
817	>	WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
818	>	#if EMULATED_PPC
819	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
820	>	#else
821		#ifdef __BEOS__
822		tvec2 = (uint32 *)get_ind_resource;
823	<	tvec[0] = tvec2[0];
824	<	tvec[1] = tvec2[1];
823	>	WriteMacInt32(tvec, tvec2[0]);
824	>	WriteMacInt32(tvec + 4, tvec2[1]);
825		#else
826	<	tvec[0] = (uint32)get_ind_resource;
826	>	WriteMacInt32(tvec, (uint32)get_ind_resource);
827	>	#endif
828		#endif
829
830		// Patch native Get1IndResource()
831	<	upp = *(uint32 ***)0xe38;
832	<	tvec = upp[5];
833	<	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
834	<	*(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
831	>	upp = ReadMacInt32(0x0e38);
832	>	tvec = ReadMacInt32(upp + 5 * 4);
833	>	D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
834	>	WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
835	>	#if EMULATED_PPC
836	>	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
837	>	#else
838		#ifdef __BEOS__
839		tvec2 = (uint32 *)get_1_ind_resource;
840	<	tvec[0] = tvec2[0];
841	<	tvec[1] = tvec2[1];
840	>	WriteMacInt32(tvec, tvec2[0]);
841	>	WriteMacInt32(tvec + 4, tvec2[1]);
842		#else
843	<	tvec[0] = (uint32)get_1_ind_resource;
843	>	WriteMacInt32(tvec, (uint32)get_1_ind_resource);
844	>	#endif
845		#endif
846
847		// Patch native RGetResource()
848	<	upp = *(uint32 ***)0xe30;
849	<	tvec = upp[5];
850	<	D(bug(" RGetResource() entry %08x, TOC %08x\n", tvec[0], tvec[1]));
851	<	*(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
848	>	upp = ReadMacInt32(0x0e30);
849	>	tvec = ReadMacInt32(upp + 5 * 4);
850	>	D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
851	>	WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
852	>	#if EMULATED_PPC
853	>	WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
854	>	#else
855		#ifdef __BEOS__
856		tvec2 = (uint32 *)r_get_resource;
857	<	tvec[0] = tvec2[0];
858	<	tvec[1] = tvec2[1];
857	>	WriteMacInt32(tvec, tvec2[0]);
858	>	WriteMacInt32(tvec + 4, tvec2[1]);
859		#else
860	<	tvec[0] = (uint32)r_get_resource;
860	>	WriteMacInt32(tvec, (uint32)r_get_resource);
861	>	#endif
862		#endif
863		}

Diff Legend

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