X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-bytecode-interpreter.c;h=a2a932c65f2d488d1f119741801cdbf0ef3c2456;hb=4fabf854f6bee54286be80dd682921634f43e813;hp=be0a32489e8c0bc725b75455eb5e6ab6a96a8a25;hpb=dc7350d64398c28628d40d8afcfae8de9d76e6f7;p=lttng-modules.git

diff --git a/src/lttng-bytecode-interpreter.c b/src/lttng-bytecode-interpreter.c
index be0a3248..a2a932c6 100644
--- a/src/lttng-bytecode-interpreter.c
+++ b/src/lttng-bytecode-interpreter.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#include <wrapper/compiler_attributes.h>
 #include <wrapper/uaccess.h>
 #include <wrapper/objtool.h>
 #include <wrapper/types.h>
@@ -211,7 +212,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 int lttng_bytecode_interpret_error(
 	struct lttng_kernel_bytecode_runtime *bytecode_runtime __attribute__((unused)),
 	const char *stack_data __attribute__((unused)),
-	struct lttng_probe_ctx *probe_ctx __attribute__((unused)),
+	struct lttng_kernel_probe_ctx *probe_ctx __attribute__((unused)),
 	void *ctx __attribute__((unused)))
 {
 	return LTTNG_KERNEL_BYTECODE_INTERPRETER_ERROR;
@@ -266,7 +267,7 @@ LABEL_##name
 #define IS_INTEGER_REGISTER(reg_type) \
 		(reg_type == REG_S64 || reg_type == REG_U64)
 
-static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+static int context_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct load_ptr *ptr,
 		uint32_t idx)
 {
@@ -363,7 +364,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 	return 0;
 }
 
-static int dynamic_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+static int dynamic_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct bytecode_runtime *runtime,
 		uint64_t index, struct estack_entry *stack_top)
 {
@@ -421,7 +422,8 @@ static int dynamic_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 		}
 		break;
 	case LOAD_ROOT_CONTEXT:
-	case LOAD_ROOT_APP_CONTEXT:	/* Fall-through */
+		lttng_fallthrough;
+	case LOAD_ROOT_APP_CONTEXT:
 	{
 		ret = context_get_index(lttng_probe_ctx,
 				&stack_top->u.ptr,
@@ -758,7 +760,7 @@ void dbg_load_ref_user_str_printk(const struct estack_entry *user_str_reg)
  */
 int lttng_bytecode_interpret(struct lttng_kernel_bytecode_runtime *kernel_bytecode,
 		const char *interpreter_stack_data,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		void *caller_ctx)
 {
 	struct bytecode_runtime *bytecode = container_of(kernel_bytecode, struct bytecode_runtime, p);
@@ -1849,7 +1851,7 @@ LTTNG_STACK_FRAME_NON_STANDARD(lttng_bytecode_interpret);
  */
 int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common *event,
 		const char *interpreter_stack_data,
-		struct lttng_probe_ctx *probe_ctx,
+		struct lttng_kernel_probe_ctx *probe_ctx,
 		void *event_filter_ctx __attribute__((unused)))
 {
 	struct lttng_kernel_bytecode_runtime *filter_bc_runtime;