X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter-bytecode.h;h=7c76e3286e987e88b4314ab87bdd5dfb5926597c;hp=07cf99b2dcd46f8f06423046857dcd193812c117;hb=78370c0c89a55749732f38caf1b460e4137423a4;hpb=e90d856165cc1110ac0d4c657a001c47236d6de8

diff --git a/src/lib/lttng-ctl/filter-bytecode.h b/src/lib/lttng-ctl/filter-bytecode.h
index 07cf99b2d..7c76e3286 100644
--- a/src/lib/lttng-ctl/filter-bytecode.h
+++ b/src/lib/lttng-ctl/filter-bytecode.h
@@ -29,24 +29,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 {
@@ -77,6 +62,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,
@@ -84,10 +71,55 @@ 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,
@@ -95,10 +127,20 @@ enum filter_op {
 
 	/* load */
 	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,
+
 	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,
+
 	NR_FILTER_OPS,
 };
 
@@ -106,7 +148,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));
@@ -117,7 +158,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 */
@@ -126,6 +166,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));