- representing the 3-state visibility (default,local,external) with 2 bits was

[libfirm] / ir / tr / tpop.c

diff --git a/ir/tr/tpop.c b/ir/tr/tpop.c
index 2987bc1..0184bbf 100644 (file)
--- a/ir/tr/tpop.c
+++ b/ir/tr/tpop.c
@@ -23,29 +23,27 @@
  * @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"
+#include "ident.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;     }
+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 *tpop_code;          const tp_op *get_tpop_code_type  (void) { return tpop_code;        }
+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;     }
 
-tp_op *
-new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size,
-         const tp_op_ops *ops)
+const tp_op *
+new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size, const tp_op_ops *ops)
 {
        tp_op *res = XMALLOC(tp_op);
        res->code          = code;
@@ -62,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
@@ -179,7 +177,7 @@ void init_tpop(void) {
        type_enumeration = new_tpop(tpo_enumeration, ID("enumeration"), 0, sizeof (enm_attr), &enum_ops);
        type_pointer     = new_tpop(tpo_pointer    , ID("pointer"),     0, sizeof (ptr_attr), &pointer_ops);
        type_primitive   = new_tpop(tpo_primitive  , ID("primitive"),   0, sizeof (pri_attr), &null_ops);
-       type_id          = new_tpop(tpo_id         , ID("type_id"),     0, /* sizeof (id_attr)  */ 0, &null_ops);
+       tpop_code        = new_tpop(tpo_code       , ID("code"),        0, /* sizeof (non_attr) */ 0, &null_ops);
        tpop_none        = new_tpop(tpo_none       , ID("None"),        0, /* sizeof (non_attr) */ 0, &pseudo_ops);
        tpop_unknown     = new_tpop(tpo_unknown    , ID("Unknown"),     0, /* sizeof (ukn_attr) */ 0, &pseudo_ops);
 }
@@ -197,10 +195,10 @@ void finish_tpop(void) {
        free_tpop(type_enumeration); type_enumeration = NULL;
        free_tpop(type_pointer    ); type_pointer     = NULL;
        free_tpop(type_primitive  ); type_primitive   = NULL;
-       free_tpop(type_id         ); type_id          = NULL;
+       free_tpop(tpop_code       ); tpop_code        = 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) {
@@ -211,10 +209,6 @@ tp_opcode (get_tpop_code)(const tp_op *op) {
        return _get_tpop_code(op);
 }
 
-ident *(get_tpop_ident)(const tp_op *op) {
-       return _get_tpop_ident(op);
-}
-
 /* returns the attribute size of the operator. */
 int (get_tpop_attr_size)(const tp_op *op) {
        return _get_tpop_attr_size(op);