/*
* 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"
[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);
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);
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;
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;