X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=59672627292d29e877aa6540911e57eae048a966;hb=ce2e13de664ebd52daf7de055790546ecfece6ff;hp=ce14faaf3a983fc69e2bf0e5672fb7e599efafb9;hpb=61a03a80a0c34c03dcf9bc227ca1c9355e8cf3ff;p=cparser

diff --git a/type.c b/type.c
index ce14faa..5967262 100644
--- a/type.c
+++ b/type.c
@@ -27,6 +27,7 @@
 #include "symbol_t.h"
 #include "type_hash.h"
 #include "adt/error.h"
+#include "adt/util.h"
 #include "lang_features.h"
 
 static struct obstack   _type_obst;
@@ -35,8 +36,8 @@ struct obstack         *type_obst                 = &_type_obst;
 static int              type_visited              = 0;
 static bool             print_implicit_array_size = false;
 
-static void intern_print_type_pre(const type_t *type, bool top);
-static void intern_print_type_post(const type_t *type, bool top);
+static void intern_print_type_pre(const type_t *type);
+static void intern_print_type_post(const type_t *type);
 
 typedef struct atomic_type_properties_t atomic_type_properties_t;
 struct atomic_type_properties_t {
@@ -52,6 +53,12 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
 		.alignment  = 0,
 		.flags      = ATOMIC_TYPE_FLAG_NONE
 	},
+	[ATOMIC_TYPE_WCHAR_T] = {
+		.size       = (unsigned)-1,
+		.alignment  = (unsigned)-1,
+		/* signed flag will be set when known */
+		.flags      = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC,
+	},
 	[ATOMIC_TYPE_CHAR] = {
 		.size       = 1,
 		.alignment  = 1,
@@ -177,6 +184,8 @@ void init_types(void)
 	/* TODO: make this configurable for platforms which do not use byte sized
 	 * bools. */
 	props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
+
+	props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
 }
 
 void exit_types(void)
@@ -216,6 +225,7 @@ const char *get_atomic_kind_name(atomic_type_kind_t kind)
 	switch(kind) {
 	case ATOMIC_TYPE_INVALID: break;
 	case ATOMIC_TYPE_VOID:        return "void";
+	case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
 	case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
 	case ATOMIC_TYPE_CHAR:        return "char";
 	case ATOMIC_TYPE_SCHAR:       return "signed char";
@@ -291,52 +301,47 @@ void print_imaginary_type(const imaginary_type_t *type)
  * Print the first part (the prefix) of a type.
  *
  * @param type   The type to print.
- * @param top    true, if this is the top type, false if it's an embedded type.
  */
-static void print_function_type_pre(const function_type_t *type, bool top)
+static void print_function_type_pre(const function_type_t *type)
 {
+	switch (type->linkage) {
+		case LINKAGE_INVALID:
+			break;
+
+		case LINKAGE_C:
+			if (c_mode & _CXX)
+				fputs("extern \"C\" ",   out);
+			break;
+
+		case LINKAGE_CXX:
+			if (!(c_mode & _CXX))
+				fputs("extern \"C++\" ", out);
+			break;
+	}
+
 	print_type_qualifiers(type->base.qualifiers);
 	if (type->base.qualifiers != 0)
 		fputc(' ', out);
 
-
-	intern_print_type_pre(type->return_type, false);
+	intern_print_type_pre(type->return_type);
 
 	switch (type->calling_convention) {
-	case CC_CDECL:
-		fputs("__cdecl ", out);
-		break;
-	case CC_STDCALL:
-		fputs("__stdcall ", out);
-		break;
-	case CC_FASTCALL:
-		fputs("__fastcall ", out);
-		break;
-	case CC_THISCALL:
-		fputs("__thiscall ", out);
-		break;
-	case CC_DEFAULT:
-		break;
+	case CC_CDECL:    fputs("__cdecl ",    out); break;
+	case CC_STDCALL:  fputs("__stdcall ",  out); break;
+	case CC_FASTCALL: fputs("__fastcall ", out); break;
+	case CC_THISCALL: fputs("__thiscall ", out); break;
+	case CC_DEFAULT:  break;
 	}
-
-	/* don't emit parenthesis if we're the toplevel type... */
-	if (!top)
-		fputc('(', out);
 }
 
 /**
  * Print the second part (the postfix) of a type.
  *
  * @param type   The type to print.
- * @param top    true, if this is the top type, false if it's an embedded type.
  */
 static void print_function_type_post(const function_type_t *type,
-                                     const scope_t *parameters, bool top)
+                                     const scope_t *parameters)
 {
-	/* don't emit parenthesis if we're the toplevel type... */
-	if (!top)
-		fputc(')', out);
-
 	fputc('(', out);
 	bool first = true;
 	if (parameters == NULL) {
@@ -351,15 +356,21 @@ static void print_function_type_post(const function_type_t *type,
 		}
 	} else {
 		entity_t *parameter = parameters->entities;
-		for( ; parameter != NULL; parameter = parameter->base.next) {
+		for (; parameter != NULL; parameter = parameter->base.next) {
+			if (parameter->kind != ENTITY_PARAMETER)
+				continue;
+
 			if (first) {
 				first = false;
 			} else {
 				fputs(", ", out);
 			}
-			assert(is_declaration(parameter));
-			print_type_ext(parameter->declaration.type, parameter->base.symbol,
-			               NULL);
+			const type_t *const type = parameter->declaration.type;
+			if (type == NULL) {
+				fputs(parameter->base.symbol->string, out);
+			} else {
+				print_type_ext(type, parameter->base.symbol, NULL);
+			}
 		}
 	}
 	if (type->variadic) {
@@ -375,7 +386,7 @@ static void print_function_type_post(const function_type_t *type,
 	}
 	fputc(')', out);
 
-	intern_print_type_post(type->return_type, false);
+	intern_print_type_post(type->return_type);
 }
 
 /**
@@ -385,11 +396,21 @@ static void print_function_type_post(const function_type_t *type,
  */
 static void print_pointer_type_pre(const pointer_type_t *type)
 {
-	intern_print_type_pre(type->points_to, false);
-	fputs("*", out);
-	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
+	type_t const *const points_to = type->points_to;
+	intern_print_type_pre(points_to);
+	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+		fputs(" (", out);
+	variable_t *const variable = type->base_variable;
+	if (variable != NULL) {
+		fputs(" __based(", out);
+		fputs(variable->base.base.symbol->string, out);
+		fputs(") ", out);
+	}
+	fputc('*', out);
+	type_qualifiers_t const qual = type->base.qualifiers;
+	if (qual != 0)
 		fputc(' ', out);
+	print_type_qualifiers(qual);
 }
 
 /**
@@ -399,7 +420,37 @@ static void print_pointer_type_pre(const pointer_type_t *type)
  */
 static void print_pointer_type_post(const pointer_type_t *type)
 {
-	intern_print_type_post(type->points_to, false);
+	type_t const *const points_to = type->points_to;
+	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+		fputc(')', out);
+	intern_print_type_post(points_to);
+}
+
+/**
+ * Prints the prefix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_pre(const reference_type_t *type)
+{
+	type_t const *const refers_to = type->refers_to;
+	intern_print_type_pre(refers_to);
+	if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+		fputs(" (", out);
+	fputc('&', out);
+}
+
+/**
+ * Prints the postfix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_post(const reference_type_t *type)
+{
+	type_t const *const refers_to = type->refers_to;
+	if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+		fputc(')', out);
+	intern_print_type_post(refers_to);
 }
 
 /**
@@ -409,7 +460,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
  */
 static void print_array_type_pre(const array_type_t *type)
 {
-	intern_print_type_pre(type->element_type, false);
+	intern_print_type_pre(type->element_type);
 }
 
 /**
@@ -431,7 +482,7 @@ static void print_array_type_post(const array_type_t *type)
 		print_expression(type->size_expression);
 	}
 	fputc(']', out);
-	intern_print_type_post(type->element_type, false);
+	intern_print_type_post(type->element_type);
 }
 
 /**
@@ -443,7 +494,7 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
 {
 	fputs(" : ", out);
 	print_expression(type->size_expression);
-	intern_print_type_post(type->base_type, false);
+	intern_print_type_post(type->base_type);
 }
 
 /**
@@ -462,9 +513,9 @@ void print_enum_definition(const enum_t *enume)
 	       entry = entry->base.next) {
 
 		print_indent();
-		fprintf(out, "%s", entry->base.symbol->string);
+		fputs(entry->base.symbol->string, out);
 		if (entry->enum_value.value != NULL) {
-			fprintf(out, " = ");
+			fputs(" = ", out);
 
 			/* skip the implicit cast */
 			expression_t *expression = entry->enum_value.value;
@@ -473,12 +524,12 @@ void print_enum_definition(const enum_t *enume)
 			}
 			print_expression(expression);
 		}
-		fprintf(out, ",\n");
+		fputs(",\n", out);
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputs("}", out);
+	fputc('}', out);
 }
 
 /**
@@ -521,7 +572,10 @@ void print_compound_definition(const compound_t *compound)
 
 	change_indent(-1);
 	print_indent();
-	fputs("}", out);
+	fputc('}', out);
+	if (compound->modifiers & DM_TRANSPARENT_UNION) {
+		fputs("__attribute__((__transparent_union__))", out);
+	}
 }
 
 /**
@@ -572,7 +626,6 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
 {
 	fputs("typeof(", out);
 	if (type->expression != NULL) {
-		assert(type->typeof_type == NULL);
 		print_expression(type->expression);
 	} else {
 		print_type(type->typeof_type);
@@ -584,9 +637,8 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
  * Prints the prefix part of a type.
  *
  * @param type   The type.
- * @param top    true if we print the toplevel type, false else.
  */
-static void intern_print_type_pre(const type_t *const type, const bool top)
+static void intern_print_type_pre(const type_t *const type)
 {
 	switch(type->kind) {
 	case TYPE_ERROR:
@@ -615,13 +667,16 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 		fputs(type->builtin.symbol->string, out);
 		return;
 	case TYPE_FUNCTION:
-		print_function_type_pre(&type->function, top);
+		print_function_type_pre(&type->function);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_pre(&type->pointer);
 		return;
+	case TYPE_REFERENCE:
+		print_reference_type_pre(&type->reference);
+		return;
 	case TYPE_BITFIELD:
-		intern_print_type_pre(type->bitfield.base_type, top);
+		intern_print_type_pre(type->bitfield.base_type);
 		return;
 	case TYPE_ARRAY:
 		print_array_type_pre(&type->array);
@@ -640,17 +695,19 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
  * Prints the postfix part of a type.
  *
  * @param type   The type.
- * @param top    true if we print the toplevel type, false else.
  */
-static void intern_print_type_post(const type_t *const type, const bool top)
+static void intern_print_type_post(const type_t *const type)
 {
 	switch(type->kind) {
 	case TYPE_FUNCTION:
-		print_function_type_post(&type->function, NULL, top);
+		print_function_type_post(&type->function, NULL);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_post(&type->pointer);
 		return;
+	case TYPE_REFERENCE:
+		print_reference_type_post(&type->reference);
+		return;
 	case TYPE_ARRAY:
 		print_array_type_post(&type->array);
 		return;
@@ -670,6 +727,10 @@ static void intern_print_type_post(const type_t *const type, const bool top)
 	case TYPE_TYPEDEF:
 		break;
 	}
+
+	if (type->base.modifiers & DM_TRANSPARENT_UNION) {
+		fputs("__attribute__((__transparent_union__))", out);
+	}
 }
 
 /**
@@ -690,15 +751,15 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
 		return;
 	}
 
-	intern_print_type_pre(type, true);
+	intern_print_type_pre(type);
 	if (symbol != NULL) {
 		fputc(' ', out);
 		fputs(symbol->string, out);
 	}
 	if (type->kind == TYPE_FUNCTION) {
-		print_function_type_post(&type->function, parameters, true);
+		print_function_type_post(&type->function, parameters);
 	} else {
-		intern_print_type_post(type, true);
+		intern_print_type_post(type);
 	}
 }
 
@@ -718,6 +779,7 @@ static size_t get_type_size(const type_t *type)
 	case TYPE_ENUM:            return sizeof(enum_type_t);
 	case TYPE_FUNCTION:        return sizeof(function_type_t);
 	case TYPE_POINTER:         return sizeof(pointer_type_t);
+	case TYPE_REFERENCE:       return sizeof(reference_type_t);
 	case TYPE_ARRAY:           return sizeof(array_type_t);
 	case TYPE_BUILTIN:         return sizeof(builtin_type_t);
 	case TYPE_TYPEDEF:         return sizeof(typedef_type_t);
@@ -743,6 +805,7 @@ type_t *duplicate_type(const type_t *type)
 
 	type_t *copy = obstack_alloc(type_obst, size);
 	memcpy(copy, type, size);
+	copy->base.firm_type = NULL;
 
 	return copy;
 }
@@ -763,12 +826,7 @@ type_t *get_unqualified_type(type_t *type)
 	type_t *unqualified_type          = duplicate_type(type);
 	unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE;
 
-	type_t *result = typehash_insert(unqualified_type);
-	if (result != unqualified_type) {
-		obstack_free(type_obst, unqualified_type);
-	}
-
-	return result;
+	return identify_new_type(unqualified_type);
 }
 
 type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
@@ -796,11 +854,7 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
 		return type;
 	}
 
-	type = typehash_insert(copy);
-	if (type != copy)
-		obstack_free(type_obst, copy);
-
-	return type;
+	return identify_new_type(copy);
 }
 
 /**
@@ -999,6 +1053,7 @@ bool is_type_incomplete(const type_t *type)
 	case TYPE_BITFIELD:
 	case TYPE_FUNCTION:
 	case TYPE_POINTER:
+	case TYPE_REFERENCE:
 	case TYPE_BUILTIN:
 	case TYPE_ERROR:
 		return false;
@@ -1029,6 +1084,9 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (!types_compatible(ret1, ret2))
 		return false;
 
+	if (func1->linkage != func2->linkage)
+		return false;
+
 	if (func1->calling_convention != func2->calling_convention)
 		return false;
 
@@ -1117,6 +1175,12 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 		return types_compatible(to1, to2);
 	}
 
+	case TYPE_REFERENCE: {
+		const type_t *const to1 = skip_typeref(type1->reference.refers_to);
+		const type_t *const to2 = skip_typeref(type2->reference.refers_to);
+		return types_compatible(to1, to2);
+	}
+
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
 	case TYPE_ENUM:
@@ -1150,14 +1214,19 @@ type_t *skip_typeref(type_t *type)
 {
 	type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
 	type_modifiers_t  modifiers  = TYPE_MODIFIER_NONE;
+	il_alignment_t    alignment  = 0;
 
 	while (true) {
+		if (alignment < type->base.alignment)
+			alignment = type->base.alignment;
+
 		switch (type->kind) {
 		case TYPE_ERROR:
 			return type;
 		case TYPE_TYPEDEF: {
 			qualifiers |= type->base.qualifiers;
 			modifiers  |= type->base.modifiers;
+
 			const typedef_type_t *typedef_type = &type->typedeft;
 			if (typedef_type->resolved_type != NULL) {
 				type = typedef_type->resolved_type;
@@ -1166,22 +1235,20 @@ type_t *skip_typeref(type_t *type)
 			type = typedef_type->typedefe->type;
 			continue;
 		}
-		case TYPE_TYPEOF: {
-			const typeof_type_t *typeof_type = &type->typeoft;
-			if (typeof_type->typeof_type != NULL) {
-				type = typeof_type->typeof_type;
-			} else {
-				type = typeof_type->expression->base.type;
-			}
+		case TYPE_TYPEOF:
+			qualifiers |= type->base.qualifiers;
+			modifiers  |= type->base.modifiers;
+			type        = type->typeoft.typeof_type;
 			continue;
-		}
 		default:
 			break;
 		}
 		break;
 	}
 
-	if (qualifiers != TYPE_QUALIFIER_NONE || modifiers != TYPE_MODIFIER_NONE) {
+	if (qualifiers != TYPE_QUALIFIER_NONE ||
+			modifiers  != TYPE_MODIFIER_NONE  ||
+			alignment  >  type->base.alignment) {
 		type_t *const copy = duplicate_type(type);
 
 		/* for const with typedefed array type the element type has to be
@@ -1191,22 +1258,22 @@ type_t *skip_typeref(type_t *type)
 			element_type                   = duplicate_type(element_type);
 			element_type->base.qualifiers |= qualifiers;
 			element_type->base.modifiers  |= modifiers;
+			element_type->base.alignment   = alignment;
 			copy->array.element_type       = element_type;
 		} else {
 			copy->base.qualifiers |= qualifiers;
 			copy->base.modifiers  |= modifiers;
+			copy->base.alignment   = alignment;
 		}
 
-		type = typehash_insert(copy);
-		if (type != copy) {
-			obstack_free(type_obst, copy);
-		}
+		type = identify_new_type(copy);
 	}
 
 	return type;
 }
 
-type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type) {
+type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type)
+{
 	type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
 
 	while (true) {
@@ -1221,15 +1288,9 @@ type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type) {
 			else
 				type = typedef_type->typedefe->type;
 			continue;
-		case TYPE_TYPEOF: {
-			const typeof_type_t *typeof_type = &type->typeoft;
-			if (typeof_type->typeof_type != NULL) {
-				type = typeof_type->typeof_type;
-			} else {
-				type = typeof_type->expression->base.type;
-			}
+		case TYPE_TYPEOF:
+			type = type->typeoft.typeof_type;
 			continue;
-		}
 		case TYPE_ARRAY:
 			if (skip_array_type) {
 				type = type->array.element_type;
@@ -1285,7 +1346,8 @@ atomic_type_kind_t get_uintptr_kind(void)
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
+atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size)
+{
 	static atomic_type_kind_t kinds[32];
 
 	assert(size < 32);
@@ -1298,7 +1360,7 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 			ATOMIC_TYPE_LONG,
 			ATOMIC_TYPE_LONGLONG
 		};
-		for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
+		for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
 			if (get_atomic_type_size(possible_kinds[i]) == size) {
 				kind = possible_kinds[i];
 				break;
@@ -1312,7 +1374,8 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
+atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size)
+{
 	static atomic_type_kind_t kinds[32];
 
 	assert(size < 32);
@@ -1325,7 +1388,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
 			ATOMIC_TYPE_ULONG,
 			ATOMIC_TYPE_ULONGLONG
 		};
-		for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
+		for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
 			if (get_atomic_type_size(possible_kinds[i]) == size) {
 				kind = possible_kinds[i];
 				break;
@@ -1340,7 +1403,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
  * Hash the given type and return the "singleton" version
  * of it.
  */
-static type_t *identify_new_type(type_t *type)
+type_t *identify_new_type(type_t *type)
 {
 	type_t *result = typehash_insert(type);
 	if (result != type) {
@@ -1418,14 +1481,56 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
 	type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
 	memset(type, 0, sizeof(pointer_type_t));
 
-	type->kind              = TYPE_POINTER;
-	type->base.qualifiers   = qualifiers;
-	type->base.alignment    = 0;
-	type->pointer.points_to = points_to;
+	type->kind                  = TYPE_POINTER;
+	type->base.qualifiers       = qualifiers;
+	type->base.alignment        = 0;
+	type->pointer.points_to     = points_to;
+	type->pointer.base_variable = NULL;
 
 	return identify_new_type(type);
 }
 
+/**
+ * Creates a new reference type.
+ *
+ * @param refers_to   The referred-to type for the new type.
+ */
+type_t *make_reference_type(type_t *refers_to)
+{
+	type_t *type = obstack_alloc(type_obst, sizeof(reference_type_t));
+	memset(type, 0, sizeof(reference_type_t));
+
+	type->kind                = TYPE_REFERENCE;
+	type->base.qualifiers     = 0;
+	type->base.alignment      = 0;
+	type->reference.refers_to = refers_to;
+
+	return identify_new_type(type);
+}
+
+/**
+ * Creates a new based pointer type.
+ *
+ * @param points_to   The points-to type for the new type.
+ * @param qualifiers  Type qualifiers for the new type.
+ * @param variable    The based variable
+ */
+type_t *make_based_pointer_type(type_t *points_to,
+								type_qualifiers_t qualifiers, variable_t *variable)
+{
+	type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
+	memset(type, 0, sizeof(pointer_type_t));
+
+	type->kind                  = TYPE_POINTER;
+	type->base.qualifiers       = qualifiers;
+	type->base.alignment        = 0;
+	type->pointer.points_to     = points_to;
+	type->pointer.base_variable = variable;
+
+	return identify_new_type(type);
+}
+
+
 type_t *make_array_type(type_t *element_type, size_t size,
                         type_qualifiers_t qualifiers)
 {