[PULL 32/61] target/m68k: Replace MD_TLONG -> MD_I32 in monitor.c

Philippe Mathieu-Daudé posted 61 patches 4 weeks ago
Maintainers: Riku Voipio <riku.voipio@iki.fi>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Clément Chigot" <chigot@adacore.com>, Frederic Konrad <konrad.frederic@yahoo.fr>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Jia Liu <proljc@gmail.com>, Song Gao <gaosong@loongson.cn>, Bibo Mao <maobibo@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Artyom Tarasenko <atar4qemu@gmail.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Peter Xu <peterx@redhat.com>, Laurent Vivier <laurent@vivier.eu>, "Daniel P. Berrangé" <berrange@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, Brian Cain <brian.cain@oss.qualcomm.com>, Helge Deller <deller@gmx.de>, Stafford Horne <shorne@gmail.com>, Yoshinori Sato <yoshinori.sato@nifty.com>, Bastian Koppelmann <kbastian@rumtueddeln.de>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Fabiano Rosas <farosas@suse.de>, Nicholas Piggin <npiggin@gmail.com>, Aditya Gupta <adityag@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, Gautam Menghani <gautam@linux.ibm.com>
[PULL 32/61] target/m68k: Replace MD_TLONG -> MD_I32 in monitor.c
Posted by Philippe Mathieu-Daudé 4 weeks ago
m68k's monitor_defs[] array implicitly uses type=MD_TLONG for
all its entries. Since we only build this target as 32-bit,
use the explicit MD_I32 type to avoid an indirect target_long
use.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20260107200702.54582-10-philmd@linaro.org>
---
 target/m68k/monitor.c | 60 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c
index 2bdf6acae0a..161f41853ec 100644
--- a/target/m68k/monitor.c
+++ b/target/m68k/monitor.c
@@ -23,36 +23,36 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 }
 
 static const MonitorDef monitor_defs[] = {
-    { "d0", offsetof(CPUM68KState, dregs[0]) },
-    { "d1", offsetof(CPUM68KState, dregs[1]) },
-    { "d2", offsetof(CPUM68KState, dregs[2]) },
-    { "d3", offsetof(CPUM68KState, dregs[3]) },
-    { "d4", offsetof(CPUM68KState, dregs[4]) },
-    { "d5", offsetof(CPUM68KState, dregs[5]) },
-    { "d6", offsetof(CPUM68KState, dregs[6]) },
-    { "d7", offsetof(CPUM68KState, dregs[7]) },
-    { "a0", offsetof(CPUM68KState, aregs[0]) },
-    { "a1", offsetof(CPUM68KState, aregs[1]) },
-    { "a2", offsetof(CPUM68KState, aregs[2]) },
-    { "a3", offsetof(CPUM68KState, aregs[3]) },
-    { "a4", offsetof(CPUM68KState, aregs[4]) },
-    { "a5", offsetof(CPUM68KState, aregs[5]) },
-    { "a6", offsetof(CPUM68KState, aregs[6]) },
-    { "a7", offsetof(CPUM68KState, aregs[7]) },
-    { "pc", offsetof(CPUM68KState, pc) },
-    { "sr", offsetof(CPUM68KState, sr) },
-    { "ssp", offsetof(CPUM68KState, sp[0]) },
-    { "usp", offsetof(CPUM68KState, sp[1]) },
-    { "isp", offsetof(CPUM68KState, sp[2]) },
-    { "sfc", offsetof(CPUM68KState, sfc) },
-    { "dfc", offsetof(CPUM68KState, dfc) },
-    { "urp", offsetof(CPUM68KState, mmu.urp) },
-    { "srp", offsetof(CPUM68KState, mmu.srp) },
-    { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) },
-    { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) },
-    { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) },
-    { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) },
-    { "mmusr", offsetof(CPUM68KState, mmu.mmusr) },
+    { "d0", offsetof(CPUM68KState, dregs[0]), NULL, MD_I32 },
+    { "d1", offsetof(CPUM68KState, dregs[1]), NULL, MD_I32 },
+    { "d2", offsetof(CPUM68KState, dregs[2]), NULL, MD_I32 },
+    { "d3", offsetof(CPUM68KState, dregs[3]), NULL, MD_I32 },
+    { "d4", offsetof(CPUM68KState, dregs[4]), NULL, MD_I32 },
+    { "d5", offsetof(CPUM68KState, dregs[5]), NULL, MD_I32 },
+    { "d6", offsetof(CPUM68KState, dregs[6]), NULL, MD_I32 },
+    { "d7", offsetof(CPUM68KState, dregs[7]), NULL, MD_I32 },
+    { "a0", offsetof(CPUM68KState, aregs[0]), NULL, MD_I32 },
+    { "a1", offsetof(CPUM68KState, aregs[1]), NULL, MD_I32 },
+    { "a2", offsetof(CPUM68KState, aregs[2]), NULL, MD_I32 },
+    { "a3", offsetof(CPUM68KState, aregs[3]), NULL, MD_I32 },
+    { "a4", offsetof(CPUM68KState, aregs[4]), NULL, MD_I32 },
+    { "a5", offsetof(CPUM68KState, aregs[5]), NULL, MD_I32 },
+    { "a6", offsetof(CPUM68KState, aregs[6]), NULL, MD_I32 },
+    { "a7", offsetof(CPUM68KState, aregs[7]), NULL, MD_I32 },
+    { "pc", offsetof(CPUM68KState, pc), NULL, MD_I32 },
+    { "sr", offsetof(CPUM68KState, sr), NULL, MD_I32 },
+    { "ssp", offsetof(CPUM68KState, sp[0]), NULL, MD_I32 },
+    { "usp", offsetof(CPUM68KState, sp[1]), NULL, MD_I32 },
+    { "isp", offsetof(CPUM68KState, sp[2]), NULL, MD_I32 },
+    { "sfc", offsetof(CPUM68KState, sfc), NULL, MD_I32 },
+    { "dfc", offsetof(CPUM68KState, dfc), NULL, MD_I32 },
+    { "urp", offsetof(CPUM68KState, mmu.urp), NULL, MD_I32 },
+    { "srp", offsetof(CPUM68KState, mmu.srp), NULL, MD_I32 },
+    { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]), NULL, MD_I32 },
+    { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]), NULL, MD_I32 },
+    { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]), NULL, MD_I32 },
+    { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]), NULL, MD_I32 },
+    { "mmusr", offsetof(CPUM68KState, mmu.mmusr), NULL, MD_I32 },
     { NULL },
 };
 
-- 
2.52.0