Version 2.5.7

[lttng-ust.git] / liblttng-ust / lttng-filter-specialize.c

diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c
index b422f50863a5f4608405c5c41ca5ed32faf1f61f..a729e427f9dead2c3ebdaffc931f79cb9ff79b39 100644 (file)
--- a/liblttng-ust/lttng-filter-specialize.c
+++ b/liblttng-ust/lttng-filter-specialize.c
@@ -396,19 +396,33 @@ 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:
+               {
+                       ERR("Unknown get context ref type\n");
+                       ret = -EINVAL;
+                       goto end;
+               }
                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;
@@ -419,6 +433,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;
@@ -429,6 +444,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;
@@ -439,6 +455,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;
@@ -516,7 +533,6 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
                        break;
                }
 
-
                }
        }
 end: