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

- added BlockMove() replacement

Browse Source 
- extfs.cpp: get_path_for_fsitem(root parent) no longer crashes
This commit is contained in:
cebix 1999-10-22 15:08:13 +00:00
parent 13301146d9
commit 20ba496c92
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/emul_op.cpp
View File

@ -503,6 +503,10 @@ void EmulOp(uint16 opcode, M68kRegisters *r)
break; break;
#endif #endif
case M68K_EMUL_OP_BLOCK_MOVE: // BlockMove() replacement
memmove(Mac2HostAddr(r->a[1]), Mac2HostAddr(r->a[0]), r->d[0]);
break;
default: default:
printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode); printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode);
printf("d0 %08lx d1 %08lx d2 %08lx d3 %08lx\n" printf("d0 %08lx d1 %08lx d2 %08lx d3 %08lx\n"

4
BasiliskII/src/extfs.cpp
View File

@ -211,7 +211,9 @@ static void add_path_comp(const char *s)
static void get_path_for_fsitem(FSItem *p) static void get_path_for_fsitem(FSItem *p)
{ {
if (p->id == ROOT_ID) { if (p->id == ROOT_PARENT_ID) {
full_path[0] = 0;
} else if (p->id == ROOT_ID) {
strncpy(full_path, RootPath, MAX_PATH_LENGTH-1); strncpy(full_path, RootPath, MAX_PATH_LENGTH-1);
full_path[MAX_PATH_LENGTH-1] = 0; full_path[MAX_PATH_LENGTH-1] = 0;
} else { } else {

1
BasiliskII/src/include/emul_op.h
View File

@ -81,6 +81,7 @@ enum {
M68K_EMUL_OP_AUDIO, M68K_EMUL_OP_AUDIO,
M68K_EMUL_OP_EXTFS_COMM, M68K_EMUL_OP_EXTFS_COMM,
M68K_EMUL_OP_EXTFS_HFS, M68K_EMUL_OP_EXTFS_HFS,
M68K_EMUL_OP_BLOCK_MOVE, // 0x7130
M68K_EMUL_OP_MAX // highest number M68K_EMUL_OP_MAX // highest number
}; };

8
BasiliskII/src/rom_patches.cpp
View File

@ -1403,6 +1403,14 @@ static bool patch_rom_32(void)
*wp++ = htons(M68K_EMUL_OP_MEMORY_DISPATCH); *wp++ = htons(M68K_EMUL_OP_MEMORY_DISPATCH);
*wp = htons(M68K_RTS); *wp = htons(M68K_RTS);
#if EMULATED_68K
// Replace BlockMove()
wp = (uint16 *)(ROMBaseHost + find_rom_trap(0xa02e)); // BlockMove()
*wp++ = htons(M68K_EMUL_OP_BLOCK_MOVE);
*wp++ = htons(0x7000);
*wp = htons(M68K_RTS);
#endif
// Patch VIA interrupt handler // Patch VIA interrupt handler
wp = (uint16 *)(ROMBaseHost + 0x9bc4); // Level 1 handler wp = (uint16 *)(ROMBaseHost + 0x9bc4); // Level 1 handler
*wp++ = htons(0x7002); // moveq #2,d0 (always 60Hz interrupt) *wp++ = htons(0x7002); // moveq #2,d0 (always 60Hz interrupt)