X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=5f9989b2111493ad0bdfe98c27805faf33d598e9;hp=16cd903dc8aa8b7740859b0e7e30aae9bd4109a4;hb=255b2138aafa746f08e410e1f239165cec43edaf;hpb=0f980a3595f61930659e392b1248c59490dd5a22

diff --git a/types/integer.c b/types/integer.c
index 16cd903d..5f9989b2 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -24,33 +24,11 @@
 static
 struct definition *_integer_definition_new(struct declaration *declaration,
 			       struct definition_scope *parent_scope,
-			       GQuark field_name, int index);
+			       GQuark field_name, int index,
+			       const char *root_name);
 static
 void _integer_definition_free(struct definition *definition);
 
-void integer_copy(struct stream_pos *dest, const struct format *fdest, 
-		  struct stream_pos *src, const struct format *fsrc,
-		  struct definition *definition)
-{
-	struct definition_integer *integer =
-		container_of(definition, struct definition_integer, p);
-	struct declaration_integer *integer_declaration = integer->declaration;
-
-	if (!integer_declaration->signedness) {
-		uint64_t v;
-
-		v = fsrc->uint_read(src, integer_declaration);
-		if (fdest)
-			fdest->uint_write(dest, integer_declaration, v);
-	} else {
-		int64_t v;
-
-		v = fsrc->int_read(src, integer_declaration);
-		if (fdest)
-			fdest->int_write(dest, integer_declaration, v);
-	}
-}
-
 static
 void _integer_declaration_free(struct declaration *declaration)
 {
@@ -61,14 +39,14 @@ void _integer_declaration_free(struct declaration *declaration)
 
 struct declaration_integer *
 	integer_declaration_new(size_t len, int byte_order,
-			 int signedness, size_t alignment)
+			 int signedness, size_t alignment, int base,
+			 enum ctf_string_encoding encoding)
 {
 	struct declaration_integer *integer_declaration;
 
 	integer_declaration = g_new(struct declaration_integer, 1);
 	integer_declaration->p.id = CTF_TYPE_INTEGER;
 	integer_declaration->p.alignment = alignment;
-	integer_declaration->p.copy = integer_copy;
 	integer_declaration->p.declaration_free = _integer_declaration_free;
 	integer_declaration->p.definition_free = _integer_definition_free;
 	integer_declaration->p.definition_new = _integer_definition_new;
@@ -76,6 +54,8 @@ struct declaration_integer *
 	integer_declaration->len = len;
 	integer_declaration->byte_order = byte_order;
 	integer_declaration->signedness = signedness;
+	integer_declaration->base = base;
+	integer_declaration->encoding = encoding;
 	return integer_declaration;
 }
 
@@ -83,19 +63,32 @@ static
 struct definition *
 	_integer_definition_new(struct declaration *declaration,
 				struct definition_scope *parent_scope,
-				GQuark field_name, int index)
+				GQuark field_name, int index,
+				const char *root_name)
 {
 	struct declaration_integer *integer_declaration =
 		container_of(declaration, struct declaration_integer, p);
 	struct definition_integer *integer;
+	int ret;
 
 	integer = g_new(struct definition_integer, 1);
 	declaration_ref(&integer_declaration->p);
 	integer->p.declaration = declaration;
 	integer->declaration = integer_declaration;
 	integer->p.ref = 1;
-	integer->p.index = index;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	integer->p.index = root_name ? INT_MAX : index;
+	integer->p.name = field_name;
+	integer->p.path = new_definition_path(parent_scope, field_name,
+					root_name);
+	integer->p.scope = NULL;
 	integer->value._unsigned = 0;
+	ret = register_field_definition(field_name, &integer->p,
+					parent_scope);
+	assert(!ret);
 	return &integer->p;
 }