fixed indentation
[libfirm] / ir / ir / irop.c
index c7b16b3..66d11e4 100644 (file)
 
 # include "irop_t.h"
 # include "irnode_t.h"
+# include "firmstat.h"
+
+# include "iropt.h"             /* for firm_set_default_operations */
 
 # include "xmalloc.h"
 
-ir_op *op_Block;           ir_op *get_op_Block     () { return op_Block;     }
-
-ir_op *op_Start;          ir_op *get_op_Start     () { return op_Start;     }
-ir_op *op_End;            ir_op *get_op_End       () { return op_End;       }
-ir_op *op_Jmp;            ir_op *get_op_Jmp       () { return op_Jmp;       }
-ir_op *op_Cond;                   ir_op *get_op_Cond      () { return op_Cond;      }
-ir_op *op_Return;         ir_op *get_op_Return    () { return op_Return;    }
-ir_op *op_Raise;          ir_op *get_op_Raise     () { return op_Raise;     }
-
-ir_op *op_Sel;            ir_op *get_op_Sel       () { return op_Sel;       }
-ir_op *op_InstOf;         ir_op *get_op_InstOf    () { return op_InstOf;    }
-
-ir_op *op_Const;          ir_op *get_op_Const     () { return op_Const;     }
-ir_op *op_SymConst;       ir_op *get_op_SymConst  () { return op_SymConst;  }
-
-ir_op *op_Call;                   ir_op *get_op_Call      () { return op_Call;      }
-ir_op *op_Add;            ir_op *get_op_Add       () { return op_Add;       }
-ir_op *op_Sub;            ir_op *get_op_Sub       () { return op_Sub;       }
-ir_op *op_Minus;          ir_op *get_op_Minus     () { return op_Minus;     }
-ir_op *op_Mul;            ir_op *get_op_Mul       () { return op_Mul;       }
-ir_op *op_Quot;                   ir_op *get_op_Quot      () { return op_Quot;      }
-ir_op *op_DivMod;         ir_op *get_op_DivMod    () { return op_DivMod;    }
-ir_op *op_Div;            ir_op *get_op_Div       () { return op_Div;       }
-ir_op *op_Mod;            ir_op *get_op_Mod       () { return op_Mod;       }
-ir_op *op_Abs;            ir_op *get_op_Abs       () { return op_Abs;       }
-ir_op *op_And;            ir_op *get_op_And       () { return op_And;       }
-ir_op *op_Or;             ir_op *get_op_Or        () { return op_Or;        }
-ir_op *op_Eor;            ir_op *get_op_Eor       () { return op_Eor;       }
-ir_op *op_Not;            ir_op *get_op_Not       () { return op_Not;       }
-ir_op *op_Cmp;            ir_op *get_op_Cmp       () { return op_Cmp;       }
-ir_op *op_Shl;            ir_op *get_op_Shl       () { return op_Shl;       }
-ir_op *op_Shr;            ir_op *get_op_Shr       () { return op_Shr;       }
-ir_op *op_Shrs;                   ir_op *get_op_Shrs      () { return op_Shrs;      }
-ir_op *op_Rot;            ir_op *get_op_Rot       () { return op_Rot;       }
-ir_op *op_Conv;                   ir_op *get_op_Conv      () { return op_Conv;      }
-ir_op *op_Cast;            ir_op *get_op_Cast      () { return op_Cast;      }
-
-ir_op *op_Phi;            ir_op *get_op_Phi       () { return op_Phi;       }
-
-ir_op *op_Load;                   ir_op *get_op_Load      () { return op_Load;      }
-ir_op *op_Store;          ir_op *get_op_Store     () { return op_Store;     }
-ir_op *op_Alloc;          ir_op *get_op_Alloc     () { return op_Alloc;     }
-ir_op *op_Free;                   ir_op *get_op_Free      () { return op_Free;      }
-ir_op *op_Sync;                   ir_op *get_op_Sync      () { return op_Sync;      }
-
-ir_op *op_Tuple;          ir_op *get_op_Tuple     () { return op_Tuple;     }
-ir_op *op_Proj;                   ir_op *get_op_Proj      () { return op_Proj;      }
-ir_op *op_Id;             ir_op *get_op_Id        () { return op_Id;        }
-ir_op *op_Bad;            ir_op *get_op_Bad       () { return op_Bad;       }
-ir_op *op_Confirm;        ir_op *get_op_Confirm   () { return op_Confirm;   }
-
-ir_op *op_Unknown;        ir_op *get_op_Unknown   () { return op_Unknown;   }
-ir_op *op_Filter;         ir_op *get_op_Filter    () { return op_Filter;    }
-ir_op *op_Break;          ir_op *get_op_Break     () { return op_Break;     }
-ir_op *op_CallBegin;      ir_op *get_op_CallBegin () { return op_CallBegin; }
-ir_op *op_EndReg;         ir_op *get_op_EndReg    () { return op_EndReg;    }
-ir_op *op_EndExcept;      ir_op *get_op_EndExcept () { return op_EndExcept; }
-
-ir_op *op_FuncCall;       ir_op *get_op_FuncCall  () { return op_FuncCall; }
+ir_op *op_Block;       ir_op *get_op_Block     (void) { return op_Block;     }
+
+ir_op *op_Start;       ir_op *get_op_Start     (void) { return op_Start;     }
+ir_op *op_End;         ir_op *get_op_End       (void) { return op_End;       }
+ir_op *op_Jmp;         ir_op *get_op_Jmp       (void) { return op_Jmp;       }
+ir_op *op_Cond;        ir_op *get_op_Cond      (void) { return op_Cond;      }
+ir_op *op_Return;      ir_op *get_op_Return    (void) { return op_Return;    }
+ir_op *op_Raise;       ir_op *get_op_Raise     (void) { return op_Raise;     }
+
+ir_op *op_Sel;         ir_op *get_op_Sel       (void) { return op_Sel;       }
+ir_op *op_InstOf;      ir_op *get_op_InstOf    (void) { return op_InstOf;    }
+
+ir_op *op_Const;       ir_op *get_op_Const     (void) { return op_Const;     }
+ir_op *op_SymConst;    ir_op *get_op_SymConst  (void) { return op_SymConst;  }
+
+ir_op *op_Call;        ir_op *get_op_Call      (void) { return op_Call;      }
+ir_op *op_Add;         ir_op *get_op_Add       (void) { return op_Add;       }
+ir_op *op_Sub;         ir_op *get_op_Sub       (void) { return op_Sub;       }
+ir_op *op_Minus;       ir_op *get_op_Minus     (void) { return op_Minus;     }
+ir_op *op_Mul;         ir_op *get_op_Mul       (void) { return op_Mul;       }
+ir_op *op_Quot;        ir_op *get_op_Quot      (void) { return op_Quot;      }
+ir_op *op_DivMod;      ir_op *get_op_DivMod    (void) { return op_DivMod;    }
+ir_op *op_Div;         ir_op *get_op_Div       (void) { return op_Div;       }
+ir_op *op_Mod;         ir_op *get_op_Mod       (void) { return op_Mod;       }
+ir_op *op_Abs;         ir_op *get_op_Abs       (void) { return op_Abs;       }
+ir_op *op_And;         ir_op *get_op_And       (void) { return op_And;       }
+ir_op *op_Or;          ir_op *get_op_Or        (void) { return op_Or;        }
+ir_op *op_Eor;         ir_op *get_op_Eor       (void) { return op_Eor;       }
+ir_op *op_Not;         ir_op *get_op_Not       (void) { return op_Not;       }
+ir_op *op_Cmp;         ir_op *get_op_Cmp       (void) { return op_Cmp;       }
+ir_op *op_Shl;         ir_op *get_op_Shl       (void) { return op_Shl;       }
+ir_op *op_Shr;         ir_op *get_op_Shr       (void) { return op_Shr;       }
+ir_op *op_Shrs;        ir_op *get_op_Shrs      (void) { return op_Shrs;      }
+ir_op *op_Rot;         ir_op *get_op_Rot       (void) { return op_Rot;       }
+ir_op *op_Conv;        ir_op *get_op_Conv      (void) { return op_Conv;      }
+ir_op *op_Cast;        ir_op *get_op_Cast      (void) { return op_Cast;      }
+
+ir_op *op_Phi;         ir_op *get_op_Phi       (void) { return op_Phi;       }
+
+ir_op *op_Load;        ir_op *get_op_Load      (void) { return op_Load;      }
+ir_op *op_Store;       ir_op *get_op_Store     (void) { return op_Store;     }
+ir_op *op_Alloc;       ir_op *get_op_Alloc     (void) { return op_Alloc;     }
+ir_op *op_Free;        ir_op *get_op_Free      (void) { return op_Free;      }
+ir_op *op_Sync;        ir_op *get_op_Sync      (void) { return op_Sync;      }
+
+ir_op *op_Tuple;       ir_op *get_op_Tuple     (void) { return op_Tuple;     }
+ir_op *op_Proj;        ir_op *get_op_Proj      (void) { return op_Proj;      }
+ir_op *op_Id;          ir_op *get_op_Id        (void) { return op_Id;        }
+ir_op *op_Bad;         ir_op *get_op_Bad       (void) { return op_Bad;       }
+ir_op *op_Confirm;     ir_op *get_op_Confirm   (void) { return op_Confirm;   }
+
+ir_op *op_Unknown;     ir_op *get_op_Unknown   (void) { return op_Unknown;   }
+ir_op *op_Filter;      ir_op *get_op_Filter    (void) { return op_Filter;    }
+ir_op *op_Break;       ir_op *get_op_Break     (void) { return op_Break;     }
+ir_op *op_CallBegin;   ir_op *get_op_CallBegin (void) { return op_CallBegin; }
+ir_op *op_EndReg;      ir_op *get_op_EndReg    (void) { return op_EndReg;    }
+ir_op *op_EndExcept;   ir_op *get_op_EndExcept (void) { return op_EndExcept; }
+
+ir_op *op_FuncCall;    ir_op *get_op_FuncCall  (void) { return op_FuncCall; }
 
 
 ir_op *
-new_ir_op (opcode code, const char *name, op_pinned p, int labeled, op_arity opar, size_t attr_size)
+new_ir_op(opcode code, const char *name, op_pinned p, unsigned flags, op_arity opar, int op_index, size_t attr_size)
 {
   ir_op *res;
 
   res = (ir_op *) xmalloc (sizeof (ir_op));
-  res->code = code;
-  res->name = id_from_str(name, strlen(name));
-  res->pinned = p;
+  res->code      = code;
+  res->name      = id_from_str(name, strlen(name));
+  res->pinned    = p;
   res->attr_size = attr_size;
-  res->labeled = labeled;   /* For vcg dumping.
-                               Set labeled = 1 if the edges should be
-                              enumarated in vcg output, otherwise set
-                              labeled = 0. */
-  res->opar = opar;
+  res->flags     = flags;
+  res->opar      = opar;
+  res->op_index  = op_index;
+
+  firm_set_default_operations(res);
+  stat_new_ir_op(res);
   return res;
 }
 
-void free_ir_op (ir_op *code) {
+void free_ir_op(ir_op *code) {
+  stat_free_ir_op(code);
   free(code);
 }
 
 void
 init_op(void)
 {
-  op_Block     = new_ir_op (iro_Block,     "Block",     pinned, 1, oparity_variable, sizeof (block_attr));
-
-  op_Start     = new_ir_op (iro_Start,     "Start",     pinned, 0, oparity_zero,     sizeof (start_attr));
-  op_End       = new_ir_op (iro_End,       "End",       pinned, 0, oparity_dynamic,  0);
-  op_Jmp       = new_ir_op (iro_Jmp,       "Jmp",       pinned, 0, oparity_zero,     0);
-  op_Cond      = new_ir_op (iro_Cond,      "Cond",      pinned, 1, oparity_any,      sizeof(cond_attr));
-  op_Return    = new_ir_op (iro_Return,    "Return",    pinned, 1, oparity_zero,     0);
-  op_Raise     = new_ir_op (iro_Raise,     "Raise",     pinned, 1, oparity_any,      0);
-
-  op_Const     = new_ir_op (iro_Const,     "Const",     floats, 0, oparity_zero,     sizeof (const_attr));
-  op_SymConst  = new_ir_op (iro_SymConst,  "SymConst",  floats, 0, oparity_zero,     sizeof (symconst_attr));
-
-  op_Sel       = new_ir_op (iro_Sel,       "Sel",       floats, 1, oparity_any,      sizeof (sel_attr));
-  op_InstOf    = new_ir_op (iro_InstOf,    "InstOf",    floats, 1, oparity_any,      sizeof (sel_attr));
-
-  op_Call      = new_ir_op (iro_Call,      "Call",      pinned, 1, oparity_variable, sizeof (call_attr));
-  op_Add       = new_ir_op (iro_Add,       "Add",       floats, 0, oparity_binary,   0);
-  op_Minus     = new_ir_op (iro_Minus,     "Minus",     floats, 0, oparity_unary,    0);
-  op_Sub       = new_ir_op (iro_Sub,       "Sub",       floats, 1, oparity_binary,   0);
-  op_Mul       = new_ir_op (iro_Mul,       "Mul",       floats, 0, oparity_binary,   0);
-  op_Quot      = new_ir_op (iro_Quot,      "Quot",      pinned, 1, oparity_binary,   sizeof(struct irnode **));
-  op_DivMod    = new_ir_op (iro_DivMod,    "DivMod",    pinned, 1, oparity_binary,   sizeof(struct irnode **));
-  op_Div       = new_ir_op (iro_Div,       "Div",       pinned, 1, oparity_binary,   sizeof(struct irnode **));
-  op_Mod       = new_ir_op (iro_Mod,       "Mod",       pinned, 1, oparity_binary,   sizeof(struct irnode **));
-  op_Abs       = new_ir_op (iro_Abs,       "Abs",       floats, 0, oparity_unary,    0);
-  op_And       = new_ir_op (iro_And,       "And",       floats, 0, oparity_binary,   0);
-  op_Or        = new_ir_op (iro_Or,        "Or",        floats, 0, oparity_binary,   0);
-  op_Eor       = new_ir_op (iro_Eor,       "Eor",       floats, 0, oparity_binary,   0);
-  op_Not       = new_ir_op (iro_Not,       "Not",       floats, 0, oparity_unary,    0);
-  op_Cmp       = new_ir_op (iro_Cmp,       "Cmp",       floats, 1, oparity_binary,   0);
-  op_Shl       = new_ir_op (iro_Shl,       "Shl",       floats, 1, oparity_binary,   0);
-  op_Shr       = new_ir_op (iro_Shr,       "Shr",       floats, 1, oparity_binary,   0);
-  op_Shrs      = new_ir_op (iro_Shrs,      "Shrs",      floats, 1, oparity_binary,   0);
-  op_Rot       = new_ir_op (iro_Rot,       "Rot",       floats, 1, oparity_binary,   0);
-  op_Conv      = new_ir_op (iro_Conv,      "Conv",      floats, 0, oparity_unary,    0);
-  op_Cast      = new_ir_op (iro_Cast,      "Cast",      floats, 0, oparity_unary,    sizeof (cast_attr));
-
-  op_Phi       = new_ir_op (iro_Phi,       "Phi",       pinned, 1, oparity_variable, sizeof (int));
-
-  op_Load      = new_ir_op (iro_Load,      "Load",      pinned, 1, oparity_any,      sizeof(struct irnode **));
-  op_Store     = new_ir_op (iro_Store,     "Store",     pinned, 1, oparity_any,      sizeof(struct irnode **));
-  op_Alloc     = new_ir_op (iro_Alloc,     "Alloc",     pinned, 1, oparity_any,      sizeof (alloc_attr));
-  op_Free      = new_ir_op (iro_Free,      "Free",      pinned, 1, oparity_any,      sizeof (type *));
-  op_Sync      = new_ir_op (iro_Sync,      "Sync",      pinned, 0, oparity_any,      0);
-
-  op_Proj      = new_ir_op (iro_Proj,      "Proj",      floats, 0, oparity_any,      sizeof (long));
-  op_Tuple     = new_ir_op (iro_Tuple,     "Tuple",     floats, 1, oparity_variable, 0);
-  op_Id        = new_ir_op (iro_Id,        "Id",        floats, 0, oparity_any,      0);
-  op_Bad       = new_ir_op (iro_Bad,       "Bad",       floats, 0, oparity_zero,     0);
-  op_Confirm   = new_ir_op (iro_Confirm,   "Confirm",   floats, 1, oparity_any,      sizeof (confirm_attr));
-
-  op_Unknown   = new_ir_op (iro_Unknown,   "Unknown",   floats, 0, oparity_zero,     0);
-  op_Filter    = new_ir_op (iro_Filter,    "Filter",    pinned, 1, oparity_variable, sizeof(filter_attr));
-  op_Break     = new_ir_op (iro_Break,     "Break",     pinned, 0, oparity_zero,     0);
-  op_CallBegin = new_ir_op (iro_CallBegin, "CallBegin", pinned, 0, oparity_any,      sizeof(callbegin_attr));
-  op_EndReg    = new_ir_op (iro_EndReg,    "EndReg",    pinned, 0, oparity_any,      sizeof(end_attr));
-  op_EndExcept = new_ir_op (iro_EndExcept, "EndExcept", pinned, 0, oparity_any,      sizeof(end_attr));
-
-  op_FuncCall  = new_ir_op (iro_FuncCall,  "FuncCall",  floats, 1, oparity_any,      sizeof (call_attr));
+#define L   irop_flag_labeled
+#define C   irop_flag_commutative
+#define X   irop_flag_cfopcode
+#define I   irop_flag_ip_cfopcode
+#define F   irop_flag_fragile
+
+  op_Block     = new_ir_op(iro_Block,     "Block",     pinned, L,   oparity_variable, -1, sizeof(block_attr));
+
+  op_Start     = new_ir_op(iro_Start,     "Start",     pinned, X,   oparity_zero,     -1, sizeof(start_attr));
+  op_End       = new_ir_op(iro_End,       "End",       pinned, X,   oparity_dynamic,  -1, 0);
+  op_Jmp       = new_ir_op(iro_Jmp,       "Jmp",       pinned, X,   oparity_zero,     -1, 0);
+  op_Cond      = new_ir_op(iro_Cond,      "Cond",      pinned, L|X, oparity_any,      -1, sizeof(cond_attr));
+  op_Return    = new_ir_op(iro_Return,    "Return",    pinned, L|X, oparity_zero,     -1, 0);
+  op_Raise     = new_ir_op(iro_Raise,     "Raise",     pinned, L|X, oparity_any,      -1, 0);
+
+  op_Const     = new_ir_op(iro_Const,     "Const",     floats, 0,   oparity_zero,     -1, sizeof(const_attr));
+  op_SymConst  = new_ir_op(iro_SymConst,  "SymConst",  floats, 0,   oparity_zero,     -1, sizeof(symconst_attr));
+
+  op_Sel       = new_ir_op(iro_Sel,       "Sel",       floats, L,   oparity_any,      -1, sizeof(sel_attr));
+  op_InstOf    = new_ir_op(iro_InstOf,    "InstOf",    floats, L,   oparity_any,      -1, sizeof(sel_attr));
+
+  op_Call      = new_ir_op(iro_Call,      "Call",      pinned, L|F, oparity_variable, -1, sizeof(call_attr));
+  op_Add       = new_ir_op(iro_Add,       "Add",       floats, C,   oparity_binary,    0, 0);
+  op_Minus     = new_ir_op(iro_Minus,     "Minus",     floats, 0,   oparity_unary,     0, 0);
+  op_Sub       = new_ir_op(iro_Sub,       "Sub",       floats, L,   oparity_binary,    0, 0);
+  op_Mul       = new_ir_op(iro_Mul,       "Mul",       floats, C,   oparity_binary,    0, 0);
+  op_Quot      = new_ir_op(iro_Quot,      "Quot",      pinned, L|F, oparity_binary,    1, sizeof(struct irnode **));
+  op_DivMod    = new_ir_op(iro_DivMod,    "DivMod",    pinned, L|F, oparity_binary,    1, sizeof(struct irnode **));
+  op_Div       = new_ir_op(iro_Div,       "Div",       pinned, L|F, oparity_binary,    1, sizeof(struct irnode **));
+  op_Mod       = new_ir_op(iro_Mod,       "Mod",       pinned, L|F, oparity_binary,    1, sizeof(struct irnode **));
+  op_Abs       = new_ir_op(iro_Abs,       "Abs",       floats, 0,   oparity_unary,     0, 0);
+  op_And       = new_ir_op(iro_And,       "And",       floats, C,   oparity_binary,    0, 0);
+  op_Or        = new_ir_op(iro_Or,        "Or",        floats, C,   oparity_binary,    0, 0);
+  op_Eor       = new_ir_op(iro_Eor,       "Eor",       floats, C,   oparity_binary,    0, 0);
+  op_Not       = new_ir_op(iro_Not,       "Not",       floats, 0,   oparity_unary,     0, 0);
+  op_Cmp       = new_ir_op(iro_Cmp,       "Cmp",       floats, L,   oparity_binary,    0, 0);
+  op_Shl       = new_ir_op(iro_Shl,       "Shl",       floats, L,   oparity_binary,    0, 0);
+  op_Shr       = new_ir_op(iro_Shr,       "Shr",       floats, L,   oparity_binary,    0, 0);
+  op_Shrs      = new_ir_op(iro_Shrs,      "Shrs",      floats, L,   oparity_binary,    0, 0);
+  op_Rot       = new_ir_op(iro_Rot,       "Rot",       floats, L,   oparity_binary,    0, 0);
+  op_Conv      = new_ir_op(iro_Conv,      "Conv",      floats, 0,   oparity_unary,     0, 0);
+  op_Cast      = new_ir_op(iro_Cast,      "Cast",      floats, 0,   oparity_unary,     0, sizeof(cast_attr));
+
+  op_Phi       = new_ir_op(iro_Phi,       "Phi",       pinned, L,   oparity_variable, -1, sizeof(int));
+
+  op_Load      = new_ir_op(iro_Load,      "Load",      pinned, L|F, oparity_any,      -1, sizeof(struct irnode **));
+  op_Store     = new_ir_op(iro_Store,     "Store",     pinned, L|F, oparity_any,      -1, sizeof(struct irnode **));
+  op_Alloc     = new_ir_op(iro_Alloc,     "Alloc",     pinned, L|F, oparity_any,      -1, sizeof(alloc_attr));
+  op_Free      = new_ir_op(iro_Free,      "Free",      pinned, L,   oparity_any,      -1, sizeof(type *));
+  op_Sync      = new_ir_op(iro_Sync,      "Sync",      pinned, 0,   oparity_any,      -1, 0);
+
+  op_Proj      = new_ir_op(iro_Proj,      "Proj",      floats, 0,   oparity_any,      -1, sizeof(long));
+  op_Tuple     = new_ir_op(iro_Tuple,     "Tuple",     floats, L,   oparity_variable, -1, 0);
+  op_Id        = new_ir_op(iro_Id,        "Id",        floats, 0,   oparity_any,      -1, 0);
+  op_Bad       = new_ir_op(iro_Bad,       "Bad",       floats, X|F, oparity_zero,     -1, 0);
+  op_Confirm   = new_ir_op(iro_Confirm,   "Confirm",   floats, L,   oparity_any,      -1, sizeof(confirm_attr));
+
+  op_Unknown   = new_ir_op(iro_Unknown,   "Unknown",   floats, X|F, oparity_zero,     -1, 0);
+  op_Filter    = new_ir_op(iro_Filter,    "Filter",    pinned, L,   oparity_variable, -1, sizeof(filter_attr));
+  op_Break     = new_ir_op(iro_Break,     "Break",     pinned, X,   oparity_zero,     -1, 0);
+  op_CallBegin = new_ir_op(iro_CallBegin, "CallBegin", pinned, X|I, oparity_any,      -1, sizeof(callbegin_attr));
+  op_EndReg    = new_ir_op(iro_EndReg,    "EndReg",    pinned, X|I, oparity_any,      -1, sizeof(end_attr));
+  op_EndExcept = new_ir_op(iro_EndExcept, "EndExcept", pinned, X|I, oparity_any,      -1, sizeof(end_attr));
+
+  op_FuncCall  = new_ir_op(iro_FuncCall,  "FuncCall",  floats, L,   oparity_any,      -1, sizeof(call_attr));
+
+#undef F
+#undef I
+#undef X
+#undef C
+#undef L
 }
 
 
 /* free memory used by irop module. */
-void finish_op() {
-  free_ir_op (op_Block); op_Block     = NULL;
+void finish_op(void) {
+  free_ir_op (op_Block    ); op_Block     = NULL;
 
   free_ir_op (op_Start    ); op_Start     = NULL;
   free_ir_op (op_End      ); op_End       = NULL;
@@ -228,6 +245,8 @@ void finish_op() {
   free_ir_op (op_CallBegin); op_CallBegin = NULL;
   free_ir_op (op_EndReg   ); op_EndReg    = NULL;
   free_ir_op (op_EndExcept); op_EndExcept = NULL;
+
+  free_ir_op (op_FuncCall ); op_FuncCall  = NULL;
 }
 
 /* Returns the string for the opcode. */
@@ -253,32 +272,3 @@ void      set_op_pinned(ir_op *op, op_pinned pinned) {
   if (op == op_Block || op == op_Phi || is_cfopcode(op)) return;
   op->pinned = pinned;
 }
-
-
-/* returns the attribute size of the operator. */
-int get_op_attr_size (const ir_op *op) {
-  return op->attr_size;
-}
-
-int is_cfopcode(const ir_op *op) {
-  return ((op == op_Start)
-          || (op == op_Jmp)
-          || (op == op_Cond)
-          || (op == op_Return)
-          || (op == op_Raise)
-          || (op == op_Bad)
-         || (op == op_End)
-          || (op == op_Unknown)
-          || (op == op_Break)
-         || (op == op_CallBegin)
-         || (op == op_EndReg)
-         || (op == op_EndExcept));
-}
-
-/* Returns true if the operation manipulates interprocedural control flow:
-   CallBegin, EndReg, EndExcept */
-int is_ip_cfopcode(const ir_op *op) {
-  return ((op == op_CallBegin)
-         || (op == op_EndReg)
-         || (op == op_EndExcept));
-}