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

Fix for MacOS X assembler, why don't Apple use GNU as?

Browse Source
This commit is contained in:
gbeauche 2005-06-25 06:33:39 +00:00
parent d0da2a0dda
commit 2de44f1910
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SheepShaver/src/Unix/ppc_asm.S
View File

@ -710,7 +710,7 @@ C_SYMBOL_NAME(call_macos7):
* Native resource manager patches * Native resource manager patches
*/ */
ASM_MACRO_START do_get_resource XLM_OLD_GET_RESOURCE ASM_MACRO_START do_get_resource ASM_MACRO_ARG0_DEF
// Create stack frame // Create stack frame
mflr r0 mflr r0
stw r0,8(r1) stw r0,8(r1)
@ -721,7 +721,7 @@ ASM_MACRO_START do_get_resource XLM_OLD_GET_RESOURCE
stw r4,56+4(r1) stw r4,56+4(r1)
// Call old routine // Call old routine
lwz r0,\XLM_OLD_GET_RESOURCE(0) lwz r0,ASM_MACRO_ARG0(0)
lwz r2,XLM_RES_LIB_TOC(0) lwz r2,XLM_RES_LIB_TOC(0)
mtctr r0 mtctr r0
bctrl bctrl

10
SheepShaver/src/Unix/ppc_asm.tmpl
View File

@ -25,6 +25,10 @@
#if (defined(__APPLE__) && defined(__MACH__)) #if (defined(__APPLE__) && defined(__MACH__))
#define C_SYMBOL_NAME(NAME) _ ## NAME #define C_SYMBOL_NAME(NAME) _ ## NAME
#define ASM_MACRO_END .endmacro #define ASM_MACRO_END .endmacro
#define ASM_MACRO_ARG0_DEF /* nothing! */
#define ASM_MACRO_ARG0 $0
#define ASM_MACRO_ARG0_DEF /* nothing! */
#define ASM_MACRO_ARG1 $1
#endif #endif
/* Defaults for GNU assembler */ /* Defaults for GNU assembler */
@ -34,6 +38,12 @@
#ifndef ASM_MACRO_END #ifndef ASM_MACRO_END
#define ASM_MACRO_END .endm #define ASM_MACRO_END .endm
#endif #endif
#ifndef ASM_MACRO_ARG0_DEF
#define ASM_MACRO_ARG0_DEF __asm_macro_arg0
#define ASM_MACRO_ARG0 \__asm_macro_arg0
#define ASM_MACRO_ARG1_DEF , __asm_macro_arg1
#define ASM_MACRO_ARG1 \__asm_macro_arg1
#endif
#ifndef C_SYMBOL_NAME #ifndef C_SYMBOL_NAME
#define C_SYMBOL_NAME(NAME) NAME #define C_SYMBOL_NAME(NAME) NAME
#endif #endif