X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=0caeab6f87f66bcc838fb565dbf097575aea2e6e;hb=7e50015d099795fcce0602bdb670fd6ae0510026;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..0caeab6f 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -3,23 +3,29 @@
  *
  * LTTng UST filter interpreter.
  *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
+#define _LGPL_SOURCE
+#include <urcu-pointer.h>
 #include "lttng-filter.h"
 
 /*
@@ -49,30 +55,36 @@ 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 (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 +93,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 +117,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;
@@ -126,13 +138,17 @@ int lttng_filter_false(void *filter_data,
 			(unsigned int) *(filter_opcode_t *) pc); 	\
 		switch (*(filter_opcode_t *) pc)	{
 
-#define OP(name)	case name
+#define OP(name)	jump_target_##name: __attribute__((unused));	\
+			case name
 
 #define PO		break
 
 #define END_OP		}						\
 	}
 
+#define JUMP_TO(name)							\
+			goto jump_target_##name
+
 #else
 
 /*
@@ -155,17 +171,29 @@ LABEL_##name
 
 #define END_OP
 
+#define JUMP_TO(name)							\
+		goto 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;
+	struct lttng_session *session = bytecode->p.session;
 	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 enum entry_type ax_t = REG_UNKNOWN, bx_t = REG_UNKNOWN;
+	register int top = FILTER_STACK_EMPTY;
 #ifndef INTERPRETER_USE_SWITCH
 	static void *dispatch[NR_FILTER_OPS] = {
 		[ FILTER_OP_UNKNOWN ] = &&LABEL_FILTER_OP_UNKNOWN,
@@ -246,13 +274,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,
@@ -261,11 +290,15 @@ 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):
@@ -279,7 +312,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;
 
@@ -300,24 +334,362 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_EQ):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_EQ_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_EQ_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_EQ_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_EQ_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_EQ_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_NE):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_NE_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_NE_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_NE_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_NE_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_NE_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_GT):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_GT_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_GT_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_GT_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_GT_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_GT_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_LT):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_LT_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_LT_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_LT_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_LT_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_LT_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_GE):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_GE_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_GE_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_GE_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_GE_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_GE_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_LE):
-			ERR("unsupported non-specialized bytecode op %u\n",
-				(unsigned int) *(filter_opcode_t *) pc);
-			ret = -EINVAL;
-			goto end;
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_LE_S64);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_LE_DOUBLE_S64);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_DOUBLE:
+				switch (estack_bx_t) {
+				case REG_S64:
+					JUMP_TO(FILTER_OP_LE_S64_DOUBLE);
+				case REG_DOUBLE:
+					JUMP_TO(FILTER_OP_LE_DOUBLE);
+				case REG_STRING:
+					ret = -EINVAL;
+					goto end;
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			case REG_STRING:
+				switch (estack_bx_t) {
+				case REG_S64:	/* Fall-through */
+				case REG_DOUBLE:
+					ret = -EINVAL;
+					goto end;
+				case REG_STRING:
+					JUMP_TO(FILTER_OP_LE_STRING);
+				default:
+					ERR("Unknown filter register type (%d)",
+						(int) estack_bx_t);
+					ret = -EINVAL;
+					goto end;
+				}
+				break;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 
 		OP(FILTER_OP_EQ_STRING):
 		{
 			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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -325,10 +697,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -336,10 +708,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -347,10 +719,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -358,10 +730,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -369,10 +741,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -381,10 +753,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -392,10 +764,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -403,10 +775,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -414,10 +786,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -425,10 +797,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -436,10 +808,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -448,10 +820,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -459,10 +831,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -470,10 +842,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -481,10 +853,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -492,10 +864,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -503,10 +875,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -516,10 +888,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -527,10 +899,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -538,10 +910,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -549,10 +921,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -560,10 +932,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -571,10 +943,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -583,10 +955,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -594,10 +966,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -605,10 +977,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -616,10 +988,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -627,10 +999,10 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
@@ -638,23 +1010,71 @@ 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, ax_t, bx_t);
+			estack_ax_v = res;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			PO;
 		}
 
 		/* unary */
 		OP(FILTER_OP_UNARY_PLUS):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:	/* Fall-through. */
+				JUMP_TO(FILTER_OP_UNARY_PLUS_S64);
+			case REG_DOUBLE:
+				JUMP_TO(FILTER_OP_UNARY_PLUS_DOUBLE);
+			case REG_STRING:
+				ret = -EINVAL;
+				goto end;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_UNARY_MINUS):
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				JUMP_TO(FILTER_OP_UNARY_MINUS_S64);
+			case REG_DOUBLE:
+				JUMP_TO(FILTER_OP_UNARY_MINUS_DOUBLE);
+			case REG_STRING:
+				ret = -EINVAL;
+				goto end;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 		OP(FILTER_OP_UNARY_NOT):
-			ERR("unsupported non-specialized bytecode op %u\n",
-				(unsigned int) *(filter_opcode_t *) pc);
-			ret = -EINVAL;
-			goto end;
-
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				JUMP_TO(FILTER_OP_UNARY_NOT_S64);
+			case REG_DOUBLE:
+				JUMP_TO(FILTER_OP_UNARY_NOT_DOUBLE);
+			case REG_STRING:
+				ret = -EINVAL;
+				goto end;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+			next_pc += sizeof(struct unary_op);
+			PO;
+		}
 
 		OP(FILTER_OP_UNARY_PLUS_S64):
 		OP(FILTER_OP_UNARY_PLUS_DOUBLE):
@@ -664,25 +1084,26 @@ 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_v = !estack_ax(stack, top)->u.d;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct unary_op);
 			PO;
 		}
@@ -692,14 +1113,18 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct logical_op *insn = (struct logical_op *) pc;
 
+			if (estack_ax_t != REG_S64) {
+				ret = -EINVAL;
+				goto end;
+			}
 			/* 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, ax_t, bx_t);
 				next_pc += sizeof(struct logical_op);
 			}
 			PO;
@@ -708,23 +1133,26 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct logical_op *insn = (struct logical_op *) pc;
 
+			if (estack_ax_t != REG_S64) {
+				ret = -EINVAL;
+				goto end;
+			}
 			/* 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, ax_t, bx_t);
 				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;
@@ -732,18 +1160,18 @@ 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, ax_t, bx_t);
+			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;
+			estack_ax_t = REG_STRING;
+			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 +1183,19 @@ 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, ax_t, bx_t);
+			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)) {
+			estack_ax_t = REG_STRING;
+			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 +1207,11 @@ 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, ax_t, bx_t);
+			estack_ax_v =
+				((struct literal_numeric *) &filter_stack_data[ref->offset])->v;
+			estack_ax_t = REG_S64;
+			dbg_printf("ref load s64 %" PRIi64 "\n", estack_ax_v);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
@@ -795,25 +1223,26 @@ 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, ax_t, bx_t);
+			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);
+			estack_ax_t = REG_DOUBLE;
+			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, ax_t, bx_t);
+			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;
+			estack_ax_t = REG_STRING;
 			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
 			PO;
 		}
@@ -822,11 +1251,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.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, ax_t, bx_t);
+			estack_ax_v = ((struct literal_numeric *) insn->data)->v;
+			estack_ax_t = REG_S64;
+			dbg_printf("load s64 %" PRIi64 "\n", estack_ax_v);
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_numeric);
 			PO;
@@ -836,11 +1264,11 @@ 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, ax_t, bx_t);
+			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;
+			estack_ax_t = REG_DOUBLE;
+			dbg_printf("load double %g\n", estack_ax(stack, top)->u.d);
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_double);
 			PO;
@@ -848,15 +1276,28 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 
 		/* cast */
 		OP(FILTER_OP_CAST_TO_S64):
-			ERR("unsupported non-specialized bytecode op %u\n",
-				(unsigned int) *(filter_opcode_t *) pc);
-			ret = -EINVAL;
-			goto end;
+		{
+			/* Dynamic typing. */
+			switch (estack_ax_t) {
+			case REG_S64:
+				JUMP_TO(FILTER_OP_CAST_NOP);
+			case REG_DOUBLE:
+				JUMP_TO(FILTER_OP_CAST_DOUBLE_TO_S64);
+			case REG_STRING:
+				ret = -EINVAL;
+				goto end;
+			default:
+				ERR("Unknown filter register type (%d)",
+					(int) estack_ax_t);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
 
 		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;
+			estack_ax_t = REG_S64;
 			next_pc += sizeof(struct cast_op);
 			PO;
 		}
@@ -867,6 +1308,126 @@ int lttng_filter_interpret_bytecode(void *filter_data,
 			PO;
 		}
 
+		/* get context ref */
+		OP(FILTER_OP_GET_CONTEXT_REF):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx *ctx;
+			struct lttng_ctx_field *ctx_field;
+			struct lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type dynamic\n",
+				ref->offset);
+			ctx = rcu_dereference(session->ctx);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx, ax_t, bx_t);
+			switch (v.sel) {
+			case LTTNG_UST_DYNAMIC_TYPE_NONE:
+				ret = -EINVAL;
+				goto end;
+			case LTTNG_UST_DYNAMIC_TYPE_S64:
+				estack_ax_v = v.u.s64;
+				estack_ax_t = REG_S64;
+				dbg_printf("ref get context dynamic s64 %" PRIi64 "\n", estack_ax_v);
+				break;
+			case LTTNG_UST_DYNAMIC_TYPE_DOUBLE:
+				estack_ax(stack, top)->u.d = v.u.d;
+				estack_ax_t = REG_DOUBLE;
+				dbg_printf("ref get context dynamic double %g\n", estack_ax(stack, top)->u.d);
+				break;
+			case LTTNG_UST_DYNAMIC_TYPE_STRING:
+				estack_ax(stack, top)->u.s.str = v.u.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 dynamic string %s\n", estack_ax(stack, top)->u.s.str);
+				estack_ax_t = REG_STRING;
+				break;
+			default:
+				dbg_printf("Filter warning: unknown dynamic type (%d).\n", (int) v.sel);
+				ret = -EINVAL;
+				goto end;
+			}
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
+		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 *ctx;
+			struct lttng_ctx_field *ctx_field;
+			struct lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type string\n",
+				ref->offset);
+			ctx = rcu_dereference(session->ctx);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx, ax_t, bx_t);
+			estack_ax(stack, top)->u.s.str = v.u.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;
+			estack_ax_t = REG_STRING;
+			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 *ctx;
+			struct lttng_ctx_field *ctx_field;
+			struct lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type s64\n",
+				ref->offset);
+			ctx = rcu_dereference(session->ctx);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx, ax_t, bx_t);
+			estack_ax_v = v.u.s64;
+			estack_ax_t = REG_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 *ctx;
+			struct lttng_ctx_field *ctx_field;
+			struct lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type double\n",
+				ref->offset);
+			ctx = rcu_dereference(session->ctx);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx, ax_t, bx_t);
+			memcpy(&estack_ax(stack, top)->u.d, &v.u.d, sizeof(struct literal_double));
+			estack_ax_t = REG_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 */