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 62C06389366A for ; Tue, 15 Jun 2021 05:11:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 62C06389366A Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 1BF35340E6E for ; Tue, 15 Jun 2021 05:11:42 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/6] sim: mips: fix format warnings when setting up memory Date: Tue, 15 Jun 2021 01:11:36 -0400 Message-Id: <20210615051141.4801-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 05:11:44 -0000 The majority of these inputs are not long's, so don't use %lx. This fixes compiler warnings about type mismatches. --- sim/mips/interp.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 93bbc5c846c0..bccc4c76ed8b 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -436,7 +436,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, if (mem_size > K1SIZE) mem_size = K1SIZE; /* memory alias K1BASE@1,K1SIZE%MEMSIZE,K0BASE */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx%%0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x%%0x%lx,0x%0x", K1BASE, K1SIZE, (long)mem_size, K0BASE); if (WITH_TARGET_WORD_BITSIZE == 64) sim_do_commandf (sd, "memory alias 0x%x,0x%" PRIxTW ",0x%" PRIxTA, @@ -453,13 +453,13 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, STATE_ENVIRONMENT (sd) = OPERATING_ENVIRONMENT; /* ROM: 0x9FC0_0000 - 0x9FFF_FFFF and 0xBFC0_0000 - 0xBFFF_FFFF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x9FC00000, 4 * 1024 * 1024, /* 4 MB */ 0xBFC00000); /* SRAM: 0x8000_0000 - 0x803F_FFFF and 0xA000_0000 - 0xA03F_FFFF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x80000000, 4 * 1024 * 1024, /* 4 MB */ 0xA0000000); @@ -468,7 +468,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, for (i=0; i<8; i++) /* 32 MB total */ { unsigned size = 4 * 1024 * 1024; /* 4 MB */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x88000000 + (i * size), size, 0xA8000000 + (i * size)); @@ -499,13 +499,13 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, /* --- memory --- */ /* ROM: 0x9FC0_0000 - 0x9FFF_FFFF and 0xBFC0_0000 - 0xBFFF_FFFF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x9FC00000, 4 * 1024 * 1024, /* 4 MB */ 0xBFC00000); /* SRAM: 0x8000_0000 - 0x803F_FFFF and 0xA000_0000 - 0xA03F_FFFF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x80000000, 4 * 1024 * 1024, /* 4 MB */ 0xA0000000); @@ -514,7 +514,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, for (i=0; i<8; i++) /* 32 MB total */ { unsigned size = 4 * 1024 * 1024; /* 4 MB */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx,0x%0x", + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x,0x%0x", 0x88000000 + (i * size), size, 0xA8000000 + (i * size)); @@ -522,15 +522,15 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, /* Dummy memory regions for unsimulated devices - sorted by address */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xB1000000, 0x400); /* ISA I/O */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xB2100000, 0x004); /* ISA ctl */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xB2500000, 0x004); /* LED/switch */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xB2700000, 0x004); /* RTC */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xB3C00000, 0x004); /* RTC */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xFFFF8000, 0x900); /* DRAMC */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xFFFF9000, 0x200); /* EBIF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xFFFFE000, 0x01c); /* EBIF */ - sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx", 0xFFFFF500, 0x300); /* PIO */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xB1000000, 0x400); /* ISA I/O */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xB2100000, 0x004); /* ISA ctl */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xB2500000, 0x004); /* LED/switch */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xB2700000, 0x004); /* RTC */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xB3C00000, 0x004); /* RTC */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xFFFF8000, 0x900); /* DRAMC */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xFFFF9000, 0x200); /* EBIF */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xFFFFE000, 0x01c); /* EBIF */ + sim_do_commandf (sd, "memory alias 0x%x@1,0x%x", 0xFFFFF500, 0x300); /* PIO */ /* --- simulated devices --- */ @@ -711,7 +711,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, idt_monitor_base, idt_monitor_size, EXTENDED (idt_monitor_base)); else - sim_do_commandf (sd, "memory region 0x%x,0x%x", + sim_do_commandf (sd, "memory region 0x%x,0x%" PRIxTA, idt_monitor_base, idt_monitor_size); /* Entry into the IDT monitor is via fixed address vectors, and -- 2.31.1