espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-04 22:15:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrace: change branch trace data structure

Browse Source 
The branch trace is represented as 3 vectors:
  - a block vector
  - a instruction vector
  - a function vector

Each vector (except for the first) is computed from the one above.

Change this into a graph where a node represents a sequence of instructions
belonging to the same function and where we have three types of edges to connect
the function segments:
  - control flow
  - same function (instance)
  - call stack

This allows us to navigate in the branch trace.  We will need this for "record
goto" and reverse execution.

This patch introduces the data structure and computes the control flow edges.
It also introduces iterator structs to simplify iterating over the branch trace
in control-flow order.

It also fixes PR gdb/15240 since now recursive calls are handled correctly.
Fix the test that got the number of expected fib instances and also the
function numbers wrong.

The current instruction had been part of the branch trace.  This will look odd
once we start support for reverse execution.  Remove it.  We still keep it in
the trace itself to allow extending the branch trace more easily in the future.

2014-01-16  Markus Metzger  <markus.t.metzger@intel.com>

	* btrace.h (struct btrace_func_link): New.
	(enum btrace_function_flag): New.
	(struct btrace_inst): Rename to ...
	(struct btrace_insn): ...this. Update all users.
	(struct btrace_func) <ibegin, iend>: Remove.
	(struct btrace_func_link): New.
	(struct btrace_func): Rename to ...
	(struct btrace_function): ...this. Update all users.
	(struct btrace_function) <segment, flow, up, insn, insn_offset)
	(number, level, flags>: New.
	(struct btrace_insn_iterator): Rename to ...
	(struct btrace_insn_history): ...this.
	Update all users.
	(struct btrace_insn_iterator, btrace_call_iterator): New.
	(struct btrace_target_info) <btrace, itrace, ftrace>: Remove.
	(struct btrace_target_info) <begin, end, level>
	<insn_history, call_history>: New.
	(btrace_insn_get, btrace_insn_number, btrace_insn_begin)
	(btrace_insn_end, btrace_insn_prev, btrace_insn_next)
	(btrace_insn_cmp, btrace_find_insn_by_number, btrace_call_get)
	(btrace_call_number, btrace_call_begin, btrace_call_end)
	(btrace_call_prev, btrace_call_next, btrace_call_cmp)
	(btrace_find_function_by_number, btrace_set_insn_history)
	(btrace_set_call_history): New.
	* btrace.c (btrace_init_insn_iterator)
	(btrace_init_func_iterator, compute_itrace): Remove.
	(ftrace_print_function_name, ftrace_print_filename)
	(ftrace_skip_file): Change
	parameter to const.
	(ftrace_init_func): Remove.
	(ftrace_debug): Use new btrace_function fields.
	(ftrace_function_switched): Also consider gaining and
	losing symbol information).
	(ftrace_print_insn_addr, ftrace_new_call, ftrace_new_return)
	(ftrace_new_switch, ftrace_find_caller, ftrace_new_function)
	(ftrace_update_caller, ftrace_fixup_caller, ftrace_new_tailcall):
	New.
	(ftrace_new_function): Move. Remove debug print.
	(ftrace_update_lines, ftrace_update_insns): New.
	(ftrace_update_function): Check for call, ret, and jump.
	(compute_ftrace): Renamed to ...
	(btrace_compute_ftrace): ...this. Rewritten to compute call
	stack.
	(btrace_fetch, btrace_clear): Updated.
	(btrace_insn_get, btrace_insn_number, btrace_insn_begin)
	(btrace_insn_end, btrace_insn_prev, btrace_insn_next)
	(btrace_insn_cmp, btrace_find_insn_by_number, btrace_call_get)
	(btrace_call_number, btrace_call_begin, btrace_call_end)
	(btrace_call_prev, btrace_call_next, btrace_call_cmp)
	(btrace_find_function_by_number, btrace_set_insn_history)
	(btrace_set_call_history): New.
	* record-btrace.c (require_btrace): Use new btrace thread
	info fields.
	(record_btrace_info, btrace_insn_history)
	(record_btrace_insn_history, record_btrace_insn_history_range):
	Use new btrace thread info fields and new iterator.
	(btrace_func_history_src_line): Rename to ...
	(btrace_call_history_src_line): ...this. Use new btrace
	thread info fields.
	(btrace_func_history): Rename to ...
	(btrace_call_history): ...this. Use new btrace thread info
	fields and new iterator.
	(record_btrace_call_history, record_btrace_call_history_range):
	Use new btrace thread info fields and new iterator.

testsuite/
	* gdb.btrace/function_call_history.exp: Fix expected function
	trace.
	* gdb.btrace/instruction_history.exp: Initialize traced.
	Remove traced_functions.
This commit is contained in:
Markus Metzger
2013-03-22 14:32:47 +01:00
parent 8372a7cb96
commit 23a7fe7580
7 changed files with 1467 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
gdb/ChangeLog
View File

@ -1,3 +1,70 @@
2014-01-16 Markus Metzger <markus.t.metzger@intel.com>
* btrace.h (struct btrace_func_link): New.
(enum btrace_function_flag): New.
(struct btrace_inst): Rename to ...
(struct btrace_insn): ...this. Update all users.
(struct btrace_func) <ibegin, iend>: Remove.
(struct btrace_func_link): New.
(struct btrace_func): Rename to ...
(struct btrace_function): ...this. Update all users.
(struct btrace_function) <segment, flow, up, insn, insn_offset)
(number, level, flags>: New.
(struct btrace_insn_iterator): Rename to ...
(struct btrace_insn_history): ...this.
Update all users.
(struct btrace_insn_iterator, btrace_call_iterator): New.
(struct btrace_target_info) <btrace, itrace, ftrace>: Remove.
(struct btrace_target_info) <begin, end, level>
<insn_history, call_history>: New.
(btrace_insn_get, btrace_insn_number, btrace_insn_begin)
(btrace_insn_end, btrace_insn_prev, btrace_insn_next)
(btrace_insn_cmp, btrace_find_insn_by_number, btrace_call_get)
(btrace_call_number, btrace_call_begin, btrace_call_end)
(btrace_call_prev, btrace_call_next, btrace_call_cmp)
(btrace_find_function_by_number, btrace_set_insn_history)
(btrace_set_call_history): New.
* btrace.c (btrace_init_insn_iterator)
(btrace_init_func_iterator, compute_itrace): Remove.
(ftrace_print_function_name, ftrace_print_filename)
(ftrace_skip_file): Change
parameter to const.
(ftrace_init_func): Remove.
(ftrace_debug): Use new btrace_function fields.
(ftrace_function_switched): Also consider gaining and
losing symbol information).
(ftrace_print_insn_addr, ftrace_new_call, ftrace_new_return)
(ftrace_new_switch, ftrace_find_caller, ftrace_new_function)
(ftrace_update_caller, ftrace_fixup_caller, ftrace_new_tailcall):
New.
(ftrace_new_function): Move. Remove debug print.
(ftrace_update_lines, ftrace_update_insns): New.
(ftrace_update_function): Check for call, ret, and jump.
(compute_ftrace): Renamed to ...
(btrace_compute_ftrace): ...this. Rewritten to compute call
stack.
(btrace_fetch, btrace_clear): Updated.
(btrace_insn_get, btrace_insn_number, btrace_insn_begin)
(btrace_insn_end, btrace_insn_prev, btrace_insn_next)
(btrace_insn_cmp, btrace_find_insn_by_number, btrace_call_get)
(btrace_call_number, btrace_call_begin, btrace_call_end)
(btrace_call_prev, btrace_call_next, btrace_call_cmp)
(btrace_find_function_by_number, btrace_set_insn_history)
(btrace_set_call_history): New.
* record-btrace.c (require_btrace): Use new btrace thread
info fields.
(record_btrace_info, btrace_insn_history)
(record_btrace_insn_history, record_btrace_insn_history_range):
Use new btrace thread info fields and new iterator.
(btrace_func_history_src_line): Rename to ...
(btrace_call_history_src_line): ...this. Use new btrace
thread info fields.
(btrace_func_history): Rename to ...
(btrace_call_history): ...this. Use new btrace thread info
fields and new iterator.
(record_btrace_call_history, record_btrace_call_history_range):
Use new btrace thread info fields and new iterator.
2014-01-16 Markus Metzger <markus.t.metzger@intel.com> 2014-01-16 Markus Metzger <markus.t.metzger@intel.com>
* frame.h (frame_id_build_unavailable_stack_special): New. * frame.h (frame_id_build_unavailable_stack_special): New.

1179
gdb/btrace.c
View File

File diff suppressed because it is too large Load Diff

243
gdb/btrace.h
View File

@ -29,63 +29,128 @@
#include "btrace-common.h" #include "btrace-common.h"
struct thread_info; struct thread_info;
struct btrace_function;
/* A branch trace instruction. /* A branch trace instruction.
This represents a single instruction in a branch trace. */ This represents a single instruction in a branch trace. */
struct btrace_inst struct btrace_insn
{ {
/* The address of this instruction. */ /* The address of this instruction. */
CORE_ADDR pc; CORE_ADDR pc;
}; };
/* A branch trace function. /* A vector of branch trace instructions. */
typedef struct btrace_insn btrace_insn_s;
DEF_VEC_O (btrace_insn_s);
/* A doubly-linked list of branch trace function segments. */
struct btrace_func_link
{
struct btrace_function *prev;
struct btrace_function *next;
};
/* Flags for btrace function segments. */
enum btrace_function_flag
{
/* The 'up' link interpretation.
If set, it points to the function segment we returned to.
If clear, it points to the function segment we called from. */
BFUN_UP_LINKS_TO_RET = (1 << 0),
/* The 'up' link points to a tail call. This obviously only makes sense
if bfun_up_links_to_ret is clear. */
BFUN_UP_LINKS_TO_TAILCALL = (1 << 1)
};
/* A branch trace function segment.
This represents a function segment in a branch trace, i.e. a consecutive This represents a function segment in a branch trace, i.e. a consecutive
number of instructions belonging to the same function. */ number of instructions belonging to the same function.
struct btrace_func
We do not allow function segments without any instructions. */
struct btrace_function
{ {
/* The full and minimal symbol for the function. One of them may be NULL. */ /* The full and minimal symbol for the function. Both may be NULL. */
struct minimal_symbol *msym; struct minimal_symbol *msym;
struct symbol *sym; struct symbol *sym;
/* The previous and next segment belonging to the same function.
If a function calls another function, the former will have at least
two segments: one before the call and another after the return. */
struct btrace_func_link segment;
/* The previous and next function in control flow order. */
struct btrace_func_link flow;
/* The directly preceding function segment in a (fake) call stack. */
struct btrace_function *up;
/* The instructions in this function segment.
The instruction vector will never be empty. */
VEC (btrace_insn_s) *insn;
/* The instruction number offset for the first instruction in this
function segment. */
unsigned int insn_offset;
/* The function number in control-flow order. */
unsigned int number;
/* The function level in a back trace across the entire branch trace.
A caller's level is one lower than the level of its callee.
Levels can be negative if we see returns for which we have not seen
the corresponding calls. The branch trace thread information provides
a fixup to normalize function levels so the smallest level is zero. */
int level;
/* The source line range of this function segment (both inclusive). */ /* The source line range of this function segment (both inclusive). */
int lbegin, lend; int lbegin, lend;
/* The instruction number range in the instruction trace corresponding /* A bit-vector of btrace_function_flag. */
to this function segment (both inclusive). */ enum btrace_function_flag flags;
unsigned int ibegin, iend;
}; };
/* Branch trace may also be represented as a vector of: /* A branch trace instruction iterator. */
- branch trace instructions starting with the oldest instruction.
- branch trace functions starting with the oldest function. */
typedef struct btrace_inst btrace_inst_s;
typedef struct btrace_func btrace_func_s;
/* Define functions operating on branch trace vectors. */
DEF_VEC_O (btrace_inst_s);
DEF_VEC_O (btrace_func_s);
/* Branch trace iteration state for "record instruction-history". */
struct btrace_insn_iterator struct btrace_insn_iterator
{ {
/* The instruction index range from begin (inclusive) to end (exclusive) /* The branch trace function segment containing the instruction.
that has been covered last time. Will never be NULL. */
If end < begin, the branch trace has just been updated. */ const struct btrace_function *function;
unsigned int begin;
unsigned int end; /* The index into the function segment's instruction vector. */
unsigned int index;
};
/* A branch trace function call iterator. */
struct btrace_call_iterator
{
/* The branch trace information for this thread. Will never be NULL. */
const struct btrace_thread_info *btinfo;
/* The branch trace function segment.
This will be NULL for the iterator pointing to the end of the trace. */
const struct btrace_function *function;
};
/* Branch trace iteration state for "record instruction-history". */
struct btrace_insn_history
{
/* The branch trace instruction range from BEGIN (inclusive) to
END (exclusive) that has been covered last time. */
struct btrace_insn_iterator begin;
struct btrace_insn_iterator end;
}; };
/* Branch trace iteration state for "record function-call-history". */ /* Branch trace iteration state for "record function-call-history". */
struct btrace_func_iterator struct btrace_call_history
{ {
/* The function index range from begin (inclusive) to end (exclusive) /* The branch trace function range from BEGIN (inclusive) to END (exclusive)
that has been covered last time. that has been covered last time. */
If end < begin, the branch trace has just been updated. */ struct btrace_call_iterator begin;
unsigned int begin; struct btrace_call_iterator end;
unsigned int end;
}; };
/* Branch trace information per thread. /* Branch trace information per thread.
@ -103,16 +168,25 @@ struct btrace_thread_info
the underlying architecture. */ the underlying architecture. */
struct btrace_target_info *target; struct btrace_target_info *target;
/* The current branch trace for this thread. */ /* The current branch trace for this thread (both inclusive).
VEC (btrace_block_s) *btrace;
VEC (btrace_inst_s) *itrace; The last instruction of END is the current instruction, which is not
VEC (btrace_func_s) *ftrace; part of the execution history.
Both will be NULL if there is no branch trace available. If there is
branch trace available, both will be non-NULL. */
struct btrace_function *begin;
struct btrace_function *end;
/* The function level offset. When added to each function's LEVEL,
this normalizes the function levels such that the smallest level
becomes zero. */
int level;
/* The instruction history iterator. */ /* The instruction history iterator. */
struct btrace_insn_iterator insn_iterator; struct btrace_insn_history *insn_history;
/* The function call history iterator. */ /* The function call history iterator. */
struct btrace_func_iterator func_iterator; struct btrace_call_history *call_history;
}; };
/* Enable branch tracing for a thread. */ /* Enable branch tracing for a thread. */
@ -139,4 +213,99 @@ extern void btrace_free_objfile (struct objfile *);
/* Parse a branch trace xml document into a block vector. */ /* Parse a branch trace xml document into a block vector. */
extern VEC (btrace_block_s) *parse_xml_btrace (const char*); extern VEC (btrace_block_s) *parse_xml_btrace (const char*);
/* Dereference a branch trace instruction iterator. Return a pointer to the
instruction the iterator points to. */
extern const struct btrace_insn *
btrace_insn_get (const struct btrace_insn_iterator *);
/* Return the instruction number for a branch trace iterator.
Returns one past the maximum instruction number for the end iterator.
Returns zero if the iterator does not point to a valid instruction. */
extern unsigned int btrace_insn_number (const struct btrace_insn_iterator *);
/* Initialize a branch trace instruction iterator to point to the begin/end of
the branch trace. Throws an error if there is no branch trace. */
extern void btrace_insn_begin (struct btrace_insn_iterator *,
const struct btrace_thread_info *);
extern void btrace_insn_end (struct btrace_insn_iterator *,
const struct btrace_thread_info *);
/* Increment/decrement a branch trace instruction iterator by at most STRIDE
instructions. Return the number of instructions by which the instruction
iterator has been advanced.
Returns zero, if the operation failed or STRIDE had been zero. */
extern unsigned int btrace_insn_next (struct btrace_insn_iterator *,
unsigned int stride);
extern unsigned int btrace_insn_prev (struct btrace_insn_iterator *,
unsigned int stride);
/* Compare two branch trace instruction iterators.
Return a negative number if LHS < RHS.
Return zero if LHS == RHS.
Return a positive number if LHS > RHS. */
extern int btrace_insn_cmp (const struct btrace_insn_iterator *lhs,
const struct btrace_insn_iterator *rhs);
/* Find an instruction in the function branch trace by its number.
If the instruction is found, initialize the branch trace instruction
iterator to point to this instruction and return non-zero.
Return zero otherwise. */
extern int btrace_find_insn_by_number (struct btrace_insn_iterator *,
const struct btrace_thread_info *,
unsigned int number);
/* Dereference a branch trace call iterator. Return a pointer to the
function the iterator points to or NULL if the interator points past
the end of the branch trace. */
extern const struct btrace_function *
btrace_call_get (const struct btrace_call_iterator *);
/* Return the function number for a branch trace call iterator.
Returns one past the maximum function number for the end iterator.
Returns zero if the iterator does not point to a valid function. */
extern unsigned int btrace_call_number (const struct btrace_call_iterator *);
/* Initialize a branch trace call iterator to point to the begin/end of
the branch trace. Throws an error if there is no branch trace. */
extern void btrace_call_begin (struct btrace_call_iterator *,
const struct btrace_thread_info *);
extern void btrace_call_end (struct btrace_call_iterator *,
const struct btrace_thread_info *);
/* Increment/decrement a branch trace call iterator by at most STRIDE function
segments. Return the number of function segments by which the call
iterator has been advanced.
Returns zero, if the operation failed or STRIDE had been zero. */
extern unsigned int btrace_call_next (struct btrace_call_iterator *,
unsigned int stride);
extern unsigned int btrace_call_prev (struct btrace_call_iterator *,
unsigned int stride);
/* Compare two branch trace call iterators.
Return a negative number if LHS < RHS.
Return zero if LHS == RHS.
Return a positive number if LHS > RHS. */
extern int btrace_call_cmp (const struct btrace_call_iterator *lhs,
const struct btrace_call_iterator *rhs);
/* Find a function in the function branch trace by its NUMBER.
If the function is found, initialize the branch trace call
iterator to point to this function and return non-zero.
Return zero otherwise. */
extern int btrace_find_call_by_number (struct btrace_call_iterator *,
const struct btrace_thread_info *,
unsigned int number);
/* Set the branch trace instruction history from BEGIN (inclusive) to
END (exclusive). */
extern void btrace_set_insn_history (struct btrace_thread_info *,
const struct btrace_insn_iterator *begin,
const struct btrace_insn_iterator *end);
/* Set the branch trace function call history from BEGIN (inclusive) to
END (exclusive). */
extern void btrace_set_call_history (struct btrace_thread_info *,
const struct btrace_call_iterator *begin,
const struct btrace_call_iterator *end);
#endif /* BTRACE_H */ #endif /* BTRACE_H */

346
gdb/record-btrace.c
View File

@ -74,7 +74,7 @@ require_btrace (void)
btinfo = &tp->btrace; btinfo = &tp->btrace;
if (VEC_empty (btrace_inst_s, btinfo->itrace)) if (btinfo->begin == NULL)
error (_("No trace.")); error (_("No trace."));
return btinfo; return btinfo;
@ -205,7 +205,7 @@ record_btrace_info (void)
{ {
struct btrace_thread_info *btinfo; struct btrace_thread_info *btinfo;
struct thread_info *tp; struct thread_info *tp;
unsigned int insts, funcs; unsigned int insns, calls;
DEBUG ("info"); DEBUG ("info");
@ -215,12 +215,26 @@ record_btrace_info (void)
btrace_fetch (tp); btrace_fetch (tp);
insns = 0;
calls = 0;
btinfo = &tp->btrace; btinfo = &tp->btrace;
insts = VEC_length (btrace_inst_s, btinfo->itrace); if (btinfo->begin != NULL)
funcs = VEC_length (btrace_func_s, btinfo->ftrace); {
struct btrace_call_iterator call;
struct btrace_insn_iterator insn;
btrace_call_end (&call, btinfo);
btrace_call_prev (&call, 1);
calls = btrace_call_number (&call) + 1;
btrace_insn_end (&insn, btinfo);
btrace_insn_prev (&insn, 1);
insns = btrace_insn_number (&insn) + 1;
}
printf_unfiltered (_("Recorded %u instructions in %u functions for thread " printf_unfiltered (_("Recorded %u instructions in %u functions for thread "
"%d (%s).\n"), insts, funcs, tp->num, "%d (%s).\n"), insns, calls, tp->num,
target_pid_to_str (tp->ptid)); target_pid_to_str (tp->ptid));
} }
@ -235,27 +249,31 @@ ui_out_field_uint (struct ui_out *uiout, const char *fld, unsigned int val)
/* Disassemble a section of the recorded instruction trace. */ /* Disassemble a section of the recorded instruction trace. */
static void static void
btrace_insn_history (struct btrace_thread_info *btinfo, struct ui_out *uiout, btrace_insn_history (struct ui_out *uiout,
unsigned int begin, unsigned int end, int flags) const struct btrace_insn_iterator *begin,
const struct btrace_insn_iterator *end, int flags)
{ {
struct gdbarch *gdbarch; struct gdbarch *gdbarch;
struct btrace_inst *inst; struct btrace_insn_iterator it;
unsigned int idx;
DEBUG ("itrace (0x%x): [%u; %u[", flags, begin, end); DEBUG ("itrace (0x%x): [%u; %u)", flags, btrace_insn_number (begin),
btrace_insn_number (end));
gdbarch = target_gdbarch (); gdbarch = target_gdbarch ();
for (idx = begin; VEC_iterate (btrace_inst_s, btinfo->itrace, idx, inst) for (it = *begin; btrace_insn_cmp (&it, end) != 0; btrace_insn_next (&it, 1))
&& idx < end; ++idx)
{ {
const struct btrace_insn *insn;
insn = btrace_insn_get (&it);
/* Print the instruction index. */ /* Print the instruction index. */
ui_out_field_uint (uiout, "index", idx); ui_out_field_uint (uiout, "index", btrace_insn_number (&it));
ui_out_text (uiout, "\t"); ui_out_text (uiout, "\t");
/* Disassembly with '/m' flag may not produce the expected result. /* Disassembly with '/m' flag may not produce the expected result.
See PR gdb/11833. */ See PR gdb/11833. */
gdb_disassembly (gdbarch, uiout, NULL, flags, 1, inst->pc, inst->pc + 1); gdb_disassembly (gdbarch, uiout, NULL, flags, 1, insn->pc, insn->pc + 1);
} }
} }
@ -265,72 +283,62 @@ static void
record_btrace_insn_history (int size, int flags) record_btrace_insn_history (int size, int flags)
{ {
struct btrace_thread_info *btinfo; struct btrace_thread_info *btinfo;
struct btrace_insn_history *history;
struct btrace_insn_iterator begin, end;
struct cleanup *uiout_cleanup; struct cleanup *uiout_cleanup;
struct ui_out *uiout; struct ui_out *uiout;
unsigned int context, last, begin, end; unsigned int context, covered;
uiout = current_uiout; uiout = current_uiout;
uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout,
"insn history"); "insn history");
btinfo = require_btrace ();
last = VEC_length (btrace_inst_s, btinfo->itrace);
context = abs (size); context = abs (size);
begin = btinfo->insn_iterator.begin;
end = btinfo->insn_iterator.end;
DEBUG ("insn-history (0x%x): %d, prev: [%u; %u[", flags, size, begin, end);
if (context == 0) if (context == 0)
error (_("Bad record instruction-history-size.")); error (_("Bad record instruction-history-size."));
/* We start at the end. */ btinfo = require_btrace ();
if (end < begin) history = btinfo->insn_history;
if (history == NULL)
{ {
/* Truncate the context, if necessary. */ /* No matter the direction, we start with the tail of the trace. */
context = min (context, last); btrace_insn_end (&begin, btinfo);
end = last;
begin = end - context;
}
else if (size < 0)
{
if (begin == 0)
{
printf_unfiltered (_("At the start of the branch trace record.\n"));
btinfo->insn_iterator.end = 0;
return;
}
/* Truncate the context, if necessary. */
context = min (context, begin);
end = begin; end = begin;
begin -= context;
DEBUG ("insn-history (0x%x): %d", flags, size);
covered = btrace_insn_prev (&begin, context);
} }
else else
{ {
if (end == last) begin = history->begin;
end = history->end;
DEBUG ("insn-history (0x%x): %d, prev: [%u; %u)", flags, size,
btrace_insn_number (&begin), btrace_insn_number (&end));
if (size < 0)
{ {
printf_unfiltered (_("At the end of the branch trace record.\n")); end = begin;
covered = btrace_insn_prev (&begin, context);
btinfo->insn_iterator.begin = last; }
return; else
{
begin = end;
covered = btrace_insn_next (&end, context);
} }
/* Truncate the context, if necessary. */
context = min (context, last - end);
begin = end;
end += context;
} }
btrace_insn_history (btinfo, uiout, begin, end, flags); if (covered > 0)
btrace_insn_history (uiout, &begin, &end, flags);
btinfo->insn_iterator.begin = begin; else
btinfo->insn_iterator.end = end; {
if (size < 0)
printf_unfiltered (_("At the start of the branch trace record.\n"));
else
printf_unfiltered (_("At the end of the branch trace record.\n"));
}
btrace_set_insn_history (btinfo, &begin, &end);
do_cleanups (uiout_cleanup); do_cleanups (uiout_cleanup);
} }
@ -340,39 +348,41 @@ static void
record_btrace_insn_history_range (ULONGEST from, ULONGEST to, int flags) record_btrace_insn_history_range (ULONGEST from, ULONGEST to, int flags)
{ {
struct btrace_thread_info *btinfo; struct btrace_thread_info *btinfo;
struct btrace_insn_history *history;
struct btrace_insn_iterator begin, end;
struct cleanup *uiout_cleanup; struct cleanup *uiout_cleanup;
struct ui_out *uiout; struct ui_out *uiout;
unsigned int last, begin, end; unsigned int low, high;
int found;
uiout = current_uiout; uiout = current_uiout;
uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout,
"insn history"); "insn history");
btinfo = require_btrace (); low = from;
last = VEC_length (btrace_inst_s, btinfo->itrace); high = to;
begin = (unsigned int) from; DEBUG ("insn-history (0x%x): [%u; %u)", flags, low, high);
end = (unsigned int) to;
DEBUG ("insn-history (0x%x): [%u; %u[", flags, begin, end);
/* Check for wrap-arounds. */ /* Check for wrap-arounds. */
if (begin != from || end != to) if (low != from || high != to)
error (_("Bad range.")); error (_("Bad range."));
if (end <= begin) if (high <= low)
error (_("Bad range.")); error (_("Bad range."));
if (last <= begin) btinfo = require_btrace ();
found = btrace_find_insn_by_number (&begin, btinfo, low);
if (found == 0)
error (_("Range out of bounds.")); error (_("Range out of bounds."));
/* Truncate the range, if necessary. */ /* Silently truncate the range, if necessary. */
if (last < end) found = btrace_find_insn_by_number (&end, btinfo, high);
end = last; if (found == 0)
btrace_insn_end (&end, btinfo);
btrace_insn_history (btinfo, uiout, begin, end, flags); btrace_insn_history (uiout, &begin, &end, flags);
btrace_set_insn_history (btinfo, &begin, &end);
btinfo->insn_iterator.begin = begin;
btinfo->insn_iterator.end = end;
do_cleanups (uiout_cleanup); do_cleanups (uiout_cleanup);
} }
@ -411,23 +421,27 @@ record_btrace_insn_history_from (ULONGEST from, int size, int flags)
/* Print the instruction number range for a function call history line. */ /* Print the instruction number range for a function call history line. */
static void static void
btrace_func_history_insn_range (struct ui_out *uiout, struct btrace_func *bfun) btrace_call_history_insn_range (struct ui_out *uiout,
const struct btrace_function *bfun)
{ {
ui_out_field_uint (uiout, "insn begin", bfun->ibegin); unsigned int begin, end;
if (bfun->ibegin == bfun->iend) begin = bfun->insn_offset;
return; end = begin + VEC_length (btrace_insn_s, bfun->insn);
ui_out_field_uint (uiout, "insn begin", begin);
ui_out_text (uiout, "-"); ui_out_text (uiout, "-");
ui_out_field_uint (uiout, "insn end", bfun->iend); ui_out_field_uint (uiout, "insn end", end);
} }
/* Print the source line information for a function call history line. */ /* Print the source line information for a function call history line. */
static void static void
btrace_func_history_src_line (struct ui_out *uiout, struct btrace_func *bfun) btrace_call_history_src_line (struct ui_out *uiout,
const struct btrace_function *bfun)
{ {
struct symbol *sym; struct symbol *sym;
int begin, end;
sym = bfun->sym; sym = bfun->sym;
if (sym == NULL) if (sym == NULL)
@ -436,54 +450,66 @@ btrace_func_history_src_line (struct ui_out *uiout, struct btrace_func *bfun)
ui_out_field_string (uiout, "file", ui_out_field_string (uiout, "file",
symtab_to_filename_for_display (sym->symtab)); symtab_to_filename_for_display (sym->symtab));
if (bfun->lend == 0) begin = bfun->lbegin;
end = bfun->lend;
if (end < begin)
return; return;
ui_out_text (uiout, ":"); ui_out_text (uiout, ":");
ui_out_field_int (uiout, "min line", bfun->lbegin); ui_out_field_int (uiout, "min line", begin);
if (bfun->lend == bfun->lbegin) if (end == begin)
return; return;
ui_out_text (uiout, "-"); ui_out_text (uiout, "-");
ui_out_field_int (uiout, "max line", bfun->lend); ui_out_field_int (uiout, "max line", end);
} }
/* Disassemble a section of the recorded function trace. */ /* Disassemble a section of the recorded function trace. */
static void static void
btrace_func_history (struct btrace_thread_info *btinfo, struct ui_out *uiout, btrace_call_history (struct ui_out *uiout,
unsigned int begin, unsigned int end, const struct btrace_call_iterator *begin,
const struct btrace_call_iterator *end,
enum record_print_flag flags) enum record_print_flag flags)
{ {
struct btrace_func *bfun; struct btrace_call_iterator it;
unsigned int idx;
DEBUG ("ftrace (0x%x): [%u; %u[", flags, begin, end); DEBUG ("ftrace (0x%x): [%u; %u)", flags, btrace_call_number (begin),
btrace_call_number (end));
for (idx = begin; VEC_iterate (btrace_func_s, btinfo->ftrace, idx, bfun) for (it = *begin; btrace_call_cmp (&it, end) < 0; btrace_call_next (&it, 1))
&& idx < end; ++idx)
{ {
const struct btrace_function *bfun;
struct minimal_symbol *msym;
struct symbol *sym;
bfun = btrace_call_get (&it);
msym = bfun->msym;
sym = bfun->sym;
/* Print the function index. */ /* Print the function index. */
ui_out_field_uint (uiout, "index", idx); ui_out_field_uint (uiout, "index", bfun->number);
ui_out_text (uiout, "\t"); ui_out_text (uiout, "\t");
if ((flags & RECORD_PRINT_INSN_RANGE) != 0) if ((flags & RECORD_PRINT_INSN_RANGE) != 0)
{ {
btrace_func_history_insn_range (uiout, bfun); btrace_call_history_insn_range (uiout, bfun);
ui_out_text (uiout, "\t"); ui_out_text (uiout, "\t");
} }
if ((flags & RECORD_PRINT_SRC_LINE) != 0) if ((flags & RECORD_PRINT_SRC_LINE) != 0)
{ {
btrace_func_history_src_line (uiout, bfun); btrace_call_history_src_line (uiout, bfun);
ui_out_text (uiout, "\t"); ui_out_text (uiout, "\t");
} }
if (bfun->sym != NULL) if (sym != NULL)
ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (bfun->sym)); ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (sym));
else if (bfun->msym != NULL) else if (msym != NULL)
ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (bfun->msym)); ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (msym));
ui_out_text (uiout, "\n"); ui_out_text (uiout, "\n");
} }
} }
@ -494,72 +520,62 @@ static void
record_btrace_call_history (int size, int flags) record_btrace_call_history (int size, int flags)
{ {
struct btrace_thread_info *btinfo; struct btrace_thread_info *btinfo;
struct btrace_call_history *history;
struct btrace_call_iterator begin, end;
struct cleanup *uiout_cleanup; struct cleanup *uiout_cleanup;
struct ui_out *uiout; struct ui_out *uiout;
unsigned int context, last, begin, end; unsigned int context, covered;
uiout = current_uiout; uiout = current_uiout;
uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout,
"insn history"); "insn history");
btinfo = require_btrace ();
last = VEC_length (btrace_func_s, btinfo->ftrace);
context = abs (size); context = abs (size);
begin = btinfo->func_iterator.begin;
end = btinfo->func_iterator.end;
DEBUG ("func-history (0x%x): %d, prev: [%u; %u[", flags, size, begin, end);
if (context == 0) if (context == 0)
error (_("Bad record function-call-history-size.")); error (_("Bad record function-call-history-size."));
/* We start at the end. */ btinfo = require_btrace ();
if (end < begin) history = btinfo->call_history;
if (history == NULL)
{ {
/* Truncate the context, if necessary. */ /* No matter the direction, we start with the tail of the trace. */
context = min (context, last); btrace_call_end (&begin, btinfo);
end = last;
begin = end - context;
}
else if (size < 0)
{
if (begin == 0)
{
printf_unfiltered (_("At the start of the branch trace record.\n"));
btinfo->func_iterator.end = 0;
return;
}
/* Truncate the context, if necessary. */
context = min (context, begin);
end = begin; end = begin;
begin -= context;
DEBUG ("call-history (0x%x): %d", flags, size);
covered = btrace_call_prev (&begin, context);
} }
else else
{ {
if (end == last) begin = history->begin;
end = history->end;
DEBUG ("call-history (0x%x): %d, prev: [%u; %u)", flags, size,
btrace_call_number (&begin), btrace_call_number (&end));
if (size < 0)
{ {
printf_unfiltered (_("At the end of the branch trace record.\n")); end = begin;
covered = btrace_call_prev (&begin, context);
btinfo->func_iterator.begin = last; }
return; else
{
begin = end;
covered = btrace_call_next (&end, context);
} }
/* Truncate the context, if necessary. */
context = min (context, last - end);
begin = end;
end += context;
} }
btrace_func_history (btinfo, uiout, begin, end, flags); if (covered > 0)
btrace_call_history (uiout, &begin, &end, flags);
btinfo->func_iterator.begin = begin; else
btinfo->func_iterator.end = end; {
if (size < 0)
printf_unfiltered (_("At the start of the branch trace record.\n"));
else
printf_unfiltered (_("At the end of the branch trace record.\n"));
}
btrace_set_call_history (btinfo, &begin, &end);
do_cleanups (uiout_cleanup); do_cleanups (uiout_cleanup);
} }
@ -569,39 +585,41 @@ static void
record_btrace_call_history_range (ULONGEST from, ULONGEST to, int flags) record_btrace_call_history_range (ULONGEST from, ULONGEST to, int flags)
{ {
struct btrace_thread_info *btinfo; struct btrace_thread_info *btinfo;
struct btrace_call_history *history;
struct btrace_call_iterator begin, end;
struct cleanup *uiout_cleanup; struct cleanup *uiout_cleanup;
struct ui_out *uiout; struct ui_out *uiout;
unsigned int last, begin, end; unsigned int low, high;
int found;
uiout = current_uiout; uiout = current_uiout;
uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout,
"func history"); "func history");
btinfo = require_btrace (); low = from;
last = VEC_length (btrace_func_s, btinfo->ftrace); high = to;
begin = (unsigned int) from; DEBUG ("call-history (0x%x): [%u; %u)", flags, low, high);
end = (unsigned int) to;
DEBUG ("func-history (0x%x): [%u; %u[", flags, begin, end);
/* Check for wrap-arounds. */ /* Check for wrap-arounds. */
if (begin != from || end != to) if (low != from || high != to)
error (_("Bad range.")); error (_("Bad range."));
if (end <= begin) if (high <= low)
error (_("Bad range.")); error (_("Bad range."));
if (last <= begin) btinfo = require_btrace ();
found = btrace_find_call_by_number (&begin, btinfo, low);
if (found == 0)
error (_("Range out of bounds.")); error (_("Range out of bounds."));
/* Truncate the range, if necessary. */ /* Silently truncate the range, if necessary. */
if (last < end) found = btrace_find_call_by_number (&end, btinfo, high);
end = last; if (found == 0)
btrace_call_end (&end, btinfo);
btrace_func_history (btinfo, uiout, begin, end, flags); btrace_call_history (uiout, &begin, &end, flags);
btrace_set_call_history (btinfo, &begin, &end);
btinfo->func_iterator.begin = begin;
btinfo->func_iterator.end = end;
do_cleanups (uiout_cleanup); do_cleanups (uiout_cleanup);
} }

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2014-01-16 Markus Metzger <markus.t.metzger@intel.com>
* gdb.btrace/function_call_history.exp: Fix expected function
trace.
* gdb.btrace/instruction_history.exp: Initialize traced.
Remove traced_functions.
2014-01-16 Markus Metzger <markus.t.metzger@intel.com> 2014-01-16 Markus Metzger <markus.t.metzger@intel.com>
* gdb.btrace/function_call_history.exp: Update * gdb.btrace/function_call_history.exp: Update

28
gdb/testsuite/gdb.btrace/function_call_history.exp
View File

@ -187,16 +187,18 @@ set bp_location [gdb_get_line_number "bp.2" $testfile.c]
gdb_breakpoint $bp_location gdb_breakpoint $bp_location
gdb_continue_to_breakpoint "cont to $bp_location" ".*$testfile.c:$bp_location.*" gdb_continue_to_breakpoint "cont to $bp_location" ".*$testfile.c:$bp_location.*"
# at this point we expect to have main, fib, ..., fib, main, where fib occurs 8 times, # at this point we expect to have main, fib, ..., fib, main, where fib occurs 9 times,
# so we limit the output to only show the latest 10 function calls # so we limit the output to only show the latest 11 function calls
gdb_test_no_output "set record function-call-history-size 10" gdb_test_no_output "set record function-call-history-size 11"
set message "recursive" gdb_test "record function-call-history" [join [list \
gdb_test_multiple "record function-call-history" $message { "20\tmain" \
-re "13\tmain\r\n14\tfib\r\n15\tfib\r\n16\tfib\r\n17\tfib\r\n18\tfib\r\n19\tfib\r\n20\tfib\r\n21\tfib\r\n22 main\r\n$gdb_prompt $" { "21\tfib" \
pass $message "22\tfib" \
} "23\tfib" \
-re "13\tinc\r\n14\tmain\r\n15\tinc\r\n16\tmain\r\n17\tinc\r\n18\tmain\r\n19\tinc\r\n20\tmain\r\n21\tfib\r\n22\tmain\r\n$gdb_prompt $" { "24\tfib" \
# recursive function calls appear only as 1 call "25\tfib" \
kfail "gdb/15240" $message "26\tfib" \
} "27\tfib" \
} "28\tfib" \
"29\tfib" \
"30\tmain"] "\r\n"] "recursive"

14
gdb/testsuite/gdb.btrace/instruction_history.exp
View File

@ -47,18 +47,18 @@ gdb_continue_to_breakpoint "cont to $bp_location" ".*$srcfile2:$bp_location.*"
# it is necessary to count the number of lines that are # it is necessary to count the number of lines that are
# shown by the "record instruction-history" command. # shown by the "record instruction-history" command.
set traced {}
set testname "determine number of recorded instructions" set testname "determine number of recorded instructions"
gdb_test_multiple "info record" $testname { gdb_test_multiple "info record" $testname {
-re "Active record target: record-btrace\r\nRecorded \(\[0-9\]*\) instructions in \(\[0-9\]*\) functions for thread 1 .*\\.\r\n$gdb_prompt $" { -re "Active record target: record-btrace\r\nRecorded \(\[0-9\]*\) instructions in \(\[0-9\]*\) functions for thread 1 .*\\.\r\n$gdb_prompt $" {
set traced $expect_out(1,string) set traced $expect_out(1,string)
set traced_functions $expect_out(2,string)
pass $testname pass $testname
} }
} }
# we have exactly 7 instructions here # we have exactly 6 instructions here
set message "exactly 7 instructions" set message "exactly 6 instructions"
if { $traced != 7 } { if { $traced != 6 } {
fail $message fail $message
} else { } else {
pass $message pass $message
@ -147,6 +147,8 @@ if { $lines != $history_size } {
pass $message pass $message
} }
set history_size 2
gdb_test_no_output "set record instruction-history-size $history_size"
set message "browse history forward middle" set message "browse history forward middle"
set lines [test_lines_length "record instruction-history +" $message] set lines [test_lines_length "record instruction-history +" $message]
if { $lines != $history_size } { if { $lines != $history_size } {
@ -168,6 +170,8 @@ gdb_test "record instruction-history" "At the end of the branch trace record\\."
# make sure we cannot move further # make sure we cannot move further
gdb_test "record instruction-history" "At the end of the branch trace record\\." "browse history forward beyond 2" gdb_test "record instruction-history" "At the end of the branch trace record\\." "browse history forward beyond 2"
set history_size 3
gdb_test_no_output "set record instruction-history-size $history_size"
set message "browse history backward last" set message "browse history backward last"
set lines [test_lines_length "record instruction-history -" $message] set lines [test_lines_length "record instruction-history -" $message]
if { $lines != $history_size } { if { $lines != $history_size } {
@ -176,6 +180,8 @@ if { $lines != $history_size } {
pass $message pass $message
} }
set history_size 2
gdb_test_no_output "set record instruction-history-size $history_size"
set message "browse history backward middle" set message "browse history backward middle"
set lines [test_lines_length "record instruction-history -" $message] set lines [test_lines_length "record instruction-history -" $message]
if { $lines != $history_size } { if { $lines != $history_size } {