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.1 by cebix, 2002-02-04T16:58:13Z vs.
Revision 1.17 by gbeauche, 2003-10-07T19:28:09Z

#	Line 58 | Line 58
58
59
60		// Other ROM addresses
61	<	const uint32 CHECK_LOAD_PATCH_SPACE = 0x2f7f00;
62	<	const uint32 PUT_SCRAP_PATCH_SPACE = 0x2f7f80;
63	<	const uint32 GET_SCRAP_PATCH_SPACE = 0x2f7fc0;
64	<	const uint32 ADDR_MAP_PATCH_SPACE = 0x2f8000;
61	>	const uint32 CHECK_LOAD_PATCH_SPACE = 0x2fcf00;
62	>	const uint32 PUT_SCRAP_PATCH_SPACE = 0x2fcf80;
63	>	const uint32 GET_SCRAP_PATCH_SPACE = 0x2fcfc0;
64	>	const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd000;
65
66		// Global variables
67		int ROMType;                            // ROM type
#	Line 74 | Line 74 | static bool patch_nanokernel(void);
74		static bool patch_68k(void);
75
76
77	+	// Decode LZSS data
78	+	static void decode_lzss(const uint8 *src, uint8 *dest, int size)
79	+	{
80	+	char dict[0x1000];
81	+	int run_mask = 0, dict_idx = 0xfee;
82	+	for (;;) {
83	+	if (run_mask < 0x100) {
84	+	// Start new run
85	+	if (--size < 0)
86	+	break;
87	+	run_mask = *src++ | 0xff00;
88	+	}
89	+	bool bit = run_mask & 1;
90	+	run_mask >>= 1;
91	+	if (bit) {
92	+	// Verbatim copy
93	+	if (--size < 0)
94	+	break;
95	+	int c = *src++;
96	+	dict[dict_idx++] = c;
97	+	*dest++ = c;
98	+	dict_idx &= 0xfff;
99	+	} else {
100	+	// Copy from dictionary
101	+	if (--size < 0)
102	+	break;
103	+	int idx = *src++;
104	+	if (--size < 0)
105	+	break;
106	+	int cnt = *src++;
107	+	idx |= (cnt << 4) & 0xf00;
108	+	cnt = (cnt & 0x0f) + 3;
109	+	while (cnt--) {
110	+	char c = dict[idx++];
111	+	dict[dict_idx++] = c;
112	+	*dest++ = c;
113	+	idx &= 0xfff;
114	+	dict_idx &= 0xfff;
115	+	}
116	+	}
117	+	}
118	+	}
119	+
120	+	// Decode parcels of ROM image (MacOS 9.X and even earlier)
121	+	void decode_parcels(const uint8 *src, uint8 *dest, int size)
122	+	{
123	+	uint32 parcel_offset = 0x14;
124	+	D(bug("Offset   Type Name\n"));
125	+	while (parcel_offset != 0) {
126	+	const uint32 *parcel_data = (uint32 *)(src + parcel_offset);
127	+	uint32 next_offset = ntohl(parcel_data[0]);
128	+	uint32 parcel_type = ntohl(parcel_data[1]);
129	+	D(bug("%08x %c%c%c%c %s\n", parcel_offset,
130	+	(parcel_type >> 24) & 0xff, (parcel_type >> 16) & 0xff,
131	+	(parcel_type >> 8) & 0xff, parcel_type & 0xff, &parcel_data[6]));
132	+	if (parcel_type == FOURCC('r','o','m',' ')) {
133	+	uint32 lzss_offset  = ntohl(parcel_data[2]);
134	+	uint32 lzss_size = ((uintptr)src + next_offset) - ((uintptr)parcel_data + lzss_offset);
135	+	decode_lzss((uint8 *)parcel_data + lzss_offset, dest, lzss_size);
136	+	}
137	+	parcel_offset = next_offset;
138	+	}
139	+	}
140	+
141	+
142	+	/*
143	+	*  Decode ROM image, 4 MB plain images or NewWorld images
144	+	*/
145	+
146	+	bool DecodeROM(uint8 *data, uint32 size)
147	+	{
148	+	if (size == ROM_SIZE) {
149	+	// Plain ROM image
150	+	memcpy((void *)ROM_BASE, data, ROM_SIZE);
151	+	return true;
152	+	}
153	+	else if (strncmp((char *)data, "<CHRP-BOOT>", 11) == 0) {
154	+	// CHRP compressed ROM image
155	+	uint32 image_offset, image_size;
156	+	bool decode_info_ok = false;
157	+
158	+	char *s = strstr((char *)data, "constant lzss-offset");
159	+	if (s != NULL) {
160	+	// Probably a plain LZSS compressed ROM image
161	+	if (sscanf(s - 7, "%06x", &image_offset) == 1) {
162	+	s = strstr((char *)data, "constant lzss-size");
163	+	if (s != NULL && (sscanf(s - 7, "%06x", &image_size) == 1))
164	+	decode_info_ok = true;
165	+	}
166	+	}
167	+	else {
168	+	// Probably a MacOS 9.2.x ROM image
169	+	s = strstr((char *)data, "constant parcels-offset");
170	+	if (s != NULL) {
171	+	if (sscanf(s - 7, "%06x", &image_offset) == 1) {
172	+	s = strstr((char *)data, "constant parcels-size");
173	+	if (s != NULL && (sscanf(s - 7, "%06x", &image_size) == 1))
174	+	decode_info_ok = true;
175	+	}
176	+	}
177	+	}
178	+
179	+	// No valid information to decode the ROM found?
180	+	if (!decode_info_ok)
181	+	return false;
182	+
183	+	// Check signature, this could be a parcels-based ROM image
184	+	uint32 rom_signature = ntohl(*(uint32 *)(data + image_offset));
185	+	if (rom_signature == FOURCC('p','r','c','l')) {
186	+	D(bug("Offset of parcels data: %08x\n", image_offset));
187	+	D(bug("Size of parcels data: %08x\n", image_size));
188	+	decode_parcels(data + image_offset, (uint8 *)ROM_BASE, image_size);
189	+	}
190	+	else {
191	+	D(bug("Offset of compressed data: %08x\n", image_offset));
192	+	D(bug("Size of compressed data: %08x\n", image_size));
193	+	decode_lzss(data + image_offset, (uint8 *)ROM_BASE, image_size);
194	+	}
195	+	return true;
196	+	}
197	+	return false;
198	+	}
199	+
200	+
201		/*
202		*  Search ROM for byte string, return ROM offset (or 0)
203		*/
#	Line 323 | Line 447 | static const uint8 cdrom_driver[] = {  //
447		0x4e, 0x75                                                      //  rts
448		};
449
450	<	#ifdef __linux__
450	>	#if EMULATED_PPC
451	>	#define SERIAL_TRAMPOLINES 1
452	>	static uint32 serial_nothing_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_NOTHING)), 0};
453	>	static uint32 serial_open_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_OPEN)), 0};
454	>	static uint32 serial_prime_in_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_PRIME_IN)), 0};
455	>	static uint32 serial_prime_out_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_PRIME_OUT)), 0};
456	>	static uint32 serial_control_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_CONTROL)), 0};
457	>	static uint32 serial_status_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_STATUS)), 0};
458	>	static uint32 serial_close_tvect[2] = {tswap32(POWERPC_NATIVE_OP_FUNC(NATIVE_SERIAL_CLOSE)), 0};
459	>	#elif defined(__linux__)
460	>	#define SERIAL_TRAMPOLINES 1
461		static uint32 serial_nothing_tvect[2] = {(uint32)SerialNothing, 0};
462		static uint32 serial_open_tvect[2] = {(uint32)SerialOpen, 0};
463		static uint32 serial_prime_in_tvect[2] = {(uint32)SerialPrimeIn, 0};
#	Line 340 | Line 474 | static const uint32 ain_driver[] = {   //
474		0x00000000, 0x00000000,
475		0xaafe0700, 0x00000000,
476		0x00000000, 0x00179822,
477	<	#ifdef __linux__
477	>	#ifdef SERIAL_TRAMPOLINES
478		0x00010004, (uint32)serial_nothing_tvect,
479		#else
480		0x00010004, (uint32)SerialNothing,
#	Line 348 | Line 482 | static const uint32 ain_driver[] = {   //
482		0x00000000, 0x00000000,
483		0xaafe0700, 0x00000000,
484		0x00000000, 0x00179822,
485	<	#ifdef __linux__
485	>	#ifdef SERIAL_TRAMPOLINES
486		0x00010004, (uint32)serial_prime_in_tvect,
487		#else
488		0x00010004, (uint32)SerialPrimeIn,
#	Line 356 | Line 490 | static const uint32 ain_driver[] = {   //
490		0x00000000, 0x00000000,
491		0xaafe0700, 0x00000000,
492		0x00000000, 0x00179822,
493	<	#ifdef __linux__
493	>	#ifdef SERIAL_TRAMPOLINES
494		0x00010004, (uint32)serial_control_tvect,
495		#else
496		0x00010004, (uint32)SerialControl,
#	Line 364 | Line 498 | static const uint32 ain_driver[] = {   //
498		0x00000000, 0x00000000,
499		0xaafe0700, 0x00000000,
500		0x00000000, 0x00179822,
501	<	#ifdef __linux__
501	>	#ifdef SERIAL_TRAMPOLINES
502		0x00010004, (uint32)serial_status_tvect,
503		#else
504		0x00010004, (uint32)SerialStatus,
#	Line 372 | Line 506 | static const uint32 ain_driver[] = {   //
506		0x00000000, 0x00000000,
507		0xaafe0700, 0x00000000,
508		0x00000000, 0x00179822,
509	<	#ifdef __linux__
509	>	#ifdef SERIAL_TRAMPOLINES
510		0x00010004, (uint32)serial_nothing_tvect,
511		#else
512		0x00010004, (uint32)SerialNothing,
#	Line 387 | Line 521 | static const uint32 aout_driver[] = {  //
521		0x00000000, 0x00000000,
522		0xaafe0700, 0x00000000,
523		0x00000000, 0x00179822,
524	<	#ifdef __linux__
524	>	#ifdef SERIAL_TRAMPOLINES
525		0x00010004, (uint32)serial_open_tvect,
526		#else
527		0x00010004, (uint32)SerialOpen,
#	Line 395 | Line 529 | static const uint32 aout_driver[] = {  //
529		0x00000000, 0x00000000,
530		0xaafe0700, 0x00000000,
531		0x00000000, 0x00179822,
532	<	#ifdef __linux__
532	>	#ifdef SERIAL_TRAMPOLINES
533		0x00010004, (uint32)serial_prime_out_tvect,
534		#else
535		0x00010004, (uint32)SerialPrimeOut,
#	Line 403 | Line 537 | static const uint32 aout_driver[] = {  //
537		0x00000000, 0x00000000,
538		0xaafe0700, 0x00000000,
539		0x00000000, 0x00179822,
540	<	#ifdef __linux__
540	>	#ifdef SERIAL_TRAMPOLINES
541		0x00010004, (uint32)serial_control_tvect,
542		#else
543		0x00010004, (uint32)SerialControl,
#	Line 411 | Line 545 | static const uint32 aout_driver[] = {  //
545		0x00000000, 0x00000000,
546		0xaafe0700, 0x00000000,
547		0x00000000, 0x00179822,
548	<	#ifdef __linux__
548	>	#ifdef SERIAL_TRAMPOLINES
549		0x00010004, (uint32)serial_status_tvect,
550		#else
551		0x00010004, (uint32)SerialStatus,
#	Line 419 | Line 553 | static const uint32 aout_driver[] = {  //
553		0x00000000, 0x00000000,
554		0xaafe0700, 0x00000000,
555		0x00000000, 0x00179822,
556	<	#ifdef __linux__
556	>	#ifdef SERIAL_TRAMPOLINES
557		0x00010004, (uint32)serial_close_tvect,
558		#else
559		0x00010004, (uint32)SerialClose,
#	Line 434 | Line 568 | static const uint32 bin_driver[] = {   //
568		0x00000000, 0x00000000,
569		0xaafe0700, 0x00000000,
570		0x00000000, 0x00179822,
571	<	#ifdef __linux__
571	>	#ifdef SERIAL_TRAMPOLINES
572		0x00010004, (uint32)serial_nothing_tvect,
573		#else
574		0x00010004, (uint32)SerialNothing,
#	Line 442 | Line 576 | static const uint32 bin_driver[] = {   //
576		0x00000000, 0x00000000,
577		0xaafe0700, 0x00000000,
578		0x00000000, 0x00179822,
579	<	#ifdef __linux__
579	>	#ifdef SERIAL_TRAMPOLINES
580		0x00010004, (uint32)serial_prime_in_tvect,
581		#else
582		0x00010004, (uint32)SerialPrimeIn,
#	Line 450 | Line 584 | static const uint32 bin_driver[] = {   //
584		0x00000000, 0x00000000,
585		0xaafe0700, 0x00000000,
586		0x00000000, 0x00179822,
587	<	#ifdef __linux__
587	>	#ifdef SERIAL_TRAMPOLINES
588		0x00010004, (uint32)serial_control_tvect,
589		#else
590		0x00010004, (uint32)SerialControl,
#	Line 458 | Line 592 | static const uint32 bin_driver[] = {   //
592		0x00000000, 0x00000000,
593		0xaafe0700, 0x00000000,
594		0x00000000, 0x00179822,
595	<	#ifdef __linux__
595	>	#ifdef SERIAL_TRAMPOLINES
596		0x00010004, (uint32)serial_status_tvect,
597		#else
598		0x00010004, (uint32)SerialStatus,
#	Line 466 | Line 600 | static const uint32 bin_driver[] = {   //
600		0x00000000, 0x00000000,
601		0xaafe0700, 0x00000000,
602		0x00000000, 0x00179822,
603	<	#ifdef __linux__
603	>	#ifdef SERIAL_TRAMPOLINES
604		0x00010004, (uint32)serial_nothing_tvect,
605		#else
606		0x00010004, (uint32)SerialNothing,
#	Line 481 | Line 615 | static const uint32 bout_driver[] = {  //
615		0x00000000, 0x00000000,
616		0xaafe0700, 0x00000000,
617		0x00000000, 0x00179822,
618	<	#ifdef __linux__
618	>	#ifdef SERIAL_TRAMPOLINES
619		0x00010004, (uint32)serial_open_tvect,
620		#else
621		0x00010004, (uint32)SerialOpen,
#	Line 489 | Line 623 | static const uint32 bout_driver[] = {  //
623		0x00000000, 0x00000000,
624		0xaafe0700, 0x00000000,
625		0x00000000, 0x00179822,
626	<	#ifdef __linux__
626	>	#ifdef SERIAL_TRAMPOLINES
627		0x00010004, (uint32)serial_prime_out_tvect,
628		#else
629		0x00010004, (uint32)SerialPrimeOut,
#	Line 497 | Line 631 | static const uint32 bout_driver[] = {  //
631		0x00000000, 0x00000000,
632		0xaafe0700, 0x00000000,
633		0x00000000, 0x00179822,
634	<	#ifdef __linux__
634	>	#ifdef SERIAL_TRAMPOLINES
635		0x00010004, (uint32)serial_control_tvect,
636		#else
637		0x00010004, (uint32)SerialControl,
#	Line 505 | Line 639 | static const uint32 bout_driver[] = {  //
639		0x00000000, 0x00000000,
640		0xaafe0700, 0x00000000,
641		0x00000000, 0x00179822,
642	<	#ifdef __linux__
642	>	#ifdef SERIAL_TRAMPOLINES
643		0x00010004, (uint32)serial_status_tvect,
644		#else
645		0x00010004, (uint32)SerialStatus,
#	Line 513 | Line 647 | static const uint32 bout_driver[] = {  //
647		0x00000000, 0x00000000,
648		0xaafe0700, 0x00000000,
649		0x00000000, 0x00179822,
650	<	#ifdef __linux__
650	>	#ifdef SERIAL_TRAMPOLINES
651		0x00010004, (uint32)serial_close_tvect,
652		#else
653		0x00010004, (uint32)SerialClose,
#	Line 545 | Line 679 | static const uint8 adbop_patch[] = {   //
679
680
681		/*
682	+	*  Copy PowerPC code to ROM image and reverse bytes if necessary
683	+	*/
684	+
685	+	static inline void memcpy_powerpc_code(void *dst, const void *src, size_t len)
686	+	{
687	+	#ifdef WORDS_BIGENDIAN
688	+	(void)memcpy(dst, src, len);
689	+	#else
690	+	uint32 *d = (uint32 *)dst;
691	+	uint32 *s = (uint32 *)src;
692	+	for (int i = 0; i < len/4; i++)
693	+	d[i] = htonl(s[i]);
694	+	#endif
695	+	}
696	+
697	+
698	+	/*
699		*  Install ROM patches (RAMBase and KernelDataAddr must be set)
700		*/
701
#	Line 567 | Line 718 | bool PatchROM(void)
718		ROMType = ROMTYPE_ZANZIBAR;
719		else if (!memcmp((void *)(ROM_BASE + 0x30d064), "Boot Gazelle", 12))
720		ROMType = ROMTYPE_GAZELLE;
721	+	else if (!memcmp((void *)(ROM_BASE + 0x30d064), "Boot Gossamer", 13))
722	+	ROMType = ROMTYPE_GOSSAMER;
723		else if (!memcmp((void *)(ROM_BASE + 0x30d064), "NewWorld", 8))
724		ROMType = ROMTYPE_NEWWORLD;
725		else
726		return false;
727
728	+	// Check that other ROM addresses point to really free regions
729	+	if (ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE)) != 0x6b636b63)
730	+	return false;
731	+	if (ntohl(*(uint32 *)(ROM_BASE + PUT_SCRAP_PATCH_SPACE)) != 0x6b636b63)
732	+	return false;
733	+	if (ntohl(*(uint32 *)(ROM_BASE + GET_SCRAP_PATCH_SPACE)) != 0x6b636b63)
734	+	return false;
735	+	if (ntohl(*(uint32 *)(ROM_BASE + ADDR_MAP_PATCH_SPACE)) != 0x6b636b63)
736	+	return false;
737	+
738		// Apply patches
739		if (!patch_nanokernel_boot()) return false;
740		if (!patch_68k_emul()) return false;
#	Line 616 | Line 779 | static bool patch_nanokernel_boot(void)
779		lp[0xfd8 >> 2] = htonl(ROM_BASE + 0x2a);                // 68k reset vector
780
781		// Skip SR/BAT/SDR init
782	<	if (ROMType == ROMTYPE_GAZELLE || ROMType == ROMTYPE_NEWWORLD) {
782	>	if (ROMType == ROMTYPE_GAZELLE || ROMType == ROMTYPE_GOSSAMER || ROMType == ROMTYPE_NEWWORLD) {
783		lp = (uint32 *)(ROM_BASE + 0x310000);
784		*lp++ = htonl(POWERPC_NOP);
785		*lp = htonl(0x38000000);
786		}
787	<	static const uint32 sr_init_loc[] = {0x3101b0, 0x3101b0, 0x3101b0, 0x3101ec, 0x310200};
787	>	static const uint32 sr_init_loc[] = {0x3101b0, 0x3101b0, 0x3101b0, 0x3101ec, 0x3101fc, 0x310200};
788		lp = (uint32 *)(ROM_BASE + 0x310008);
789		*lp = htonl(0x48000000 | (sr_init_loc[ROMType] - 8) & 0xffff);  // b            ROM_BASE+0x3101b0
790		lp = (uint32 *)(ROM_BASE + sr_init_loc[ROMType]);
#	Line 631 | Line 794 | static bool patch_nanokernel_boot(void)
794		*lp = htonl(0x3de00010);                // lis  r15,0x0010      (size of kernel memory)
795
796		// Don't read PVR
797	<	static const uint32 pvr_loc[] = {0x3103b0, 0x3103b4, 0x3103b4, 0x310400, 0x310438};
797	>	static const uint32 pvr_loc[] = {0x3103b0, 0x3103b4, 0x3103b4, 0x310400, 0x310430, 0x310438};
798		lp = (uint32 *)(ROM_BASE + pvr_loc[ROMType]);
799		*lp = htonl(0x81800000 + XLM_PVR);      // lwz  r12,(theoretical PVR)
800
#	Line 779 | Line 942 | static bool patch_nanokernel_boot(void)
942		*lp = htonl(POWERPC_NOP);
943
944		// Don't read PVR
945	<	static const uint32 pvr_ofs[] = {0x138, 0x138, 0x138, 0x140, 0x148};
945	>	static const uint32 pvr_ofs[] = {0x138, 0x138, 0x138, 0x140, 0x148, 0x148};
946		lp = (uint32 *)(ROM_BASE + loc + pvr_ofs[ROMType]);
947		*lp = htonl(0x82e00000 + XLM_PVR);              // lwz  r23,(theoretical PVR)
948		lp = (uint32 *)(ROM_BASE + loc + 0x170);
949	<	if (ntohl(*lp) == 0x7eff42a6)   // NewWorld ROM
949	>	if (ntohl(*lp) == 0x7eff42a6)   // NewWorld or Gossamer ROM
950		*lp = htonl(0x82e00000 + XLM_PVR);      // lwz  r23,(theoretical PVR)
951		lp = (uint32 *)(ROM_BASE + 0x313134);
952		if (ntohl(*lp) == 0x7e5f42a6)
#	Line 791 | Line 954 | static bool patch_nanokernel_boot(void)
954		lp = (uint32 *)(ROM_BASE + 0x3131f4);
955		if (ntohl(*lp) == 0x7e5f42a6)   // NewWorld ROM
956		*lp = htonl(0x82400000 + XLM_PVR);      // lwz  r18,(theoretical PVR)
957	+	lp = (uint32 *)(ROM_BASE + 0x314600);
958	+	if (ntohl(*lp) == 0x7d3f42a6)
959	+	*lp = htonl(0x81200000 + XLM_PVR);      // lzw  r9,(theoritical PVR)
960
961		// Don't read SDR1
962	<	static const uint32 sdr1_ofs[] = {0x174, 0x174, 0x174, 0x17c, 0x19c};
962	>	static const uint32 sdr1_ofs[] = {0x174, 0x174, 0x174, 0x17c, 0x19c, 0x19c};
963		lp = (uint32 *)(ROM_BASE + loc + sdr1_ofs[ROMType]);
964		*lp++ = htonl(0x3d00dead);              // lis  r8,0xdead               (pointer to page table)
965		*lp++ = htonl(0x3ec0001f);              // lis  r22,0x001f      (size of page table)
966		*lp = htonl(POWERPC_NOP);
967
968		// Don't clear page table
969	<	static const uint32 pgtb_ofs[] = {0x198, 0x198, 0x198, 0x1a0, 0x1c4};
969	>	static const uint32 pgtb_ofs[] = {0x198, 0x198, 0x198, 0x1a0, 0x1c0, 0x1c4};
970		lp = (uint32 *)(ROM_BASE + loc + pgtb_ofs[ROMType]);
971		*lp = htonl(POWERPC_NOP);
972
973		// Don't invalidate TLB
974	<	static const uint32 tlb_ofs[] = {0x1a0, 0x1a0, 0x1a0, 0x1a8, 0x1cc};
974	>	static const uint32 tlb_ofs[] = {0x1a0, 0x1a0, 0x1a0, 0x1a8, 0x1c8, 0x1cc};
975		lp = (uint32 *)(ROM_BASE + loc + tlb_ofs[ROMType]);
976		*lp = htonl(POWERPC_NOP);
977
978		// Don't create RAM descriptor table
979	<	static const uint32 desc_ofs[] = {0x350, 0x350, 0x350, 0x358, 0x37c};
979	>	static const uint32 desc_ofs[] = {0x350, 0x350, 0x350, 0x358, 0x378, 0x37c};
980		lp = (uint32 *)(ROM_BASE + loc + desc_ofs[ROMType]);
981		*lp = htonl(POWERPC_NOP);
982
983		// Don't load SRs and BATs
984	<	static const uint32 sr_ofs[] = {0x3d8, 0x3d8, 0x3d8, 0x3e0, 0x404};
984	>	static const uint32 sr_ofs[] = {0x3d8, 0x3d8, 0x3d8, 0x3e0, 0x400, 0x404};
985		lp = (uint32 *)(ROM_BASE + loc + sr_ofs[ROMType]);
986		*lp = htonl(POWERPC_NOP);
987
988		// Don't mess with SRs
989	<	static const uint32 sr2_ofs[] = {0x312118, 0x312118, 0x312118, 0x312118, 0x3121b4};
989	>	static const uint32 sr2_ofs[] = {0x312118, 0x312118, 0x312118, 0x312118, 0x312118, 0x3121b4};
990		lp = (uint32 *)(ROM_BASE + sr2_ofs[ROMType]);
991		*lp = htonl(POWERPC_BLR);
992
993		// Don't check performance monitor
994	<	static const uint32 pm_ofs[] = {0x313148, 0x313148, 0x313148, 0x313148, 0x313218};
994	>	static const uint32 pm_ofs[] = {0x313148, 0x313148, 0x313148, 0x313148, 0x313158, 0x313218};
995		lp = (uint32 *)(ROM_BASE + pm_ofs[ROMType]);
996		while (ntohl(*lp) != 0x7e58eba6) lp++;
997		*lp++ = htonl(POWERPC_NOP);
#	Line 861 | Line 1027 | static bool patch_nanokernel_boot(void)
1027		*lp++ = htonl(POWERPC_NOP);
1028
1029		// Jump to 68k emulator
1030	<	static const uint32 jump68k_ofs[] = {0x40c, 0x40c, 0x40c, 0x414, 0x438};
1030	>	static const uint32 jump68k_ofs[] = {0x40c, 0x40c, 0x40c, 0x414, 0x434, 0x438};
1031		lp = (uint32 *)(ROM_BASE + loc + jump68k_ofs[ROMType]);
1032		*lp++ = htonl(0x80610634);              // lwz  r3,0x0634(r1)   (pointer to Emulator Data)
1033		*lp++ = htonl(0x8081119c);              // lwz  r4,0x119c(r1)   (pointer to opcode table)
#	Line 882 | Line 1048 | static bool patch_68k_emul(void)
1048		uint32 base;
1049
1050		// Overwrite twi instructions
1051	<	static const uint32 twi_loc[] = {0x36e680, 0x36e6c0, 0x36e6c0, 0x36e6c0, 0x36e740};
1051	>	static const uint32 twi_loc[] = {0x36e680, 0x36e6c0, 0x36e6c0, 0x36e6c0, 0x36e740, 0x36e740};
1052		base = twi_loc[ROMType];
1053		lp = (uint32 *)(ROM_BASE + base);
1054		*lp++ = htonl(0x48000000 + 0x36f900 - base);            // b 0x36f900 (Emulator start)
#	Line 903 | Line 1069 | static bool patch_68k_emul(void)
1069		*lp = htonl(POWERPC_ILLEGAL);
1070
1071		#if EMULATED_PPC
1072	<	// Install EMUL_RETURN, EXEC_RETURN and EMUL_OP opcodes
1072	>	// Install EMUL_RETURN, EXEC_RETURN, EXEC_NATIVE and EMUL_OP opcodes
1073		lp = (uint32 *)(ROM_BASE + 0x380000 + (M68K_EMUL_RETURN << 3));
1074		*lp++ = htonl(POWERPC_EMUL_OP);
1075		*lp++ = htonl(0x4bf66e80);                                                      // b    0x366084
1076		*lp++ = htonl(POWERPC_EMUL_OP | 1);
1077		*lp++ = htonl(0x4bf66e78);                                                      // b    0x366084
1078	+	*lp++ = htonl(POWERPC_EMUL_OP | 2);
1079	+	*lp++ = htonl(0x4bf66e70);                                                      // b    0x366084
1080		for (int i=0; i<OP_MAX; i++) {
1081	<	*lp++ = htonl(POWERPC_EMUL_OP | (i + 2));
1082	<	*lp++ = htonl(0x4bf66e70 - i*8);                        // b    0x366084
1081	>	*lp++ = htonl(POWERPC_EMUL_OP | (i + 3));
1082	>	*lp++ = htonl(0x4bf66e68 - i*8);                                // b    0x366084
1083		}
1084		#else
1085		// Install EMUL_RETURN, EXEC_RETURN and EMUL_OP opcodes
#	Line 920 | Line 1088 | static bool patch_68k_emul(void)
1088		*lp++ = htonl(0x4bf705fc);                                                      // b    0x36f800
1089		*lp++ = htonl(0x80000000 + XLM_EXEC_RETURN_PROC);       // lwz  r0,XLM_EXEC_RETURN_PROC
1090		*lp++ = htonl(0x4bf705f4);                                                      // b    0x36f800
1091	+	*lp++ = htonl(0x00dead00);                                                      // Let SheepShaver crash, since
1092	+	*lp++ = htonl(0x00beef00);                                                      // no native opcode is available
1093		for (int i=0; i<OP_MAX; i++) {
1094		*lp++ = htonl(0x38a00000 + i);                          // li   r5,OP_*
1095	<	*lp++ = htonl(0x4bf705f4 - i*8);                        // b    0x36f808
1095	>	*lp++ = htonl(0x4bf705ec - i*8);                        // b    0x36f808
1096		}
1097
1098		// Extra routines for EMUL_RETURN/EXEC_RETURN/EMUL_OP
#	Line 938 | Line 1108 | static bool patch_68k_emul(void)
1108		// Extra routine for 68k emulator start
1109		lp = (uint32 *)(ROM_BASE + 0x36f900);
1110		*lp++ = htonl(0x7c2903a6);                                      // mtctr        r1
1111	+	#if EMULATED_PPC
1112	+	*lp++ = POWERPC_NATIVE_OP(NATIVE_DISABLE_INTERRUPT);
1113	+	#else
1114		*lp++ = htonl(0x80200000 + XLM_IRQ_NEST);       // lwz          r1,XLM_IRQ_NEST
1115		*lp++ = htonl(0x38210001);                                      // addi         r1,r1,1
1116		*lp++ = htonl(0x90200000 + XLM_IRQ_NEST);       // stw          r1,XLM_IRQ_NEST
1117	+	#endif
1118		*lp++ = htonl(0x80200000 + XLM_KERNEL_DATA);// lwz              r1,XLM_KERNEL_DATA
1119		*lp++ = htonl(0x90c10018);                                      // stw          r6,0x18(r1)
1120		*lp++ = htonl(0x7cc902a6);                                      // mfctr        r6
#	Line 968 | Line 1142 | static bool patch_68k_emul(void)
1142		// Extra routine for Mixed Mode
1143		lp = (uint32 *)(ROM_BASE + 0x36fa00);
1144		*lp++ = htonl(0x7c2903a6);                                      // mtctr        r1
1145	+	#if EMULATED_PPC
1146	+	*lp++ = POWERPC_NATIVE_OP(NATIVE_DISABLE_INTERRUPT);
1147	+	#else
1148		*lp++ = htonl(0x80200000 + XLM_IRQ_NEST);       // lwz          r1,XLM_IRQ_NEST
1149		*lp++ = htonl(0x38210001);                                      // addi         r1,r1,1
1150		*lp++ = htonl(0x90200000 + XLM_IRQ_NEST);       // stw          r1,XLM_IRQ_NEST
1151	+	#endif
1152		*lp++ = htonl(0x80200000 + XLM_KERNEL_DATA);// lwz              r1,XLM_KERNEL_DATA
1153		*lp++ = htonl(0x90c10018);                                      // stw          r6,0x18(r1)
1154		*lp++ = htonl(0x7cc902a6);                                      // mfctr        r6
#	Line 996 | Line 1174 | static bool patch_68k_emul(void)
1174		*lp = htonl(0x4e800020);                                        // blr
1175
1176		// Extra routine for Reset/FC1E opcode
1177	<	lp = (uint32 *)(ROM_BASE + 0x36fc00);
1177	>	lp = (uint32 *)(ROM_BASE + 0x36fb00);
1178		*lp++ = htonl(0x7c2903a6);                                      // mtctr        r1
1179	+	#if EMULATED_PPC
1180	+	*lp++ = POWERPC_NATIVE_OP(NATIVE_DISABLE_INTERRUPT);
1181	+	#else
1182		*lp++ = htonl(0x80200000 + XLM_IRQ_NEST);       // lwz          r1,XLM_IRQ_NEST
1183		*lp++ = htonl(0x38210001);                                      // addi         r1,r1,1
1184		*lp++ = htonl(0x90200000 + XLM_IRQ_NEST);       // stw          r1,XLM_IRQ_NEST
1185	+	#endif
1186		*lp++ = htonl(0x80200000 + XLM_KERNEL_DATA);// lwz              r1,XLM_KERNEL_DATA
1187		*lp++ = htonl(0x90c10018);                                      // stw          r6,0x18(r1)
1188		*lp++ = htonl(0x7cc902a6);                                      // mfctr        r6
#	Line 1017 | Line 1199 | static bool patch_68k_emul(void)
1199		*lp++ = htonl(0x80e10660);                                      // lwz          r7,$0660(r1)
1200		*lp++ = htonl(0x7d8802a6);                                      // mflr         r12
1201		*lp++ = htonl(0x50e74001);                                      // rlwimi.      r7,r7,8,$80000000
1202	<	*lp++ = htonl(0x814105f4);                                      // lwz          r10,0x05f8(r1)
1202	>	*lp++ = htonl(0x814105f8);                                      // lwz          r10,0x05f8(r1)
1203		*lp++ = htonl(0x7d4803a6);                                      // mtlr         r10
1204		*lp++ = htonl(0x7d8a6378);                                      // mr           r10,r12
1205		*lp++ = htonl(0x3d600002);                                      // lis          r11,0x0002
#	Line 1028 | Line 1210 | static bool patch_68k_emul(void)
1210		// Extra routine for FE0A opcode (QuickDraw 3D needs this)
1211		lp = (uint32 *)(ROM_BASE + 0x36fc00);
1212		*lp++ = htonl(0x7c2903a6);                                      // mtctr        r1
1213	+	#if EMULATED_PPC
1214	+	*lp++ = POWERPC_NATIVE_OP(NATIVE_DISABLE_INTERRUPT);
1215	+	#else
1216		*lp++ = htonl(0x80200000 + XLM_IRQ_NEST);       // lwz          r1,XLM_IRQ_NEST
1217		*lp++ = htonl(0x38210001);                                      // addi         r1,r1,1
1218		*lp++ = htonl(0x90200000 + XLM_IRQ_NEST);       // stw          r1,XLM_IRQ_NEST
1219	+	#endif
1220		*lp++ = htonl(0x80200000 + XLM_KERNEL_DATA);// lwz              r1,XLM_KERNEL_DATA
1221		*lp++ = htonl(0x90c10018);                                      // stw          r6,0x18(r1)
1222		*lp++ = htonl(0x7cc902a6);                                      // mfctr        r6
#	Line 1047 | Line 1233 | static bool patch_68k_emul(void)
1233		*lp++ = htonl(0x80e10660);                                      // lwz          r7,$0660(r1)
1234		*lp++ = htonl(0x7d8802a6);                                      // mflr         r12
1235		*lp++ = htonl(0x50e74001);                                      // rlwimi.      r7,r7,8,$80000000
1236	<	*lp++ = htonl(0x814105f4);                                      // lwz          r10,0x05fc(r1)
1236	>	*lp++ = htonl(0x814105fc);                                      // lwz          r10,0x05fc(r1)
1237		*lp++ = htonl(0x7d4803a6);                                      // mtlr         r10
1238		*lp++ = htonl(0x7d8a6378);                                      // mr           r10,r12
1239		*lp++ = htonl(0x3d600002);                                      // lis          r11,0x0002
#	Line 1165 | Line 1351 | static bool patch_nanokernel(void)
1351		*lp = htonl(POWERPC_BCTR);
1352
1353		lp = (uint32 *)(ROM_BASE + 0x318000);
1354	+	#if EMULATED_PPC
1355	+	*lp++ = POWERPC_NATIVE_OP(NATIVE_ENABLE_INTERRUPT);
1356	+	*lp = htonl(0x48000000 + ((xlp - 0x8004) & 0x03fffffc));        // b            ROM_BASE+0x312c2c
1357	+	#else
1358		*lp++ = htonl(0x81400000 + XLM_IRQ_NEST);       // lwz  r10,XLM_IRQ_NEST
1359		*lp++ = htonl(0x394affff);                                      // subi r10,r10,1
1360		*lp++ = htonl(0x91400000 + XLM_IRQ_NEST);       // stw  r10,XLM_IRQ_NEST
1361		*lp = htonl(0x48000000 + ((xlp - 0x800c) & 0x03fffffc));        // b            ROM_BASE+0x312c2c
1362	+	#endif
1363	+
1364		/*
1365		// Disable FE0A/FE06 opcodes
1366		lp = (uint32 *)(ROM_BASE + 0x3144ac);
#	Line 1214 | Line 1406 | static bool patch_68k(void)
1406		// Patch UniversalInfo
1407		if (ROMType == ROMTYPE_NEWWORLD) {
1408		static const uint8 univ_info_dat[] = {0x3f, 0xff, 0x04, 0x00};
1409	<	if ((base = find_rom_data(0x14000, 0x16000, univ_info_dat, sizeof(univ_info_dat))) == 0) return false;
1409	>	if ((base = find_rom_data(0x14000, 0x18000, univ_info_dat, sizeof(univ_info_dat))) == 0) return false;
1410		D(bug("universal_info %08lx\n", base));
1411		lp = (uint32 *)(ROM_BASE + base - 0x14);
1412		lp[0x00 >> 2] = htonl(ADDR_MAP_PATCH_SPACE - (base - 0x14));
#	Line 1238 | Line 1430 | static bool patch_68k(void)
1430		lp[0x28 >> 2] = htonl(0x00000861);
1431		lp[0x58 >> 2] = htonl(0x30200000);
1432		lp[0x60 >> 2] = htonl(0x0000003d);
1433	+	} else if (ROMType == ROMTYPE_GOSSAMER) {
1434	+	base = 0x12d20;
1435	+	lp = (uint32 *)(ROM_BASE + base - 0x14);
1436	+	lp[0x00 >> 2] = htonl(ADDR_MAP_PATCH_SPACE - (base - 0x14));
1437	+	lp[0x10 >> 2] = htonl(0xcc003d11);              // Make it like the PowerMac 9500 UniversalInfo
1438	+	lp[0x14 >> 2] = htonl(0x3fff0401);
1439	+	lp[0x18 >> 2] = htonl(0x0300001c);
1440	+	lp[0x1c >> 2] = htonl(0x000108c4);
1441	+	lp[0x24 >> 2] = htonl(0xc301bf26);
1442	+	lp[0x28 >> 2] = htonl(0x00000861);
1443	+	lp[0x58 >> 2] = htonl(0x30410000);
1444	+	lp[0x60 >> 2] = htonl(0x0000003d);
1445		}
1446
1447		// Construct AddrMap for NewWorld ROM
1448	<	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_ZANZIBAR) {
1448	>	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GOSSAMER) {
1449		lp = (uint32 *)(ROM_BASE + ADDR_MAP_PATCH_SPACE);
1450		memset(lp - 10, 0, 0x128);
1451		lp[-10] = htonl(0x0300001c);
#	Line 1367 | Line 1571 | static bool patch_68k(void)
1571		*wp++ = htons(M68K_EMUL_OP_XPRAM2);
1572		*wp = htons(0x4ed3);                    // jmp  (a3)
1573
1574	<	static const uint32 nvram3_loc[] = {0x582f0, 0xa0a0, 0x7e50, 0xa1d0, 0};
1575	<	wp = (uint16 *)(ROM_BASE + nvram3_loc[ROMType]);
1574	>	static const uint8 nvram3_dat[] = {0x4e, 0xd3, 0x06, 0x41, 0x13, 0x00};
1575	>	if ((base = find_rom_data(0x7000, 0xb000, nvram3_dat, sizeof(nvram3_dat))) == 0) return false;
1576	>	D(bug("nvram3 %08lx\n", base));
1577	>	wp = (uint16 *)(ROM_BASE + base + 2);
1578	>	*wp++ = htons(M68K_EMUL_OP_XPRAM3);
1579	>	*wp = htons(0x4ed3);                    // jmp  (a3)
1580	>
1581	>	static const uint32 nvram4_loc[] = {0x582f0, 0xa0a0, 0x7e50, 0xa1d0, 0x538d0, 0};
1582	>	wp = (uint16 *)(ROM_BASE + nvram4_loc[ROMType]);
1583		*wp++ = htons(0x202f);                  // move.l       4(sp),d0
1584		*wp++ = htons(0x0004);
1585		*wp++ = htons(M68K_EMUL_OP_NVRAM1);
#	Line 1381 | Line 1592 | static bool patch_68k(void)
1592		*wp = htons(0x0004);
1593		}
1594
1595	<	static const uint32 nvram4_loc[] = {0x58460, 0xa0f0, 0x7f40, 0xa220, 0};
1596	<	wp = (uint16 *)(ROM_BASE + nvram4_loc[ROMType]);
1595	>	static const uint32 nvram5_loc[] = {0x58460, 0xa0f0, 0x7f40, 0xa220, 0x53a20, 0};
1596	>	wp = (uint16 *)(ROM_BASE + nvram5_loc[ROMType]);
1597		if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GAZELLE) {
1598		*wp++ = htons(0x202f);                  // move.l       4(sp),d0
1599		*wp++ = htons(0x0004);
#	Line 1559 | Line 1770 | static bool patch_68k(void)
1770		if ((base = find_rom_data(0x13000, 0x20000, gc_mask2_dat, sizeof(gc_mask2_dat))) == 0) return false;
1771		D(bug("gc_mask2 %08lx\n", base));
1772		wp = (uint16 *)(ROM_BASE + base);
1773	+	if (ROMType == ROMTYPE_GOSSAMER)
1774	+	*wp++ = htons(M68K_NOP);
1775		for (int i=0; i<5; i++) {
1776		*wp++ = htons(M68K_NOP);
1777		*wp++ = htons(M68K_NOP);
#	Line 1566 | Line 1779 | static bool patch_68k(void)
1779		*wp++ = htons(M68K_NOP);
1780		wp += 2;
1781		}
1782	<	if (ROMType == ROMTYPE_ZANZIBAR) {
1782	>	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_GOSSAMER) {
1783		for (int i=0; i<6; i++) {
1784		*wp++ = htons(M68K_NOP);
1785		*wp++ = htons(M68K_NOP);
#	Line 1592 | Line 1805 | static bool patch_68k(void)
1805
1806		// Patch GetCPUSpeed (via 0x27a) (some ROMs have two of them)
1807		static const uint8 cpu_speed_dat[] = {0x20, 0x30, 0x81, 0xf2, 0x5f, 0xff, 0xef, 0xd8, 0x00, 0x04, 0x4c, 0x7c};
1808	<	if ((base = find_rom_data(0x6000, 0x9000, cpu_speed_dat, sizeof(cpu_speed_dat))) == 0) return false;
1808	>	if ((base = find_rom_data(0x6000, 0xa000, cpu_speed_dat, sizeof(cpu_speed_dat))) == 0) return false;
1809		D(bug("cpu_speed %08lx\n", base));
1810		wp = (uint16 *)(ROM_BASE + base);
1811		*wp++ = htons(0x203c);                  // move.l       #(MHz<<16)|MHz,d0
1812		*wp++ = htons(CPUClockSpeed / 1000000);
1813		*wp++ = htons(CPUClockSpeed / 1000000);
1814		*wp = htons(M68K_RTS);
1815	<	if ((base = find_rom_data(base, 0x9000, cpu_speed_dat, sizeof(cpu_speed_dat))) != 0) {
1815	>	if ((base = find_rom_data(base, 0xa000, cpu_speed_dat, sizeof(cpu_speed_dat))) != 0) {
1816		D(bug("cpu_speed2 %08lx\n", base));
1817		wp = (uint16 *)(ROM_BASE + base);
1818		*wp++ = htons(0x203c);                  // move.l       #(MHz<<16)|MHz,d0
#	Line 1639 | Line 1852 | static bool patch_68k(void)
1852		*wp = htons(M68K_RTS);
1853
1854		// Don't install Time Manager task for 60Hz interrupt (Enable60HzInts, via 0x2b8)
1855	<	if (ROMType == ROMTYPE_NEWWORLD) {
1855	>	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
1856		static const uint8 tm_task_dat[] = {0x30, 0x3c, 0x4e, 0x2b, 0xa9, 0xc9};
1857	<	if ((base = find_rom_data(0x2e0, 0x320, tm_task_dat, sizeof(tm_task_dat))) == 0) return false;
1857	>	if ((base = find_rom_data(0x2a0, 0x320, tm_task_dat, sizeof(tm_task_dat))) == 0) return false;
1858		D(bug("tm_task %08lx\n", base));
1859		wp = (uint16 *)(ROM_BASE + base + 28);
1860		*wp++ = htons(M68K_NOP);
#	Line 1661 | Line 1874 | static bool patch_68k(void)
1874		}
1875
1876		// Don't read PVR from 0x5fffef80 in DriverServicesLib (via 0x316)
1877	<	if (ROMType != ROMTYPE_NEWWORLD) {
1877	>	if (ROMType != ROMTYPE_NEWWORLD && ROMType != ROMTYPE_GOSSAMER) {
1878		uint32 dsl_offset = find_rom_resource(FOURCC('n','l','i','b'), -16401);
1879		if (ROMType == ROMTYPE_ZANZIBAR) {
1880		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 1747 | Line 1960 | static bool patch_68k(void)
1960		D(bug("scsi_var2 %08lx\n", base));
1961		wp = (uint16 *)(ROM_BASE + base);
1962		*wp++ = htons(0x7000);  // moveq #0,d0
1963	<	*wp = htons(M68K_RTS);  // bra
1963	>	*wp = htons(M68K_RTS);
1964	>	}
1965	>	}
1966	>	else if (ROMType == ROMTYPE_GOSSAMER) {
1967	>	static const uint8 scsi_var_dat[] = {0x70, 0x01, 0xa0, 0x89, 0x4a, 0x6e, 0xfe, 0xac, 0x4f, 0xef, 0x00, 0x10, 0x66, 0x00};
1968	>	if ((base = find_rom_data(0x1d700, 0x1d800, scsi_var_dat, sizeof(scsi_var_dat))) != 0) {
1969	>	D(bug("scsi_var %08lx\n", base));
1970	>	wp = (uint16 *)(ROM_BASE + base + 12);
1971	>	*wp = htons(0x6000);    // bra
1972	>	}
1973	>
1974	>	static const uint8 scsi_var2_dat[] = {0x4e, 0x56, 0xfc, 0x5a, 0x48, 0xe7, 0x1f, 0x38};
1975	>	if ((base = find_rom_data(0x1d900, 0x1da00, scsi_var2_dat, sizeof(scsi_var2_dat))) != 0) {
1976	>	D(bug("scsi_var2 %08lx\n", base));
1977	>	wp = (uint16 *)(ROM_BASE + base);
1978	>	*wp++ = htons(0x7000);  // moveq #0,d0
1979	>	*wp = htons(M68K_RTS);
1980		}
1981		}
1982		#endif
#	Line 1803 | Line 2032 | static bool patch_68k(void)
2032		memcpy((void *)(ROM_BASE + sony_offset + 0x200), cdrom_driver, sizeof(cdrom_driver));
2033
2034		// Install serial drivers
2035	<	memcpy((void *)(ROM_BASE + sony_offset + 0x300), ain_driver, sizeof(ain_driver));
2036	<	memcpy((void *)(ROM_BASE + sony_offset + 0x400), aout_driver, sizeof(aout_driver));
2037	<	memcpy((void *)(ROM_BASE + sony_offset + 0x500), bin_driver, sizeof(bin_driver));
2038	<	memcpy((void *)(ROM_BASE + sony_offset + 0x600), bout_driver, sizeof(bout_driver));
2035	>	memcpy_powerpc_code((void *)(ROM_BASE + sony_offset + 0x300), ain_driver, sizeof(ain_driver));
2036	>	memcpy_powerpc_code((void *)(ROM_BASE + sony_offset + 0x400), aout_driver, sizeof(aout_driver));
2037	>	memcpy_powerpc_code((void *)(ROM_BASE + sony_offset + 0x500), bin_driver, sizeof(bin_driver));
2038	>	memcpy_powerpc_code((void *)(ROM_BASE + sony_offset + 0x600), bout_driver, sizeof(bout_driver));
2039
2040		// Copy icons to ROM
2041		SonyDiskIconAddr = ROM_BASE + sony_offset + 0x800;
#	Line 1827 | Line 2056 | static bool patch_68k(void)
2056		*wp = htons(M68K_RTS);
2057
2058		// Don't install serial drivers from ROM
2059	<	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_NEWWORLD) {
2059	>	if (ROMType == ROMTYPE_ZANZIBAR || ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
2060		wp = (uint16 *)(ROM_BASE + find_rom_resource(FOURCC('S','E','R','D'), 0));
2061		*wp = htons(M68K_RTS);
2062		} else {
#	Line 1886 | Line 2115 | static bool patch_68k(void)
2115		wp = (uint16 *)(ROM_BASE + base);
2116		if (ROMType == ROMTYPE_ZANZIBAR)
2117		*wp = htons(M68K_RTS);
2118	<	else
2118	>	else if (ntohs(wp[-4]) == 0x61ff)
2119	>	*wp = htons(M68K_RTS);
2120	>	else if (ntohs(wp[-2]) == 0x6700)
2121		wp[-2] = htons(0x6000); // bra
2122
2123		// Patch PowerOff()
#	Line 1916 | Line 2147 | static bool patch_68k(void)
2147
2148		if (ROMType == ROMTYPE_NEWWORLD) {
2149		static const uint8 via_int3_dat[] = {0x48, 0xe7, 0xf0, 0xf0, 0x76, 0x01, 0x60, 0x26};
2150	<	if ((base = find_rom_data(0x15000, 0x18000, via_int3_dat, sizeof(via_int3_dat))) == 0) return false;
2150	>	if ((base = find_rom_data(0x15000, 0x19000, via_int3_dat, sizeof(via_int3_dat))) == 0) return false;
2151		D(bug("via_int3 %08lx\n", base));
2152		wp = (uint16 *)(ROM_BASE + base);       // CHRP level 1 handler
2153		*wp++ = htons(M68K_JMP);
#	Line 2008 | Line 2239 | void InstallDrivers(void)
2239		M68kRegisters r;
2240		uint8 pb[SIZEOF_IOParam];
2241
2242	+	// Install floppy driver
2243	+	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
2244	+
2245	+	// Force installation of floppy driver with NewWorld and Gossamer ROMs
2246	+	r.a[0] = ROM_BASE + sony_offset;
2247	+	r.d[0] = (uint32)SonyRefNum;
2248	+	Execute68kTrap(0xa43d, &r);             // DrvrInstallRsrvMem()
2249	+	r.a[0] = ReadMacInt32(ReadMacInt32(0x11c) + ~SonyRefNum * 4);   // Get driver handle from Unit Table
2250	+	Execute68kTrap(0xa029, &r);             // HLock()
2251	+	uint32 dce = ReadMacInt32(r.a[0]);
2252	+	WriteMacInt32(dce + dCtlDriver, ROM_BASE + sony_offset);
2253	+	WriteMacInt16(dce + dCtlFlags, SonyDriverFlags);
2254	+	}
2255	+
2256	+	#if DISABLE_SCSI && 0
2257	+	// Fake SCSIGlobals
2258	+	static const uint8 fake_scsi_globals[32] = {0,};
2259	+	WriteMacInt32(0xc0c, (uint32)fake_scsi_globals);
2260	+	#endif
2261	+
2262		// Open .Sony driver
2263		WriteMacInt8((uint32)pb + ioPermssn, 0);
2264		WriteMacInt32((uint32)pb + ioNamePtr, (uint32)"\005.Sony");

Diff Legend

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