aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/windows-tdep.c18
-rw-r--r--sim/common/cgen-trace.c4
-rw-r--r--sim/common/sim-load.c13
-rw-r--r--sim/cr16/interp.c4
-rw-r--r--sim/cris/sim-if.c25
-rw-r--r--sim/d10v/interp.c4
-rw-r--r--sim/erc32/func.c4
-rw-r--r--sim/m32c/load.c4
-rw-r--r--sim/rl78/load.c22
-rw-r--r--sim/rx/load.c14
10 files changed, 58 insertions, 54 deletions
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index a34ac5e..702af65 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -1007,10 +1007,11 @@ is_linked_with_cygwin_dll (bfd *abfd)
|| import_table_va >= idata_section_end_va)
{
warning (_("\
-%s: import table's virtual address (0x%" BFD_VMA_FMT "x) is outside .idata \
-section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
- bfd_get_filename (abfd), import_table_va, idata_section_va,
- idata_section_end_va);
+%s: import table's virtual address (%s) is outside .idata \
+section's range [%s, %s]."),
+ bfd_get_filename (abfd), hex_string (import_table_va),
+ hex_string (idata_section_va),
+ hex_string (idata_section_end_va));
return false;
}
@@ -1057,10 +1058,11 @@ section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
if (name_va < idata_section_va || name_va >= idata_section_end_va)
{
warning (_("\
-%s: name's virtual address (0x%" BFD_VMA_FMT "x) is outside .idata section's \
-range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
- bfd_get_filename (abfd), name_va, idata_section_va,
- idata_section_end_va);
+%s: name's virtual address (%s) is outside .idata section's \
+range [%s, %s]."),
+ bfd_get_filename (abfd), hex_string (name_va),
+ hex_string (idata_section_va),
+ hex_string (idata_section_end_va));
break;
}
diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 3df30c5..e79e93c 100644
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -366,8 +366,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%" BFD_VMA_FMT "x is out of bounds.",
- memaddr);
+ "Address 0x%" PRIx64 " is out of bounds.",
+ (uint64_t) memaddr);
}
/* Disassemble using the CGEN opcode table.
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 020165a..80fa2ea 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -121,11 +121,10 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback,
if (verbose_p)
{
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"), lma);
+ "Loading section %s, size 0x%" PRIx64
+ " %s %" PRIx64 "\n",
+ bfd_section_name (s), (uint64_t) size,
+ lma_p ? "lma" : "vma", (uint64_t) lma);
}
data_count += size;
bfd_get_section_contents (result_bfd, s, buffer, 0, size);
@@ -147,8 +146,8 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback,
if (verbose_p)
{
end_time = time (NULL);
- xprintf (callback, "Start address %" BFD_VMA_FMT "x\n",
- bfd_get_start_address (result_bfd));
+ xprintf (callback, "Start address %" PRIx64 "\n",
+ (uint64_t) bfd_get_start_address (result_bfd));
report_transfer_performance (callback, data_count, start_time, end_time);
}
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 47fb647..b375dad 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -677,8 +677,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%" BFD_VMA_FMT "x\n",
- start_address);
+ sim_io_printf (sd, "sim_create_inferior: PC=0x%" PRIx64 "\n",
+ (uint64_t) start_address);
#endif
{
SIM_CPU *cpu = STATE_CPU (sd, 0);
diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index d7c1005..75176d0 100644
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -257,17 +257,18 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write)
if (verbose)
sim_io_printf (sd,
- "Loading segment at 0x%" BFD_VMA_FMT "x, "
- "size 0x%" BFD_VMA_FMT "x\n",
- lma, phdr[i].p_filesz);
+ "Loading segment at 0x%" PRIx64 ", "
+ "size 0x%" PRIx64 "\n",
+ (uint64_t) lma, (uint64_t) 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%" BFD_VMA_FMT "x, "
- "size 0x%" BFD_VMA_FMT "x\n",
- STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
+ "%s: could not read segment at 0x%" PRIx64 ", "
+ "size 0x%" PRIx64 "\n",
+ STATE_MY_NAME (sd), (uint64_t) lma,
+ (uint64_t) phdr[i].p_filesz);
free (buf);
return FALSE;
}
@@ -275,9 +276,10 @@ 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%" BFD_VMA_FMT "x, "
- "size 0x%" BFD_VMA_FMT "x\n",
- STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
+ "%s: could not load segment at 0x%" PRIx64 ", "
+ "size 0x%" PRIx64 "\n",
+ STATE_MY_NAME (sd), (uint64_t) lma,
+ (uint64_t) phdr[i].p_filesz);
free (buf);
return FALSE;
}
@@ -573,9 +575,8 @@ 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%" BFD_VMA_FMT "x,"
- "0x%" BFD_VMA_FMT "x",
- interp_load_addr, interpsiz);
+ sim_do_commandf (sd, "memory region 0x%" PRIx64 ",0x%" PRIx64,
+ (uint64_t) interp_load_addr, (uint64_t) interpsiz);
/* Now that memory for the interpreter is defined, load it. */
if (!cris_load_elf_file (sd, ibfd, cris_write_interp))
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 5716a10..fde96aa 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1171,8 +1171,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%" BFD_VMA_FMT "x\n",
- start_address);
+ sim_io_printf (sd, "sim_create_inferior: PC=0x%" PRIx64 "\n",
+ (uint64_t) start_address);
#endif
{
SIM_CPU *cpu = STATE_CPU (sd, 0);
diff --git a/sim/erc32/func.c b/sim/erc32/func.c
index b4f2b42..4d19420 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -1060,8 +1060,8 @@ bfd_load (const char *fname)
section_size = bfd_section_size (section);
if (sis_verbose)
- printf("\nsection %s at 0x%08" BFD_VMA_FMT "x (0x%lx bytes)",
- section_name, section_address, section_size);
+ printf("\nsection %s at 0x%08" PRIx64 " (0x%lx bytes)",
+ section_name, (uint64_t) section_address, section_size);
/* Text, data or lit */
if (bfd_section_flags (section) & SEC_LOAD) {
diff --git a/sim/m32c/load.c b/sim/m32c/load.c
index ce0bddc..9a432d0 100644
--- a/sim/m32c/load.c
+++ b/sim/m32c/load.c
@@ -99,8 +99,8 @@ m32c_load (bfd * prog)
base = bfd_section_lma (s);
if (verbose)
- fprintf (stderr, "[load a=%08" BFD_VMA_FMT "x s=%08x %s]\n",
- base, (int) size, bfd_section_name (s));
+ fprintf (stderr, "[load a=%08" PRIx64 " s=%08x %s]\n",
+ (uint64_t) 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/load.c b/sim/rl78/load.c
index 2bf5469..5c99f22 100644
--- a/sim/rl78/load.c
+++ b/sim/rl78/load.c
@@ -130,15 +130,15 @@ rl78_load (bfd *prog, host_callback *callbacks, const char * const simname)
base = p->p_paddr;
if (verbose > 1)
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);
+ "[load segment: lma=%08" PRIx64 " vma=%08" PRIx64 " "
+ "size=%08" PRIx64 "]\n",
+ (uint64_t) base, (uint64_t) p->p_vaddr, (uint64_t) size);
if (callbacks)
xprintf (callbacks,
- "Loading section %s, size %#" BFD_VMA_FMT "x "
- "lma %08" BFD_VMA_FMT "x vma %08lx\n",
+ "Loading section %s, size %#" PRIx64 " "
+ "lma %08" PRIx64 " vma %08" PRIx64 "\n",
find_section_name_by_offset (prog, p->p_offset),
- size, base, p->p_vaddr);
+ (uint64_t) size, (uint64_t) base, (uint64_t) p->p_vaddr);
buf = xmalloc (size);
@@ -151,17 +151,17 @@ rl78_load (bfd *prog, host_callback *callbacks, const char * const simname)
if (bfd_bread (buf, size, prog) != size)
{
- fprintf (stderr, "%s: Failed to read %" BFD_VMA_FMT "x bytes\n",
- simname, size);
+ fprintf (stderr, "%s: Failed to read %" PRIx64 " bytes\n",
+ simname, (uint64_t) size);
continue;
}
if (base > 0xeffff || base + size > 0xeffff)
{
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);
+ "%s, Can't load image to RAM/SFR space: 0x%" PRIx64 " "
+ "- 0x%" PRIx64 "\n",
+ simname, (uint64_t) base, (uint64_t) (base + size));
continue;
}
if (max_rom < base + size)
diff --git a/sim/rx/load.c b/sim/rx/load.c
index 500babc..a0dca3d 100644
--- a/sim/rx/load.c
+++ b/sim/rx/load.c
@@ -130,14 +130,15 @@ rx_load (bfd *prog, host_callback *callback)
base = p->p_paddr;
if (verbose > 1)
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);
+ "[load segment: lma=%08" PRIx64 " vma=%08" PRIx64 " "
+ "size=%08" PRIx64 "]\n",
+ (uint64_t) base, (uint64_t) p->p_vaddr, (uint64_t) size);
if (callback)
xprintf (callback,
- "Loading section %s, size %#lx lma %08lx vma %08lx\n",
+ "Loading section %s, size %#" PRIx64 " lma %08" PRIx64
+ " vma %08" PRIx64 "\n",
find_section_name_by_offset (prog, p->p_offset),
- size, base, p->p_vaddr);
+ (uint64_t) size, (uint64_t) base, (uint64_t) p->p_vaddr);
buf = malloc (size);
if (buf == NULL)
@@ -154,7 +155,8 @@ rx_load (bfd *prog, host_callback *callback)
}
if (bfd_bread (buf, size, prog) != size)
{
- fprintf (stderr, "Failed to read %" BFD_VMA_FMT "x bytes\n", size);
+ fprintf (stderr, "Failed to read %" PRIx64 " bytes\n",
+ (uint64_t) size);
continue;
}
generated by cgit v1.1 at 2024-11-13 14:55:30 +0000