X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=df4add225dbb2585548b6bcb740a4aaa026772b8;hb=35c7fa927fef4a851f5a22b78b7fe883789f2a5d;hp=dbc3cfeafb5cdaac719a2c1ec38dad933b674d6e;hpb=71c1ceeb09675681606ac8c81cbc6fcb363da9e3;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index dbc3cfea..df4add22 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -49,30 +49,40 @@ int parse_char(const char **p)
 }
 
 static
-int stack_strcmp(struct estack *stack, const char *cmp_type)
+int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 {
-	const char *p = estack_bx(stack)->u.s.str, *q = estack_ax(stack)->u.s.str;
+	const char *p = estack_bx(stack, top)->u.s.str, *q = estack_ax(stack, top)->u.s.str;
 	int ret;
 	int diff;
 
 	for (;;) {
 		int escaped_r0 = 0;
 
-		if (unlikely(p - estack_bx(stack)->u.s.str > estack_bx(stack)->u.s.seq_len || *p == '\0')) {
-			if (q - estack_ax(stack)->u.s.str > estack_ax(stack)->u.s.seq_len || *q == '\0')
-				diff = 0;
-			else
-				diff = -1;
-			break;
+		if (unlikely(p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0')) {
+			if (q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0') {
+				return 0;
+			} else {
+				if (estack_ax(stack, top)->u.s.literal) {
+					ret = parse_char(&q);
+					if (ret == -1)
+						return 0;
+				}
+				return -1;
+			}
 		}
-		if (unlikely(q - estack_ax(stack)->u.s.str > estack_ax(stack)->u.s.seq_len || *q == '\0')) {
-			if (p - estack_bx(stack)->u.s.str > estack_bx(stack)->u.s.seq_len || *p == '\0')
-				diff = 0;
-			else
-				diff = 1;
-			break;
+		if (unlikely(q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0')) {
+			if (p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0') {
+				return 0;
+			} else {
+				if (estack_bx(stack, top)->u.s.literal) {
+					ret = parse_char(&p);
+					if (ret == -1)
+						return 0;
+				}
+				return 1;
+			}
 		}
-		if (estack_bx(stack)->u.s.literal) {
+		if (estack_bx(stack, top)->u.s.literal) {
 			ret = parse_char(&p);
 			if (ret == -1) {
 				return 0;
@@ -81,7 +91,7 @@ int stack_strcmp(struct estack *stack, const char *cmp_type)
 			}
 			/* else compare both char */
 		}
-		if (estack_ax(stack)->u.s.literal) {
+		if (estack_ax(stack, top)->u.s.literal) {
 			ret = parse_char(&q);
 			if (ret == -1) {
 				return 0;
@@ -105,7 +115,7 @@ int stack_strcmp(struct estack *stack, const char *cmp_type)
 	return diff;
 }
 
-int lttng_filter_false(void *filter_data,
+uint64_t lttng_filter_false(void *filter_data,
 		const char *filter_stack_data)
 {
 	return 0;
@@ -157,15 +167,22 @@ LABEL_##name
 
 #endif
 
-int lttng_filter_interpret_bytecode(void *filter_data,
+/*
+ * Return 0 (discard), or raise the 0x1 flag (log event).
+ * Currently, other flags are kept for future extensions and have no
+ * effect.
+ */
+uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		const char *filter_stack_data)
 {
 	struct bytecode_runtime *bytecode = filter_data;
 	void *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
-	int retval = 0;
+	uint64_t retval = 0;
 	struct estack _stack;
 	struct estack *stack = &_stack;
+	register int64_t ax = 0, bx = 0;
+	register int top = FILTER_STACK_EMPTY;
 #ifndef INTERPRETER_USE_SWITCH
 	static void *dispatch[NR_FILTER_OPS] = {
 		[ FILTER_OP_UNKNOWN ] = &&LABEL_FILTER_OP_UNKNOWN,
@@ -216,6 +233,21 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_GE_DOUBLE ] = &&LABEL_FILTER_OP_GE_DOUBLE,
 		[ FILTER_OP_LE_DOUBLE ] = &&LABEL_FILTER_OP_LE_DOUBLE,
 
+		/* Mixed S64-double binary comparators */
+		[ FILTER_OP_EQ_DOUBLE_S64 ] = &&LABEL_FILTER_OP_EQ_DOUBLE_S64,
+		[ FILTER_OP_NE_DOUBLE_S64 ] = &&LABEL_FILTER_OP_NE_DOUBLE_S64,
+		[ FILTER_OP_GT_DOUBLE_S64 ] = &&LABEL_FILTER_OP_GT_DOUBLE_S64,
+		[ FILTER_OP_LT_DOUBLE_S64 ] = &&LABEL_FILTER_OP_LT_DOUBLE_S64,
+		[ FILTER_OP_GE_DOUBLE_S64 ] = &&LABEL_FILTER_OP_GE_DOUBLE_S64,
+		[ FILTER_OP_LE_DOUBLE_S64 ] = &&LABEL_FILTER_OP_LE_DOUBLE_S64,
+
+		[ FILTER_OP_EQ_S64_DOUBLE ] = &&LABEL_FILTER_OP_EQ_S64_DOUBLE,
+		[ FILTER_OP_NE_S64_DOUBLE ] = &&LABEL_FILTER_OP_NE_S64_DOUBLE,
+		[ FILTER_OP_GT_S64_DOUBLE ] = &&LABEL_FILTER_OP_GT_S64_DOUBLE,
+		[ FILTER_OP_LT_S64_DOUBLE ] = &&LABEL_FILTER_OP_LT_S64_DOUBLE,
+		[ FILTER_OP_GE_S64_DOUBLE ] = &&LABEL_FILTER_OP_GE_S64_DOUBLE,
+		[ FILTER_OP_LE_S64_DOUBLE ] = &&LABEL_FILTER_OP_LE_S64_DOUBLE,
+
 		/* unary */
 		[ FILTER_OP_UNARY_PLUS ] = &&LABEL_FILTER_OP_UNARY_PLUS,
 		[ FILTER_OP_UNARY_MINUS ] = &&LABEL_FILTER_OP_UNARY_MINUS,
@@ -231,13 +263,14 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_AND ] = &&LABEL_FILTER_OP_AND,
 		[ FILTER_OP_OR ] = &&LABEL_FILTER_OP_OR,
 
-		/* load */
+		/* load field ref */
 		[ FILTER_OP_LOAD_FIELD_REF ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF,
 		[ FILTER_OP_LOAD_FIELD_REF_STRING ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_STRING,
 		[ FILTER_OP_LOAD_FIELD_REF_SEQUENCE ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_SEQUENCE,
 		[ FILTER_OP_LOAD_FIELD_REF_S64 ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_S64,
 		[ FILTER_OP_LOAD_FIELD_REF_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_DOUBLE,
 
+		/* load from immediate operand */
 		[ FILTER_OP_LOAD_STRING ] = &&LABEL_FILTER_OP_LOAD_STRING,
 		[ FILTER_OP_LOAD_S64 ] = &&LABEL_FILTER_OP_LOAD_S64,
 		[ FILTER_OP_LOAD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_DOUBLE,
@@ -246,15 +279,20 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_CAST_TO_S64 ] = &&LABEL_FILTER_OP_CAST_TO_S64,
 		[ FILTER_OP_CAST_DOUBLE_TO_S64 ] = &&LABEL_FILTER_OP_CAST_DOUBLE_TO_S64,
 		[ FILTER_OP_CAST_NOP ] = &&LABEL_FILTER_OP_CAST_NOP,
+
+		/* get context ref */
+		[ FILTER_OP_GET_CONTEXT_REF ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF,
+		[ FILTER_OP_GET_CONTEXT_REF_STRING ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_STRING,
+		[ FILTER_OP_GET_CONTEXT_REF_S64 ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_S64,
+		[ FILTER_OP_GET_CONTEXT_REF_DOUBLE ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_DOUBLE,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
-	estack_init(stack);
-
 	START_OP
 
 		OP(FILTER_OP_UNKNOWN):
 		OP(FILTER_OP_LOAD_FIELD_REF):
+		OP(FILTER_OP_GET_CONTEXT_REF):
 #ifdef INTERPRETER_USE_SWITCH
 		default:
 #endif /* INTERPRETER_USE_SWITCH */
@@ -264,7 +302,8 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN):
-			retval = !!estack_ax(stack)->u.v;
+			/* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
+			retval = !!estack_ax_v;
 			ret = 0;
 			goto end;
 
@@ -299,10 +338,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, "==") == 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, "==") == 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -310,10 +348,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, "!=") != 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, "!=") != 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -321,10 +358,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, ">") > 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, ">") > 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -332,10 +368,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, "<") < 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, "<") < 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -343,10 +378,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, ">=") >= 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, ">=") >= 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -354,10 +388,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (stack_strcmp(stack, "<=") <= 0);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (stack_strcmp(stack, top, "<=") <= 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -366,10 +399,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v == estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v == estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -377,10 +409,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v != estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v != estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -388,10 +419,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v > estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v > estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -399,10 +429,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v < estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v < estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -410,10 +439,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v >= estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v >= estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -421,10 +449,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v <= estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx_v <= estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -433,14 +460,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v == estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d == estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -448,14 +470,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v != estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d != estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -463,14 +480,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v > estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d > estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -478,14 +490,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v < estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d < estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -493,14 +500,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v >= estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d >= estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -508,14 +510,132 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			if (unlikely(estack_ax(stack)->type == REG_S64))
-				estack_ax(stack)->u.d = (double) estack_ax(stack)->u.v;
-			else if (unlikely(estack_bx(stack)->type == REG_S64))
-				estack_bx(stack)->u.d = (double) estack_bx(stack)->u.v;
-			res = (estack_bx(stack)->u.v <= estack_ax(stack)->u.v);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			res = (estack_bx(stack, top)->u.d <= estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+
+		/* Mixed S64-double binary comparators */
+		OP(FILTER_OP_EQ_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d == estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_NE_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d != estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_GT_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d > estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_LT_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d < estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_GE_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d >= estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_LE_DOUBLE_S64):
+		{
+			int res;
+
+			res = (estack_bx(stack, top)->u.d <= estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+
+		OP(FILTER_OP_EQ_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v == estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_NE_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v != estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_GT_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v > estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_LT_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v < estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_GE_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v >= estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_LE_S64_DOUBLE):
+		{
+			int res;
+
+			res = (estack_bx_v <= estack_ax(stack, top)->u.d);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -538,25 +658,25 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		}
 		OP(FILTER_OP_UNARY_MINUS_S64):
 		{
-			estack_ax(stack)->u.v = -estack_ax(stack)->u.v;
+			estack_ax_v = -estack_ax_v;
 			next_pc += sizeof(struct unary_op);
 			PO;
 		}
 		OP(FILTER_OP_UNARY_MINUS_DOUBLE):
 		{
-			estack_ax(stack)->u.d = -estack_ax(stack)->u.d;
+			estack_ax(stack, top)->u.d = -estack_ax(stack, top)->u.d;
 			next_pc += sizeof(struct unary_op);
 			PO;
 		}
 		OP(FILTER_OP_UNARY_NOT_S64):
 		{
-			estack_ax(stack)->u.v = !estack_ax(stack)->u.v;
+			estack_ax_v = !estack_ax_v;
 			next_pc += sizeof(struct unary_op);
 			PO;
 		}
 		OP(FILTER_OP_UNARY_NOT_DOUBLE):
 		{
-			estack_ax(stack)->u.d = !estack_ax(stack)->u.d;
+			estack_ax(stack, top)->u.d = !estack_ax(stack, top)->u.d;
 			next_pc += sizeof(struct unary_op);
 			PO;
 		}
@@ -567,13 +687,13 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			struct logical_op *insn = (struct logical_op *) pc;
 
 			/* If AX is 0, skip and evaluate to 0 */
-			if (unlikely(estack_ax(stack)->u.v == 0)) {
+			if (unlikely(estack_ax_v == 0)) {
 				dbg_printf("Jumping to bytecode offset %u\n",
 					(unsigned int) insn->skip_offset);
 				next_pc = start_pc + insn->skip_offset;
 			} else {
 				/* Pop 1 when jump not taken */
-				estack_pop(stack);
+				estack_pop(stack, top, ax, bx);
 				next_pc += sizeof(struct logical_op);
 			}
 			PO;
@@ -584,21 +704,21 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 			/* If AX is nonzero, skip and evaluate to 1 */
 
-			if (unlikely(estack_ax(stack)->u.v != 0)) {
-				estack_ax(stack)->u.v = 1;
+			if (unlikely(estack_ax_v != 0)) {
+				estack_ax_v = 1;
 				dbg_printf("Jumping to bytecode offset %u\n",
 					(unsigned int) insn->skip_offset);
 				next_pc = start_pc + insn->skip_offset;
 			} else {
 				/* Pop 1 when jump not taken */
-				estack_pop(stack);
+				estack_pop(stack, top, ax, bx);
 				next_pc += sizeof(struct logical_op);
 			}
 			PO;
 		}
 
 
-		/* load */
+		/* load field ref */
 		OP(FILTER_OP_LOAD_FIELD_REF_STRING):
 		{
 			struct load_op *insn = (struct load_op *) pc;
@@ -606,18 +726,17 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 			dbg_printf("load field ref offset %u type string\n",
 				ref->offset);
-			estack_push(stack);
-			estack_ax(stack)->u.s.str =
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.s.str =
 				*(const char * const *) &filter_stack_data[ref->offset];
-			if (unlikely(!estack_ax(stack)->u.s.str)) {
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
 				dbg_printf("Filter warning: loading a NULL string.\n");
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack)->type = REG_STRING;
-			estack_ax(stack)->u.s.seq_len = UINT_MAX;
-			estack_ax(stack)->u.s.literal = 0;
-			dbg_printf("ref load string %s\n", estack_ax(stack)->u.s.str);
+			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
+			estack_ax(stack, top)->u.s.literal = 0;
+			dbg_printf("ref load string %s\n", estack_ax(stack, top)->u.s.str);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
@@ -629,19 +748,18 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 			dbg_printf("load field ref offset %u type sequence\n",
 				ref->offset);
-			estack_push(stack);
-			estack_ax(stack)->u.s.seq_len =
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.s.seq_len =
 				*(unsigned long *) &filter_stack_data[ref->offset];
-			estack_ax(stack)->u.s.str =
+			estack_ax(stack, top)->u.s.str =
 				*(const char **) (&filter_stack_data[ref->offset
 								+ sizeof(unsigned long)]);
-			if (unlikely(!estack_ax(stack)->u.s.str)) {
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
 				dbg_printf("Filter warning: loading a NULL sequence.\n");
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack)->type = REG_STRING;
-			estack_ax(stack)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.literal = 0;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
@@ -653,11 +771,10 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 			dbg_printf("load field ref offset %u type s64\n",
 				ref->offset);
-			estack_push(stack);
-			memcpy(&estack_ax(stack)->u.v, &filter_stack_data[ref->offset],
-				sizeof(struct literal_numeric));
-			estack_ax(stack)->type = REG_S64;
-			dbg_printf("ref load s64 %" PRIi64 "\n", estack_ax(stack)->u.v);
+			estack_push(stack, top, ax, bx);
+			estack_ax_v =
+				((struct literal_numeric *) &filter_stack_data[ref->offset])->v;
+			dbg_printf("ref load s64 %" PRIi64 "\n", estack_ax_v);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
@@ -669,25 +786,24 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 			dbg_printf("load field ref offset %u type double\n",
 				ref->offset);
-			estack_push(stack);
-			memcpy(&estack_ax(stack)->u.d, &filter_stack_data[ref->offset],
+			estack_push(stack, top, ax, bx);
+			memcpy(&estack_ax(stack, top)->u.d, &filter_stack_data[ref->offset],
 				sizeof(struct literal_double));
-			estack_ax(stack)->type = REG_DOUBLE;
-			dbg_printf("ref load double %g\n", estack_ax(stack)->u.d);
+			dbg_printf("ref load double %g\n", estack_ax(stack, top)->u.d);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
 
+		/* load from immediate operand */
 		OP(FILTER_OP_LOAD_STRING):
 		{
 			struct load_op *insn = (struct load_op *) pc;
 
 			dbg_printf("load string %s\n", insn->data);
-			estack_push(stack);
-			estack_ax(stack)->type = REG_STRING;
-			estack_ax(stack)->u.s.str = insn->data;
-			estack_ax(stack)->u.s.seq_len = UINT_MAX;
-			estack_ax(stack)->u.s.literal = 1;
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.s.str = insn->data;
+			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
+			estack_ax(stack, top)->u.s.literal = 1;
 			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
 			PO;
 		}
@@ -696,11 +812,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 
-			estack_push(stack);
-			memcpy(&estack_ax(stack)->u.v, insn->data,
-				sizeof(struct literal_numeric));
-			dbg_printf("load s64 %" PRIi64 "\n", estack_ax(stack)->u.v);
-			estack_ax(stack)->type = REG_S64;
+			estack_push(stack, top, ax, bx);
+			estack_ax_v = ((struct literal_numeric *) insn->data)->v;
+			dbg_printf("load s64 %" PRIi64 "\n", estack_ax_v);
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_numeric);
 			PO;
@@ -710,11 +824,10 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 
-			estack_push(stack);
-			memcpy(&estack_ax(stack)->u.d, insn->data,
+			estack_push(stack, top, ax, bx);
+			memcpy(&estack_ax(stack, top)->u.d, insn->data,
 				sizeof(struct literal_double));
-			dbg_printf("load s64 %g\n", estack_ax(stack)->u.d);
-			estack_ax(stack)->type = REG_DOUBLE;
+			dbg_printf("load s64 %g\n", estack_ax(stack, top)->u.d);
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_double);
 			PO;
@@ -729,8 +842,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 		OP(FILTER_OP_CAST_DOUBLE_TO_S64):
 		{
-			estack_ax(stack)->u.v = (int64_t) estack_ax(stack)->u.d;
-			estack_ax(stack)->type = REG_S64;
+			estack_ax_v = (int64_t) estack_ax(stack, top)->u.d;
 			next_pc += sizeof(struct cast_op);
 			PO;
 		}
@@ -741,6 +853,68 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			PO;
 		}
 
+		/* get context ref */
+		OP(FILTER_OP_GET_CONTEXT_REF_STRING):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type string\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.s.str = v.str;
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
+				dbg_printf("Filter warning: loading a NULL string.\n");
+				ret = -EINVAL;
+				goto end;
+			}
+			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
+			estack_ax(stack, top)->u.s.literal = 0;
+			dbg_printf("ref get context string %s\n", estack_ax(stack, top)->u.s.str);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_CONTEXT_REF_S64):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type s64\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			estack_ax_v = v.s64;
+			dbg_printf("ref get context s64 %" PRIi64 "\n", estack_ax_v);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_CONTEXT_REF_DOUBLE):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type double\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			memcpy(&estack_ax(stack, top)->u.d, &v.d, sizeof(struct literal_double));
+			dbg_printf("ref get context double %g\n", estack_ax(stack, top)->u.d);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
 	END_OP
 end:
 	/* return 0 (discard) on error */