Filter code relicensing to MIT license

[lttng-ust.git] / liblttng-ust / filter-bytecode.h

diff --git a/liblttng-ust/filter-bytecode.h b/liblttng-ust/filter-bytecode.h
index 38c5d51c04f84bdaf494f69a6317e8ea96a5819b..d5194bc25ddf02a2efc4c256c4f712686dd9eeba 100644 (file)
--- a/liblttng-ust/filter-bytecode.h
+++ b/liblttng-ust/filter-bytecode.h
@@ -6,20 +6,25 @@
  *
  * LTTng filter bytecode
  *
- * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2012-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, version 2.1 only,
- * as published by the Free Software Foundation.
+ * 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.
  */
 
 #include <lttng/ust-abi.h>
@@ -28,12 +33,6 @@
  * offsets are absolute from start of bytecode.
  */
 
-enum filter_register {
-       REG_R0 = 0,
-       REG_R1 = 1,
-       REG_ERROR,
-};
-
 struct field_ref {
        /* Initially, symbol offset. After link, field offset. */
        uint16_t offset;
@@ -100,6 +99,21 @@ enum filter_op {
        FILTER_OP_GE_DOUBLE,
        FILTER_OP_LE_DOUBLE,
 
+       /* Mixed S64-double binary comparators */
+       FILTER_OP_EQ_DOUBLE_S64,
+       FILTER_OP_NE_DOUBLE_S64,
+       FILTER_OP_GT_DOUBLE_S64,
+       FILTER_OP_LT_DOUBLE_S64,
+       FILTER_OP_GE_DOUBLE_S64,
+       FILTER_OP_LE_DOUBLE_S64,
+
+       FILTER_OP_EQ_S64_DOUBLE,
+       FILTER_OP_NE_S64_DOUBLE,
+       FILTER_OP_GT_S64_DOUBLE,
+       FILTER_OP_LT_S64_DOUBLE,
+       FILTER_OP_GE_S64_DOUBLE,
+       FILTER_OP_LE_S64_DOUBLE,
+
        /* unary */
        FILTER_OP_UNARY_PLUS,
        FILTER_OP_UNARY_MINUS,
@@ -115,13 +129,14 @@ enum filter_op {
        FILTER_OP_AND,
        FILTER_OP_OR,
 
-       /* load */
+       /* load field ref */
        FILTER_OP_LOAD_FIELD_REF,
        FILTER_OP_LOAD_FIELD_REF_STRING,
        FILTER_OP_LOAD_FIELD_REF_SEQUENCE,
        FILTER_OP_LOAD_FIELD_REF_S64,
        FILTER_OP_LOAD_FIELD_REF_DOUBLE,
 
+       /* load immediate from operand */
        FILTER_OP_LOAD_STRING,
        FILTER_OP_LOAD_S64,
        FILTER_OP_LOAD_DOUBLE,
@@ -131,6 +146,12 @@ enum filter_op {
        FILTER_OP_CAST_DOUBLE_TO_S64,
        FILTER_OP_CAST_NOP,
 
+       /* get context ref */
+       FILTER_OP_GET_CONTEXT_REF,
+       FILTER_OP_GET_CONTEXT_REF_STRING,
+       FILTER_OP_GET_CONTEXT_REF_S64,
+       FILTER_OP_GET_CONTEXT_REF_DOUBLE,
+
        NR_FILTER_OPS,
 };
 
@@ -138,7 +159,6 @@ typedef uint8_t filter_opcode_t;
 
 struct load_op {
        filter_opcode_t op;
-       uint8_t reg;            /* enum filter_register */
        char data[0];
        /* data to load. Size known by enum filter_opcode and null-term char. */
 } __attribute__((packed));
@@ -149,7 +169,6 @@ struct binary_op {
 
 struct unary_op {
        filter_opcode_t op;
-       uint8_t reg;            /* enum filter_register */
 } __attribute__((packed));
 
 /* skip_offset is absolute from start of bytecode */
@@ -160,7 +179,6 @@ struct logical_op {
 
 struct cast_op {
        filter_opcode_t op;
-       uint8_t reg;            /* enum filter_register */
 } __attribute__((packed));
 
 struct return_op {