--- trunk/configure	2007/10/08 16:19:28	21
+++ 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.180 2005/11/23 22:03:23 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?
 #
 ###############################################################################
@@ -67,19 +64,25 @@
 	ENABLEPPC=YES
 else
 	#  Development:
+	UNSTABLE=YES
+	DYNTRANSBACKEND=NO #YES
 	ENABLEALPHA=YES
 	ENABLEARM=YES
-	ENABLEAVR=NO
-	ENABLEHPPA=NO
-	ENABLEI960=NO
-	ENABLEIA64=NO
-	ENABLEM68K=NO
+	ENABLEAVR=YES
+	ENABLEHPPA=YES
+	ENABLEI960=YES
+	ENABLEIA64=YES
+	ENABLEM68K=YES
 	ENABLEMIPS=YES
-	ENABLENEWMIPS=NO
+	NEWMIPS=NO
 	ENABLEPPC=YES
-	ENABLESH=NO
-	ENABLESPARC=NO
-	ENABLEX86=NO
+	ENABLESH=YES
+	ENABLESPARC=YES
+	ENABLEX86=YES
+fi
+
+if [ z"$UNSTABLE" = zYES ]; then
+	printf "###  DEVELOPMENT (UNSTABLE)\n\n"
 fi
 
 if [ z"$*" != z ]; then
@@ -99,72 +102,10 @@
 			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
-			ENABLENEWMIPS=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-newmips ]; then
-			ENABLENEWMIPS=NO
-		else if [ z$a = z--enable-newmips ]; then
-			ENABLENEWMIPS=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-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
@@ -173,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]"
 
@@ -188,107 +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"
 
-			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$ENABLENEWMIPS = zYES ]; then
-				printf "  --disable-newmips  disable "
-			else
-				printf "  --enable-newmips   enable "
-			fi
-			printf "(New, dyntrans) 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 "
+			if [ z$DYNTRANSBACKEND = zYES ]; then
+				printf "  --disable-dyntransbackend  disable "
 			else
-				printf "  --enable-x86       enable "
+				printf "  --enable-dyntransbackend  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"
@@ -301,8 +165,7 @@
 			    "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
 	done
 fi
 
@@ -385,10 +248,10 @@
 fi
 if [ z$ENABLEMIPS = zYES ]; then
 	printf "#define ENABLE_MIPS\n" >> config.h
-fi
-if [ z$ENABLENEWMIPS = zYES ]; then
-	printf "#define ENABLE_NEWMIPS\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_newmips.o"
+	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
@@ -424,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
@@ -785,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
@@ -792,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
@@ -807,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
@@ -897,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 <time.h>\n#include <stdio.h>
@@ -1185,7 +1079,7 @@
 
 ###############################################################################
 #
-#  Dynamic binary translation (BINTRANS):
+#  OLD binary translation (BINTRANS):
 #
 ###############################################################################
 
@@ -1210,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"
@@ -1249,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... "
@@ -1275,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/
 
@@ -1315,12 +1239,14 @@
 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:
-D=". src src/include src/cpus src/devices src/devices/fonts src/promemul"
+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