From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id zXBNLF47kWDxYAAAWB0awg (envelope-from ) for ; Tue, 04 May 2021 08:17:34 -0400 Received: by simark.ca (Postfix, from userid 112) id A94E31F11C; Tue, 4 May 2021 08:17:34 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9F1521E54D for ; Tue, 4 May 2021 08:17:32 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 26A14398207A; Tue, 4 May 2021 12:17:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26A14398207A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620130652; bh=Ejz+j9URA6VG8uWNPDAeFZvm+iMlk8A0uTAcHBDH93k=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=RrtmctGt/akrwtN4lbE9SPBxZ+QlB5eGIxweaLJ1JakK14SbhV3OpiNfBJ1lpwexc B0FtiH8NcoBBVVZg/ErT/QdNL038Smz/yCmMZ8peSV+6MCq/8WqwsqNd6/gNcWSiGX OHFtMjKrxnhW6rG0lTu+OGxsGj76TLHyTZ+onhCY= Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 3ABBE3950C61 for ; Tue, 4 May 2021 12:17:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3ABBE3950C61 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 4DE02335D94 for ; Tue, 4 May 2021 12:17:27 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH/committed] sim: clean up bfd_vma printing Date: Tue, 4 May 2021 08:17:25 -0400 Message-Id: <20210504121725.24936-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" A lot of this code predates the bfd_vma format define, so we have a random mix of casts to known types so we can printf the value. Use the BFD_VMA_FMT that now exists to simplify and reliability output across different build configs. --- sim/common/ChangeLog | 7 +++++++ sim/common/cgen-trace.c | 4 ++-- sim/common/sim-load.c | 24 ++++++------------------ sim/cr16/ChangeLog | 4 ++++ sim/cr16/interp.c | 3 ++- sim/cris/ChangeLog | 6 ++++++ sim/cris/sim-if.c | 16 +++++++++------- sim/d10v/ChangeLog | 5 +++++ sim/d10v/d10v_sim.h | 1 - sim/d10v/interp.c | 3 ++- sim/erc32/ChangeLog | 4 ++++ sim/erc32/func.c | 2 +- sim/m32c/ChangeLog | 4 ++++ sim/m32c/load.c | 4 ++-- sim/rl78/ChangeLog | 4 ++++ sim/rl78/load.c | 18 ++++++++++++------ sim/rx/ChangeLog | 4 ++++ sim/rx/load.c | 8 +++++--- 18 files changed, 79 insertions(+), 42 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 17b711c965e4..783449941b28 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,10 @@ +2021-05-04 Mike Frysinger + + * cgen-trace.c (sim_disasm_perror_memory): Use BFD_VMA_FMT and drop + cast. + * sim-load.c (xprintf_bfd_vma): Delete. + (sim_load_file): Delete xprintf_bfd_vma calls. Use BFD_VMA_FMT. + 2021-05-03 Simon Marchi * hw-events.h (hw_event_queue_schedule_tracef): Use format attribute. diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c index 0f18c502c637..649c37a61b1c 100644 --- a/sim/common/cgen-trace.c +++ b/sim/common/cgen-trace.c @@ -340,8 +340,8 @@ sim_disasm_perror_memory (int status, bfd_vma memaddr, /* Actually, address between memaddr and memaddr + len was out of bounds. */ info->fprintf_func (info->stream, - "Address 0x%x is out of bounds.", - (int) memaddr); + "Address 0x%" BFD_VMA_FMT "x is out of bounds.", + memaddr); } /* Disassemble using the CGEN opcode table. diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index e0aab1e9eb49..04681c524a0c 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -38,7 +38,6 @@ static void eprintf (host_callback *, const char *, ...); static void xprintf (host_callback *, const char *, ...); static void report_transfer_performance (host_callback *, unsigned long, time_t, time_t); -static void xprintf_bfd_vma (host_callback *, bfd_vma); /* Load program PROG into the simulator using the function DO_LOAD. If PROG_BFD is non-NULL, the file has already been opened. @@ -122,12 +121,12 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback, lma = bfd_section_vma (s); if (verbose_p) { - xprintf (callback, "Loading section %s, size 0x%lx %s ", + xprintf (callback, + "Loading section %s, size 0x%lx %s " + "%" BFD_VMA_FMT "x\n", bfd_section_name (s), (unsigned long) size, - (lma_p ? "lma" : "vma")); - xprintf_bfd_vma (callback, lma); - xprintf (callback, "\n"); + (lma_p ? "lma" : "vma"), lma); } data_count += size; bfd_get_section_contents (result_bfd, s, buffer, 0, size); @@ -149,9 +148,8 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback, if (verbose_p) { end_time = time (NULL); - xprintf (callback, "Start address "); - xprintf_bfd_vma (callback, bfd_get_start_address (result_bfd)); - xprintf (callback, "\n"); + xprintf (callback, "Start address %" BFD_VMA_FMT "x\n", + bfd_get_start_address (result_bfd)); report_transfer_performance (callback, data_count, start_time, end_time); } @@ -198,13 +196,3 @@ report_transfer_performance (host_callback *callback, unsigned long data_count, xprintf (callback, "%ld bits in <1 sec", (data_count * 8)); xprintf (callback, ".\n"); } - -/* Print a bfd_vma. - This is intended to handle the vagaries of 32 vs 64 bits, etc. */ - -static void -xprintf_bfd_vma (host_callback *callback, bfd_vma vma) -{ - /* FIXME: for now */ - xprintf (callback, "0x%lx", (unsigned long) vma); -} diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 654b4e0987ec..ebf601fe9b9d 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * interp.c (sim_create_inferior): Use BFD_VMA_FMT and drop cast. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index 46150069a383..8f7fafa715e9 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -672,7 +672,8 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, start_address = 0x0; #ifdef DEBUG if (cr16_debug) - sim_io_printf (sd, "sim_create_inferior: PC=0x%lx\n", (long) start_address); + sim_io_printf (sd, "sim_create_inferior: PC=0x%" BFD_VMA_FMT "x\n", + start_address); #endif { SIM_CPU *cpu = STATE_CPU (sd, 0); diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 1ac455e561bc..49db6ef32b2d 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,9 @@ +2021-05-04 Mike Frysinger + + * sim-if.c (cris_load_elf_file): Use BFD_VMA_FMT + (cris_handle_interpreter): Likewise. Delete phaddr. + (sim_open): Use PRIx32. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index 9914912b156b..edd7885caf70 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -257,14 +257,16 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write) buf = xmalloc (phdr[i].p_filesz); if (verbose) - sim_io_printf (sd, "Loading segment at 0x%lx, size 0x%lx\n", + sim_io_printf (sd, + "Loading segment at 0x%" BFD_VMA_FMT "x, size 0x%lx\n", lma, phdr[i].p_filesz); if (bfd_seek (abfd, phdr[i].p_offset, SEEK_SET) != 0 || (bfd_bread (buf, phdr[i].p_filesz, abfd) != phdr[i].p_filesz)) { sim_io_eprintf (sd, - "%s: could not read segment at 0x%lx, size 0x%lx\n", + "%s: could not read segment at 0x%" BFD_VMA_FMT "x, " + "size 0x%lx\n", STATE_MY_NAME (sd), lma, phdr[i].p_filesz); free (buf); return FALSE; @@ -273,7 +275,8 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write) if (do_write (sd, lma, buf, phdr[i].p_filesz) != phdr[i].p_filesz) { sim_io_eprintf (sd, - "%s: could not load segment at 0x%lx, size 0x%lx\n", + "%s: could not load segment at 0x%" BFD_VMA_FMT "x, " + "size 0x%lx\n", STATE_MY_NAME (sd), lma, phdr[i].p_filesz); free (buf); return FALSE; @@ -495,7 +498,6 @@ static bfd_boolean cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd) { int i, n_hdrs; - bfd_vma phaddr; bfd_byte buf[4]; char *interp = NULL; struct bfd *ibfd; @@ -571,7 +573,7 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd) memory area, so we go via a temporary area. Luckily, the interpreter is supposed to be small, less than 0x40000 bytes. */ - sim_do_commandf (sd, "memory region 0x%lx,0x%lx", + sim_do_commandf (sd, "memory region 0x%" BFD_VMA_FMT "x,0x%lx", interp_load_addr, interpsiz); /* Now that memory for the interpreter is defined, load it. */ @@ -885,8 +887,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, /* Allocate core managed memory if none specified by user. */ if (sim_core_read_buffer (sd, NULL, read_map, &c, startmem, 1) == 0) - sim_do_commandf (sd, "memory region 0x%lx,0x%lx", startmem, - endmem - startmem); + sim_do_commandf (sd, "memory region 0x%" PRIx32 "x,0x%" PRIu32 "x", + startmem, endmem - startmem); /* Allocate simulator I/O managed memory if none specified by user. */ if (cris_have_900000xxif) diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index ebe6cd3f1a9f..bbf97d20318b 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2021-05-04 Mike Frysinger + + * d10v_sim.h (decode_pc): Delete. + * interp.c (sim_create_inferior): Use BFD_VMA_FMT. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h index a3755bf3ccb9..64f974f01dbc 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -444,7 +444,6 @@ while (0) extern uint8 *dmem_addr (SIM_DESC, SIM_CPU *, uint16 offset); extern uint8 *imem_addr (SIM_DESC, SIM_CPU *, uint32); -extern bfd_vma decode_pc (void); #define RB(x) (*(dmem_addr (sd, cpu, x))) #define SB(addr,data) ( RB(addr) = (data & 0xff)) diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 90c171eda398..86e566a79fb8 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -1160,7 +1160,8 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, start_address = 0xffc0 << 2; #ifdef DEBUG if (d10v_debug) - sim_io_printf (sd, "sim_create_inferior: PC=0x%lx\n", (long) start_address); + sim_io_printf (sd, "sim_create_inferior: PC=0x%" BFD_VMA_FMT "x\n", + start_address); #endif { SIM_CPU *cpu = STATE_CPU (sd, 0); diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 12398af89972..a6b142a6ec28 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * func.c (bfd_load): Use BFD_VMA_FMT. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/erc32/func.c b/sim/erc32/func.c index c6dfa1927ad4..52428e48350f 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -1056,7 +1056,7 @@ bfd_load (const char *fname) section_size = bfd_section_size (section); if (sis_verbose) - printf("\nsection %s at 0x%08lx (0x%lx bytes)", + printf("\nsection %s at 0x%08" BFD_VMA_FMT "x (0x%lx bytes)", section_name, section_address, section_size); /* Text, data or lit */ diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index e3393c9be662..df0625609835 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * load.c (m32c_load): Use BFD_VMA_FMT and drop casts. + 2021-05-02 Mike Frysinger * m32c.opc: Include ansidecl.h. diff --git a/sim/m32c/load.c b/sim/m32c/load.c index 156a275ad31b..86e774e3abe9 100644 --- a/sim/m32c/load.c +++ b/sim/m32c/load.c @@ -97,8 +97,8 @@ m32c_load (bfd * prog) base = bfd_section_lma (s); if (verbose) - fprintf (stderr, "[load a=%08x s=%08x %s]\n", - (int) base, (int) size, bfd_section_name (s)); + fprintf (stderr, "[load a=%08" BFD_VMA_FMT "x s=%08x %s]\n", + base, (int) size, bfd_section_name (s)); buf = (char *) malloc (size); bfd_get_section_contents (prog, s, buf, 0, size); mem_put_blk (base, buf, size); diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 9d70041b907f..1be5181dc6d1 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * load.c (rl78_load): Use BFD_VMA_FMT and drop casts. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/rl78/load.c b/sim/rl78/load.c index f89b5e69c4be..c137ba6e40e4 100644 --- a/sim/rl78/load.c +++ b/sim/rl78/load.c @@ -128,12 +128,15 @@ rl78_load (bfd *prog, host_callback *callbacks, const char * const simname) base = p->p_paddr; if (verbose > 1) - fprintf (stderr, "[load segment: lma=%08x vma=%08x size=%08x]\n", - (int) base, (int) p->p_vaddr, (int) size); + fprintf (stderr, + "[load segment: lma=%08" BFD_VMA_FMT "x vma=%08x " + "size=%08" BFD_VMA_FMT "x]\n", + base, (int) p->p_vaddr, size); if (callbacks) xprintf (callbacks, - "Loading section %s, size %#lx lma %08lx vma %08lx\n", - find_section_name_by_offset (prog, p->p_offset), + "Loading section %s, size %#" BFD_VMA_FMT "x " + "lma %08" BFD_VMA_FMT "x vma %08lx\n", + find_section_name_by_offset (prog, p->p_offset), size, base, p->p_vaddr); buf = xmalloc (size); @@ -147,13 +150,16 @@ rl78_load (bfd *prog, host_callback *callbacks, const char * const simname) if (bfd_bread (buf, size, prog) != size) { - fprintf (stderr, "%s: Failed to read %lx bytes\n", simname, size); + fprintf (stderr, "%s: Failed to read %" BFD_VMA_FMT "x bytes\n", + simname, size); continue; } if (base > 0xeffff || base + size > 0xeffff) { - fprintf (stderr, "%s, Can't load image to RAM/SFR space: 0x%lx - 0x%lx\n", + fprintf (stderr, + "%s, Can't load image to RAM/SFR space: 0x%" BFD_VMA_FMT "x " + "- 0x%" BFD_VMA_FMT "x\n", simname, base, base+size); continue; } diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index 4d7e93dabe92..21a8ff626cf1 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * load.c (rx_load): Use BFD_VMA_FMT and drop casts. + 2021-05-03 Simon Marchi * trace.c (op_printf): Likewise. diff --git a/sim/rx/load.c b/sim/rx/load.c index b4523e12ac75..b04826f55c7f 100644 --- a/sim/rx/load.c +++ b/sim/rx/load.c @@ -128,8 +128,10 @@ rx_load (bfd *prog, host_callback *callback) base = p->p_paddr; if (verbose > 1) - fprintf (stderr, "[load segment: lma=%08x vma=%08x size=%08x]\n", - (int) base, (int) p->p_vaddr, (int) size); + fprintf (stderr, + "[load segment: lma=%08" BFD_VMA_FMT "x vma=%08x " + "size=%08" BFD_VMA_FMT "x]\n", + base, (int) p->p_vaddr, size); if (callback) xprintf (callback, "Loading section %s, size %#lx lma %08lx vma %08lx\n", @@ -151,7 +153,7 @@ rx_load (bfd *prog, host_callback *callback) } if (bfd_bread (buf, size, prog) != size) { - fprintf (stderr, "Failed to read %lx bytes\n", (long) size); + fprintf (stderr, "Failed to read %" BFD_VMA_FMT "x bytes\n", size); continue; } -- 2.31.1