Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-20 15:29:48 +00:00
Code Issues Projects Releases Wiki Activity
82b38333f1
macemu/BasiliskII/src/rsrc_patches.cpp

631 lines
21 KiB
C++
Raw Normal View History

Imported sources
1999-10-03 14:16:26 +00:00
/*
* rsrc_patches.cpp - Resource patches
*
- updated copyright info: 1999->2000
2000-04-10 18:53:46 +00:00
* Basilisk II (C) 1997-2000 Christian Bauer
Imported sources
1999-10-03 14:16:26 +00:00
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <string.h>
#include "sysdeps.h"
#include "cpu_emulation.h"
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
#include "macos_util.h"
Imported sources
1999-10-03 14:16:26 +00:00
#include "main.h"
#include "emul_op.h"
#include "audio.h"
#include "audio_defs.h"
#include "rsrc_patches.h"
- removed MemoryDispatch() replacement; routine from ROM is now used if possible - rom_patches.cpp: check for double PACK 4 resources; if only one is found, assume that the ROM requires an FPU and issue a warning if FPU emulation is turned off - UAE CPU opcode routines no longer return the cycle count - main_unix.cpp: pressing Ctrl-C dumps the UAE CPU state before entering mon - sys_unix.cpp: under Linux, partition sizes are read with BLKGETSIZE instead of llseek()
1999-10-31 23:18:44 +00:00
#if ENABLE_MON
#include "mon.h"
#endif
Imported sources
1999-10-03 14:16:26 +00:00
#define DEBUG 0
#include "debug.h"
#if !EMULATED_68K
// Assembly functions
extern "C" void Scod060Patch1(void);
extern "C" void Scod060Patch2(void);
extern "C" void ThInitFPUPatch(void);
#endif
/*
* Search resource for byte string, return offset (or 0)
*/
static uint32 find_rsrc_data(const uint8 *rsrc, uint32 max, const uint8 *search, uint32 search_len, uint32 ofs = 0)
{
while (ofs < max - search_len) {
if (!memcmp(rsrc + ofs, search, search_len))
return ofs;
ofs++;
}
return 0;
}
/*
* Resource patches via vCheckLoad
*/
void CheckLoad(uint32 type, int16 id, uint8 *p, uint32 size)
{
uint16 *p16;
uint32 base;
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
D(bug("vCheckLoad %c%c%c%c (%08x) ID %d, data %08x, size %d\n", (char)(type >> 24), (char)((type >> 16) & 0xff), (char )((type >> 8) & 0xff), (char )(type & 0xff), type, id, p, size));
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
if (type == FOURCC('b','o','o','t') && id == 3) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" boot 3 found\n"));
// Set boot stack pointer (7.5, 7.6, 7.6.1, 8.0)
static const uint8 dat[] = {0x22, 0x00, 0xe4, 0x89, 0x90, 0x81, 0x22, 0x40};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 6);
*p16 = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
FlushCodeCache(p + base + 6, 2);
D(bug(" patch 1 applied\n"));
}
#if !ROM_IS_WRITE_PROTECTED
// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.5, 8.0)
static const uint8 dat2[] = {0x20, 0x78, 0x02, 0xae, 0xd1, 0xfc, 0x00, 0x01, 0x00, 0x00, 0x21, 0xc8, 0x00, 0x00};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) {
p16 = (uint16 *)(p + base);
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
#if defined(AMIGA) || defined(__NetBSD__) || defined(USE_SCRATCHMEM_SUBTERFUGE)
Imported sources
1999-10-03 14:16:26 +00:00
// Set 0x0000 to scratch memory area
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
extern uint8 *ScratchMem;
const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
Imported sources
1999-10-03 14:16:26 +00:00
*p16++ = htons(0x207c); // move.l #ScratchMem,a0
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
*p16++ = htons(ScratchMemBase >> 16);
*p16++ = htons(ScratchMemBase);
Imported sources
1999-10-03 14:16:26 +00:00
*p16++ = htons(M68K_NOP);
*p16 = htons(M68K_NOP);
#else
#error System specific handling for writable ROM is required here
#endif
FlushCodeCache(p + base, 14);
D(bug(" patch 2 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('b','o','o','t') && id == 2) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" boot 2 found\n"));
// Set fake handle at 0x0000 to some safe place (so broken Mac programs won't write into Mac ROM) (7.5, 8.0)
static const uint8 dat[] = {0x20, 0x78, 0x02, 0xae, 0xd1, 0xfc, 0x00, 0x01, 0x00, 0x00, 0x21, 0xc8, 0x00, 0x00};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base);
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
#if defined(AMIGA) || defined(__NetBSD__) || defined(USE_SCRATCHMEM_SUBTERFUGE)
Imported sources
1999-10-03 14:16:26 +00:00
// Set 0x0000 to scratch memory area
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
extern uint8 *ScratchMem;
const uint32 ScratchMemBase = Host2MacAddr(ScratchMem);
Imported sources
1999-10-03 14:16:26 +00:00
*p16++ = htons(0x207c); // move.l #ScratchMem,a0
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
*p16++ = htons(ScratchMemBase >> 16);
*p16++ = htons(ScratchMemBase);
Imported sources
1999-10-03 14:16:26 +00:00
*p16++ = htons(M68K_NOP);
*p16 = htons(M68K_NOP);
#else
#error System specific handling for writable ROM is required here
#endif
FlushCodeCache(p + base, 14);
D(bug(" patch 1 applied\n"));
}
#endif
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('P','T','C','H') && id == 630) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug("PTCH 630 found\n"));
// Don't replace Time Manager (Classic ROM, 6.0.3)
static const uint8 dat[] = {0x30, 0x3c, 0x00, 0x58, 0xa2, 0x47};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base);
p16[2] = htons(M68K_NOP);
p16[7] = htons(M68K_NOP);
p16[12] = htons(M68K_NOP);
FlushCodeCache(p + base, 26);
D(bug(" patch 1 applied\n"));
}
// Don't replace Time Manager (Classic ROM, 6.0.8)
static const uint8 dat2[] = {0x70, 0x58, 0xa2, 0x47};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) {
p16 = (uint16 *)(p + base);
p16[1] = htons(M68K_NOP);
p16[5] = htons(M68K_NOP);
p16[9] = htons(M68K_NOP);
FlushCodeCache(p + base, 20);
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('p','t','c','h') && id == 26) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" ptch 26 found\n"));
// Trap ABC4 is initialized with absolute ROM address (7.5, 7.6, 7.6.1, 8.0)
static const uint8 dat[] = {0x40, 0x83, 0x36, 0x10};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base);
*p16++ = htons((ROMBaseMac + 0x33610) >> 16);
*p16 = htons((ROMBaseMac + 0x33610) & 0xffff);
FlushCodeCache(p + base, 4);
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('p','t','c','h') && id == 34) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" ptch 34 found\n"));
// Don't wait for VIA (Classic ROM, 6.0.8)
static const uint8 dat[] = {0x22, 0x78, 0x01, 0xd4, 0x10, 0x11, 0x02, 0x00, 0x00, 0x30};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 14);
*p16 = htons(M68K_NOP);
FlushCodeCache(p + base + 14, 2);
D(bug(" patch 1 applied\n"));
}
// Don't replace ADBOp() (Classic ROM, 6.0.8)
static const uint8 dat2[] = {0x21, 0xc0, 0x05, 0xf0};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) {
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_NOP);
*p16 = htons(M68K_NOP);
FlushCodeCache(p + base, 4);
D(bug(" patch 2 applied\n"));
}
#if !EMULATED_68K
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (CPUIs68060 && (type == FOURCC('g','p','c','h') && id == 669 || type == FOURCC('l','p','c','h') && id == 63)) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" gpch 669/lpch 63 found\n"));
static uint16 ThPatchSpace[1024]; // Replacement routines are constructed here
uint16 *q = ThPatchSpace;
uint32 start;
int i;
// Patch Thread Manager thread switcher for 68060 FPU (7.5, 8.0)
static const uint8 dat[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x18};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) { // Skip first routine (no FPU -> no FPU)
base = find_rsrc_data(p, size - base - 2, dat, sizeof(dat), base + 2);
if (base) { // no FPU -> FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<28; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state or "FPU state saved" flag set?)
*q++ = htons(2);
*q++ = htons(0x6712); // beq
*q++ = htons(0x588f); // addq.l #2,sp (flag set, skip it)
*q++ = htons(0xf21f); // fmove.l (sp)+,fpcr (restore FPU registers)
*q++ = htons(0x9000);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpsr
*q++ = htons(0x8800);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpiar
*q++ = htons(0x8400);
*q++ = htons(0xf21f); // fmovem.x (sp)+,fp0-fp7
*q++ = htons(0xd0ff);
*q++ = htons(0xf35f); // frestore (sp)+
*q++ = htons(0x4e75); // rts
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 1 applied\n"));
static const uint8 dat2[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x28};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) { // FPU -> FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<4; i++) *q++ = *p16++;
*q++ = htons(0x6736); // beq
*q++ = htons(0xf327); // fsave -(sp) (save FPU state frame)
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state?)
*q++ = htons(2);
*q++ = htons(0x6716); // beq
*q++ = htons(0xf227); // fmovem.x fp0-fp7,-(sp) (no, save FPU registers)
*q++ = htons(0xe0ff);
*q++ = htons(0xf227); // fmove.l fpiar,-(sp)
*q++ = htons(0xa400);
*q++ = htons(0xf227); // fmove.l fpsr,-(sp)
*q++ = htons(0xa800);
*q++ = htons(0xf227); // fmove.l fpcr,-(sp)
*q++ = htons(0xb000);
*q++ = htons(0x4879); // pea -1 (push "FPU state saved" flag)
*q++ = htons(0xffff);
*q++ = htons(0xffff);
p16 += 9;
for (i=0; i<23; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state or "FPU state saved" flag set?)
*q++ = htons(2);
*q++ = htons(0x6712); // beq
*q++ = htons(0x588f); // addq.l #2,sp (flag set, skip it)
*q++ = htons(0xf21f); // fmove.l (sp)+,fpcr (restore FPU registers)
*q++ = htons(0x9000);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpsr
*q++ = htons(0x8800);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpiar
*q++ = htons(0x8400);
*q++ = htons(0xf21f); // fmovem.x (sp)+,fp0-fp7
*q++ = htons(0xd0ff);
*q++ = htons(0xf35f); // frestore (sp)+
*q++ = htons(0x4e75); // rts
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 2 applied\n"));
base = find_rsrc_data(p, size - base - 2, dat2, sizeof(dat2), base + 2);
if (base) { // FPU -> no FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<4; i++) *q++ = *p16++;
*q++ = htons(0x6736); // beq
*q++ = htons(0xf327); // fsave -(sp) (save FPU state frame)
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state?)
*q++ = htons(2);
*q++ = htons(0x6716); // beq
*q++ = htons(0xf227); // fmovem.x fp0-fp7,-(sp) (no, save FPU registers)
*q++ = htons(0xe0ff);
*q++ = htons(0xf227); // fmove.l fpiar,-(sp)
*q++ = htons(0xa400);
*q++ = htons(0xf227); // fmove.l fpsr,-(sp)
*q++ = htons(0xa800);
*q++ = htons(0xf227); // fmove.l fpcr,-(sp)
*q++ = htons(0xb000);
*q++ = htons(0x4879); // pea -1 (push "FPU state saved" flag)
*q++ = htons(0xffff);
*q++ = htons(0xffff);
p16 += 9;
for (i=0; i<24; i++) *q++ = *p16++;
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 3 applied\n"));
}
}
}
}
// Patch Thread Manager thread switcher for 68060 FPU (additional routines under 8.0 for Mixed Mode Manager)
static const uint8 dat3[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x40};
base = find_rsrc_data(p, size, dat3, sizeof(dat3));
if (base) { // Skip first routine (no FPU -> no FPU)
base = find_rsrc_data(p, size - base - 2, dat3, sizeof(dat3), base + 2);
if (base) { // no FPU -> FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<48; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state or "FPU state saved" flag set?)
*q++ = htons(2);
*q++ = htons(0x6712); // beq
*q++ = htons(0x588f); // addq.l #2,sp (flag set, skip it)
*q++ = htons(0xf21f); // fmove.l (sp)+,fpcr (restore FPU registers)
*q++ = htons(0x9000);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpsr
*q++ = htons(0x8800);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpiar
*q++ = htons(0x8400);
*q++ = htons(0xf21f); // fmovem.x (sp)+,fp0-fp7
*q++ = htons(0xd0ff);
p16 += 7;
for (i=0; i<20; i++) *q++ = *p16++;
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 4 applied\n"));
static const uint8 dat4[] = {0x22, 0x6f, 0x00, 0x08, 0x20, 0x2f, 0x00, 0x04, 0x67, 0x50};
base = find_rsrc_data(p, size, dat4, sizeof(dat4));
if (base) { // FPU -> FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<4; i++) *q++ = *p16++;
*q++ = htons(0x675e); // beq
p16++;
for (i=0; i<21; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state?)
*q++ = htons(2);
*q++ = htons(0x6716); // beq
*q++ = htons(0xf227); // fmovem.x fp0-fp7,-(sp) (no, save FPU registers)
*q++ = htons(0xe0ff);
*q++ = htons(0xf227); // fmove.l fpiar,-(sp)
*q++ = htons(0xa400);
*q++ = htons(0xf227); // fmove.l fpsr,-(sp)
*q++ = htons(0xa800);
*q++ = htons(0xf227); // fmove.l fpcr,-(sp)
*q++ = htons(0xb000);
*q++ = htons(0x4879); // pea -1 (push "FPU state saved" flag)
*q++ = htons(0xffff);
*q++ = htons(0xffff);
p16 += 7;
for (i=0; i<23; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state or "FPU state saved" flag set?)
*q++ = htons(2);
*q++ = htons(0x6712); // beq
*q++ = htons(0x588f); // addq.l #2,sp (flag set, skip it)
*q++ = htons(0xf21f); // fmove.l (sp)+,fpcr (restore FPU registers)
*q++ = htons(0x9000);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpsr
*q++ = htons(0x8800);
*q++ = htons(0xf21f); // fmove.l (sp)+,fpiar
*q++ = htons(0x8400);
*q++ = htons(0xf21f); // fmovem.x (sp)+,fp0-fp7
*q++ = htons(0xd0ff);
p16 += 7;
for (i=0; i<20; i++) *q++ = *p16++;
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 5 applied\n"));
base = find_rsrc_data(p, size - base - 2, dat4, sizeof(dat4), base + 2);
if (base) { // FPU -> no FPU
p16 = (uint16 *)(p + base);
start = (uint32)q;
for (i=0; i<4; i++) *q++ = *p16++;
*q++ = htons(0x675e); // beq
p16++;
for (i=0; i<21; i++) *q++ = *p16++;
*q++ = htons(0x4a2f); // tst.b 2(sp) (null FPU state?)
*q++ = htons(2);
*q++ = htons(0x6716); // beq
*q++ = htons(0xf227); // fmovem.x fp0-fp7,-(sp) (no, save FPU registers)
*q++ = htons(0xe0ff);
*q++ = htons(0xf227); // fmove.l fpiar,-(sp)
*q++ = htons(0xa400);
*q++ = htons(0xf227); // fmove.l fpsr,-(sp)
*q++ = htons(0xa800);
*q++ = htons(0xf227); // fmove.l fpcr,-(sp)
*q++ = htons(0xb000);
*q++ = htons(0x4879); // pea -1 (push "FPU state saved" flag)
*q++ = htons(0xffff);
*q++ = htons(0xffff);
p16 += 7;
for (i=0; i<42; i++) *q++ = *p16++;
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons(start >> 16);
*p16 = htons(start & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 6 applied\n"));
}
}
}
}
FlushCodeCache(ThPatchSpace, 1024);
// Patch Thread Manager FPU init for 68060 FPU (7.5, 8.0)
static const uint8 dat5[] = {0x4a, 0x28, 0x00, 0xa4, 0x67, 0x0a, 0x4a, 0x2c, 0x00, 0x40};
base = find_rsrc_data(p, size, dat5, sizeof(dat5));
if (base) {
p16 = (uint16 *)(p + base + 6);
*p16++ = htons(M68K_JSR);
*p16++ = htons((uint32)ThInitFPUPatch >> 16);
*p16++ = htons((uint32)ThInitFPUPatch & 0xffff);
*p16++ = htons(M68K_NOP);
*p16 = htons(M68K_NOP);
FlushCodeCache(p + base + 6, 10);
D(bug(" patch 7 applied\n"));
}
#endif
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('g','p','c','h') && id == 750) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" gpch 750 found\n"));
// Don't use PTEST instruction in BlockMove() (7.5, 7.6, 7.6.1, 8.0)
EMUL_OP_BLOCK_MOVE is no longer used to replace the BlockMove() routine but to implement more clever cache flushing for it
2000-10-09 17:45:58 +00:00
static const uint8 dat[] = {0x20, 0x5f, 0x22, 0x5f, 0x0c, 0x38, 0x00, 0x04, 0x01, 0x2f};
Imported sources
1999-10-03 14:16:26 +00:00
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
EMUL_OP_BLOCK_MOVE is no longer used to replace the BlockMove() routine but to implement more clever cache flushing for it
2000-10-09 17:45:58 +00:00
p16 = (uint16 *)(p + base + 4);
*p16++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
*p16++ = htons(0x7000);
*p16 = htons(M68K_RTS);
FlushCodeCache(p + base + 4, 6);
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('l','p','c','h') && id == 24) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" lpch 24 found\n"));
// Don't replace Time Manager (7.0.1, 7.1, 7.5, 7.6, 7.6.1, 8.0)
static const uint8 dat[] = {0x70, 0x59, 0xa2, 0x47};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 2);
*p16++ = htons(M68K_NOP);
p16 += 3;
*p16++ = htons(M68K_NOP);
p16 += 7;
*p16 = htons(M68K_NOP);
FlushCodeCache(p + base + 2, 28);
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('l','p','c','h') && id == 31) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" lpch 31 found\n"));
// Don't write to VIA in vSoundDead() (7.0.1, 7.1, 7.5, 7.6, 7.6.1, 8.0)
static const uint8 dat[] = {0x20, 0x78, 0x01, 0xd4, 0x08, 0xd0, 0x00, 0x07, 0x4e, 0x75};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base);
*p16 = htons(M68K_RTS);
FlushCodeCache(p + base, 2);
D(bug(" patch 1 applied\n"));
}
// Don't replace SCSI manager (7.1, 7.5, 7.6.1, 8.0)
static const uint8 dat2[] = {0x0c, 0x6f, 0x00, 0x0e, 0x00, 0x04, 0x66, 0x0c};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) {
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_EMUL_OP_SCSI_DISPATCH);
*p16++ = htons(0x2e49); // move.l a1,a7
*p16 = htons(M68K_JMP_A0);
FlushCodeCache(p + base, 6);
D(bug(" patch 2 applied\n"));
}
#if !EMULATED_68K
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (CPUIs68060 && type == FOURCC('s','c','o','d') && (id == -16463 || id == -16464)) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" scod -16463/-16464 found\n"));
// Correct 68060 FP frame handling in Process Manager task switches (7.1, 7.5, 8.0)
static const uint8 dat[] = {0xf3, 0x27, 0x4a, 0x17};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base);
*p16++ = htons(M68K_JMP);
*p16++ = htons((uint32)Scod060Patch1 >> 16);
*p16 = htons((uint32)Scod060Patch1 & 0xffff);
FlushCodeCache(p + base, 6);
D(bug(" patch 1 applied\n"));
}
// Even a null FP frame is 3 longwords on the 68060 (7.1, 7.5, 8.0)
static const uint8 dat2[] = {0xf3, 0x5f, 0x4e, 0x75};
base = find_rsrc_data(p, size, dat2, sizeof(dat2));
if (base) {
p16 = (uint16 *)(p + base - 2);
*p16++ = htons(M68K_JMP);
*p16++ = htons((uint32)Scod060Patch2 >> 16);
*p16 = htons((uint32)Scod060Patch2 & 0xffff);
FlushCodeCache(p + base - 2, 6);
D(bug(" patch 2 applied\n"));
}
#endif
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('t','h','n','g') && id == -16563) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" thng -16563 found\n"));
// Set audio component flags (7.5, 7.6, 7.6.1, 8.0)
*(uint32 *)(p + componentFlags) = htonl(audio_component_flags);
D(bug(" patch 1 applied\n"));
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('s','i','f','t') && id == -16563) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" sift -16563 found\n"));
// Replace audio component (7.5, 7.6, 7.6.1, 8.0)
p16 = (uint16 *)p;
*p16++ = htons(0x4e56); *p16++ = htons(0x0000); // link a6,#0
*p16++ = htons(0x48e7); *p16++ = htons(0x8018); // movem.l d0/a3-a4,-(sp)
*p16++ = htons(0x266e); *p16++ = htons(0x000c); // movea.l 12(a6),a3
*p16++ = htons(0x286e); *p16++ = htons(0x0008); // movea.l 8(a6),a4
*p16++ = htons(M68K_EMUL_OP_AUDIO);
*p16++ = htons(0x2d40); *p16++ = htons(0x0010); // move.l d0,16(a6)
*p16++ = htons(0x4cdf); *p16++ = htons(0x1801); // movem.l (sp)+,d0/a3-a4
*p16++ = htons(0x4e5e); // unlk a6
*p16++ = htons(0x4e74); *p16++ = htons(0x0008); // rtd #8
FlushCodeCache(p, 32);
D(bug(" patch 1 applied\n"));
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('i','n','s','t') && id == -19069) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" inst -19069 found\n"));
// Don't replace Microseconds (QuickTime 2.0)
static const uint8 dat[] = {0x30, 0x3c, 0xa1, 0x93, 0xa2, 0x47};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 4);
*p16 = htons(M68K_NOP);
FlushCodeCache(p + base + 4, 2);
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('D','R','V','R') && id == -20066) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug("DRVR -20066 found\n"));
// Don't access SCC in .Infra driver
static const uint8 dat[] = {0x28, 0x78, 0x01, 0xd8, 0x48, 0xc7, 0x20, 0x0c, 0xd0, 0x87, 0x20, 0x40, 0x1c, 0x10};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 12);
*p16 = htons(0x7a00); // moveq #0,d6
FlushCodeCache(p + base + 12, 2);
D(bug(" patch 1 applied\n"));
}
- new FOURCC() macro in macos_util.h
2000-07-22 16:07:23 +00:00
} else if (type == FOURCC('l','t','l','k') && id == 0) {
Imported sources
1999-10-03 14:16:26 +00:00
D(bug(" ltlk 0 found\n"));
// Disable LocalTalk (7.0.1, 7.5, 7.6, 7.6.1, 8.0)
p16 = (uint16 *)p;
*p16++ = htons(M68K_JMP_A0);
*p16++ = htons(0x7000);
*p16 = htons(M68K_RTS);
FlushCodeCache(p, 6);
D(bug(" patch 1 applied\n"));
}
- added an experimental patch to fix a bug with the AppleShare extension in real addressing mode
2000-09-22 17:17:56 +00:00
#if REAL_ADDRESSING && !defined(AMIGA)
else if (type == FOURCC('D','R','V','R') && id == 41) {
D(bug(" DRVR 41 found\n"));
// gb-- [0x28E (ROM85)] contains 0x3fff that will be placed into a0
// Seems to be caused by the AppleShare extension from MacOS 8.1 (3.7.4)
// .AFPTranslator (DRVR addr 0x2372)
static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
base = find_rsrc_data(p, size, dat, sizeof(dat));
if (base) {
p16 = (uint16 *)(p + base + 4);
*p16++ = htons(0x3078); // movea.w ROM85,%a0
*p16++ = htons(0x028e);
*p16++ = htons(0xd1fc); // adda.l #RAMBaseMac,%a0
*p16++ = htons((RAMBaseMac >> 16) & 0xffff);
*p16++ = htons(RAMBaseMac & 0xffff);
*p16++ = htons(0x2448); // movea.l %a0,%a2
*p16++ = htons(M68K_NOP);
FlushCodeCache(p + base + 4, 14);
D(bug(" patch 1 applied\n"));
}
}
#endif
Imported sources
1999-10-03 14:16:26 +00:00
}
Reference in New Issue Copy Permalink