From f9a4d54332f9e1f75701ba43249a03cc631ec736 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Jun 2021 19:51:52 -0400 Subject: sim: overhaul & unify endian settings management The m4 macro has 2 args: the "wire" settings (which represents the hardwired port behavior), and the default settings (which are used if nothing else is specified). If none are specified, the arch is expected to support both, and the value will be probed based on the user runtime options or the input program. Only two arches today set the default value (bpf & mips). We can probably let this go as it only shows up in one scenario: the sim is invoked, but with no inputs, and no user endian selection. This means bpf will not behave like the other arches: an error is shown and forces the user to make a choice. If an input program is used though, we'll still switch the default to that. This allows us to remove the WITH_DEFAULT_TARGET_BYTE_ORDER setting. For the ports that set a "wire" endian, move it to the runtime init of the respective sim_open calls. This allows us to change the WITH_TARGET_BYTE_ORDER to purely a user-selected configure setting if they want to force a specific endianness. With all the endian logic moved to runtime selection, we can move the configure call up to the common dir so we only process it once across all ports. The ppc arch was picking the wire endian based on the target used, but since we weren't doing that for other biendian arches, we can let this go too. We'll rely on the input selecting the endian, or make the user decide. --- sim/mips/ChangeLog | 5 ++++ sim/mips/aclocal.m4 | 1 - sim/mips/configure | 74 ++------------------------------------------------- sim/mips/configure.ac | 19 ------------- 4 files changed, 7 insertions(+), 92 deletions(-) (limited to 'sim/mips') diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index c582abc..05d6461 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,8 @@ +2021-06-17 Mike Frysinger + + * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. + * aclocal.m4, configure: Regenerate. + 2021-06-16 Mike Frysinger * interp.c (dotrace): Make comment const. diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4 index b61eb2e..cd86d4d 100644 --- a/sim/mips/aclocal.m4 +++ b/sim/mips/aclocal.m4 @@ -111,7 +111,6 @@ m4_include([../../ltversion.m4]) m4_include([../../lt~obsolete.m4]) m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) -m4_include([../m4/sim_ac_option_endian.m4]) m4_include([../m4/sim_ac_option_float.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_inline.m4]) diff --git a/sim/mips/configure b/sim/mips/configure index d7fdbf3..55041fd 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -633,7 +633,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS sim_default_model sim_scache -sim_alignment cgen_breaks XMKMF sim_multi_obj @@ -764,7 +763,6 @@ sim_hw sim_hw_objs sim_hw_cflags sim_float -sim_endian sim_bitsize' ac_subst_files='' ac_user_opts=' @@ -783,7 +781,6 @@ enable_werror enable_build_warnings enable_sim_build_warnings enable_sim_reserved_bits -enable_sim_endian enable_sim_bitsize enable_sim_float enable_sim_hardware @@ -1439,8 +1436,6 @@ Optional Features: --enable-sim-reserved-bits Specify whether to check reserved bits in instruction - --enable-sim-endian=endian - Specify target byte endian orientation --enable-sim-bitsize=N Specify target bitsize (32 or 64) --enable-sim-float Specify that the target processor has floating point hardware @@ -10770,7 +10765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10773 "configure" +#line 10768 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10876,7 +10871,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10879 "configure" +#line 10874 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11305,69 +11300,6 @@ esac # -# Select the byte order of the target -# -mips_endian= -default_endian= -case "${target}" in - mips64el*-*-*) mips_endian=LITTLE ;; - mips64vr*el-*-*) default_endian=LITTLE ;; - mips64*-*-*) default_endian=BIG ;; - mips16*-*-*) default_endian=BIG ;; - mipsisa32*-*-*) default_endian=BIG ;; - mipsisa64*-*-*) default_endian=BIG ;; - mips*-*-*) default_endian=BIG ;; - *) default_endian=BIG ;; -esac - -wire_endian="$mips_endian" -default_endian="$default_endian" -# Check whether --enable-sim-endian was given. -if test "${enable_sim_endian+set}" = set; then : - enableval=$enable_sim_endian; case "${enableval}" in - b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_BIG";; - l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE";; - yes) if test x"$wire_endian" != x; then - sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}" - else - if test x"$default_endian" != x; then - sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}" - else - echo "No hard-wired endian for target $target" 1>&6 - sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN" - fi - fi;; - no) if test x"$default_endian" != x; then - sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}" - else - if test x"$wire_endian" != x; then - sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}" - else - echo "No default endian for target $target" 1>&6 - sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN" - fi - fi;; - *) as_fn_error $? "\"Unknown value $enableval for --enable-sim-endian\"" "$LINENO" 5; sim_endian="";; -esac -if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then - echo "Setting endian flags = $sim_endian" 6>&1 -fi -else - if test x"$default_endian" != x; then - sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}" -else - if test x"$wire_endian" != x; then - sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}" - else - sim_endian= - fi -fi -fi - - - - -# # Select the bitsize of the target # mips_addr_bitsize= @@ -12195,8 +12127,6 @@ ac_config_commands="$ac_config_commands stamp-h" - - 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 diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index f0b26b4..03d8f51 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -28,25 +28,6 @@ AC_SUBST(SIM_SUBTARGET) # -# Select the byte order of the target -# -mips_endian= -default_endian= -case "${target}" in - mips64el*-*-*) mips_endian=LITTLE ;; - mips64vr*el-*-*) default_endian=LITTLE ;; - mips64*-*-*) default_endian=BIG ;; - mips16*-*-*) default_endian=BIG ;; - mipsisa32*-*-*) default_endian=BIG ;; - mipsisa64*-*-*) default_endian=BIG ;; - mips*-*-*) default_endian=BIG ;; - *) default_endian=BIG ;; -esac -SIM_AC_OPTION_ENDIAN($mips_endian,$default_endian) - - - -# # Select the bitsize of the target # mips_addr_bitsize= -- cgit v1.1