--- trunk/configure 2007/10/08 16:19:01 16 +++ trunk/configure 2007/10/08 16:20:58 32 @@ -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.172 2005/10/09 21:32:05 debug Exp $ +# $Id: configure,v 1.235 2006/10/28 13:04:37 debug Exp $ # # This is a minimal configure script, hardcoded for GXemul. This script # figures out which compiler flags will work, and creates Makefiles in @@ -47,14 +47,13 @@ # o) special hacks for some OSes # o) which compiler to use (overridden by setting CC) # 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? +# o) X11 flags and libraries (TODO: should be possible to override +# via command line options?) +# +# +# The general philosophy regarding command line switches is that anything +# which can be incorporated into the program as a runtime command line option +# should be, instead of requiring a recompile. # ############################################################################### @@ -62,22 +61,33 @@ X=`basename \`pwd\`|cut -d \- -f 2-|cut -c1-2` if [ z"$X" = z0. ]; then # Stable: + ENABLEALPHA=YES ENABLEARM=YES ENABLEMIPS=YES + ENABLEPPC=YES + ENABLESH=YES else # Development: + UNSTABLE=YES ENABLEALPHA=YES ENABLEARM=YES - ENABLEAVR=NO - ENABLEHPPA=NO - ENABLEI960=NO - ENABLEIA64=NO - ENABLEM68K=NO + ENABLEAVR=YES + ENABLEAVR32=YES + ENABLEHPPA=YES + ENABLEI960=YES + ENABLEIA64=YES + ENABLEM68K=YES ENABLEMIPS=YES ENABLEPPC=YES - ENABLESH=NO - ENABLESPARC=NO - ENABLEX86=NO + ENABLERCA180X=YES + ENABLESH=YES + ENABLESPARC=YES + ENABLETRANSPUTER=YES + ENABLEX86=YES +fi + +if [ z"$UNSTABLE" = zYES ]; then + printf "###\n### DEVELOPMENT (UNSTABLE)\n###\n\n" fi if [ z"$*" != z ]; then @@ -85,210 +95,18 @@ for a in $*; do if [ z$a = z--disable-x ]; then NOX11=YES - else if [ z$a = z--always32 ]; then - ALWAYS32=YES - else if [ z$a = z--tracenull ]; then - TRACENULL=YES - else if [ z$a = z--disable-bintrans ]; then - NOBINTRANS=YES - else if [ z$a = z--enable-bintrans ]; then - NOBINTRANS=NO - else if [ z$a = z--disable-mips16 ]; then - MIPS16=NO - else if [ z$a = z--enable-mips16 ]; then - MIPS16=YES - else if [ z$a = z--enable-all ]; then - ENABLEALPHA=YES - ENABLEARM=YES - ENABLEAVR=YES - ENABLEHPPA=YES - ENABLEI960=YES - ENABLEIA64=YES - ENABLEM68K=YES - ENABLEMIPS=YES - ENABLEPPC=YES - ENABLESH=YES - ENABLESPARC=YES - ENABLEX86=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-avr ]; then - ENABLEAVR=NO - else if [ z$a = z--enable-avr ]; then - ENABLEAVR=YES - else if [ z$a = z--disable-hppa ]; then - ENABLEHPPA=NO - else if [ z$a = z--enable-hppa ]; then - ENABLEHPPA=YES - else if [ z$a = z--disable-i960 ]; then - ENABLEI960=NO - else if [ z$a = z--enable-i960 ]; then - ENABLEI960=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-sh ]; then - ENABLESH=NO - else if [ z$a = z--enable-sh ]; then - ENABLESH=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-delays ]; then - DELAYS=NO - else if [ z$a = z--enable-delays ]; then - DELAYS=YES - else if [ z$a = z--disable-caches ]; then - CACHES=NO - else if [ z$a = z--enable-caches ]; then - CACHES=YES else if [ z$a = z--help ]; then - echo "usage: $0 [options]" - - printf "\nGeneral options:\n\n" - - echo " --disable-bintrans configure without the" \ - "old binary translation subsystem," - echo " even if the host" \ - "supports it" - echo " --disable-x don't include X11 support" - - printf "\nDevelopment (debug) options:\n\n" - - 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" - - printf " --enable-all enable everything\n" - - 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 " - else - printf " --enable-arm enable " - fi - printf "ARM CPU emulation\n" - - if [ z$ENABLEAVR = zYES ]; then - printf " --disable-avr disable " - else - printf " --enable-avr enable " - fi - printf "Atmel AVR CPU emulation\n" - - if [ z$ENABLEHPPA = zYES ]; then - printf " --disable-hppa disable " - else - printf " --enable-hppa enable " - fi - printf "HPPA CPU emulation\n" - - if [ z$ENABLEI960 = zYES ]; then - printf " --disable-i960 disable " - else - printf " --enable-i960 enable " - fi - printf "i960 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$ENABLESH = zYES ]; then - printf " --disable-sh disable " - else - printf " --enable-sh enable " - fi - printf "SH 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" - - echo " --enable-mips16 enable MIPS16 support" - - printf "\n(Pretty much all of these options are only" - printf " meaningful during the development of\nthe" - printf " emulator, and should not be used when " - printf "compiling a stable version.)\n" + printf "usage: $0 [options]\n\n" + echo " --disable-x don't include X11 support,"\ + "even if the host supports it" + echo exit else echo "Invalid option: $a" 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 done fi @@ -318,20 +136,20 @@ fi +if [ z"$UNSTABLE" = zYES ]; then + printf "#define UNSTABLE_DEVEL\n" >> config.h +fi + + ZZ=`echo compiled on \`uname\`/\`uname -m\`, \`date\`` printf "#define COMPILE_DATE \"$ZZ\"\n" >> config.h # Support for various CPU types: -if [ z$MIPS16 = zYES ]; then - printf 'Enabling MIPS16 support. ' - printf 'NOTE: MIPS16 support is not really working yet.\n' - printf "#define ENABLE_MIPS16\n" >> config.h -fi if [ z$ENABLEALPHA = zYES ]; then printf "#define ENABLE_ALPHA\n" >> config.h - CPU_ARCHS="$CPU_ARCHS cpu_alpha.o cpu_alpha_palcode.o" + CPU_ARCHS="$CPU_ARCHS cpu_alpha.o cpu_alpha_palcode.o memory_alpha.o" CPU_TOOLS="$CPU_TOOLS generate_alpha_misc" fi if [ z$ENABLEARM = zYES ]; then @@ -345,14 +163,18 @@ 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" + 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" + 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$ENABLEAVR32 = zYES ]; then + printf "#define ENABLE_AVR32\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_avr32.o" +fi if [ z$ENABLEHPPA = zYES ]; then printf "#define ENABLE_HPPA\n" >> config.h CPU_ARCHS="$CPU_ARCHS cpu_hppa.o" @@ -371,19 +193,31 @@ fi if [ z$ENABLEMIPS = zYES ]; then printf "#define ENABLE_MIPS\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_mips.o cpu_mips_coproc.o " + CPU_ARCHS="$CPU_ARCHS cpu_mips_instr_unaligned.o" + CPU_TOOLS="$CPU_TOOLS generate_mips_loadstore" 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$ENABLERCA180X = zYES ]; then + printf "#define ENABLE_RCA180X\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_rca180x.o" +fi if [ z$ENABLESH = zYES ]; then printf "#define ENABLE_SH\n" >> config.h - CPU_ARCHS="$CPU_ARCHS cpu_sh.o" + CPU_ARCHS="$CPU_ARCHS cpu_sh.o memory_sh.o" fi if [ z$ENABLESPARC = zYES ]; then printf "#define ENABLE_SPARC\n" >> config.h - CPU_ARCHS="$CPU_ARCHS cpu_sparc.o" + CPU_ARCHS="$CPU_ARCHS cpu_sparc.o memory_sparc.o" + CPU_TOOLS="$CPU_TOOLS generate_sparc_loadstore" +fi +if [ z$ENABLETRANSPUTER = zYES ]; then + printf "#define ENABLE_TRANSPUTER\n" >> config.h + CPU_ARCHS="$CPU_ARCHS cpu_transputer.o" fi if [ z$ENABLEX86 = zYES ]; then printf "#define ENABLE_X86\n" >> config.h @@ -391,46 +225,6 @@ fi -# Instruction delay/latency emulation: -if [ z$DELAYS = zYES ]; then - echo 'Enabling Instruction delay/latency emulation.' - printf "#define ENABLE_INSTRUCTION_DELAYS\n" >> config.h -fi - - -# Development option: ALWAYS_SIGNEXTEND_32 -if [ z$ALWAYS32 = zYES ]; then - echo 'Enabling ALWAYS_SIGNEXTEND_32. (NOTE:' \ - 'This slows down everything.)' - printf "#define ALWAYS_SIGNEXTEND_32\n" >> config.h -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 -fi - - -# Cache emulation: -if [ z$CACHES = zYES ]; then - echo 'Enabling Cache emulation. (EXPERIMENTAL)' - printf "#define ENABLE_CACHE_EMULATION\n" >> config.h - - if [ z$DELAYS != zYES ]; then - printf 'WARNING: Cache emulation without instruction ' - printf 'delay/latency emulation\n' - printf ' (--delays) will not produce correct ' - printf 'cache miss penalties and such.\n' - fi - - printf "\nNOTE: Cache emulation enabled, but right now it triggers " - printf "weird bugs in the\n emulator. You have been warned.\n\n" -fi - - ############################################################################### # # Special hacks for some host OSes: @@ -767,6 +561,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 @@ -774,7 +580,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 @@ -789,9 +595,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 @@ -879,6 +685,25 @@ rm -f _testprog _testprog.error _testprog.stdout +# -g, for development builds +if [ z"$UNSTABLE" = zYES ]; then + 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 +fi + + # -lrt for nanosleep? printf "checking whether -lrt is required for nanosleep... " printf "#include \n#include @@ -1013,12 +838,20 @@ #include #include int main(int argc, char *argv[]) { fseeko(NULL, 0, 0); return 0;}\n" > _tests.c -$CC $CFLAGS _tests.c -o _tests 2> /dev/null +$CC $CFLAGS $CWARNINGS _tests.c -o _tests 2> /dev/null if [ ! -x _tests ]; then - printf "missing\n" - printf "WARNING! fseeko missing from libc. Using a hack, " - printf "which probably doesn't work.\n" - printf "#define HACK_FSEEKO\n" >> config.h + # Try with _LARGEFILE_SOURCE (hack to make fseeko + # work on 64-bit Linux): + $CC $CFLAGS -D_LARGEFILE_SOURCE $CWARNINGS _tests.c -o _tests 2> /dev/null + if [ ! -x _tests ]; then + printf "missing\n" + printf "WARNING! fseeko missing from libc. Using a hack, " + printf "which probably doesn't work.\n" + printf "#define HACK_FSEEKO\n" >> config.h + else + printf "using -D_LARGEFILE_SOURCE hack\n" + CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE" + fi else printf "found\n" fi @@ -1075,6 +908,47 @@ rm -f _tests.[co] _tests +# Check for PRIx64 in inttypes.h: +printf "checking for PRIx64 in inttypes.h... " +printf "#include \nint main(int argc, char *argv[])\n +{\n#ifdef PRIx64\nreturn 0;\n#else\nreturn 1;\n#endif\n}\n" > _testpri.c +$CC $CFLAGS _testpri.c -o _testpri 2> /dev/null +if [ ! -x _testpri ]; then + printf "\nERROR! COULD NOT COMPILE PRIx64 TEST PROGRAM AT ALL!\n" + exit +else + if ./_testpri; then + printf "yes\n" + else + printf "no, using an ugly hack instead, " + printf "#define NO_C99_PRINTF_DEFINES\n" >> config.h + + # Try llx first: + printf "#include \n#include \nint main(int argc, char *argv[]){ + printf(\"%%llx\\\n\", (int64_t)128);return 0;}\n" > _testpri.c + rm -f _testpri + $CC $CFLAGS $CWARNINGS _testpri.c -o _testpri 2> /dev/null + if [ z`./_testpri` = z80 ]; then + printf "PRIx64=llx\n" + printf "#define NO_C99_64BIT_LONGLONG\n" >> config.h + else + # Try lx too: + printf "#include \n#include \nint main(int argc, char *argv[]){ + printf(\"%%lx\\\n\", (int64_t)128);return 0;}\n" > _testpri.c + rm -f _testpri + $CC $CFLAGS $CWARNINGS _testpri.c -o _testpri 2> /dev/null + if [ z`./_testpri` = z80 ]; then + printf "PRIx64=lx\n" + else + printf "\nFailed, neither lx nor llx worked!\n" + exit + fi + fi + fi +fi +rm -f _testpri.c _testpri + + # Check for 64-bit off_t: printf "checking for 64-bit off_t... " printf "#include \n#include \n#include \n @@ -1166,71 +1040,6 @@ ############################################################################### -# -# Dynamic binary translation (BINTRANS): -# -############################################################################### - -printf "checking for bintrans backend... " - -BINTRANS=NO - -if [ z$ENABLEMIPS = zNO ]; then - printf "NO!\nTEMPORARY HACK/PROBLEM: Disabling bintrans for now,\n" - printf "until things have stabilized.\n" - NOBINTRANS=YES -fi - -if [ z$NOBINTRANS = zYES ]; then - printf "disabled\n" -else - # Alpha: - if [ z"`uname -m`" = zalpha ]; then - printf "#define ALPHA\n" >> config.h - printf "#define BINTRANS\n" >> config.h - printf "Alpha\n" - BINTRANS=YES - fi - - # x86: (all machines ending in "86" are treated as i386) - if [ z"`uname -m|rev|cut -c1-2`" = z68 ]; then - printf "#define I386\n" >> config.h - printf "#define BINTRANS\n" >> config.h - printf "i386\n" - BINTRANS=YES - fi - -# MIPS not yet -# # MIPS: -# if [ z"`uname -m`" = zmips ]; then -# printf "#define MIPS\n" >> config.h -# printf "#define BINTRANS\n" >> config.h -# printf "MIPS\n" -# BINTRANS=YES -# fi - -# # UltraSPARC: -# if [ z"`uname -m`" = zsun4u ]; then -# printf "#define SPARCV9\n" >> config.h -# printf "#define BINTRANS\n" >> config.h -# printf "SPARC V9\n" -# BINTRANS=YES -# else -# if [ z"`uname -m`" = zsparc64 ]; then -# printf "#define SPARCV9\n" >> config.h -# printf "#define BINTRANS\n" >> config.h -# printf "SPARC V9\n" -# BINTRANS=YES -# fi -# fi - - if [ z$BINTRANS = zNO ]; then - printf "not supported yet on this arch\n" - fi -fi - - -############################################################################### # Host byte order? printf "checking host endianness... " @@ -1257,32 +1066,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/ @@ -1302,8 +1085,9 @@ # Create the Makefiles: - -for a in . src src/cpus src/devices src/devices/fonts src/promemul; do +D=". src src/include src/cpus src/debugger src/devices src/devices/fonts" +D="$D src/machines src/net src/promemul" +for a in $D; do echo "creating $a/Makefile" touch $a/Makefile cat _Makefile.header > $a/Makefile