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.11 by gbeauche, 2004-06-20T19:10:02Z vs.
Revision 1.18 by gbeauche, 2006-05-03T21:53:33Z

# Line 1 | Line 1
1   /*
2   *  rsrc_patches.cpp - Resource patches
3   *
4 < *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 117 | Line 117 | void CheckLoad(uint32 type, int16 id, ui
117          D(bug("vCheckLoad %c%c%c%c (%08x) ID %d, data %p, size %d\n", type >> 24, (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, type, id, p, size));
118  
119          // Don't modify resources in ROM
120 <        if ((uintptr)p >= ROM_BASE && (uintptr)p <= (ROM_BASE + ROM_SIZE))
120 >        if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
121                  return;
122  
123          if (type == FOURCC('b','o','o','t') && id == 3) {
# Line 168 | Line 168 | void CheckLoad(uint32 type, int16 id, ui
168                                          p[5] = htons(0x6010);   // bra
169                                          D(bug(" patch 7 applied\n"));
170                                  }
171 +                        } else if (PM(0,0x2f3c) && PM(1,0x7665) && PM(2,0x7273) && PM(3,0x3f3c) && PM(4,0x0001) && PM(10,0x2041) && PM(11,0x2248) && PM(12,0x2050) && PM(20,0x7066) && PM(21,0xa9c9)) {
172 +                                // Check when vers 1 is installed (for safe abort if MacOS < 8.1 is used with a NewWorld ROM)
173 +                                p[10] = htons(M68K_EMUL_OP_CHECK_SYSV);
174 +                                p[11] = htons(0x4a81);  // tst.l        d1
175 +                                p[12] = htons(0x670e);  // beq.s        <SysError #dsOldSystem>
176 +                                D(bug(" patch 9 applied\n"));
177                          }
178                          p++;
179                  }
# Line 451 | Line 457 | void CheckLoad(uint32 type, int16 id, ui
457                          p[(0x378 + 0x6c0) >> 1] = htons(0x4e80);                // blr
458                          p[(0x37a + 0x6c0) >> 1] = htons(0x0020);
459                          D(bug(" patch 2 applied\n"));
460 +                } else if (p[(0x374 + 0x510) >> 1] == htons(0x7c08) && p[(0x376 + 0x510) >> 1] == htons(0x02a6)) {
461 +                        // Don't overwrite our serial drivers (9.0)
462 +                        p[(0x374 + 0x510) >> 1] = htons(0x4e80);                // blr
463 +                        p[(0x376 + 0x510) >> 1] = htons(0x0020);
464 +                        D(bug(" patch 3 applied\n"));
465                  }
466  
467          } else if (type == FOURCC('c','i','t','t') && id == 45) {
# Line 468 | Line 479 | void CheckLoad(uint32 type, int16 id, ui
479  
480          } else if (type == FOURCC('t','h','n','g')) {
481                  // Collect info about used audio sifters
482 <                uint32 thing = (uintptr)p;
482 >                uint32 thing = Host2MacAddr((uint8 *)p);
483                  uint32 c_type = ReadMacInt32(thing);
484                  uint32 sub_type = ReadMacInt32(thing + 4);
485                  if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
# Line 549 | Line 560 | void CheckLoad(uint32 type, int16 id, ui
560                          p[(base + 0x06) >> 1] = htons(0x0020);
561                          D(bug(" patch 2 applied\n"));
562                  }
563 +
564 +        } else if (type == FOURCC('C','O','D','E') && id == 27 && size == 25024) {
565 +                D(bug("CODE 27 found [Apple Personal Diagnostics]\n"));
566 +
567 +                // Don't access FCBs directly in Apple Personal Diagnostics (MacOS 9)
568 +                // FIXME: this should not be called in the first place, use UTResolveFCB?
569 +                static const uint8 dat[] = {0x2d, 0x78, 0x03, 0x4e, 0xff, 0xf8, 0x20, 0x6e, 0xff, 0xf8};
570 +                base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
571 +                if (base
572 +                        && ReadMacInt16(0x3f6) == 4 /* FSFCBLen */
573 +                        && p[(base + 0x1a) >> 1] == htons(0x605e)
574 +                        && p[(base + 0x80) >> 1] == htons(0x7000))
575 +                {
576 +                        p[(base + 0x1a) >> 1] = htons(0x6064);
577 +                        D(bug(" patch1 applied\n"));
578 +                }
579 +        }
580 + }
581 +
582 +
583 + /*
584 + *  Resource patches via GetNamedResource() and Get1NamedResource()
585 + */
586 +
587 + void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
588 + {
589 +        uint16 *p16;
590 +        uint32 base;
591 +        D(bug("vCheckLoad %c%c%c%c (%08x) name \"%*s\", data %p, size %d\n", type >> 24, (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, type, name[0], &name[1], p, size));
592 +
593 +        // Don't modify resources in ROM
594 +        if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
595 +                return;
596 +
597 +        if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
598 +                D(bug(" DRVR .AFPTranslator found\n"));
599 +                
600 +                // Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
601 +                static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
602 +                base = find_rsrc_data(p, size, dat, sizeof(dat));
603 +                if (base) {
604 +                        p16 = (uint16 *)(p + base + 4);
605 +                        *p16++ = htons(0x303c);         // move.l       #ROM85,%d0
606 +                        *p16++ = htons(0x028e);
607 +                        *p16++ = htons(M68K_NOP);
608 +                        *p16++ = htons(M68K_NOP);
609 +                        D(bug("  patch 1 applied\n"));
610 +                }
611          }
612   }
613  
# Line 571 | Line 630 | void check_load_invoc(uint32 type, int16
630                  return;
631          uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
632  
633 <        CheckLoad(type, id, (uint16 *)p, size);
633 >        CheckLoad(type, id, (uint16 *)Mac2HostAddr(p), size);
634 > }
635 >
636 > #ifdef __BEOS__
637 > static
638 > #else
639 > extern "C"
640 > #endif
641 > void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
642 > {
643 >        if (h == 0)
644 >                return;
645 >        uint32 p = ReadMacInt32(h);
646 >        if (p == 0)
647 >                return;
648 >        uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
649 >
650 >        CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
651   }
652  
653   #ifdef __BEOS__
# Line 739 | Line 815 | static asm void **r_get_resource(registe
815          addi    r1,r1,56+12
816          blr
817   }
818 +
819 + static asm void **get_named_resource(register uint32 type, register uint32 name)
820 + {
821 +        // Create stack frame
822 +        mflr    r0
823 +        stw             r0,8(r1)
824 +        stwu    r1,-(56+12)(r1)
825 +
826 +        // Save type/ID
827 +        stw             r3,56(r1)
828 +        stw             r4,56+4(r1)
829 +
830 +        // Call old routine
831 +        lwz             r0,XLM_GET_NAMED_RESOURCE
832 +        lwz             r2,XLM_RES_LIB_TOC
833 +        mtctr   r0
834 +        bctrl
835 +        lwz             r2,XLM_TOC              // Get TOC
836 +        stw             r3,56+8(r1)             // Save handle
837 +
838 +        // Call CheckLoad
839 +        lwz             r3,56(r1)
840 +        lwz             r4,56+4(r1)
841 +        lwz             r5,56+8(r1)
842 +        bl              named_check_load_invoc
843 +        lwz             r3,56+8(r1)             // Restore handle
844 +
845 +        // Return to caller
846 +        lwz             r0,56+12+8(r1)
847 +        mtlr    r0
848 +        addi    r1,r1,56+12
849 +        blr
850 + }
851 +
852 + static asm void **get_1_named_resource(register uint32 type, register uint32 name)
853 + {
854 +        // Create stack frame
855 +        mflr    r0
856 +        stw             r0,8(r1)
857 +        stwu    r1,-(56+12)(r1)
858 +
859 +        // Save type/ID
860 +        stw             r3,56(r1)
861 +        stw             r4,56+4(r1)
862 +
863 +        // Call old routine
864 +        lwz             r0,XLM_GET_1_NAMED_RESOURCE
865 +        lwz             r2,XLM_RES_LIB_TOC
866 +        mtctr   r0
867 +        bctrl
868 +        lwz             r2,XLM_TOC              // Get TOC
869 +        stw             r3,56+8(r1)             // Save handle
870 +
871 +        // Call CheckLoad
872 +        lwz             r3,56(r1)
873 +        lwz             r4,56+4(r1)
874 +        lwz             r5,56+8(r1)
875 +        bl              named_check_load_invoc
876 +        lwz             r3,56+8(r1)             // Restore handle
877 +
878 +        // Return to caller
879 +        lwz             r0,56+12+8(r1)
880 +        mtlr    r0
881 +        addi    r1,r1,56+12
882 +        blr
883 + }
884   #else
885   // Routines in asm_linux.S
886   extern "C" void get_resource(void);
# Line 746 | Line 888 | extern "C" void get_1_resource(void);
888   extern "C" void get_ind_resource(void);
889   extern "C" void get_1_ind_resource(void);
890   extern "C" void r_get_resource(void);
891 + extern "C" void get_named_resource(void);
892 + extern "C" void get_1_named_resource(void);
893   #endif
894  
895   void PatchNativeResourceManager(void)
# Line 756 | Line 900 | void PatchNativeResourceManager(void)
900          uint32 upp = ReadMacInt32(0x1480);
901          if ((upp & 0xffc00000) == ROM_BASE)
902                  return;
903 <        uint32 *tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
904 <        D(bug(" GetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
905 <        *(uint32 *)XLM_RES_LIB_TOC = tvec[1];
906 <        *(uint32 *)XLM_GET_RESOURCE = tvec[0];
903 >        uint32 tvec = ReadMacInt32(upp + 5 * 4);
904 >        D(bug(" GetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
905 >        WriteMacInt32(XLM_RES_LIB_TOC, ReadMacInt32(tvec + 4));
906 >        WriteMacInt32(XLM_GET_RESOURCE, ReadMacInt32(tvec));
907   #if EMULATED_PPC
908 <        tvec[0] = htonl(NativeFunction(NATIVE_GET_RESOURCE));
908 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_RESOURCE));
909   #else
910   #ifdef __BEOS__
911          uint32 *tvec2 = (uint32 *)get_resource;
912 <        tvec[0] = tvec2[0];
913 <        tvec[1] = tvec2[1];
912 >        WriteMacInt32(tvec, tvec2[0]);
913 >        WriteMacInt32(tvec + 4, tvec2[1]);
914   #else
915 <        tvec[0] = (uint32)get_resource;
915 >        WriteMacInt32(tvec, (uint32)get_resource);
916   #endif
917   #endif
918  
919          // Patch native Get1Resource()
920          upp = ReadMacInt32(0x0e7c);
921 <        tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
922 <        D(bug(" Get1Resource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
923 <        *(uint32 *)XLM_GET_1_RESOURCE = tvec[0];
921 >        tvec = ReadMacInt32(upp + 5 * 4);
922 >        D(bug(" Get1Resource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
923 >        WriteMacInt32(XLM_GET_1_RESOURCE, ReadMacInt32(tvec));
924   #if EMULATED_PPC
925 <        tvec[0] = htonl(NativeFunction(NATIVE_GET_1_RESOURCE));
925 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_RESOURCE));
926   #else
927   #ifdef __BEOS__
928          tvec2 = (uint32 *)get_1_resource;
929 <        tvec[0] = tvec2[0];
930 <        tvec[1] = tvec2[1];
929 >        WriteMacInt32(tvec, tvec2[0]);
930 >        WriteMacInt32(tvec + 4, tvec2[1]);
931   #else
932 <        tvec[0] = (uint32)get_1_resource;
932 >        WriteMacInt32(tvec, (uint32)get_1_resource);
933   #endif
934   #endif
935  
936          // Patch native GetIndResource()
937          upp = ReadMacInt32(0x1474);
938 <        tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
939 <        D(bug(" GetIndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
940 <        *(uint32 *)XLM_GET_IND_RESOURCE = tvec[0];
938 >        tvec = ReadMacInt32(upp + 5 * 4);
939 >        D(bug(" GetIndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
940 >        WriteMacInt32(XLM_GET_IND_RESOURCE, ReadMacInt32(tvec));
941   #if EMULATED_PPC
942 <        tvec[0] = htonl(NativeFunction(NATIVE_GET_IND_RESOURCE));
942 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_IND_RESOURCE));
943   #else
944   #ifdef __BEOS__
945          tvec2 = (uint32 *)get_ind_resource;
946 <        tvec[0] = tvec2[0];
947 <        tvec[1] = tvec2[1];
946 >        WriteMacInt32(tvec, tvec2[0]);
947 >        WriteMacInt32(tvec + 4, tvec2[1]);
948   #else
949 <        tvec[0] = (uint32)get_ind_resource;
949 >        WriteMacInt32(tvec, (uint32)get_ind_resource);
950   #endif
951   #endif
952  
953          // Patch native Get1IndResource()
954          upp = ReadMacInt32(0x0e38);
955 <        tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
956 <        D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
957 <        *(uint32 *)XLM_GET_1_IND_RESOURCE = tvec[0];
955 >        tvec = ReadMacInt32(upp + 5 * 4);
956 >        D(bug(" Get1IndResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
957 >        WriteMacInt32(XLM_GET_1_IND_RESOURCE, ReadMacInt32(tvec));
958   #if EMULATED_PPC
959 <        tvec[0] = htonl(NativeFunction(NATIVE_GET_1_IND_RESOURCE));
959 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_IND_RESOURCE));
960   #else
961   #ifdef __BEOS__
962          tvec2 = (uint32 *)get_1_ind_resource;
963 <        tvec[0] = tvec2[0];
964 <        tvec[1] = tvec2[1];
963 >        WriteMacInt32(tvec, tvec2[0]);
964 >        WriteMacInt32(tvec + 4, tvec2[1]);
965   #else
966 <        tvec[0] = (uint32)get_1_ind_resource;
966 >        WriteMacInt32(tvec, (uint32)get_1_ind_resource);
967   #endif
968   #endif
969  
970          // Patch native RGetResource()
971          upp = ReadMacInt32(0x0e30);
972 <        tvec = (uint32 *)ReadMacInt32(upp + 5 * 4);
973 <        D(bug(" RGetResource() entry %08x, TOC %08x\n", ntohl(tvec[0]), ntohl(tvec[1])));
974 <        *(uint32 *)XLM_R_GET_RESOURCE = tvec[0];
972 >        tvec = ReadMacInt32(upp + 5 * 4);
973 >        D(bug(" RGetResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
974 >        WriteMacInt32(XLM_R_GET_RESOURCE, ReadMacInt32(tvec));
975   #if EMULATED_PPC
976 <        tvec[0] = htonl(NativeFunction(NATIVE_R_GET_RESOURCE));
976 >        WriteMacInt32(tvec, NativeFunction(NATIVE_R_GET_RESOURCE));
977   #else
978   #ifdef __BEOS__
979          tvec2 = (uint32 *)r_get_resource;
980 <        tvec[0] = tvec2[0];
981 <        tvec[1] = tvec2[1];
980 >        WriteMacInt32(tvec, tvec2[0]);
981 >        WriteMacInt32(tvec + 4, tvec2[1]);
982 > #else
983 >        WriteMacInt32(tvec, (uint32)r_get_resource);
984 > #endif
985 > #endif
986 >
987 >        // Patch native GetNamedResource()
988 >        upp = ReadMacInt32(0x1484);
989 >        tvec = ReadMacInt32(upp + 5 * 4);
990 >        D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
991 >        WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
992 > #if EMULATED_PPC
993 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
994 > #else
995 > #ifdef __BEOS__
996 >        tvec2 = (uint32 *)get_named_resource;
997 >        WriteMacInt32(tvec, tvec2[0]);
998 >        WriteMacInt32(tvec + 4, tvec2[1]);
999 > #else
1000 >        WriteMacInt32(tvec, (uint32)get_named_resource);
1001 > #endif
1002 > #endif
1003 >
1004 >        // Patch native Get1NamedResource()
1005 >        upp = ReadMacInt32(0x0e80);
1006 >        tvec = ReadMacInt32(upp + 5 * 4);
1007 >        D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
1008 >        WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
1009 > #if EMULATED_PPC
1010 >        WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
1011 > #else
1012 > #ifdef __BEOS__
1013 >        tvec2 = (uint32 *)get_1_named_resource;
1014 >        WriteMacInt32(tvec, tvec2[0]);
1015 >        WriteMacInt32(tvec + 4, tvec2[1]);
1016   #else
1017 <        tvec[0] = (uint32)r_get_resource;
1017 >        WriteMacInt32(tvec, (uint32)get_1_named_resource);
1018   #endif
1019   #endif
1020   }

Diff Legend

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