X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Ffilter-bytecode.h;h=ce2dbc7394db17d37506bb7ed210adc1f06b172d;hb=12f6d1183b45091b7b398a3d559ef9feadbba7c8;hp=7bb0123ec52dc526ac47a6e762f22155bfdbea6b;hpb=da6eed2597e16cf3291e1c0f0f9dcc2323d298cf;p=lttng-ust.git

diff --git a/liblttng-ust/filter-bytecode.h b/liblttng-ust/filter-bytecode.h
index 7bb0123e..ce2dbc73 100644
--- a/liblttng-ust/filter-bytecode.h
+++ b/liblttng-ust/filter-bytecode.h
@@ -28,24 +28,9 @@
  * offsets are absolute from start of bytecode.
  */
 
-enum filter_register {
-	REG_R0 = 0,
-	REG_R1 = 1,
-	REG_ERROR,
-};
-
-enum field_ref_type {
-	FIELD_REF_UNKNOWN = 0,
-	FIELD_REF_STRING,
-	FIELD_REF_SEQUENCE,
-	FIELD_REF_S64,
-	FIELD_REF_DOUBLE,
-};
-
 struct field_ref {
 	/* Initially, symbol offset. After link, field offset. */
 	uint16_t offset;
-	uint8_t type;	/* enum field_ref_type */
 } __attribute__((packed));
 
 struct literal_numeric {
@@ -76,6 +61,8 @@ enum filter_op {
 	FILTER_OP_BIN_AND,
 	FILTER_OP_BIN_OR,
 	FILTER_OP_BIN_XOR,
+
+	/* binary comparators */
 	FILTER_OP_EQ,
 	FILTER_OP_NE,
 	FILTER_OP_GT,
@@ -83,21 +70,83 @@ enum filter_op {
 	FILTER_OP_GE,
 	FILTER_OP_LE,
 
+	/* string binary comparator */
+	FILTER_OP_EQ_STRING,
+	FILTER_OP_NE_STRING,
+	FILTER_OP_GT_STRING,
+	FILTER_OP_LT_STRING,
+	FILTER_OP_GE_STRING,
+	FILTER_OP_LE_STRING,
+
+	/* s64 binary comparator */
+	FILTER_OP_EQ_S64,
+	FILTER_OP_NE_S64,
+	FILTER_OP_GT_S64,
+	FILTER_OP_LT_S64,
+	FILTER_OP_GE_S64,
+	FILTER_OP_LE_S64,
+
+	/* double binary comparator */
+	FILTER_OP_EQ_DOUBLE,
+	FILTER_OP_NE_DOUBLE,
+	FILTER_OP_GT_DOUBLE,
+	FILTER_OP_LT_DOUBLE,
+	FILTER_OP_GE_DOUBLE,
+	FILTER_OP_LE_DOUBLE,
+
+	/* Mixed S64-double binary comparators */
+	FILTER_OP_EQ_DOUBLE_S64,
+	FILTER_OP_NE_DOUBLE_S64,
+	FILTER_OP_GT_DOUBLE_S64,
+	FILTER_OP_LT_DOUBLE_S64,
+	FILTER_OP_GE_DOUBLE_S64,
+	FILTER_OP_LE_DOUBLE_S64,
+
+	FILTER_OP_EQ_S64_DOUBLE,
+	FILTER_OP_NE_S64_DOUBLE,
+	FILTER_OP_GT_S64_DOUBLE,
+	FILTER_OP_LT_S64_DOUBLE,
+	FILTER_OP_GE_S64_DOUBLE,
+	FILTER_OP_LE_S64_DOUBLE,
+
 	/* unary */
 	FILTER_OP_UNARY_PLUS,
 	FILTER_OP_UNARY_MINUS,
 	FILTER_OP_UNARY_NOT,
+	FILTER_OP_UNARY_PLUS_S64,
+	FILTER_OP_UNARY_MINUS_S64,
+	FILTER_OP_UNARY_NOT_S64,
+	FILTER_OP_UNARY_PLUS_DOUBLE,
+	FILTER_OP_UNARY_MINUS_DOUBLE,
+	FILTER_OP_UNARY_NOT_DOUBLE,
 
 	/* logical */
 	FILTER_OP_AND,
 	FILTER_OP_OR,
 
-	/* load */
+	/* load field ref */
 	FILTER_OP_LOAD_FIELD_REF,
+	FILTER_OP_LOAD_FIELD_REF_STRING,
+	FILTER_OP_LOAD_FIELD_REF_SEQUENCE,
+	FILTER_OP_LOAD_FIELD_REF_S64,
+	FILTER_OP_LOAD_FIELD_REF_DOUBLE,
+
+	/* load immediate from operand */
 	FILTER_OP_LOAD_STRING,
 	FILTER_OP_LOAD_S64,
 	FILTER_OP_LOAD_DOUBLE,
 
+	/* cast */
+	FILTER_OP_CAST_TO_S64,
+	FILTER_OP_CAST_DOUBLE_TO_S64,
+	FILTER_OP_CAST_NOP,
+
+	/* get context ref */
+	FILTER_OP_GET_CONTEXT_REF,
+	FILTER_OP_GET_CONTEXT_REF_STRING,
+	FILTER_OP_GET_CONTEXT_REF_S64,
+	FILTER_OP_GET_CONTEXT_REF_DOUBLE,
+
 	NR_FILTER_OPS,
 };
 
@@ -105,7 +154,6 @@ typedef uint8_t filter_opcode_t;
 
 struct load_op {
 	filter_opcode_t op;
-	uint8_t reg;		/* enum filter_register */
 	char data[0];
 	/* data to load. Size known by enum filter_opcode and null-term char. */
 } __attribute__((packed));
@@ -116,7 +164,6 @@ struct binary_op {
 
 struct unary_op {
 	filter_opcode_t op;
-	uint8_t reg;		/* enum filter_register */
 } __attribute__((packed));
 
 /* skip_offset is absolute from start of bytecode */
@@ -125,6 +172,10 @@ struct logical_op {
 	uint16_t skip_offset;	/* bytecode insn, if skip second test */
 } __attribute__((packed));
 
+struct cast_op {
+	filter_opcode_t op;
+} __attribute__((packed));
+
 struct return_op {
 	filter_opcode_t op;
 } __attribute__((packed));