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

Make EmulOp() and check_load_invoc() extern "C" so that we are C++ name

Browse Source 
mangling independent for asm_linux.S
This commit is contained in:
gbeauche 2003-04-12 10:14:09 +00:00
parent 69d04276e8
commit 5bd60842d6
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SheepShaver/src/Unix/Linux/asm_linux.S
View File

@ -400,7 +400,7 @@ jump_to_rom:
lwz r13,XLM_TOC(r0) lwz r13,XLM_TOC(r0)
addi r3,r1,8 addi r3,r1,8
mr r4,r24 mr r4,r24
bl EmulOp__FP13M68kRegistersUii bl EmulOp
// Restore 68k registers (M68kRegisters) // Restore 68k registers (M68kRegisters)
lwz r8,8+0*4(r1) // d[0]..d[7] lwz r8,8+0*4(r1) // d[0]..d[7]
@ -705,7 +705,7 @@ get_resource:
lwz r3,56(r1) lwz r3,56(r1)
lwz r4,56+4(r1) lwz r4,56+4(r1)
lwz r5,56+8(r1) lwz r5,56+8(r1)
bl check_load_invoc__FUisPPUs bl check_load_invoc
lwz r3,56+8(r1) // Restore handle lwz r3,56+8(r1) // Restore handle
// Return to caller // Return to caller
@ -736,7 +736,7 @@ get_1_resource:
lwz r3,56(r1) lwz r3,56(r1)
lwz r4,56+4(r1) lwz r4,56+4(r1)
lwz r5,56+8(r1) lwz r5,56+8(r1)
bl check_load_invoc__FUisPPUs bl check_load_invoc
lwz r3,56+8(r1) // Restore handle lwz r3,56+8(r1) // Restore handle
// Return to caller // Return to caller
@ -767,7 +767,7 @@ get_ind_resource:
lwz r3,56(r1) lwz r3,56(r1)
lwz r4,56+4(r1) lwz r4,56+4(r1)
lwz r5,56+8(r1) lwz r5,56+8(r1)
bl check_load_invoc__FUisPPUs bl check_load_invoc
lwz r3,56+8(r1) // Restore handle lwz r3,56+8(r1) // Restore handle
// Return to caller // Return to caller
@ -798,7 +798,7 @@ get_1_ind_resource:
lwz r3,56(r1) lwz r3,56(r1)
lwz r4,56+4(r1) lwz r4,56+4(r1)
lwz r5,56+8(r1) lwz r5,56+8(r1)
bl check_load_invoc__FUisPPUs bl check_load_invoc
lwz r3,56+8(r1) // Restore handle lwz r3,56+8(r1) // Restore handle
// Return to caller // Return to caller
@ -829,7 +829,7 @@ r_get_resource:
lwz r3,56(r1) lwz r3,56(r1)
lwz r4,56+4(r1) lwz r4,56+4(r1)
lwz r5,56+8(r1) lwz r5,56+8(r1)
bl check_load_invoc__FUisPPUs bl check_load_invoc
lwz r3,56+8(r1) // Restore handle lwz r3,56+8(r1) // Restore handle
// Return to caller // Return to caller

2
SheepShaver/src/include/emul_op.h
View File

@ -103,6 +103,6 @@ const uint16 M68K_EMUL_OP_EXTFS_COMM = M68K_EMUL_BREAK + OP_EXTFS_COMM;
const uint16 M68K_EMUL_OP_EXTFS_HFS = M68K_EMUL_BREAK + OP_EXTFS_HFS; const uint16 M68K_EMUL_OP_EXTFS_HFS = M68K_EMUL_BREAK + OP_EXTFS_HFS;
const uint16 M68K_EMUL_OP_IDLE_TIME = M68K_EMUL_BREAK + OP_IDLE_TIME; const uint16 M68K_EMUL_OP_IDLE_TIME = M68K_EMUL_BREAK + OP_IDLE_TIME;
extern void EmulOp(M68kRegisters *r, uint32 pc, int selector); extern "C" void EmulOp(M68kRegisters *r, uint32 pc, int selector);
#endif #endif

2
SheepShaver/src/rsrc_patches.cpp
View File

@ -490,6 +490,8 @@ void CheckLoad(uint32 type, int16 id, uint16 *p, uint32 size)
#ifdef __BEOS__ #ifdef __BEOS__
static static
#else
extern "C"
#endif #endif
void check_load_invoc(uint32 type, int16 id, uint16 **h) void check_load_invoc(uint32 type, int16 id, uint16 **h)
{ {