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

Comparing BasiliskII/src/rom_patches.cpp (file contents):
Revision 1.17 by gbeauche, 2000-09-22T17:17:21Z vs.
Revision 1.20 by gbeauche, 2001-02-10T11:37:42Z

# Line 1 | Line 1
1   /*
2   *  rom_patches.cpp - ROM patches
3   *
4 < *  Basilisk II (C) 1997-2000 Christian Bauer
4 > *  Basilisk II (C) 1997-2001 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 43 | Line 43 | uint32 UniversalInfo;          // ROM offset of
43   uint32 PutScrapPatch;           // Mac address of PutScrap() patch
44   uint32 ROMBreakpoint = 0;       // ROM offset of breakpoint (0 = disabled, 0x2310 = CritError)
45   bool PrintROMInfo = false;      // Flag: print ROM information in PatchROM()
46 + bool PatchHWBases = true;       // Flag: patch hardware base addresses
47  
48   static uint32 sony_offset;              // ROM offset of .Sony driver
49   static uint32 serd_offset;              // ROM offset of SERD resource (serial drivers)
# Line 52 | Line 53 | static uint32 debugutil_offset;                // ROM
53   // Prototypes
54   uint16 ROMVersion;
55  
55
56   /*
57 < *      Convenience functions for retrieving a particular 16-bit word from
58 < *      a 32-bit word value.
59 < *      
60 < *      gb-- probably put those elsewhere...
57 > *  Macros used to extract one of the 16-bit words from a 32-bit word value
58   */
59  
60   #define HiWord(X) (((X) >> 16) & 0xffff)
# Line 1032 | Line 1029 | static bool patch_rom_32(void)
1029          bp = ROMBaseHost + UniversalInfo + 18;          // productKind
1030          *bp = PrefsFindInt32("modelid");
1031  
1032 + #if !ROM_IS_WRITE_PROTECTED
1033 + #if defined(USE_SCRATCHMEM_SUBTERFUGE)
1034 +        // Set hardware base addresses to scratch memory area
1035 +        if (PatchHWBases) {
1036 +                extern uint8 *ScratchMem;
1037 +                const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
1038 +                
1039 +                D(bug("LMGlob\tOfs/4\tBase\n"));
1040 +                base = ROMBaseMac + UniversalInfo + ReadMacInt32(ROMBaseMac + UniversalInfo); // decoderInfoPtr
1041 +                wp = (uint16 *)(ROMBaseHost + 0x94a);
1042 +                while (*wp != 0xffff) {
1043 +                        int16 ofs = ntohs(*wp++);                       // offset in decoderInfo (/4)
1044 +                        int16 lmg = ntohs(*wp++);                       // address of LowMem global
1045 +                        D(bug("0x%04x\t%d\t0x%08x\n", lmg, ofs, ReadMacInt32(base + ofs*4)));
1046 +                        
1047 +                        // Fake address only if this is not the ASC base
1048 +                        if (lmg != 0xcc0)
1049 +                                WriteMacInt32(base + ofs*4, ScratchMemBase);
1050 +                }
1051 +        }
1052 + #else
1053 + #error System specific handling for writable ROM is required here
1054 + #endif
1055 + #endif
1056 +
1057          // Make FPU optional
1058          if (FPUType == 0) {
1059                  bp = ROMBaseHost + UniversalInfo + 22;  // defaultRSRCs
# Line 1240 | Line 1262 | static bool patch_rom_32(void)
1262   #endif
1263  
1264   #if !ROM_IS_WRITE_PROTECTED
1265 < #if defined(AMIGA) || defined(USE_SCRATCHMEM_SUBTERFUGE)
1265 > #if defined(USE_SCRATCHMEM_SUBTERFUGE)
1266          // Set fake handle at 0x0000 to scratch memory area (so broken Mac programs won't write into Mac ROM)
1267          extern uint8 *ScratchMem;
1268          const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
# Line 1462 | Line 1484 | static bool patch_rom_32(void)
1484          if (ROMSize > 0x80000) {
1485  
1486                  // BlockMove()
1487 <                static const uint8 ptest_dat[] = {0xa0, 0x8d, 0x0c, 0x81, 0x00, 0x00, 0x0c, 0x00, 0x6d, 0x06, 0x4e, 0x71, 0xf4, 0xf8};
1488 <                base = find_rom_data(0x87000, 0x87800, ptest_dat, sizeof(ptest_dat));
1489 <                D(bug("ptest %08lx\n", base));
1487 >                static const uint8 bmove_dat[] = {0x20, 0x5f, 0x22, 0x5f, 0x0c, 0x38, 0x00, 0x04, 0x01, 0x2f};
1488 >                base = find_rom_data(0x87000, 0x87800, bmove_dat, sizeof(bmove_dat));
1489 >                D(bug("block_move %08lx\n", base));
1490                  if (base) {             // ROM15/22/23/26/27/32
1491 <                        wp = (uint16 *)(ROMBaseHost + base + 8);
1492 <                        *wp = htons(M68K_NOP);
1491 >                        wp = (uint16 *)(ROMBaseHost + base + 4);
1492 >                        *wp++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
1493 >                        *wp++ = htons(0x7000);
1494 >                        *wp = htons(M68K_RTS);
1495                  }
1496  
1497                  // SANE
# Line 1599 | Line 1623 | static bool patch_rom_32(void)
1623          *wp++ = htons(base >> 16);
1624          *wp = htons(base & 0xffff);
1625  
1602 #if EMULATED_68K
1603        // Replace BlockMove()
1604        wp = (uint16 *)(ROMBaseHost + find_rom_trap(0xa02e));   // BlockMove()
1605        *wp++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
1606        *wp++ = htons(0x7000);
1607        *wp = htons(M68K_RTS);
1608 #endif
1609
1626          // Look for double PACK 4 resources
1627          if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4)) == 0) return false;
1628          if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4, true)) == 0 && FPUType == 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines