first stage in function unit support; add new switches & latest code from andrew

1 files changed, 57 insertions, 21 deletions

diff --git a/sim/ppc/configure.in b/sim/ppc/configure.in
index 43761d8..4ebcefb 100644
--- a/sim/ppc/configure.in
+++ b/sim/ppc/configure.in
@@ -3,15 +3,23 @@ AC_PREREQ(2.3)dnl
 AC_INIT(Makefile.in)
 
 AC_ARG_ENABLE(sim-cflags,
-[  --enable-sim-cflags=opts	Extra CFLAGS for use in building simulator],
+[  --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator],
 [case "${enableval}" in
   yes)	sim_cflags="-O2 -fomit-frame-pointer";;
   no)	sim_cflags="";;
   *)	sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
 esac],[sim_cflags=""])dnl
 
+AC_ARG_ENABLE(sim-warnings,
+[  --enable-sim-warnings=opts		Extra CFLAGS for turning on compiler warnings except for idecode.o and semantics.o],
+[case "${enableval}" in
+  yes)	sim_warnings="-Wall";;
+  no)	sim_warnings="-w";;
+  *)	sim_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac],[sim_warnings=""])dnl
+
 AC_ARG_ENABLE(sim-config,
-[  --enable-sim-config=file	Override default config file],
+[  --enable-sim-config=file		Override default config file],
 [case "${enableval}" in
   yes)	sim_config="std-config.h";;
   no)	sim_config="std-config.h";;
@@ -19,7 +27,7 @@ AC_ARG_ENABLE(sim-config,
 esac],[sim_config="std-config.h]")dnl
 
 AC_ARG_ENABLE(sim-opcode,
-[  --enable-sim-opcode=which	Override default opcode lookup.],
+[  --enable-sim-opcode=which		Override default opcode lookup.],
 [case "${enableval}" in
   yes)	sim_opcode="ppc-opcode-simple";;
   no)	sim_opcode="ppc-opcode-simple";;
@@ -27,35 +35,35 @@ AC_ARG_ENABLE(sim-opcode,
 esac],[sim_opcode="ppc-opcode-simple"])dnl
 
 AC_ARG_ENABLE(sim-switch,
-[  --enable-sim-switch		Use a switch instead of a table for instruction call.],
+[  --enable-sim-switch			Use a switch instead of a table for instruction call.],
 [case "${enableval}" in
   yes)	sim_switch="-s";;
   *)	sim_switch="";;
 esac],[sim_switch=""])dnl
 
 AC_ARG_ENABLE(sim-duplicate,
-[  --enable-sim-duplicate	Expand (duplicate) semantic functions.],
+[  --enable-sim-duplicate		Expand (duplicate) semantic functions.],
 [case "${enableval}" in
    yes)	sim_dup="-e";;
    *)	sim_dup="";;
 esac],[sim_dup=""])dnl
 
 AC_ARG_ENABLE(sim-filter,
-[  --enable-sim-filter=rule	Specify filter rules.],
+[  --enable-sim-filter=rule		Specify filter rules.],
 [case "${enableval}" in
    yes)	sim_filter="";;
    *)	sim_filter="-f $enableval";;
 esac],[sim_filter="-f 64"])dnl
 
 AC_ARG_ENABLE(sim-icache,
-[  --enable-sim-icache=size	Specify instruction cache size.],
+[  --enable-sim-icache=size		Specify instruction cache size.],
 [case "${enableval}" in
    yes)	sim_icache="-r 1024";;
    *)	sim_icache="";;
 esac],[sim_icache=""])dnl
 
 AC_ARG_ENABLE(sim-inline,
-[  --enable-sim-inline=inlines	Specify which functions should be inlined.],
+[  --enable-sim-inline=inlines		Specify which functions should be inlined.],
 [sim_inline=""
 case "$enableval" in
   no)		sim_inline="";;
@@ -79,7 +87,7 @@ case "$enableval" in
 esac],[sim_inline=""])dnl
 
 AC_ARG_ENABLE(sim-bswap,
-[  --enable-sim-bswap		Use the BSWAP instruction on Intel 486s and Pentiums.],
+[  --enable-sim-bswap			Use the BSWAP instruction on Intel 486s and Pentiums.],
 [case "${enableval}" in
   yes)	sim_bswap="-DWITH_BSWAP=1";;
   no)	sim_bswap="-DWITH_BSWAP=0";;
@@ -87,7 +95,7 @@ AC_ARG_ENABLE(sim-bswap,
 esac],[sim_bswap=""])dnl
 
 AC_ARG_ENABLE(sim-endian,
-[  --enable-sim-endian=endian	Specify target byte endian orientation.],
+[  --enable-sim-endian=endian		Specify target byte endian orientation.],
 [case "${enableval}" in
   yes)	case "$target" in
 	  *powerpc-*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BIG_ENDIAN";;
@@ -101,7 +109,7 @@ AC_ARG_ENABLE(sim-endian,
 esac],[sim_endian=""])dnl
 
 AC_ARG_ENABLE(sim-hostendian,
-[  --enable-sim-hostendain=end	Specify host byte endian orientation.],
+[  --enable-sim-hostendain=end		Specify host byte endian orientation.],
 [case "${enableval}" in
   no)	 sim_hostendian="-DWITH_HOST_BYTE_ORDER=0";;
   b*|B*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN";;
@@ -110,7 +118,7 @@ AC_ARG_ENABLE(sim-hostendian,
 esac],[sim_hostendian=""])dnl
 
 AC_ARG_ENABLE(sim-smp,
-[  --enable-sim-smp=n		Specify number of processors to configure for.],
+[  --enable-sim-smp=n			Specify number of processors to configure for.],
 [case "${enableval}" in
   yes)	sim_smp="-DWITH_SMP=2";;
   no)	sim_smp="-DWITH_SMP=0";;
@@ -118,7 +126,7 @@ AC_ARG_ENABLE(sim-smp,
 esac],[sim_smp=""])dnl
 
 AC_ARG_ENABLE(sim-bitsize,
-[  --enable-sim-bitsize=n	Specify target bitsize (32 or 64).],
+[  --enable-sim-bitsize=n		Specify target bitsize (32 or 64).],
 [case "${enableval}" in
   yes)	sim_bitsize="";;
   no)	sim_bitsize="";;
@@ -126,7 +134,7 @@ AC_ARG_ENABLE(sim-bitsize,
 esac],[sim_bitsize=""])dnl
 
 AC_ARG_ENABLE(sim-hostbitsize,
-[  --enable-sim-hostbitsize=n	Specify host bitsize (32 or 64).],
+[  --enable-sim-hostbitsize=n		Specify host bitsize (32 or 64).],
 [case "${enableval}" in
   yes)	sim_hostbitsize="";;
   no)	sim_hostbitsize="";;
@@ -134,7 +142,7 @@ AC_ARG_ENABLE(sim-hostbitsize,
 esac],[sim_hostbitsize=""])dnl
 
 AC_ARG_ENABLE(sim-env,
-[  --enable-sim-env=env		Specify target environment (operating, virtual, user).],
+[  --enable-sim-env=env			Specify target environment (operating, virtual, user).],
 [case "${enableval}" in
   operating | os | oea)	sim_env="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
   virtual | vea)	sim_env="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
@@ -143,7 +151,7 @@ AC_ARG_ENABLE(sim-env,
 esac],[sim_env=""])dnl
 
 AC_ARG_ENABLE(sim-timebase,
-[  --enable-sim-timebase	Specify whether the PPC timebase is supported.],
+[  --enable-sim-timebase			Specify whether the PPC timebase is supported.],
 [case "${enableval}" in
   yes)	sim_timebase="-DWITH_TIME_BASE=1";;
   no)	sim_timebase="-DWITH_TIME_BASE=0";;
@@ -151,7 +159,7 @@ AC_ARG_ENABLE(sim-timebase,
 esac],[sim_timebase=""])dnl
 
 AC_ARG_ENABLE(sim-alignment,
-[  --enable-sim-alignment=align	Specify strict or nonstrict alignment.]
+[  --enable-sim-alignment=align		Specify strict or nonstrict alignment.],
 [case "${enableval}" in
   yes | strict | STRICT)	sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";;
   no | nonstrict | NONSTRICT)	sim_alignment="-DWITH_ALIGNMENT=NOSTRICT_ALIGNMENT";;
@@ -159,7 +167,7 @@ AC_ARG_ENABLE(sim-alignment,
 esac],[sim_alignment=""])dnl
 
 AC_ARG_ENABLE(sim-trace,
-[  --enable-sim-trace		Specify whether tracing is supported.],
+[  --enable-sim-trace			Specify whether tracing is supported.],
 [case "${enableval}" in
   yes)	sim_trace="-DWITH_TRACE=1";;
   no)	sim_trace="-DWITH_TRACE=0";;
@@ -167,7 +175,7 @@ AC_ARG_ENABLE(sim-trace,
 esac],[sim_trace=""])dnl
 
 AC_ARG_ENABLE(sim-assert,
-[  --enable-sim-assert		Specify whether to perform random assertions.],
+[  --enable-sim-assert			Specify whether to perform random assertions.],
 [case "${enableval}" in
   yes)	sim_assert="-DWITH_ASSERT=1";;
   no)	sim_assert="-DWITH_ASSERT=0";;
@@ -175,7 +183,7 @@ AC_ARG_ENABLE(sim-assert,
 esac],[sim_assert=""])dnl
 
 AC_ARG_ENABLE(sim-float,
-[  --enable-sim-float		Specify whether to use host floating point or simulate.],
+[  --enable-sim-float			Specify whether to use host floating point or simulate.],
 [case "${enableval}" in
   yes | hard)	sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT";;
   no | soft)	sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";;
@@ -183,7 +191,7 @@ AC_ARG_ENABLE(sim-float,
 esac],[sim_float=""])dnl
 
 AC_ARG_ENABLE(sim-monitor,
-[  --enable-sim-monitor=mon	Specify whether to enable monitoring events.],
+[  --enable-sim-monitor=mon		Specify whether to enable monitoring events.],
 [case "${enableval}" in
   yes)		sim_mon="-DWITH_MON='MONITOR_INSTRUCTION_ISSUE | MONITOR_LOAD_STORE_UNIT'";;
   no)		sim_mon="-DWITH_MON=0";;
@@ -192,6 +200,30 @@ AC_ARG_ENABLE(sim-monitor,
   *)		sim_mon="-DWITH_MON='$enableval'";;
 esac],[sim_float=""])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";;
+  *)	sim_func="";;
+esac],[sim_func=""])dnl
+
+AC_ARG_ENABLE(sim-model,
+[  --enable-sim-model=which		Specify PowerPC to model.],
+[case "${enableval}" in
+  yes)	sim_model="";;
+  no)	sim_model="";;
+  *)	sim_model="-DWITH_PPC_MODEL=${enableval}";;
+esac],[sim_model=""])dnl
+
+AC_ARG_ENABLE(sim-default-model,
+[  --enable-sim-default-model=which	Specify default PowerPC to model.],
+[case "${enableval}" in
+  yes)	sim_default_model="";;
+  no)	sim_default_model="";;
+  *)	sim_default_model="-DWITH_DEFAULT_PPC_MODEL=${enableval}";;
+esac],[sim_model=""])dnl
+
 AC_CONFIG_HEADER(config.h:config.in)
 
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
@@ -207,6 +239,7 @@ AR=${AR-ar}
 AC_SUBST(AR)
 AC_PROG_RANLIB
 AC_SUBST(sim_cflags)
+AC_SUBST(sim_warnings)
 AC_SUBST(sim_config)
 AC_SUBST(sim_opcode)
 AC_SUBST(sim_switch)
@@ -227,6 +260,9 @@ AC_SUBST(sim_float)
 AC_SUBST(sim_trace)
 AC_SUBST(sim_assert)
 AC_SUBST(sim_monitor)
+AC_SUBST(sim_func)
+AC_SUBST(sim_model)
+AC_SUBST(sim_default_model)
 
 AC_CHECK_FUNCS(getrusage)