X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=de4738dd0d3705566974afefe37d4c890ac80d44;hb=500b42e579d745de73c781479ed0f90b8e1d45cf;hp=4671d376e4bb6698b31012003620f2c9ee0208b2;hpb=6ce1c83ddd63ba283fdc50872a56439c6e292579;p=cparser

diff --git a/type.c b/type.c
index 4671d37..de4738d 100644
--- a/type.c
+++ b/type.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,11 +32,14 @@
 #include "lang_features.h"
 #include "warning.h"
 #include "diagnostic.h"
+#include "printer.h"
+#include "driver/firm_cmdline.h"
+
+/** The default calling convention. */
+cc_kind_t default_calling_convention = CC_CDECL;
 
 static struct obstack   _type_obst;
-static FILE            *out;
 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);
@@ -186,6 +189,10 @@ void init_types(void)
 	props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
 	props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
 	props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
+	if (firm_opt.os_support == OS_SUPPORT_MACHO) {
+		props[ATOMIC_TYPE_LONG_DOUBLE].size      = 16;
+		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 16;
+	}
 
 	/* TODO: make this configurable for platforms which do not use byte sized
 	 * bools. */
@@ -199,30 +206,16 @@ void exit_types(void)
 	obstack_free(type_obst, NULL);
 }
 
-void type_set_output(FILE *stream)
-{
-	out = stream;
-}
-
-void inc_type_visited(void)
-{
-	type_visited++;
-}
-
 void print_type_qualifiers(type_qualifiers_t qualifiers)
 {
-	int first = 1;
 	if (qualifiers & TYPE_QUALIFIER_CONST) {
-		fputs(" const" + first,    out);
-		first = 0;
+		print_string("const ");
 	}
 	if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
-		fputs(" volatile" + first, out);
-		first = 0;
+		print_string("volatile ");
 	}
 	if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
-		fputs(" restrict" + first, out);
-		first = 0;
+		print_string("restrict ");
 	}
 }
 
@@ -259,7 +252,7 @@ const char *get_atomic_kind_name(atomic_type_kind_t kind)
 static void print_atomic_kinds(atomic_type_kind_t kind)
 {
 	const char *s = get_atomic_kind_name(kind);
-	fputs(s, out);
+	print_string(s);
 }
 
 /**
@@ -270,8 +263,6 @@ static void print_atomic_kinds(atomic_type_kind_t kind)
 static void print_atomic_type(const atomic_type_t *type)
 {
 	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
 	print_atomic_kinds(type->akind);
 }
 
@@ -280,12 +271,10 @@ static void print_atomic_type(const atomic_type_t *type)
  *
  * @param type  The type.
  */
-static
-void print_complex_type(const complex_type_t *type)
+static void print_complex_type(const complex_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs(" _Complex " + empty, out);
+	print_string("_Complex");
 	print_atomic_kinds(type->akind);
 }
 
@@ -294,12 +283,10 @@ void print_complex_type(const complex_type_t *type)
  *
  * @param type  The type.
  */
-static
-void print_imaginary_type(const imaginary_type_t *type)
+static void print_imaginary_type(const imaginary_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs(" _Imaginary " + empty, out);
+	print_string("_Imaginary ");
 	print_atomic_kinds(type->akind);
 }
 
@@ -316,27 +303,33 @@ static void print_function_type_pre(const function_type_t *type)
 
 		case LINKAGE_C:
 			if (c_mode & _CXX)
-				fputs("extern \"C\" ",   out);
+				print_string("extern \"C\" ");
 			break;
 
 		case LINKAGE_CXX:
 			if (!(c_mode & _CXX))
-				fputs("extern \"C++\" ", out);
+				print_string("extern \"C++\" ");
 			break;
 	}
 
 	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
 
 	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;
+	cc_kind_t cc = type->calling_convention;
+restart:
+	switch (cc) {
+	case CC_CDECL:    print_string(" __cdecl");    break;
+	case CC_STDCALL:  print_string(" __stdcall");  break;
+	case CC_FASTCALL: print_string(" __fastcall"); break;
+	case CC_THISCALL: print_string(" __thiscall"); break;
+	case CC_DEFAULT:
+		if (default_calling_convention != CC_CDECL) {
+			/* show the default calling convention if its not cdecl */
+			cc = default_calling_convention;
+			goto restart;
+		}
+		break;
 	}
 }
 
@@ -348,7 +341,7 @@ static void print_function_type_pre(const function_type_t *type)
 static void print_function_type_post(const function_type_t *type,
                                      const scope_t *parameters)
 {
-	fputc('(', out);
+	print_string("(");
 	bool first = true;
 	if (parameters == NULL) {
 		function_parameter_t *parameter = type->parameters;
@@ -356,7 +349,7 @@ static void print_function_type_post(const function_type_t *type,
 			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
 			}
 			print_type(parameter->type);
 		}
@@ -369,11 +362,11 @@ static void print_function_type_post(const function_type_t *type,
 			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
 			}
 			const type_t *const type = parameter->declaration.type;
 			if (type == NULL) {
-				fputs(parameter->base.symbol->string, out);
+				print_string(parameter->base.symbol->string);
 			} else {
 				print_type_ext(type, parameter->base.symbol, NULL);
 			}
@@ -383,14 +376,14 @@ static void print_function_type_post(const function_type_t *type,
 		if (first) {
 			first = false;
 		} else {
-			fputs(", ", out);
+			print_string(", ");
 		}
-		fputs("...", out);
+		print_string("...");
 	}
 	if (first && !type->unspecified_parameters) {
-		fputs("void", out);
+		print_string("void");
 	}
-	fputc(')', out);
+	print_string(")");
 
 	intern_print_type_post(type->return_type);
 }
@@ -405,17 +398,17 @@ static void print_pointer_type_pre(const pointer_type_t *type)
 	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);
+		print_string(" (");
 	variable_t *const variable = type->base_variable;
 	if (variable != NULL) {
-		fputs(" __based(", out);
-		fputs(variable->base.base.symbol->string, out);
-		fputs(") ", out);
+		print_string(" __based(");
+		print_string(variable->base.base.symbol->string);
+		print_string(") ");
 	}
-	fputc('*', out);
+	print_string("*");
 	type_qualifiers_t const qual = type->base.qualifiers;
 	if (qual != 0)
-		fputc(' ', out);
+		print_string(" ");
 	print_type_qualifiers(qual);
 }
 
@@ -428,7 +421,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
 {
 	type_t const *const points_to = type->points_to;
 	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
-		fputc(')', out);
+		print_string(")");
 	intern_print_type_post(points_to);
 }
 
@@ -442,8 +435,8 @@ 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);
+		print_string(" (");
+	print_string("&");
 }
 
 /**
@@ -455,7 +448,7 @@ 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);
+		print_string(")");
 	intern_print_type_post(refers_to);
 }
 
@@ -476,18 +469,16 @@ static void print_array_type_pre(const array_type_t *type)
  */
 static void print_array_type_post(const array_type_t *type)
 {
-	fputc('[', out);
+	print_string("[");
 	if (type->is_static) {
-		fputs("static ", out);
+		print_string("static ");
 	}
 	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
 	if (type->size_expression != NULL
 			&& (print_implicit_array_size || !type->has_implicit_size)) {
 		print_expression(type->size_expression);
 	}
-	fputc(']', out);
+	print_string("]");
 	intern_print_type_post(type->element_type);
 }
 
@@ -498,7 +489,7 @@ static void print_array_type_post(const array_type_t *type)
  */
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
-	fputs(" : ", out);
+	print_string(" : ");
 	print_expression(type->size_expression);
 	intern_print_type_post(type->base_type);
 }
@@ -510,7 +501,7 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
  */
 void print_enum_definition(const enum_t *enume)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 
 	change_indent(1);
 
@@ -519,9 +510,9 @@ void print_enum_definition(const enum_t *enume)
 	       entry = entry->base.next) {
 
 		print_indent();
-		fputs(entry->base.symbol->string, out);
+		print_string(entry->base.symbol->string);
 		if (entry->enum_value.value != NULL) {
-			fputs(" = ", out);
+			print_string(" = ");
 
 			/* skip the implicit cast */
 			expression_t *expression = entry->enum_value.value;
@@ -530,12 +521,12 @@ void print_enum_definition(const enum_t *enume)
 			}
 			print_expression(expression);
 		}
-		fputs(",\n", out);
+		print_string(",\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputc('}', out);
+	print_string("}");
 }
 
 /**
@@ -545,14 +536,13 @@ void print_enum_definition(const enum_t *enume)
  */
 static void print_type_enum(const enum_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs(" enum " + empty, out);
+	print_string("enum ");
 
 	enum_t   *enume  = type->enume;
 	symbol_t *symbol = enume->base.symbol;
 	if (symbol != NULL) {
-		fputs(symbol->string, out);
+		print_string(symbol->string);
 	} else {
 		print_enum_definition(enume);
 	}
@@ -563,7 +553,7 @@ static void print_type_enum(const enum_type_t *type)
  */
 void print_compound_definition(const compound_t *compound)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 	change_indent(1);
 
 	entity_t *entity = compound->members.entities;
@@ -573,14 +563,14 @@ void print_compound_definition(const compound_t *compound)
 
 		print_indent();
 		print_entity(entity);
-		fputc('\n', out);
+		print_string("\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputc('}', out);
+	print_string("}");
 	if (compound->modifiers & DM_TRANSPARENT_UNION) {
-		fputs("__attribute__((__transparent_union__))", out);
+		print_string("__attribute__((__transparent_union__))");
 	}
 }
 
@@ -591,20 +581,19 @@ void print_compound_definition(const compound_t *compound)
  */
 static void print_compound_type(const compound_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
 
 	if (type->base.kind == TYPE_COMPOUND_STRUCT) {
-		fputs(" struct " + empty, out);
+		print_string("struct ");
 	} else {
 		assert(type->base.kind == TYPE_COMPOUND_UNION);
-		fputs(" union " + empty, out);
+		print_string("union ");
 	}
 
 	compound_t *compound = type->compound;
 	symbol_t   *symbol   = compound->base.symbol;
 	if (symbol != NULL) {
-		fputs(symbol->string, out);
+		print_string(symbol->string);
 	} else {
 		print_compound_definition(compound);
 	}
@@ -618,9 +607,7 @@ static void print_compound_type(const compound_type_t *type)
 static void print_typedef_type_pre(const typedef_type_t *const type)
 {
 	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
-	fputs(type->typedefe->base.symbol->string, out);
+	print_string(type->typedefe->base.symbol->string);
 }
 
 /**
@@ -630,13 +617,13 @@ static void print_typedef_type_pre(const typedef_type_t *const type)
  */
 static void print_typeof_type_pre(const typeof_type_t *const type)
 {
-	fputs("typeof(", out);
+	print_string("typeof(");
 	if (type->expression != NULL) {
 		print_expression(type->expression);
 	} else {
 		print_type(type->typeof_type);
 	}
-	fputc(')', out);
+	print_string(")");
 }
 
 /**
@@ -648,10 +635,10 @@ static void intern_print_type_pre(const type_t *const type)
 {
 	switch(type->kind) {
 	case TYPE_ERROR:
-		fputs("<error>", out);
+		print_string("<error>");
 		return;
 	case TYPE_INVALID:
-		fputs("<invalid>", out);
+		print_string("<invalid>");
 		return;
 	case TYPE_ENUM:
 		print_type_enum(&type->enumt);
@@ -670,7 +657,7 @@ static void intern_print_type_pre(const type_t *const type)
 		print_compound_type(&type->compound);
 		return;
 	case TYPE_BUILTIN:
-		fputs(type->builtin.symbol->string, out);
+		print_string(type->builtin.symbol->string);
 		return;
 	case TYPE_FUNCTION:
 		print_function_type_pre(&type->function);
@@ -694,7 +681,7 @@ static void intern_print_type_pre(const type_t *const type)
 		print_typeof_type_pre(&type->typeoft);
 		return;
 	}
-	fputs("unknown", out);
+	print_string("unknown");
 }
 
 /**
@@ -749,14 +736,14 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const scope_t *parameters)
 {
 	if (type == NULL) {
-		fputs("nil type", out);
+		print_string("nil type");
 		return;
 	}
 
 	intern_print_type_pre(type);
 	if (symbol != NULL) {
-		fputc(' ', out);
-		fputs(symbol->string, out);
+		print_string(" ");
+		print_string(symbol->string);
 	}
 	if (type->kind == TYPE_FUNCTION) {
 		print_function_type_post(&type->function, parameters);
@@ -1097,19 +1084,24 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (func1->linkage != func2->linkage)
 		return false;
 
-	/* this would make alot of sense, but gcc doesn't seem to do this */
-#if 0
-	if (func1->calling_convention != func2->calling_convention)
-		return false;
-#endif
+	cc_kind_t cc1 = func1->calling_convention;
+	if (cc1 == CC_DEFAULT)
+		cc1 = default_calling_convention;
+	cc_kind_t cc2 = func2->calling_convention;
+	if (cc2 == CC_DEFAULT)
+		cc2 = default_calling_convention;
 
-	/* can parameters be compared? */
-	if (func1->unspecified_parameters || func2->unspecified_parameters)
-		return true;
+	if (cc1 != cc2)
+		return false;
 
 	if (func1->variadic != func2->variadic)
 		return false;
 
+	/* can parameters be compared? */
+	if ((func1->unspecified_parameters && !func1->kr_style_parameters)
+			|| (func2->unspecified_parameters && !func2->kr_style_parameters))
+		return true;
+
 	/* TODO: handling of unspecified parameters not correct yet */
 
 	/* all argument types must be compatible */
@@ -1680,49 +1672,55 @@ type_t *make_array_type(type_t *element_type, size_t size,
 	return identify_new_type(type);
 }
 
-static entity_t *pack_bitfield_members(il_size_t *size, bool packed,
-                                       type_t *type, size_t offset,
-									   entity_t *first)
+static entity_t *pack_bitfield_members(il_size_t *struct_offset,
+                                       il_alignment_t *struct_alignment,
+									   bool packed, entity_t *first)
 {
-	/* TODO: packed handling */
-	type_t *base_type      = skip_typeref(type->bitfield.base_type);
-	size_t  remaining_bits = get_type_size(base_type) * BITS_PER_BYTE;
-	size_t  bit_offset     = 0;
+	il_size_t      offset     = *struct_offset;
+	il_alignment_t alignment  = *struct_alignment;
+	size_t         bit_offset = 0;
 
 	entity_t *member;
 	for (member = first; member != NULL; member = member->base.next) {
-		/* TODO: make this an assert */
 		if (member->kind != ENTITY_COMPOUND_MEMBER)
-			continue;
+			break;
 
-		type_t *member_type = member->declaration.type;
-		if (member_type->kind != TYPE_BITFIELD)
+		type_t *type = member->declaration.type;
+		if (type->kind != TYPE_BITFIELD)
 			break;
-		size_t bit_size = member_type->bitfield.bit_size;
+
+		type_t *base_type = skip_typeref(type->bitfield.base_type);
+		il_alignment_t base_alignment = get_type_alignment(base_type);
+		il_alignment_t alignment_mask = base_alignment-1;
+		if (base_alignment > alignment)
+			alignment = base_alignment;
+
+		size_t bit_size = type->bitfield.bit_size;
 		if (!packed) {
-			if (base_type != NULL
-			    && skip_typeref(member_type->bitfield.base_type) != base_type)
-				break;
-			if (bit_size > remaining_bits)
-				break;
+			bit_offset += (offset & alignment_mask) * BITS_PER_BYTE;
+			offset     &= ~alignment_mask;
+			size_t base_size = get_type_size(base_type) * BITS_PER_BYTE;
+
+			if (bit_offset + bit_size > base_size || bit_size == 0) {
+				offset    += (bit_offset+BITS_PER_BYTE-1) / BITS_PER_BYTE;
+				offset     = (offset + base_alignment-1) & ~alignment_mask;
+				bit_offset = 0;
+			}
 		}
 
 		member->compound_member.offset     = offset;
 		member->compound_member.bit_offset = bit_offset;
 
 		bit_offset += bit_size;
-
-		/* 0-size members end current bucket. multiple 0-size buckets
-		 * seem to not start-end multiple buckets */
-		if (bit_size == 0) {
-			remaining_bits = 0;
-		} else {
-			remaining_bits -= bit_size;
-		}
+		offset     += bit_offset / BITS_PER_BYTE;
+		bit_offset %= BITS_PER_BYTE;
 	}
-	assert(member != first);
 
-	*size += (bit_offset + (BITS_PER_BYTE-1)) / BITS_PER_BYTE;
+	if (bit_offset > 0)
+		offset += 1;
+
+	*struct_offset    = offset;
+	*struct_alignment = alignment;
 
 	return member;
 }
@@ -1741,8 +1739,7 @@ void layout_struct_type(compound_type_t *type)
 	if (type->compound->layouted)
 		return;
 
-	il_size_t      offset;
-	il_size_t      size      = 0;
+	il_size_t      offset    = 0;
 	il_alignment_t alignment = compound->alignment;
 	bool           need_pad  = false;
 
@@ -1760,42 +1757,37 @@ void layout_struct_type(compound_type_t *type)
 			continue;
 		}
 
-		type_t *base_type = m_type;
 		if (skipped->kind == TYPE_BITFIELD) {
-			base_type = m_type->bitfield.base_type;
+			entry = pack_bitfield_members(&offset, &alignment,
+			                              compound->packed, entry);
+			continue;
 		}
 
-		il_alignment_t m_alignment = get_type_alignment(base_type);
-		il_size_t      m_size      = get_type_size(base_type);
+		il_alignment_t m_alignment = get_type_alignment(m_type);
 		if (m_alignment > alignment)
 			alignment = m_alignment;
 
-		if (compound->packed) {
-			offset = size;
-		} else {
-			offset = (size + m_alignment - 1) & -m_alignment;
-		}
+		if (!compound->packed) {
+			il_size_t new_offset = (offset + m_alignment-1) & -m_alignment;
 
-		if (offset > size)
-			need_pad = true;
+			if (new_offset > offset) {
+				need_pad = true;
+				offset   = new_offset;
+			}
+		}
 
-		if (skipped->kind == TYPE_BITFIELD) {
-			entry = pack_bitfield_members(&size, compound->packed,
-			                              m_type, offset, entry);
-		} else {
-			entry->compound_member.offset = offset;
-			size                          = offset + m_size;
+		entry->compound_member.offset = offset;
+		offset += get_type_size(m_type);
 
-			entry = entry->base.next;
-		}
+		entry = entry->base.next;
 	}
 
 	if (!compound->packed) {
-		offset = (size + alignment - 1) & -alignment;
-		if (offset > size)
+		il_size_t new_offset = (offset + alignment-1) & -alignment;
+		if (new_offset > offset) {
 			need_pad = true;
-	} else {
-		offset = size;
+			offset   = new_offset;
+		}
 	}
 
 	if (need_pad) {
@@ -1857,10 +1849,8 @@ void layout_union_type(compound_type_t *type)
 static __attribute__((unused))
 void dbg_type(const type_t *type)
 {
-	FILE *old_out = out;
-	out = stderr;
+	print_to_file(stderr);
 	print_type(type);
-	puts("\n");
+	print_string("\n");
 	fflush(stderr);
-	out = old_out;
 }