/*
* This file is part of cparser.
- * 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
*/
#include <config.h>
#include <stdio.h>
-#include <assert.h>
+#include "adt/bitfiddle.h"
#include "type_t.h"
#include "types.h"
#include "entity_t.h"
#include "warning.h"
#include "diagnostic.h"
#include "printer.h"
+#include "separator_t.h"
/** The default calling convention. */
cc_kind_t default_calling_convention = CC_CDECL;
{
static const size_t sizes[] = {
[TYPE_ATOMIC] = sizeof(atomic_type_t),
+ [TYPE_IMAGINARY] = sizeof(atomic_type_t),
+ [TYPE_COMPLEX] = sizeof(atomic_type_t),
[TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
[TYPE_COMPOUND_UNION] = sizeof(compound_type_t),
[TYPE_ENUM] = sizeof(enum_type_t),
[TYPE_TYPEDEF] = sizeof(typedef_type_t),
[TYPE_TYPEOF] = sizeof(typeof_type_t),
};
- assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1);
- assert(kind <= TYPE_TYPEOF);
+ assert((size_t)kind < lengthof(sizes));
assert(sizes[kind] != 0);
return sizes[kind];
}
.flags = ATOMIC_TYPE_FLAG_NONE,
};
-static inline bool is_po2(unsigned x)
-{
- return (x & (x-1)) == 0;
-}
-
void init_types(unsigned machine_size)
{
obstack_init(&type_obst);
const char *get_atomic_kind_name(atomic_type_kind_t kind)
{
- switch(kind) {
+ switch (kind) {
case ATOMIC_TYPE_VOID: return "void";
case ATOMIC_TYPE_WCHAR_T: return "wchar_t";
case ATOMIC_TYPE_BOOL: return c_mode & _CXX ? "bool" : "_Bool";
static void print_complex_type(const atomic_type_t *type)
{
print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
- print_string("_Complex");
+ print_string("_Complex ");
print_atomic_kinds(type->akind);
}
const scope_t *parameters)
{
print_char('(');
- bool first = true;
+ separator_t sep = { "", ", " };
if (parameters == NULL) {
function_parameter_t *parameter = type->parameters;
- for( ; parameter != NULL; parameter = parameter->next) {
- if (first) {
- first = false;
- } else {
- print_string(", ");
- }
+ for ( ; parameter != NULL; parameter = parameter->next) {
+ print_string(sep_next(&sep));
print_type(parameter->type);
}
} else {
if (parameter->kind != ENTITY_PARAMETER)
continue;
- if (first) {
- first = false;
- } else {
- print_string(", ");
- }
+ print_string(sep_next(&sep));
const type_t *const param_type = parameter->declaration.type;
if (param_type == NULL) {
print_string(parameter->base.symbol->string);
}
}
if (type->variadic) {
- if (first) {
- first = false;
- } else {
- print_string(", ");
- }
+ print_string(sep_next(&sep));
print_string("...");
}
- if (first && !type->unspecified_parameters) {
+ if (sep_at_first(&sep) && !type->unspecified_parameters) {
print_string("void");
}
print_char(')');
change_indent(1);
entity_t *entry = enume->base.next;
- for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+ for ( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
entry = entry->base.next) {
print_indent();
change_indent(1);
entity_t *entity = compound->members.entities;
- for( ; entity != NULL; entity = entity->base.next) {
+ for ( ; entity != NULL; entity = entity->base.next) {
if (entity->kind != ENTITY_COMPOUND_MEMBER)
continue;
*/
static void intern_print_type_pre(const type_t *const type)
{
- switch(type->kind) {
+ switch (type->kind) {
case TYPE_ARRAY: print_array_type_pre( &type->array); return;
case TYPE_ATOMIC: print_atomic_type( &type->atomic); return;
case TYPE_COMPLEX: print_complex_type( &type->atomic); return;
*/
static void intern_print_type_post(const type_t *const type)
{
- switch(type->kind) {
+ switch (type->kind) {
case TYPE_FUNCTION:
print_function_type_post(&type->function, NULL);
return;
bool is_type_integer(const type_t *type)
{
assert(!is_typeref(type));
-
- if (type->kind == TYPE_ENUM)
- return true;
- if (type->kind != TYPE_ATOMIC)
+ if (!is_type_arithmetic(type))
return false;
-
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
}
bool is_type_complex(const type_t *type)
{
assert(!is_typeref(type));
-
- if (type->kind != TYPE_ATOMIC)
- return false;
-
- return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
+ return type->kind == TYPE_COMPLEX;
}
bool is_type_signed(const type_t *type)
{
assert(!is_typeref(type));
-
- /* enum types are int for now */
- if (type->kind == TYPE_ENUM)
- return true;
- if (type->kind != TYPE_ATOMIC)
+ if (!is_type_arithmetic(type))
return false;
-
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
}
{
assert(!is_typeref(type));
- switch(type->kind) {
+ switch (type->kind) {
case TYPE_ENUM:
return true;
case TYPE_ATOMIC:
{
assert(!is_typeref(type));
- if (type->kind == TYPE_POINTER)
+ switch (type->kind) {
+ case TYPE_POINTER:
+ case TYPE_ENUM:
return true;
-
- return is_type_arithmetic(type);
+ case TYPE_ATOMIC:
+ case TYPE_COMPLEX:
+ case TYPE_IMAGINARY:
+ return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+ default:
+ return false;
+ }
}
bool is_type_incomplete(const type_t *type)
{
assert(!is_typeref(type));
- switch(type->kind) {
+ switch (type->kind) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
const compound_type_t *compound_type = &type->compound;
case TYPE_ARRAY:
return get_type_alignment(type->array.element_type);
case TYPE_TYPEDEF: {
- il_alignment_t alignment
- = get_type_alignment(type->typedeft.typedefe->type);
- if (type->typedeft.typedefe->alignment > alignment)
- alignment = type->typedeft.typedefe->alignment;
-
- return alignment;
+ il_alignment_t const alignment = get_type_alignment(type->typedeft.typedefe->type);
+ return MAX(alignment, type->typedeft.typedefe->alignment);
}
case TYPE_TYPEOF:
return get_type_alignment(type->typeoft.typeof_type);
decl_modifiers_t get_type_modifiers(const type_t *type)
{
- switch(type->kind) {
+ switch (type->kind) {
case TYPE_ERROR:
break;
case TYPE_COMPOUND_STRUCT:
type_t *const base_type = skip_typeref(member->declaration.type);
il_alignment_t base_alignment = get_type_alignment_compound(base_type);
il_alignment_t alignment_mask = base_alignment-1;
- if (base_alignment > alignment)
- alignment = base_alignment;
+ alignment = MAX(alignment, base_alignment);
size_t bit_size = member->compound_member.bit_size;
if (!packed) {
}
il_alignment_t m_alignment = get_type_alignment_compound(m_type);
- if (m_alignment > alignment)
- alignment = m_alignment;
+ alignment = MAX(alignment, m_alignment);
if (!compound->packed) {
- il_size_t new_offset = (offset + m_alignment-1) & -m_alignment;
-
+ il_size_t const new_offset = round_up2(offset, m_alignment);
if (new_offset > offset) {
need_pad = true;
offset = new_offset;
}
if (!compound->packed) {
- il_size_t new_offset = (offset + alignment-1) & -alignment;
+ il_size_t const new_offset = round_up2(offset, alignment);
if (new_offset > offset) {
need_pad = true;
offset = new_offset;
}
}
- source_position_t const *const pos = &compound->base.source_position;
+ position_t const *const pos = &compound->base.pos;
if (need_pad) {
warningf(WARN_PADDED, pos, "'%T' needs padding", type);
} else if (compound->packed) {
entry->compound_member.offset = 0;
il_size_t m_size = get_type_size(m_type);
- if (m_size > size)
- size = m_size;
+ size = MAX(size, m_size);
il_alignment_t m_alignment = get_type_alignment_compound(m_type);
- if (m_alignment > alignment)
- alignment = m_alignment;
+ alignment = MAX(alignment, m_alignment);
}
- size = (size + alignment - 1) & -alignment;
+ size = round_up2(size, alignment);
compound->size = size;
compound->alignment = alignment;
projects / cparser / blobdiff