X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-specialize.c;h=92196dfb17bcf64e9138da8ac6569b4a4906d389;hb=7e50015d099795fcce0602bdb670fd6ae0510026;hp=ef0d811bf5c342418a146ed52799694047857183;hpb=0305960f8200d1db7002b75d9a5c3ea37541e2c5;p=lttng-ust.git diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c index ef0d811b..92196dfb 100644 --- a/liblttng-ust/lttng-filter-specialize.c +++ b/liblttng-ust/lttng-filter-specialize.c @@ -3,23 +3,28 @@ * * LTTng UST filter code specializer. * - * Copyright (C) 2010-2012 Mathieu Desnoyers + * Copyright (C) 2010-2016 Mathieu Desnoyers * - * 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 "lttng-filter.h" int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) @@ -73,17 +78,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_EQ_STRING; break; case 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. */ } /* Pop 2, push 1 */ if (vstack_pop(stack)) { @@ -106,17 +122,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_NE_STRING; break; case 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. */ } /* Pop 2, push 1 */ if (vstack_pop(stack)) { @@ -139,17 +166,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_GT_STRING; break; case 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. */ } /* Pop 2, push 1 */ if (vstack_pop(stack)) { @@ -172,17 +210,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_LT_STRING; break; case 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. */ } /* Pop 2, push 1 */ if (vstack_pop(stack)) { @@ -205,17 +254,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_GE_STRING; break; case 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)) { @@ -237,17 +297,28 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_LE_STRING; break; case 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. */ } vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); @@ -272,6 +343,18 @@ 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: { /* Pop 2, push 1 */ if (vstack_pop(stack)) { @@ -300,6 +383,8 @@ 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); @@ -322,6 +407,8 @@ 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); @@ -344,6 +431,8 @@ 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); @@ -366,19 +455,37 @@ 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: { if (vstack_push(stack)) { ret = -EINVAL; @@ -389,6 +496,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) break; } case FILTER_OP_LOAD_FIELD_REF_S64: + case FILTER_OP_GET_CONTEXT_REF_S64: { if (vstack_push(stack)) { ret = -EINVAL; @@ -399,6 +507,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) break; } case FILTER_OP_LOAD_FIELD_REF_DOUBLE: + case FILTER_OP_GET_CONTEXT_REF_DOUBLE: { if (vstack_push(stack)) { ret = -EINVAL; @@ -409,6 +518,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) break; } + /* load from immediate operand */ case FILTER_OP_LOAD_STRING: { struct load_op *insn = (struct load_op *) pc; @@ -467,6 +577,8 @@ 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; } /* Pop 1, push 1 */ vstack_ax(stack)->type = REG_S64; @@ -486,7 +598,6 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) break; } - } } end: