Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-23 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity

- changed type of ScratchMem from uint32 to uint8 *

Browse Source 
- use of Host2MacAddr to glue the ScratchMem area
- added an experimental patch to fix a bug with Speedometer in real addressing mode
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
This commit is contained in:
gbeauche 2000-09-22 17:17:21 +00:00
parent f882c34591
commit c982fcf621
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BasiliskII/src/rom_patches.cpp
View File

@ -53,6 +53,17 @@ static uint32 debugutil_offset; // ROM offset of DebugUtil() replacement routin
uint16 ROMVersion; uint16 ROMVersion;
/*
* Convenience functions for retrieving a particular 16-bit word from
* a 32-bit word value.
*
* gb-- probably put those elsewhere...
*/
#define HiWord(X) (((X) >> 16) & 0xffff)
#define LoWord(X) ((X) & 0xffff)
/* /*
* Search ROM for byte string, return ROM offset (or 0) * Search ROM for byte string, return ROM offset (or 0)
*/ */
@ -818,8 +829,8 @@ bool CheckROM(void)
// Read version // Read version
ROMVersion = ntohs(*(uint16 *)(ROMBaseHost + 8)); ROMVersion = ntohs(*(uint16 *)(ROMBaseHost + 8));
#if REAL_ADDRESSING #if REAL_ADDRESSING || DIRECT_ADDRESSING
// Real addressing mode requires a 32-bit clean ROM // Real and direct addressing modes require a 32-bit clean ROM
return ROMVersion == ROM_VERSION_32; return ROMVersion == ROM_VERSION_32;
#else #else
// Virtual addressing mode works with 32-bit clean Mac II ROMs and Classic ROMs // Virtual addressing mode works with 32-bit clean Mac II ROMs and Classic ROMs
@ -1221,19 +1232,22 @@ static bool patch_rom_32(void)
#if REAL_ADDRESSING #if REAL_ADDRESSING
// Move system zone to start of Mac RAM // Move system zone to start of Mac RAM
lp = (uint32 *)(ROMBaseHost + 0x50a); wp = (uint16 *)(ROMBaseHost + 0x50a);
*lp++ = htonl(RAMBaseMac); *wp++ = htons(HiWord(RAMBaseMac + 0x2000));
*lp = htonl(RAMBaseMac + 0x1800); *wp++ = htons(LoWord(RAMBaseMac + 0x2000));
*wp++ = htons(HiWord(RAMBaseMac + 0x3800));
*wp = htons(LoWord(RAMBaseMac + 0x3800));
#endif #endif
#if !ROM_IS_WRITE_PROTECTED #if !ROM_IS_WRITE_PROTECTED
#if defined(AMIGA) #if defined(AMIGA) || defined(USE_SCRATCHMEM_SUBTERFUGE)
// Set fake handle at 0x0000 to scratch memory area (so broken Mac programs won't write into Mac ROM) // Set fake handle at 0x0000 to scratch memory area (so broken Mac programs won't write into Mac ROM)
extern uint32 ScratchMem; extern uint8 *ScratchMem;
const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
wp = (uint16 *)(ROMBaseHost + 0xccaa); wp = (uint16 *)(ROMBaseHost + 0xccaa);
*wp++ = htons(0x203c); // move.l #ScratchMem,d0 *wp++ = htons(0x203c); // move.l #ScratchMem,d0
*wp++ = htons(ScratchMem >> 16); *wp++ = htons(ScratchMemBase >> 16);
*wp = htons(ScratchMem); *wp = htons(ScratchMemBase);
#else #else
#error System specific handling for writable ROM is required here #error System specific handling for writable ROM is required here
#endif #endif
@ -1245,7 +1259,14 @@ static bool patch_rom_32(void)
*wp++ = htons(M68K_NOP); *wp++ = htons(M68K_NOP);
*wp = htons(M68K_NOP); *wp = htons(M68K_NOP);
#endif #endif
#if REAL_ADDRESSING && !defined(AMIGA)
// gb-- Temporary hack to get rid of crashes in Speedometer
wp = (uint16 *)(ROMBaseHost + 0xdba2);
if (ntohs(*wp) == 0x662c) // bne.b #$2c
*wp = htons(0x602c); // bra.b #$2c
#endif
// Don't write to VIA in InitTimeMgr // Don't write to VIA in InitTimeMgr
wp = (uint16 *)(ROMBaseHost + 0xb0e2); wp = (uint16 *)(ROMBaseHost + 0xb0e2);
*wp++ = htons(0x4cdf); // movem.l (sp)+,d0-d5/a0-a4 *wp++ = htons(0x4cdf); // movem.l (sp)+,d0-d5/a0-a4