[PATCH 03/11] btrace: Add btinfo to instruction interator.

[Tim Wiederhake <tim dot wiederhake at intel dot com>]

2017-02-17  Tim Wiederhake  <tim.wiederhake@intel.com>

gdb/ChangeLog:

	* btrace.c (btrace_insn_begin, btrace_insn_end,
	btrace_find_insn_by_number): Added btinfo to iterator.
	* btrace.h (struct btrace_insn_iterator): Added btinfo.


---
 gdb/btrace.c | 3 +++
 gdb/btrace.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/gdb/btrace.c b/gdb/btrace.c
index da8e0f7..5f0eb7a 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -2279,6 +2279,7 @@ btrace_insn_begin (struct btrace_insn_iterator *it,
   if (bfun == NULL)
     error (_("No trace."));
 
+  it->btinfo = btinfo;
   it->function = bfun;
   it->index = 0;
 }
@@ -2304,6 +2305,7 @@ btrace_insn_end (struct btrace_insn_iterator *it,
   if (length > 0)
     length -= 1;
 
+  it->btinfo = btinfo;
   it->function = bfun;
   it->index = length;
 }
@@ -2507,6 +2509,7 @@ btrace_find_insn_by_number (struct btrace_insn_iterator *it,
       break;
     }
 
+  it->btinfo = btinfo;
   it->function = bfun;
   it->index = number - bfun->insn_offset;
   return 1;
diff --git a/gdb/btrace.h b/gdb/btrace.h
index 07ed10c..f912b04 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -193,6 +193,9 @@ DEF_VEC_P (btrace_fun_p);
 /* A branch trace instruction iterator.  */
 struct btrace_insn_iterator
 {
+  /* The branch trace information for this thread.  Will never be NULL.  */
+  const struct btrace_thread_info *btinfo;
+
   /* The branch trace function segment containing the instruction.
      Will never be NULL.  */
   const struct btrace_function *function;
-- 
2.7.4