opcodes error messages

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

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 59a7b64ae88811e710057d67ee2c454e01a7633a..f34f103875715f6d565bb2884f5eaad0e5625f8e 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1,6 +1,6 @@
 /* Tracing functionality for remote targets in custom GDB protocol
 
-   Copyright (C) 1997-2017 Free Software Foundation, Inc.
+   Copyright (C) 1997-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1654,11 +1654,9 @@ start_tracing (const char *notes)
       t->number_on_target = b->number;
 
       for (loc = b->loc; loc; loc = loc->next)
-       if (loc->probe.probe != NULL
-           && loc->probe.probe->pops->set_semaphore != NULL)
-         loc->probe.probe->pops->set_semaphore (loc->probe.probe,
-                                                loc->probe.objfile,
-                                                loc->gdbarch);
+       if (loc->probe.prob != NULL)
+         loc->probe.prob->set_semaphore (loc->probe.objfile,
+                                         loc->gdbarch);
 
       if (bp_location_downloaded)
        observer_notify_breakpoint_modified (b);
@@ -1754,11 +1752,9 @@ stop_tracing (const char *note)
             but we don't really care if this semaphore goes out of sync.
             That's why we are decrementing it here, but not taking care
             in other places.  */
-         if (loc->probe.probe != NULL
-             && loc->probe.probe->pops->clear_semaphore != NULL)
-           loc->probe.probe->pops->clear_semaphore (loc->probe.probe,
-                                                    loc->probe.objfile,
-                                                    loc->gdbarch);
+         if (loc->probe.prob != NULL)
+           loc->probe.prob->clear_semaphore (loc->probe.objfile,
+                                             loc->gdbarch);
        }
     }
 
@@ -3269,7 +3265,6 @@ create_tsv_from_upload (struct uploaded_tsv *utsv)
   std::string buf;
   int try_num = 0;
   struct trace_state_variable *tsv;
-  struct cleanup *old_chain;
 
   if (utsv->name)
     {
@@ -3964,15 +3959,16 @@ parse_traceframe_info (const char *tframe_info)
 static void
 traceframe_info_start_memory (struct gdb_xml_parser *parser,
                              const struct gdb_xml_element *element,
-                             void *user_data, VEC(gdb_xml_value_s) *attributes)
+                             void *user_data,
+                             std::vector<gdb_xml_value> &attributes)
 {
   struct traceframe_info *info = (struct traceframe_info *) user_data;
   ULONGEST *start_p, *length_p;
 
   start_p
-    = (ULONGEST *) xml_find_attribute (attributes, "start")->value;
+    = (ULONGEST *) xml_find_attribute (attributes, "start")->value.get ();
   length_p
-    = (ULONGEST *) xml_find_attribute (attributes, "length")->value;
+    = (ULONGEST *) xml_find_attribute (attributes, "length")->value.get ();
 
   info->memory.emplace_back (*start_p, *length_p);
 }
@@ -3983,11 +3979,11 @@ static void
 traceframe_info_start_tvar (struct gdb_xml_parser *parser,
                             const struct gdb_xml_element *element,
                             void *user_data,
-                            VEC(gdb_xml_value_s) *attributes)
+                            std::vector<gdb_xml_value> &attributes)
 {
   struct traceframe_info *info = (struct traceframe_info *) user_data;
   const char *id_attrib
-    = (const char *) xml_find_attribute (attributes, "id")->value;
+    = (const char *) xml_find_attribute (attributes, "id")->value.get ();
   int id = gdb_xml_parse_ulongest (parser, id_attrib);
 
   info->tvars.push_back (id);