projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbserver: make aarch64_write_goto_address static
[deliverable/binutils-gdb.git]
/
gdb
/
tracepoint.c
diff --git
a/gdb/tracepoint.c
b/gdb/tracepoint.c
index ed1d75e170e1deec7fa229e2b58b0e8d6aa249a3..a934e56d3b97d59997bb7c15be3b0e0713c8bd6f 100644
(file)
--- a/
gdb/tracepoint.c
+++ b/
gdb/tracepoint.c
@@
-1,6
+1,6
@@
/* Tracing functionality for remote targets in custom GDB protocol
/* Tracing functionality for remote targets in custom GDB protocol
- Copyright (C) 1997-20
19
Free Software Foundation, Inc.
+ Copyright (C) 1997-20
20
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-51,19
+51,12
@@
#include "memrange.h"
#include "cli/cli-utils.h"
#include "probe.h"
#include "memrange.h"
#include "cli/cli-utils.h"
#include "probe.h"
-#include "ctf.h"
#include "gdbsupport/filestuff.h"
#include "gdbsupport/rsp-low.h"
#include "tracefile.h"
#include "location.h"
#include <algorithm>
#include "gdbsupport/filestuff.h"
#include "gdbsupport/rsp-low.h"
#include "tracefile.h"
#include "location.h"
#include <algorithm>
-
-/* readline include files */
-#include "readline/readline.h"
-#include "readline/history.h"
-
-/* readline defines this. */
-#undef savestring
+#include "cli/cli-style.h"
#include <unistd.h>
#include <unistd.h>
@@
-138,12
+131,12
@@
static struct cmd_list_element *tfindlist;
/* List of expressions to collect by default at each tracepoint hit. */
char *default_collect;
/* List of expressions to collect by default at each tracepoint hit. */
char *default_collect;
-static
int
disconnected_tracing;
+static
bool
disconnected_tracing;
/* This variable controls whether we ask the target for a linear or
circular trace buffer. */
/* This variable controls whether we ask the target for a linear or
circular trace buffer. */
-static
int
circular_trace_buffer;
+static
bool
circular_trace_buffer;
/* This variable is the requested trace buffer size, or -1 to indicate
that we don't care and leave it up to the target to set a size. */
/* This variable is the requested trace buffer size, or -1 to indicate
that we don't care and leave it up to the target to set a size. */
@@
-243,11
+236,11
@@
set_traceframe_context (struct frame_info *trace_frame)
/* Save func name as "$trace_func", a debugger variable visible to
users. */
if (traceframe_fun == NULL
/* Save func name as "$trace_func", a debugger variable visible to
users. */
if (traceframe_fun == NULL
- ||
SYMBOL_LINKAGE_NAME (traceframe_fun
) == NULL)
+ ||
traceframe_fun->linkage_name (
) == NULL)
clear_internalvar (lookup_internalvar ("trace_func"));
else
set_internalvar_string (lookup_internalvar ("trace_func"),
clear_internalvar (lookup_internalvar ("trace_func"));
else
set_internalvar_string (lookup_internalvar ("trace_func"),
-
SYMBOL_LINKAGE_NAME (traceframe_fun
));
+
traceframe_fun->linkage_name (
));
/* Save file name as "$trace_file", a debugger variable visible to
users. */
/* Save file name as "$trace_file", a debugger variable visible to
users. */
@@
-442,6
+435,7
@@
tvariables_info_1 (void)
uiout->field_string ("name", std::string ("$") + tsv.name);
uiout->field_string ("initial", plongest (tsv.initial_value));
uiout->field_string ("name", std::string ("$") + tsv.name);
uiout->field_string ("initial", plongest (tsv.initial_value));
+ ui_file_style style;
if (tsv.value_known)
c = plongest (tsv.value);
else if (uiout->is_mi_like_p ())
if (tsv.value_known)
c = plongest (tsv.value);
else if (uiout->is_mi_like_p ())
@@
-450,13
+444,19
@@
tvariables_info_1 (void)
undefined does not seem important enough to represent. */
c = NULL;
else if (current_trace_status ()->running || traceframe_number >= 0)
undefined does not seem important enough to represent. */
c = NULL;
else if (current_trace_status ()->running || traceframe_number >= 0)
- /* The value is/was defined, but we don't have it. */
- c = "<unknown>";
+ {
+ /* The value is/was defined, but we don't have it. */
+ c = "<unknown>";
+ style = metadata_style.style ();
+ }
else
else
- /* It is not meaningful to ask about the value. */
- c = "<undefined>";
+ {
+ /* It is not meaningful to ask about the value. */
+ c = "<undefined>";
+ style = metadata_style.style ();
+ }
if (c)
if (c)
- uiout->field_string ("current", c);
+ uiout->field_string ("current", c
, style
);
uiout->text ("\n");
}
}
uiout->text ("\n");
}
}
@@
-693,7
+693,7
@@
validate_actionline (const char *line, struct breakpoint *b)
{
error (_("constant `%s' (value %s) "
"will not be collected."),
{
error (_("constant `%s' (value %s) "
"will not be collected."),
-
SYMBOL_PRINT_NAME (exp->elts[2].symbol
),
+
exp->elts[2].symbol->print_name (
),
plongest (SYMBOL_VALUE (exp->elts[2].symbol)));
}
else if (SYMBOL_CLASS (exp->elts[2].symbol)
plongest (SYMBOL_VALUE (exp->elts[2].symbol)));
}
else if (SYMBOL_CLASS (exp->elts[2].symbol)
@@
-701,7
+701,7
@@
validate_actionline (const char *line, struct breakpoint *b)
{
error (_("`%s' is optimized away "
"and cannot be collected."),
{
error (_("`%s' is optimized away "
"and cannot be collected."),
-
SYMBOL_PRINT_NAME (exp->elts[2].symbol
));
+
exp->elts[2].symbol->print_name (
));
}
}
}
}
@@
-926,19
+926,18
@@
collection_list::collect_symbol (struct symbol *sym,
{
default:
printf_filtered ("%s: don't know symbol class %d\n",
{
default:
printf_filtered ("%s: don't know symbol class %d\n",
- SYMBOL_PRINT_NAME (sym),
- SYMBOL_CLASS (sym));
+ sym->print_name (), SYMBOL_CLASS (sym));
break;
case LOC_CONST:
printf_filtered ("constant %s (value %s) will not be collected.\n",
break;
case LOC_CONST:
printf_filtered ("constant %s (value %s) will not be collected.\n",
-
SYMBOL_PRINT_NAME (sym
), plongest (SYMBOL_VALUE (sym)));
+
sym->print_name (
), plongest (SYMBOL_VALUE (sym)));
break;
case LOC_STATIC:
offset = SYMBOL_VALUE_ADDRESS (sym);
if (info_verbose)
{
printf_filtered ("LOC_STATIC %s: collect %ld bytes at %s.\n",
break;
case LOC_STATIC:
offset = SYMBOL_VALUE_ADDRESS (sym);
if (info_verbose)
{
printf_filtered ("LOC_STATIC %s: collect %ld bytes at %s.\n",
-
SYMBOL_PRINT_NAME (sym
), len,
+
sym->print_name (
), len,
paddress (gdbarch, offset));
}
/* A struct may be a C++ class with static fields, go to general
paddress (gdbarch, offset));
}
/* A struct may be a C++ class with static fields, go to general
@@
-951,8
+950,7
@@
collection_list::collect_symbol (struct symbol *sym,
case LOC_REGISTER:
reg = SYMBOL_REGISTER_OPS (sym)->register_number (sym, gdbarch);
if (info_verbose)
case LOC_REGISTER:
reg = SYMBOL_REGISTER_OPS (sym)->register_number (sym, gdbarch);
if (info_verbose)
- printf_filtered ("LOC_REG[parm] %s: ",
- SYMBOL_PRINT_NAME (sym));
+ printf_filtered ("LOC_REG[parm] %s: ", sym->print_name ());
add_local_register (gdbarch, reg, scope);
/* Check for doubles stored in two registers. */
/* FIXME: how about larger types stored in 3 or more regs? */
add_local_register (gdbarch, reg, scope);
/* Check for doubles stored in two registers. */
/* FIXME: how about larger types stored in 3 or more regs? */
@@
-962,8
+960,7
@@
collection_list::collect_symbol (struct symbol *sym,
break;
case LOC_REF_ARG:
printf_filtered ("Sorry, don't know how to do LOC_REF_ARG yet.\n");
break;
case LOC_REF_ARG:
printf_filtered ("Sorry, don't know how to do LOC_REF_ARG yet.\n");
- printf_filtered (" (will not collect %s)\n",
- SYMBOL_PRINT_NAME (sym));
+ printf_filtered (" (will not collect %s)\n", sym->print_name ());
break;
case LOC_ARG:
reg = frame_regno;
break;
case LOC_ARG:
reg = frame_regno;
@@
-971,8
+968,7
@@
collection_list::collect_symbol (struct symbol *sym,
if (info_verbose)
{
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
if (info_verbose)
{
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
- " from frame ptr reg %d\n",
- SYMBOL_PRINT_NAME (sym), len,
+ " from frame ptr reg %d\n", sym->print_name (), len,
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
@@
-983,8
+979,7
@@
collection_list::collect_symbol (struct symbol *sym,
if (info_verbose)
{
printf_filtered ("LOC_REGPARM_ADDR %s: Collect %ld bytes at offset %s"
if (info_verbose)
{
printf_filtered ("LOC_REGPARM_ADDR %s: Collect %ld bytes at offset %s"
- " from reg %d\n",
- SYMBOL_PRINT_NAME (sym), len,
+ " from reg %d\n", sym->print_name (), len,
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
@@
-995,8
+990,7
@@
collection_list::collect_symbol (struct symbol *sym,
if (info_verbose)
{
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
if (info_verbose)
{
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
- " from frame ptr reg %d\n",
- SYMBOL_PRINT_NAME (sym), len,
+ " from frame ptr reg %d\n", sym->print_name (), len,
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
paddress (gdbarch, offset), reg);
}
add_memrange (gdbarch, reg, offset, len, scope);
@@
-1008,7
+1002,7
@@
collection_list::collect_symbol (struct symbol *sym,
case LOC_OPTIMIZED_OUT:
printf_filtered ("%s has been optimized out of existence.\n",
case LOC_OPTIMIZED_OUT:
printf_filtered ("%s has been optimized out of existence.\n",
-
SYMBOL_PRINT_NAME (sym
));
+
sym->print_name (
));
break;
case LOC_COMPUTED:
break;
case LOC_COMPUTED:
@@
-1028,7
+1022,7
@@
collection_list::collect_symbol (struct symbol *sym,
if (!aexpr)
{
printf_filtered ("%s has been optimized out of existence.\n",
if (!aexpr)
{
printf_filtered ("%s has been optimized out of existence.\n",
-
SYMBOL_PRINT_NAME (sym
));
+
sym->print_name (
));
return;
}
return;
}
@@
-1424,7
+1418,7
@@
encode_actions_1 (struct command_line *action,
case OP_VAR_VALUE:
{
struct symbol *sym = exp->elts[2].symbol;
case OP_VAR_VALUE:
{
struct symbol *sym = exp->elts[2].symbol;
- const char *name =
SYMBOL_NATURAL_NAME (sym
);
+ const char *name =
sym->natural_name (
);
collect->collect_symbol (exp->elts[2].symbol,
target_gdbarch (),
collect->collect_symbol (exp->elts[2].symbol,
target_gdbarch (),
@@
-2136,7
+2130,7
@@
tfind_1 (enum trace_find_type type, int num,
DON'T give an error, but DO change the state of
traceframe_number etc. to invalid.
DON'T give an error, but DO change the state of
traceframe_number etc. to invalid.
- The rational
l
e is that if you typed the command, you
+ The rationale is that if you typed the command, you
might just have committed a typo or something, and you'd
like to NOT lose your current debugging state. However
if you're in a user-defined command or especially in a
might just have committed a typo or something, and you'd
like to NOT lose your current debugging state. However
if you're in a user-defined command or especially in a
@@
-2526,7
+2520,7
@@
info_scope_command (const char *args_in, int from_tty)
printf_filtered ("Scope for %s:\n", save_args);
count++;
printf_filtered ("Scope for %s:\n", save_args);
count++;
- symname =
SYMBOL_PRINT_NAME (sym
);
+ symname =
sym->print_name (
);
if (symname == NULL || *symname == '\0')
continue; /* Probably botched, certainly useless. */
if (symname == NULL || *symname == '\0')
continue; /* Probably botched, certainly useless. */
@@
-2616,7
+2610,7
@@
info_scope_command (const char *args_in, int from_tty)
paddress (gdbarch, BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym))));
break;
case LOC_UNRESOLVED:
paddress (gdbarch, BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym))));
break;
case LOC_UNRESOLVED:
- msym = lookup_minimal_symbol (
SYMBOL_LINKAGE_NAME (sym
),
+ msym = lookup_minimal_symbol (
sym->linkage_name (
),
NULL, NULL);
if (msym.minsym == NULL)
printf_filtered ("Unresolved Static");
NULL, NULL);
if (msym.minsym == NULL)
printf_filtered ("Unresolved Static");
@@
-3689,8
+3683,8
@@
print_one_static_tracepoint_marker (int count,
if (sym)
{
uiout->text ("in ");
if (sym)
{
uiout->text ("in ");
- uiout->field_string ("func",
SYMBOL_PRINT_NAME (sym
),
-
ui_out_style_kind::FUNCTION
);
+ uiout->field_string ("func",
sym->print_name (
),
+
function_name_style.style ()
);
uiout->wrap_hint (wrap_indent);
uiout->text (" at ");
}
uiout->wrap_hint (wrap_indent);
uiout->text (" at ");
}
@@
-3701,7
+3695,7
@@
print_one_static_tracepoint_marker (int count,
{
uiout->field_string ("file",
symtab_to_filename_for_display (sal.symtab),
{
uiout->field_string ("file",
symtab_to_filename_for_display (sal.symtab),
-
ui_out_style_kind::FILE
);
+
file_name_style.style ()
);
uiout->text (":");
if (uiout->is_mi_like_p ())
uiout->text (":");
if (uiout->is_mi_like_p ())
This page took
0.027104 seconds
and
4
git commands to generate.