Add determining when we do not have enough writeback slots; Do not do model specific...

[deliverable/binutils-gdb.git] / sim / ppc / configure.in

diff --git a/sim/ppc/configure.in b/sim/ppc/configure.in
index b2a0ee444aad43ffe547c084c82f66ffe2cf363b..a8382ce2ff7ccb16ba52f0265c91514f1d8c3817 100644 (file)
--- a/sim/ppc/configure.in
+++ b/sim/ppc/configure.in
@@ -16,7 +16,7 @@ fi],[sim_cflags=""])dnl
 AC_ARG_ENABLE(sim-warnings,
 [  --enable-sim-warnings=opts          Extra CFLAGS for turning on compiler warnings except for idecode.o, semantics.o and psim.o],
 [case "${enableval}" in
-  yes) sim_warnings="-Wall -Wpointer-arith -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations";;
+  yes) sim_warnings="-Werror -Wall -Wpointer-arith -Wmissing-prototypes";;
   no)  sim_warnings="-w";;
   *)   sim_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
 esac
@@ -110,9 +110,10 @@ AC_ARG_ENABLE(sim-icache,
 [  --enable-sim-icache=size            Specify instruction cache size.],
 icache=""
 [case "${enableval}" in
-  yes) sim_icache="-r 1024"; icache="1024";;
-  no)  sim_icache="";;
-  *)   sim_icache="-r ${enableval}"; icache="${enableval}";;
+  yes)         sim_icache="-r 1024"; icache="1024";;
+  define)      sim_icache="-r 1024 -R"; icache="1024";;
+  no)          sim_icache="";;
+  *)           sim_icache="-r ${enableval}"; icache="${enableval}";;
 esac
 if test x"$silent" != x"yes" && test x"$icache" != x""; then
   echo "Setting instruction cache size to $icache"
@@ -125,7 +126,7 @@ AC_ARG_ENABLE(sim-inline,
 [  --enable-sim-inline=inlines         Specify which functions should be inlined.],
 [sim_inline=""
 case "$enableval" in
-  no)          sim_inline="";;
+  no)          sim_inline="-DDEFAULT_INLINE=0 -DINLINE=";;
   0)           sim_inline="-DDEFAULT_INLINE=0";;
   yes | 2)     sim_inline="-DDEFAULT_INLINE=2";;
   1)           sim_inline="-DDEFAULT_INLINE=1";;
@@ -198,7 +199,7 @@ fi],[sim_hostendian=""])dnl
 AC_ARG_ENABLE(sim-smp,
 [  --enable-sim-smp=n                  Specify number of processors to configure for.],
 [case "${enableval}" in
-  yes) sim_smp="-DWITH_SMP=2";;
+  yes) sim_smp="-DWITH_SMP=5";;
   no)  sim_smp="-DWITH_SMP=0";;
   *)   sim_smp="-DWITH_SMP=$enableval";;
 esac
@@ -209,6 +210,14 @@ if test x"$silent" != x"yes"; then
   echo "Setting smp flags = $sim_smp" 6>&1
 fi])dnl
 
+AC_ARG_ENABLE(sim-xor-endian,
+[  --enable-sim-xor-endian=n           Specify number bytes involved in PowerPC XOR bi-endian mode (default 8).],
+[case "${enableval}" in
+  yes) sim_xor_endian="-DWITH_XOR_ENDIAN=8";;
+  no)  sim_xor_endian="-DWITH_XOR_ENDIAN=0";;
+  *)   sim_xor_endian="-DWITH_XOR_ENDIAN=$enableval";;
+esac],[sim_xor_endian=""])dnl
+
 AC_ARG_ENABLE(sim-bitsize,
 [  --enable-sim-bitsize=n              Specify target bitsize (32 or 64).],
 [case "${enableval}" in
@@ -321,17 +330,6 @@ if test x"$silent" != x"yes" && test x"$sim_mon" != x""; then
   echo "Setting monitor flags = $sim_mon" 6>&1
 fi],[sim_mon=""])dnl
 
-AC_ARG_ENABLE(sim-function-unit,
-[  --enable-sim-function-unit          Specify whether detailed functional unit support is built.],
-[case "${enableval}" in
-  yes) sim_func="-DWITH_FUNCTION_UNIT=1";;
-  no)  sim_func="-DWITH_FUNCTION_UNIT=0";;
-  *)   AC_MSG_ERROR("--enable-sim-function-unit does not take a value"); sim_func="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_func" != x""; then
-  echo "Setting function-unit flags = $sim_func" 6>&1
-fi],[sim_func=""])dnl
-
 AC_ARG_ENABLE(sim-model,
 [  --enable-sim-model=which            Specify PowerPC to model.],
 [case "${enableval}" in
@@ -352,6 +350,17 @@ if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
   echo "Setting default-model flags = $sim_default_model" 6>&1
 fi],[sim_model=""])dnl
 
+AC_ARG_ENABLE(sim-model-issue,
+[  --enable-sim-model-issue            Specify whether to simulate model specific actions],
+[case "${enableval}" in
+  yes) sim_model_issue="-DWITH_MODEL_ISSUE=MODEL_ISSUE_PROCESS";;
+  no)  sim_model_issue="-DWITH_MODEL_ISSUE=MODEL_ISSUE_IGNORE";;
+  *)   AC_MSG_ERROR("--enable-sim-model-issue does not take a value"); sim_model_issue="";;
+esac
+if test x"$silent" != x"yes"; then
+  echo "Setting model-issue flags = $sim_model_issue" 6>&1
+fi],[sim_model_issue=""])dnl
+
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -377,6 +386,7 @@ AC_SUBST(sim_icache)
 AC_SUBST(sim_inline)
 AC_SUBST(sim_bswap)
 AC_SUBST(sim_endian)
+AC_SUBST(sim_xor_endian)
 AC_SUBST(sim_hostendian)
 AC_SUBST(sim_smp)
 AC_SUBST(sim_bitsize)
@@ -389,9 +399,9 @@ AC_SUBST(sim_trace)
 AC_SUBST(sim_assert)
 AC_SUBST(sim_reserved)
 AC_SUBST(sim_monitor)
-AC_SUBST(sim_func)
 AC_SUBST(sim_model)
 AC_SUBST(sim_default_model)
+AC_SUBST(sim_model_issue)
 
 AC_CHECK_FUNCS(getrusage)
 
@@ -404,7 +414,7 @@ else
 fi
 AC_SUBST(CC_FOR_BUILD)
 
-AC_CHECK_HEADERS(string.h strings.h stdlib.h time.h sys/times.h unistd.h sys/resource.h)
+AC_CHECK_HEADERS(string.h strings.h stdlib.h time.h sys/types.h sys/time.h sys/times.h unistd.h sys/resource.h)
 
 AC_OUTPUT(Makefile,
 [case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])