X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-interpreter.c;fp=lttng-filter-interpreter.c;h=5bf0bd6074719ef59cf5dc8a2fe57f4cc0f5e7e7;hb=e16c054bb621df50a1710dcd9d1d613f13ef52d2;hp=0bede9c5bb36c761583369850cba43eb0d92086d;hpb=3834b99f4341209754c4955ec853dc250b33ed4b;p=lttng-modules.git

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index 0bede9c5..5bf0bd60 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -647,8 +647,8 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_MOD ] = &&LABEL_FILTER_OP_MOD,
 		[ FILTER_OP_PLUS ] = &&LABEL_FILTER_OP_PLUS,
 		[ FILTER_OP_MINUS ] = &&LABEL_FILTER_OP_MINUS,
-		[ FILTER_OP_RSHIFT ] = &&LABEL_FILTER_OP_RSHIFT,
-		[ FILTER_OP_LSHIFT ] = &&LABEL_FILTER_OP_LSHIFT,
+		[ FILTER_OP_BIT_RSHIFT ] = &&LABEL_FILTER_OP_BIT_RSHIFT,
+		[ FILTER_OP_BIT_LSHIFT ] = &&LABEL_FILTER_OP_BIT_LSHIFT,
 		[ FILTER_OP_BIT_AND ] = &&LABEL_FILTER_OP_BIT_AND,
 		[ FILTER_OP_BIT_OR ] = &&LABEL_FILTER_OP_BIT_OR,
 		[ FILTER_OP_BIT_XOR ] = &&LABEL_FILTER_OP_BIT_XOR,
@@ -769,6 +769,8 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_LOAD_FIELD_STRING ] = &&LABEL_FILTER_OP_LOAD_FIELD_STRING,
 		[ FILTER_OP_LOAD_FIELD_SEQUENCE ] = &&LABEL_FILTER_OP_LOAD_FIELD_SEQUENCE,
 		[ FILTER_OP_LOAD_FIELD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_DOUBLE,
+
+		[ FILTER_OP_UNARY_BIT_NOT ] = &&LABEL_FILTER_OP_UNARY_BIT_NOT,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
@@ -797,8 +799,6 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		OP(FILTER_OP_MOD):
 		OP(FILTER_OP_PLUS):
 		OP(FILTER_OP_MINUS):
-		OP(FILTER_OP_RSHIFT):
-		OP(FILTER_OP_LSHIFT):
 			printk(KERN_WARNING "unsupported bytecode op %u\n",
 				(unsigned int) *(filter_opcode_t *) pc);
 			ret = -EINVAL;
@@ -986,6 +986,26 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			BUG_ON(1);
 			PO;
 		}
+		OP(FILTER_OP_BIT_RSHIFT):
+		{
+			int64_t res;
+
+			res = (estack_bx_v >> estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_BIT_LSHIFT):
+		{
+			int64_t res;
+
+			res = (estack_bx_v << estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
 		OP(FILTER_OP_BIT_AND):
 		{
 			int64_t res;
@@ -1027,6 +1047,13 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 
+		OP(FILTER_OP_UNARY_BIT_NOT):
+		{
+			estack_ax_v = ~estack_ax_v;
+			next_pc += sizeof(struct unary_op);
+			PO;
+		}
+
 		OP(FILTER_OP_UNARY_PLUS_S64):
 		{
 			next_pc += sizeof(struct unary_op);