[PATCH 0/5] Various build fixes for sims

[PATCH 0/5] Various build fixes for sims

[John Baldwin]

These are a few build fixes I ran into while trying to build gdb
master on FreeBSD 14 with clang 11.  Some of these are unique to my
build environment, e.g. patch 1 is because I have an older version of
binutils installed in the same path (/usr/local) as the SDL libraries
needed by bfin, patch 2 is because clang 11 treats this as an error
even without -Werror, patch 3 is because I use tcsh as my login shell.
Patch 5 is probably due to FreeBSD not having readline in
/usr/include.  I've no idea why the breakage patch 4 addresses doesn't
break everywhere.  In that case, igen wasn't generating any output
files at all.

For patch 1, while this is a "minimal" fix, I'm not sure if it is the
best fix (e.g. would it be better to move all of CONFIG_CFLAGS after
CSEARCH instead?)

John Baldwin (5):
  sim: Add SIM_EXTRA_CFLAGS after CSEARCH.
  sim frv: Add a missing return value for frvbf_check_acc_range.
  sim lm32: Use a known-good shell with genmloop.sh.
  sim mn10300: Fix igen generation.
  sim erc32: Add include path for readline.

 sim/common/ChangeLog      | 6 ++++++
 sim/common/Make-common.in | 7 +++----
 sim/erc32/ChangeLog       | 7 +++++++
 sim/erc32/Makefile.in     | 6 +++++-
 sim/erc32/configure       | 8 ++++++--
 sim/erc32/configure.ac    | 3 +++
 sim/frv/ChangeLog         | 4 ++++
 sim/frv/traps.c           | 2 +-
 sim/lm32/ChangeLog        | 4 ++++
 sim/lm32/Makefile.in      | 2 +-
 sim/mn10300/ChangeLog     | 5 +++++
 sim/mn10300/Makefile.in   | 5 +++--
 sim/mn10300/mn10300.igen  | 1 +
 13 files changed, 49 insertions(+), 11 deletions(-)

-- 
2.30.1

[PATCH 1/5] sim: Add SIM_EXTRA_CFLAGS after CSEARCH.

[John Baldwin]

The bfin sim adds include paths for the SDL libraries.  These include
paths might include headers for different version of binutils.  Move
SIM_EXTRA_CFLAGS after CSEARCH to ensure local includes are always
preferred to external includes.

sim/common/ChangeLog:

	* Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS.
	(ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after
	CSEARCH.
---
 sim/common/ChangeLog      | 6 ++++++
 sim/common/Make-common.in | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index dd4391e36d9..d11e5e049a9 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-14  John Baldwin  <jhb@FreeBSD.org>
+
+	* Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS.
+	(ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after
+	CSEARCH.
+
 2021-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-cpu.c (sim_cpu_alloc_all): Delete 3rd arg.  Delete 2nd arg to
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 28f50abb220..709882469e4 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -227,17 +227,16 @@ CONFIG_CFLAGS = \
 	$(SIM_SCACHE) \
 	$(SIM_WARN_CFLAGS) \
 	$(SIM_WERROR_CFLAGS) \
-	$(SIM_HARDWARE) \
-	$(SIM_EXTRA_CFLAGS)
+	$(SIM_HARDWARE)
 CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
   -I../../include -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
   -I../../opcodes -I$(srcroot)/opcodes \
   @INCINTL@
-ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS)
+ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
 BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH)
 
-COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH)
+COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS)
 
 ZLIB = @zlibdir@ -lz
 LIBIBERTY_LIB = ../../libiberty/libiberty.a
-- 
2.30.1

Re: [PATCH 1/5] sim: Add SIM_EXTRA_CFLAGS after CSEARCH.

[Mike Frysinger]

On 14 Apr 2021 16:02, John Baldwin wrote:
> The bfin sim adds include paths for the SDL libraries.  These include
> paths might include headers for different version of binutils.  Move
> SIM_EXTRA_CFLAGS after CSEARCH to ensure local includes are always
> preferred to external includes.

lgtm, thanks
-mike

[PATCH 2/5] sim frv: Add a missing return value for frvbf_check_acc_range.

[John Baldwin]

Claim that the accumulator indices are out of range without raising an
exception if the CPU doesn't support media instructions.

sim/frv/ChangeLog:

	* traps.c (frvbf_check_acc_range): Add missing return value.
---
 sim/frv/ChangeLog | 4 ++++
 sim/frv/traps.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 1ec05977f69..81f5621250a 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-14  John Baldwin  <jhb@FreeBSD.org>
+
+	* traps.c (frvbf_check_acc_range): Add missing return value.
+
 2021-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
diff --git a/sim/frv/traps.c b/sim/frv/traps.c
index c0ed9b1c49f..5e6a4d06ef4 100644
--- a/sim/frv/traps.c
+++ b/sim/frv/traps.c
@@ -742,7 +742,7 @@ frvbf_check_acc_range (SIM_CPU *current_cpu, SI regno)
   /* Only applicable to fr550 */
   SIM_DESC sd = CPU_STATE (current_cpu);
   if (STATE_ARCHITECTURE (sd)->mach != bfd_mach_fr550)
-    return;
+    return 0;
 
   /* On the fr550, media insns in slots 0 and 2 can only access
      accumulators acc0-acc3. Insns in slots 1 and 3 can only access
-- 
2.30.1

Re: [PATCH 2/5] sim frv: Add a missing return value for frvbf_check_acc_range.

[Mike Frysinger]

On 14 Apr 2021 16:02, John Baldwin wrote:
> Claim that the accumulator indices are out of range without raising an
> exception if the CPU doesn't support media instructions.

lgtm, thanks
-mike

Re: [PATCH 2/5] sim frv: Add a missing return value for frvbf_check_acc_range.

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 913 bytes --]

On 14 Apr 2021 16:02, John Baldwin wrote:
> Claim that the accumulator indices are out of range without raising an
> exception if the CPU doesn't support media instructions.

this breaks a large chunk of the tests.  did you run `make check` before &
after your change ?

# --target=frv-elf
$ git checkout -f f00b50d057298ac581cb222c0ab4b5e21d134464
$ make all-sim
$ make check-sim
# of expected passes            3440
# of unexpected failures        155
# of expected failures          3
# of unsupported tests          14

$ git checkout -f f00b50d057298ac581cb222c0ab4b5e21d134464^
$ make all-sim
$ make check-sim
# of expected passes            3595
# of expected failures          3
# of unsupported tests          14

i'm by no means an FR-V expert, but the testsuite should pass cleanly.
i think more failures have been slipping in because the suite is broken
currently, so they get ignored entirely.
-mike

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 3/5] sim lm32: Use a known-good shell with genmloop.sh.

[John Baldwin]

Explicitly use a known-good shell found by autoconf for executing
additional scripts in genmloop.sh rather than the building user's
shell.

sim/lm32/ChangeLog:

	* Makefile.in: Pass -shell to genmloop.sh.
---
 sim/lm32/ChangeLog   | 4 ++++
 sim/lm32/Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 32766f07950..3c008abe9c8 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-14  John Baldwin  <jhb@FreeBSD.org>
+
+	* Makefile.in: Pass -shell to genmloop.sh.
+
 2021-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 6a71aceb45b..633ffec8fd8 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -43,7 +43,7 @@ lm32.o: lm32.c $(LM32BF_INCLUDE_DEPS)
 # FIXME: Use of `mono' is wip.
 mloop.c eng.h: stamp-mloop
 stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
-	$(SHELL) $(srccom)/genmloop.sh \
+	$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \
 		-mono -fast -pbb -switch sem-switch.c \
 		-cpu lm32bf -infile $(srcdir)/mloop.in
 	$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
-- 
2.30.1

Re: [PATCH 3/5] sim lm32: Use a known-good shell with genmloop.sh.

[Mike Frysinger]

On 14 Apr 2021 16:02, John Baldwin wrote:
> Explicitly use a known-good shell found by autoconf for executing
> additional scripts in genmloop.sh rather than the building user's
> shell.

lgtm, thanks
-mike

[PATCH 4/5] sim mn10300: Fix igen generation.

[John Baldwin]

Only pass the top-level instruction decode table (mn10300.igen) to
igen via -i.  The additional files passed previously caused igen to
exit its getopt loop in main and exit silently without generating any
output.  In addition, when am33-2.igen was added, it was not included
from mn10300.igen, so was never used.

sim/mn10300/ChangeLog:

	* Makefile.in: (tmp-igen) Only pass mn10300.igen to igen.
	* mn10300.igen: Include am33-2.igen.
---
 sim/mn10300/ChangeLog    | 5 +++++
 sim/mn10300/Makefile.in  | 5 +++--
 sim/mn10300/mn10300.igen | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 5638b8621ef..ad1eb66df0b 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-14  John Baldwin  <jhb@FreeBSD.org>
+
+	* Makefile.in: (tmp-igen) Only pass mn10300.igen to igen.
+	* mn10300.igen: Include am33-2.igen.
+
 2021-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 773b7f9a0c5..120958fce6d 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -66,9 +66,10 @@ clean-igen:
 	rm -f tmp-igen tmp-insns
 
 IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
-IGEN_INSN=$(srcdir)/mn10300.igen $(srcdir)/am33.igen $(srcdir)/am33-2.igen
+IGEN_INSN=$(srcdir)/mn10300.igen
+IGEN_INSN_INC=$(srcdir)/am33.igen $(srcdir)/am33-2.igen
 IGEN_DC=$(srcdir)/mn10300.dc
-tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
+tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) ../igen/igen
 	$(IGEN) \
 		$(IGEN_TRACE) \
 		-G gen-direct-access \
diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen
index c7b83ed141f..80a394309c9 100644
--- a/sim/mn10300/mn10300.igen
+++ b/sim/mn10300/mn10300.igen
@@ -4590,4 +4590,5 @@
 
 
 :include::am33:am33.igen
+:include::am33-2:am33-2.igen
 
-- 
2.30.1

Re: [PATCH 4/5] sim mn10300: Fix igen generation.

[Mike Frysinger]

On 14 Apr 2021 16:02, John Baldwin wrote:
> Only pass the top-level instruction decode table (mn10300.igen) to
> igen via -i.  The additional files passed previously caused igen to
> exit its getopt loop in main and exit silently without generating any
> output.  In addition, when am33-2.igen was added, it was not included
> from mn10300.igen, so was never used.

lgtm, thanks
-mike

[PATCH 5/5] sim erc32: Add include path for readline.

[John Baldwin]

Add a READLINE_CFLAGS variable which adds the include path to the
in-tree readline when using the in-tree readline library.

sim/erc32/ChangeLog:

	* Makefile.in (READLINE_SRC, READLINE_CFLAGS): Add.
	(SIM_EXTRA_CFLAGS): Add READLINE_CFLAGS.
	* configure: Rebuild.
	* configure.ac (READLINE_CFLAGS): Add.
---
 sim/erc32/ChangeLog    | 7 +++++++
 sim/erc32/Makefile.in  | 6 +++++-
 sim/erc32/configure    | 8 ++++++--
 sim/erc32/configure.ac | 3 +++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 3b85c66beeb..223c29c7bc9 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-14  John Baldwin  <jhb@FreeBSD.org>
+
+	* Makefile.in (READLINE_SRC, READLINE_CFLAGS): Add.
+	(SIM_EXTRA_CFLAGS): Add READLINE_CFLAGS.
+	* configure: Rebuild.
+	* configure.ac (READLINE_CFLAGS): Add.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
 	* func.c: Include sys/time.h.
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 0006922904b..be20fb01fb4 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -19,10 +19,14 @@
 ## COMMON_PRE_CONFIG_FRAG
 
 TERMCAP_LIB = @TERMCAP@
+
+READLINE_SRC = $(srcroot)/readline/readline
 READLINE_LIB = @READLINE@
+READLINE_CFLAGS= @READLINE_CFLAGS@
 
 SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
 SIM_RUN_OBJS = sis.o
+SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS)
 SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
 SIM_EXTRA_INSTALL = install-sis
 SIM_EXTRA_CLEAN = clean-sis
@@ -30,7 +34,7 @@ SIM_EXTRA_CLEAN = clean-sis
 # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
 # CFLAGS if faster (infinite) UART speed is desired. Might affect the
 # behaviour of UART interrupt routines ...
-SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot)
+SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot)
 
 ## COMMON_POST_CONFIG_FRAG
 
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 3f7227b2e7e..548b11cf4ed 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -642,6 +642,7 @@ sim_endian
 sim_bitsize
 sim_alignment
 cgen_breaks
+READLINE_CFLAGS
 READLINE
 TERMCAP
 REPORT_BUGS_TEXI
@@ -11227,7 +11228,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11333,7 +11334,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 11337 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12071,6 +12072,7 @@ fi
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
   READLINE=../../readline/readline/libreadline.a
+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }
@@ -12114,9 +12116,11 @@ else
   as_fn_error $? "the required \"readline\" library is missing" "$LINENO" 5
 fi
 
+  READLINE_CFLAGS=
 fi
 
 
+
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 8b7b688322f..cf7ec5fdb80 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -39,9 +39,12 @@ AC_SUBST(TERMCAP)
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
   READLINE=../../readline/readline/libreadline.a
+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
 else
   AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
 	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
+  READLINE_CFLAGS=
 fi
 AC_SUBST(READLINE)
+AC_SUBST(READLINE_CFLAGS)
 SIM_AC_OUTPUT
-- 
2.30.1

Re: [PATCH 5/5] sim erc32: Add include path for readline.

[Mike Frysinger]

On 14 Apr 2021 16:02, John Baldwin wrote:
> --- a/sim/erc32/Makefile.in
> +++ b/sim/erc32/Makefile.in
>  
> +READLINE_CFLAGS= @READLINE_CFLAGS@

space before the =

lgtm otherwise
-mike