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.

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 1b4a5fe336628a1f59e475e905f05c6705b97ebd..4e7b919a3c509afcab37760d9752fe535dc492c2 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-23  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete "x" after PRI macros.
+
 2021-05-23  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-if.c: Include unistd.h.

diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index cea499d1daa999825191a619c812698a09c086ef..6613a93ecc554a4afaff7a76015770e4098d2ba7 100644 (file)
--- 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.  */