+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * README-HACKING: Change SIM_AC_OPTION_HARDWARE to
+ SIM_EXTRA_HW_DEVICES.
+ * m4/sim_ac_option_hardware.m4: Remove first argument, and change
+ configure option to a boolean. Delete device list.
+ * m4/sim_ac_output.m4: Delete sim_hw variables.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* README-HACKING (SIM_AC_COMMON): Delete mention.
================
The simplest simulator doesn't include hardware device support. Once you're
-ready to move on to the next level, call the common macro in your configure.ac:
-SIM_AC_OPTION_HARDWARE(devone devtwo devthree)
+ready to move on to the next level, declare in your Makefile.in:
+SIM_EXTRA_HW_DEVICES = devone devtwo devthree
The basic hardware API is documented in common/hw-device.h.
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
machs.o \
sim-resume.o
+SIM_EXTRA_HW_DEVICES = \
+ bfin_cec \
+ bfin_ctimer \
+ bfin_dma \
+ bfin_dmac \
+ bfin_ebiu_amc \
+ bfin_ebiu_ddrc \
+ bfin_ebiu_sdc \
+ bfin_emac \
+ bfin_eppi \
+ bfin_evt \
+ bfin_gpio \
+ bfin_gpio2 \
+ bfin_gptimer \
+ bfin_jtag \
+ bfin_mmu \
+ bfin_nfc \
+ bfin_otp \
+ bfin_pfmon \
+ bfin_pint \
+ bfin_pll \
+ bfin_ppi \
+ bfin_rtc \
+ bfin_sic \
+ bfin_spi \
+ bfin_trace \
+ bfin_twi \
+ bfin_uart \
+ bfin_uart2 \
+ bfin_wdog \
+ bfin_wp \
+ eth_phy
+
SIM_EXTRA_CFLAGS = @SDL_CFLAGS@
SIM_EXTRA_LIBS = @SDL_LIBS@ -lm
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
OBJEXT
EXEEXT
ac_ct_CC
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Some influential environment variables:
PKG_CONFIG path to pkg-config utility
-hardware="cfi core pal glue \
- bfin_cec \
- bfin_ctimer \
- bfin_dma \
- bfin_dmac \
- bfin_ebiu_amc \
- bfin_ebiu_ddrc \
- bfin_ebiu_sdc \
- bfin_emac \
- bfin_eppi \
- bfin_evt \
- bfin_gpio \
- bfin_gpio2 \
- bfin_gptimer \
- bfin_jtag \
- bfin_mmu \
- bfin_nfc \
- bfin_otp \
- bfin_pfmon \
- bfin_pint \
- bfin_pll \
- bfin_ppi \
- bfin_rtc \
- bfin_sic \
- bfin_spi \
- bfin_trace \
- bfin_twi \
- bfin_uart \
- bfin_uart2 \
- bfin_wdog \
- bfin_wp \
- eth_phy \
-"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
-# Check whether --enable-sim-hardware was given.
-if test "${enable_sim_hardware+set}" = set; then :
- enableval=$enable_sim_hardware;
-else
- enable_sim_hardware="yes"
-fi
-
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
-if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
- sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
- sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
- # mingw does not support sockser
- case ${host} in
- *mingw*) ;;
- *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
- # that you instatiate. Instead, other code will call into it directly.
- # At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
- sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
- ;;
- esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
-fi
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
+# Check whether --enable-sim-hardware was given.
+if test "${enable_sim_hardware+set}" = set; then :
+ enableval=$enable_sim_hardware;
+else
+ enable_sim_hardware="yes"
+fi
+
+sim_hw_sockser=
+if test "$enable_sim_hardware" = no; then
+ sim_hw_cflags="-DWITH_HW=0"
+elif test "$enable_sim_hardware" = yes; then
+ sim_hw_cflags="-DWITH_HW=1"
+ # mingw does not support sockser
+ case ${host} in
+ *mingw*) ;;
+ *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
+ # that you instatiate. Instead, other code will call into it directly.
+ # At some point, we should convert it over.
+ sim_hw_sockser="dv-sockser.o"
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
+ ;;
+ esac
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_OPTION_DEFAULT_MODEL(bf537)
-SIM_AC_OPTION_HARDWARE(\
- bfin_cec \
- bfin_ctimer \
- bfin_dma \
- bfin_dmac \
- bfin_ebiu_amc \
- bfin_ebiu_ddrc \
- bfin_ebiu_sdc \
- bfin_emac \
- bfin_eppi \
- bfin_evt \
- bfin_gpio \
- bfin_gpio2 \
- bfin_gptimer \
- bfin_jtag \
- bfin_mmu \
- bfin_nfc \
- bfin_otp \
- bfin_pfmon \
- bfin_pint \
- bfin_pll \
- bfin_ppi \
- bfin_rtc \
- bfin_sic \
- bfin_spi \
- bfin_trace \
- bfin_twi \
- bfin_uart \
- bfin_uart2 \
- bfin_wdog \
- bfin_wp \
- eth_phy \
-)
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(SDL, sdl, [
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_reserved_bits
sim_float
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model
sim_bitsize'
ac_subst_files=''
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Make-common.in (SIM_HW): Delete.
+ (SIM_HW_OBJS): Redefine.
+ (SIM_HW_SOCKSER, SIM_HW_DEVICES): Define.
+ (stamp-hw): Change SIM_HW to SIM_HW_DEVICES.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (CGENDIR): Delete.
SIM_DEFAULT_MODEL = @sim_default_model@
SIM_FLOAT = @sim_float@
SIM_HW_CFLAGS = @sim_hw_cflags@
-SIM_HW_OBJS = @sim_hw_objs@
-SIM_HW = @sim_hw@
+SIM_HW_SOCKSER = @sim_hw_sockser@
SIM_RESERVED_BITS = @sim_reserved_bits@
SIM_SCACHE = @sim_scache@
SIM_WARN_CFLAGS = $(WARN_CFLAGS)
COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS)
+SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES)
+SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER)
+@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS =
+
ZLIB = $(zlibdir) -lz
LIBIBERTY_LIB = ../../libiberty/libiberty.a
BFD_LIB = ../../bfd/libbfd.a
stamp-hw: Makefile.in $(srccom)/Make-common.in config.status Makefile
rm -f tmp-hw.h
echo "/* generated by Makefile */" > tmp-hw.h
- sim_hw="$(SIM_HW)"; \
+ sim_hw="$(SIM_HW_DEVICES)"; \
for hw in $$sim_hw ; do \
echo "extern const struct hw_descriptor dv_$${hw}_descriptor[];" ; \
done >> tmp-hw.h
echo "const struct hw_descriptor *hw_descriptors[] = {" >> tmp-hw.h
- sim_hw="$(SIM_HW)"; \
+ sim_hw="$(SIM_HW_DEVICES)"; \
for hw in $$sim_hw ; do \
echo " dv_$${hw}_descriptor," ; \
done >> tmp-hw.h
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* traps.c (dump_statistics): Clean up sim_io_eprintf calls, and
$(CRISV32F_OBJS) \
traps.o
+SIM_EXTRA_HW_DEVICES = rv cris cris_900000xx
+
# Extra headers included by sim-main.h.
# FIXME: $(srccom)/cgen-ops.h should be in CGEN_INCLUDE_DEPS.
SIM_EXTRA_DEPS = \
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_sim_scache
-enable_sim_hardware
enable_sim_default_model
+enable_sim_hardware
'
ac_precious_vars='build_alias
host_alias
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-sim-scache=size
Specify simulator execution cache size
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
--enable-sim-default-model=model
Specify default model to simulate
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-hardware="cfi core pal glue rv cris cris_900000xx"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
+# The default model shouldn't matter as long as there's a BFD.
+
+default_sim_default_model="crisv32"
+# 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 $? "\"Missing argument to --enable-sim-default-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 = $sim_default_model" 6>&1
+fi
+else
+ sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
-fi
-
-
-# The default model shouldn't matter as long as there's a BFD.
-
-default_sim_default_model="crisv32"
-# 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 $? "\"Missing argument to --enable-sim-default-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 = $sim_default_model" 6>&1
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
else
- sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_OPTION_SCACHE(16384)
-SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx)
# The default model shouldn't matter as long as there's a BFD.
SIM_AC_OPTION_DEFAULT_MODEL(crisv32)
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
READLINE_CFLAGS
READLINE
TERMCAP
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Some influential environment variables:
CC C compiler command
fi
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
sim_trapdump
target_alias
host_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
--enable-sim-default-model=model
Specify default model to simulate
--enable-sim-trapdump Make unknown traps dump the registers
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
fi
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
cpu.o decode.o sem.o model.o mloop.o \
lm32.o traps.o user.o
+SIM_EXTRA_HW_DEVICES = lm32cpu lm32timer lm32uart
+
# List of extra dependencies.
# Generally this consists of simulator specific files included by sim-main.h.
SIM_EXTRA_DEPS = $(CGEN_INCLUDE_DEPS) $(srcdir)/../../opcodes/lm32-desc.h \
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-hardware="cfi core pal glue lm32cpu lm32timer lm32uart"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
SIM_AC_OPTION_SCACHE(16384)
SIM_AC_OPTION_DEFAULT_MODEL(lm32)
-SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart)
SIM_AC_OUTPUT
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
$(M32R2_OBJS) \
$(TRAPS_OBJ)
+SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart
+
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \
$(CGEN_INCLUDE_DEPS) \
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
sim_extra_cflags
traps_obj
target_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue m32r_cache m32r_uart"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
AC_SUBST(traps_obj)
AC_SUBST(sim_extra_cflags)
-SIM_AC_OPTION_HARDWARE(m32r_cache m32r_uart)
-
SIM_AC_OUTPUT
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl
dnl --enable-sim-hardware is for users of the simulator
-dnl arg[1] is a space separated list of extra target specific devices.
AC_DEFUN([SIM_AC_OPTION_HARDWARE],
-[
-hardware="cfi core pal glue [$1]"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`"
-
+[dnl
+AC_MSG_CHECKING([for sim hardware settings])
AC_ARG_ENABLE(sim-hardware,
- [AS_HELP_STRING([--enable-sim-hardware=LIST],
- [Specify the hardware to be included in the build.])],
+ [AS_HELP_STRING([--enable-sim-hardware],
+ [Whether to enable hardware/device simulation])],
,[enable_sim_hardware="yes"])
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ AC_MSG_ERROR([unknown argument "$enable_sim_hardware"])
fi
-])
+dnl AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"])
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+AC_SUBST(SIM_ENABLE_HW_TRUE)
+AC_SUBST(SIM_ENABLE_HW_FALSE)
+AC_MSG_RESULT(${enable_sim_hardware})
AC_SUBST(sim_hw_cflags)
-AC_SUBST(sim_hw_objs)
-AC_SUBST(sim_hw)
+AC_SUBST(sim_hw_sockser)
+])
AC_SUBST(sim_float)
AC_SUBST(sim_scache)
AC_SUBST(sim_default_model)
-AC_SUBST(sim_hw_cflags)
-AC_SUBST(sim_hw_objs)
-AC_SUBST(sim_hw)
AC_SUBST(sim_reserved_bits)
AC_OUTPUT
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
$(SIM_NEW_COMMON_OBJS) \
sim-resume.o
+SIM_EXTRA_HW_DEVICES = m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram
+
SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1
# We must use 32-bit addresses to support memory bank switching.
# The WORD_BITSIZE is normally 16 but must be switched (temporarily)
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue \
- m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
AC_INIT(Makefile.in)
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
-dnl Options available in this module
-SIM_AC_OPTION_HARDWARE(\
- m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram)
-
SIM_AC_OUTPUT
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim-main.o \
sim-resume.o \
+SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio
# List of flags to always pass to $(CC).
SIM_SUBTARGET=@SIM_SUBTARGET@
sim_default_model
sim_scache
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
sim_multi_obj
sim_multi_src
sim_multi_igen_configs
PATH_SEPARATOR
SHELL
sim_reserved_bits
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_float
sim_bitsize'
ac_subst_files=''
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
--enable-sim-float Specify that the target processor has floating point
hardware
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-#
-# Add simulated hardware devices
-#
-
-hardware="cfi core pal glue tx3904cpu tx3904irc tx3904tmr tx3904sio"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
AC_SUBST(sim_multi_igen_configs)
AC_SUBST(sim_multi_src)
AC_SUBST(sim_multi_obj)
-#
-# Add simulated hardware devices
-#
-SIM_AC_OPTION_HARDWARE(tx3904cpu tx3904irc tx3904tmr tx3904sio)
SIM_AC_OUTPUT
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
SIM_OBJS = $(MN10300_OBJS) interp.o
+SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop
+
SIM_EXTRA_CLEAN = clean-igen
# Extra dependencies for "sim-main.h"
SIM_EXTRA_DEPS = mn10300_sim.h itable.h idecode.h
sim_scache
sim_float
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_reserved_bits
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_bitsize'
ac_subst_files=''
ac_user_opts='
Specify whether to check reserved bits in
instruction
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
fi
-hardware="cfi core pal glue mn103cpu mn103int mn103tim mn103ser mn103iop"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
SIM_AC_OPTION_RESERVED_BITS
SIM_AC_OPTION_BITSIZE(32,31)
-SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop)
SIM_AC_OUTPUT
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_reserved_bits
sim_float
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model
sim_bitsize'
ac_subst_files=''
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_scache
sim_float
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_default_model
sim_bitsize'
ac_subst_files=''
--enable-sim-default-model=model
Specify default model to simulate
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
fi
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* Makefile.in: Rename sim_cycle_accurate_flags to
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
sim_rx_cycle_accurate_flags
target_alias
host_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-sim-rx-cycle-accurate
Disable cycle accurate simulation (faster runtime)
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
fi
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_float
sim_bitsize
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL
-sim_hw
-sim_hw_objs
-sim_hw_cflags'
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
cgen_breaks=""
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_COMMON): Delete.
sim_scache
sim_float
cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
target_alias
host_alias
build_alias
PATH_SEPARATOR
SHELL
sim_reserved_bits
-sim_hw
-sim_hw_objs
-sim_hw_cflags
sim_bitsize'
ac_subst_files=''
ac_user_opts='
Specify whether to check reserved bits in
instruction
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
- --enable-sim-hardware=LIST
- Specify the hardware to be included in the build.
+ --enable-sim-hardware Whether to enable hardware/device simulation
Report bugs to the package provider.
_ACEOF
fi
-
-hardware="cfi core pal glue "
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
enable_sim_hardware="yes"
fi
-case ${enable_sim_hardware} in
- yes|no) ;;
- ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
- *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
- *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
- sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
- sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
- # remove duplicates
- sim_hw=""
- sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
- for i in $hardware ; do
- case " $sim_hw " in
- *" $i "*) ;;
- *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
- esac
- done
# mingw does not support sockser
case ${host} in
*mingw*) ;;
*) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
- sim_hw_objs="$sim_hw_objs dv-sockser.o"
+ sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
- if test x"$silent" != x"yes"; then
- echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
- fi
+else
+ as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+ SIM_ENABLE_HW_TRUE=
+ SIM_ENABLE_HW_FALSE='#'
+else
+ SIM_ENABLE_HW_TRUE='#'
+ SIM_ENABLE_HW_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
-
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
projects / thirdparty / binutils-gdb.git / commitdiff
