X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Ffilter-bytecode.h;h=59e84555a0076b35941b8030f2eebde7649c66cc;hb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;hp=b0c8f8183cf89c55a07243c8d49b17e0cc67994a;hpb=3151a51df2b93554f3e4559a2e7ec08541e8674d;p=lttng-ust.git

diff --git a/liblttng-ust/filter-bytecode.h b/liblttng-ust/filter-bytecode.h
index b0c8f818..59e84555 100644
--- a/liblttng-ust/filter-bytecode.h
+++ b/liblttng-ust/filter-bytecode.h
@@ -27,8 +27,13 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include <lttng/ust-abi.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 /*
  * offsets are absolute from start of bytecode.
  */
@@ -38,6 +43,19 @@ struct field_ref {
 	uint16_t offset;
 } __attribute__((packed));
 
+struct get_symbol {
+	/* Symbol offset. */
+	uint16_t offset;
+} LTTNG_PACKED;
+
+struct get_index_u16 {
+	uint16_t index;
+} LTTNG_PACKED;
+
+struct get_index_u64 {
+	uint64_t index;
+} LTTNG_PACKED;
+
 struct literal_numeric {
 	int64_t v;
 } __attribute__((packed));
@@ -61,11 +79,11 @@ enum filter_op {
 	FILTER_OP_MOD				= 4,
 	FILTER_OP_PLUS				= 5,
 	FILTER_OP_MINUS				= 6,
-	FILTER_OP_RSHIFT			= 7,
-	FILTER_OP_LSHIFT			= 8,
-	FILTER_OP_BIN_AND			= 9,
-	FILTER_OP_BIN_OR			= 10,
-	FILTER_OP_BIN_XOR			= 11,
+	FILTER_OP_BIT_RSHIFT			= 7,
+	FILTER_OP_BIT_LSHIFT			= 8,
+	FILTER_OP_BIT_AND			= 9,
+	FILTER_OP_BIT_OR			= 10,
+	FILTER_OP_BIT_XOR			= 11,
 
 	/* binary comparators */
 	FILTER_OP_EQ				= 12,
@@ -166,6 +184,35 @@ enum filter_op {
 	FILTER_OP_EQ_STAR_GLOB_STRING		= 77,
 	FILTER_OP_NE_STAR_GLOB_STRING		= 78,
 
+	/*
+	 * Instructions for recursive traversal through composed types.
+	 */
+	FILTER_OP_GET_CONTEXT_ROOT		= 79,
+	FILTER_OP_GET_APP_CONTEXT_ROOT		= 80,
+	FILTER_OP_GET_PAYLOAD_ROOT		= 81,
+
+	FILTER_OP_GET_SYMBOL			= 82,
+	FILTER_OP_GET_SYMBOL_FIELD		= 83,
+	FILTER_OP_GET_INDEX_U16			= 84,
+	FILTER_OP_GET_INDEX_U64			= 85,
+
+	FILTER_OP_LOAD_FIELD			= 86,
+	FILTER_OP_LOAD_FIELD_S8			= 87,
+	FILTER_OP_LOAD_FIELD_S16		= 88,
+	FILTER_OP_LOAD_FIELD_S32		= 89,
+	FILTER_OP_LOAD_FIELD_S64		= 90,
+	FILTER_OP_LOAD_FIELD_U8			= 91,
+	FILTER_OP_LOAD_FIELD_U16		= 92,
+	FILTER_OP_LOAD_FIELD_U32		= 93,
+	FILTER_OP_LOAD_FIELD_U64		= 94,
+	FILTER_OP_LOAD_FIELD_STRING		= 95,
+	FILTER_OP_LOAD_FIELD_SEQUENCE		= 96,
+	FILTER_OP_LOAD_FIELD_DOUBLE		= 97,
+
+	FILTER_OP_UNARY_BIT_NOT			= 98,
+
+	FILTER_OP_RETURN_S64			= 99,
+
 	NR_FILTER_OPS,
 };