From fc75521fb6e2c04fb48d79a631d3227971bd01aa Mon Sep 17 00:00:00 2001 From: "Clifford T. Matthews" Date: Thu, 11 Nov 2010 09:33:10 -0700 Subject: [PATCH] Ancient hacks that I made as I was trying to get Executor on iPad. Unfortunately I never documented exactly what I did and now months have gone by, so I have to go back and try to figure out what I was doing and what worked and what didn't. --- autogen.sh | 2 +- include/syn68k_public.h | 8 ++++++-- runtime/syn68k_header.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index 8b18250..722c6bf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset -o noclobber -libtoolize +glibtoolize aclocal autoheader automake --add-missing diff --git a/include/syn68k_public.h b/include/syn68k_public.h index 3fbd27b..81005b2 100644 --- a/include/syn68k_public.h +++ b/include/syn68k_public.h @@ -7,12 +7,15 @@ /* Decide whether we are big or little endian here. Add more machines as * they are supported. */ + +/* DO NOT COMMIT THE || 1 below or it will screw others. */ + #if !defined(BIGENDIAN) && !defined(LITTLEENDIAN) # if defined(__BIG_ENDIAN__) || defined(m68k) || defined(mc68000) \ || defined(sparc) || defined(powerpc) || defined (__ppc__) # define BIGENDIAN /* ARDI naming convention, why rock the boat? */ # elif defined(__alpha) || defined(i860) || defined(vax) || defined(i386) \ - || defined(__x86_64) + || defined(__x86_64) || 1 # define LITTLEENDIAN # else # error "Unknown CPU type" @@ -30,7 +33,8 @@ * alpha can get by, for now. */ -#if !defined (QUADALIGN) +/* DO NOT COMMIT the && 0 below or it will screw others */ +#if !defined (QUADALIGN) && 0 # if defined(sparc) || /* defined(__alpha) || */ defined (i860) || defined(mips) # define QUADALIGN # elif !defined(m68k) && !defined(mc68000) && !defined(i386) \ diff --git a/runtime/syn68k_header.c b/runtime/syn68k_header.c index 9533d8c..51fd881 100644 --- a/runtime/syn68k_header.c +++ b/runtime/syn68k_header.c @@ -22,7 +22,9 @@ #elif defined(__x86_64) # define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("%r12"); #else -# error "Choose a global register to hold the current synthetic PC. Make sure it is saved by the normal calling convention." +/* DO NOT COMMIT THIS. IT IS FOR ARM ONLY, but I DON'T KNOW THE PREPROCESSOR SYMBOL */ +# define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("%r11"); +// # error "Choose a global register to hold the current synthetic PC. Make sure it is saved by the normal calling convention." #endif