From ba307cddcf7e42c5099632dcbad598d8f96044f4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 7 Jun 2021 00:54:20 -0400 Subject: sim: overhaul alignment settings management Currently, the sim-config module will abort if alignment settings haven't been specified by the port's configure.ac. This is a bit weird when we've allowed SIM_AC_OPTION_ALIGNMENT to seem like it's optional to use. Thus everyone invokes it. There are 4 alignment settings, but really only 2 matters: strict and nonstrict. The "mixed" setting is just the default ("unset"), and "forced" isn't used directly by anyone (it's available as a runtime option for some ports). 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, then the build won't work (see above as if SIM_AC_OPTION_ALIGNMENT wasn't called). If default settings are provided, then that is used, but we allow the user to override at runtime. Otherwise, the "wire" settings are used and user runtime options to change are ignored. Most ports specify a default, or set the "wire" to nonstrict. A few set "wire" to strict, but it's not clear that's necessary as it doesn't make the code behavior, by default, any different. It might make things a little faster, but we should provide the user the choice of the compromises to make: force a specific mode at compile time for faster runtime, or allow the choice at runtime. More likely it seems like an oversight when these ports were initially created, and/or copied & pasted from existing ports. With all that backstory, let's get to what this commit does. First kill off the idea of a compile-time default alignment and set it to nonstrict in the common code. For any ports that want strict alignment by default, that code is moved to sim_open while initializing the sim. That means WITH_DEFAULT_ALIGNMENT can be completely removed. Moving the default alignment to the runtime also allows removal of setting the "wire" settings at configure time. Which allows removing of all arguments to SIM_AC_OPTION_ALIGNMENT and moving that call to common code. The macro logic can be reworked to not pass WITH_ALIGNMENT as -D CPPFLAG and instead move it to config.h. All of these taken together mean we can hoist the macro up to the top level and share it among all sims so behavior is consistent among all the ports. --- sim/frv/ChangeLog | 5 +++++ sim/frv/aclocal.m4 | 1 - sim/frv/configure | 58 ++++------------------------------------------------ sim/frv/configure.ac | 1 - sim/frv/sim-if.c | 3 +++ 5 files changed, 12 insertions(+), 56 deletions(-) (limited to 'sim/frv') diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 6fc7d02..c231ad1 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,10 @@ 2021-06-12 Mike Frysinger + * configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT. + * sim-if.c (sim_open): Set current_alignment. + +2021-06-12 Mike Frysinger + * aclocal.m4, config.in, configure: Regenerate. 2021-06-12 Mike Frysinger diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index 948b368..4fb0bd7 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -110,7 +110,6 @@ m4_include([../../ltsugar.m4]) m4_include([../../ltversion.m4]) m4_include([../../lt~obsolete.m4]) m4_include([../m4/sim_ac_common.m4]) -m4_include([../m4/sim_ac_option_alignment.m4]) m4_include([../m4/sim_ac_option_cgen_maint.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_endian.m4]) diff --git a/sim/frv/configure b/sim/frv/configure index bc3aa9c..346e0bd 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -634,6 +634,7 @@ LIBOBJS sim_reserved_bits sim_float sim_bitsize +sim_alignment cgen_breaks sim_trapdump cgen @@ -757,8 +758,7 @@ sim_hw sim_hw_objs sim_hw_cflags sim_endian -sim_default_model -sim_alignment' +sim_default_model' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -773,7 +773,6 @@ enable_libtool_lock enable_maintainer_mode enable_sim_inline enable_sim_endian -enable_sim_alignment enable_sim_scache enable_sim_default_model enable_werror @@ -1422,9 +1421,6 @@ Optional Features: Specify which functions should be inlined --enable-sim-endian=endian Specify target byte endian orientation - --enable-sim-alignment=align - Specify strict, nonstrict or forced alignment of - memory accesses --enable-sim-scache=size Specify simulator execution cache size --enable-sim-default-model=model @@ -10762,7 +10758,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10765 "configure" +#line 10761 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10868,7 +10864,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10871 "configure" +#line 10867 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11210,52 +11206,6 @@ else fi fi -wire_alignment="STRICT_ALIGNMENT" -default_alignment="" - -# Check whether --enable-sim-alignment was given. -if test "${enable_sim_alignment+set}" = set; then : - enableval=$enable_sim_alignment; case "${enableval}" in - strict | STRICT) sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";; - nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";; - forced | FORCED) sim_alignment="-DWITH_ALIGNMENT=FORCED_ALIGNMENT";; - yes) if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}" - else - if test x"$default_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${default_alignment}" - else - echo "No hard-wired alignment for target $target" 1>&6 - sim_alignment="-DWITH_ALIGNMENT=0" - fi - fi;; - no) if test x"$default_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}" - else - if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${wire_alignment}" - else - echo "No default alignment for target $target" 1>&6 - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=0" - fi - fi;; - *) as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-alignment\"" "$LINENO" 5; sim_alignment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then - echo "Setting alignment flags = $sim_alignment" 6>&1 -fi -else - if test x"$default_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}" -else - if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}" - else - sim_alignment= - fi -fi -fi - default_sim_scache="16384" # Check whether --enable-sim-scache was given. diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index e5bbdbf..fcc2e88 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -5,7 +5,6 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(BIG) -SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(fr500) SIM_AC_OPTION_WARNINGS(no) diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c index 8ac9665..0ad5f62 100644 --- a/sim/frv/sim-if.c +++ b/sim/frv/sim-if.c @@ -54,6 +54,9 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, bfd *abfd, unsigned long elf_flags = 0; SIM_DESC sd = sim_state_alloc (kind, callback); + /* Set default options before parsing user options. */ + current_alignment = STRICT_ALIGNMENT; + /* The cpu data is kept in a separately allocated chunk of memory. */ if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK) { -- cgit v1.1