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.4 by cebix, 1999-10-12T20:00:45Z vs.
Revision 1.18 by cebix, 2000-10-09T17:45:58Z

# Line 1 | Line 1
1   /*
2   *  rom_patches.cpp - ROM patches
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 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 30 | Line 30
30   #include "disk.h"
31   #include "cdrom.h"
32   #include "video.h"
33 + #include "extfs.h"
34   #include "prefs.h"
35   #include "rom_patches.h"
36  
# Line 37 | Line 38
38   #include "debug.h"
39  
40  
40 // Breakpoint
41 //#define M68K_BREAKPOINT 0x2310        // CritError
42 //#define M68K_BREAKPOINT 0x1d10        // BootMe
43
41   // Global variables
42 < uint32 UniversalInfo;   // ROM offset of UniversalInfo
43 < uint32 PutScrapPatch;   // Mac address of PutScrap() patch
42 > uint32 UniversalInfo;           // ROM offset of UniversalInfo
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  
47   static uint32 sony_offset;              // ROM offset of .Sony driver
48   static uint32 serd_offset;              // ROM offset of SERD resource (serial drivers)
49   static uint32 microseconds_offset;      // ROM offset of Microseconds() replacement routine
50 < static uint32 memory_dispatch_offset;   // ROM offset of MemoryDispatch() replacement routine
50 > static uint32 debugutil_offset;         // ROM offset of DebugUtil() replacement routine
51  
52   // Prototypes
53   uint16 ROMVersion;
54  
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...
61 + */
62 +
63 + #define HiWord(X) (((X) >> 16) & 0xffff)
64 + #define LoWord(X) ((X) & 0xffff)
65 +
66 +
67 + /*
68   *  Search ROM for byte string, return ROM offset (or 0)
69   */
70  
# Line 83 | Line 93 | static uint32 find_rom_resource(uint32 s
93  
94          if (!cont)
95                  rsrc_ptr = x;
96 +        else
97 +                rsrc_ptr = ReadMacInt32(ROMBaseMac + rsrc_ptr + 8);
98  
99          for (;;) {
100                  lp = ROMBaseMac + rsrc_ptr;
# Line 141 | Line 153 | again:
153  
154  
155   /*
156 + *  Print ROM information to stream,
157 + */
158 +
159 + static void list_rom_resources(void)
160 + {
161 +        printf("ROM Resources:\n");
162 +        printf("Offset\t Type\tID\tSize\tName\n");
163 +        printf("------------------------------------------------\n");
164 +
165 +        uint32 lp = ROMBaseMac + ReadMacInt32(ROMBaseMac + 0x1a);
166 +        uint32 rsrc_ptr = ReadMacInt32(lp);
167 +
168 +        for (;;) {
169 +                lp = ROMBaseMac + rsrc_ptr;
170 +                uint32 data = ReadMacInt32(lp + 12);
171 +
172 +                char name[32];
173 +                int name_len = ReadMacInt8(lp + 23), i;
174 +                for (i=0; i<name_len; i++)
175 +                        name[i] = ReadMacInt8(lp + 24 + i);
176 +                name[i] = 0;
177 +
178 +                printf("%08x %c%c%c%c\t%d\t%d\t%s\n", data, ReadMacInt8(lp + 16), ReadMacInt8(lp + 17), ReadMacInt8(lp + 18), ReadMacInt8(lp + 19), ReadMacInt16(lp + 20), ReadMacInt32(ROMBaseMac + data - 8), name);
179 +
180 +                rsrc_ptr = ReadMacInt32(lp + 8);
181 +                if (!rsrc_ptr)
182 +                        break;
183 +        }
184 +        printf("\n");
185 + }
186 +
187 + // Mapping of Model IDs to Model names
188 + struct mac_desc {
189 +        char *name;
190 +        int32 id;
191 + };
192 +
193 + static mac_desc MacDesc[] = {
194 +        {"Classic"                              , 1},
195 +        {"Mac XL"                               , 2},
196 +        {"Mac 512KE"                    , 3},
197 +        {"Mac Plus"                             , 4},
198 +        {"Mac SE"                               , 5},
199 +        {"Mac II"                               , 6},
200 +        {"Mac IIx"                              , 7},
201 +        {"Mac IIcx"                             , 8},
202 +        {"Mac SE/030"                   , 9},
203 +        {"Mac Portable"                 , 10},
204 +        {"Mac IIci"                             , 11},
205 +        {"Mac IIfx"                             , 13},
206 +        {"Mac Classic"                  , 17},
207 +        {"Mac IIsi"                             , 18},
208 +        {"Mac LC"                               , 19},
209 +        {"Quadra 900"                   , 20},
210 +        {"PowerBook 170"                , 21},
211 +        {"Quadra 700"                   , 22},
212 +        {"Classic II"                   , 23},
213 +        {"PowerBook 100"                , 24},
214 +        {"PowerBook 140"                , 25},
215 +        {"Quadra 950"                   , 26},
216 +        {"Mac LCIII/Performa 450", 27},
217 +        {"PowerBook Duo 210"    , 29},
218 +        {"Centris 650"                  , 30},
219 +        {"PowerBook Duo 230"    , 32},
220 +        {"PowerBook 180"                , 33},
221 +        {"PowerBook 160"                , 34},
222 +        {"Quadra 800"                   , 35},
223 +        {"Quadra 650"                   , 36},
224 +        {"Mac LCII"                             , 37},
225 +        {"PowerBook Duo 250"    , 38},
226 +        {"Mac IIvi"                             , 44},
227 +        {"Mac IIvm/Performa 600", 45},
228 +        {"Mac IIvx"                             , 48},
229 +        {"Color Classic/Performa 250", 49},
230 +        {"PowerBook 165c"               , 50},
231 +        {"Centris 610"                  , 52},
232 +        {"Quadra 610"                   , 53},
233 +        {"PowerBook 145"                , 54},
234 +        {"Mac LC520"                    , 56},
235 +        {"Quadra/Centris 660AV" , 60},
236 +        {"Performa 46x"                 , 62},
237 +        {"PowerBook 180c"               , 71},
238 +        {"PowerBook 520/520c/540/540c", 72},
239 +        {"PowerBook Duo 270c"   , 77},
240 +        {"Quadra 840AV"                 , 78},
241 +        {"Performa 550"                 , 80},
242 +        {"PowerBook 165"                , 84},
243 +        {"PowerBook 190"                , 85},
244 +        {"Mac TV"                               , 88},
245 +        {"Mac LC475/Performa 47x", 89},
246 +        {"Mac LC575"                    , 92},
247 +        {"Quadra 605"                   , 94},
248 +        {"Quadra 630"                   , 98},
249 +        {"Mac LC580"                    , 99},
250 +        {"PowerBook Duo 280"    , 102},
251 +        {"PowerBook Duo 280c"   , 103},
252 +        {"PowerBook 150"                , 115},
253 +        {"unknown", -1}
254 + };
255 +
256 + static void print_universal_info(uint32 info)
257 + {
258 +        uint8 id = ReadMacInt8(info + 18);
259 +        uint16 hwcfg = ReadMacInt16(info + 16);
260 +        uint16 rom85 = ReadMacInt16(info + 20);
261 +
262 +        // Find model name
263 +        char *name = "unknown";
264 +        for (int i=0; MacDesc[i].id >= 0; i++)
265 +                if (MacDesc[i].id == id + 6) {
266 +                        name = MacDesc[i].name;
267 +                        break;
268 +                }
269 +
270 +        printf("%08x %02x\t%04x\t%04x\t%s\n", info - ROMBaseMac, id, hwcfg, rom85, name);
271 + }
272 +
273 + static void list_universal_infos(void)
274 + {
275 +        uint32 ofs = 0x3000;
276 +        for (int i=0; i<0x2000; i+=2, ofs+=2)
277 +                if (ReadMacInt32(ROMBaseMac + ofs) == 0xdc000505) {
278 +                        ofs -= 16;
279 +                        uint32 q;
280 +                        for (q=ofs; q > 0 && ReadMacInt32(ROMBaseMac + q) != ofs - q; q-=4) ;
281 +                        if (q > 0) {
282 +                                printf("Universal Table at %08x:\n", q);
283 +                                printf("Offset\t ID\tHWCfg\tROM85\tModel\n");
284 +                                printf("------------------------------------------------\n");
285 +                                while ((ofs = ReadMacInt32(ROMBaseMac + q))) {
286 +                                        print_universal_info(ROMBaseMac + ofs + q);
287 +                                        q += 4;
288 +                                }
289 +                        }
290 +                        break;
291 +                }
292 +        printf("\n");
293 + }
294 +
295 + static void print_rom_info(void)
296 + {
297 +        printf("\nROM Info:\n");
298 +        printf("Checksum    : %08x\n", ReadMacInt32(ROMBaseMac));
299 +        printf("Version     : %04x\n", ROMVersion);
300 +        printf("Sub Version : %04x\n", ReadMacInt16(ROMBaseMac + 18));
301 +        printf("Resource Map: %08x\n", ReadMacInt32(ROMBaseMac + 26));
302 +        printf("Trap Tables : %08x\n\n", ReadMacInt32(ROMBaseMac + 34));
303 +        if (ROMVersion == ROM_VERSION_32) {
304 +                list_rom_resources();
305 +                list_universal_infos();
306 +        }
307 + }
308 +
309 +
310 + /*
311   *  Driver stubs
312   */
313  
# Line 538 | Line 705 | static const uint8 adbop_patch[] = {   //
705  
706   void InstallDrivers(uint32 pb)
707   {
708 <        D(bug("InstallDrivers\n"));
708 >        D(bug("InstallDrivers, pb %08x\n", pb));
709          M68kRegisters r;
710  
711          // Install Microseconds() replacement routine
# Line 546 | Line 713 | void InstallDrivers(uint32 pb)
713          r.d[0] = 0xa093;
714          Execute68kTrap(0xa247, &r);             // SetOSTrapAddress()
715  
716 +        // Install DebugUtil() replacement routine
717 +        r.a[0] = ROMBaseMac + debugutil_offset;
718 +        r.d[0] = 0xa08d;
719 +        Execute68kTrap(0xa247, &r);             // SetOSTrapAddress()
720 +
721          // Install disk driver
722          r.a[0] = ROMBaseMac + sony_offset + 0x100;
723          r.d[0] = (uint32)DiskRefNum;
# Line 641 | Line 813 | void InstallSERD(void)
813  
814   void PatchAfterStartup(void)
815   {
816 <        // Install MemoryDispatch() replacement routine
817 <        M68kRegisters r;
818 <        r.a[0] = ROMBaseMac + memory_dispatch_offset;
819 <        r.d[0] = 0xa05c;
648 <        Execute68kTrap(0xa247, &r);             // SetOSTrapAddress()
816 > #if SUPPORTS_EXTFS
817 >        // Install external file system
818 >        InstallExtFS();
819 > #endif
820   }
821  
822  
# Line 658 | Line 829 | bool CheckROM(void)
829          // Read version
830          ROMVersion = ntohs(*(uint16 *)(ROMBaseHost + 8));
831  
832 < #if REAL_ADDRESSING
833 <        // Real addressing mode requires a 32-bit clean ROM
832 > #if REAL_ADDRESSING || DIRECT_ADDRESSING
833 >        // Real and direct addressing modes require a 32-bit clean ROM
834          return ROMVersion == ROM_VERSION_32;
835   #else
836 <        // Virtual addressing mode works with 32-bit clean Mac II ROMs and Classic ROMs (experimental)
836 >        // Virtual addressing mode works with 32-bit clean Mac II ROMs and Classic ROMs
837          return (ROMVersion == ROM_VERSION_CLASSIC) || (ROMVersion == ROM_VERSION_32);
838   #endif
839   }
# Line 776 | Line 947 | static bool patch_rom_classic(void)
947          *wp++ = htons(M68K_RTS);
948          microseconds_offset = (uint8 *)wp - ROMBaseHost;
949          *wp++ = htons(M68K_EMUL_OP_MICROSECONDS);
950 +        *wp++ = htons(M68K_RTS);
951 +
952 +        // Replace DebugUtil
953 +        debugutil_offset = (uint8 *)wp - ROMBaseHost;
954 +        *wp++ = htons(M68K_EMUL_OP_DEBUGUTIL);
955          *wp = htons(M68K_RTS);
956  
957          // Replace SCSIDispatch()
# Line 1038 | Line 1214 | static bool patch_rom_32(void)
1214          *wp = htons(M68K_RTS);
1215  
1216          // Fake CPU speed test (SetupTimeK)
1217 +        // *** increased jl : MacsBug uses TimeDBRA for kbd repeat timing
1218          wp = (uint16 *)(ROMBaseHost + 0x800);
1219          *wp++ = htons(0x31fc);                  // move.w       #xxx,TimeDBRA
1220 <        *wp++ = htons(100);
1220 >        *wp++ = htons(10000);
1221          *wp++ = htons(0x0d00);
1222          *wp++ = htons(0x31fc);                  // move.w       #xxx,TimeSCCDBRA
1223 <        *wp++ = htons(100);
1223 >        *wp++ = htons(10000);
1224          *wp++ = htons(0x0d02);
1225          *wp++ = htons(0x31fc);                  // move.w       #xxx,TimeSCSIDBRA
1226 <        *wp++ = htons(100);
1226 >        *wp++ = htons(10000);
1227          *wp++ = htons(0x0b24);
1228          *wp++ = htons(0x31fc);                  // move.w       #xxx,TimeRAMDBRA
1229 <        *wp++ = htons(100);
1229 >        *wp++ = htons(10000);
1230          *wp++ = htons(0x0cea);
1231          *wp = htons(M68K_RTS);
1232  
1233   #if REAL_ADDRESSING
1234          // Move system zone to start of Mac RAM
1235 <        lp = (uint32 *)(ROMBaseHost + 0x50a);
1236 <        *lp++ = htonl(RAMBaseMac);
1237 <        *lp = htonl(RAMBaseMac + 0x1800);
1235 >        wp = (uint16 *)(ROMBaseHost + 0x50a);
1236 >        *wp++ = htons(HiWord(RAMBaseMac + 0x2000));
1237 >        *wp++ = htons(LoWord(RAMBaseMac + 0x2000));
1238 >        *wp++ = htons(HiWord(RAMBaseMac + 0x3800));
1239 >        *wp = htons(LoWord(RAMBaseMac + 0x3800));
1240   #endif
1241  
1242   #if !ROM_IS_WRITE_PROTECTED
1243 < #if defined(AMIGA)
1243 > #if defined(USE_SCRATCHMEM_SUBTERFUGE)
1244          // Set fake handle at 0x0000 to scratch memory area (so broken Mac programs won't write into Mac ROM)
1245 <        extern uint32 ScratchMem;
1245 >        extern uint8 *ScratchMem;
1246 >        const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
1247          wp = (uint16 *)(ROMBaseHost + 0xccaa);
1248          *wp++ = htons(0x203c);                  // move.l       #ScratchMem,d0
1249 <        *wp++ = htons(ScratchMem >> 16);
1250 <        *wp = htons(ScratchMem);
1249 >        *wp++ = htons(ScratchMemBase >> 16);
1250 >        *wp = htons(ScratchMemBase);
1251   #else
1252   #error System specific handling for writable ROM is required here
1253   #endif
# Line 1079 | Line 1259 | static bool patch_rom_32(void)
1259          *wp++ = htons(M68K_NOP);
1260          *wp = htons(M68K_NOP);
1261   #endif
1262 <
1262 >        
1263 > #if REAL_ADDRESSING && !defined(AMIGA)
1264 >        // gb-- Temporary hack to get rid of crashes in Speedometer
1265 >        wp = (uint16 *)(ROMBaseHost + 0xdba2);
1266 >        if (ntohs(*wp) == 0x662c)               // bne.b        #$2c
1267 >                *wp = htons(0x602c);            // bra.b        #$2c
1268 > #endif
1269 >        
1270          // Don't write to VIA in InitTimeMgr
1271          wp = (uint16 *)(ROMBaseHost + 0xb0e2);
1272          *wp++ = htons(0x4cdf);                  // movem.l      (sp)+,d0-d5/a0-a4
# Line 1151 | Line 1338 | static bool patch_rom_32(void)
1338          *wp++ = htons(M68K_NOP);
1339          *wp = htons(M68K_NOP);
1340  
1341 <        // Fix logical/physical RAM size (CompBootStack) (must be done after InitMemMgr!)
1342 <        static const uint8 fix_memsize_dat[] = {0x4e, 0x75};
1343 <        if ((base = find_rom_data(0x490, 0x4b0, fix_memsize_dat, sizeof(fix_memsize_dat))) == 0) return false;
1344 <        D(bug("fix_memsize %08lx\n", base));
1345 <        wp = (uint16 *)(ROMBaseHost + base);
1341 >        // Compute boot stack pointer and fix logical/physical RAM size (CompBootStack) (must be done after InitMemMgr!)
1342 >        wp = (uint16 *)(ROMBaseHost + 0x490);
1343 >        *wp++ = htons(0x2038);  // move.l       $10c,d0
1344 >        *wp++ = htons(0x010c);
1345 >        *wp++ = htons(0xd0b8);  // add.l        $2a6,d0
1346 >        *wp++ = htons(0x02a6);
1347 >        *wp++ = htons(0xe288);  // lsr.l        #1,d0
1348 >        *wp++ = htons(0x0880);  // bclr         #0,d0
1349 >        *wp++ = htons(0x0000);
1350 >        *wp++ = htons(0x0440);  // subi.w       #$400,d0
1351 >        *wp++ = htons(0x0400);
1352 >        *wp++ = htons(0x2040);  // move.l       d0,a0
1353          *wp++ = htons(M68K_EMUL_OP_FIX_MEMSIZE);
1354 <        *wp = htons(M68K_RTS);
1354 >        *wp++ = htons(M68K_RTS);
1355  
1356          static const uint8 fix_memsize2_dat[] = {0x22, 0x30, 0x81, 0xe2, 0x0d, 0xdc, 0xff, 0xba, 0xd2, 0xb0, 0x81, 0xe2, 0x0d, 0xdc, 0xff, 0xec, 0x21, 0xc1, 0x1e, 0xf8};
1357          base = find_rom_data(0x4c000, 0x4c080, fix_memsize2_dat, sizeof(fix_memsize2_dat));
# Line 1268 | Line 1462 | static bool patch_rom_32(void)
1462          if (ROMSize > 0x80000) {
1463  
1464                  // BlockMove()
1465 <                static const uint8 ptest_dat[] = {0xa0, 0x8d, 0x0c, 0x81, 0x00, 0x00, 0x0c, 0x00, 0x6d, 0x06, 0x4e, 0x71, 0xf4, 0xf8};
1466 <                base = find_rom_data(0x87000, 0x87800, ptest_dat, sizeof(ptest_dat));
1467 <                D(bug("ptest %08lx\n", base));
1465 >                static const uint8 bmove_dat[] = {0x20, 0x5f, 0x22, 0x5f, 0x0c, 0x38, 0x00, 0x04, 0x01, 0x2f};
1466 >                base = find_rom_data(0x87000, 0x87800, bmove_dat, sizeof(bmove_dat));
1467 >                D(bug("block_move %08lx\n", base));
1468                  if (base) {             // ROM15/22/23/26/27/32
1469 <                        wp = (uint16 *)(ROMBaseHost + base + 8);
1470 <                        *wp = htons(M68K_NOP);
1469 >                        wp = (uint16 *)(ROMBaseHost + base + 4);
1470 >                        *wp++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
1471 >                        *wp++ = htons(0x7000);
1472 >                        *wp = htons(M68K_RTS);
1473                  }
1474  
1475                  // SANE
# Line 1290 | Line 1486 | static bool patch_rom_32(void)
1486                  }
1487          }
1488  
1489 +        // Don't set MemoryDispatch() to unimplemented trap
1490 +        static const uint8 memdisp_dat[] = {0x30, 0x3c, 0xa8, 0x9f, 0xa7, 0x46, 0x30, 0x3c, 0xa0, 0x5c, 0xa2, 0x47};
1491 +        base = find_rom_data(0x4f100, 0x4f180, memdisp_dat, sizeof(memdisp_dat));
1492 +        D(bug("memdisp %08lx\n", base));
1493 +        if (base) {     // ROM15/22/23/26/27/32
1494 +                wp = (uint16 *)(ROMBaseHost + base + 10);
1495 +                *wp = htons(M68K_NOP);
1496 +        }
1497 +
1498          // Patch .EDisk driver (don't scan for EDisks in the area ROMBase..0xe00000)
1499 <        uint32 edisk_offset = find_rom_resource('DRVR', 51);
1499 >        uint32 edisk_offset = find_rom_resource(FOURCC('D','R','V','R'), 51);
1500          if (edisk_offset) {
1501                  static const uint8 edisk_dat[] = {0xd5, 0xfc, 0x00, 0x01, 0x00, 0x00, 0xb5, 0xfc, 0x00, 0xe0, 0x00, 0x00};
1502                  base = find_rom_data(edisk_offset, edisk_offset + 0x10000, edisk_dat, sizeof(edisk_dat));
# Line 1304 | Line 1509 | static bool patch_rom_32(void)
1509          }
1510  
1511          // Replace .Sony driver
1512 <        sony_offset = find_rom_resource('DRVR', 4);
1512 >        sony_offset = find_rom_resource(FOURCC('D','R','V','R'), 4);
1513          D(bug("sony %08lx\n", sony_offset));
1514          memcpy(ROMBaseHost + sony_offset, sony_driver, sizeof(sony_driver));
1515  
# Line 1323 | Line 1528 | static bool patch_rom_32(void)
1528          memcpy(ROMBaseHost + sony_offset + 0xa00, CDROMIcon, sizeof(CDROMIcon));
1529  
1530          // Install SERD patch and serial drivers
1531 <        serd_offset = find_rom_resource('SERD', 0);
1531 >        serd_offset = find_rom_resource(FOURCC('S','E','R','D'), 0);
1532          D(bug("serd %08lx\n", serd_offset));
1533          wp = (uint16 *)(ROMBaseHost + serd_offset + 12);
1534          *wp++ = htons(M68K_EMUL_OP_SERD);
# Line 1356 | Line 1561 | static bool patch_rom_32(void)
1561          *wp++ = htons(M68K_RTS);
1562          microseconds_offset = (uint8 *)wp - ROMBaseHost;
1563          *wp++ = htons(M68K_EMUL_OP_MICROSECONDS);
1564 +        *wp++ = htons(M68K_RTS);
1565 +
1566 +        // Replace DebugUtil
1567 +        debugutil_offset = (uint8 *)wp - ROMBaseHost;
1568 +        *wp++ = htons(M68K_EMUL_OP_DEBUGUTIL);
1569          *wp = htons(M68K_RTS);
1570  
1571          // Replace SCSIDispatch()
# Line 1391 | Line 1601 | static bool patch_rom_32(void)
1601          *wp++ = htons(base >> 16);
1602          *wp = htons(base & 0xffff);
1603  
1604 <        // Install MemoryDispatch() replacement routine (activated in PatchAfterStartup())
1605 <        memory_dispatch_offset = sony_offset + 0xc20;
1606 <        wp = (uint16 *)(ROMBaseHost + memory_dispatch_offset);
1607 <        *wp++ = htons(M68K_EMUL_OP_MEMORY_DISPATCH);
1398 <        *wp = htons(M68K_RTS);
1604 >        // Look for double PACK 4 resources
1605 >        if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4)) == 0) return false;
1606 >        if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4, true)) == 0 && FPUType == 0)
1607 >                printf("WARNING: This ROM seems to require an FPU\n");
1608  
1609          // Patch VIA interrupt handler
1610          wp = (uint16 *)(ROMBaseHost + 0x9bc4);  // Level 1 handler
# Line 1414 | Line 1623 | static bool patch_rom_32(void)
1623  
1624   bool PatchROM(void)
1625   {
1626 <        // Print ROM info
1627 <        D(bug("ROM Info:\n"));
1628 <        D(bug("Checksum: %08lx\n", ReadMacInt32(ROMBaseMac)));
1420 <        D(bug("Version: %04x\n", ROMVersion));
1421 <        D(bug("Sub Version: %04x\n", ReadMacInt16(ROMBaseMac + 18)));
1626 >        // Print some information about the ROM
1627 >        if (PrintROMInfo)
1628 >                print_rom_info();
1629  
1630          // Patch ROM depending on version
1631          switch (ROMVersion) {
# Line 1434 | Line 1641 | bool PatchROM(void)
1641                          return false;
1642          }
1643  
1437 #ifdef M68K_BREAKPOINT
1644          // Install breakpoint
1645 <        uint16 *wp = (uint16 *)(ROMBaseHost + M68K_BREAKPOINT);
1646 <        *wp = htons(M68K_EMUL_BREAK);
1647 < #endif
1645 >        if (ROMBreakpoint) {
1646 >                uint16 *wp = (uint16 *)(ROMBaseHost + ROMBreakpoint);
1647 >                *wp = htons(M68K_EMUL_BREAK);
1648 >        }
1649  
1650          // Clear caches as we loaded and patched code
1651          FlushCodeCache(ROMBaseHost, ROMSize);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines