From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 178733858C36 for ; Sun, 25 Dec 2022 07:14:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 178733858C36 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 97C3A340F90; Sun, 25 Dec 2022 07:14:41 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/9] sim: mn10300: fix SMP compile Date: Sun, 25 Dec 2022 02:14:27 -0500 Message-Id: <20221225071434.30014-2-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225071434.30014-1-vapier@gentoo.org> References: <20221225071434.30014-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The igen tool sets up the SD define for code fragments to use, but mn10300 was expecting "sd". Change all the igen related code to use SD so it actually compiles. --- sim/mn10300/am33.igen | 8 ++++---- sim/mn10300/mn10300-sim.h | 4 ++-- sim/mn10300/mn10300.igen | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sim/mn10300/am33.igen b/sim/mn10300/am33.igen index 964f07521a8c..da8f88fa599f 100644 --- a/sim/mn10300/am33.igen +++ b/sim/mn10300/am33.igen @@ -256,8 +256,8 @@ usp += 4; } - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x1) @@ -307,8 +307,8 @@ PC = cia; mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x4) diff --git a/sim/mn10300/mn10300-sim.h b/sim/mn10300/mn10300-sim.h index f6e4d854a144..3eadc0fe1780 100644 --- a/sim/mn10300/mn10300-sim.h +++ b/sim/mn10300/mn10300-sim.h @@ -182,10 +182,10 @@ dw2u64 (dword data) /* Bring data in from the cold */ #define IMEM8(EA) \ -(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA))) +(sim_core_read_aligned_1(STATE_CPU (SD, 0), EA, exec_map, (EA))) #define IMEM8_IMMED(EA, N) \ -(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA) + (N))) +(sim_core_read_aligned_1(STATE_CPU (SD, 0), EA, exec_map, (EA) + (N))) /* Function declarations. */ diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen index 6330d6f0090a..42c0ead205d2 100644 --- a/sim/mn10300/mn10300.igen +++ b/sim/mn10300/mn10300.igen @@ -4024,8 +4024,8 @@ sp += 4; } - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x1) @@ -4080,8 +4080,8 @@ PC = cia; mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x4) @@ -4183,8 +4183,8 @@ mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x4) @@ -4293,8 +4293,8 @@ mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { if (mask & 0x4) @@ -4401,8 +4401,8 @@ offset = -4; mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { @@ -4507,8 +4507,8 @@ offset = -4; mask = REGS; - if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33 - || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2 + if (STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33 + || STATE_ARCHITECTURE (SD)->mach == bfd_mach_am33_2 ) { -- 2.39.0