projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename common to gdbsupport
[deliverable/binutils-gdb.git]
/
gdb
/
tracepoint.c
diff --git
a/gdb/tracepoint.c
b/gdb/tracepoint.c
index c74e7500f4e38c97131070b36b0817d04ba04681..5674400776a79d7243f411afca6e507066de665e 100644
(file)
--- a/
gdb/tracepoint.c
+++ b/
gdb/tracepoint.c
@@
-52,8
+52,8
@@
#include "cli/cli-utils.h"
#include "probe.h"
#include "ctf.h"
#include "cli/cli-utils.h"
#include "probe.h"
#include "ctf.h"
-#include "filestuff.h"
-#include "rsp-low.h"
+#include "
gdbsupport/
filestuff.h"
+#include "
gdbsupport/
rsp-low.h"
#include "tracefile.h"
#include "location.h"
#include <algorithm>
#include "tracefile.h"
#include "location.h"
#include <algorithm>
@@
-2636,8
+2636,11
@@
info_scope_command (const char *args_in, int from_tty)
}
}
if (SYMBOL_TYPE (sym))
}
}
if (SYMBOL_TYPE (sym))
- printf_filtered (", length %d.\n",
- TYPE_LENGTH (check_typedef (SYMBOL_TYPE (sym))));
+ {
+ struct type *t = check_typedef (SYMBOL_TYPE (sym));
+
+ printf_filtered (", length %s.\n", pulongest (TYPE_LENGTH (t)));
+ }
}
if (BLOCK_FUNCTION (block))
break;
}
if (BLOCK_FUNCTION (block))
break;
@@
-3083,7
+3086,8
@@
find_matching_tracepoint_location (struct uploaded_tp *utp)
if (b->type == utp->type
&& t->step_count == utp->step
&& t->pass_count == utp->pass
if (b->type == utp->type
&& t->step_count == utp->step
&& t->pass_count == utp->pass
- && cond_string_is_same (t->cond_string, utp->cond_string)
+ && cond_string_is_same (t->cond_string,
+ utp->cond_string.get ())
/* FIXME also test actions. */
)
{
/* FIXME also test actions. */
)
{
@@
-3462,7
+3466,7
@@
parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
int enabled, end;
enum bptype type;
const char *srctype;
int enabled, end;
enum bptype type;
const char *srctype;
- char *
cond, *
buf;
+ char *buf;
struct uploaded_tp *utp = NULL;
p = line;
struct uploaded_tp *utp = NULL;
p = line;
@@
-3475,13
+3479,14
@@
parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
p++; /* skip a colon */
if (piece == 'T')
{
p++; /* skip a colon */
if (piece == 'T')
{
+ gdb::unique_xmalloc_ptr<char[]> cond;
+
enabled = (*p++ == 'E');
p++; /* skip a colon */
p = unpack_varlen_hex (p, &step);
p++; /* skip a colon */
p = unpack_varlen_hex (p, &pass);
type = bp_tracepoint;
enabled = (*p++ == 'E');
p++; /* skip a colon */
p = unpack_varlen_hex (p, &step);
p++; /* skip a colon */
p = unpack_varlen_hex (p, &pass);
type = bp_tracepoint;
- cond = NULL;
/* Thumb through optional fields. */
while (*p == ':')
{
/* Thumb through optional fields. */
while (*p == ':')
{
@@
-3502,8
+3507,8
@@
parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
p++;
p = unpack_varlen_hex (p, &xlen);
p++; /* skip a comma */
p++;
p = unpack_varlen_hex (p, &xlen);
p++; /* skip a comma */
- cond
= (char *) xmalloc (2 * xlen + 1
);
- strncpy (
cond
, p, 2 * xlen);
+ cond
.reset ((char *) xmalloc (2 * xlen + 1)
);
+ strncpy (
&cond[0]
, p, 2 * xlen);
cond[2 * xlen] = '\0';
p += 2 * xlen;
}
cond[2 * xlen] = '\0';
p += 2 * xlen;
}
@@
-3516,17
+3521,17
@@
parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
utp->enabled = enabled;
utp->step = step;
utp->pass = pass;
utp->enabled = enabled;
utp->step = step;
utp->pass = pass;
- utp->cond =
cond
;
+ utp->cond =
std::move (cond)
;
}
else if (piece == 'A')
{
utp = get_uploaded_tp (num, addr, utpp);
}
else if (piece == 'A')
{
utp = get_uploaded_tp (num, addr, utpp);
- utp->actions.
push
_back (xstrdup (p));
+ utp->actions.
emplace
_back (xstrdup (p));
}
else if (piece == 'S')
{
utp = get_uploaded_tp (num, addr, utpp);
}
else if (piece == 'S')
{
utp = get_uploaded_tp (num, addr, utpp);
- utp->step_actions.
push
_back (xstrdup (p));
+ utp->step_actions.
emplace
_back (xstrdup (p));
}
else if (piece == 'Z')
{
}
else if (piece == 'Z')
{
@@
-3546,11
+3551,11
@@
parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
buf[end] = '\0';
if (startswith (srctype, "at:"))
buf[end] = '\0';
if (startswith (srctype, "at:"))
- utp->at_string
= xstrdup (buf
);
+ utp->at_string
.reset (xstrdup (buf)
);
else if (startswith (srctype, "cond:"))
else if (startswith (srctype, "cond:"))
- utp->cond_string
= xstrdup (buf
);
+ utp->cond_string
.reset (xstrdup (buf)
);
else if (startswith (srctype, "cmd:"))
else if (startswith (srctype, "cmd:"))
- utp->cmd_strings.
push
_back (xstrdup (buf));
+ utp->cmd_strings.
emplace
_back (xstrdup (buf));
}
else if (piece == 'V')
{
}
else if (piece == 'V')
{
@@
-4019,13
+4024,11
@@
If no arguments are supplied, delete all variables."), &deletelist);
/* FIXME add a trace variable completer. */
add_info ("tvariables", info_tvariables_command, _("\
/* FIXME add a trace variable completer. */
add_info ("tvariables", info_tvariables_command, _("\
-Status of trace state variables and their values.\n\
-"));
+Status of trace state variables and their values."));
add_info ("static-tracepoint-markers",
info_static_tracepoint_markers_command, _("\
add_info ("static-tracepoint-markers",
info_static_tracepoint_markers_command, _("\
-List target static tracepoints markers.\n\
-"));
+List target static tracepoints markers."));
add_prefix_cmd ("tfind", class_trace, tfind_command, _("\
Select a trace frame;\n\
add_prefix_cmd ("tfind", class_trace, tfind_command, _("\
Select a trace frame;\n\
This page took
0.027027 seconds
and
4
git commands to generate.