X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Ffilter-bytecode.h;h=1c51eb0935443cddb32f2655c29c8fddf7a97f20;hb=064220d4dfca7c4dee6c839702ab57aa60336937;hp=938c671873cd9afeb52dc5a0b5e02478ab94f4c6;hpb=cd54f6d934faf715cbd12fa9665e94b6fe367802;p=lttng-ust.git

diff --git a/liblttng-ust/filter-bytecode.h b/liblttng-ust/filter-bytecode.h
index 938c6718..1c51eb09 100644
--- a/liblttng-ust/filter-bytecode.h
+++ b/liblttng-ust/filter-bytecode.h
@@ -34,23 +34,19 @@ enum filter_register {
 	REG_ERROR,
 };
 
-enum field_ref_type {
-	FIELD_REF_UNKNOWN = 0,
-	FIELD_REF_STRING,
-	FIELD_REF_SEQUENCE,
-	FIELD_REF_S64,
-};
-
 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 {
 	int64_t v;
 } __attribute__((packed));
 
+struct literal_double {
+	double v;
+} __attribute__((packed));
+
 struct literal_string {
 	char string[0];
 } __attribute__((packed));
@@ -71,6 +67,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,
@@ -78,10 +76,40 @@ 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,
+
 	/* 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,
@@ -89,8 +117,14 @@ 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,
 
 	NR_FILTER_OPS,
 };