X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=4b75f0bcd01854b4de53e1877ce05603919d2aa4;hb=83b68040af326eaa84e6ec24a50fd409e66ec37b;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..4b75f0bc 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -49,30 +49,30 @@ 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')
+		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')
 				diff = 0;
 			else
 				diff = -1;
 			break;
 		}
-		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')
+		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')
 				diff = 0;
 			else
 				diff = 1;
 			break;
 		}
-		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 +81,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 +105,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 +157,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 +223,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,
@@ -249,8 +271,6 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
-	estack_init(stack);
-
 	START_OP
 
 		OP(FILTER_OP_UNKNOWN):
@@ -264,7 +284,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 +320,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 +330,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 +340,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 +350,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 +360,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 +370,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 +381,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 +391,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 +401,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 +411,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 +421,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 +431,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 +442,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 +452,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 +462,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 +472,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 +482,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 +492,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 +640,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 +669,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,14 +686,14 @@ 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;
@@ -606,18 +708,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 +730,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 +753,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,11 +768,10 @@ 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;
 		}
@@ -683,11 +781,10 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			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 +793,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 +805,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 +823,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;
 		}