X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2Ffilter-visitor-generate-bytecode.c;h=a5e7a5afe735588096aba6faaa679bd3ab362db6;hp=699273c3d984f7e9aba6f4ee51b0d77e2fa666d1;hb=0ae3cfc61fedae38ef31fe5a99458c4f2161c3b5;hpb=e4d2f27a74baf6942ac8fcafd5ea53e775ceceb3

diff --git a/src/common/filter/filter-visitor-generate-bytecode.c b/src/common/filter/filter-visitor-generate-bytecode.c
index 699273c3d..a5e7a5afe 100644
--- a/src/common/filter/filter-visitor-generate-bytecode.c
+++ b/src/common/filter/filter-visitor-generate-bytecode.c
@@ -11,113 +11,25 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <common/align.h>
+#include <common/compat/errno.h>
 #include <common/compat/string.h>
 
-#include "filter-bytecode.h"
-#include "filter-ir.h"
+#include "common/align.h"
+#include "common/bytecode/bytecode.h"
+#include "common/compat/string.h"
+#include "common/macros.h"
 #include "filter-ast.h"
-
-#include <common/macros.h>
+#include "filter-ir.h"
 
 #ifndef max_t
 #define max_t(type, a, b)	((type) ((a) > (b) ? (a) : (b)))
 #endif
 
-#define INIT_ALLOC_SIZE		4
-
 static
 int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
 		struct ir_op *node);
 
-static inline int get_count_order(unsigned int count)
-{
-	int order;
-
-	order = lttng_fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
-}
-
-static
-int bytecode_init(struct lttng_filter_bytecode_alloc **fb)
-{
-	uint32_t alloc_len;
-
-	alloc_len = sizeof(struct lttng_filter_bytecode_alloc) + INIT_ALLOC_SIZE;
-	*fb = calloc(alloc_len, 1);
-	if (!*fb) {
-		return -ENOMEM;
-	} else {
-		(*fb)->alloc_len = alloc_len;
-		return 0;
-	}
-}
-
-static
-int32_t bytecode_reserve(struct lttng_filter_bytecode_alloc **fb, uint32_t align, uint32_t len)
-{
-	int32_t ret;
-	uint32_t padding = offset_align((*fb)->b.len, align);
-	uint32_t new_len = (*fb)->b.len + padding + len;
-	uint32_t new_alloc_len = sizeof(struct lttng_filter_bytecode_alloc) + new_len;
-	uint32_t old_alloc_len = (*fb)->alloc_len;
-
-	if (new_len > LTTNG_FILTER_MAX_LEN)
-		return -EINVAL;
-
-	if (new_alloc_len > old_alloc_len) {
-		struct lttng_filter_bytecode_alloc *newptr;
-
-		new_alloc_len =
-			max_t(uint32_t, 1U << get_count_order(new_alloc_len), old_alloc_len << 1);
-		newptr = realloc(*fb, new_alloc_len);
-		if (!newptr)
-			return -ENOMEM;
-		*fb = newptr;
-		/* We zero directly the memory from start of allocation. */
-		memset(&((char *) *fb)[old_alloc_len], 0, new_alloc_len - old_alloc_len);
-		(*fb)->alloc_len = new_alloc_len;
-	}
-	(*fb)->b.len += padding;
-	ret = (*fb)->b.len;
-	(*fb)->b.len += len;
-	return ret;
-}
-
-static
-int bytecode_push(struct lttng_filter_bytecode_alloc **fb, const void *data,
-		uint32_t align, uint32_t len)
-{
-	int32_t offset;
-
-	offset = bytecode_reserve(fb, align, len);
-	if (offset < 0)
-		return offset;
-	memcpy(&(*fb)->b.data[offset], data, len);
-	return 0;
-}
-
-static
-int bytecode_push_logical(struct lttng_filter_bytecode_alloc **fb,
-		struct logical_op *data,
-		uint32_t align, uint32_t len,
-		uint16_t *skip_offset)
-{
-	int32_t offset;
-
-	offset = bytecode_reserve(fb, align, len);
-	if (offset < 0)
-		return offset;
-	memcpy(&(*fb)->b.data[offset], data, len);
-	*skip_offset =
-		(void *) &((struct logical_op *) &(*fb)->b.data[offset])->skip_offset
-			- (void *) &(*fb)->b.data[0];
-	return 0;
-}
-
 static
 int bytecode_patch(struct lttng_filter_bytecode_alloc **fb,
 		const void *data,