X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-ir.h;h=d62c0ee0c4f4d66b5be2336b6104c4f7ce75d4d7;hp=c07050df58d666e9736e9095b1a74c847aa81c96;hb=d44f9a1878031bfdb6ceee49d817430b11f0a58b;hpb=661dfdd190c65bad5a044e21c1d5f9ad59144bf8

diff --git a/src/lib/lttng-ctl/filter/filter-ir.h b/src/lib/lttng-ctl/filter/filter-ir.h
index c07050df5..d62c0ee0c 100644
--- a/src/lib/lttng-ctl/filter/filter-ir.h
+++ b/src/lib/lttng-ctl/filter/filter-ir.h
@@ -6,20 +6,10 @@
  *
  * LTTng filter ir
  *
- * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "filter-ast.h"
@@ -38,8 +28,7 @@ enum ir_data_type {
 	IR_DATA_FLOAT,
 	IR_DATA_FIELD_REF,
 	IR_DATA_GET_CONTEXT_REF,
-	IR_DATA_FIELD_REF_INDEX,
-	IR_DATA_GET_CONTEXT_REF_INDEX,
+	IR_DATA_EXPRESSION,
 };
 
 enum ir_op_type {
@@ -73,6 +62,28 @@ struct ir_op_root {
 	struct ir_op *child;
 };
 
+enum ir_load_expression_type {
+	IR_LOAD_EXPRESSION_GET_CONTEXT_ROOT,
+	IR_LOAD_EXPRESSION_GET_APP_CONTEXT_ROOT,
+	IR_LOAD_EXPRESSION_GET_PAYLOAD_ROOT,
+	IR_LOAD_EXPRESSION_GET_SYMBOL,
+	IR_LOAD_EXPRESSION_GET_INDEX,
+	IR_LOAD_EXPRESSION_LOAD_FIELD,
+};
+
+struct ir_load_expression_op {
+	struct ir_load_expression_op *next;
+	enum ir_load_expression_type type;
+	union {
+		char *symbol;
+		uint64_t index;
+	} u;
+};
+
+struct ir_load_expression {
+	struct ir_load_expression_op *child;
+};
+
 struct ir_op_load {
 	union {
 		struct {
@@ -82,10 +93,7 @@ struct ir_op_load {
 		int64_t num;
 		double flt;
 		char *ref;
-		struct {
-			char *symbol;
-			uint64_t index;
-		} ref_index;
+		struct ir_load_expression *expression;
 	} u;
 };