From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/9] sim: mn10300: fix SMP compile
Date: Sun, 25 Dec 2022 02:14:27 -0500 [thread overview]
Message-ID: <20221225071434.30014-2-vapier@gentoo.org> (raw)
In-Reply-To: <20221225071434.30014-1-vapier@gentoo.org>
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
next prev parent reply other threads:[~2022-12-25 7:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-25 7:14 [PATCH 1/9] sim: cpu: fix SMP msg prefix helper Mike Frysinger
2022-12-25 7:14 ` Mike Frysinger [this message]
2022-12-25 7:14 ` [PATCH 3/9] sim: or1k: fix iterator typo when setting up cpus Mike Frysinger
2022-12-25 7:14 ` [PATCH 4/9] sim: v850: fix SMP compile Mike Frysinger
2022-12-25 7:14 ` [PATCH 5/9] sim: m32r: fix iterator typo when setting up cpus Mike Frysinger
2022-12-25 7:14 ` [PATCH 6/9] sim: msp430: add basic SMP cpu init Mike Frysinger
2022-12-25 7:14 ` [PATCH 7/9] sim: cpu: change default init to handle all cpus Mike Frysinger
2022-12-25 7:14 ` [PATCH 8/9] sim: smp: make option available again Mike Frysinger
2022-12-25 7:14 ` [PATCH 9/9] sim: smp: plumb igen flag down to all users Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221225071434.30014-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).