ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/rsrc_patches.cpp
(Generate patch)

Comparing SheepShaver/src/rsrc_patches.cpp (file contents):
Revision 1.5 by gbeauche, 2003-09-29T22:48:22Z vs.
Revision 1.11 by gbeauche, 2004-06-20T19:10:02Z

# Line 1 | Line 1
1   /*
2   *  rsrc_patches.cpp - Resource patches
3   *
4 < *  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-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 31 | Line 31
31   #include "rom_patches.h"
32   #include "main.h"
33   #include "audio.h"
34 + #include "audio_defs.h"
35 + #include "thunks.h"
36  
37   #define DEBUG 0
38   #include "debug.h"
# Line 134 | Line 136 | void CheckLoad(uint32 type, int16 id, ui
136                                  // Check when ntrb 17 is installed (for native Resource Manager patch) (7.6, 7.6.1, 8.0, 8.1)
137                                  p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
138                                  D(bug(" patch 3 applied\n"));
139 <                        } else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff)) {
139 >                        } else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(8,0x245f)) {
140                                  // Check when ntrb 17 is installed (for native Resource Manager patch) (8.5, 8.6)
141                                  p[8] = htons(M68K_EMUL_OP_NTRB_17_PATCH);
142                                  D(bug(" patch 4 applied\n"));
143 +                        } else if (PM(0,0x3f2a) && PM(1,0x0006) && PM(2,0x3f2a) && PM(3,0x0002) && PM(4,0x61ff) && PM(7,0x301f)) {
144 +                                // Check when ntrb 17 is installed (for native Resource Manager patch) (9.0)
145 +                                p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH4);
146 +                                p[8] = htons(ntohs(p[8]) & 0xf0ff); // bra
147 +                                D(bug(" patch 8 applied\n"));
148                          } else if (PM(0,0x0c39) && PM(1,0x0001) && PM(2,0xf800) && PM(3,0x0008) && PM(4,0x6f00)) {
149                                  // Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6)
150                                  p[0] = htons(M68K_NOP);
# Line 177 | Line 184 | void CheckLoad(uint32 type, int16 id, ui
184                          D(bug(" patch 1 applied\n"));
185                  }
186  
187 +        } else if (type == FOURCC('p','t','c','h') && id == 156) {
188 +                D(bug("ptch 156 found\n"));
189 +                size >>= 1;
190 +                while (size--) {
191 +                        if (PM(0,0x4e56) && PM(1,0xfffa) && PM(2,0x48e7) && PM(3,0x1f18) && PM(4,0x7800) && PM(5,0x267c) && PM(6,0x6900) && PM(7,0x0000)) {
192 +                                // Don't call FE0A opcode (9.0)
193 +                                p[0] = htons(0x7000);           // moveq #0,d0
194 +                                p[1] = htons(M68K_RTS);
195 +                                D(bug(" patch 1 applied\n"));
196 +                                break;
197 +                        }
198 +                        p++;
199 +                }
200 +
201          } else if (type == FOURCC('p','t','c','h') && id == 420) {
202                  D(bug("ptch 420 found\n"));
203                  size >>= 1;
# Line 420 | Line 441 | void CheckLoad(uint32 type, int16 id, ui
441  
442          } else if (type == FOURCC('n','s','r','d') && id == 1) {
443                  D(bug("nsrd 1 found\n"));
444 <                if (p[(0x378 + 0x570) >> 1] == 0x7c08 && p[(0x37a + 0x570) >> 1] == 0x02a6) {
444 >                if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) {
445                          // Don't overwrite our serial drivers (8.0, 8.1)
446 <                        p[(0x378 + 0x570) >> 1] = 0x4e80;               // blr
447 <                        p[(0x37a + 0x570) >> 1] = 0x0020;
446 >                        p[(0x378 + 0x570) >> 1] = htons(0x4e80);                // blr
447 >                        p[(0x37a + 0x570) >> 1] = htons(0x0020);
448                          D(bug(" patch 1 applied\n"));
449 <                } else if (p[(0x378 + 0x6c0) >> 1] == 0x7c08 && p[(0x37a + 0x6c0) >> 1] == 0x02a6) {
449 >                } else if (p[(0x378 + 0x6c0) >> 1] == htons(0x7c08) && p[(0x37a + 0x6c0) >> 1] == htons(0x02a6)) {
450                          // Don't overwrite our serial drivers (8.5, 8.6)
451 <                        p[(0x378 + 0x6c0) >> 1] = 0x4e80;               // blr
452 <                        p[(0x37a + 0x6c0) >> 1] = 0x0020;
451 >                        p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
452 >                        p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
453                          D(bug(" patch 2 applied\n"));
454                  }
455  
# Line 438 | Line 459 | void CheckLoad(uint32 type, int16 id, ui
459                  while (size--) {
460                          if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
461                                  // Don't replace SCSI Manager (8.1, 8.5, 8.6)
462 <                                p[5] = htons((p[5] & 0xff) | 0x6000);           // beq
462 >                                p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);            // beq
463                                  D(bug(" patch 1 applied\n"));
464                                  break;
465                          }
# Line 447 | Line 468 | void CheckLoad(uint32 type, int16 id, ui
468  
469          } else if (type == FOURCC('t','h','n','g')) {
470                  // Collect info about used audio sifters
471 <                uint32 c_type = 0[(uint32 *)p];
472 <                uint32 sub_type = 1[(uint32 *)p];
471 >                uint32 thing = (uintptr)p;
472 >                uint32 c_type = ReadMacInt32(thing);
473 >                uint32 sub_type = ReadMacInt32(thing + 4);
474                  if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
475 <                        1[(uint32 *)p] = FOURCC('a','w','g','c');
475 >                        WriteMacInt32(thing + 4, FOURCC('a','w','g','c'));
476                          D(bug("thng %d, type %c%c%c%c (%08x), sub type %c%c%c%c (%08x), data %p\n", id, c_type >> 24, (c_type >> 16) & 0xff, (c_type >> 8) & 0xff, c_type & 0xff, c_type, sub_type >> 24, (sub_type >> 16) & 0xff, (sub_type >> 8) & 0xff, sub_type & 0xff, sub_type, p));
477 <                        AddSifter(*(uint32 *)(((uintptr)p)+20), p[12]);
478 <                        if (p[28])                                                              // componentPFCount
479 <                                AddSifter(*(uint32 *)(((uintptr)p)+62), p[33]);
477 >                        AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID));
478 >                        if (ReadMacInt32(thing + componentPFCount))
479 >                                AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID));
480                  }
481  
482          } else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) {
# Line 504 | Line 526 | void CheckLoad(uint32 type, int16 id, ui
526                          p16[1] = htons(M68K_RTS);
527                          D(bug(" patch 1 applied\n"));
528                  }
529 +
530 +        } else if (type == FOURCC('N','O','b','j') && id == 100) {
531 +                D(bug("NObj 100 found\n"));
532 +
533 +                // Don't access VIA registers in MacBench 5.0
534 +                static const uint8 dat1[] = {0x7c, 0x08, 0x02, 0xa6, 0xbf, 0x01, 0xff, 0xe0, 0x90, 0x01, 0x00, 0x08};
535 +                base = find_rsrc_data((uint8 *)p, size, dat1, sizeof(dat1));
536 +                if (base) {
537 +                        p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
538 +                        p[(base + 0x02) >> 1] = htons(0x0000);
539 +                        p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
540 +                        p[(base + 0x06) >> 1] = htons(0x0020);
541 +                        D(bug(" patch 1 applied\n"));
542 +                }
543 +                static const uint8 dat2[] = {0x7c, 0x6c, 0x1b, 0x78, 0x7c, 0x8b, 0x23, 0x78, 0x38, 0xc0, 0x3f, 0xfd};
544 +                base = find_rsrc_data((uint8 *)p, size, dat2, sizeof(dat2));
545 +                if (base) {
546 +                        p[(base + 0x00) >> 1] = htons(0x3860);          // li r3,0
547 +                        p[(base + 0x02) >> 1] = htons(0x0000);
548 +                        p[(base + 0x04) >> 1] = htons(0x4e80);          // blr
549 +                        p[(base + 0x06) >> 1] = htons(0x0020);
550 +                        D(bug(" patch 2 applied\n"));
551 +                }
552          }
553   }
554  
# Line 716 | Line 761 | void PatchNativeResourceManager(void)
761          *(uint32 *)XLM_RES_LIB_TOC = tvec[1];
762          *(uint32 *)XLM_GET_RESOURCE = tvec[0];
763   #if EMULATED_PPC
764 <        tvec[0] = htonl(POWERPC_NATIVE_OP_FUNC(NATIVE_GET_RESOURCE));
764 >        tvec[0] = htonl(NativeFunction(NATIVE_GET_RESOURCE));
765   #else
766   #ifdef __BEOS__
767          uint32 *tvec2 = (uint32 *)get_resource;
# Line 733 | Line 778 | void PatchNativeResourceManager(void)
778          D(bug(" Get1Resource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
779          *(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
780   #if EMULATED_PPC
781 <        tvec[0] = htonl(POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_RESOURCE));
781 >        tvec[0] = htonl(NativeFunction(NATIVE_GET_1_RESOURCE));
782   #else
783   #ifdef __BEOS__
784          tvec2 = (uint32 *)get_1_resource;
# Line 750 | Line 795 | void PatchNativeResourceManager(void)
795          D(bug(" GetIndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
796          *(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
797   #if EMULATED_PPC
798 <        tvec[0] = htonl(POWERPC_NATIVE_OP_FUNC(NATIVE_GET_IND_RESOURCE));
798 >        tvec[0] = htonl(NativeFunction(NATIVE_GET_IND_RESOURCE));
799   #else
800   #ifdef __BEOS__
801          tvec2 = (uint32 *)get_ind_resource;
# Line 767 | Line 812 | void PatchNativeResourceManager(void)
812          D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
813          *(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
814   #if EMULATED_PPC
815 <        tvec[0] = htonl(POWERPC_NATIVE_OP_FUNC(NATIVE_GET_1_IND_RESOURCE));
815 >        tvec[0] = htonl(NativeFunction(NATIVE_GET_1_IND_RESOURCE));
816   #else
817   #ifdef __BEOS__
818          tvec2 = (uint32 *)get_1_ind_resource;
# Line 784 | Line 829 | void PatchNativeResourceManager(void)
829          D(bug(" RGetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
830          *(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
831   #if EMULATED_PPC
832 <        tvec[0] = htonl(POWERPC_NATIVE_OP_FUNC(NATIVE_R_GET_RESOURCE));
832 >        tvec[0] = htonl(NativeFunction(NATIVE_R_GET_RESOURCE));
833   #else
834   #ifdef __BEOS__
835          tvec2 = (uint32 *)r_get_resource;

Diff Legend

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