diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/btrace.c | 45 | ||||
| -rw-r--r-- | gdb/btrace.h | 7 |
2 files changed, 46 insertions, 6 deletions
diff --git a/gdb/btrace.c b/gdb/btrace.c index 06122cd..95dc7ab 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -1839,13 +1839,19 @@ btrace_fetch (struct thread_info *tp) /* Compute the trace, provided we have any. */ if (!btrace_data_empty (&btrace)) { + struct btrace_function *bfun; + /* Store the raw trace data. The stored data will be cleared in btrace_clear, so we always append the new trace. */ btrace_data_append (&btinfo->data, &btrace); btrace_maint_clear (btinfo); + VEC_truncate (btrace_fun_p, btinfo->functions, 0); btrace_clear_history (btinfo); btrace_compute_ftrace (tp, &btrace); + + for (bfun = btinfo->begin; bfun != NULL; bfun = bfun->flow.next) + VEC_safe_push (btrace_fun_p, btinfo->functions, bfun); } do_cleanups (cleanup); @@ -1868,6 +1874,8 @@ btrace_clear (struct thread_info *tp) btinfo = &tp->btrace; + VEC_free (btrace_fun_p, btinfo->functions); + it = btinfo->begin; while (it != NULL) { @@ -2458,20 +2466,45 @@ btrace_find_insn_by_number (struct btrace_insn_iterator *it, unsigned int number) { const struct btrace_function *bfun; + unsigned int upper, lower; - for (bfun = btinfo->end; bfun != NULL; bfun = bfun->flow.prev) - if (bfun->insn_offset <= number) - break; + if (VEC_empty (btrace_fun_p, btinfo->functions)) + return 0; - if (bfun == NULL) + lower = 0; + bfun = VEC_index (btrace_fun_p, btinfo->functions, lower); + if (number < bfun->insn_offset) return 0; - if (bfun->insn_offset + ftrace_call_num_insn (bfun) <= number) + upper = VEC_length (btrace_fun_p, btinfo->functions) - 1; + bfun = VEC_index (btrace_fun_p, btinfo->functions, upper); + if (number >= bfun->insn_offset + ftrace_call_num_insn (bfun)) return 0; + /* We assume that there are no holes in the numbering. */ + for (;;) + { + const unsigned int average = lower + (upper - lower) / 2; + + bfun = VEC_index (btrace_fun_p, btinfo->functions, average); + + if (number < bfun->insn_offset) + { + upper = average - 1; + continue; + } + + if (number >= bfun->insn_offset + ftrace_call_num_insn (bfun)) + { + lower = average + 1; + continue; + } + + break; + } + it->function = bfun; it->index = number - bfun->insn_offset; - return 1; } diff --git a/gdb/btrace.h b/gdb/btrace.h index 1c0b6b3..07ed10c 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -187,6 +187,9 @@ struct btrace_function btrace_function_flags flags; }; +typedef struct btrace_function *btrace_fun_p; +DEF_VEC_P (btrace_fun_p); + /* A branch trace instruction iterator. */ struct btrace_insn_iterator { @@ -337,6 +340,10 @@ struct btrace_thread_info struct btrace_function *begin; struct btrace_function *end; + /* Vector of pointer to decoded function segments. These are in execution + order with the first element == BEGIN and the last element == END. */ + VEC (btrace_fun_p) *functions; + /* The function level offset. When added to each function's LEVEL, this normalizes the function levels such that the smallest level becomes zero. */ |