Fix typo.

[libfirm] / ir / tr / tpop.c

diff --git a/ir/tr/tpop.c b/ir/tr/tpop.c
index 30da1ed..d42639d 100644 (file)
--- a/ir/tr/tpop.c
+++ b/ir/tr/tpop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -52,7 +52,7 @@ new_tpop(tp_opcode code, ident *name, unsigned flags, size_t attr_size, const tp
        res->attr_size     = attr_size;
 
        if (ops)
-               memcpy(&res->ops, ops, sizeof(res->ops));
+               res->ops = *ops;
        else
                memset(&res->ops, 0, sizeof(res->ops));
 
@@ -165,25 +165,22 @@ static const tp_op_ops
                NULL
        };
 
-#define C     TP_OP_FLAG_COMPOUND
-#define ID(s) new_id_from_chars(s, sizeof(s) - 1)
-
 void init_tpop(void)
 {
-       type_class       = new_tpop(tpo_class      , ID("class"),       C, sizeof (cls_attr), &class_ops);
-       type_struct      = new_tpop(tpo_struct     , ID("struct"),      C, sizeof (stc_attr), &struct_ops);
-       type_method      = new_tpop(tpo_method     , ID("method"),      0, sizeof (mtd_attr), &method_ops);
-       type_union       = new_tpop(tpo_union      , ID("union"),       C, sizeof (uni_attr), &union_ops);
-       type_array       = new_tpop(tpo_array      , ID("array"),       C, sizeof (arr_attr), &array_ops);
-       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);
-       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);
-}
+#define ID(s) new_id_from_chars(s, sizeof(s) - 1)
+       type_class       = new_tpop(tpo_class      , ID("class"),       TP_OP_FLAG_COMPOUND, sizeof(cls_attr), &class_ops);
+       type_struct      = new_tpop(tpo_struct     , ID("struct"),      TP_OP_FLAG_COMPOUND, sizeof(stc_attr), &struct_ops);
+       type_method      = new_tpop(tpo_method     , ID("method"),      0,                   sizeof(mtd_attr), &method_ops);
+       type_union       = new_tpop(tpo_union      , ID("union"),       TP_OP_FLAG_COMPOUND, sizeof(uni_attr), &union_ops);
+       type_array       = new_tpop(tpo_array      , ID("array"),       0,                   sizeof(arr_attr), &array_ops);
+       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);
+       tpop_code        = new_tpop(tpo_code       , ID("code"),        0,                   0,                &null_ops);
+       tpop_none        = new_tpop(tpo_none       , ID("None"),        0,                   0,                &pseudo_ops);
+       tpop_unknown     = new_tpop(tpo_unknown    , ID("Unknown"),     0,                   0,                &pseudo_ops);
 #undef ID
-#undef C
+}
 
 /* Finalize the tpop module.
  * Frees all type opcodes.  */
@@ -214,7 +211,7 @@ tp_opcode (get_tpop_code)(const tp_op *op)
 }
 
 /* returns the attribute size of the operator. */
-int (get_tpop_attr_size)(const tp_op *op)
+size_t (get_tpop_attr_size)(const tp_op *op)
 {
        return _get_tpop_attr_size(op);
 }