1 files changed, 14 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index bb0a9f27165b..78a5692dd718 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -13,13 +13,26 @@ struct ins;
 struct ins_operands {
        char    *raw;
        struct {
+                char    *raw;
                char    *name;
-                u64     offset;
                u64     addr;
+                u64     offset;
        } target;
+        union {
+                struct {
+                        char    *raw;
+                        char    *name;
+                        u64     addr;
+                } source;
+                struct {
+                        struct ins *ins;
+                        struct ins_operands *ops;
+                } locked;
+        };
 };
 struct ins_ops {
+        void (*free)(struct ins_operands *ops);
        int (*parse)(struct ins_operands *ops);
        int (*scnprintf)(struct ins *ins, char *bf, size_t size,
                         struct ins_operands *ops);

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index bb0a9f27165b..78a5692dd718 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h
@@ -13,13 +13,26 @@ struct ins;
13	struct ins_operands {	13	struct ins_operands {
14	char *raw;	14	char *raw;
15	struct {	15	struct {
		16	char *raw;
16	char *name;	17	char *name;
17	u64 offset;
18	u64 addr;	18	u64 addr;
		19	u64 offset;
19	} target;	20	} target;
		21	union {
		22	struct {
		23	char *raw;
		24	char *name;
		25	u64 addr;
		26	} source;
		27	struct {
		28	struct ins *ins;
		29	struct ins_operands *ops;
		30	} locked;
		31	};
20	};	32	};
21		33
22	struct ins_ops {	34	struct ins_ops {
		35	void (free)(struct ins_operands ops);
23	int (parse)(struct ins_operands ops);	36	int (parse)(struct ins_operands ops);
24	int (scnprintf)(struct ins ins, char *bf, size_t size,	37	int (scnprintf)(struct ins ins, char *bf, size_t size,
25	struct ins_operands *ops);	38	struct ins_operands *ops);