cleanup: Add and use macro MAX().

[cparser] / ast2firm.c

diff --git a/ast2firm.c b/ast2firm.c
index 7790c60..c93c67c 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include <libfirm/firm.h>
 #include <libfirm/adt/obst.h>
@@ -22,6 +21,7 @@
 #include "adt/util.h"
 #include "jump_target.h"
 #include "symbol_t.h"
+#include "symbol_table.h"
 #include "token_t.h"
 #include "type_t.h"
 #include "ast_t.h"
@@ -30,8 +30,8 @@
 #include "diagnostic.h"
 #include "lang_features.h"
 #include "types.h"
-#include "type_hash.h"
 #include "mangle.h"
+#include "unicode.h"
 #include "walk.h"
 #include "warning.h"
 #include "printer.h"
@@ -193,9 +193,7 @@ static unsigned decide_modulo_shift(unsigned type_size)
 {
        if (architecture_modulo_shift == 0)
                return 0;
-       if (type_size < architecture_modulo_shift)
-               return architecture_modulo_shift;
-       return type_size;
+       return MAX(type_size, architecture_modulo_shift);
 }
 
 static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind)
@@ -328,6 +326,8 @@ static type_t *get_parameter_type(type_t *orig_type)
        return type;
 }
 
+static ir_type *get_ir_type(type_t *type);
+
 static ir_type *create_method_type(const function_type_t *function_type, bool for_closure)
 {
        type_t        *return_type  = skip_typeref(function_type->return_type);
@@ -674,7 +674,7 @@ static ir_type *get_ir_type_incomplete(type_t *type)
        }
 }
 
-ir_type *get_ir_type(type_t *type)
+static ir_type *get_ir_type(type_t *type)
 {
        type = skip_typeref(type);
 
@@ -2686,28 +2686,31 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
        return get_type_size_node(type);
 }
 
-static entity_t *get_expression_entity(const expression_t *expression)
-{
-       if (expression->kind != EXPR_REFERENCE)
-               return NULL;
+static unsigned get_object_alignment(expression_t const *expr);
 
-       return expression->reference.entity;
+static unsigned get_address_alignment(expression_t const *const expr)
+{
+       if (expr->kind == EXPR_UNARY_TAKE_ADDRESS) {
+               return get_object_alignment(expr->unary.value);
+       } else {
+               type_t *const type = skip_typeref(expr->base.type);
+               assert(is_type_pointer(type));
+               return get_type_alignment(type->pointer.points_to);
+       }
 }
 
-static unsigned get_cparser_entity_alignment(const entity_t *entity)
+static unsigned get_object_alignment(expression_t const *const expr)
 {
-       switch (entity->kind) {
-       case DECLARATION_KIND_CASES:
-               return entity->declaration.alignment;
-       case ENTITY_STRUCT:
-       case ENTITY_UNION:
-               return entity->compound.alignment;
-       case ENTITY_TYPEDEF:
-               return entity->typedefe.alignment;
-       default:
-               break;
+       entity_t *ent;
+       switch (expr->kind) {
+       case EXPR_ARRAY_ACCESS:      return get_address_alignment(expr->array_access.array_ref);
+       case EXPR_UNARY_DEREFERENCE: return get_address_alignment(expr->unary.value);
+       case EXPR_REFERENCE:         ent = expr->reference.entity;      break;
+       case EXPR_SELECT:            ent = expr->select.compound_entry; break;
+       default:                     return get_type_alignment(expr->base.type);
        }
-       return 0;
+       assert(is_declaration(ent));
+       return ent->declaration.alignment;
 }
 
 /**
@@ -2715,20 +2718,9 @@ static unsigned get_cparser_entity_alignment(const entity_t *entity)
  */
 static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 {
-       unsigned alignment = 0;
-
-       const expression_t *tp_expression = expression->tp_expression;
-       if (tp_expression != NULL) {
-               entity_t *entity = get_expression_entity(tp_expression);
-               if (entity != NULL) {
-                       alignment = get_cparser_entity_alignment(entity);
-               }
-       }
-
-       if (alignment == 0) {
-               type_t *type = expression->type;
-               alignment = get_type_alignment(type);
-       }
+       unsigned const alignment = expression->tp_expression
+               ? get_object_alignment(expression->tp_expression)
+               : get_type_alignment(expression->type);
 
        dbg_info  *dbgi = get_dbg_info(&expression->base.pos);
        ir_mode   *mode = get_ir_mode_storage(expression->base.type);
@@ -5893,32 +5885,6 @@ static void create_function(entity_t *entity)
 
        irg_finalize_cons(irg);
 
-       /* finalize the frame type */
-       ir_type *frame_type = get_irg_frame_type(irg);
-       int      n          = get_compound_n_members(frame_type);
-       int      align_all  = 4;
-       int      offset     = 0;
-       for (int i = 0; i < n; ++i) {
-               ir_entity *member      = get_compound_member(frame_type, i);
-               ir_type   *entity_type = get_entity_type(member);
-
-               int align = get_type_alignment_bytes(entity_type);
-               if (align > align_all)
-                       align_all = align;
-               int misalign = 0;
-               if (align > 0) {
-                       misalign  = offset % align;
-                       if (misalign > 0) {
-                               offset += align - misalign;
-                       }
-               }
-
-               set_entity_offset(member, offset);
-               offset += get_type_size_bytes(entity_type);
-       }
-       set_type_size_bytes(frame_type, offset);
-       set_type_alignment_bytes(frame_type, align_all);
-
        irg_verify(irg, VERIFY_ENFORCE_SSA);
        current_vararg_entity = old_current_vararg_entity;
        current_function      = old_current_function;