Lots of changes

1 files changed, 87 insertions, 78 deletions

diff --git a/sim/ppc/configure b/sim/ppc/configure
index ebf3a51..3b5059a 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -1040,13 +1040,41 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
+if test x"$enable_sim_cflags" != x"" -a x"$enable_sim_cflags" != x"no"; then
+  if test "$enable_sim_cflags" = "yes"; then
+    enable_sim_cflags="-fomit-frame-pointer,-O2"
+  fi
+  echo "Setting SIM_CFLAGS=$enable_sim_cflags" | sed -e "s/,/ /g" 1>&6
+  (echo; echo "# --enable-sim-cflags=$enable_sim_cflags";
+   echo "SIM_CFLAGS = $enable_sim_cflags" | sed -e "s/,/ /g") >> Makefile
+else
+  echo "Setting SIM_CFLAGS=" 1>&6
+  (echo; echo "# no --enable-sim-cflags"; echo "SIM_CFLAGS =") >> Makefile
+fi
+
+$srcdir/config.make Makefile CONFIG_FILE --enable-sim-config "$enable_sim_config" \
+  "" "std-config.h" "no" "std-config.h" "yes" "std-config.h" "*" "$enable_sim_config" 1>&6
+
+$srcdir/config.make Makefile IGEN_OPCODE_RULES --enable-sim-opcode "$enable_sim_opcode" \
+  "" "ppc-opcode-simple" "no" "ppc-opcode-simple" "yes" "ppc-opcode-simple" \
+  "complex" "ppc-opcode-complex" "simple" "ppc-opcode-simple" 1>&6
+
+$srcdir/config.make Makefile DGEN_FLAGS --enable-sim-switch "$enable_sim_switch" \
+  "" "" "no" "" "yes" "-s" 1>&6
+
+$srcdir/config.make Makefile IGEN_DUPLICATE --enable-sim-duplicate "$enable_sim_duplicate" \
+  "" "" "no" "" "yes" "-e" 1>&6
+
+$srcdir/config.make Makefile IGEN_FILTER --enable-sim-filter "$enable_sim_filter" \
+  "" "-f 64" "no" "" "yes" "-f 64" "*" "$enable_sim_filter" 1>&6
+
+flags=""
 if test x"$enable_sim_inline" != x""; then
-  flags=""
   case "$enable_sim_inline" in
     no)		flags="";;
-    0)		flags="-DDEFAULT_INLINE=0";;
-    yes | 2)	flags="-DDEFAULT_INLINE=2";;
-    1)		flags="-DDEFAULT_INLINE=1";;
+    0)		flags=" -DDEFAULT_INLINE=0";;
+    yes | 2)	flags=" -DDEFAULT_INLINE=2";;
+    1)		flags=" -DDEFAULT_INLINE=1";;
     *) for x in `echo "$enable_sim_inline" | sed -e "s/,/ /g"`; do
 	 case "$x" in
 	   *_INLINE=*)	flags="$flags -D$x";;
@@ -1056,87 +1084,68 @@ if test x"$enable_sim_inline" != x""; then
 	 esac
        done;;
   esac
-  if test x"$flags" != x""; then
-    mv Makefile Makefile.tem
-    echo "Setting INLINE_CFLAGS=$flags" 1>&6
-    sed -e "s/^INLINE_CFLAGS.*=.*\$/INLINE_CFLAGS =$flags/" \
-      < Makefile.tem > Makefile
-    rm -f Makefile.tem
-  fi
 fi
-
-if test x"$enable_sim_bswap" != x"" -a x"$enable_sim_bswap" != x"no"; then
-  mv Makefile Makefile.tem
-  echo "Setting BSWAP_CFLAGS=-DWITH_BSWAP=1" 1>&6
-  sed -e "s/^BSWAP_CFLAGS.*=.*\$/BSWAP_CFLAGS = -DWITH_BSWAP=1/" \
-    < Makefile.tem > Makefile
-  rm -f Makefile.tem
+if test x"$flags" != x""; then
+  echo "Setting INLINE_CFLAGS=$flags" 1>&6
+  (echo; echo "# --enable-sim-inline=$enable_sim_inline"; echo "INLINE_CFLAGS =$flags") >> Makefile
+else
+  echo "Setting INLINE_CFLAGS=" 1>&6
+  (echo; echo "# no --enable-sim-inline"; echo "INLINE_CFLAGS =") >> Makefile 
 fi
 
-if test x"$enable_sim_cflags" != x"" -a x"$enable_sim_cflags" != x"no"; then
-  if test "$enable_sim_cflags" = "yes"; then
-    enable_sim_cflags="-fomit-frame-pointer,-O2"
-  fi
-  mv Makefile Makefile.tem
-  echo "Setting SIM_CFLAGS=$enable_sim_cflags"
-  sed -e "s/^SIM_CFLAGS.*=.*\$/SIM_CFLAGS = $enable_sim_cflags/" -e "s/,/ /g"\
-    < Makefile.tem > Makefile
-  rm -f Makefile.tem
-fi
+$srcdir/config.hdr config.h WITH_BSWAP --enable-sim-bswap "$enable_sim_bswap" "yes" 1
 
-if test x"$enable_sim_complex" != x"" -a x"$enable_sim_complex" != x"no"; then
-  mv Makefile Makefile.tem
-  echo "Setting IGEN_OPCODE_RULES=ppc-opcode-complex" 1>&6
-  sed -e "s/^IGEN_OPCODE_RULES.*=.*\$/IGEN_OPCODE_RULES = ppc-opcode-complex/" \
-    < Makefile.tem > Makefile
-  rm -f Makefile.tem
-fi
+case "$target" in
+  *powerpc-*) endian="BIG_ENDIAN";;
+  *powerpcle-*) endian="LITTLE_ENDIAN";;
+  *) echo "Unknown $target" 1>&6; endian="0";;
+esac
 
-if test x"$enable_sim_switch" != x"" -a x"$enable_sim_switch" != x"no"; then
-  mv Makefile Makefile.tem
-  echo "Setting DGEN_FLAGS=-s" 1>&6
-  sed -e "s/^DGEN_FLAGS.*=.*\$/DGEN_FLAGS = -s/" < Makefile.tem > Makefile
-  rm -f Makefile.tem
-fi
+$srcdir/config.hdr config.h WITH_TARGET_BYTE_ORDER --enable-sim-endian "$enable_sim_endian" \
+  "" "0" "no" "0" "yes" "$endian" \
+  "b" "BIG_ENDIAN" "big" "BIG_ENDIAN" "big-endian" "BIG_ENDIAN" \
+  "B" "BIG_ENDIAN" "BIG" "BIG_ENDIAN" "BIG-ENDIAN" "BIG_ENDIAN" \
+  "l" "LITTLE_ENDIAN" "little" "LITTLE_ENDIAN" "little-endian" "LITTLE_ENDIAN" \
+  "L" "LITTLE_ENDIAN" "little" "LITTLE_ENDIAN" "little-endian" "LITTLE_ENDIAN" 1>&6
 
-if test x"$enable_sim_duplicate" != x"" -a x"$enable_sim_duplicate" != x"no"; then
-  mv Makefile Makefile.tem
-  echo "Setting IGEN_DUPLICATE=-e" 1>&6
-  sed -e "s/^IGEN_DUPLICATE.*=.*\$/IGEN_DUPLICATE = -e/" < Makefile.tem > Makefile
-  rm -f Makefile.tem
-fi
+$srcdir/config.hdr config.h WITH_HOST_BYTE_ORDER --enable-sim-hostendian "$enable_sim_hostendian" \
+  "b" "BIG_ENDIAN" "big" "BIG_ENDIAN" "big-endian" "BIG_ENDIAN" \
+  "B" "BIG_ENDIAN" "BIG" "BIG_ENDIAN" "BIG-ENDIAN" "BIG_ENDIAN" \
+  "l" "LITTLE_ENDIAN" "little" "LITTLE_ENDIAN" "little-endian" "LITTLE_ENDIAN" \
+  "L" "LITTLE_ENDIAN" "little" "LITTLE_ENDIAN" "little-endian" "LITTLE_ENDIAN" 1>&6
 
-if test x"$enable_sim_filter" = x"no"; then
-  mv Makefile Makefile.tem
-  echo "Setting IGEN_FILTER=" 1>&6
-  sed -e "s/^IGEN_FILTER.*=.*\$/IGEN_FILTER =/" < Makefile.tem > Makefile
-  rm -f Makefile.tem
+$srcdir/config.hdr config.h WITH_SMP --enable-sim-smp "$enable_sim_smp" \
+  "" "0" "no" "0" "yes" "2" "*" "$enable_sim_smp" 1>&6
 
-else
-  if test x"$enable_sim_filter" != x"yes" -a x"$enable_sim_filter" != x""; then
-    mv Makefile Makefile.tem
-    echo "Setting IGEN_FILTER= -f $enable_sim_filter" 1>&6
-    sed -e "s/^IGEN_FILTER.*=.*\$/IGEN_FILTER = -f $enable_sim_filter/" \
-      < Makefile.tem > Makefile
-    rm -f Makefile.tem
-  fi
-fi
+$srcdir/config.hdr config.h WITH_TARGET_WORD_BITSIZE --enable-sim-bitsize "$enable_sim_bitsize" \
+  "yes" "32" "32" "32" "32" "64" "64" 1>&6
 
-endian=""
-case x"$enable_sim_endian" in
-  xb* | xB*) endian="BIG_ENDIAN";;
-  xl* | xL*) endian="LITTLE_ENDIAN";;
-  xyes) case "$target" in
-	  *powerpc-*) endian="BIG_ENDIAN";;
-	  *powerpcle-*) endian="LITTLE_ENDIAN";;
-	  *) echo "Unknown $target" 1>&6;;
-        esac;;
-esac
-if test x"$endian" != x""; then
-  mv Makefile Makefile.tem
-  echo "Setting SIM_ENDIAN=-DWITH_TARGET_BYTE_ORDER=$endian"
-  sed -e "s/^SIM_ENDIAN.*=.*\$/SIM_ENDIAN = -DWITH_TARGET_BYTE_ORDER=$endian/" \
-    < Makefile.tem > Makefile
-  rm -f Makefile.tem
-fi
+$srcdir/config.hdr config.h WITH_HOST_WORD_BITSIZE --enable-sim-hostbitsize "$enable_sim_hostbitsize" \
+  "yes" "32" "32" "32" "32" "64" "64" 1>&6
+
+$srcdir/config.hdr config.h WITH_ENVIRONMENT --enable-sim-env "$enable_sim_env" \
+  "yes" "0" \
+  "operating" "OPERATING_ENVIRONMENT" "os" "OPERATING_ENVIRONMENT" "oea" "OPERATING_ENVIRONMENT" \
+  "virtual" "VIRTUAL_ENVIRONMENT" "vea" "VIRTUAL_ENVIRONMENT" 1>&6
+
+$srcdir/config.hdr config.h WITH_TIME_BASE --enable-sim-timebase "$enable_sim_timebase" \
+  "no" "0" "yes" "1" 1>&6
+
+$srcdir/config.hdr config.h WITH_ALIGNMENT --enable-sim-alignment "$enable_sim_alignment" \
+  "no" "NONSTRICT_ALIGNMENT" "nonstrict" "NONSTRICT_ALIGNMENT" \
+  "yes" "STRICT_ALIGNMENT" "strict" "STRICT_ALIGNMENT" 1>&6
+
+$srcdir/config.hdr config.h WITH_FLOATING_POINT --enable-sim-float "$enable_sim_float" \
+  "no" "SOFT_FLOATING_POINT" "soft" "SOFT_FLOATING_POINT" \
+  "yes" "HARD_FLOATING_POINT" "hard" "HARD_FLOATING_POINT" 1>&6
+
+$srcdir/config.hdr config.h WITH_TRACE --enable-sim-trace "$enable_sim_trace" \
+  "no" "0" "yes" "1" 1>&6
+
+$srcdir/config.hdr config.h WITH_ASSERT --enable-sim-assert "$enable_sim_assert" \
+  "no" "0" "yes" "1" 1>&6
 
+$srcdir/config.hdr config.h WITH_MON --enable-sim-monitor "$enable_sim_monitor" \
+  "no" "0" "yes" "MONITOR_INSTRUCTION_ISSUE|MONITOR_LOAD_STORE_UNIT" \
+  "instruction" "MONITOR_INSTRUCTION_ISSUE" \
+  "memory" "MONITOR_LOAD_STORE_UNIT" 1>&6