Change wrap buffering to use a std::string

[deliverable/binutils-gdb.git] / gdb / csky-tdep.c

diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 997ca93288b36d096a0fd9548f1a35205a9c438e..ed56aed97a4f5114ad9b80a7d6c210de21c8dd2f 100644 (file)
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -336,7 +336,8 @@ static CORE_ADDR
 csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
                      struct regcache *regcache, CORE_ADDR bp_addr,
                      int nargs, struct value **args, CORE_ADDR sp,
-                     int struct_return, CORE_ADDR struct_addr)
+                     function_call_return_method return_method,
+                     CORE_ADDR struct_addr)
 {
   int argnum;
   int argreg = CSKY_ABI_A0_REGNUM;
@@ -351,7 +352,7 @@ csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
 
   /* The struct_return pointer occupies the first parameter
      passing register.  */
-  if (struct_return)
+  if (return_method == return_method_struct)
     {
       if (csky_debug)
        {
@@ -1103,8 +1104,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
                                          "csky: found stack adjustment of"
                                          " 0x%x bytes.\n", adjust);
                      fprintf_unfiltered (gdb_stdlog,
-                                         "csky: skipping to new address "
-                                         "0x%lx\n", addr);
+                                         "csky: skipping to new address %s\n",
+                                         core_addr_to_string_nz (addr));
                      fprintf_unfiltered (gdb_stdlog,
                                          "csky: continuing\n");
                    }
@@ -1205,7 +1206,6 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
          else if (CSKY_16_IS_LRW4 (insn) || CSKY_16_IS_MOVI4 (insn))
            {
              int adjust = 0;
-             int offset = 0;
              unsigned int insn2;
 
              if (csky_debug)
@@ -1239,7 +1239,7 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
                  fprintf_unfiltered (gdb_stdlog,
                                      "csky: looking for r4 adjusters...\n");
                }
-             offset = 2;
+             int offset = 2;
              insn_len = csky_get_insn (gdbarch, addr + offset, &insn2);
              while (CSKY_IS_R4_ADJUSTER (insn2))
                {
@@ -1415,8 +1415,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
                                          "found stack adjustment of 0x%x"
                                          " bytes.\n", adjust);
                      fprintf_unfiltered (gdb_stdlog, "csky: "
-                                         "skipping to new address 0x%lx\n",
-                                         addr);
+                                         "skipping to new address %s\n",
+                                         core_addr_to_string_nz (addr));
                      fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
                    }
                  continue;
@@ -1609,7 +1609,7 @@ csky_memory_insert_breakpoint (struct gdbarch *gdbarch,
 
   /* Sanity-check bp_address.  */
   if (bp_tgt->reqstd_address % 2)
-    warning (_("Invalid breakpoint address 0x%x is an odd number.\n"),
+    warning (_("Invalid breakpoint address 0x%x is an odd number."),
             (unsigned int) bp_tgt->reqstd_address);
   scoped_restore restore_memory
     = make_scoped_restore_show_memory_breakpoints (1);