X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=e6e96dbff9a9bf53cdb346b68cd63a9b4728d457;hb=a8909ba54718ed54cefb1b839a5d41a065df09f9;hp=3ce00bbafc1d3941270ebf7134055a3a0551d2e1;hpb=dbea82ec5429aa713b029dfdfaf2fcff5287321d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 3ce00bba..e6e96dbf 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;
@@ -166,6 +166,8 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 	int 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,
@@ -264,8 +266,6 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
-	estack_init(stack);
-
 	START_OP
 
 		OP(FILTER_OP_UNKNOWN):
@@ -279,7 +279,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN):
-			retval = !!estack_ax(stack)->u.v;
+			retval = !!estack_ax_v;
 			ret = 0;
 			goto end;
 
@@ -314,10 +314,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;
 		}
@@ -325,10 +324,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;
 		}
@@ -336,10 +334,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;
 		}
@@ -347,10 +344,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;
 		}
@@ -358,10 +354,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;
 		}
@@ -369,10 +364,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;
 		}
@@ -381,10 +375,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;
 		}
@@ -392,10 +385,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;
 		}
@@ -403,10 +395,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;
 		}
@@ -414,10 +405,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;
 		}
@@ -425,10 +415,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;
 		}
@@ -436,10 +425,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;
 		}
@@ -448,10 +436,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d == estack_ax(stack)->u.d);
-			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;
 		}
@@ -459,10 +446,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d != estack_ax(stack)->u.d);
-			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;
 		}
@@ -470,10 +456,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d > estack_ax(stack)->u.d);
-			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;
 		}
@@ -481,10 +466,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d < estack_ax(stack)->u.d);
-			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;
 		}
@@ -492,10 +476,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d >= estack_ax(stack)->u.d);
-			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;
 		}
@@ -503,10 +486,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d <= estack_ax(stack)->u.d);
-			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;
 		}
@@ -516,10 +498,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d == 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -527,10 +508,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d != 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -538,10 +518,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d > 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -549,10 +528,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d < 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -560,10 +538,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d >= 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -571,10 +548,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.d <= 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_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -583,10 +559,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v == estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -594,10 +569,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v != estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -605,10 +579,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v > estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -616,10 +589,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v < estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -627,10 +599,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v >= estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -638,10 +609,9 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			int res;
 
-			res = (estack_bx(stack)->u.v <= estack_ax(stack)->u.d);
-			estack_pop(stack);
-			estack_ax(stack)->u.v = res;
-			estack_ax(stack)->type = REG_S64;
+			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;
 		}
@@ -664,25 +634,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;
 		}
@@ -693,13 +663,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;
@@ -710,14 +680,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;
@@ -732,18 +702,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;
 		}
@@ -755,19 +724,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;
 		}
@@ -779,11 +747,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;
 		}
@@ -795,11 +762,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;
 		}
@@ -809,11 +775,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;
 		}
@@ -822,11 +787,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;
@@ -836,11 +799,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;
@@ -855,8 +817,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;
 		}