From d16ce6e4d581bcd25c7d9a402c19824c59f04276 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 23 May 2021 23:27:40 -0400 Subject: [PATCH] sim: cris: fix memory setup typos The cleanup to use BFD_VMA_FMT also adjusted this line, but used the incorrect format: while BFD_VMA_FMT needs an explicit "x", PRIx32 does not, so the spurious "x" here confused the parser and broke execution. --- sim/cris/ChangeLog | 4 ++++ sim/cris/sim-if.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 1b4a5fe3366..4e7b919a3c5 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,7 @@ +2021-05-23 Mike Frysinger + + * sim-if.c (sim_open): Delete "x" after PRI macros. + 2021-05-23 Mike Frysinger * sim-if.c: Include unistd.h. diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index cea499d1daa..6613a93ecc5 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -879,7 +879,7 @@ 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%" PRIx32 "x,0x%" PRIu32 "x", + sim_do_commandf (sd, "memory region 0x%" PRIx32 ",0x%" PRIu32, startmem, endmem - startmem); /* Allocate simulator I/O managed memory if none specified by user. */ -- 2.30.2