--- trunk/configure 2007/10/08 16:18:38 12 +++ trunk/configure 2007/10/08 16:19:37 22 @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################### # -# Copyright (C) 2003-2005 Anders Gavare. All rights reserved. +# Copyright (C) 2003-2006 Anders Gavare. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # -# $Id: configure,v 1.155 2005/08/16 05:37:08 debug Exp $ +# $Id: configure,v 1.198 2006/02/18 13:15:20 debug Exp $ # # This is a minimal configure script, hardcoded for GXemul. This script # figures out which compiler flags will work, and creates Makefiles in @@ -49,11 +49,8 @@ # o) which compiler flags to use (overridden by setting CFLAGS) # o) X11 flags and libraries (TODO: should be possible to override) # o) binary translation (on supported platforms) -# o) prefetch capability (TODO: this is assumed on Alpha, but not all -# Alphas have it...) # # TODO: -# o) do not enable prefetch on Alpha ev4 or ev5, only on pca56 and newer # o) X11 libs and includes via command line options? # ############################################################################### @@ -62,19 +59,32 @@ X=`basename \`pwd\`|cut -d \- -f 2-|cut -c1-2` if [ z"$X" = z0. ]; then # Stable: + ENABLEARM=YES ENABLEMIPS=YES + ENABLEPPC=YES else # Development: + UNSTABLE=YES + DYNTRANSBACKEND=NO #YES ENABLEALPHA=YES ENABLEARM=YES + ENABLEAVR=YES + ENABLEHPPA=YES + ENABLEI960=YES ENABLEIA64=YES ENABLEM68K=YES ENABLEMIPS=YES + NEWMIPS=NO ENABLEPPC=YES + ENABLESH=YES ENABLESPARC=YES ENABLEX86=YES fi +if [ z"$UNSTABLE" = zYES ]; then + printf "### DEVELOPMENT (UNSTABLE)\n\n" +fi + if [ z"$*" != z ]; then # Parse command line options: for a in $*; do @@ -92,38 +102,10 @@ MIPS16=NO else if [ z$a = z--enable-mips16 ]; then MIPS16=YES - else if [ z$a = z--disable-alpha ]; then - ENABLEALPHA=NO - else if [ z$a = z--enable-alpha ]; then - ENABLEALPHA=YES - else if [ z$a = z--disable-arm ]; then - ENABLEARM=NO - else if [ z$a = z--enable-arm ]; then - ENABLEARM=YES - else if [ z$a = z--disable-ia64 ]; then - ENABLEIA64=NO - else if [ z$a = z--enable-ia64 ]; then - ENABLEIA64=YES - else if [ z$a = z--disable-m68k ]; then - ENABLEM68K=NO - else if [ z$a = z--enable-m68k ]; then - ENABLEM86K=YES - else if [ z$a = z--disable-mips ]; then - ENABLEMIPS=NO - else if [ z$a = z--enable-mips ]; then - ENABLEMIPS=YES - else if [ z$a = z--disable-ppc ]; then - ENABLEPPC=NO - else if [ z$a = z--enable-ppc ]; then - ENABLEPPC=YES - else if [ z$a = z--disable-sparc ]; then - ENABLESPARC=NO - else if [ z$a = z--enable-sparc ]; then - ENABLESPARC=YES - else if [ z$a = z--disable-x86 ]; then - ENABLEX86=NO - else if [ z$a = z--enable-x86 ]; then - ENABLEX86=YES + else if [ z$a = z--disable-dyntransbackend ]; then + DYNTRANSBACKEND=NO + else if [ z$a = z--enable-dyntransbackend ]; then + DYNTRANSBACKEND=YES else if [ z$a = z--disable-delays ]; then DELAYS=NO else if [ z$a = z--enable-delays ]; then @@ -132,6 +114,14 @@ CACHES=NO else if [ z$a = z--enable-caches ]; then CACHES=YES + else if [ z$a = z--disable-newmips ]; then + NEWMIPS=NO + else if [ z$a = z--enable-newmips ]; then + NEWMIPS=YES + else if [ z$a = z--disable-1k-pages ]; then + ONEKPAGE=NO + else if [ z$a = z--enable-1k-pages ]; then + ONEKPAGE=YES else if [ z$a = z--help ]; then echo "usage: $0 [options]" @@ -147,70 +137,22 @@ echo " --always32 enable ALWAYS_SIGNEXTEND_32"\ "(for hunting down 32-bit bugs)" - echo " --tracenull enable" \ - "TRACE_NULL_CRASHES (for bug hunting)" printf " --enable-caches enable cache emulation" printf " (BUGGY)\n" echo " --enable-delays enable instruction" \ "latency/delay emulation" - if [ z$ENABLEALPHA = zYES ]; then - printf " --disable-alpha disable " - else - printf " --enable-alpha enable " - fi - printf "Alpha CPU emulation\n" - - if [ z$ENABLEARM = zYES ]; then - printf " --disable-arm disable " + if [ z$DYNTRANSBACKEND = zYES ]; then + printf " --disable-dyntransbackend disable " else - printf " --enable-arm enable " + printf " --enable-dyntransbackend enable" fi - printf "ARM CPU emulation\n" - - if [ z$ENABLEIA64 = zYES ]; then - printf " --disable-ia64 disable " - else - printf " --enable-ia64 enable " - fi - printf "IA64 CPU emulation\n" - - if [ z$ENABLEM68K = zYES ]; then - printf " --disable-m68k disable " - else - printf " --enable-m68k enable " - fi - printf "M68K CPU emulation\n" - - if [ z$ENABLEMIPS = zYES ]; then - printf " --disable-mips disable " - else - printf " --enable-mips enable " - fi - printf "MIPS CPU emulation\n" - - if [ z$ENABLEPPC = zYES ]; then - printf " --disable-ppc disable " - else - printf " --enable-ppc enable " - fi - printf "POWER/PPC CPU emulation\n" - - if [ z$ENABLESPARC = zYES ]; then - printf " --disable-sparc disable " - else - printf " --enable-sparc enable " - fi - printf "SPARC CPU emulation\n" - - if [ z$ENABLEX86 = zYES ]; then - printf " --disable-x86 disable " - else - printf " --enable-x86 enable " - fi - printf "x86 CPU emulation\n" + printf "dyntrans backend\n" echo " --enable-mips16 enable MIPS16 support" + echo " --enable-newmips use new MIPS dyntrans code" + #printf " --enable-1k-pages allow 1KB dyntrans pages" + #printf " (default: 4KB)\n" printf "\n(Pretty much all of these options are only" printf " meaningful during the development of\nthe" @@ -222,8 +164,8 @@ echo "Run $0 --help to get a list of" \ "available options." exit - fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi - fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi + fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi + fi; fi done fi @@ -267,10 +209,34 @@ if [ z$ENABLEALPHA = zYES ]; then printf "#define ENABLE_ALPHA\n" >> config.h CPU_ARCHS="$CPU_ARCHS cpu_alpha.o cpu_alpha_palcode.o" + CPU_TOOLS="$CPU_TOOLS generate_alpha_misc" fi if [ z$ENABLEARM = zYES ]; then printf "#define ENABLE_ARM\n" >> config.h - CPU_ARCHS="$CPU_ARCHS cpu_arm.o" + CPU_ARCHS="$CPU_ARCHS cpu_arm.o cpu_arm_coproc.o memory_arm.o " + CPU_ARCHS="$CPU_ARCHS tmp_arm_dpi.o tmp_arm_loadstore.o tmp_arm_r.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_r0.o tmp_arm_r1.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_r2.o tmp_arm_r3.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_r4.o tmp_arm_r5.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_r6.o tmp_arm_r7.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_r8.o tmp_arm_r9.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_ra.o tmp_arm_rb.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_rc.o tmp_arm_rd.o" + CPU_ARCHS="$CPU_ARCHS tmp_arm_re.o tmp_arm_rf.o tmp_arm_multi.o" + CPU_TOOLS="$CPU_TOOLS generate_arm_dpi generate_arm_r" + CPU_TOOLS="$CPU_TOOLS generate_arm_loadstore generate_arm_multi" +fi +if [ z$ENABLEAVR = zYES ]; then + printf "#define ENABLE_AVR\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_avr.o" +fi +if [ z$ENABLEHPPA = zYES ]; then + printf "#define ENABLE_HPPA\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_hppa.o" +fi +if [ z$ENABLEI960 = zYES ]; then + printf "#define ENABLE_I960\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_i960.o" fi if [ z$ENABLEIA64 = zYES ]; then printf "#define ENABLE_IA64\n" >> config.h @@ -282,10 +248,19 @@ fi if [ z$ENABLEMIPS = zYES ]; then printf "#define ENABLE_MIPS\n" >> config.h + if [ z$NEWMIPS = zYES ]; then + echo 'Enabling the _EXPERIMENTAL_ MIPS dyntrans code.' + printf "#define EXPERIMENTAL_NEWMIPS\n" >> config.h + fi fi if [ z$ENABLEPPC = zYES ]; then printf "#define ENABLE_PPC\n" >> config.h CPU_ARCHS="$CPU_ARCHS cpu_ppc.o" + CPU_TOOLS="$CPU_TOOLS generate_ppc_loadstore" +fi +if [ z$ENABLESH = zYES ]; then + printf "#define ENABLE_SH\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_sh.o" fi if [ z$ENABLESPARC = zYES ]; then printf "#define ENABLE_SPARC\n" >> config.h @@ -312,17 +287,19 @@ fi -# Development option: TRACE_NULL_CRASHES -if [ z$TRACENULL = zYES ]; then - echo 'Enabling TRACE_NULL_CRASHES. (NOTE:' \ - 'This slows down the emulator.)' - printf "#define TRACE_NULL_CRASHES\n" >> config.h +# 1KB page emulation: +if [ z$ONEKPAGE = zYES ]; then + echo '1 KB pages: not yet.' + exit + echo 'Enabling 1 KB page dyntrans support. (NOTE:' \ + 'This slows down everything.)' + printf "#define ONEKPAGE\n" >> config.h fi # Cache emulation: if [ z$CACHES = zYES ]; then - echo 'Enabling Cache emulation. (EXPERIMENTAL)' + echo 'Enabling Cache emulation. (EXPERIMENTAL and BUGGY)' printf "#define ENABLE_CACHE_EMULATION\n" >> config.h if [ z$DELAYS != zYES ]; then @@ -411,15 +388,15 @@ fi rm -f _testprog - # Try ccc (FreeBSD/Alpha): - printf "#!/bin/sh\nccc _testprog.c -o _testprog >" > _test.sh - printf " /dev/null 2> /dev/null\n" >> _test.sh - chmod 755 _test.sh - ./_test.sh > /dev/null 2> /dev/null - if [ -x _testprog ]; then - CC="ccc" - fi - rm -f _testprog +# # Try ccc (FreeBSD/Alpha): +# printf "#!/bin/sh\nccc _testprog.c -o _testprog >" > _test.sh +# printf " /dev/null 2> /dev/null\n" >> _test.sh +# chmod 755 _test.sh +# ./_test.sh > /dev/null 2> /dev/null +# if [ -x _testprog ]; then +# CC="ccc" +# fi +# rm -f _testprog rm -f _test.sh fi @@ -673,6 +650,18 @@ if [ z"$COMPAQCC" = zYES ]; then CWARNINGS="$CWARNINGS -msg_disable longlongtype,unusedtop" fi + + if [ z"$UNSTABLE" = zYES ]; then + printf "checking whether -Werror can be used... " + rm -f _testprog + $CC $CFLAGS $CWARNINGS _testprog.c -o _testprog -Werror 2> /dev/null + if [ -x _testprog ]; then + printf "yes\n" + CWARNINGS="$CWARNINGS -Werror" + else + printf "no\n" + fi + fi else printf "no\n" fi @@ -680,7 +669,7 @@ if [ z"$COMPAQCC" = zYES ]; then - # -O4 is possible, but is -O3 better? + # -O4 is possible, but sometimes -O3 is better? CFLAGS="-O4 $CFLAGS" else if [ z"`uname`" = zSunOS ]; then @@ -695,9 +684,9 @@ $CC $CFLAGS _testprog.c -o _testprog -O 2> /dev/null if [ -x _testprog ]; then rm -f _testprog - $CC $CFLAGS _testprog.c -o _testprog -O2 2> /dev/null + $CC $CFLAGS _testprog.c -o _testprog -O3 2> /dev/null if [ -x _testprog ]; then - CFLAGS="-O2 $CFLAGS" + CFLAGS="-O3 $CFLAGS" else CFLAGS="-O $CFLAGS" fi @@ -785,6 +774,23 @@ rm -f _testprog _testprog.error _testprog.stdout +# -g +printf "checking whether -g can be used... " +if [ z"$COMPAQCC" = zYES ]; then + printf "skipping\n" +else + $CC $CFLAGS -g _testprog.c -o _testprog > _testprog.stdout 2>&1 + cat _testprog.stdout >> _testprog.error + if [ -x _testprog ]; then + CFLAGS="-g $CFLAGS" + printf "yes\n" + else + printf "no\n" + fi +fi +rm -f _testprog _testprog.error _testprog.stdout + + # -lrt for nanosleep? printf "checking whether -lrt is required for nanosleep... " printf "#include \n#include @@ -1016,6 +1022,8 @@ # Check for u_int8_t etc: +# These are needed because some header files in src/include/ use u_int* +# instead of uint*, and I don't have time to rewrite them all. printf "checking for u_int8_t... " printf "#include \n#include \n#include \n int main(int argc, char *argv[]){printf(\"%%i\\\n\", @@ -1037,17 +1045,41 @@ printf "typedef uint8_t u_int8_t;\n" >> config.h printf "typedef uint16_t u_int16_t;\n" >> config.h printf "typedef uint32_t u_int32_t;\n" >> config.h - printf "typedef uint64_t u_int64_t;\n" >> config.h printf "uint8_t\n" else printf "yes\n" fi rm -f _testuint.c _testuint +printf "checking for u_int64_t... " +printf "#include \n#include \n#include \n +int main(int argc, char *argv[]){printf(\"%%i\\\n\", + (int)sizeof(u_int64_t));return 0;}\n" > _testuint.c +$CC $CFLAGS _testuint.c -o _testuint 2> /dev/null +if [ ! -x _testuint ]; then + rm -f _testuint* + printf "#include \n#include + \n#include \nint main(int argc, char *argv[]) + {printf(\"%%i\\\n\", (int)sizeof(uint64_t));return 0;}\n" > _testuint.c + $CC $CFLAGS _testuint.c -o _testuint 2> /dev/null + if [ ! -x _testuint ]; then + printf "no\n\nERROR: No u_int64_t or uint64_t. Aborting\n" + # TODO: Automagically detect using various combinations + # of char, int, short, long etc. + exit + fi + + printf "typedef uint64_t u_int64_t;\n" >> config.h + printf "uint64_t\n" +else + printf "yes\n" +fi +rm -f _testuint.c _testuint + ############################################################################### # -# Dynamic binary translation (BINTRANS): +# OLD binary translation (BINTRANS): # ############################################################################### @@ -1072,8 +1104,8 @@ BINTRANS=YES fi - # x86: (all machines ending in "86" are treated as i386) - if [ z"`uname -m|rev|cut -c1-2`" = z68 ]; then + # x86: + if `uname -m|grep -v 64|grep -q 86`; then printf "#define I386\n" >> config.h printf "#define BINTRANS\n" >> config.h printf "i386\n" @@ -1111,6 +1143,62 @@ ############################################################################### +# +# Dyntrans recompilation (native backend) support: +# +############################################################################### + +if [ z$DYNTRANSBACKEND = zYES ]; then + printf "Dyntrans: Not yet.\n" + exit + + printf "checking for dyntrans backend... " + DBFOUND=NO + + # Alpha: + if [ z"`uname -m`" = zalpha ]; then + printf "#define DYNTRANS_BACKEND_ALPHA\n" >> config.h + printf "Alpha\n" + CPU_BACKENDS="$CPU_BACKENDS backend_alpha.o" + DBFOUND=YES + fi + + # AMD64: + # TODO + +# # UltraSPARC: +# if [ z"`uname -m`" = zsun4u ]; then +# printf "#define DYNTRANS_BACKEND_SPARC64\n" >> config.h +# printf "UltraSPARC\n" +# CPU_BACKENDS="$CPU_BACKENDS backend_sparc.o" +# DBFOUND=YES +# fi +# if [ z"`uname -m`" = zsparc64 ]; then +# printf "#define DYNTRANS_BACKEND_SPARC64\n" >> config.h +# printf "UltraSPARC\n" +# CPU_BACKENDS="$CPU_BACKENDS backend_sparc.o" +# DBFOUND=YES +# fi + + # x86: + if `uname -m|grep -q -v 64|grep -q 86`; then + printf "#define DYNTRANS_BACKEND_I386\n" >> config.h + printf "i386\n" + CPU_BACKENDS="$CPU_BACKENDS backend_i386.o" + DBFOUND=YES + fi + + if [ z$DBFOUND = zYES ]; then + printf "#define DYNTRANS_BACKEND\n" >> config.h + else + printf "not supported yet on this arch (" + printf `uname -m` + printf ")\n" + fi +fi + + +############################################################################### # Host byte order? printf "checking host endianness... " @@ -1137,32 +1225,6 @@ ############################################################################### -# Prefetch support? -printf "checking for asm prefetch support... " -if [ z"`uname -m`" = zalpha ]; then - rm -f _alpha_asm_test.c _alpha_asm_test - printf 'int main(int argc, char *argv[]) - { int x; int *y = &x; asm ("ldl $31,0(%%0)" : : "g" (y)); - return 0; }\n' > _alpha_asm_test.c - $CC $CFLAGS -O2 _alpha_asm_test.c -o _alpha_asm_test \ - > /dev/null 2> /dev/null - if [ -x _alpha_asm_test ]; then -# printf "#define HAVE_PREFETCH\n" >> config.h - printf "#define PREFETCH(x) asm(\"ldl" >> config.h - printf " \$31,0(%%0)\" : : \"g\" (x))\n" >> config.h - echo "yes" - PREFSUP=YES - fi - rm -f _alpha_asm_test.c _alpha_asm_test -fi -if [ z$PREFSUP = z ]; then - printf "#define PREFETCH(x) { }\n" >> config.h - echo "no" -fi - - -############################################################################### - INCLUDE=-Iinclude/ DINCLUDE=-I../include/ @@ -1177,12 +1239,15 @@ echo "CC=$CC" >> _Makefile.header echo "OTHERLIBS=$OTHERLIBS" >> _Makefile.header echo "CPU_ARCHS=$CPU_ARCHS" >> _Makefile.header +echo "CPU_BACKENDS=$CPU_BACKENDS" >> _Makefile.header +echo "CPU_TOOLS=$CPU_TOOLS" >> _Makefile.header echo "" >> _Makefile.header # Create the Makefiles: - -for a in . src src/devices src/devices/fonts; do +D=". src src/include src/cpus src/devices src/devices/fonts" +D="$D src/machines src/promemul" +for a in $D; do echo "creating $a/Makefile" touch $a/Makefile cat _Makefile.header > $a/Makefile