X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-specialize.c;h=d115585d8c9a1cc85b482a72bf981e5cad031ffa;hb=8db078dccf54f56edbcbd20cff2430b5e7540801;hp=fc350fd61b2e7b73e7288a00326f1a80249afb34;hpb=97b58163ffe6cced54c3d37ae79d4113a9d26455;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c
index fc350fd6..d115585d 100644
--- a/liblttng-ust/lttng-filter-specialize.c
+++ b/liblttng-ust/lttng-filter-specialize.c
@@ -20,19 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include "lttng-filter.h"
 
 int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 {
 	void *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
-	struct vreg reg[NR_REG];
-	int i;
+	struct vstack _stack;
+	struct vstack *stack = &_stack;
 
-	for (i = 0; i < NR_REG; i++) {
-		reg[i].type = REG_TYPE_UNKNOWN;
-		reg[i].literal = 0;
-	}
+	vstack_init(stack);
 
 	start_pc = &bytecode->data[0];
 	for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
@@ -69,26 +67,42 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_EQ_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_EQ_S64;
 				else
-					insn->op = FILTER_OP_EQ_DOUBLE;
+					insn->op = FILTER_OP_EQ_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_EQ_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_EQ_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_EQ_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
 			}
-			reg[REG_R0].type = REG_S64;
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -97,26 +111,42 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_NE_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_NE_S64;
 				else
-					insn->op = FILTER_OP_NE_DOUBLE;
+					insn->op = FILTER_OP_NE_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_NE_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_NE_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_NE_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
 			}
-			reg[REG_R0].type = REG_S64;
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -125,26 +155,42 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_GT_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_GT_S64;
 				else
-					insn->op = FILTER_OP_GT_DOUBLE;
+					insn->op = FILTER_OP_GT_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_GT_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_GT_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_GT_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
 			}
-			reg[REG_R0].type = REG_S64;
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -153,26 +199,42 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_LT_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_LT_S64;
 				else
-					insn->op = FILTER_OP_LT_DOUBLE;
+					insn->op = FILTER_OP_LT_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_LT_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_LT_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_LT_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
 			}
-			reg[REG_R0].type = REG_S64;
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -181,26 +243,42 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_GE_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_GE_S64;
 				else
-					insn->op = FILTER_OP_GE_DOUBLE;
+					insn->op = FILTER_OP_GE_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_GE_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_GE_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_GE_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
+			}
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
 			}
-			reg[REG_R0].type = REG_S64;
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -208,26 +286,37 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct binary_op *insn = (struct binary_op *) pc;
 
-			switch(reg[REG_R0].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
 				goto end;
 
 			case REG_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
 				insn->op = FILTER_OP_LE_STRING;
 				break;
 			case REG_S64:
-				if (reg[REG_R1].type == REG_S64)
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
 					insn->op = FILTER_OP_LE_S64;
 				else
-					insn->op = FILTER_OP_LE_DOUBLE;
+					insn->op = FILTER_OP_LE_DOUBLE_S64;
 				break;
 			case REG_DOUBLE:
-				insn->op = FILTER_OP_LE_DOUBLE;
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				if (vstack_bx(stack)->type == REG_S64)
+					insn->op = FILTER_OP_LE_S64_DOUBLE;
+				else
+					insn->op = FILTER_OP_LE_DOUBLE;
 				break;
+			case REG_UNKNOWN:
+				break;	/* Dynamic typing. */
 			}
-			reg[REG_R0].type = REG_S64;
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -250,8 +339,25 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		case FILTER_OP_LT_DOUBLE:
 		case FILTER_OP_GE_DOUBLE:
 		case FILTER_OP_LE_DOUBLE:
+		case FILTER_OP_EQ_DOUBLE_S64:
+		case FILTER_OP_NE_DOUBLE_S64:
+		case FILTER_OP_GT_DOUBLE_S64:
+		case FILTER_OP_LT_DOUBLE_S64:
+		case FILTER_OP_GE_DOUBLE_S64:
+		case FILTER_OP_LE_DOUBLE_S64:
+		case FILTER_OP_EQ_S64_DOUBLE:
+		case FILTER_OP_NE_S64_DOUBLE:
+		case FILTER_OP_GT_S64_DOUBLE:
+		case FILTER_OP_LT_S64_DOUBLE:
+		case FILTER_OP_GE_S64_DOUBLE:
+		case FILTER_OP_LE_S64_DOUBLE:
 		{
-			reg[REG_R0].type = REG_S64;
+			/* Pop 2, push 1 */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct binary_op);
 			break;
 		}
@@ -261,7 +367,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct unary_op *insn = (struct unary_op *) pc;
 
-			switch(reg[insn->reg].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
@@ -273,7 +379,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_DOUBLE:
 				insn->op = FILTER_OP_UNARY_PLUS_DOUBLE;
 				break;
+			case REG_UNKNOWN:	/* Dynamic typing. */
+				break;
 			}
+			/* Pop 1, push 1 */
 			next_pc += sizeof(struct unary_op);
 			break;
 		}
@@ -282,7 +391,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct unary_op *insn = (struct unary_op *) pc;
 
-			switch(reg[insn->reg].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
@@ -294,7 +403,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_DOUBLE:
 				insn->op = FILTER_OP_UNARY_MINUS_DOUBLE;
 				break;
+			case REG_UNKNOWN:	/* Dynamic typing. */
+				break;
 			}
+			/* Pop 1, push 1 */
 			next_pc += sizeof(struct unary_op);
 			break;
 		}
@@ -303,7 +415,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct unary_op *insn = (struct unary_op *) pc;
 
-			switch(reg[insn->reg].type) {
+			switch(vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
@@ -315,7 +427,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_DOUBLE:
 				insn->op = FILTER_OP_UNARY_NOT_DOUBLE;
 				break;
+			case REG_UNKNOWN:	/* Dynamic typing. */
+				break;
 			}
+			/* Pop 1, push 1 */
 			next_pc += sizeof(struct unary_op);
 			break;
 		}
@@ -327,6 +442,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		case FILTER_OP_UNARY_MINUS_DOUBLE:
 		case FILTER_OP_UNARY_NOT_DOUBLE:
 		{
+			/* Pop 1, push 1 */
 			next_pc += sizeof(struct unary_op);
 			break;
 		}
@@ -335,62 +451,90 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		case FILTER_OP_AND:
 		case FILTER_OP_OR:
 		{
+			/* Continue to next instruction */
+			/* Pop 1 when jump not taken */
+			if (vstack_pop(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
 			next_pc += sizeof(struct logical_op);
 			break;
 		}
 
-		/* load */
+		/* load field ref */
 		case FILTER_OP_LOAD_FIELD_REF:
 		{
 			ERR("Unknown field ref type\n");
 			ret = -EINVAL;
 			goto end;
 		}
+		/* get context ref */
+		case FILTER_OP_GET_CONTEXT_REF:
+		{
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_UNKNOWN;
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			break;
+		}
 		case FILTER_OP_LOAD_FIELD_REF_STRING:
 		case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+		case FILTER_OP_GET_CONTEXT_REF_STRING:
 		{
-			struct load_op *insn = (struct load_op *) pc;
-
-			reg[insn->reg].type = REG_STRING;
-			reg[insn->reg].literal = 0;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_STRING;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			break;
 		}
 		case FILTER_OP_LOAD_FIELD_REF_S64:
+		case FILTER_OP_GET_CONTEXT_REF_S64:
 		{
-			struct load_op *insn = (struct load_op *) pc;
-
-			reg[insn->reg].type = REG_S64;
-			reg[insn->reg].literal = 0;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			break;
 		}
 		case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+		case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
 		{
-			struct load_op *insn = (struct load_op *) pc;
-
-			reg[insn->reg].type = REG_DOUBLE;
-			reg[insn->reg].literal = 0;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_DOUBLE;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			break;
 		}
 
+		/* load from immediate operand */
 		case FILTER_OP_LOAD_STRING:
 		{
 			struct load_op *insn = (struct load_op *) pc;
 
-			reg[insn->reg].type = REG_STRING;
-			reg[insn->reg].literal = 1;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_STRING;
 			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
 			break;
 		}
 
 		case FILTER_OP_LOAD_S64:
 		{
-			struct load_op *insn = (struct load_op *) pc;
-
-			reg[insn->reg].type = REG_S64;
-			reg[insn->reg].literal = 1;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_numeric);
 			break;
@@ -398,10 +542,11 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 
 		case FILTER_OP_LOAD_DOUBLE:
 		{
-			struct load_op *insn = (struct load_op *) pc;
-
-			reg[insn->reg].type = REG_DOUBLE;
-			reg[insn->reg].literal = 1;
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_DOUBLE;
 			next_pc += sizeof(struct load_op)
 					+ sizeof(struct literal_double);
 			break;
@@ -412,7 +557,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		{
 			struct cast_op *insn = (struct cast_op *) pc;
 
-			switch (reg[insn->reg].type) {
+			switch (vstack_ax(stack)->type) {
 			default:
 				ERR("unknown register type\n");
 				ret = -EINVAL;
@@ -428,16 +573,18 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_DOUBLE:
 				insn->op = FILTER_OP_CAST_DOUBLE_TO_S64;
 				break;
+			case REG_UNKNOWN:
+				break;
 			}
-			reg[insn->reg].type = REG_S64;
+			/* Pop 1, push 1 */
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct cast_op);
 			break;
 		}
 		case FILTER_OP_CAST_DOUBLE_TO_S64:
 		{
-			struct cast_op *insn = (struct cast_op *) pc;
-
-			reg[insn->reg].type = REG_S64;
+			/* Pop 1, push 1 */
+			vstack_ax(stack)->type = REG_S64;
 			next_pc += sizeof(struct cast_op);
 			break;
 		}
@@ -447,7 +594,6 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			break;
 		}
 
-
 		}
 	}
 end: