ViewVC Help

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

root/cebix/SheepShaver/src/rom_patches.cpp

Comparing SheepShaver/src/rom_patches.cpp (file contents):
Revision 1.4 by gbeauche, 2003-05-17T08:42:34Z vs.
Revision 1.35 by gbeauche, 2004-07-14T08:24:07Z

#	Line 1 | Line 1
1		/*
2		*  rom_patches.cpp - ROM patches
3		*
4	<	*  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2004 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 40 | Line 40
40		#include "audio_defs.h"
41		#include "serial.h"
42		#include "macos_util.h"
43	+	#include "thunks.h"
44
45		#define DEBUG 0
46		#include "debug.h"
#	Line 58 | Line 59
59
60
61		// Other ROM addresses
62	<	const uint32 CHECK_LOAD_PATCH_SPACE = 0x2f7f00;
63	<	const uint32 PUT_SCRAP_PATCH_SPACE = 0x2f7f80;
64	<	const uint32 GET_SCRAP_PATCH_SPACE = 0x2f7fc0;
65	<	const uint32 ADDR_MAP_PATCH_SPACE = 0x2f8000;
62	>	const uint32 CHECK_LOAD_PATCH_SPACE = 0x2fcf00;
63	>	const uint32 PUT_SCRAP_PATCH_SPACE = 0x2fcf80;
64	>	const uint32 GET_SCRAP_PATCH_SPACE = 0x2fcfc0;
65	>	const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd100;
66
67		// Global variables
68		int ROMType;                            // ROM type
#	Line 131 | Line 132 | void decode_parcels(const uint8 *src, ui
132		(parcel_type >> 8) & 0xff, parcel_type & 0xff, &parcel_data[6]));
133		if (parcel_type == FOURCC('r','o','m',' ')) {
134		uint32 lzss_offset  = ntohl(parcel_data[2]);
135	<	uint32 lzss_size = ((uint32)src + parcel_offset) - ((uint32)parcel_data + lzss_offset);
135	>	uint32 lzss_size = ((uintptr)src + next_offset) - ((uintptr)parcel_data + lzss_offset);
136		decode_lzss((uint8 *)parcel_data + lzss_offset, dest, lzss_size);
137		}
138		parcel_offset = next_offset;
#	Line 269 | Line 270 | static uint32 find_rom_trap(uint16 trap)
270
271
272		/*
273	+	*  Return target of branch instruction specified at ADDR, or 0 if
274	+	*  there is no such instruction
275	+	*/
276	+
277	+	static uint32 powerpc_branch_target(uintptr addr)
278	+	{
279	+	uint32 opcode = ntohl(*(uint32 *)addr);
280	+	uint32 primop = opcode >> 26;
281	+	uint32 target = 0;
282	+
283	+	if (primop == 18) {                     // Branch
284	+	target = opcode & 0x3fffffc;
285	+	if (target & 0x2000000)
286	+	target |= 0xfc000000;
287	+	if ((opcode & 2) == 0)
288	+	target += addr;
289	+	}
290	+	else if (primop == 16) {        // Branch Conditional
291	+	target = (int32)(int16)(opcode & 0xfffc);
292	+	if ((opcode & 2) == 0)
293	+	target += addr;
294	+	}
295	+	return target;
296	+	}
297	+
298	+
299	+	/*
300	+	*  Search ROM for instruction branching to target address, return 0 if none found
301	+	*/
302	+
303	+	static uint32 find_rom_powerpc_branch(uint32 start, uint32 end, uint32 target)
304	+	{
305	+	for (uint32 addr = start; addr < end; addr += 4) {
306	+	if (powerpc_branch_target(ROM_BASE + addr) == ROM_BASE + target)
307	+	return addr;
308	+	}
309	+	return 0;
310	+	}
311	+
312	+
313	+	/*
314	+	*  Check that requested ROM patch space is really available
315	+	*/
316	+
317	+	static bool check_rom_patch_space(uint32 base, uint32 size)
318	+	{
319	+	size = (size + 3) & -4;
320	+	for (int i = 0; i < size; i += 4) {
321	+	uint32 x = ntohl(*(uint32 *)(ROM_BASE + base + i));
322	+	if (x != 0x6b636b63 && x != 0)
323	+	return false;
324	+	}
325	+	return true;
326	+	}
327	+
328	+
329	+	/*
330		*  List of audio sifters installed in ROM and System file
331		*/
332
#	Line 447 | Line 505 | static const uint8 cdrom_driver[] = {  //
505		0x4e, 0x75                                                      //  rts
506		};
507
508	<	#ifdef __linux__
451	<	static uint32 serial_nothing_tvect[2] = {(uint32)SerialNothing, 0};
452	<	static uint32 serial_open_tvect[2] = {(uint32)SerialOpen, 0};
453	<	static uint32 serial_prime_in_tvect[2] = {(uint32)SerialPrimeIn, 0};
454	<	static uint32 serial_prime_out_tvect[2] = {(uint32)SerialPrimeOut, 0};
455	<	static uint32 serial_control_tvect[2] = {(uint32)SerialControl, 0};
456	<	static uint32 serial_status_tvect[2] = {(uint32)SerialStatus, 0};
457	<	static uint32 serial_close_tvect[2] = {(uint32)SerialClose, 0};
458	<	#endif
508	>	static uint32 long_ptr;
509
510	<	static const uint32 ain_driver[] = {    // .AIn driver header
511	<	0x4d000000, 0x00000000,
512	<	0x00200040, 0x00600080,
513	<	0x00a0042e, 0x41496e00,
514	<	0x00000000, 0x00000000,
515	<	0xaafe0700, 0x00000000,
516	<	0x00000000, 0x00179822,
517	<	#ifdef __linux__
518	<	0x00010004, (uint32)serial_nothing_tvect,
519	<	#else
520	<	0x00010004, (uint32)SerialNothing,
521	<	#endif
522	<	0x00000000, 0x00000000,
523	<	0xaafe0700, 0x00000000,
524	<	0x00000000, 0x00179822,
525	<	#ifdef __linux__
526	<	0x00010004, (uint32)serial_prime_in_tvect,
527	<	#else
528	<	0x00010004, (uint32)SerialPrimeIn,
529	<	#endif
530	<	0x00000000, 0x00000000,
531	<	0xaafe0700, 0x00000000,
532	<	0x00000000, 0x00179822,
533	<	#ifdef __linux__
534	<	0x00010004, (uint32)serial_control_tvect,
535	<	#else
536	<	0x00010004, (uint32)SerialControl,
537	<	#endif
538	<	0x00000000, 0x00000000,
539	<	0xaafe0700, 0x00000000,
540	<	0x00000000, 0x00179822,
541	<	#ifdef __linux__
542	<	0x00010004, (uint32)serial_status_tvect,
543	<	#else
544	<	0x00010004, (uint32)SerialStatus,
545	<	#endif
546	<	0x00000000, 0x00000000,
547	<	0xaafe0700, 0x00000000,
548	<	0x00000000, 0x00179822,
549	<	#ifdef __linux__
500	<	0x00010004, (uint32)serial_nothing_tvect,
501	<	#else
502	<	0x00010004, (uint32)SerialNothing,
503	<	#endif
504	<	0x00000000, 0x00000000,
510	>	static void SetLongBase(uint32 addr)
511	>	{
512	>	long_ptr = addr;
513	>	}
514	>
515	>	static void Long(uint32 value)
516	>	{
517	>	WriteMacInt32(long_ptr, value);
518	>	long_ptr += 4;
519	>	}
520	>
521	>	static void gen_ain_driver(uintptr addr)
522	>	{
523	>	SetLongBase(addr);
524	>
525	>	// .AIn driver header
526	>	Long(0x4d000000); Long(0x00000000);
527	>	Long(0x00200040); Long(0x00600080);
528	>	Long(0x00a0042e); Long(0x41496e00);
529	>	Long(0x00000000); Long(0x00000000);
530	>	Long(0xaafe0700); Long(0x00000000);
531	>	Long(0x00000000); Long(0x00179822);
532	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_NOTHING));
533	>	Long(0x00000000); Long(0x00000000);
534	>	Long(0xaafe0700); Long(0x00000000);
535	>	Long(0x00000000); Long(0x00179822);
536	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_PRIME_IN));
537	>	Long(0x00000000); Long(0x00000000);
538	>	Long(0xaafe0700); Long(0x00000000);
539	>	Long(0x00000000); Long(0x00179822);
540	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CONTROL));
541	>	Long(0x00000000); Long(0x00000000);
542	>	Long(0xaafe0700); Long(0x00000000);
543	>	Long(0x00000000); Long(0x00179822);
544	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_STATUS));
545	>	Long(0x00000000); Long(0x00000000);
546	>	Long(0xaafe0700); Long(0x00000000);
547	>	Long(0x00000000); Long(0x00179822);
548	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_NOTHING));
549	>	Long(0x00000000); Long(0x00000000);
550		};
551
552	<	static const uint32 aout_driver[] = {   // .AOut driver header
553	<	0x4d000000, 0x00000000,
554	<	0x00200040, 0x00600080,
555	<	0x00a0052e, 0x414f7574,
556	<	0x00000000, 0x00000000,
557	<	0xaafe0700, 0x00000000,
558	<	0x00000000, 0x00179822,
559	<	#ifdef __linux__
560	<	0x00010004, (uint32)serial_open_tvect,
561	<	#else
562	<	0x00010004, (uint32)SerialOpen,
563	<	#endif
564	<	0x00000000, 0x00000000,
565	<	0xaafe0700, 0x00000000,
566	<	0x00000000, 0x00179822,
567	<	#ifdef __linux__
568	<	0x00010004, (uint32)serial_prime_out_tvect,
569	<	#else
570	<	0x00010004, (uint32)SerialPrimeOut,
571	<	#endif
572	<	0x00000000, 0x00000000,
573	<	0xaafe0700, 0x00000000,
574	<	0x00000000, 0x00179822,
575	<	#ifdef __linux__
576	<	0x00010004, (uint32)serial_control_tvect,
577	<	#else
578	<	0x00010004, (uint32)SerialControl,
579	<	#endif
580	<	0x00000000, 0x00000000,
536	<	0xaafe0700, 0x00000000,
537	<	0x00000000, 0x00179822,
538	<	#ifdef __linux__
539	<	0x00010004, (uint32)serial_status_tvect,
540	<	#else
541	<	0x00010004, (uint32)SerialStatus,
542	<	#endif
543	<	0x00000000, 0x00000000,
544	<	0xaafe0700, 0x00000000,
545	<	0x00000000, 0x00179822,
546	<	#ifdef __linux__
547	<	0x00010004, (uint32)serial_close_tvect,
548	<	#else
549	<	0x00010004, (uint32)SerialClose,
550	<	#endif
551	<	0x00000000, 0x00000000,
552	>	static void gen_aout_driver(uintptr addr)
553	>	{
554	>	SetLongBase(addr);
555	>
556	>	// .AOut driver header
557	>	Long(0x4d000000); Long(0x00000000);
558	>	Long(0x00200040); Long(0x00600080);
559	>	Long(0x00a0052e); Long(0x414f7574);
560	>	Long(0x00000000); Long(0x00000000);
561	>	Long(0xaafe0700); Long(0x00000000);
562	>	Long(0x00000000); Long(0x00179822);
563	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_OPEN));
564	>	Long(0x00000000); Long(0x00000000);
565	>	Long(0xaafe0700); Long(0x00000000);
566	>	Long(0x00000000); Long(0x00179822);
567	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_PRIME_OUT));
568	>	Long(0x00000000); Long(0x00000000);
569	>	Long(0xaafe0700); Long(0x00000000);
570	>	Long(0x00000000); Long(0x00179822);
571	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CONTROL));
572	>	Long(0x00000000); Long(0x00000000);
573	>	Long(0xaafe0700); Long(0x00000000);
574	>	Long(0x00000000); Long(0x00179822);
575	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_STATUS));
576	>	Long(0x00000000); Long(0x00000000);
577	>	Long(0xaafe0700); Long(0x00000000);
578	>	Long(0x00000000); Long(0x00179822);
579	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CLOSE));
580	>	Long(0x00000000); Long(0x00000000);
581		};
582
583	<	static const uint32 bin_driver[] = {    // .BIn driver header
584	<	0x4d000000, 0x00000000,
585	<	0x00200040, 0x00600080,
586	<	0x00a0042e, 0x42496e00,
587	<	0x00000000, 0x00000000,
588	<	0xaafe0700, 0x00000000,
589	<	0x00000000, 0x00179822,
590	<	#ifdef __linux__
591	<	0x00010004, (uint32)serial_nothing_tvect,
592	<	#else
593	<	0x00010004, (uint32)SerialNothing,
594	<	#endif
595	<	0x00000000, 0x00000000,
596	<	0xaafe0700, 0x00000000,
597	<	0x00000000, 0x00179822,
598	<	#ifdef __linux__
599	<	0x00010004, (uint32)serial_prime_in_tvect,
600	<	#else
601	<	0x00010004, (uint32)SerialPrimeIn,
602	<	#endif
603	<	0x00000000, 0x00000000,
604	<	0xaafe0700, 0x00000000,
605	<	0x00000000, 0x00179822,
606	<	#ifdef __linux__
607	<	0x00010004, (uint32)serial_control_tvect,
608	<	#else
609	<	0x00010004, (uint32)SerialControl,
610	<	#endif
611	<	0x00000000, 0x00000000,
583	<	0xaafe0700, 0x00000000,
584	<	0x00000000, 0x00179822,
585	<	#ifdef __linux__
586	<	0x00010004, (uint32)serial_status_tvect,
587	<	#else
588	<	0x00010004, (uint32)SerialStatus,
589	<	#endif
590	<	0x00000000, 0x00000000,
591	<	0xaafe0700, 0x00000000,
592	<	0x00000000, 0x00179822,
593	<	#ifdef __linux__
594	<	0x00010004, (uint32)serial_nothing_tvect,
595	<	#else
596	<	0x00010004, (uint32)SerialNothing,
597	<	#endif
598	<	0x00000000, 0x00000000,
583	>	static void gen_bin_driver(uintptr addr)
584	>	{
585	>	SetLongBase(addr);
586	>
587	>	// .BIn driver header
588	>	Long(0x4d000000); Long(0x00000000);
589	>	Long(0x00200040); Long(0x00600080);
590	>	Long(0x00a0042e); Long(0x42496e00);
591	>	Long(0x00000000); Long(0x00000000);
592	>	Long(0xaafe0700); Long(0x00000000);
593	>	Long(0x00000000); Long(0x00179822);
594	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_NOTHING));
595	>	Long(0x00000000); Long(0x00000000);
596	>	Long(0xaafe0700); Long(0x00000000);
597	>	Long(0x00000000); Long(0x00179822);
598	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_PRIME_IN));
599	>	Long(0x00000000); Long(0x00000000);
600	>	Long(0xaafe0700); Long(0x00000000);
601	>	Long(0x00000000); Long(0x00179822);
602	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CONTROL));
603	>	Long(0x00000000); Long(0x00000000);
604	>	Long(0xaafe0700); Long(0x00000000);
605	>	Long(0x00000000); Long(0x00179822);
606	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_STATUS));
607	>	Long(0x00000000); Long(0x00000000);
608	>	Long(0xaafe0700); Long(0x00000000);
609	>	Long(0x00000000); Long(0x00179822);
610	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_NOTHING));
611	>	Long(0x00000000); Long(0x00000000);
612		};
613
614	<	static const uint32 bout_driver[] = {   // .BOut driver header
615	<	0x4d000000, 0x00000000,
616	<	0x00200040, 0x00600080,
617	<	0x00a0052e, 0x424f7574,
618	<	0x00000000, 0x00000000,
619	<	0xaafe0700, 0x00000000,
620	<	0x00000000, 0x00179822,
621	<	#ifdef __linux__
622	<	0x00010004, (uint32)serial_open_tvect,
623	<	#else
624	<	0x00010004, (uint32)SerialOpen,
625	<	#endif
626	<	0x00000000, 0x00000000,
627	<	0xaafe0700, 0x00000000,
628	<	0x00000000, 0x00179822,
629	<	#ifdef __linux__
630	<	0x00010004, (uint32)serial_prime_out_tvect,
631	<	#else
632	<	0x00010004, (uint32)SerialPrimeOut,
633	<	#endif
634	<	0x00000000, 0x00000000,
635	<	0xaafe0700, 0x00000000,
636	<	0x00000000, 0x00179822,
637	<	#ifdef __linux__
638	<	0x00010004, (uint32)serial_control_tvect,
639	<	#else
640	<	0x00010004, (uint32)SerialControl,
641	<	#endif
642	<	0x00000000, 0x00000000,
630	<	0xaafe0700, 0x00000000,
631	<	0x00000000, 0x00179822,
632	<	#ifdef __linux__
633	<	0x00010004, (uint32)serial_status_tvect,
634	<	#else
635	<	0x00010004, (uint32)SerialStatus,
636	<	#endif
637	<	0x00000000, 0x00000000,
638	<	0xaafe0700, 0x00000000,
639	<	0x00000000, 0x00179822,
640	<	#ifdef __linux__
641	<	0x00010004, (uint32)serial_close_tvect,
642	<	#else
643	<	0x00010004, (uint32)SerialClose,
644	<	#endif
645	<	0x00000000, 0x00000000,
614	>	static void gen_bout_driver(uintptr addr)
615	>	{
616	>	SetLongBase(addr);
617	>
618	>	// .BOut driver header
619	>	Long(0x4d000000); Long(0x00000000);
620	>	Long(0x00200040); Long(0x00600080);
621	>	Long(0x00a0052e); Long(0x424f7574);
622	>	Long(0x00000000); Long(0x00000000);
623	>	Long(0xaafe0700); Long(0x00000000);
624	>	Long(0x00000000); Long(0x00179822);
625	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_OPEN));
626	>	Long(0x00000000); Long(0x00000000);
627	>	Long(0xaafe0700); Long(0x00000000);
628	>	Long(0x00000000); Long(0x00179822);
629	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_PRIME_OUT));
630	>	Long(0x00000000); Long(0x00000000);
631	>	Long(0xaafe0700); Long(0x00000000);
632	>	Long(0x00000000); Long(0x00179822);
633	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CONTROL));
634	>	Long(0x00000000); Long(0x00000000);
635	>	Long(0xaafe0700); Long(0x00000000);
636	>	Long(0x00000000); Long(0x00179822);
637	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_STATUS));
638	>	Long(0x00000000); Long(0x00000000);
639	>	Long(0xaafe0700); Long(0x00000000);
640	>	Long(0x00000000); Long(0x00179822);
641	>	Long(0x00010004); Long(NativeTVECT(NATIVE_SERIAL_CLOSE));
642	>	Long(0x00000000); Long(0x00000000);
643		};
644
645		static const uint8 adbop_patch[] = {    // Call ADBOp() completion procedure
#	Line 669 | Line 666 | static const uint8 adbop_patch[] = {   //
666
667
668		/*
669	+	*  Copy PowerPC code to ROM image and reverse bytes if necessary
670	+	*/
671	+
672	+	static inline void memcpy_powerpc_code(void *dst, const void *src, size_t len)
673	+	{
674	+	#ifdef WORDS_BIGENDIAN
675	+	(void)memcpy(dst, src, len);
676	+	#else
677	+	uint32 *d = (uint32 *)dst;
678	+	uint32 *s = (uint32 *)src;
679	+	for (int i = 0; i < len/4; i++)
680	+	d[i] = htonl(s[i]);
681	+	#endif
682	+	}
683	+
684	+
685	+	/*
686		*  Install ROM patches (RAMBase and KernelDataAddr must be set)
687		*/
688
#	Line 691 | Line 705 | bool PatchROM(void)
705		ROMType = ROMTYPE_ZANZIBAR;
706		else if (!memcmp((void *)(ROM_BASE + 0x30d064), "Boot Gazelle", 12))
707		ROMType = ROMTYPE_GAZELLE;
708	+	else if (!memcmp((void *)(ROM_BASE + 0x30d064), "Boot Gossamer", 13))
709	+	ROMType = ROMTYPE_GOSSAMER;
710		else if (!memcmp((void *)(ROM_BASE + 0x30d064), "NewWorld", 8))
711		ROMType = ROMTYPE_NEWWORLD;
712		else
713		return false;
714
715	+	// Check that other ROM addresses point to really free regions
716	+	if (!check_rom_patch_space(CHECK_LOAD_PATCH_SPACE, 0x40))
717	+	return false;
718	+	if (!check_rom_patch_space(PUT_SCRAP_PATCH_SPACE, 0x40))
719	+	return false;
720	+	if (!check_rom_patch_space(GET_SCRAP_PATCH_SPACE, 0x40))
721	+	return false;
722	+	if (!check_rom_patch_space(ADDR_MAP_PATCH_SPACE - 10 * 4, 0x100))
723	+	return false;
724	+
725		// Apply patches
726		if (!patch_nanokernel_boot()) return false;
727		if (!patch_68k_emul()) return false;
#	Line 728 | Line 754 | bool PatchROM(void)
754		static bool patch_nanokernel_boot(void)
755		{
756		uint32 *lp;
757	+	uint32 base, loc;
758
759		// ROM boot structure patches
760		lp = (uint32 *)(ROM_BASE + 0x30d000);
#	Line 740 | Line 767 | static bool patch_nanokernel_boot(void)
767		lp[0xfd8 >> 2] = htonl(ROM_BASE + 0x2a);                // 68k reset vector
768
769		// Skip SR/BAT/SDR init
770	<	if (ROMType == ROMTYPE_GAZELLE || ROMType == ROMTYPE_NEWWORLD) {
771	<	lp = (uint32 *)(ROM_BASE + 0x310000);
770	>	loc = 0x310000;
771	>	if (ROMType == ROMTYPE_GAZELLE || ROMType == ROMTYPE_GOSSAMER || ROMType == ROMTYPE_NEWWORLD) {
772	>	lp = (uint32 *)(ROM_BASE + loc);
773		*lp++ = htonl(POWERPC_NOP);
774		*lp = htonl(0x38000000);
775		}
776	<	static const uint32 sr_init_loc[] = {0x3101b0, 0x3101b0, 0x3101b0, 0x3101ec, 0x310200};
777	<	lp = (uint32 *)(ROM_BASE + 0x310008);
778	<	*lp = htonl(0x48000000 | (sr_init_loc[ROMType] - 8) & 0xffff);  // b            ROM_BASE+0x3101b0
779	<	lp = (uint32 *)(ROM_BASE + sr_init_loc[ROMType]);
776	>	static const uint8 sr_init_dat[] = {0x35, 0x4a, 0xff, 0xfc, 0x7d, 0x86, 0x50, 0x2e};
777	>	if ((base = find_rom_data(0x3101b0, 0x3105b0, sr_init_dat, sizeof(sr_init_dat))) == 0) return false;
778	>	D(bug("sr_init %08lx\n", base));
779	>	lp = (uint32 *)(ROM_BASE + loc + 8);
780	>	*lp = htonl(0x48000000 | ((base - loc - 8) & 0x3fffffc));       // b            ROM_BASE+0x3101b0
781	>	lp = (uint32 *)(ROM_BASE + base);
782		*lp++ = htonl(0x80200000 + XLM_KERNEL_DATA);            // lwz  r1,(pointer to Kernel Data)
783		*lp++ = htonl(0x3da0dead);              // lis  r13,0xdead      (start of kernel memory)
784		*lp++ = htonl(0x3dc00010);              // lis  r14,0x0010      (size of page table)
785		*lp = htonl(0x3de00010);                // lis  r15,0x0010      (size of kernel memory)
786
787		// Don't read PVR
788	<	static const uint32 pvr_loc[] = {0x3103b0, 0x3103b4, 0x3103b4, 0x310400, 0x310438};
789	<	lp = (uint32 *)(ROM_BASE + pvr_loc[ROMType]);
788	>	static const uint8 pvr_read_dat[] = {0x7d, 0x9f, 0x42, 0xa6};
789	>	if ((base = find_rom_data(0x3103b0, 0x3108b0, pvr_read_dat, sizeof(pvr_read_dat))) == 0) return false;
790	>	D(bug("pvr_read %08lx\n", base));
791	>	lp = (uint32 *)(ROM_BASE + base);
792		*lp = htonl(0x81800000 + XLM_PVR);      // lwz  r12,(theoretical PVR)
793
794		// Set CPU specific data (even if ROM doesn't have support for that CPU)
763	–	lp = (uint32 *)(ROM_BASE + pvr_loc[ROMType]);
795		if (ntohl(lp[6]) != 0x2c0c0001)
796		return false;
797		uint32 ofs = ntohl(lp[7]) & 0xffff;
798		D(bug("ofs %08lx\n", ofs));
799		lp[8] = htonl((ntohl(lp[8]) & 0xffff) | 0x48000000);    // beq -> b
800	<	uint32 loc = (ntohl(lp[8]) & 0xffff) + (uint32)(lp+8) - ROM_BASE;
800	>	loc = (ntohl(lp[8]) & 0xffff) + (uint32)(lp+8) - ROM_BASE;
801		D(bug("loc %08lx\n", loc));
802		lp = (uint32 *)(ROM_BASE + ofs + 0x310000);
803		switch (PVR >> 16) {
#	Line 816 | Line 847 | static bool patch_nanokernel_boot(void)
847		lp[7] = htonl(0x00040004);      // Inst cache assoc/Data cache assoc
848		lp[8] = htonl(0x00400002);      // TLB total size/TLB assoc
849		break;
850	<	case 8:         // 750
850	>	case 8:         // 750, 750FX
851	>	case 0x7000:
852		lp[0] = htonl(0x1000);          // Page size
853		lp[1] = htonl(0x8000);          // Data cache size
854		lp[2] = htonl(0x8000);          // Inst cache size
#	Line 840 | Line 872 | static bool patch_nanokernel_boot(void)
872		lp[8] = htonl(0x00800002);      // TLB total size/TLB assoc
873		break;
874		//              case 11:        // X704?
875	<	case 12:        // ???
875	>	case 12:        // 7400, 7410, 7450, 7455, 7457
876	>	case 0x800c:
877	>	case 0x8000:
878	>	case 0x8001:
879	>	case 0x8002:
880		lp[0] = htonl(0x1000);          // Page size
881		lp[1] = htonl(0x8000);          // Data cache size
882		lp[2] = htonl(0x8000);          // Inst cache size
#	Line 875 | Line 911 | static bool patch_nanokernel_boot(void)
911		lp[7] = htonl(0x00080008);      // Inst cache assoc/Data cache assoc
912		lp[8] = htonl(0x00800004);      // TLB total size/TLB assoc
913		break;
914	+	case 0x39:      // 970
915	+	lp[0] = htonl(0x1000);          // Page size
916	+	lp[1] = htonl(0x8000);          // Data cache size
917	+	lp[2] = htonl(0x10000);         // Inst cache size
918	+	lp[3] = htonl(0x00200020);      // Coherency block size/Reservation granule size
919	+	lp[4] = htonl(0x00010020);      // Unified caches/Inst cache line size
920	+	lp[5] = htonl(0x00200020);      // Data cache line size/Data cache block size touch
921	+	lp[6] = htonl(0x00800080);      // Inst cache block size/Data cache block size
922	+	lp[7] = htonl(0x00020002);      // Inst cache assoc/Data cache assoc
923	+	lp[8] = htonl(0x02000004);      // TLB total size/TLB assoc
924	+	break;
925		default:
926		printf("WARNING: Unknown CPU type\n");
927		break;
928		}
929
930		// Don't set SPRG3, don't test MQ
931	<	lp = (uint32 *)(ROM_BASE + loc + 0x20);
932	<	*lp++ = htonl(POWERPC_NOP);
933	<	lp++;
934	<	*lp++ = htonl(POWERPC_NOP);
935	<	lp++;
936	<	*lp = htonl(POWERPC_NOP);
931	>	static const uint8 sprg3_mq_dat[] = {0x7d, 0x13, 0x43, 0xa6, 0x3d, 0x00, 0x00, 0x04, 0x7d, 0x00, 0x03, 0xa6, 0x39, 0x00, 0x00, 0x00, 0x7d, 0x00, 0x02, 0xa6};
932	>	if ((base = find_rom_data(loc + 0x20, loc + 0x60, sprg3_mq_dat, sizeof(sprg3_mq_dat))) == 0) return false;
933	>	D(bug("sprg3/mq %08lx\n", base));
934	>	lp = (uint32 *)(ROM_BASE + base);
935	>	lp[0] = htonl(POWERPC_NOP);
936	>	lp[2] = htonl(POWERPC_NOP);
937	>	lp[4] = htonl(POWERPC_NOP);
938
939		// Don't read MSR
940	<	lp = (uint32 *)(ROM_BASE + loc + 0x40);
940	>	static const uint8 msr_dat[] = {0x7d, 0xc0, 0x00, 0xa6};
941	>	if ((base = find_rom_data(loc + 0x40, loc + 0x80, msr_dat, sizeof(msr_dat))) == 0) return false;
942	>	D(bug("msr %08lx\n", base));
943	>	lp = (uint32 *)(ROM_BASE + base);
944		*lp = htonl(0x39c00000);                // li   r14,0
945
946		// Don't write to DEC
#	Line 899 | Line 950 | static bool patch_nanokernel_boot(void)
950		D(bug("loc %08lx\n", loc));
951
952		// Don't set SPRG3
953	<	lp = (uint32 *)(ROM_BASE + loc + 0x2c);
953	>	static const uint8 sprg3_dat[] = {0x39, 0x21, 0x03, 0x60, 0x7d, 0x33, 0x43, 0xa6, 0x39, 0x01, 0x04, 0x20};
954	>	if ((base = find_rom_data(0x310000, 0x314000, sprg3_dat, sizeof(sprg3_dat))) == 0) return false;
955	>	D(bug("sprg3 %08lx\n", base + 4));
956	>	lp = (uint32 *)(ROM_BASE + base + 4);
957		*lp = htonl(POWERPC_NOP);
958
959		// Don't read PVR
960	<	static const uint32 pvr_ofs[] = {0x138, 0x138, 0x138, 0x140, 0x148};
961	<	lp = (uint32 *)(ROM_BASE + loc + pvr_ofs[ROMType]);
960	>	static const uint8 pvr_read2_dat[] = {0x7e, 0xff, 0x42, 0xa6, 0x56, 0xf7, 0x84, 0x3e};
961	>	if ((base = find_rom_data(0x310000, 0x320000, pvr_read2_dat, sizeof(pvr_read2_dat))) == 0) return false;
962	>	D(bug("pvr_read2 %08lx\n", base));
963	>	lp = (uint32 *)(ROM_BASE + base);
964		*lp = htonl(0x82e00000 + XLM_PVR);              // lwz  r23,(theoretical PVR)
965	<	lp = (uint32 *)(ROM_BASE + loc + 0x170);
966	<	if (ntohl(*lp) == 0x7eff42a6)   // NewWorld ROM
965	>	if ((base = find_rom_data(base + 4, 0x320000, pvr_read2_dat, sizeof(pvr_read2_dat))) != 0) {
966	>	D(bug("pvr_read2 %08lx\n", base));
967	>	lp = (uint32 *)(ROM_BASE + base);
968		*lp = htonl(0x82e00000 + XLM_PVR);      // lwz  r23,(theoretical PVR)
969	<	lp = (uint32 *)(ROM_BASE + 0x313134);
970	<	if (ntohl(*lp) == 0x7e5f42a6)
971	<	*lp = htonl(0x82400000 + XLM_PVR);      // lwz  r18,(theoretical PVR)
972	<	lp = (uint32 *)(ROM_BASE + 0x3131f4);
973	<	if (ntohl(*lp) == 0x7e5f42a6)   // NewWorld ROM
969	>	}
970	>	static const uint8 pvr_read3_dat[] = {0x7e, 0x5f, 0x42, 0xa6, 0x56, 0x52, 0x84, 0x3e};
971	>	if ((base = find_rom_data(0x310000, 0x320000, pvr_read3_dat, sizeof(pvr_read3_dat))) != 0) {
972	>	D(bug("pvr_read3 %08lx\n", base));
973	>	lp = (uint32 *)(ROM_BASE + base);
974		*lp = htonl(0x82400000 + XLM_PVR);      // lwz  r18,(theoretical PVR)
975	<	lp = (uint32 *)(ROM_BASE + 0x314600);
976	<	if (ntohl(*lp) == 0x7d3f42a6)
975	>	}
976	>	static const uint8 pvr_read4_dat[] = {0x7d, 0x3f, 0x42, 0xa6, 0x55, 0x29, 0x84, 0x3e};
977	>	if ((base = find_rom_data(0x310000, 0x320000, pvr_read4_dat, sizeof(pvr_read4_dat))) != 0) {
978	>	D(bug("pvr_read4 %08lx\n", base));
979	>	lp = (uint32 *)(ROM_BASE + base);
980		*lp = htonl(0x81200000 + XLM_PVR);      // lzw  r9,(theoritical PVR)
981	+	}
982
983		// Don't read SDR1
984	<	static const uint32 sdr1_ofs[] = {0x174, 0x174, 0x174, 0x17c, 0x19c};
985	<	lp = (uint32 *)(ROM_BASE + loc + sdr1_ofs[ROMType]);
984	>	static const uint8 sdr1_read_dat[] = {0x7d, 0x19, 0x02, 0xa6, 0x55, 0x16, 0x81, 0xde};
985	>	if ((base = find_rom_data(0x310000, 0x320000, sdr1_read_dat, sizeof(sdr1_read_dat))) == 0) return false;
986	>	D(bug("sdr1_read %08lx\n", base));
987	>	lp = (uint32 *)(ROM_BASE + base);
988		*lp++ = htonl(0x3d00dead);              // lis  r8,0xdead               (pointer to page table)
989		*lp++ = htonl(0x3ec0001f);              // lis  r22,0x001f      (size of page table)
990		*lp = htonl(POWERPC_NOP);
991
992	<	// Don't clear page table
993	<	static const uint32 pgtb_ofs[] = {0x198, 0x198, 0x198, 0x1a0, 0x1c4};
994	<	lp = (uint32 *)(ROM_BASE + loc + pgtb_ofs[ROMType]);
992	>	// Don't clear page table, don't invalidate TLB
993	>	static const uint8 pgtb_clear_dat[] = {0x36, 0xd6, 0xff, 0xfc, 0x7e, 0xe8, 0xb1, 0x2e, 0x41, 0x81, 0xff, 0xf8};
994	>	if ((base = find_rom_data(0x310000, 0x320000, pgtb_clear_dat, sizeof(pgtb_clear_dat))) == 0) return false;
995	>	D(bug("pgtb_clear %08lx\n", base + 4));
996	>	lp = (uint32 *)(ROM_BASE + base + 4);
997		*lp = htonl(POWERPC_NOP);
998	<
999	<	// Don't invalidate TLB
935	<	static const uint32 tlb_ofs[] = {0x1a0, 0x1a0, 0x1a0, 0x1a8, 0x1cc};
936	<	lp = (uint32 *)(ROM_BASE + loc + tlb_ofs[ROMType]);
998	>	D(bug("tblie %08lx\n", base + 12));
999	>	lp = (uint32 *)(ROM_BASE + base + 12);
1000		*lp = htonl(POWERPC_NOP);
1001
1002		// Don't create RAM descriptor table
1003	<	static const uint32 desc_ofs[] = {0x350, 0x350, 0x350, 0x358, 0x37c};
1004	<	lp = (uint32 *)(ROM_BASE + loc + desc_ofs[ROMType]);
1003	>	static const uint8 desc_create_dat[] = {0x97, 0xfd, 0x00, 0x04, 0x3b, 0xff, 0x10, 0x00, 0x4b, 0xff, 0xff, 0xdc};
1004	>	if ((base = find_rom_data(0x310000, 0x320000, desc_create_dat, sizeof(desc_create_dat))) == 0) return false;
1005	>	D(bug("desc_create %08lx\n", base))
1006	>	lp = (uint32 *)(ROM_BASE + base);
1007		*lp = htonl(POWERPC_NOP);
1008
1009		// Don't load SRs and BATs
1010	<	static const uint32 sr_ofs[] = {0x3d8, 0x3d8, 0x3d8, 0x3e0, 0x404};
1011	<	lp = (uint32 *)(ROM_BASE + loc + sr_ofs[ROMType]);
1010	>	static const uint8 sr_load[] = {0x7c, 0x00, 0x04, 0xac, 0x83, 0x9d, 0x00, 0x00, 0x93, 0x81, 0x05, 0xe8};
1011	>	if ((loc = find_rom_data(0x310000, 0x320000, sr_load, sizeof(sr_load))) == 0) return false;
1012	>	static const uint8 sr_load_caller[] = {0x3e, 0xd6, 0xff, 0xff, 0x41, 0x81, 0xff, 0xdc, 0xb2, 0xc8, 0x00, 0x02};
1013	>	if ((base = find_rom_data(0x310000, 0x320000, sr_load_caller, sizeof(sr_load_caller))) == 0) return false;
1014	>	if ((base = find_rom_powerpc_branch(base + 12, 0x320000, loc)) == 0) return false;
1015	>	D(bug("sr_load %08lx, called from %08lx\n", loc, base));
1016	>	lp = (uint32 *)(ROM_BASE + base);
1017		*lp = htonl(POWERPC_NOP);
1018
1019		// Don't mess with SRs
1020	<	static const uint32 sr2_ofs[] = {0x312118, 0x312118, 0x312118, 0x312118, 0x3121b4};
1021	<	lp = (uint32 *)(ROM_BASE + sr2_ofs[ROMType]);
1020	>	static const uint8 sr_load2_dat[] = {0x83, 0xa1, 0x05, 0xe8, 0x57, 0x7c, 0x3e, 0x78, 0x7f, 0xbd, 0xe0, 0x2e};
1021	>	if ((base = find_rom_data(0x310000, 0x320000, sr_load2_dat, sizeof(sr_load2_dat))) == 0) return false;
1022	>	D(bug("sr_load2 %08lx\n", base));
1023	>	lp = (uint32 *)(ROM_BASE + base);
1024		*lp = htonl(POWERPC_BLR);
1025
1026		// Don't check performance monitor
1027	<	static const uint32 pm_ofs[] = {0x313148, 0x313148, 0x313148, 0x313148, 0x313218};
1028	<	lp = (uint32 *)(ROM_BASE + pm_ofs[ROMType]);
1029	<	while (ntohl(*lp) != 0x7e58eba6) lp++;
1030	<	*lp++ = htonl(POWERPC_NOP);
1031	<	while (ntohl(*lp) != 0x7e78eaa6) lp++;
1032	<	*lp++ = htonl(POWERPC_NOP);
1033	<	while (ntohl(*lp) != 0x7e59eba6) lp++;
1034	<	*lp++ = htonl(POWERPC_NOP);
1035	<	while (ntohl(*lp) != 0x7e79eaa6) lp++;
1036	<	*lp++ = htonl(POWERPC_NOP);
1037	<	while (ntohl(*lp) != 0x7e5aeba6) lp++;
1038	<	*lp++ = htonl(POWERPC_NOP);
1039	<	while (ntohl(*lp) != 0x7e7aeaa6) lp++;
1040	<	*lp++ = htonl(POWERPC_NOP);
1041	<	while (ntohl(*lp) != 0x7e5beba6) lp++;
1042	<	*lp++ = htonl(POWERPC_NOP);
1043	<	while (ntohl(*lp) != 0x7e7beaa6) lp++;
1044	<	*lp++ = htonl(POWERPC_NOP);
1045	<	while (ntohl(*lp) != 0x7e5feba6) lp++;
1046	<	*lp++ = htonl(POWERPC_NOP);
1047	<	while (ntohl(*lp) != 0x7e7feaa6) lp++;
1048	<	*lp++ = htonl(POWERPC_NOP);
1049	<	while (ntohl(*lp) != 0x7e5ceba6) lp++;
1050	<	*lp++ = htonl(POWERPC_NOP);
979	<	while (ntohl(*lp) != 0x7e7ceaa6) lp++;
980	<	*lp++ = htonl(POWERPC_NOP);
981	<	while (ntohl(*lp) != 0x7e5deba6) lp++;
982	<	*lp++ = htonl(POWERPC_NOP);
983	<	while (ntohl(*lp) != 0x7e7deaa6) lp++;
984	<	*lp++ = htonl(POWERPC_NOP);
985	<	while (ntohl(*lp) != 0x7e5eeba6) lp++;
986	<	*lp++ = htonl(POWERPC_NOP);
987	<	while (ntohl(*lp) != 0x7e7eeaa6) lp++;
988	<	*lp++ = htonl(POWERPC_NOP);
1027	>	static const uint8 pm_check_dat[] = {0x7e, 0x58, 0xeb, 0xa6, 0x7e, 0x53, 0x90, 0xf8, 0x7e, 0x78, 0xea, 0xa6};
1028	>	if ((base = find_rom_data(0x310000, 0x320000, pm_check_dat, sizeof(pm_check_dat))) == 0) return false;
1029	>	D(bug("pm_check %08lx\n", base));
1030	>	lp = (uint32 *)(ROM_BASE + base);
1031	>
1032	>	static const int spr_check_list[] = {
1033	>	952 /* mmcr0 */, 953 /* pmc1 */, 954 /* pmc2 */, 955 /* sia */,
1034	>	956 /* mmcr1 */, 957 /* pmc3 */, 958 /* pmc4 */, 959 /* sda */
1035	>	};
1036	>
1037	>	for (int i = 0; i < sizeof(spr_check_list)/sizeof(spr_check_list[0]); i++) {
1038	>	int spr = spr_check_list[i];
1039	>	uint32 mtspr = 0x7e4003a6 | ((spr & 0x1f) << 16) | ((spr & 0x3e0) << 6);
1040	>	uint32 mfspr = 0x7e6002a6 | ((spr & 0x1f) << 16) | ((spr & 0x3e0) << 6);
1041	>	for (int ofs = 0; ofs < 64; ofs++) {
1042	>	if (ntohl(lp[ofs]) == mtspr) {
1043	>	if (ntohl(lp[ofs + 2]) != mfspr)
1044	>	return false;
1045	>	D(bug("  SPR%d %08lx\n", spr, base + 4*ofs));
1046	>	lp[ofs] = htonl(POWERPC_NOP);
1047	>	lp[ofs + 2] = htonl(POWERPC_NOP);
1048	>	}
1049	>	}
1050	>	}
1051
1052		// Jump to 68k emulator
1053	<	static const uint32 jump68k_ofs[] = {0x40c, 0x40c, 0x40c, 0x414, 0x438};
1054	<	lp = (uint32 *)(ROM_BASE + loc + jump68k_ofs[ROMType]);
1053	>	static const uint8 jump68k_dat[] = {0x7d, 0x92, 0x43, 0xa6, 0x7d, 0x5a, 0x03, 0xa6, 0x7d, 0x7b, 0x03, 0xa6};
1054	>	if ((loc = find_rom_data(0x310000, 0x320000, jump68k_dat, sizeof(jump68k_dat))) == 0) return false;
1055	>	static const uint8 jump68k_caller_dat[] = {0x85, 0x13, 0x00, 0x08, 0x56, 0xbf, 0x50, 0x3e, 0x63, 0xff, 0x0c, 0x00};
1056	>	if ((base = find_rom_data(0x310000, 0x320000, jump68k_caller_dat, sizeof(jump68k_caller_dat))) == 0) return false;
1057	>	if ((base = find_rom_powerpc_branch(base + 12, 0x320000, loc)) == 0) return false;
1058	>	D(bug("jump68k %08lx, called from %08lx\n", loc, base));
1059	>	lp = (uint32 *)(ROM_BASE + base);
1060		*lp++ = htonl(0x80610634);              // lwz  r3,0x0634(r1)   (pointer to Emulator Data)
1061		*lp++ = htonl(0x8081119c);              // lwz  r4,0x119c(r1)   (pointer to opcode table)
1062		*lp++ = htonl(0x80011184);              // lwz  r0,0x1184(r1)   (pointer to emulator init routine)
#	Line 1006 | Line 1073 | static bool patch_nanokernel_boot(void)
1073		static bool patch_68k_emul(void)
1074		{
1075		uint32 *lp;
1076	<	uint32 base;
1076	>	uint32 base, loc;
1077
1078		// Overwrite twi instructions
1079	<	static const uint32 twi_loc[] = {0x36e680, 0x36e6c0, 0x36e6c0, 0x36e6c0, 0x36e740};
1080	<	base = twi_loc[ROMType];
1079	>	static const uint8 twi_dat[] = {0x0f, 0xff, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x01, 0x0f, 0xff, 0x00, 0x02};
1080	>	if ((base = find_rom_data(0x36e600, 0x36ea00, twi_dat, sizeof(twi_dat))) == 0) return false;
1081	>	D(bug("twi %08lx\n", base));
1082		lp = (uint32 *)(ROM_BASE + base);
1083		*lp++ = htonl(0x48000000 + 0x36f900 - base);            // b 0x36f900 (Emulator start)
1084		*lp++ = htonl(0x48000000 + 0x36fa00 - base - 4);        // b 0x36fa00 (Mixed mode)
#	Line 1030 | Line 1098 | static bool patch_68k_emul(void)
1098		*lp = htonl(POWERPC_ILLEGAL);
1099
1100		#if EMULATED_PPC
1101	<	// Install EMUL_RETURN, EXEC_RETURN and EMUL_OP opcodes
1101	>	// Install EMUL_RETURN, EXEC_RETURN, EXEC_NATIVE and EMUL_OP opcodes
1102		lp = (uint32 *)(ROM_BASE + 0x380000 + (M68K_EMUL_RETURN << 3));
1103		*lp++ = htonl(POWERPC_EMUL_OP);
1104		*lp++ = htonl(0x4bf66e80);                                                      // b    0x366084
1105		*lp++ = htonl(POWERPC_EMUL_OP | 1);
1106		*lp++ = htonl(0x4bf66e78);                                                      // b    0x366084
1107	+	*lp++ = htonl(POWERPC_EMUL_OP | 2);
1108	+	*lp++ = htonl(0x4bf66e70);                                                      // b    0x366084
1109		for (int i=0; i<OP_MAX; i++) {
1110	<	*lp++ = htonl(POWERPC_EMUL_OP | (i + 2));
1111	<	*lp++ = htonl(0x4bf66e70 - i*8);                        // b    0x366084
1110	>	*lp++ = htonl(POWERPC_EMUL_OP | (i + 3));
1111	>	*lp++ = htonl(0x4bf66e68 - i*8);                                // b    0x366084
1112		}
1113		#else
1114		// Install EMUL_RETURN, EXEC_RETURN and EMUL_OP opcodes
#	Line 1047 | Line 1117 | static bool patch_68k_emul(void)
1117		*lp++ = htonl(0x4bf705fc);                                                      // b    0x36f800
1118		*lp++ = htonl(0x80000000 + XLM_EXEC_RETURN_PROC);       // lwz  r0,XLM_EXEC_RETURN_PROC
1119		*lp++ = htonl(0x4bf705f4);                                                      // b    0x36f800
1120	+	*lp++ = htonl(0x00dead00);                                                      // Let SheepShaver crash, since
1121	+	*lp++ = htonl(0x00beef00);                                                      // no native opcode is available
1122		for (int i=0; i<OP_MAX; i++) {
1123		*lp++ = htonl(0x38a00000 + i);                          // li   r5,OP_*
1124	<	*lp++ = htonl(0x4bf705f4 - i*8);                        // b    0x36f808
1124	>	*lp++ = htonl(0x4bf705ec - i*8);                        // b    0x36f808
1125		}
1126
1127		// Extra routines for EMUL_RETURN/EXEC_RETURN/EMUL_OP
#	Line 1193 | Line 1265 | static bool patch_68k_emul(void)
1265		return false;
1266		dr_found:
1267		lp++;
1268	<	*lp = htonl(0x48000000 + 0xf000 - (((uint32)lp - ROM_BASE) & 0xffff));          // b    DR_CACHE_BASE+0x1f000
1269	<	lp = (uint32 *)(ROM_BASE + 0x37f000);
1270	<	*lp++ = htonl(0x3c000000 + ((ROM_BASE + 0x46d0a4) >> 16));              // lis  r0,xxx
1271	<	*lp++ = htonl(0x60000000 + ((ROM_BASE + 0x46d0a4) & 0xffff));   // ori  r0,r0,xxx
1272	<	*lp++ = htonl(0x7c0903a6);                                                                              // mtctr        r0
1273	<	*lp = htonl(POWERPC_BCTR);                                                                              // bctr
1268	>	loc = (uint32)lp - ROM_BASE;
1269	>	if ((base = powerpc_branch_target(ROM_BASE + loc)) == 0) base = ROM_BASE + loc;
1270	>	static const uint8 dr_ret_dat[] = {0x80, 0xbf, 0x08, 0x14, 0x53, 0x19, 0x4d, 0xac, 0x7c, 0xa8, 0x03, 0xa6};
1271	>	if ((base = find_rom_data(base - ROM_BASE, 0x380000, dr_ret_dat, sizeof(dr_ret_dat))) == 0) return false;
1272	>	D(bug("dr_ret %08lx\n", base));
1273	>	if (base != loc) {
1274	>	// OldWorld ROMs contain an absolute branch
1275	>	D(bug(" patching absolute branch at %08x\n", (uint32)lp - ROM_BASE));
1276	>	*lp = htonl(0x48000000 + 0xf000 - (((uint32)lp - ROM_BASE) & 0xffff));          // b    DR_CACHE_BASE+0x1f000
1277	>	lp = (uint32 *)(ROM_BASE + 0x37f000);
1278	>	*lp++ = htonl(0x3c000000 + ((ROM_BASE + base) >> 16));                  // lis  r0,xxx
1279	>	*lp++ = htonl(0x60000000 + ((ROM_BASE + base) & 0xffff));               // ori  r0,r0,xxx
1280	>	*lp++ = htonl(0x7c0803a6);                                                                              // mtlr r0
1281	>	*lp = htonl(POWERPC_BLR);                                                                               // blr
1282	>	}
1283		return true;
1284		}
1285
#	Line 1210 | Line 1291 | dr_found:
1291		static bool patch_nanokernel(void)
1292		{
1293		uint32 *lp;
1294	+	uint32 base, loc;
1295
1296		// Patch Mixed Mode trap
1297	<	lp = (uint32 *)(ROM_BASE + 0x313c90);   // Don't translate virtual->physical
1298	<	while (ntohl(*lp) != 0x3ba10320) lp++;
1299	<	lp++;
1300	<	*lp++ = htonl(0x7f7fdb78);                                      // mr           r31,r27
1301	<	lp++;
1302	<	*lp = htonl(POWERPC_NOP);
1303	<
1304	<	lp = (uint32 *)(ROM_BASE + 0x313c3c);   // Don't activate PPC exception table
1305	<	while (ntohl(*lp) != 0x39010420) lp++;
1297	>	static const uint8 virt2phys_dat[] = {0x7d, 0x1b, 0x43, 0x78, 0x3b, 0xa1, 0x03, 0x20};
1298	>	if ((base = find_rom_data(0x313000, 0x314000, virt2phys_dat, sizeof(virt2phys_dat))) == 0) return false;
1299	>	D(bug("virt2phys %08lx\n", base + 8));
1300	>	lp = (uint32 *)(ROM_BASE + base + 8);   // Don't translate virtual->physical
1301	>	lp[0] = htonl(0x7f7fdb78);                                      // mr           r31,r27
1302	>	lp[2] = htonl(POWERPC_NOP);
1303	>
1304	>	static const uint8 ppc_excp_tbl_dat[] = {0x39, 0x01, 0x04, 0x20, 0x7d, 0x13, 0x43, 0xa6};
1305	>	if ((base = find_rom_data(0x313000, 0x314000, ppc_excp_tbl_dat, sizeof(ppc_excp_tbl_dat))) == 0) return false;
1306	>	D(bug("ppc_excp_tbl %08lx\n", base));
1307	>	lp = (uint32 *)(ROM_BASE + base);               // Don't activate PPC exception table
1308		*lp++ = htonl(0x39000000 + MODE_NATIVE);        // li   r8,MODE_NATIVE
1309	<	*lp = htonl(0x91000000 + XLM_RUN_MODE); // stw  r8,XLM_RUN_MODE
1309	>	*lp = htonl(0x91000000 + XLM_RUN_MODE);         // stw  r8,XLM_RUN_MODE
1310
1311	<	lp = (uint32 *)(ROM_BASE + 0x312e88);   // Don't modify MSR to turn on FPU
1312	<	while (ntohl(*lp) != 0x556b04e2) lp++;
1313	<	lp -= 4;
1311	>	static const uint8 save_fpu_dat[] = {0x7d, 0x00, 0x00, 0xa6, 0x61, 0x08, 0x20, 0x00, 0x7d, 0x00, 0x01, 0x24};
1312	>	if ((base = find_rom_data(0x310000, 0x314000, save_fpu_dat, sizeof(save_fpu_dat))) == 0) return false;
1313	>	D(bug("save_fpu %08lx\n", base));
1314	>	lp = (uint32 *)(ROM_BASE + base);               // Don't modify MSR to turn on FPU
1315	>	if (ntohl(lp[4]) != 0x556b04e2) return false;
1316	>	loc = ROM_BASE + base;
1317	>	#if 1
1318	>	// FIXME: is that really intended?
1319		*lp++ = htonl(POWERPC_NOP);
1320		lp++;
1321		*lp++ = htonl(POWERPC_NOP);
1322		lp++;
1323		*lp = htonl(POWERPC_NOP);
1324	+	#else
1325	+	lp[0] = htonl(POWERPC_NOP);
1326	+	lp[1] = htonl(POWERPC_NOP);
1327	+	lp[2] = htonl(POWERPC_NOP);
1328	+	lp[3] = htonl(POWERPC_NOP);
1329	+	#endif
1330
1331	<	lp = (uint32 *)(ROM_BASE + 0x312b3c);   // Always save FPU state
1332	<	while (ntohl(*lp) != 0x81010668) lp++;
1333	<	lp--;
1331	>	static const uint8 save_fpu_caller_dat[] = {0x93, 0xa6, 0x01, 0xec, 0x93, 0xc6, 0x01, 0xf4, 0x93, 0xe6, 0x01, 0xfc, 0x40};
1332	>	if ((base = find_rom_data(0x310000, 0x314000, save_fpu_caller_dat, sizeof(save_fpu_caller_dat))) == 0) return false;
1333	>	D(bug("save_fpu_caller %08lx\n", base + 12));
1334	>	if (powerpc_branch_target(ROM_BASE + base + 12) != loc) return false;
1335	>	lp = (uint32 *)(ROM_BASE + base + 12);  // Always save FPU state
1336		*lp = htonl(0x48000000 | (ntohl(*lp) & 0xffff));        // bl   0x00312e88
1337
1338	<	lp = (uint32 *)(ROM_BASE + 0x312b44);   // Don't read DEC
1339	<	while (ntohl(*lp) != 0x7ff602a6) lp++;
1340	<	*lp = htonl(0x3be00000);                                        // li   r31,0
1341	<
1342	<	lp = (uint32 *)(ROM_BASE + 0x312b50);   // Don't write DEC
1246	<	while (ntohl(*lp) != 0x7d1603a6) lp++;
1338	>	static const uint8 mdec_dat[] = {0x7f, 0xf6, 0x02, 0xa6, 0x2c, 0x08, 0x00, 0x00, 0x93, 0xe1, 0x06, 0x68, 0x7d, 0x16, 0x03, 0xa6};
1339	>	if ((base = find_rom_data(0x310000, 0x314000, mdec_dat, sizeof(mdec_dat))) == 0) return false;
1340	>	D(bug("mdec %08lx\n", base));
1341	>	lp = (uint32 *)(ROM_BASE + base);               // Don't modify DEC
1342	>	lp[0] = htonl(0x3be00000);                                      // li   r31,0
1343		#if 1
1344	<	*lp++ = htonl(POWERPC_NOP);
1345	<	*lp = htonl(POWERPC_NOP);
1344	>	lp[3] = htonl(POWERPC_NOP);
1345	>	lp[4] = htonl(POWERPC_NOP);
1346		#else
1347	<	*lp++ = htonl(0x39000040);                                      // li   r8,0x40
1348	<	*lp = htonl(0x990600e4);                                        // stb  r8,0xe4(r6)
1347	>	lp[3] = htonl(0x39000040);                                      // li   r8,0x40
1348	>	lp[4] = htonl(0x990600e4);                                      // stb  r8,0xe4(r6)
1349		#endif
1350
1351	<	lp = (uint32 *)(ROM_BASE + 0x312b9c);   // Always restore FPU state
1352	<	while (ntohl(*lp) != 0x7c00092d) lp++;
1353	<	lp--;
1351	>	static const uint8 restore_fpu_caller_dat[] = {0x81, 0x06, 0x00, 0xf4, 0x81, 0x46, 0x00, 0xfc, 0x7d, 0x09, 0x03, 0xa6, 0x40};
1352	>	if ((base = find_rom_data(0x310000, 0x314000, restore_fpu_caller_dat, sizeof(restore_fpu_caller_dat))) == 0) return false;
1353	>	D(bug("restore_fpu_caller %08lx\n", base + 12));
1354	>	lp = (uint32 *)(ROM_BASE + base + 12);  // Always restore FPU state
1355		*lp = htonl(0x48000000 | (ntohl(*lp) & 0xffff));        // bl   0x00312ddc
1356
1357	<	lp = (uint32 *)(ROM_BASE + 0x312a68);   // Don't activate 68k exception table
1358	<	while (ntohl(*lp) != 0x39010360) lp++;
1357	>	static const uint8 m68k_excp_tbl_dat[] = {0x81, 0x21, 0x06, 0x58, 0x39, 0x01, 0x03, 0x60, 0x7d, 0x13, 0x43, 0xa6};
1358	>	if ((base = find_rom_data(0x310000, 0x314000, m68k_excp_tbl_dat, sizeof(m68k_excp_tbl_dat))) == 0) return false;
1359	>	D(bug("m68k_excp %08lx\n", base + 4));
1360	>	lp = (uint32 *)(ROM_BASE + base + 4);   // Don't activate 68k exception table
1361		*lp++ = htonl(0x39000000 + MODE_68K);           // li   r8,MODE_68K
1362		*lp = htonl(0x91000000 + XLM_RUN_MODE);         // stw  r8,XLM_RUN_MODE
1363
1364		// Patch 68k emulator trap routine
1365	<	lp = (uint32 *)(ROM_BASE + 0x312994);   // Always restore FPU state
1366	<	while (ntohl(*lp) != 0x39260040) lp++;
1367	<	lp--;
1365	>	static const uint8 restore_fpu_caller2_dat[] = {0x81, 0x86, 0x00, 0x8c, 0x80, 0x66, 0x00, 0x94, 0x80, 0x86, 0x00, 0x9c, 0x40};
1366	>	if ((base = find_rom_data(0x310000, 0x314000, restore_fpu_caller2_dat, sizeof(restore_fpu_caller2_dat))) == 0) return false;
1367	>	D(bug("restore_fpu_caller2 %08lx\n", base + 12));
1368	>	loc = powerpc_branch_target(ROM_BASE + base + 12) - ROM_BASE;
1369	>	lp = (uint32 *)(ROM_BASE + base + 12);  // Always restore FPU state
1370		*lp = htonl(0x48000000 | (ntohl(*lp) & 0xffff));        // bl   0x00312dd4
1371
1372	<	lp = (uint32 *)(ROM_BASE + 0x312dd8);   // Don't modify MSR to turn on FPU
1373	<	while (ntohl(*lp) != 0x810600e4) lp++;
1374	<	lp--;
1372	>	static const uint8 restore_fpu_dat[] = {0x55, 0x68, 0x04, 0xa5, 0x4c, 0x82, 0x00, 0x20, 0x81, 0x06, 0x00, 0xe4};
1373	>	if ((base = find_rom_data(0x310000, 0x314000, restore_fpu_dat, sizeof(restore_fpu_dat))) == 0) return false;
1374	>	D(bug("restore_fpu %08lx\n", base));
1375	>	if (base != loc) return false;
1376	>	lp = (uint32 *)(ROM_BASE + base + 4);   // Don't modify MSR to turn on FPU
1377		*lp++ = htonl(POWERPC_NOP);
1378		lp += 2;
1379		*lp++ = htonl(POWERPC_NOP);
#	Line 1280 | Line 1383 | static bool patch_nanokernel(void)
1383		*lp = htonl(POWERPC_NOP);
1384
1385		// Patch trap return routine
1386	<	lp = (uint32 *)(ROM_BASE + 0x312c20);
1387	<	while (ntohl(*lp) != 0x7d5a03a6) lp++;
1386	>	static const uint8 trap_return_dat[] = {0x80, 0xc1, 0x00, 0x18, 0x80, 0x21, 0x00, 0x04, 0x4c, 0x00, 0x00, 0x64};
1387	>	if ((base = find_rom_data(0x312000, 0x320000, trap_return_dat, sizeof(trap_return_dat))) == 0) return false;
1388	>	D(bug("trap_return %08lx\n", base + 8));
1389	>	lp = (uint32 *)(ROM_BASE + base + 8);   // Replace rfi
1390	>	*lp = htonl(POWERPC_BCTR);
1391	>
1392	>	while (ntohl(*lp) != 0x7d5a03a6) lp--;
1393		*lp++ = htonl(0x7d4903a6);                                      // mtctr        r10
1394		*lp++ = htonl(0x7daff120);                                      // mtcr r13
1395	<	*lp = htonl(0x48000000 + 0x8000 - (((uint32)lp - ROM_BASE) & 0xffff));  // b            ROM_BASE+0x318000
1396	<	uint32 xlp = ((uint32)(lp+1) - ROM_BASE) & 0xffff;
1289	<
1290	<	lp = (uint32 *)(ROM_BASE + 0x312c50);   // Replace rfi
1291	<	while (ntohl(*lp) != 0x4c000064) lp++;
1292	<	*lp = htonl(POWERPC_BCTR);
1395	>	*lp = htonl(0x48000000 + ((0x318000 - ((uint32)lp - ROM_BASE)) & 0x03fffffc));  // b            ROM_BASE+0x318000
1396	>	uint32 npc = (uint32)(lp + 1) - ROM_BASE;
1397
1398		lp = (uint32 *)(ROM_BASE + 0x318000);
1399		*lp++ = htonl(0x81400000 + XLM_IRQ_NEST);       // lwz  r10,XLM_IRQ_NEST
1400		*lp++ = htonl(0x394affff);                                      // subi r10,r10,1
1401		*lp++ = htonl(0x91400000 + XLM_IRQ_NEST);       // stw  r10,XLM_IRQ_NEST
1402	<	*lp = htonl(0x48000000 + ((xlp - 0x800c) & 0x03fffffc));        // b            ROM_BASE+0x312c2c
1402	>	*lp = htonl(0x48000000 + ((npc - 0x31800c) & 0x03fffffc));      // b            ROM_BASE+0x312c2c
1403	>
1404		/*
1405		// Disable FE0A/FE06 opcodes
1406		lp = (uint32 *)(ROM_BASE + 0x3144ac);
#	Line 1315 | Line 1420 | static bool patch_68k(void)
1420		uint32 *lp;
1421		uint16 *wp;
1422		uint8 *bp;
1423	<	uint32 base;
1423	>	uint32 base, loc;
1424
1425		// Remove 68k RESET instruction
1426		static const uint8 reset_dat[] = {0x4e, 0x70};
#	Line 1365 | Line 1470 | static bool patch_68k(void)
1470		lp[0x28 >> 2] = htonl(0x00000861);
1471		lp[0x58 >> 2] = htonl(0x30200000);
1472		lp[0x60 >> 2] = htonl(0x0000003d);
1473	+	} else if (ROMType == ROMTYPE_GOSSAMER) {
1474	+	base = 0x12d20;
1475	+	lp = (uint32 *)(ROM_BASE + base - 0x14);
1476	+	lp[0x00 >> 2] = htonl(ADDR_MAP_PATCH_SPACE - (base - 0x14));
1477	+	lp[0x10 >> 2] = htonl(0xcc003d11);              // Make it like the PowerMac 9500 UniversalInfo
1478	+	lp[0x14 >> 2] = htonl(0x3fff0401);
1479	+	lp[0x18 >> 2] = htonl(0x0300001c);
1480	+	lp[0x1c >> 2] = htonl(0x000108c4);
1481	+	lp[0x24 >> 2] = htonl(0xc301bf26);
1482	+	lp[0x28 >> 2] = htonl(0x00000861);
1483	+	lp[0x58 >> 2] = htonl(0x30410000);
1484	+	lp[0x60 >> 2] = htonl(0x0000003d);
1485		}
1486
1487		// Construct AddrMap for NewWorld ROM
1488	<	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_ZANZIBAR) {
1488	>	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GOSSAMER) {
1489		lp = (uint32 *)(ROM_BASE + ADDR_MAP_PATCH_SPACE);
1490		memset(lp - 10, 0, 0x128);
1491		lp[-10] = htonl(0x0300001c);
#	Line 1494 | Line 1611 | static bool patch_68k(void)
1611		*wp++ = htons(M68K_EMUL_OP_XPRAM2);
1612		*wp = htons(0x4ed3);                    // jmp  (a3)
1613
1614	<	static const uint32 nvram3_loc[] = {0x582f0, 0xa0a0, 0x7e50, 0xa1d0, 0};
1615	<	wp = (uint16 *)(ROM_BASE + nvram3_loc[ROMType]);
1614	>	static const uint8 nvram3_dat[] = {0x4e, 0xd3, 0x06, 0x41, 0x13, 0x00};
1615	>	if ((base = find_rom_data(0x7000, 0xb000, nvram3_dat, sizeof(nvram3_dat))) == 0) return false;
1616	>	D(bug("nvram3 %08lx\n", base));
1617	>	wp = (uint16 *)(ROM_BASE + base + 2);
1618	>	*wp++ = htons(M68K_EMUL_OP_XPRAM3);
1619	>	*wp = htons(0x4ed3);                    // jmp  (a3)
1620	>
1621	>	static const uint32 nvram4_loc[] = {0x582f0, 0xa0a0, 0x7e50, 0xa1d0, 0x538d0, 0};
1622	>	wp = (uint16 *)(ROM_BASE + nvram4_loc[ROMType]);
1623		*wp++ = htons(0x202f);                  // move.l       4(sp),d0
1624		*wp++ = htons(0x0004);
1625		*wp++ = htons(M68K_EMUL_OP_NVRAM1);
#	Line 1508 | Line 1632 | static bool patch_68k(void)
1632		*wp = htons(0x0004);
1633		}
1634
1635	<	static const uint32 nvram4_loc[] = {0x58460, 0xa0f0, 0x7f40, 0xa220, 0};
1636	<	wp = (uint16 *)(ROM_BASE + nvram4_loc[ROMType]);
1635	>	static const uint32 nvram5_loc[] = {0x58460, 0xa0f0, 0x7f40, 0xa220, 0x53a20, 0};
1636	>	wp = (uint16 *)(ROM_BASE + nvram5_loc[ROMType]);
1637		if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GAZELLE) {
1638		*wp++ = htons(0x202f);                  // move.l       4(sp),d0
1639		*wp++ = htons(0x0004);
#	Line 1537 | Line 1661 | static bool patch_68k(void)
1661		*wp = htons(M68K_NOP);
1662
1663		// Don't initialize SCC (via 0x1ac)
1664	<	static const uint8 scc_init_dat[] = {0x48, 0xe7, 0x38, 0xfe};
1665	<	if ((base = find_rom_data(0x190, 0x1f0, scc_init_dat, sizeof(scc_init_dat))) == 0) return false;
1664	>	static const uint8 scc_init_caller_dat[] = {0x21, 0xce, 0x01, 0x08, 0x22, 0x78, 0x0d, 0xd8};
1665	>	if ((base = find_rom_data(0x180, 0x1f0, scc_init_caller_dat, sizeof(scc_init_caller_dat))) == 0) return false;
1666	>	D(bug("scc_init_caller %08lx\n", base + 12));
1667	>	wp = (uint16 *)(ROM_BASE + base + 12);
1668	>	loc = ntohs(wp[1]) + ((uintptr)wp - ROM_BASE) + 2;
1669	>	static const uint8 scc_init_dat[] = {0x20, 0x78, 0x01, 0xdc, 0x22, 0x78, 0x01, 0xd8};
1670	>	if ((base = find_rom_data(loc, loc + 0x80, scc_init_dat, sizeof(scc_init_dat))) == 0) return false;
1671		D(bug("scc_init %08lx\n", base));
1672	<	wp = (uint16 *)(ROM_BASE + base - 2);
1544	<	wp = (uint16 *)(ROM_BASE + ntohs(*wp) + base - 2);
1672	>	wp = (uint16 *)(ROM_BASE + base);
1673		*wp++ = htons(M68K_EMUL_OP_RESET);
1674		*wp = htons(M68K_RTS);
1675
#	Line 1623 | Line 1751 | static bool patch_68k(void)
1751		*wp++ = htons(M68K_NOP);
1752		*wp = htons(M68K_NOP);
1753
1754	<	// Gestalt PowerPC page size, RAM size (InitGestalt, via 0x25c)
1754	>	// Gestalt PowerPC page size, CPU type, RAM size (InitGestalt, via 0x25c)
1755		static const uint8 page_size2_dat[] = {0x26, 0x79, 0x5f, 0xff, 0xef, 0xd8, 0x25, 0x6b, 0x00, 0x10, 0x00, 0x1e};
1756		if ((base = find_rom_data(0x50000, 0x70000, page_size2_dat, sizeof(page_size2_dat))) == 0) return false;
1757		D(bug("page_size2 %08lx\n", base));
#	Line 1633 | Line 1761 | static bool patch_68k(void)
1761		*wp++ = htons(0x1000);
1762		*wp++ = htons(0x001e);
1763		*wp++ = htons(0x157c);                  // move.b       #PVR,$1d(a2)
1764	<	*wp++ = htons(PVR >> 16);
1764	>	uint32 cput = (PVR >> 16);
1765	>	if (cput == 0x7000)
1766	>	cput |= 0x20;
1767	>	else if (cput >= 0x8000 && cput <= 0x8002)
1768	>	cput |= 0x10;
1769	>	cput &= 0xff;
1770	>	*wp++ = htons(cput);
1771		*wp++ = htons(0x001d);
1772		*wp++ = htons(0x263c);                  // move.l       #RAMSize,d3
1773		*wp++ = htons(RAMSize >> 16);
#	Line 1686 | Line 1820 | static bool patch_68k(void)
1820		if ((base = find_rom_data(0x13000, 0x20000, gc_mask2_dat, sizeof(gc_mask2_dat))) == 0) return false;
1821		D(bug("gc_mask2 %08lx\n", base));
1822		wp = (uint16 *)(ROM_BASE + base);
1823	+	if (ROMType == ROMTYPE_GOSSAMER) {
1824	+	*wp++ = htons(M68K_NOP);
1825	+	*wp++ = htons(M68K_NOP);
1826	+	*wp++ = htons(M68K_NOP);
1827	+	*wp++ = htons(M68K_NOP);
1828	+	}
1829		for (int i=0; i<5; i++) {
1830		*wp++ = htons(M68K_NOP);
1831		*wp++ = htons(M68K_NOP);
#	Line 1693 | Line 1833 | static bool patch_68k(void)
1833		*wp++ = htons(M68K_NOP);
1834		wp += 2;
1835		}
1836	<	if (ROMType == ROMTYPE_ZANZIBAR) {
1836	>	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GOSSAMER) {
1837		for (int i=0; i<6; i++) {
1838		*wp++ = htons(M68K_NOP);
1839		*wp++ = htons(M68K_NOP);
#	Line 1766 | Line 1906 | static bool patch_68k(void)
1906		*wp = htons(M68K_RTS);
1907
1908		// Don't install Time Manager task for 60Hz interrupt (Enable60HzInts, via 0x2b8)
1909	<	if (ROMType == ROMTYPE_NEWWORLD) {
1909	>	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
1910		static const uint8 tm_task_dat[] = {0x30, 0x3c, 0x4e, 0x2b, 0xa9, 0xc9};
1911	<	if ((base = find_rom_data(0x2e0, 0x320, tm_task_dat, sizeof(tm_task_dat))) == 0) return false;
1911	>	if ((base = find_rom_data(0x2a0, 0x320, tm_task_dat, sizeof(tm_task_dat))) == 0) return false;
1912		D(bug("tm_task %08lx\n", base));
1913		wp = (uint16 *)(ROM_BASE + base + 28);
1914		*wp++ = htons(M68K_NOP);
#	Line 1788 | Line 1928 | static bool patch_68k(void)
1928		}
1929
1930		// Don't read PVR from 0x5fffef80 in DriverServicesLib (via 0x316)
1931	<	if (ROMType != ROMTYPE_NEWWORLD) {
1931	>	if (ROMType != ROMTYPE_NEWWORLD && ROMType != ROMTYPE_GOSSAMER) {
1932		uint32 dsl_offset = find_rom_resource(FOURCC('n','l','i','b'), -16401);
1933		if (ROMType == ROMTYPE_ZANZIBAR) {
1934		static const uint8 dsl_pvr_dat[] = {0x40, 0x82, 0x00, 0x40, 0x38, 0x60, 0xef, 0x80, 0x3c, 0x63, 0x60, 0x00, 0x80, 0x83, 0x00, 0x00, 0x54, 0x84, 0x84, 0x3e};
#	Line 1823 | Line 1963 | static bool patch_68k(void)
1963		*lp = htonl(0x38600000);                // li   r3,0
1964		}
1965
1966	+	// FIXME: Fake reading from [HpChk]+4 (the callchain reports some function from DriverServicesLib)
1967	+	if (1) {
1968	+	uint32 hpchk_offset = find_rom_resource(FOURCC('n','l','i','b'), 10);
1969	+	static const uint8 hpchk_dat[] = {0x80, 0x80, 0x03, 0x16, 0x94, 0x21, 0xff, 0xb0, 0x83, 0xc4, 0x00, 0x04};
1970	+	if ((base = find_rom_data(hpchk_offset, hpchk_offset + 0x3000, hpchk_dat, sizeof(hpchk_dat))) == 0) return false;
1971	+	D(bug("hpchk %08lx\n", base));
1972	+	lp = (uint32 *)(ROM_BASE + base);
1973	+	*lp = htonl(0x80800000 + XLM_ZERO_PAGE);                // lwz  r4,(zero page)
1974	+	}
1975	+
1976		// Patch Name Registry
1977		static const uint8 name_reg_dat[] = {0x70, 0xff, 0xab, 0xeb};
1978		if ((base = find_rom_data(0x300, 0x380, name_reg_dat, sizeof(name_reg_dat))) == 0) return false;
#	Line 1874 | Line 2024 | static bool patch_68k(void)
2024		D(bug("scsi_var2 %08lx\n", base));
2025		wp = (uint16 *)(ROM_BASE + base);
2026		*wp++ = htons(0x7000);  // moveq #0,d0
2027	<	*wp = htons(M68K_RTS);  // bra
2027	>	*wp = htons(M68K_RTS);
2028	>	}
2029	>	}
2030	>	else if (ROMType == ROMTYPE_GOSSAMER) {
2031	>	static const uint8 scsi_var_dat[] = {0x70, 0x01, 0xa0, 0x89, 0x4a, 0x6e, 0xfe, 0xac, 0x4f, 0xef, 0x00, 0x10, 0x66, 0x00};
2032	>	if ((base = find_rom_data(0x1d700, 0x1d800, scsi_var_dat, sizeof(scsi_var_dat))) != 0) {
2033	>	D(bug("scsi_var %08lx\n", base));
2034	>	wp = (uint16 *)(ROM_BASE + base + 12);
2035	>	*wp = htons(0x6000);    // bra
2036	>	}
2037	>
2038	>	static const uint8 scsi_var2_dat[] = {0x4e, 0x56, 0xfc, 0x5a, 0x48, 0xe7, 0x1f, 0x38};
2039	>	if ((base = find_rom_data(0x1d900, 0x1da00, scsi_var2_dat, sizeof(scsi_var2_dat))) != 0) {
2040	>	D(bug("scsi_var2 %08lx\n", base));
2041	>	wp = (uint16 *)(ROM_BASE + base);
2042	>	*wp++ = htons(0x7000);  // moveq #0,d0
2043	>	*wp = htons(M68K_RTS);
2044		}
2045		}
2046		#endif
#	Line 1930 | Line 2096 | static bool patch_68k(void)
2096		memcpy((void *)(ROM_BASE + sony_offset + 0x200), cdrom_driver, sizeof(cdrom_driver));
2097
2098		// Install serial drivers
2099	<	memcpy((void *)(ROM_BASE + sony_offset + 0x300), ain_driver, sizeof(ain_driver));
2100	<	memcpy((void *)(ROM_BASE + sony_offset + 0x400), aout_driver, sizeof(aout_driver));
2101	<	memcpy((void *)(ROM_BASE + sony_offset + 0x500), bin_driver, sizeof(bin_driver));
2102	<	memcpy((void *)(ROM_BASE + sony_offset + 0x600), bout_driver, sizeof(bout_driver));
2099	>	gen_ain_driver( ROM_BASE + sony_offset + 0x300);
2100	>	gen_aout_driver(ROM_BASE + sony_offset + 0x400);
2101	>	gen_bin_driver( ROM_BASE + sony_offset + 0x500);
2102	>	gen_bout_driver(ROM_BASE + sony_offset + 0x600);
2103
2104		// Copy icons to ROM
2105		SonyDiskIconAddr = ROM_BASE + sony_offset + 0x800;
#	Line 1954 | Line 2120 | static bool patch_68k(void)
2120		*wp = htons(M68K_RTS);
2121
2122		// Don't install serial drivers from ROM
2123	<	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_NEWWORLD) {
2123	>	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
2124		wp = (uint16 *)(ROM_BASE + find_rom_resource(FOURCC('S','E','R','D'), 0));
2125		*wp = htons(M68K_RTS);
2126		} else {
#	Line 2013 | Line 2179 | static bool patch_68k(void)
2179		wp = (uint16 *)(ROM_BASE + base);
2180		if (ROMType == ROMTYPE_ZANZIBAR)
2181		*wp = htons(M68K_RTS);
2182	<	else
2182	>	else if (ntohs(wp[-4]) == 0x61ff)
2183	>	*wp = htons(M68K_RTS);
2184	>	else if (ntohs(wp[-2]) == 0x6700)
2185		wp[-2] = htons(0x6000); // bra
2186
2187		// Patch PowerOff()
#	Line 2073 | Line 2241 | static bool patch_68k(void)
2241		lp = (uint32 *)(ROM_BASE + ntohl(*lp));
2242		lp[0xa9fd & 0x3ff] = htonl(GET_SCRAP_PATCH_SPACE);
2243
2076	–	#if __BEOS__
2244		// Patch SynchIdleTime()
2245		if (PrefsFindBool("idlewait")) {
2246		wp = (uint16 *)(ROM_BASE + find_rom_trap(0xabf7) + 4);  // SynchIdleTime()
2247		D(bug("SynchIdleTime at %08lx\n", wp));
2248	<	if (ntohs(*wp) == 0x2078) {
2248	>	if (ntohs(*wp) == 0x2078) {                                                             // movea.l      ExpandMem,a0
2249		*wp++ = htons(M68K_EMUL_OP_IDLE_TIME);
2250		*wp = htons(M68K_NOP);
2251	<	} else {
2251	>	}
2252	>	else if (ntohs(*wp) == 0x70fe)                                                  // moveq        #-2,d0
2253	>	*wp++ = htons(M68K_EMUL_OP_IDLE_TIME_2);
2254	>	else {
2255		D(bug("SynchIdleTime patch not installed\n"));
2256		}
2257		}
2088	–	#endif
2258
2259		// Construct list of all sifters used by sound components in ROM
2260		D(bug("Searching for sound components with type sdev in ROM\n"));
#	Line 2133 | Line 2302 | void InstallDrivers(void)
2302		{
2303		D(bug("Installing drivers...\n"));
2304		M68kRegisters r;
2305	<	uint8 pb[SIZEOF_IOParam];
2305	>	SheepArray<SIZEOF_IOParam> pb_var;
2306	>	const uintptr pb = pb_var.addr();
2307	>
2308	>	// Install floppy driver
2309	>	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
2310	>
2311	>	// Force installation of floppy driver with NewWorld and Gossamer ROMs
2312	>	r.a[0] = ROM_BASE + sony_offset;
2313	>	r.d[0] = (uint32)SonyRefNum;
2314	>	Execute68kTrap(0xa43d, &r);             // DrvrInstallRsrvMem()
2315	>	r.a[0] = ReadMacInt32(ReadMacInt32(0x11c) + ~SonyRefNum * 4);   // Get driver handle from Unit Table
2316	>	Execute68kTrap(0xa029, &r);             // HLock()
2317	>	uint32 dce = ReadMacInt32(r.a[0]);
2318	>	WriteMacInt32(dce + dCtlDriver, ROM_BASE + sony_offset);
2319	>	WriteMacInt16(dce + dCtlFlags, SonyDriverFlags);
2320	>	}
2321	>
2322	>	#if DISABLE_SCSI && HAVE_SIGSEGV_SKIP_INSTRUCTION
2323	>	// Fake SCSIGlobals
2324	>	WriteMacInt32(0xc0c, SheepMem::ZeroPage());
2325	>	#endif
2326
2327		// Open .Sony driver
2328	<	WriteMacInt8((uint32)pb + ioPermssn, 0);
2329	<	WriteMacInt32((uint32)pb + ioNamePtr, (uint32)"\005.Sony");
2330	<	r.a[0] = (uint32)pb;
2328	>	SheepString sony_str("\005.Sony");
2329	>	WriteMacInt8(pb + ioPermssn, 0);
2330	>	WriteMacInt32(pb + ioNamePtr, sony_str.addr());
2331	>	r.a[0] = pb;
2332		Execute68kTrap(0xa000, &r);             // Open()
2333
2334		// Install disk driver
#	Line 2152 | Line 2342 | void InstallDrivers(void)
2342		WriteMacInt16(dce + dCtlFlags, DiskDriverFlags);
2343
2344		// Open disk driver
2345	<	WriteMacInt32((uint32)pb + ioNamePtr, (uint32)"\005.Disk");
2346	<	r.a[0] = (uint32)pb;
2345	>	SheepString disk_str("\005.Disk");
2346	>	WriteMacInt32(pb + ioNamePtr, disk_str.addr());
2347	>	r.a[0] = pb;
2348		Execute68kTrap(0xa000, &r);             // Open()
2349
2350		// Install CD-ROM driver unless nocdrom option given
#	Line 2170 | Line 2361 | void InstallDrivers(void)
2361		WriteMacInt16(dce + dCtlFlags, CDROMDriverFlags);
2362
2363		// Open CD-ROM driver
2364	<	WriteMacInt32((uint32)pb + ioNamePtr, (uint32)"\010.AppleCD");
2365	<	r.a[0] = (uint32)pb;
2364	>	SheepString apple_cd("\010.AppleCD");
2365	>	WriteMacInt32(pb + ioNamePtr, apple_cd.addr());
2366	>	r.a[0] = pb;
2367		Execute68kTrap(0xa000, &r);             // Open()
2368		}
2369

Diff Legend

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