},
[ATOMIC_TYPE_FLOAT] = {
.size = 4,
- .alignment = 4,
- .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC
+ .alignment = (unsigned) -1,
+ .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC
| ATOMIC_TYPE_FLAG_SIGNED,
},
[ATOMIC_TYPE_DOUBLE] = {
.size = 8,
- .alignment = 8,
- .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC
+ .alignment = (unsigned) -1,
+ .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC
| ATOMIC_TYPE_FLAG_SIGNED,
},
[ATOMIC_TYPE_LONG_DOUBLE] = {
.size = 12,
- .alignment = 12,
- .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC
+ .alignment = (unsigned) -1,
+ .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC
| ATOMIC_TYPE_FLAG_SIGNED,
},
/* complex and imaginary types are set in init_types */
{
obstack_init(type_obst);
- atomic_type_properties_t *props = &atomic_type_properties;
+ atomic_type_properties_t *props = atomic_type_properties;
if(char_is_signed) {
props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED;
/* TODO: backend specific, need a way to query the backend for this.
* The following are good settings for x86 */
- props[ATOMIC_TYPE_FLOAT].alignment = 4;
- props[ATOMIC_TYPE_DOUBLE].alignment = 4;
- props[ATOMIC_TYPE_LONGLONG].alignment = 4;
- props[ATOMIC_TYPE_ULONGLONG].alignment = 4;
+ props[ATOMIC_TYPE_FLOAT].alignment = 4;
+ props[ATOMIC_TYPE_DOUBLE].alignment = 4;
+ props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
+ props[ATOMIC_TYPE_LONGLONG].alignment = 4;
+ props[ATOMIC_TYPE_ULONGLONG].alignment = 4;
props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
-
- /* initialize complex/imaginary types */
- props[ATOMIC_TYPE_FLOAT_COMPLEX] = props[ATOMIC_TYPE_FLOAT];
- props[ATOMIC_TYPE_FLOAT_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX;
- props[ATOMIC_TYPE_FLOAT_COMPLEX].size *= 2;
- props[ATOMIC_TYPE_DOUBLE_COMPLEX] = props[ATOMIC_TYPE_DOUBLE];
- props[ATOMIC_TYPE_DOUBLE_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX;
- props[ATOMIC_TYPE_DOUBLE_COMPLEX].size *= 2;
- props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX]
- = props[ATOMIC_TYPE_LONG_DOUBLE];
- props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX;
- props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX].size *= 2;
-
- props[ATOMIC_TYPE_FLOAT_IMAGINARY] = props[ATOMIC_TYPE_FLOAT];
- props[ATOMIC_TYPE_DOUBLE_IMAGINARY] = props[ATOMIC_TYPE_DOUBLE];
- props[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = props[ATOMIC_TYPE_LONG_DOUBLE];
}
void exit_types(void)
}
/**
- * Prints the name of a atomic type.
+ * Prints the name of an atomic type kinds.
*
- * @param type The type.
+ * @param kind The type kind.
*/
static
-void print_atomic_type(const atomic_type_t *type)
+void print_atomic_kinds(atomic_type_kind_t kind)
{
- print_type_qualifiers(type->type.qualifiers);
-
const char *s = "INVALIDATOMIC";
- switch((atomic_type_kind_t) type->akind) {
- case ATOMIC_TYPE_INVALID: break;
- case ATOMIC_TYPE_VOID: s = "void"; break;
- case ATOMIC_TYPE_BOOL: s = "_Bool"; break;
- case ATOMIC_TYPE_CHAR: s = "char"; break;
- case ATOMIC_TYPE_SCHAR: s = "signed char"; break;
- case ATOMIC_TYPE_UCHAR: s = "unsigned char"; break;
- case ATOMIC_TYPE_INT: s = "int"; break;
- case ATOMIC_TYPE_UINT: s = "unsigned int"; break;
- case ATOMIC_TYPE_SHORT: s = "short"; break;
- case ATOMIC_TYPE_USHORT: s = "unsigned short"; break;
- case ATOMIC_TYPE_LONG: s = "long"; break;
- case ATOMIC_TYPE_ULONG: s = "unsigned long"; break;
- case ATOMIC_TYPE_LONGLONG: s = "long long"; break;
- case ATOMIC_TYPE_ULONGLONG: s = "unsigned long long"; break;
- case ATOMIC_TYPE_LONG_DOUBLE: s = "long double"; break;
- case ATOMIC_TYPE_FLOAT: s = "float"; break;
- case ATOMIC_TYPE_DOUBLE: s = "double"; break;
- case ATOMIC_TYPE_FLOAT_COMPLEX: s = "_Complex float"; break;
- case ATOMIC_TYPE_DOUBLE_COMPLEX: s = "_Complex float"; break;
- case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: s = "_Complex float"; break;
- case ATOMIC_TYPE_FLOAT_IMAGINARY: s = "_Imaginary float"; break;
- case ATOMIC_TYPE_DOUBLE_IMAGINARY: s = "_Imaginary float"; break;
- case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: s = "_Imaginary float"; break;
+ switch(kind) {
+ case ATOMIC_TYPE_INVALID: break;
+ case ATOMIC_TYPE_VOID: s = "void"; break;
+ case ATOMIC_TYPE_BOOL: s = "_Bool"; break;
+ case ATOMIC_TYPE_CHAR: s = "char"; break;
+ case ATOMIC_TYPE_SCHAR: s = "signed char"; break;
+ case ATOMIC_TYPE_UCHAR: s = "unsigned char"; break;
+ case ATOMIC_TYPE_INT: s = "int"; break;
+ case ATOMIC_TYPE_UINT: s = "unsigned int"; break;
+ case ATOMIC_TYPE_SHORT: s = "short"; break;
+ case ATOMIC_TYPE_USHORT: s = "unsigned short"; break;
+ case ATOMIC_TYPE_LONG: s = "long"; break;
+ case ATOMIC_TYPE_ULONG: s = "unsigned long"; break;
+ case ATOMIC_TYPE_LONGLONG: s = "long long"; break;
+ case ATOMIC_TYPE_ULONGLONG: s = "unsigned long long"; break;
+ case ATOMIC_TYPE_LONG_DOUBLE: s = "long double"; break;
+ case ATOMIC_TYPE_FLOAT: s = "float"; break;
+ case ATOMIC_TYPE_DOUBLE: s = "double"; break;
}
fputs(s, out);
}
+/**
+ * Prints the name of an atomic type.
+ *
+ * @param type The type.
+ */
+static
+void print_atomic_type(const atomic_type_t *type)
+{
+ print_type_qualifiers(type->base.qualifiers);
+ print_atomic_kinds(type->akind);
+}
+
+/**
+ * Prints the name of a complex type.
+ *
+ * @param type The type.
+ */
+static
+void print_complex_type(const complex_type_t *type)
+{
+ print_type_qualifiers(type->base.qualifiers);
+ fputs("_Complex ", out);
+ print_atomic_kinds(type->akind);
+}
+
+/**
+ * Prints the name of an imaginary type.
+ *
+ * @param type The type.
+ */
+static
+void print_imaginary_type(const imaginary_type_t *type)
+{
+ print_type_qualifiers(type->base.qualifiers);
+ fputs("_Imaginary ", out);
+ print_atomic_kinds(type->akind);
+}
+
/**
* Print the first part (the prefix) of a type.
*
*/
static void print_function_type_pre(const function_type_t *type, bool top)
{
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
intern_print_type_pre(type->return_type, false);
fputc('(', out);
- int first = 1;
+ bool first = true;
if(scope == NULL) {
function_parameter_t *parameter = type->parameters;
for( ; parameter != NULL; parameter = parameter->next) {
if(first) {
- first = 0;
+ first = false;
} else {
fputs(", ", out);
}
declaration_t *parameter = scope->declarations;
for( ; parameter != NULL; parameter = parameter->next) {
if(first) {
- first = 0;
+ first = false;
} else {
fputs(", ", out);
}
}
if(type->variadic) {
if(first) {
- first = 0;
+ first = false;
} else {
fputs(", ", out);
}
{
intern_print_type_pre(type->points_to, false);
fputs("*", out);
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
}
/**
if(type->is_static) {
fputs("static ", out);
}
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
if(type->size_expression != NULL
&& (print_implicit_array_size || !type->has_implicit_size)) {
print_expression(type->size_expression);
{
fputs(" : ", out);
print_expression(type->size);
- intern_print_type_post(type->base, false);
+ intern_print_type_post(type->base_type, false);
}
/**
*/
static void print_type_enum(const enum_type_t *type)
{
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
fputs("enum ", out);
declaration_t *declaration = type->declaration;
*/
static void print_compound_type(const compound_type_t *type)
{
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
- if(type->type.kind == TYPE_COMPOUND_STRUCT) {
+ if(type->base.kind == TYPE_COMPOUND_STRUCT) {
fputs("struct ", out);
} else {
- assert(type->type.kind == TYPE_COMPOUND_UNION);
+ assert(type->base.kind == TYPE_COMPOUND_UNION);
fputs("union ", out);
}
*/
static void print_typedef_type_pre(const typedef_type_t *const type)
{
- print_type_qualifiers(type->type.qualifiers);
+ print_type_qualifiers(type->base.qualifiers);
fputs(type->declaration->symbol->string, out);
}
case TYPE_ATOMIC:
print_atomic_type(&type->atomic);
return;
+ case TYPE_COMPLEX:
+ print_complex_type(&type->complex);
+ return;
+ case TYPE_IMAGINARY:
+ print_imaginary_type(&type->imaginary);
+ return;
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION:
print_compound_type(&type->compound);
print_pointer_type_pre(&type->pointer);
return;
case TYPE_BITFIELD:
- intern_print_type_pre(type->bitfield.base, top);
+ intern_print_type_pre(type->bitfield.base_type, top);
return;
case TYPE_ARRAY:
print_array_type_pre(&type->array);
case TYPE_ERROR:
case TYPE_INVALID:
case TYPE_ATOMIC:
+ case TYPE_COMPLEX:
+ case TYPE_IMAGINARY:
case TYPE_ENUM:
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION:
{
switch(type->kind) {
case TYPE_ATOMIC: return sizeof(atomic_type_t);
+ case TYPE_COMPLEX: return sizeof(complex_type_t);
+ case TYPE_IMAGINARY: return sizeof(imaginary_type_t);
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: return sizeof(compound_type_t);
case TYPE_ENUM: return sizeof(enum_type_t);
{
assert(!is_typeref(type));
- if(type->kind == TYPE_BITFIELD || type->kind == TYPE_ENUM)
+ switch(type->kind) {
+ case TYPE_BITFIELD:
+ case TYPE_ENUM:
return true;
- if(type->kind != TYPE_ATOMIC)
+ case TYPE_ATOMIC:
+ return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+ case TYPE_COMPLEX:
+ return test_atomic_type_flag(type->complex.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+ case TYPE_IMAGINARY:
+ return test_atomic_type_flag(type->imaginary.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+ default:
return false;
-
- return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+ }
}
/**
case TYPE_COMPOUND_UNION: {
const compound_type_t *compound_type = &type->compound;
declaration_t *declaration = compound_type->declaration;
- return !declaration->init.is_defined;
+ return !declaration->init.complete;
}
case TYPE_ENUM: {
const enum_type_t *enum_type = &type->enumt;
declaration_t *declaration = enum_type->declaration;
- return !declaration->init.is_defined;
+ return !declaration->init.complete;
}
case TYPE_BITFIELD:
case TYPE_FUNCTION:
case TYPE_ATOMIC:
return type->atomic.akind == ATOMIC_TYPE_VOID;
+ case TYPE_COMPLEX:
+ return type->complex.akind == ATOMIC_TYPE_VOID;
+
+ case TYPE_IMAGINARY:
+ return type->imaginary.akind == ATOMIC_TYPE_VOID;
+
case TYPE_POINTER:
case TYPE_BUILTIN:
case TYPE_ERROR:
return function_types_compatible(&type1->function, &type2->function);
case TYPE_ATOMIC:
return type1->atomic.akind == type2->atomic.akind;
+ case TYPE_COMPLEX:
+ return type1->complex.akind == type2->complex.akind;
+ case TYPE_IMAGINARY:
+ return type1->imaginary.akind == type2->imaginary.akind;
case TYPE_ARRAY:
return array_types_compatible(&type1->array, &type2->array);
return atomic_type_properties[kind].flags;
}
+atomic_type_kind_t get_intptr_kind(void)
+{
+ if(machine_size <= 32)
+ return ATOMIC_TYPE_INT;
+ else if(machine_size <= 64)
+ return ATOMIC_TYPE_LONG;
+ else
+ return ATOMIC_TYPE_LONGLONG;
+}
+
+atomic_type_kind_t get_uintptr_kind(void)
+{
+ if(machine_size <= 32)
+ return ATOMIC_TYPE_UINT;
+ else if(machine_size <= 64)
+ return ATOMIC_TYPE_ULONG;
+ else
+ return ATOMIC_TYPE_ULONGLONG;
+}
+
/**
* Find the atomic type kind representing a given size (signed).
*/
* @param akind The kind of the atomic type.
* @param qualifiers Type qualifiers for the new type.
*/
-type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
{
type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
memset(type, 0, sizeof(atomic_type_t));
type->kind = TYPE_ATOMIC;
type->base.qualifiers = qualifiers;
- type->base.alignment = 0;
- type->atomic.akind = atype;
+ type->base.alignment = get_atomic_type_alignment(akind);
+ type->atomic.akind = akind;
- /* TODO: set the alignment depending on the atype here */
+ return identify_new_type(type);
+}
+
+/**
+ * Creates a new complex type.
+ *
+ * @param akind The kind of the atomic type.
+ * @param qualifiers Type qualifiers for the new type.
+ */
+type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
+{
+ type_t *type = obstack_alloc(type_obst, sizeof(complex_type_t));
+ memset(type, 0, sizeof(complex_type_t));
+
+ type->kind = TYPE_COMPLEX;
+ type->base.qualifiers = qualifiers;
+ type->base.alignment = get_atomic_type_alignment(akind);
+ type->complex.akind = akind;
+
+ return identify_new_type(type);
+}
+
+/**
+ * Creates a new imaginary type.
+ *
+ * @param akind The kind of the atomic type.
+ * @param qualifiers Type qualifiers for the new type.
+ */
+type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
+{
+ type_t *type = obstack_alloc(type_obst, sizeof(imaginary_type_t));
+ memset(type, 0, sizeof(imaginary_type_t));
+
+ type->kind = TYPE_IMAGINARY;
+ type->base.qualifiers = qualifiers;
+ type->base.alignment = get_atomic_type_alignment(akind);
+ type->imaginary.akind = akind;
return identify_new_type(type);
}