Fix a couple of comments

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

diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index 54b365e9586215cb1cd5d7bccdc7338f3520734f..13e130c6fd32e4e8cd5f141297695982a93d337c 100644 (file)
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -1,5 +1,5 @@
 /* Target-dependent code for the 32-bit OpenRISC 1000, for the GDB.
-   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -33,7 +33,6 @@
 #include "block.h"
 #include "reggroups.h"
 #include "arch-utils.h"
-#include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "dwarf2-frame.h"
@@ -55,7 +54,7 @@ static int or1k_debug = 0;
 
 static void
 show_or1k_debug (struct ui_file *file, int from_tty,
-                 struct cmd_list_element *c, const char *value)
+                struct cmd_list_element *c, const char *value)
 {
   fprintf_filtered (file, _("OpenRISC debugging is %s.\n"), value);
 }
@@ -132,8 +131,8 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...)
 
          /* Check we got something, and if so skip on.  */
          if (start_ptr == end_ptr)
-           error ("bitstring \"%s\" at offset %d has no length field.\n",
-                       format, i);
+           error (_("bitstring \"%s\" at offset %d has no length field."),
+                  format, i);
 
          i += end_ptr - start_ptr;
 
@@ -141,8 +140,8 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...)
             still give a fatal error, because these are fixed strings that
             just should not be wrong.  */
          if ('b' != format[i++])
-           error ("bitstring \"%s\" at offset %d has no terminating 'b'.\n",
-                       format, i);
+           error (_("bitstring \"%s\" at offset %d has no terminating 'b'."),
+                  format, i);
 
          /* Break out the field.  There is a special case with a bit width
             of 32.  */
@@ -158,8 +157,8 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...)
          break;
 
        default:
-         error ("invalid character in bitstring \"%s\" at offset %d.\n",
-                     format, i);
+         error (_("invalid character in bitstring \"%s\" at offset %d."),
+                format, i);
          break;
        }
     }
@@ -297,7 +296,7 @@ or1k_return_value (struct gdbarch *gdbarch, struct value *functype,
          else
            memcpy (buf, writebuf, rv_size);
 
-         regcache_cooked_write (regcache, OR1K_RV_REGNUM, buf);
+         regcache->cooked_write (OR1K_RV_REGNUM, buf);
 
          free (buf);
        }
@@ -330,8 +329,8 @@ or1k_return_value (struct gdbarch *gdbarch, struct value *functype,
          memcpy (buf_hi, writebuf, rv_size - bpw);
          memcpy (buf_lo, writebuf + bpw, bpw);
 
-         regcache_cooked_write (regcache, OR1K_RV_REGNUM, buf_hi);
-         regcache_cooked_write (regcache, OR1K_RV_REGNUM + 1, buf_lo);
+         regcache->cooked_write (OR1K_RV_REGNUM, buf_hi);
+         regcache->cooked_write (OR1K_RV_REGNUM + 1, buf_lo);
 
          free (buf_lo);
          free (buf_hi);
@@ -372,9 +371,9 @@ or1k_single_step_through_delay (struct gdbarch *gdbarch,
     return 0;
 
   insn = cgen_lookup_insn (tdep->gdb_cgen_cpu_desc,
-                           NULL,
-                           or1k_fetch_instruction (gdbarch, ppc),
-                           NULL, 32, &tmp_fields, 0);
+                          NULL,
+                          or1k_fetch_instruction (gdbarch, ppc),
+                          NULL, 32, &tmp_fields, 0);
 
   /* NULL here would mean the last instruction was not understood by cgen.
      This should not usually happen, but if does its not a delay slot.  */
@@ -541,8 +540,8 @@ or1k_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
   pc = frame_unwind_register_unsigned (next_frame, OR1K_NPC_REGNUM);
 
   if (or1k_debug)
-    fprintf_unfiltered (gdb_stdlog, "or1k_unwind_pc, pc=0x%p\n",
-                       (void *) pc);
+    fprintf_unfiltered (gdb_stdlog, "or1k_unwind_pc, pc=%s\n",
+                       paddress (gdbarch, pc));
 
   return pc;
 }
@@ -561,8 +560,8 @@ or1k_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
   sp = frame_unwind_register_unsigned (next_frame, OR1K_SP_REGNUM);
 
   if (or1k_debug)
-    fprintf_unfiltered (gdb_stdlog, "or1k_unwind_sp, sp=0x%p\n",
-                       (void *) sp);
+    fprintf_unfiltered (gdb_stdlog, "or1k_unwind_sp, sp=%s\n",
+                       paddress (gdbarch, sp));
 
   return sp;
 }
@@ -595,7 +594,8 @@ static CORE_ADDR
 or1k_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 argreg;
@@ -617,7 +617,7 @@ or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
 
   /* Location for a returned structure.  This is passed as a silent first
      argument.  */
-  if (struct_return)
+  if (return_method == return_method_struct)
     {
       regcache_cooked_write_unsigned (regcache, OR1K_FIRST_ARG_REGNUM,
                                      struct_addr);
@@ -882,8 +882,8 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
 
   if (or1k_debug)
     fprintf_unfiltered (gdb_stdlog,
-                       "or1k_frame_cache, prologue_cache = 0x%p\n",
-                       *prologue_cache);
+                       "or1k_frame_cache, prologue_cache = %s\n",
+                       host_address_to_string (*prologue_cache));
 
   /* Nothing to do if we already have this info.  */
   if (NULL != *prologue_cache)
@@ -942,8 +942,8 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
      have executed the code.  Check we have a sane prologue size, and if
      zero we are frameless and can give up here.  */
   if (end_addr < start_addr)
-    error ("end addr 0x%08x is less than start addr 0x%08x\n",
-               (unsigned int) end_addr, (unsigned int) start_addr);
+    error (_("end addr %s is less than start addr %s"),
+          paddress (gdbarch, end_addr), paddress (gdbarch, start_addr));
 
   if (end_addr == start_addr)
     frame_size = 0;
@@ -1068,10 +1068,10 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
 
   if (or1k_debug)
     {
-      fprintf_unfiltered (gdb_stdlog, "  this_sp_for_id = 0x%p\n",
-                         (void *) this_sp_for_id);
-      fprintf_unfiltered (gdb_stdlog, "  start_addr     = 0x%p\n",
-                         (void *) start_addr);
+      fprintf_unfiltered (gdb_stdlog, "  this_sp_for_id = %s\n",
+                         paddress (gdbarch, this_sp_for_id));
+      fprintf_unfiltered (gdb_stdlog, "  start_addr     = %s\n",
+                         paddress (gdbarch, start_addr));
     }
 
   return info;
@@ -1255,6 +1255,9 @@ or1k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       tdesc_use_registers (gdbarch, tdesc, tdesc_data);
     }
 
+  /* Hook in ABI-specific overrides, if they have been registered.  */
+  gdbarch_init_osabi (info, gdbarch);
+
   return gdbarch;
 }