Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-07 16:31:25 +00:00
Code Issues Projects Releases Wiki Activity

iOS port is beginning to build again

Browse Source
This commit is contained in:
Aaron Culliney 2016-07-15 21:15:53 -07:00
parent ab3392a8f8
commit 635075f34b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arm/cpu-regs.h
View File

@ -64,7 +64,8 @@
#error __COUNTER__ macro should be available in modern compilers #error __COUNTER__ macro should be available in modern compilers
#endif #endif
#if __PIC__ #if __PIC__ && !__APPLE__
// 2016/07/15 : TODO FIXME : this PIC code does not work on ARM-Darwin
# define _SYM_ADDR_PRE(reg) \ # define _SYM_ADDR_PRE(reg) \
ldr reg, 5f; ldr reg, 5f;
@ -89,7 +90,7 @@
_SYM_ADDR_OFF_ARM(reg, __COUNTER__); \ _SYM_ADDR_OFF_ARM(reg, __COUNTER__); \
_SYM_ADDR_POST(var,8) _SYM_ADDR_POST(var,8)
# endif # endif
#else /* !__PIC__ */ #else
# if NO_UNDERSCORES # if NO_UNDERSCORES
# define SYM(reg,var) \ # define SYM(reg,var) \
ldr reg, =var ldr reg, =var

4
src/darwin-cpu-glue.S
View File

@ -11,13 +11,13 @@
#ifdef __APPLE__ #ifdef __APPLE__
# if defined(__arm__) # if defined(__arm__)
# include "arm/cpu.S"
# include "arm/glue.S" # include "arm/glue.S"
# include "arm/cpu.S"
# elif defined(__arm64__) # elif defined(__arm64__)
# error aarch64 not implemented ... TODO SOON # error aarch64 not implemented ... TODO SOON
# else # else
// simulator is x86 // simulator is x86
# include "x86/cpu.S"
# include "x86/glue.S" # include "x86/glue.S"
# include "x86/cpu.S"
# endif # endif
#endif #endif