ViewVC Help

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

root/cebix/BasiliskII/src/rsrc_patches.cpp

Comparing BasiliskII/src/rsrc_patches.cpp (file contents):
Revision 1.5 by cebix, 2000-07-22T16:07:18Z vs.
Revision 1.15 by gbeauche, 2006-04-30T21:16:48Z

#	Line 1 | Line 1
1		/*
2		*  rsrc_patches.cpp - Resource patches
3		*
4	<	*  Basilisk II (C) 1997-2000 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
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 24 | Line 24
24		#include "cpu_emulation.h"
25		#include "macos_util.h"
26		#include "main.h"
27	+	#include "prefs.h"
28		#include "emul_op.h"
29		#include "audio.h"
30		#include "audio_defs.h"
#	Line 37 | Line 38
38		#include "debug.h"
39
40
40	–	#if !EMULATED_68K
41	–	// Assembly functions
42	–	extern "C" void Scod060Patch1(void);
43	–	extern "C" void Scod060Patch2(void);
44	–	extern "C" void ThInitFPUPatch(void);
45	–	#endif
46	–
47	–
41		/*
42		*  Search resource for byte string, return offset (or 0)
43		*/
#	Line 61 | Line 54 | static uint32 find_rsrc_data(const uint8
54
55
56		/*
57	+	*  Install SynchIdleTime() patch
58	+	*/
59	+
60	+	static void patch_idle_time(uint8 *p, uint32 size, int n = 1)
61	+	{
62	+	if (!PrefsFindBool("idlewait"))
63	+	return;
64	+
65	+	static const uint8 dat[] = {0x70, 0x03, 0xa0, 0x9f};
66	+	uint32 base = find_rsrc_data(p, size, dat, sizeof(dat));
67	+	if (base) {
68	+	uint8 *pbase = p + base - 0x80;
69	+	static const uint8 dat2[] = {0x20, 0x78, 0x02, 0xb6, 0x41, 0xe8, 0x00, 0x80};
70	+	base = find_rsrc_data(pbase, 0x80, dat2, sizeof(dat2));
71	+	if (base) {
72	+	uint16 *p16 = (uint16 *)(pbase + base);
73	+	*p16++ = htons(M68K_EMUL_OP_IDLE_TIME);
74	+	*p16 = htons(M68K_NOP);
75	+	FlushCodeCache(pbase + base, 4);
76	+	D(bug("  patch %d applied\n", n));
77	+	}
78	+	}
79	+	}
80	+
81	+
82	+	/*
83		*  Resource patches via vCheckLoad
84		*/
85
#	Line 68 | Line 87 | void CheckLoad(uint32 type, int16 id, ui
87		{
88		uint16 *p16;
89		uint32 base;
90	<	D(bug("vCheckLoad %c%c%c%c (%08x) ID %d, data %08x, size %d\n", (char)(type >> 24), (char)((type >> 16) & 0xff), (char )((type >> 8) & 0xff), (char )(type & 0xff), type, id, p, size));
91	<
90	>	D(bug("vCheckLoad %c%c%c%c (%08x) ID %d, data %p, size %d\n", (char)(type >> 24), (char)((type >> 16) & 0xff), (char )((type >> 8) & 0xff), (char )(type & 0xff), type, id, p, size));
91	>
92		if (type == FOURCC('b','o','o','t') && id == 3) {
93		D(bug(" boot 3 found\n"));
94
#	Line 84 | Line 103 | void CheckLoad(uint32 type, int16 id, ui
103		}
104
105		#if !ROM_IS_WRITE_PROTECTED
106	<	// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.5, 8.0)
106	>	// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.1, 7.5, 8.0)
107		static const uint8 dat2[] = {0x20, 0x78, 0x02, 0xae, 0xd1, 0xfc, 0x00, 0x01, 0x00, 0x00, 0x21, 0xc8, 0x00, 0x00};
108		base = find_rsrc_data(p, size, dat2, sizeof(dat2));
109		if (base) {
110		p16 = (uint16 *)(p + base);
111
112	<	#if defined(AMIGA) || defined(__NetBSD__)
112	>	#if defined(USE_SCRATCHMEM_SUBTERFUGE)
113		// Set 0x0000 to scratch memory area
114	<	extern uint32 ScratchMem;
114	>	extern uint8 *ScratchMem;
115	>	const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
116		*p16++ = htons(0x207c);                 // move.l       #ScratchMem,a0
117	<	*p16++ = htons(ScratchMem >> 16);
118	<	*p16++ = htons(ScratchMem);
117	>	*p16++ = htons(ScratchMemBase >> 16);
118	>	*p16++ = htons(ScratchMemBase);
119		*p16++ = htons(M68K_NOP);
120		*p16 = htons(M68K_NOP);
121		#else
#	Line 108 | Line 128 | void CheckLoad(uint32 type, int16 id, ui
128		} else if (type == FOURCC('b','o','o','t') && id == 2) {
129		D(bug(" boot 2 found\n"));
130
131	<	// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.5, 8.0)
131	>	// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.1, 7.5, 8.0)
132		static const uint8 dat[] = {0x20, 0x78, 0x02, 0xae, 0xd1, 0xfc, 0x00, 0x01, 0x00, 0x00, 0x21, 0xc8, 0x00, 0x00};
133		base = find_rsrc_data(p, size, dat, sizeof(dat));
134		if (base) {
135		p16 = (uint16 *)(p + base);
136
137	<	#if defined(AMIGA) || defined(__NetBSD__)
137	>	#if defined(USE_SCRATCHMEM_SUBTERFUGE)
138		// Set 0x0000 to scratch memory area
139	<	extern uint32 ScratchMem;
139	>	extern uint8 *ScratchMem;
140	>	const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
141		*p16++ = htons(0x207c);                 // move.l       #ScratchMem,a0
142	<	*p16++ = htons(ScratchMem >> 16);
143	<	*p16++ = htons(ScratchMem);
142	>	*p16++ = htons(ScratchMemBase >> 16);
143	>	*p16++ = htons(ScratchMemBase);
144		*p16++ = htons(M68K_NOP);
145		*p16 = htons(M68K_NOP);
146		#else
#	Line 160 | Line 181 | void CheckLoad(uint32 type, int16 id, ui
181		} else if (type == FOURCC('p','t','c','h') && id == 26) {
182		D(bug(" ptch 26 found\n"));
183
184	<	// Trap ABC4 is initialized with absolute ROM address (7.5, 7.6, 7.6.1, 8.0)
184	>	// Trap ABC4 is initialized with absolute ROM address (7.1, 7.5, 7.6, 7.6.1, 8.0)
185		static const uint8 dat[] = {0x40, 0x83, 0x36, 0x10};
186		base = find_rsrc_data(p, size, dat, sizeof(dat));
187		if (base) {
#	Line 195 | Line 216 | void CheckLoad(uint32 type, int16 id, ui
216		D(bug("  patch 2 applied\n"));
217		}
218
198	–	#if !EMULATED_68K
199	–	} else if (CPUIs68060 && (type == FOURCC('g','p','c','h') && id == 669 || type == FOURCC('l','p','c','h') && id == 63)) {
200	–	D(bug(" gpch 669/lpch 63 found\n"));
201	–
202	–	static uint16 ThPatchSpace[1024];       // Replacement routines are constructed here
203	–	uint16 *q = ThPatchSpace;
204	–	uint32 start;
205	–	int i;
206	–
207	–	// Patch Thread Manager thread switcher for 68060 FPU (7.5, 8.0)
208	–	static const uint8 dat[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x18};
209	–	base = find_rsrc_data(p, size, dat, sizeof(dat));
210	–	if (base) {     // Skip first routine (no FPU -> no FPU)
211	–
212	–	base = find_rsrc_data(p, size - base - 2, dat, sizeof(dat), base + 2);
213	–	if (base) {     // no FPU -> FPU
214	–
215	–	p16 = (uint16 *)(p + base);
216	–	start = (uint32)q;
217	–	for (i=0; i<28; i++) *q++ = *p16++;
218	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state or "FPU state saved" flag set?)
219	–	*q++ = htons(2);
220	–	*q++ = htons(0x6712);           // beq
221	–	*q++ = htons(0x588f);           // addq.l #2,sp                         (flag set, skip it)
222	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpcr           (restore FPU registers)
223	–	*q++ = htons(0x9000);
224	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpsr
225	–	*q++ = htons(0x8800);
226	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpiar
227	–	*q++ = htons(0x8400);
228	–	*q++ = htons(0xf21f);           // fmovem.x (sp)+,fp0-fp7
229	–	*q++ = htons(0xd0ff);
230	–	*q++ = htons(0xf35f);           // frestore (sp)+
231	–	*q++ = htons(0x4e75);           // rts
232	–
233	–	p16 = (uint16 *)(p + base);
234	–	*p16++ = htons(M68K_JMP);
235	–	*p16++ = htons(start >> 16);
236	–	*p16 = htons(start & 0xffff);
237	–	FlushCodeCache(p + base, 6);
238	–	D(bug("  patch 1 applied\n"));
239	–
240	–	static const uint8 dat2[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x28};
241	–	base = find_rsrc_data(p, size, dat2, sizeof(dat2));
242	–	if (base) {     // FPU -> FPU
243	–
244	–	p16 = (uint16 *)(p + base);
245	–	start = (uint32)q;
246	–	for (i=0; i<4; i++) *q++ = *p16++;
247	–	*q++ = htons(0x6736);           // beq
248	–	*q++ = htons(0xf327);           // fsave -(sp)                          (save FPU state frame)
249	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state?)
250	–	*q++ = htons(2);
251	–	*q++ = htons(0x6716);           // beq
252	–	*q++ = htons(0xf227);           // fmovem.x fp0-fp7,-(sp)       (no, save FPU registers)
253	–	*q++ = htons(0xe0ff);
254	–	*q++ = htons(0xf227);           // fmove.l fpiar,-(sp)
255	–	*q++ = htons(0xa400);
256	–	*q++ = htons(0xf227);           // fmove.l fpsr,-(sp)
257	–	*q++ = htons(0xa800);
258	–	*q++ = htons(0xf227);           // fmove.l fpcr,-(sp)
259	–	*q++ = htons(0xb000);
260	–	*q++ = htons(0x4879);           // pea -1                                       (push "FPU state saved" flag)
261	–	*q++ = htons(0xffff);
262	–	*q++ = htons(0xffff);
263	–	p16 += 9;
264	–	for (i=0; i<23; i++) *q++ = *p16++;
265	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state or "FPU state saved" flag set?)
266	–	*q++ = htons(2);
267	–	*q++ = htons(0x6712);           // beq
268	–	*q++ = htons(0x588f);           // addq.l #2,sp                         (flag set, skip it)
269	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpcr           (restore FPU registers)
270	–	*q++ = htons(0x9000);
271	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpsr
272	–	*q++ = htons(0x8800);
273	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpiar
274	–	*q++ = htons(0x8400);
275	–	*q++ = htons(0xf21f);           // fmovem.x (sp)+,fp0-fp7
276	–	*q++ = htons(0xd0ff);
277	–	*q++ = htons(0xf35f);           // frestore (sp)+
278	–	*q++ = htons(0x4e75);           // rts
279	–
280	–	p16 = (uint16 *)(p + base);
281	–	*p16++ = htons(M68K_JMP);
282	–	*p16++ = htons(start >> 16);
283	–	*p16 = htons(start & 0xffff);
284	–	FlushCodeCache(p + base, 6);
285	–	D(bug("  patch 2 applied\n"));
286	–
287	–	base = find_rsrc_data(p, size - base - 2, dat2, sizeof(dat2), base + 2);
288	–	if (base) {     // FPU -> no FPU
289	–
290	–	p16 = (uint16 *)(p + base);
291	–	start = (uint32)q;
292	–	for (i=0; i<4; i++) *q++ = *p16++;
293	–	*q++ = htons(0x6736);           // beq
294	–	*q++ = htons(0xf327);           // fsave -(sp)                          (save FPU state frame)
295	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state?)
296	–	*q++ = htons(2);
297	–	*q++ = htons(0x6716);           // beq
298	–	*q++ = htons(0xf227);           // fmovem.x fp0-fp7,-(sp)       (no, save FPU registers)
299	–	*q++ = htons(0xe0ff);
300	–	*q++ = htons(0xf227);           // fmove.l fpiar,-(sp)
301	–	*q++ = htons(0xa400);
302	–	*q++ = htons(0xf227);           // fmove.l fpsr,-(sp)
303	–	*q++ = htons(0xa800);
304	–	*q++ = htons(0xf227);           // fmove.l fpcr,-(sp)
305	–	*q++ = htons(0xb000);
306	–	*q++ = htons(0x4879);           // pea -1                                       (push "FPU state saved" flag)
307	–	*q++ = htons(0xffff);
308	–	*q++ = htons(0xffff);
309	–	p16 += 9;
310	–	for (i=0; i<24; i++) *q++ = *p16++;
311	–
312	–	p16 = (uint16 *)(p + base);
313	–	*p16++ = htons(M68K_JMP);
314	–	*p16++ = htons(start >> 16);
315	–	*p16 = htons(start & 0xffff);
316	–	FlushCodeCache(p + base, 6);
317	–	D(bug("  patch 3 applied\n"));
318	–	}
319	–	}
320	–	}
321	–	}
322	–
323	–	// Patch Thread Manager thread switcher for 68060 FPU (additional routines under 8.0 for Mixed Mode Manager)
324	–	static const uint8 dat3[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x40};
325	–	base = find_rsrc_data(p, size, dat3, sizeof(dat3));
326	–	if (base) {     // Skip first routine (no FPU -> no FPU)
327	–
328	–	base = find_rsrc_data(p, size - base - 2, dat3, sizeof(dat3), base + 2);
329	–	if (base) {     // no FPU -> FPU
330	–
331	–	p16 = (uint16 *)(p + base);
332	–	start = (uint32)q;
333	–	for (i=0; i<48; i++) *q++ = *p16++;
334	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state or "FPU state saved" flag set?)
335	–	*q++ = htons(2);
336	–	*q++ = htons(0x6712);           // beq
337	–	*q++ = htons(0x588f);           // addq.l #2,sp                         (flag set, skip it)
338	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpcr           (restore FPU registers)
339	–	*q++ = htons(0x9000);
340	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpsr
341	–	*q++ = htons(0x8800);
342	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpiar
343	–	*q++ = htons(0x8400);
344	–	*q++ = htons(0xf21f);           // fmovem.x (sp)+,fp0-fp7
345	–	*q++ = htons(0xd0ff);
346	–	p16 += 7;
347	–	for (i=0; i<20; i++) *q++ = *p16++;
348	–
349	–	p16 = (uint16 *)(p + base);
350	–	*p16++ = htons(M68K_JMP);
351	–	*p16++ = htons(start >> 16);
352	–	*p16 = htons(start & 0xffff);
353	–	FlushCodeCache(p + base, 6);
354	–	D(bug("  patch 4 applied\n"));
355	–
356	–	static const uint8 dat4[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x50};
357	–	base = find_rsrc_data(p, size, dat4, sizeof(dat4));
358	–	if (base) {     // FPU -> FPU
359	–
360	–	p16 = (uint16 *)(p + base);
361	–	start = (uint32)q;
362	–	for (i=0; i<4; i++) *q++ = *p16++;
363	–	*q++ = htons(0x675e);           // beq
364	–	p16++;
365	–	for (i=0; i<21; i++) *q++ = *p16++;
366	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state?)
367	–	*q++ = htons(2);
368	–	*q++ = htons(0x6716);           // beq
369	–	*q++ = htons(0xf227);           // fmovem.x fp0-fp7,-(sp)       (no, save FPU registers)
370	–	*q++ = htons(0xe0ff);
371	–	*q++ = htons(0xf227);           // fmove.l fpiar,-(sp)
372	–	*q++ = htons(0xa400);
373	–	*q++ = htons(0xf227);           // fmove.l fpsr,-(sp)
374	–	*q++ = htons(0xa800);
375	–	*q++ = htons(0xf227);           // fmove.l fpcr,-(sp)
376	–	*q++ = htons(0xb000);
377	–	*q++ = htons(0x4879);           // pea -1                                       (push "FPU state saved" flag)
378	–	*q++ = htons(0xffff);
379	–	*q++ = htons(0xffff);
380	–	p16 += 7;
381	–	for (i=0; i<23; i++) *q++ = *p16++;
382	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state or "FPU state saved" flag set?)
383	–	*q++ = htons(2);
384	–	*q++ = htons(0x6712);           // beq
385	–	*q++ = htons(0x588f);           // addq.l #2,sp                         (flag set, skip it)
386	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpcr           (restore FPU registers)
387	–	*q++ = htons(0x9000);
388	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpsr
389	–	*q++ = htons(0x8800);
390	–	*q++ = htons(0xf21f);           // fmove.l (sp)+,fpiar
391	–	*q++ = htons(0x8400);
392	–	*q++ = htons(0xf21f);           // fmovem.x (sp)+,fp0-fp7
393	–	*q++ = htons(0xd0ff);
394	–	p16 += 7;
395	–	for (i=0; i<20; i++) *q++ = *p16++;
396	–
397	–	p16 = (uint16 *)(p + base);
398	–	*p16++ = htons(M68K_JMP);
399	–	*p16++ = htons(start >> 16);
400	–	*p16 = htons(start & 0xffff);
401	–	FlushCodeCache(p + base, 6);
402	–	D(bug("  patch 5 applied\n"));
403	–
404	–	base = find_rsrc_data(p, size - base - 2, dat4, sizeof(dat4), base + 2);
405	–	if (base) {     // FPU -> no FPU
406	–
407	–	p16 = (uint16 *)(p + base);
408	–	start = (uint32)q;
409	–	for (i=0; i<4; i++) *q++ = *p16++;
410	–	*q++ = htons(0x675e);           // beq
411	–	p16++;
412	–	for (i=0; i<21; i++) *q++ = *p16++;
413	–	*q++ = htons(0x4a2f);           // tst.b 2(sp)                          (null FPU state?)
414	–	*q++ = htons(2);
415	–	*q++ = htons(0x6716);           // beq
416	–	*q++ = htons(0xf227);           // fmovem.x fp0-fp7,-(sp)       (no, save FPU registers)
417	–	*q++ = htons(0xe0ff);
418	–	*q++ = htons(0xf227);           // fmove.l fpiar,-(sp)
419	–	*q++ = htons(0xa400);
420	–	*q++ = htons(0xf227);           // fmove.l fpsr,-(sp)
421	–	*q++ = htons(0xa800);
422	–	*q++ = htons(0xf227);           // fmove.l fpcr,-(sp)
423	–	*q++ = htons(0xb000);
424	–	*q++ = htons(0x4879);           // pea -1                                       (push "FPU state saved" flag)
425	–	*q++ = htons(0xffff);
426	–	*q++ = htons(0xffff);
427	–	p16 += 7;
428	–	for (i=0; i<42; i++) *q++ = *p16++;
429	–
430	–	p16 = (uint16 *)(p + base);
431	–	*p16++ = htons(M68K_JMP);
432	–	*p16++ = htons(start >> 16);
433	–	*p16 = htons(start & 0xffff);
434	–	FlushCodeCache(p + base, 6);
435	–	D(bug("  patch 6 applied\n"));
436	–	}
437	–	}
438	–	}
439	–	}
440	–
441	–	FlushCodeCache(ThPatchSpace, 1024);
442	–
443	–	// Patch Thread Manager FPU init for 68060 FPU (7.5, 8.0)
444	–	static const uint8 dat5[] = {0x4a, 0x28, 0x00, 0xa4, 0x67, 0x0a, 0x4a, 0x2c, 0x00, 0x40};
445	–	base = find_rsrc_data(p, size, dat5, sizeof(dat5));
446	–	if (base) {
447	–	p16 = (uint16 *)(p + base + 6);
448	–	*p16++ = htons(M68K_JSR);
449	–	*p16++ = htons((uint32)ThInitFPUPatch >> 16);
450	–	*p16++ = htons((uint32)ThInitFPUPatch & 0xffff);
451	–	*p16++ = htons(M68K_NOP);
452	–	*p16 = htons(M68K_NOP);
453	–	FlushCodeCache(p + base + 6, 10);
454	–	D(bug("  patch 7 applied\n"));
455	–	}
456	–	#endif
457	–
219		} else if (type == FOURCC('g','p','c','h') && id == 750) {
220		D(bug(" gpch 750 found\n"));
221
222		// Don't use PTEST instruction in BlockMove() (7.5, 7.6, 7.6.1, 8.0)
223	<	static const uint8 dat[] = {0xa0, 0x8d, 0x0c, 0x81, 0x00, 0x00, 0x0c, 0x00, 0x65, 0x06, 0x4e, 0x71, 0xf4, 0xf8};
223	>	static const uint8 dat[] = {0x20, 0x5f, 0x22, 0x5f, 0x0c, 0x38, 0x00, 0x04, 0x01, 0x2f};
224		base = find_rsrc_data(p, size, dat, sizeof(dat));
225		if (base) {
226	<	p16 = (uint16 *)(p + base + 8);
227	<	*p16 = htons(M68K_NOP);
228	<	FlushCodeCache(p + base + 8, 2);
226	>	p16 = (uint16 *)(p + base + 4);
227	>	*p16++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
228	>	*p16++ = htons(0x7000);
229	>	*p16 = htons(M68K_RTS);
230	>	FlushCodeCache(p + base + 4, 6);
231		D(bug("  patch 1 applied\n"));
232		}
233
234	+	// Patch SynchIdleTime()
235	+	patch_idle_time(p, size, 2);
236	+
237		} else if (type == FOURCC('l','p','c','h') && id == 24) {
238		D(bug(" lpch 24 found\n"));
239
#	Line 510 | Line 276 | void CheckLoad(uint32 type, int16 id, ui
276		D(bug("  patch 2 applied\n"));
277		}
278
279	<	#if !EMULATED_68K
280	<	} else if (CPUIs68060 && type == FOURCC('s','c','o','d') && (id == -16463 || id == -16464)) {
515	<	D(bug(" scod -16463/-16464 found\n"));
516	<
517	<	// Correct 68060 FP frame handling in Process Manager task switches (7.1, 7.5, 8.0)
518	<	static const uint8 dat[] = {0xf3, 0x27, 0x4a, 0x17};
519	<	base = find_rsrc_data(p, size, dat, sizeof(dat));
520	<	if (base) {
521	<	p16 = (uint16 *)(p + base);
522	<	*p16++ = htons(M68K_JMP);
523	<	*p16++ = htons((uint32)Scod060Patch1 >> 16);
524	<	*p16 = htons((uint32)Scod060Patch1 & 0xffff);
525	<	FlushCodeCache(p + base, 6);
526	<	D(bug("  patch 1 applied\n"));
527	<	}
528	<
529	<	// Even a null FP frame is 3 longwords on the 68060 (7.1, 7.5, 8.0)
530	<	static const uint8 dat2[] = {0xf3, 0x5f, 0x4e, 0x75};
531	<	base = find_rsrc_data(p, size, dat2, sizeof(dat2));
532	<	if (base) {
533	<	p16 = (uint16 *)(p + base - 2);
534	<	*p16++ = htons(M68K_JMP);
535	<	*p16++ = htons((uint32)Scod060Patch2 >> 16);
536	<	*p16 = htons((uint32)Scod060Patch2 & 0xffff);
537	<	FlushCodeCache(p + base - 2, 6);
538	<	D(bug("  patch 2 applied\n"));
539	<	}
540	<	#endif
279	>	// Patch SynchIdleTime()
280	>	patch_idle_time(p, size, 3);
281
282		} else if (type == FOURCC('t','h','n','g') && id == -16563) {
283		D(bug(" thng -16563 found\n"));
#	Line 599 | Line 339 | void CheckLoad(uint32 type, int16 id, ui
339		*p16 = htons(M68K_RTS);
340		FlushCodeCache(p, 6);
341		D(bug("  patch 1 applied\n"));
342	+
343	+	} else if (type == FOURCC('D','R','V','R') && id == 41) {
344	+	D(bug(" DRVR 41 found\n"));
345	+
346	+	// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
347	+	static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
348	+	base = find_rsrc_data(p, size, dat, sizeof(dat));
349	+	if (base) {
350	+	p16 = (uint16 *)(p + base + 4);
351	+	*p16++ = htons(0x303c);         // move.l       #ROM85,%d0
352	+	*p16++ = htons(0x028e);
353	+	*p16++ = htons(M68K_NOP);
354	+	*p16++ = htons(M68K_NOP);
355	+	FlushCodeCache(p + base + 4, 8);
356	+	D(bug("  patch 1 applied\n"));
357	+	}
358		}
359		}

Diff Legend

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