From 08e88f27c7a4a232ace290a19500f33f1a343f3d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 2 Jan 2024 01:13:44 -0500 Subject: sim: ppc: standardize configure option processing Switch from ad-hoc $silent checks & echo calls to standard AC_MSG_CHECKING & AC_MSG_RESULT calls. Also delete pointless variable setting after calling AC_MSG_ERROR. --- sim/ppc/configure | 198 ++++++++++++++++++++++------------------------- sim/ppc/configure.ac | 211 +++++++++++++++++---------------------------------- 2 files changed, 161 insertions(+), 248 deletions(-) (limited to 'sim') diff --git a/sim/ppc/configure b/sim/ppc/configure index 8bf95fd..2c20e13 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -1738,90 +1738,86 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc bitsize settings" >&5 +$as_echo_n "checking for sim ppc bitsize settings... " >&6; } # Check whether --enable-sim-bitsize was given. if test "${enable_sim_bitsize+set}" = set; then : enableval=$enable_sim_bitsize; case "${enableval}" in 32|64) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=$enableval";; - *) as_fn_error $? "\"--enable-sim-bitsize was given $enableval. Expected 32 or 64\"" "$LINENO" 5; sim_bitsize="";; + *) as_fn_error $? "\"--enable-sim-bitsize was given $enableval. Expected 32 or 64\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_bitsize" != x""; then - echo "Setting bitsize flags = $sim_bitsize" 6>&1 -fi else sim_bitsize="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_bitsize" >&5 +$as_echo "$sim_bitsize" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc decode mechanism" >&5 +$as_echo_n "checking for sim ppc decode mechanism... " >&6; } # Check whether --enable-sim-decode-mechanism was given. if test "${enable_sim_decode_mechanism+set}" = set; then : enableval=$enable_sim_decode_mechanism; case "${enableval}" in yes|no) as_fn_error $? "\"No value supplied for --enable-sim-decode-mechanism=file\"" "$LINENO" 5;; array|switch|padded-switch|goto-switch) sim_decode_mechanism="-T ${enableval}";; - *) as_fn_error $? "\"File $enableval is not an opcode rules file\"" "$LINENO" 5; - sim_decode_mechanism="switch";; + *) as_fn_error $? "\"File $enableval is not an opcode rules file\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_decode_mechanism" != x""; then - echo "Setting decode mechanism flags = $sim_decode_mechanism" 6>&1 -fi else sim_decode_mechanism="" -if test x"$silent" != x"yes"; then - echo "Setting decode mechanism flags = $sim_decode_mechanism" -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_decode_mechanism" >&5 +$as_echo "$sim_decode_mechanism" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc default model" >&5 +$as_echo_n "checking for sim ppc default model... " >&6; } # Check whether --enable-sim-default-model was given. if test "${enable_sim_default_model+set}" = set; then : enableval=$enable_sim_default_model; case "${enableval}" in yes|no) as_fn_error $? "\"No value supplied for --enable-sim-default-model=model\"" "$LINENO" 5;; *) sim_default_model="-DWITH_DEFAULT_MODEL=${enableval}";; esac -if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then - echo "Setting default-model flags = $sim_default_model" 6>&1 -fi else sim_default_model="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_default_model" >&5 +$as_echo "$sim_default_model" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc duplicate settings" >&5 +$as_echo_n "checking for sim ppc duplicate settings... " >&6; } # Check whether --enable-sim-duplicate was given. if test "${enable_sim_duplicate+set}" = set; then : enableval=$enable_sim_duplicate; case "${enableval}" in yes) sim_dup="-E";; no) sim_dup="";; - *) as_fn_error $? "\"--enable-sim-duplicate does not take a value\"" "$LINENO" 5; sim_dup="";; + *) as_fn_error $? "\"--enable-sim-duplicate does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_dup" != x""; then - echo "Setting duplicate flags = $sim_dup" 6>&1 -fi else sim_dup="-E" -if test x"$silent" != x"yes"; then - echo "Setting duplicate flags = $sim_dup" 6>&1 -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_dup" >&5 +$as_echo "$sim_dup" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc filter rules" >&5 +$as_echo_n "checking for sim ppc filter rules... " >&6; } # Check whether --enable-sim-filter was given. if test "${enable_sim_filter+set}" = set; then : enableval=$enable_sim_filter; case "${enableval}" in - yes) as_fn_error $? "\"--enable-sim-filter must be specified with a rule to filter or no\"" "$LINENO" 5; sim_filter="";; + yes) as_fn_error $? "\"--enable-sim-filter must be specified with a rule to filter or no\"" "$LINENO" 5;; no) sim_filter="";; *) sim_filter="-F $enableval";; esac -if test x"$silent" != x"yes" && test x"$sim_filter" != x""; then - echo "Setting filter flags = $sim_filter" 6>&1 -fi else sim_filter="-F 32,f,o" -if test x"$silent" != x"yes"; then - echo "Setting filter flags = $sim_filter" 6>&1 -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_filter" >&5 +$as_echo "$sim_filter" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc float settings" >&5 +$as_echo_n "checking for sim ppc float settings... " >&6; } # Check whether --enable-sim-float was given. if test "${enable_sim_float+set}" = set; then : enableval=$enable_sim_float; case "${enableval}" in @@ -1829,47 +1825,40 @@ if test "${enable_sim_float+set}" = set; then : no | soft) sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";; altivec) sim_float="-DWITH_ALTIVEC" ; sim_filter="${sim_filter},av" ;; *spe*|*simd*) sim_float="-DWITH_E500" ; sim_filter="${sim_filter},e500" ;; - *) as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-float\"" "$LINENO" 5; sim_float="";; + *) as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-float\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_float" != x""; then - echo "Setting float flags = $sim_float" 6>&1 -fi else - -case "${target}" in + case "${target}" in *altivec*) sim_float="-DWITH_ALTIVEC" ; sim_filter="${sim_filter},av" ;; *spe*|*simd*) sim_float="-DWITH_E500" ; sim_filter="${sim_filter},e500" ;; *) sim_float="" esac - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_float" >&5 +$as_echo "$sim_float" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc hardware settings" >&5 +$as_echo_n "checking for sim ppc hardware settings... " >&6; } +hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" # Check whether --enable-sim-hardware was given. if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" -case "${enableval}" in + enableval=$enable_sim_hardware; case "${enableval}" in yes) ;; - no) as_fn_error $? "\"List of hardware must be specified for --enable-sim-hardware\"" "$LINENO" 5; hardware="";; + no) as_fn_error $? "\"List of hardware must be specified for --enable-sim-hardware\"" "$LINENO" 5;; ,*) hardware="${hardware}${enableval}";; *,) hardware="${enableval}${hardware}";; *) hardware="${enableval}"'';; esac -sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` -sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" fi -else - hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" + sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" -fi -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardware" >&5 +$as_echo "$hardware" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc icache settings" >&5 +$as_echo_n "checking for sim ppc icache settings... " >&6; } # Check whether --enable-sim-icache was given. if test "${enable_sim_icache+set}" = set; then : enableval=$enable_sim_icache; icache="-R" @@ -1884,84 +1873,83 @@ if test "${enable_sim_icache+set}" = set; then : semantic) sim_icache="${sim_icache}C";; insn) sim_icache="${sim_icache}S";; 0*|1*|2*|3*|4*|5*|6*|7*|8*|9*) icache=$x;; - *) as_fn_error $? "\"Unknown value $x for --enable-sim-icache\"" "$LINENO" 5; sim_icache="";; + *) as_fn_error $? "\"Unknown value $x for --enable-sim-icache\"" "$LINENO" 5;; esac done sim_icache="${sim_icache}I $icache";; esac -if test x"$silent" != x"yes" && test x"$icache" != x""; then - echo "Setting instruction cache size to $icache ($sim_icache)" -fi else sim_icache="-CSRI 1024" -if test x"$silent" != x"yes"; then - echo "Setting instruction cache size to 1024 ($sim_icache)" -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_icache" >&5 +$as_echo "$sim_icache" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc jump settings" >&5 +$as_echo_n "checking for sim ppc jump settings... " >&6; } # Check whether --enable-sim-jump was given. if test "${enable_sim_jump+set}" = set; then : enableval=$enable_sim_jump; case "${enableval}" in yes) sim_jump="-J";; no) sim_jump="";; - *) as_fn_error $? "\"--enable-sim-jump does not take a value\"" "$LINENO" 5; sim_jump="";; + *) as_fn_error $? "\"--enable-sim-jump does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_jump" != x""; then - echo "Setting jump flag = $sim_jump" 6>&1 -fi else sim_jump="" -if test x"$silent" != x"yes"; then - echo "Setting jump flag = $sim_jump" 6>&1 -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_jump" >&5 +$as_echo "$sim_jump" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc source debug line numbers" >&5 +$as_echo_n "checking for sim ppc source debug line numbers... " >&6; } # Check whether --enable-sim-line-nr was given. if test "${enable_sim_line_nr+set}" = set; then : enableval=$enable_sim_line_nr; case "${enableval}" in yes) sim_line_nr="";; no) sim_line_nr="-L";; - *) as_fn_error $? "\"--enable-sim-line-nr does not take a value\"" "$LINENO" 5; sim_line_nr="";; + *) as_fn_error $? "\"--enable-sim-line-nr does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_line_nr" != x""; then - echo "Setting warning flags = $sim_line_nr" 6>&1 -fi else sim_line_nr="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_line_nr" >&5 +$as_echo "$sim_line_nr" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc model" >&5 +$as_echo_n "checking for sim ppc model... " >&6; } # Check whether --enable-sim-model was given. if test "${enable_sim_model+set}" = set; then : enableval=$enable_sim_model; case "${enableval}" in yes|no) as_fn_error $? "\"No value supplied for --enable-sim-model=model\"" "$LINENO" 5;; *) sim_model="-DWITH_MODEL=${enableval}";; esac -if test x"$silent" != x"yes" && test x"$sim_model" != x""; then - echo "Setting model flags = $sim_model" 6>&1 -fi else sim_model="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_model" >&5 +$as_echo "$sim_model" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc model issue" >&5 +$as_echo_n "checking for sim ppc model issue... " >&6; } # Check whether --enable-sim-model-issue was given. if test "${enable_sim_model_issue+set}" = set; then : enableval=$enable_sim_model_issue; case "${enableval}" in yes) sim_model_issue="-DWITH_MODEL_ISSUE=MODEL_ISSUE_PROCESS";; no) sim_model_issue="-DWITH_MODEL_ISSUE=MODEL_ISSUE_IGNORE";; - *) as_fn_error $? "\"--enable-sim-model-issue does not take a value\"" "$LINENO" 5; sim_model_issue="";; + *) as_fn_error $? "\"--enable-sim-model-issue does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes"; then - echo "Setting model-issue flags = $sim_model_issue" 6>&1 -fi else sim_model_issue="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_model_issue" >&5 +$as_echo "$sim_model_issue" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc event monitoring" >&5 +$as_echo_n "checking for sim ppc event monitoring... " >&6; } # Check whether --enable-sim-monitor was given. if test "${enable_sim_monitor+set}" = set; then : enableval=$enable_sim_monitor; case "${enableval}" in @@ -1971,14 +1959,15 @@ if test "${enable_sim_monitor+set}" = set; then : memory) sim_monitor="-DWITH_MON=MONITOR_LOAD_STORE_UNIT";; *) as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-mon\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_monitor" != x""; then - echo "Setting monitor flags = $sim_monitor" 6>&1 -fi else sim_monitor="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_monitor" >&5 +$as_echo "$sim_monitor" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc opcode lookup settings" >&5 +$as_echo_n "checking for sim ppc opcode lookup settings... " >&6; } # Check whether --enable-sim-opcode was given. if test "${enable_sim_opcode+set}" = set; then : enableval=$enable_sim_opcode; case "${enableval}" in @@ -1988,21 +1977,18 @@ if test "${enable_sim_opcode+set}" = set; then : elif test -f "${srcdir}/dc-${enableval}"; then sim_opcode="dc-${enableval}" else - as_fn_error $? "\"File $enableval is not an opcode rules file\"" "$LINENO" 5; - sim_opcode="dc-complex" + as_fn_error $? "\"File $enableval is not an opcode rules file\"" "$LINENO" 5 fi;; esac -if test x"$silent" != x"yes" && test x"$sim_opcode" != x""; then - echo "Setting opcode flags = $sim_opcode" 6>&1 -fi else sim_opcode="dc-complex" -if test x"$silent" != x"yes"; then - echo "Setting opcode flags = $sim_opcode" -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_opcode" >&5 +$as_echo "$sim_opcode" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc smp settings" >&5 +$as_echo_n "checking for sim ppc smp settings... " >&6; } # Check whether --enable-sim-smp was given. if test "${enable_sim_smp+set}" = set; then : enableval=$enable_sim_smp; case "${enableval}" in @@ -2010,50 +1996,47 @@ if test "${enable_sim_smp+set}" = set; then : no) sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";; *) sim_smp="-DWITH_SMP=$enableval" ; sim_igen_smp="-N $enableval";; esac -if test x"$silent" != x"yes" && test x"$sim_smp" != x""; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi else sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5" -if test x"$silent" != x"yes"; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_smp" >&5 +$as_echo "$sim_smp" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc switch table settings" >&5 +$as_echo_n "checking for sim ppc switch table settings... " >&6; } # Check whether --enable-sim-switch was given. if test "${enable_sim_switch+set}" = set; then : enableval=$enable_sim_switch; case "${enableval}" in yes) sim_switch="-DWITH_SPREG_SWITCH_TABLE";; no) sim_switch="";; - *) as_fn_error $? "\"--enable-sim-switch does not take a value\"" "$LINENO" 5; sim_switch="";; + *) as_fn_error $? "\"--enable-sim-switch does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_switch" != x""; then - echo "Setting switch flags = $sim_switch" 6>&1 -fi else - sim_switch=""; -if test x"$silent" != x"yes"; then - echo "Setting switch flags = $sim_switch" 6>&1 -fi + sim_switch="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_switch" >&5 +$as_echo "$sim_switch" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc timebase" >&5 +$as_echo_n "checking for sim ppc timebase... " >&6; } # Check whether --enable-sim-timebase was given. if test "${enable_sim_timebase+set}" = set; then : enableval=$enable_sim_timebase; case "${enableval}" in yes) sim_timebase="-DWITH_TIME_BASE=1";; no) sim_timebase="-DWITH_TIME_BASE=0";; - *) as_fn_error $? "\"--enable-sim-timebase does not take a value\"" "$LINENO" 5; sim_timebase="";; + *) as_fn_error $? "\"--enable-sim-timebase does not take a value\"" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_timebase" != x""; then - echo "Setting timebase flags = $sim_timebase" 6>&1 -fi else sim_timebase="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_timebase" >&5 +$as_echo "$sim_timebase" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim ppc xor endian settings" >&5 +$as_echo_n "checking for sim ppc xor endian settings... " >&6; } # Check whether --enable-sim-xor-endian was given. if test "${enable_sim_xor_endian+set}" = set; then : enableval=$enable_sim_xor_endian; case "${enableval}" in @@ -2061,13 +2044,12 @@ if test "${enable_sim_xor_endian+set}" = set; then : no) sim_xor_endian="-DWITH_XOR_ENDIAN=0";; *) sim_xor_endian="-DWITH_XOR_ENDIAN=$enableval";; esac -if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then - echo "Setting xor-endian flag = $sim_xor_endian" 6>&1 -fi else sim_xor_endian="" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_xor_endian" >&5 +$as_echo "$sim_xor_endian" >&6; } diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index dce55d8..3019044 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -2,75 +2,55 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../.. ../../config]) - +AC_MSG_CHECKING([for sim ppc bitsize settings]) AC_ARG_ENABLE(sim-bitsize, [AS_HELP_STRING([--enable-sim-bitsize=n], [Specify target bitsize (32 or 64).])], [case "${enableval}" in 32|64) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=$enableval";; - *) AC_MSG_ERROR("--enable-sim-bitsize was given $enableval. Expected 32 or 64"); sim_bitsize="";; -esac -if test x"$silent" != x"yes" && test x"$sim_bitsize" != x""; then - echo "Setting bitsize flags = $sim_bitsize" 6>&1 -fi],[sim_bitsize=""])dnl - + *) AC_MSG_ERROR("--enable-sim-bitsize was given $enableval. Expected 32 or 64");; +esac], [sim_bitsize=""]) +AC_MSG_RESULT($sim_bitsize) +AC_MSG_CHECKING([for sim ppc decode mechanism]) AC_ARG_ENABLE(sim-decode-mechanism, [AS_HELP_STRING([--enable-sim-decode-mechanism=which], [Specify the instruction decode mechanism.])], [case "${enableval}" in yes|no) AC_MSG_ERROR("No value supplied for --enable-sim-decode-mechanism=file");; array|switch|padded-switch|goto-switch) sim_decode_mechanism="-T ${enableval}";; - *) AC_MSG_ERROR("File $enableval is not an opcode rules file"); - sim_decode_mechanism="switch";; -esac -if test x"$silent" != x"yes" && test x"$sim_decode_mechanism" != x""; then - echo "Setting decode mechanism flags = $sim_decode_mechanism" 6>&1 -fi],[sim_decode_mechanism="" -if test x"$silent" != x"yes"; then - echo "Setting decode mechanism flags = $sim_decode_mechanism" -fi])dnl - + *) AC_MSG_ERROR("File $enableval is not an opcode rules file");; +esac], [sim_decode_mechanism=""]) +AC_MSG_RESULT($sim_decode_mechanism) +AC_MSG_CHECKING([for sim ppc default model]) AC_ARG_ENABLE(sim-default-model, [AS_HELP_STRING([--enable-sim-default-model=which], [Specify default PowerPC to model.])], [case "${enableval}" in yes|no) AC_MSG_ERROR("No value supplied for --enable-sim-default-model=model");; *) sim_default_model="-DWITH_DEFAULT_MODEL=${enableval}";; -esac -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_default_model=""])dnl - +esac], [sim_default_model=""]) +AC_MSG_RESULT($sim_default_model) +AC_MSG_CHECKING([for sim ppc duplicate settings]) AC_ARG_ENABLE(sim-duplicate, [AS_HELP_STRING([--enable-sim-duplicate], [Expand (duplicate) semantic functions.])], [case "${enableval}" in yes) sim_dup="-E";; no) sim_dup="";; - *) AC_MSG_ERROR("--enable-sim-duplicate does not take a value"); sim_dup="";; -esac -if test x"$silent" != x"yes" && test x"$sim_dup" != x""; then - echo "Setting duplicate flags = $sim_dup" 6>&1 -fi],[sim_dup="-E" -if test x"$silent" != x"yes"; then - echo "Setting duplicate flags = $sim_dup" 6>&1 -fi])dnl - + *) AC_MSG_ERROR("--enable-sim-duplicate does not take a value");; +esac], [sim_dup="-E"]) +AC_MSG_RESULT($sim_dup) +AC_MSG_CHECKING([for sim ppc filter rules]) AC_ARG_ENABLE(sim-filter, [AS_HELP_STRING([--enable-sim-filter=rule], [Specify filter rules.])], [case "${enableval}" in - yes) AC_MSG_ERROR("--enable-sim-filter must be specified with a rule to filter or no"); sim_filter="";; + yes) AC_MSG_ERROR("--enable-sim-filter must be specified with a rule to filter or no");; no) sim_filter="";; *) sim_filter="-F $enableval";; -esac -if test x"$silent" != x"yes" && test x"$sim_filter" != x""; then - echo "Setting filter flags = $sim_filter" 6>&1 -fi],[sim_filter="-F 32,f,o" -if test x"$silent" != x"yes"; then - echo "Setting filter flags = $sim_filter" 6>&1 -fi])dnl - +esac], [sim_filter="-F 32,f,o"]) +AC_MSG_RESULT($sim_filter) +AC_MSG_CHECKING([for sim ppc float settings]) AC_ARG_ENABLE(sim-float, [AS_HELP_STRING([--enable-sim-float], [Specify whether the target has hard, soft, altivec or e500 floating point.])], [case "${enableval}" in @@ -78,41 +58,31 @@ AC_ARG_ENABLE(sim-float, no | soft) sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";; altivec) sim_float="-DWITH_ALTIVEC" ; sim_filter="${sim_filter},av" ;; *spe*|*simd*) sim_float="-DWITH_E500" ; sim_filter="${sim_filter},e500" ;; - *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-float"); sim_float="";; -esac -if test x"$silent" != x"yes" && test x"$sim_float" != x""; then - echo "Setting float flags = $sim_float" 6>&1 -fi],[ -case "${target}" in + *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-float");; +esac], +[case "${target}" in *altivec*) sim_float="-DWITH_ALTIVEC" ; sim_filter="${sim_filter},av" ;; *spe*|*simd*) sim_float="-DWITH_E500" ; sim_filter="${sim_filter},e500" ;; *) sim_float="" -esac -])dnl - +esac]) +AC_MSG_RESULT($sim_float) +AC_MSG_CHECKING([for sim ppc hardware settings]) +hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" AC_ARG_ENABLE(sim-hardware, [AS_HELP_STRING([--enable-sim-hardware=list], [Specify the hardware to be included in the build.])], -[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" -case "${enableval}" in +[case "${enableval}" in yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; + no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware");; ,*) hardware="${hardware}${enableval}";; *,) hardware="${enableval}${hardware}";; *) hardware="${enableval}"'';; -esac +esac]) sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" -fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide,sem,shm" -sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` -sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" -fi])dnl - +AC_MSG_RESULT($hardware) +AC_MSG_CHECKING([for sim ppc icache settings]) AC_ARG_ENABLE(sim-icache, [AS_HELP_STRING([--enable-sim-icache=size], [Specify instruction-decode cache size and type.])], [icache="-R" @@ -127,69 +97,53 @@ AC_ARG_ENABLE(sim-icache, semantic) sim_icache="${sim_icache}C";; insn) sim_icache="${sim_icache}S";; 0*|1*|2*|3*|4*|5*|6*|7*|8*|9*) icache=$x;; - *) AC_MSG_ERROR("Unknown value $x for --enable-sim-icache"); sim_icache="";; + *) AC_MSG_ERROR("Unknown value $x for --enable-sim-icache");; esac done sim_icache="${sim_icache}I $icache";; -esac -if test x"$silent" != x"yes" && test x"$icache" != x""; then - echo "Setting instruction cache size to $icache ($sim_icache)" -fi],[sim_icache="-CSRI 1024" -if test x"$silent" != x"yes"; then - echo "Setting instruction cache size to 1024 ($sim_icache)" -fi])dnl - +esac], [sim_icache="-CSRI 1024"]) +AC_MSG_RESULT($sim_icache) +AC_MSG_CHECKING([for sim ppc jump settings]) AC_ARG_ENABLE(sim-jump, [AS_HELP_STRING([--enable-sim-jump], [Jump between semantic code (instead of call/return).])], [case "${enableval}" in yes) sim_jump="-J";; no) sim_jump="";; - *) AC_MSG_ERROR("--enable-sim-jump does not take a value"); sim_jump="";; -esac -if test x"$silent" != x"yes" && test x"$sim_jump" != x""; then - echo "Setting jump flag = $sim_jump" 6>&1 -fi],[sim_jump="" -if test x"$silent" != x"yes"; then - echo "Setting jump flag = $sim_jump" 6>&1 -fi])dnl - + *) AC_MSG_ERROR("--enable-sim-jump does not take a value");; +esac], [sim_jump=""]) +AC_MSG_RESULT($sim_jump) +AC_MSG_CHECKING([for sim ppc source debug line numbers]) AC_ARG_ENABLE(sim-line-nr, [AS_HELP_STRING([--enable-sim-line-nr=opts], [Generate extra CPP code that references source rather than generated code])], [case "${enableval}" in yes) sim_line_nr="";; no) sim_line_nr="-L";; - *) AC_MSG_ERROR("--enable-sim-line-nr does not take a value"); sim_line_nr="";; -esac -if test x"$silent" != x"yes" && test x"$sim_line_nr" != x""; then - echo "Setting warning flags = $sim_line_nr" 6>&1 -fi],[sim_line_nr=""])dnl - + *) AC_MSG_ERROR("--enable-sim-line-nr does not take a value");; +esac], [sim_line_nr=""]) +AC_MSG_RESULT($sim_line_nr) +AC_MSG_CHECKING([for sim ppc model]) AC_ARG_ENABLE(sim-model, [AS_HELP_STRING([--enable-sim-model=which], [Specify PowerPC to model.])], [case "${enableval}" in yes|no) AC_MSG_ERROR("No value supplied for --enable-sim-model=model");; *) sim_model="-DWITH_MODEL=${enableval}";; -esac -if test x"$silent" != x"yes" && test x"$sim_model" != x""; then - echo "Setting model flags = $sim_model" 6>&1 -fi],[sim_model=""])dnl - +esac], [sim_model=""]) +AC_MSG_RESULT($sim_model) +AC_MSG_CHECKING([for sim ppc model issue]) AC_ARG_ENABLE(sim-model-issue, [AS_HELP_STRING([--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_MSG_ERROR("--enable-sim-model-issue does not take a value");; +esac], [sim_model_issue=""]) +AC_MSG_RESULT($sim_model_issue) +AC_MSG_CHECKING([for sim ppc event monitoring]) AC_ARG_ENABLE(sim-monitor, [AS_HELP_STRING([--enable-sim-monitor=mon], [Specify whether to enable monitoring events.])], [case "${enableval}" in @@ -198,12 +152,10 @@ AC_ARG_ENABLE(sim-monitor, instruction) sim_monitor="-DWITH_MON=MONITOR_INSTRUCTION_ISSUE";; memory) sim_monitor="-DWITH_MON=MONITOR_LOAD_STORE_UNIT";; *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-mon");; -esac -if test x"$silent" != x"yes" && test x"$sim_monitor" != x""; then - echo "Setting monitor flags = $sim_monitor" 6>&1 -fi],[sim_monitor=""])dnl - +esac], [sim_monitor=""]) +AC_MSG_RESULT($sim_monitor) +AC_MSG_CHECKING([for sim ppc opcode lookup settings]) AC_ARG_ENABLE(sim-opcode, [AS_HELP_STRING([--enable-sim-opcode=which], [Override default opcode lookup.])], [case "${enableval}" in @@ -213,71 +165,50 @@ AC_ARG_ENABLE(sim-opcode, elif test -f "${srcdir}/dc-${enableval}"; then sim_opcode="dc-${enableval}" else - AC_MSG_ERROR("File $enableval is not an opcode rules file"); - sim_opcode="dc-complex" + AC_MSG_ERROR("File $enableval is not an opcode rules file") fi;; -esac -if test x"$silent" != x"yes" && test x"$sim_opcode" != x""; then - echo "Setting opcode flags = $sim_opcode" 6>&1 -fi],[sim_opcode="dc-complex" -if test x"$silent" != x"yes"; then - echo "Setting opcode flags = $sim_opcode" -fi])dnl - +esac], [sim_opcode="dc-complex"]) +AC_MSG_RESULT($sim_opcode) +AC_MSG_CHECKING([for sim ppc smp settings]) AC_ARG_ENABLE(sim-smp, [AS_HELP_STRING([--enable-sim-smp=n], [Specify number of processors to configure for.])], [case "${enableval}" in yes) sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5";; no) sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";; *) sim_smp="-DWITH_SMP=$enableval" ; sim_igen_smp="-N $enableval";; -esac -if test x"$silent" != x"yes" && test x"$sim_smp" != x""; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi],[sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5" -if test x"$silent" != x"yes"; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi])dnl - +esac], [sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5"]) +AC_MSG_RESULT($sim_smp) +AC_MSG_CHECKING([for sim ppc switch table settings]) AC_ARG_ENABLE(sim-switch, [AS_HELP_STRING([--enable-sim-switch], [Use a switch instead of a table for instruction call.])], [case "${enableval}" in yes) sim_switch="-DWITH_SPREG_SWITCH_TABLE";; no) sim_switch="";; - *) AC_MSG_ERROR("--enable-sim-switch does not take a value"); sim_switch="";; -esac -if test x"$silent" != x"yes" && test x"$sim_switch" != x""; then - echo "Setting switch flags = $sim_switch" 6>&1 -fi],[sim_switch=""; -if test x"$silent" != x"yes"; then - echo "Setting switch flags = $sim_switch" 6>&1 -fi])dnl - + *) AC_MSG_ERROR("--enable-sim-switch does not take a value");; +esac], [sim_switch=""]) +AC_MSG_RESULT($sim_switch) +AC_MSG_CHECKING([for sim ppc timebase]) AC_ARG_ENABLE(sim-timebase, [AS_HELP_STRING([--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";; - *) AC_MSG_ERROR("--enable-sim-timebase does not take a value"); sim_timebase="";; -esac -if test x"$silent" != x"yes" && test x"$sim_timebase" != x""; then - echo "Setting timebase flags = $sim_timebase" 6>&1 -fi],[sim_timebase=""])dnl - + *) AC_MSG_ERROR("--enable-sim-timebase does not take a value");; +esac], [sim_timebase=""]) +AC_MSG_RESULT($sim_timebase) +AC_MSG_CHECKING([for sim ppc xor endian settings]) AC_ARG_ENABLE(sim-xor-endian, [AS_HELP_STRING([--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 -if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then - echo "Setting xor-endian flag = $sim_xor_endian" 6>&1 -fi],[sim_xor_endian=""])dnl - +esac], [sim_xor_endian=""]) +AC_MSG_RESULT($sim_xor_endian) AC_SUBST(sim_line_nr) AC_SUBST(sim_opcode) -- cgit v1.1