gdb/copyright.py: Remove testsuite/gdb.base/step-line.{c,inp} special handling

[deliverable/binutils-gdb.git] / gdb / ctf.c

diff --git a/gdb/ctf.c b/gdb/ctf.c
index d719163b35ab610236fc496bc7f322c8f124d88d..e9bd6fe58088473f7cd320bba815d02eab075260 100644 (file)
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -313,7 +313,6 @@ ctf_start (struct trace_file_writer *self, const char *dirname)
 {
   struct ctf_trace_file_writer *writer
     = (struct ctf_trace_file_writer *) self;
-  int i;
   mode_t hmode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH;
 
   /* Create DIRNAME.  */
@@ -453,7 +452,6 @@ ctf_write_status (struct trace_file_writer *self,
   struct ctf_trace_file_writer *writer
     = (struct ctf_trace_file_writer *) self;
   uint32_t id;
-  int32_t int32;
 
   ctf_save_write_metadata (&writer->tcs, "\n");
   ctf_save_write_metadata (&writer->tcs,
@@ -496,7 +494,6 @@ ctf_write_uploaded_tsv (struct trace_file_writer *self,
     = (struct ctf_trace_file_writer *) self;
   int32_t int32;
   int64_t int64;
-  unsigned int len;
   const gdb_byte zero = 0;
 
   /* Event Id.  */
@@ -618,9 +615,6 @@ ctf_write_tdesc (struct trace_file_writer *self)
 static void
 ctf_write_definition_end (struct trace_file_writer *self)
 {
-  struct ctf_trace_file_writer *writer
-    = (struct ctf_trace_file_writer *) self;
-
   self->ops->frame_ops->end (self);
 }
 
@@ -859,7 +853,6 @@ static void
 ctf_open_dir (const char *dirname)
 {
   struct bt_iter_pos begin_pos;
-  struct bt_iter_pos *pos;
   unsigned int count, i;
   struct bt_ctf_event_decl * const *list;
 
@@ -889,7 +882,6 @@ ctf_open_dir (const char *dirname)
   for (i = 0; i < count; i++)
     if (strcmp ("register", bt_ctf_get_decl_event_name (list[i])) == 0)
       {
-       unsigned int j;
        const struct bt_ctf_field_decl * const *field_list;
        const struct bt_declaration *decl;
 
@@ -1186,7 +1178,7 @@ static void
 ctf_fetch_registers (struct target_ops *ops,
                     struct regcache *regcache, int regno)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch *gdbarch = regcache->arch ();
   struct bt_ctf_event *event = NULL;
   struct bt_iter_pos *pos;
 
@@ -1284,7 +1276,6 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
   if (get_traceframe_number () != -1)
     {
       struct bt_iter_pos *pos;
-      int i = 0;
       enum target_xfer_status res;
       /* Records the lowest available address of all blocks that
         intersects the requested range.  */
@@ -1302,8 +1293,6 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
          ULONGEST amt;
          uint64_t maddr;
          uint16_t mlen;
-         enum bfd_endian byte_order
-           = gdbarch_byte_order (target_gdbarch ());
          const struct bt_definition *scope;
          const struct bt_definition *def;
          struct bt_ctf_event *event
@@ -1336,8 +1325,6 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
            {
              const struct bt_definition *array
                = bt_ctf_get_field (event, scope, "contents");
-             const struct bt_declaration *decl
-               = bt_ctf_get_decl_from_def (array);
              gdb_byte *contents;
              int k;
 
@@ -1534,10 +1521,8 @@ static int
 ctf_trace_find (struct target_ops *self, enum trace_find_type type, int num,
                CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
 {
-  int ret = -1;
   int tfnum = 0;
   int found = 0;
-  struct bt_iter_pos pos;
 
   if (num == -1)
     {
@@ -1552,7 +1537,6 @@ ctf_trace_find (struct target_ops *self, enum trace_find_type type, int num,
 
   while (1)
     {
-      int id;
       struct bt_ctf_event *event;
       const char *name;
 
@@ -1635,10 +1619,10 @@ ctf_trace_find (struct target_ops *self, enum trace_find_type type, int num,
    frame, extract memory range information, and return them in
    traceframe_info.  */
 
-static struct traceframe_info *
+static traceframe_info_up
 ctf_traceframe_info (struct target_ops *self)
 {
-  struct traceframe_info *info = XCNEW (struct traceframe_info);
+  traceframe_info_up info (new traceframe_info);
   const char *name;
   struct bt_iter_pos *pos;
 
@@ -1663,14 +1647,14 @@ ctf_traceframe_info (struct target_ops *self)
            = bt_ctf_get_top_level_scope (event,
                                          BT_EVENT_FIELDS);
          const struct bt_definition *def;
-         struct mem_range *r;
 
-         r = VEC_safe_push (mem_range_s, info->memory, NULL);
          def = bt_ctf_get_field (event, scope, "address");
-         r->start = bt_ctf_get_uint64 (def);
+         CORE_ADDR start = bt_ctf_get_uint64 (def);
 
          def = bt_ctf_get_field (event, scope, "length");
-         r->length = (uint16_t) bt_ctf_get_uint64 (def);
+         int length = (uint16_t) bt_ctf_get_uint64 (def);
+
+         info->memory.emplace_back (start, length);
        }
       else if (strcmp (name, "tsv") == 0)
        {
@@ -1682,7 +1666,7 @@ ctf_traceframe_info (struct target_ops *self)
 
          def = bt_ctf_get_field (event, scope, "num");
          vnum = (int) bt_ctf_get_uint64 (def);
-         VEC_safe_push (int, info->tvars, vnum);
+         info->tvars.push_back (vnum);
        }
       else
        {