- cleaned up irp functions a bit

[libfirm] / ir / tr / tpop.c

diff --git a/ir/tr/tpop.c b/ir/tr/tpop.c
index 015d1cd..bb9088b 100644 (file)
--- a/ir/tr/tpop.c
+++ b/ir/tr/tpop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -23,33 +23,29 @@
  * @author  Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "xmalloc.h"
 #include "tpop_t.h"
 #include "type_t.h"
-
-tp_op *type_class;         tp_op *get_tpop_class      (void) { return type_class;       }
-tp_op *type_struct;        tp_op *get_tpop_struct     (void) { return type_struct;      }
-tp_op *type_method;        tp_op *get_tpop_method     (void) { return type_method;      }
-tp_op *type_union;         tp_op *get_tpop_union      (void) { return type_union;       }
-tp_op *type_array;         tp_op *get_tpop_array      (void) { return type_array;       }
-tp_op *type_enumeration;   tp_op *get_tpop_enumeration(void) { return type_enumeration; }
-tp_op *type_pointer;       tp_op *get_tpop_pointer    (void) { return type_pointer;     }
-tp_op *type_primitive;     tp_op *get_tpop_primitive  (void) { return type_primitive;   }
-tp_op *type_id;            tp_op *get_tpop_id         (void) { return type_id;          }
-tp_op *tpop_none;          tp_op *get_tpop_none       (void) { return tpop_none;        }
-tp_op *tpop_unknown;       tp_op *get_tpop_unknown    (void) { return tpop_unknown;     }
-
-tp_op *
-new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size,
-         const tp_op_ops *ops)
+#include "ident.h"
+
+const tp_op *type_class;         const tp_op *get_tpop_class      (void) { return type_class;       }
+const tp_op *type_struct;        const tp_op *get_tpop_struct     (void) { return type_struct;      }
+const tp_op *type_method;        const tp_op *get_tpop_method     (void) { return type_method;      }
+const tp_op *type_union;         const tp_op *get_tpop_union      (void) { return type_union;       }
+const tp_op *type_array;         const tp_op *get_tpop_array      (void) { return type_array;       }
+const tp_op *type_enumeration;   const tp_op *get_tpop_enumeration(void) { return type_enumeration; }
+const tp_op *type_pointer;       const tp_op *get_tpop_pointer    (void) { return type_pointer;     }
+const tp_op *type_primitive;     const tp_op *get_tpop_primitive  (void) { return type_primitive;   }
+const tp_op *type_id;            const tp_op *get_tpop_id         (void) { return type_id;          }
+const tp_op *tpop_none;          const tp_op *get_tpop_none       (void) { return tpop_none;        }
+const tp_op *tpop_unknown;       const tp_op *get_tpop_unknown    (void) { return tpop_unknown;     }
+
+const tp_op *
+new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size, const tp_op_ops *ops)
 {
-       tp_op *res;
-
-       res = xmalloc(sizeof(*res));
+       tp_op *res = XMALLOC(tp_op);
        res->code          = code;
        res->name          = name;
        res->flags         = flags;
@@ -64,8 +60,8 @@ new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size,
 }
 
 void
-free_tpop(tp_op *tpop) {
-       free(tpop);
+free_tpop(const tp_op *tpop) {
+       xfree((void *)tpop);
 }
 
 static const tp_op_ops
@@ -75,7 +71,7 @@ static const tp_op_ops
                free_class_entities,
                NULL,
                set_class_mode,
-               set_class_size_bits,
+               set_class_size,
                get_class_n_members,
                get_class_member,
                get_class_member_index
@@ -86,7 +82,7 @@ static const tp_op_ops
                free_struct_entities,
                NULL,
                set_struct_mode,
-               set_struct_size_bits,
+               set_struct_size,
                get_struct_n_members,
                get_struct_member,
                get_struct_member_index
@@ -108,7 +104,7 @@ static const tp_op_ops
                free_union_entities,
                NULL,
                NULL,
-               set_union_size_bits,
+               set_union_size,
                get_union_n_members,
                get_union_member,
                get_union_member_index
@@ -119,7 +115,7 @@ static const tp_op_ops
                free_array_entities,
                free_array_automatic_entities,
                NULL,
-               set_array_size_bits,
+               set_array_size,
                NULL,
                NULL,
                NULL
@@ -152,7 +148,7 @@ static const tp_op_ops
                NULL,
                NULL,
                NULL,
-               set_default_size_bits,
+               set_default_size,
                NULL,
                NULL,
                NULL
@@ -202,7 +198,7 @@ void finish_tpop(void) {
        free_tpop(type_id         ); type_id          = NULL;
        free_tpop(tpop_none       ); tpop_none        = NULL;
        free_tpop(tpop_unknown    ); tpop_unknown     = NULL;
-       }
+}
 
 /* Returns the string for the tp_opcode. */
 const char  *get_tpop_name(const tp_op *op) {