.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,
/* 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)
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";
*/
static void print_function_type_pre(const function_type_t *type, bool top)
{
- if (type->linkage != NULL) {
- fputs("extern \"", out);
- fputs(type->linkage->string, out);
- fputs("\" ", out);
+ 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);
}
} else {
entity_t *parameter = parameters->entities;
- for( ; parameter != NULL; parameter = parameter->base.next) {
+ for (; parameter != NULL; parameter = parameter->base.next) {
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) {
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)
+ 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);
+}
+
+/**
+ * Prints the prefix part of a reference type.
+ *
+ * @param type The reference type.
+ */
+static void print_reference_type_pre(const reference_type_t *type)
+{
+ intern_print_type_pre(type->refers_to, false);
+ fputc('&', out);
}
/**
intern_print_type_post(type->points_to, false);
}
+/**
+ * Prints the postfix part of a reference type.
+ *
+ * @param type The reference type.
+ */
+static void print_reference_type_post(const reference_type_t *type)
+{
+ intern_print_type_post(type->refers_to, false);
+}
+
/**
* Prints the prefix part of an array type.
*
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;
}
print_expression(expression);
}
- fprintf(out, ",\n");
+ fputs(",\n", out);
}
change_indent(-1);
print_indent();
- fputs("}", out);
+ fputc('}', out);
}
/**
change_indent(-1);
print_indent();
- fputs("}", out);
+ fputc('}', out);
+ if (compound->modifiers & DM_TRANSPARENT_UNION) {
+ fputs("__attribute__((__transparent_union__))", out);
+ }
}
/**
{
fputs("typeof(", out);
if (type->expression != NULL) {
- assert(type->typeof_type == NULL);
print_expression(type->expression);
} else {
print_type(type->typeof_type);
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);
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;
case TYPE_TYPEDEF:
break;
}
+
+ if (type->base.modifiers & DM_TRANSPARENT_UNION) {
+ fputs("__attribute__((__transparent_union__))", out);
+ }
}
/**
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);
type_t *copy = obstack_alloc(type_obst, size);
memcpy(copy, type, size);
+ copy->base.firm_type = NULL;
return copy;
}
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)
return type;
}
- type = typehash_insert(copy);
- if (type != copy)
- obstack_free(type_obst, copy);
-
- return type;
+ return identify_new_type(copy);
}
/**
case TYPE_BITFIELD:
case TYPE_FUNCTION:
case TYPE_POINTER:
+ case TYPE_REFERENCE:
case TYPE_BUILTIN:
case TYPE_ERROR:
return false;
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:
{
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;
continue;
}
case TYPE_TYPEOF: {
+ qualifiers |= type->base.qualifiers;
+ modifiers |= type->base.modifiers;
+
const typeof_type_t *typeof_type = &type->typeoft;
if (typeof_type->typeof_type != NULL) {
type = typeof_type->typeof_type;
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
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;
* 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) {
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)
{
projects / cparser / blobdiff