X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=507233c97cdf3b4fbdf4ce8e24548be2a8fb6967;hp=9da7d0d8322d8aecd55590db613de4bdab2388d2;hb=2527e1494b783a60d8a874f28835700046f55dda;hpb=aa6bffaea450106c60fc1292152bd94a270fd243

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 9da7d0d8..507233c9 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -313,6 +313,22 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
 				fprintf(fd, "[error] %s: cannot find typealias \"%s\".\n", __func__, g_quark_to_string(alias_q));
 				return NULL;
 			}
+			if (nested_declaration->id == CTF_TYPE_INTEGER) {
+				struct declaration_integer *integer_declaration =
+					container_of(nested_declaration, struct declaration_integer, p);
+				/* For base to 16 for pointers (expected pretty-print) */
+				if (!integer_declaration->base) {
+					/*
+					 * We need to do a copy of the
+					 * integer declaration to modify it. There could be other references to
+					 * it.
+					 */
+					integer_declaration = integer_declaration_new(integer_declaration->len,
+						integer_declaration->byte_order, integer_declaration->signedness,
+						integer_declaration->p.alignment, 16);
+					nested_declaration = &integer_declaration->p;
+				}
+			}
 		} else {
 			nested_declaration = ctf_type_specifier_list_visit(fd, depth,
 				type_specifier_list, declaration_scope, trace);
@@ -653,7 +669,8 @@ int ctf_variant_declaration_list_visit(FILE *fd, int depth,
 static
 struct declaration *ctf_declaration_struct_visit(FILE *fd,
 	int depth, const char *name, struct cds_list_head *declaration_list,
-	int has_body, struct declaration_scope *declaration_scope,
+	int has_body, struct cds_list_head *min_align,
+	struct declaration_scope *declaration_scope,
 	struct ctf_trace *trace)
 {
 	struct declaration_struct *struct_declaration;
@@ -672,6 +689,8 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 						  declaration_scope);
 		return &struct_declaration->p;
 	} else {
+		uint64_t min_align_value = 0;
+
 		/* For unnamed struct, create type */
 		/* For named struct (with body), create type and add to declaration scope */
 		if (name) {
@@ -682,7 +701,16 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 				return NULL;
 			}
 		}
-		struct_declaration = struct_declaration_new(declaration_scope);
+		if (!cds_list_empty(min_align)) {
+			ret = get_unary_unsigned(min_align, &min_align_value);
+			if (ret) {
+				fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__);
+				ret = -EINVAL;
+				goto error;
+			}
+		}
+		struct_declaration = struct_declaration_new(declaration_scope,
+							    min_align_value);
 		cds_list_for_each_entry(iter, declaration_list, siblings) {
 			ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter,
 				struct_declaration, trace);
@@ -1057,6 +1085,7 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 	int byte_order = trace->byte_order;
 	int signedness = 0;
 	int has_alignment = 0, has_size = 0;
+	int base = 0;
 	struct declaration_integer *integer_declaration;
 
 	cds_list_for_each_entry(expression, expressions, siblings) {
@@ -1088,7 +1117,63 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			alignment = right->u.unary_expression.u.unsigned_constant;
+			/* Make sure alignment is a power of two */
+			if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
+				fprintf(fd, "[error] %s: align: expecting power of two\n",
+					__func__);
+				return NULL;
+			}
 			has_alignment = 1;
+		} else if (!strcmp(left->u.unary_expression.u.string, "base")) {
+			switch (right->u.unary_expression.type) {
+			case UNARY_UNSIGNED_CONSTANT:
+				switch (right->u.unary_expression.u.unsigned_constant) {
+				case 2: 
+				case 8:
+				case 10:
+				case 16:
+					base = right->u.unary_expression.u.unsigned_constant;
+					break;
+				default:
+					fprintf(fd, "[error] %s: base not supported (%" PRIu64 ")\n",
+						__func__, right->u.unary_expression.u.unsigned_constant);
+				return NULL;
+				}
+				break;
+			case UNARY_STRING:
+			{
+				char *s_right = concatenate_unary_strings(&expression->u.ctf_expression.right);
+				if (!s_right) {
+					fprintf(fd, "[error] %s: unexpected unary expression for integer base\n", __func__);
+					g_free(s_right);
+					return NULL;
+				}
+				if (!strcmp(s_right, "decimal") || !strcmp(s_right, "dec") || !strcmp(s_right, "d")
+				    || !strcmp(s_right, "i") || !strcmp(s_right, "u")) {
+					base = 10;
+				} else if (!strcmp(s_right, "hexadecimal") || !strcmp(s_right, "hex")
+				    || !strcmp(s_right, "x") || !strcmp(s_right, "X")
+				    || !strcmp(s_right, "p")) {
+					base = 16;
+				} else if (!strcmp(s_right, "octal") || !strcmp(s_right, "oct")
+				    || !strcmp(s_right, "o")) {
+					base = 8;
+				} else if (!strcmp(s_right, "binary") || !strcmp(s_right, "b")) {
+					base = 2;
+				} else {
+					fprintf(fd, "[error] %s: unexpected expression for integer base (%s)\n", __func__, s_right);
+					g_free(s_right);
+					return NULL;
+				}
+
+				g_free(s_right);
+				break;
+			}
+			default:
+				fprintf(fd, "[error] %s: base: expecting unsigned constant or unary string\n",
+					__func__);
+				return NULL;
+			}
 		} else {
 			fprintf(fd, "[error] %s: unknown attribute name %s\n",
 				__func__, left->u.unary_expression.u.string);
@@ -1109,7 +1194,7 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 		}
 	}
 	integer_declaration = integer_declaration_new(size,
-				byte_order, signedness, alignment);
+				byte_order, signedness, alignment, base);
 	return &integer_declaration->p;
 }
 
@@ -1156,6 +1241,12 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			alignment = right->u.unary_expression.u.unsigned_constant;
+			/* Make sure alignment is a power of two */
+			if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
+				fprintf(fd, "[error] %s: align: expecting power of two\n",
+					__func__);
+				return NULL;
+			}
 			has_alignment = 1;
 		} else {
 			fprintf(fd, "[error] %s: unknown attribute name %s\n",
@@ -1253,6 +1344,7 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd,
 			node->u._struct.name,
 			&node->u._struct.declaration_list,
 			node->u._struct.has_body,
+			&node->u._struct.min_align,
 			declaration_scope,
 			trace);
 	case TYPESPEC_VARIANT:
@@ -1966,6 +2058,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 
 	printf_verbose("CTF visitor: metadata construction... ");
 	trace->root_declaration_scope = new_declaration_scope(NULL);
+	trace->streams = g_ptr_array_new();
 	trace->byte_order = byte_order;
 
 	switch (node->type) {