static FILE *out;
static int type_visited = 0;
-static void intern_print_type_pre(type_t *type);
-static void intern_print_type_post(type_t *type);
+static void intern_print_type_pre(const type_t *type, bool top);
+static void intern_print_type_post(const type_t *type, bool top);
void init_types(void)
{
fputs(s, out);
}
-static void print_function_type_pre(const function_type_t *type)
+static void print_function_type_pre(const function_type_t *type, bool top)
{
print_type_qualifiers(type->type.qualifiers);
- intern_print_type_pre(type->return_type);
+ intern_print_type_pre(type->return_type, false);
- /* TODO: don't emit braces if we're the toplevel type... */
- fputc('(', out);
+ /* don't emit braces if we're the toplevel type... */
+ if(!top)
+ fputc('(', out);
}
static void print_function_type_post(const function_type_t *type,
- const context_t *context)
+ const context_t *context, bool top)
{
- /* TODO: don't emit braces if we're the toplevel type... */
- intern_print_type_post(type->return_type);
- fputc(')', out);
+ intern_print_type_post(type->return_type, false);
+ /* don't emit braces if we're the toplevel type... */
+ if(!top)
+ fputc(')', out);
fputc('(', out);
static void print_pointer_type_pre(const pointer_type_t *type)
{
- intern_print_type_pre(type->points_to);
+ intern_print_type_pre(type->points_to, false);
fputs("*", out);
print_type_qualifiers(type->type.qualifiers);
}
static void print_pointer_type_post(const pointer_type_t *type)
{
- intern_print_type_post(type->points_to);
+ intern_print_type_post(type->points_to, false);
}
static void print_array_type_pre(const array_type_t *type)
{
- intern_print_type_pre(type->element_type);
+ intern_print_type_pre(type->element_type, false);
}
static void print_array_type_post(const array_type_t *type)
print_expression(type->size);
}
fputc(']', out);
- intern_print_type_post(type->element_type);
+ intern_print_type_post(type->element_type, false);
+}
+
+static void print_bitfield_type_post(const bitfield_type_t *type)
+{
+ fputs(" : ", out);
+ print_expression(type->size);
+ intern_print_type_post(type->base, false);
}
void print_enum_definition(const declaration_t *declaration)
{
print_type_qualifiers(type->type.qualifiers);
- if(type->type.type == TYPE_COMPOUND_STRUCT) {
+ if(type->type.kind == TYPE_COMPOUND_STRUCT) {
fputs("struct ", out);
} else {
- assert(type->type.type == TYPE_COMPOUND_UNION);
+ assert(type->type.kind == TYPE_COMPOUND_UNION);
fputs("union ", out);
}
}
}
-static void print_typedef_type_pre(typedef_type_t *type)
+static void print_typedef_type_pre(const typedef_type_t *const type)
{
+ print_type_qualifiers(type->type.qualifiers);
fputs(type->declaration->symbol->string, out);
}
-static void print_typeof_type_pre(typeof_type_t *type)
+static void print_typeof_type_pre(const typeof_type_t *const type)
{
fputs("typeof(", out);
if(type->expression != NULL) {
fputc(')', out);
}
-static void intern_print_type_pre(type_t *type)
+static void intern_print_type_pre(const type_t *const type, const bool top)
{
- switch(type->type) {
+ switch(type->kind) {
case TYPE_INVALID:
fputs("invalid", out);
return;
fputs(type->builtin.symbol->string, out);
return;
case TYPE_FUNCTION:
- print_function_type_pre(&type->function);
+ print_function_type_pre(&type->function, top);
return;
case TYPE_POINTER:
print_pointer_type_pre(&type->pointer);
return;
+ case TYPE_BITFIELD:
+ intern_print_type_pre(type->bitfield.base, top);
+ return;
case TYPE_ARRAY:
print_array_type_pre(&type->array);
return;
fputs("unknown", out);
}
-static void intern_print_type_post(type_t *type)
+static void intern_print_type_post(const type_t *const type, const bool top)
{
- switch(type->type) {
+ switch(type->kind) {
case TYPE_FUNCTION:
- print_function_type_post(&type->function, NULL);
+ print_function_type_post(&type->function, NULL, top);
return;
case TYPE_POINTER:
print_pointer_type_post(&type->pointer);
case TYPE_ARRAY:
print_array_type_post(&type->array);
return;
+ case TYPE_BITFIELD:
+ print_bitfield_type_post(&type->bitfield);
+ return;
case TYPE_INVALID:
case TYPE_ATOMIC:
case TYPE_ENUM:
}
}
-void print_type(type_t *type)
+void print_type(const type_t *const type)
{
print_type_ext(type, NULL, NULL);
}
-void print_type_ext(type_t *type, const symbol_t *symbol,
+void print_type_ext(const type_t *const type, const symbol_t *symbol,
const context_t *context)
{
if(type == NULL) {
return;
}
- intern_print_type_pre(type);
+ intern_print_type_pre(type, true);
if(symbol != NULL) {
fputc(' ', out);
fputs(symbol->string, out);
}
- if(type->type == TYPE_FUNCTION) {
- print_function_type_post((const function_type_t*) type, context);
+ if(type->kind == TYPE_FUNCTION) {
+ print_function_type_post(&type->function, context, true);
} else {
- intern_print_type_post(type);
+ intern_print_type_post(type, true);
}
}
static size_t get_type_size(type_t *type)
{
- switch(type->type) {
+ switch(type->kind) {
case TYPE_ATOMIC: return sizeof(atomic_type_t);
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: return sizeof(compound_type_t);
case TYPE_BUILTIN: return sizeof(builtin_type_t);
case TYPE_TYPEDEF: return sizeof(typedef_type_t);
case TYPE_TYPEOF: return sizeof(typeof_type_t);
+ case TYPE_BITFIELD: return sizeof(bitfield_type_t);
case TYPE_INVALID: panic("invalid type found");
}
panic("unknown type found");
bool type_valid(const type_t *type)
{
- return type->type != TYPE_INVALID;
+ return type->kind != TYPE_INVALID;
}
bool is_type_integer(const type_t *type)
{
assert(!is_typeref(type));
- if(type->type == TYPE_ENUM)
+ if(type->kind == TYPE_ENUM)
return true;
- if(type->type != TYPE_ATOMIC)
+ if(type->kind != TYPE_ATOMIC)
return false;
switch(type->atomic.atype) {
{
assert(!is_typeref(type));
- if(type->type != TYPE_ATOMIC)
+ if(type->kind != TYPE_ATOMIC)
return false;
switch(type->atomic.atype) {
assert(!is_typeref(type));
/* enum types are int for now */
- if(type->type == TYPE_ENUM)
+ if(type->kind == TYPE_ENUM)
return true;
- if(type->type != TYPE_ATOMIC)
+ if(type->kind != TYPE_ATOMIC)
return false;
switch(type->atomic.atype) {
case ATOMIC_TYPE_ULONGLONG:
return false;
- case ATOMIC_TYPE_INVALID:
case ATOMIC_TYPE_VOID:
+ case ATOMIC_TYPE_INVALID:
+ case ATOMIC_TYPE_LAST:
return false;
}
{
assert(!is_typeref(type));
+ if(type->kind == TYPE_BITFIELD)
+ return true;
+
if(is_type_integer(type) || is_type_floating(type))
- return 1;
+ return true;
- return 0;
+ return false;
}
bool is_type_scalar(const type_t *type)
{
assert(!is_typeref(type));
- if(type->type == TYPE_POINTER)
- return 1;
+ switch (type->kind) {
+ case TYPE_POINTER: return true;
+ case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
+ default: break;
+ }
return is_type_arithmetic(type);
}
{
assert(!is_typeref(type));
- switch(type->type) {
+ switch(type->kind) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
const compound_type_t *compound_type = &type->compound;
declaration_t *declaration = compound_type->declaration;
return !declaration->init.is_defined;
}
+ case TYPE_BITFIELD:
case TYPE_FUNCTION:
return true;
return type->array.size == NULL;
case TYPE_ATOMIC:
+ return type->atomic.atype == ATOMIC_TYPE_VOID;
+
case TYPE_POINTER:
case TYPE_ENUM:
+ case TYPE_BUILTIN:
return false;
case TYPE_TYPEDEF:
case TYPE_TYPEOF:
- case TYPE_BUILTIN:
panic("is_type_incomplete called without typerefs skipped");
case TYPE_INVALID:
break;
static bool function_types_compatible(const function_type_t *func1,
const function_type_t *func2)
{
- if(!types_compatible(func1->return_type, func2->return_type))
+ const type_t* const ret1 = skip_typeref(func1->return_type);
+ const type_t* const ret2 = skip_typeref(func2->return_type);
+ if (!types_compatible(ret1, ret2))
return false;
/* can parameters be compared? */
return false;
if(array1->size != NULL && array2->size != NULL) {
- /* TODO: check if size expression evaulate to the same value
+ /* TODO: check if size expression evaluate to the same value
* if they are constant */
}
if(type1->base.qualifiers != type2->base.qualifiers)
return false;
- if(type1->type != type2->type)
+ if(type1->kind != type2->kind)
return false;
- switch(type1->type) {
+ switch(type1->kind) {
case TYPE_FUNCTION:
return function_types_compatible(&type1->function, &type2->function);
case TYPE_ATOMIC:
return type1->atomic.atype == type2->atomic.atype;
case TYPE_ARRAY:
return array_types_compatible(&type1->array, &type2->array);
- case TYPE_POINTER:
- return types_compatible(type1->pointer.points_to,
- type2->pointer.points_to);
+
+ case TYPE_POINTER: {
+ const type_t *const to1 = skip_typeref(type1->pointer.points_to);
+ const type_t *const to2 = skip_typeref(type2->pointer.points_to);
+ return types_compatible(to1, to2);
+ }
+
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION:
case TYPE_ENUM:
/* TODO: not implemented */
break;
+ case TYPE_BITFIELD:
+ /* not sure if this makes sense or is even needed, implement it if you
+ * really need it! */
+ panic("type compatibility check for bitfield type");
+
case TYPE_INVALID:
panic("invalid type found in compatible types");
case TYPE_TYPEDEF:
assert(!is_typeref(type1));
assert(!is_typeref(type2));
- assert(type1->type == TYPE_POINTER);
- assert(type2->type == TYPE_POINTER);
+ assert(type1->kind == TYPE_POINTER);
+ assert(type2->kind == TYPE_POINTER);
/* TODO */
return true;
}
type_t *skip_typeref(type_t *type)
{
- unsigned qualifiers = type->base.qualifiers;
+ unsigned qualifiers = TYPE_QUALIFIER_NONE;
- while(1) {
- switch(type->type) {
+ while(true) {
+ switch(type->kind) {
case TYPE_TYPEDEF: {
qualifiers |= type->base.qualifiers;
const typedef_type_t *typedef_type = &type->typedeft;
}
continue;
}
- case TYPE_BUILTIN: {
- const builtin_type_t *builtin_type = &type->builtin;
- type = builtin_type->real_type;
- continue;
- }
default:
break;
}
break;
}
+ if (qualifiers != TYPE_QUALIFIER_NONE) {
+ type_t *const copy = duplicate_type(type);
+ copy->base.qualifiers |= qualifiers;
+
+ type = typehash_insert(copy);
+ if (type != copy) {
+ obstack_free(type_obst, copy);
+ }
+ }
+
return type;
}
type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
memset(type, 0, sizeof(atomic_type_t));
- type->type = TYPE_ATOMIC;
+ type->kind = TYPE_ATOMIC;
type->base.qualifiers = qualifiers;
type->atomic.atype = atype;
type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
memset(type, 0, sizeof(pointer_type_t));
- type->type = TYPE_POINTER;
+ type->kind = TYPE_POINTER;
type->base.qualifiers = qualifiers;
type->pointer.points_to = points_to;