gdb: remove duplicate declaration of 'find_thread_ptid'

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

diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index 75df206a2bd409eeebef9074cbbac842d08b80be..db6c41b32f257e85b54c58985ec9165b8ad19239 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-2020 Free Software Foundation, Inc.
+   Copyright (C) 2008-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -635,7 +635,7 @@ or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
       int len = TYPE_LENGTH (arg_type);
       enum type_code typecode = arg_type->code ();
 
-      if (TYPE_VARARGS (func_type) && argnum >= func_type->num_fields ())
+      if (func_type->has_varargs () && argnum >= func_type->num_fields ())
        break; /* end or regular args, varargs go to stack.  */
 
       /* Extract the value, either a reference or the data.  */
@@ -757,7 +757,7 @@ or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
       int len = TYPE_LENGTH (arg_type);
       enum type_code typecode = arg_type->code ();
       /* The EABI passes structures that do not fit in a register by
-         reference.  In all other cases, pass the structure by value.  */
+        reference.  In all other cases, pass the structure by value.  */
       if ((TYPE_CODE_STRUCT == typecode) || (TYPE_CODE_UNION == typecode)
          || (len > bpw * 2))
        {
@@ -974,8 +974,8 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
          else
            {
              /* We are past this point, so the stack pointer of the prev
-                frame is frame_size greater than the stack pointer of this
-                frame.  */
+                frame is frame_size greater than the stack pointer of this
+                frame.  */
              trad_frame_set_reg_value (info, OR1K_SP_REGNUM,
                                        this_sp + frame_size);
            }
@@ -1008,7 +1008,7 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
              inst = or1k_fetch_instruction (gdbarch, addr);
 
              /* If we have got this far, the stack pointer of the previous
-                frame is the frame pointer of this frame.  */
+                frame is the frame pointer of this frame.  */
              trad_frame_set_reg_realreg (info, OR1K_SP_REGNUM,
                                          OR1K_FP_REGNUM);
            }
@@ -1047,7 +1047,7 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache)
              inst = or1k_fetch_instruction (gdbarch, addr);
 
              /* The register in the previous frame can be found at this
-                location in this frame.  */
+                location in this frame.  */
              trad_frame_set_reg_addr (info, rb, this_sp + simm);
            }
          else
@@ -1113,7 +1113,7 @@ or1k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   struct gdbarch *gdbarch;
   struct gdbarch_tdep *tdep;
   const struct bfd_arch_info *binfo;
-  struct tdesc_arch_data *tdesc_data = NULL;
+  tdesc_arch_data_up tdesc_data;
   const struct target_desc *tdesc = info.target_desc;
 
   /* Find a candidate among the list of pre-declared architectures.  */
@@ -1214,21 +1214,18 @@ or1k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
       feature = tdesc_find_feature (tdesc, "org.gnu.gdb.or1k.group0");
       if (feature == NULL)
-        return NULL;
+       return NULL;
 
       tdesc_data = tdesc_data_alloc ();
 
       valid_p = 1;
 
       for (i = 0; i < OR1K_NUM_REGS; i++)
-        valid_p &= tdesc_numbered_register (feature, tdesc_data, i,
-                                            or1k_reg_names[i]);
+       valid_p &= tdesc_numbered_register (feature, tdesc_data.get (), i,
+                                           or1k_reg_names[i]);
 
       if (!valid_p)
-        {
-          tdesc_data_cleanup (tdesc_data);
-          return NULL;
-        }
+       return NULL;
     }
 
   if (tdesc_data != NULL)
@@ -1243,7 +1240,7 @@ or1k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       reggroup_add (gdbarch, save_reggroup);
       reggroup_add (gdbarch, restore_reggroup);
 
-      tdesc_use_registers (gdbarch, tdesc, tdesc_data);
+      tdesc_use_registers (gdbarch, tdesc, std::move (tdesc_data));
     }
 
   /* Hook in ABI-specific overrides, if they have been registered.  */