From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 11692385842A; Tue, 10 Jan 2023 06:27:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11692385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332029; bh=V9EPGSyizGHbwi3hDNOINY593pN8xjousRe9EF52GWQ=; h=From:To:Subject:Date:From; b=vSAQt74Rec22Lp12oRtV1Qca94NyVKrPTfypKiHeEvxexcrakx/1h8bzLn+MaOn3s pDMMj7iHP1s5b+/qV0ENQ7LMmDiUybwWm+W5RIIwV+ucJJDyNNAmdtvCw84lGIcoS1 jxdi3NlCH1fvp/jzyhlmXNv7UVPpp0H1CKdd3sk0= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: m68hc11: move arch-specific file compilation to top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 9b5a17d2be51a9d84df4934bf1262441cd1a2ca1 X-Git-Newrev: 5a71cd470ffe6e3f818ed1fba7ce8c3faaae7709 Message-Id: <20230110062709.11692385842A@sourceware.org> Date: Tue, 10 Jan 2023 06:27:09 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5a71cd470ffe= 6e3f818ed1fba7ce8c3faaae7709 commit 5a71cd470ffe6e3f818ed1fba7ce8c3faaae7709 Author: Mike Frysinger Date: Sun Jan 1 14:15:00 2023 -0500 sim: m68hc11: move arch-specific file compilation to top-level =20 The arch-specific compiler flags are duplicated, but they'll be cleaned up once we move all subdir compiles to the top-level. Diff: --- sim/Makefile.in | 9 ++++++--- sim/m68hc11/local.mk | 14 +++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 61ee0abd011..0b9dfeb6b22 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2522,6 +2522,12 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/mloop2.c \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/stamp-mloop-2 =20 +@SIM_ENABLE_ARCH_m68hc11_TRUE@AM_CPPFLAGS_m68hc11 =3D \ +@SIM_ENABLE_ARCH_m68hc11_TRUE@ -DWITH_TARGET_WORD_BITSIZE=3D32 \ +@SIM_ENABLE_ARCH_m68hc11_TRUE@ -DWITH_TARGET_CELL_BITSIZE=3D32 \ +@SIM_ENABLE_ARCH_m68hc11_TRUE@ -DWITH_TARGET_ADDRESS_BITSIZE=3D32 \ +@SIM_ENABLE_ARCH_m68hc11_TRUE@ -DWITH_TARGET_WORD_MSB=3D31 + @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5056,9 +5062,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_m32r_TRUE@m32r/cpu2.h m32r/sem2-switch.c m32r/model2.c m3= 2r/decode2.c m32r/decode2.h: @CGEN_MAINT@ m32r/cgen-cpu-decode-2 @SIM_ENABLE_ARCH_m68hc11_TRUE@$(m68hc11_libsim_a_OBJECTS) $(m68hc11_libsim= _a_LIBADD): m68hc11/hw-config.h =20 -@SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/%.o: m68hc11/%.c -@SIM_ENABLE_ARCH_m68hc11_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) = $(@F) - @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/%.o: common/%.c @SIM_ENABLE_ARCH_m68hc11_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) = $(@F) @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/modules.c: | $(m68hc11_BUILD_OUTPUTS) diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk index 9b52df6b533..79350c8fc27 100644 --- a/sim/m68hc11/local.mk +++ b/sim/m68hc11/local.mk @@ -16,6 +16,17 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . =20 +## We must use 32-bit addresses to support memory bank switching. +## The WORD_BITSIZE is normally 16 but must be switched (temporarily) +## to 32 to avoid a bug in the sim-common which uses 'unsigned_word' +## instead of 'address_word' in some places (the result is a truncation +## of the 32-bit address to 16-bit; and this breaks the simulator). +AM_CPPFLAGS_%C% =3D \ + -DWITH_TARGET_WORD_BITSIZE=3D32 \ + -DWITH_TARGET_CELL_BITSIZE=3D32 \ + -DWITH_TARGET_ADDRESS_BITSIZE=3D32 \ + -DWITH_TARGET_WORD_MSB=3D31 + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -34,9 +45,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-co= nfig.h =20 noinst_LIBRARIES +=3D %D%/libsim.a =20 -%D%/%.o: %D%/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - %D%/%.o: common/%.c $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)