Merge branch 'master' of git@github.com:ctm/syn68k

This commit is contained in:
Clifford Matthews 2009-06-08 11:20:08 -06:00
commit b33bf94c49
5 changed files with 15 additions and 7 deletions

5
TODO
View File

@ -1,3 +1,8 @@
Non-native version can't be built
may need to dig into ancient svn history to find old
makefiles that used to build it
Mac OS X fixes: Mac OS X fixes:
figure out why i486-cleanup.pl basically eats all figure out why i486-cleanup.pl basically eats all

View File

@ -67,11 +67,11 @@ AC_SUBST(HOST_NATIVE)
AC_ARG_ENABLE([native], AC_ARG_ENABLE([native],
AC_HELP_STRING([--enable-native], AC_HELP_STRING([--enable-native],
[native or nonnative (default is native)]), [native or nonnative (default is native)]),
[var_native=$enable_native], [var_native=no] ) [var_native=$enable_native], [var_native=yes] )
if test "$var_native" = "yes"; then if test "$var_native" = "yes"; then
NO_NATIVE=TRUE
else
NO_NATIVE=FALSE NO_NATIVE=FALSE
else
NO_NATIVE=TRUE
fi fi
AC_SUBST(NO_NATIVE) AC_SUBST(NO_NATIVE)

View File

@ -41,7 +41,7 @@
* should work even if you leave it undefined though. If you have problems * should work even if you leave it undefined though. If you have problems
* with divide, try undef'ing this to use the slower but safer version. * with divide, try undef'ing this to use the slower but safer version.
*/ */
#if @host_cpu_class@ == i386 /* ||defined(mc68000) || defined(i386) || defined(__alpha) || defined (powerpc) || defined (__ppc__) */ #if defined(mc68000) || defined(i386) || defined(__alpha) || defined (powerpc) || defined (__ppc__) || defined(__x86_64)
# define M68K_DIVISION_BEHAVIOR # define M68K_DIVISION_BEHAVIOR
#endif #endif
@ -59,7 +59,7 @@
/* #define this if support exists for generating native code in some /* #define this if support exists for generating native code in some
* situations. * situations.
*/ */
#if defined (USE_DIRECT_DISPATCH) && @host_cpu_class@ == i386 && !defined (NONNATIVE) #if defined (USE_DIRECT_DISPATCH) && defined(i386) && !defined (NONNATIVE)
# define GENERATE_NATIVE_CODE # define GENERATE_NATIVE_CODE
#endif #endif

View File

@ -12,7 +12,8 @@
# if defined(__BIG_ENDIAN__) || defined(m68k) || defined(mc68000) \ # if defined(__BIG_ENDIAN__) || defined(m68k) || defined(mc68000) \
|| defined(sparc) || defined(powerpc) || defined (__ppc__) || defined(sparc) || defined(powerpc) || defined (__ppc__)
# define BIGENDIAN /* ARDI naming convention, why rock the boat? */ # define BIGENDIAN /* ARDI naming convention, why rock the boat? */
# elif defined(__alpha) || defined(i860) || defined(vax) || defined(i386) # elif defined(__alpha) || defined(i860) || defined(vax) || defined(i386) \
|| defined(__x86_64)
# define LITTLEENDIAN # define LITTLEENDIAN
# else # else
# error "Unknown CPU type" # error "Unknown CPU type"
@ -35,7 +36,7 @@
# define QUADALIGN # define QUADALIGN
# elif !defined(m68k) && !defined(mc68000) && !defined(i386) \ # elif !defined(m68k) && !defined(mc68000) && !defined(i386) \
&& !defined(vax) && !defined(__alpha) && !defined(powerpc) \ && !defined(vax) && !defined(__alpha) && !defined(powerpc) \
&& !defined (__ppc__) && !defined (__ppc__) && !defined(__x86_64)
# error Unknown CPU type # error Unknown CPU type
# endif # endif
#endif #endif

View File

@ -17,6 +17,8 @@
# define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("$9"); # define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("$9");
#elif defined (powerpc) || defined (__ppc__) #elif defined (powerpc) || defined (__ppc__)
# define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("%r13"); # define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("%r13");
#elif defined(__x86_64)
# define GLOBAL_REGISTER_DECLS register const uint16 *code asm ("%rsi");
#else #else
# error "Choose a global register to hold the current synthetic PC. Make sure it is saved by the normal calling convention." # error "Choose a global register to hold the current synthetic PC. Make sure it is saved by the normal calling convention."
#endif #endif