cleaned up the order of ifdef's

[libfirm] / ir / common / old_fctnames.h

diff --git a/ir/common/old_fctnames.h b/ir/common/old_fctnames.h
index d88b6e8..7d941e2 100644 (file)
--- a/ir/common/old_fctnames.h
+++ b/ir/common/old_fctnames.h
@@ -19,8 +19,8 @@
 
 /* ircons */
 #define add_in_edge(X, Y)     add_immBlock_pred(X, Y)
-#define mature_block(X)              mature_immBlock(X)
-#define switch_block(X)              set_cur_block(X)
+#define mature_block(X)       mature_immBlock(X)
+#define switch_block(X)       set_cur_block(X)
 #define finalize_cons(X)      irg_finalize_cons(X)
 
 /* irgraph */
@@ -37,8 +37,8 @@
 #define get_Sel_n_index       get_Sel_n_indexs
 #define get_SymConst_ptrinfo  get_SymConst_name
 #define set_SymConst_ptrinfo  set_SymConst_name
-#define type_tag             symconst_type_tag
-#define size                 symconst_size
+#define type_tag              symconst_type_tag
+#define size                  symconst_size
 #define linkage_ptr_info      symconst_addr_name
 
 #define get_nodes_Block(X)    get_nodes_block(X)
@@ -84,17 +84,17 @@
 #define get_null_of_mode         get_mode_null
 #define get_fsigned_of_mode      get_mode_fsigned
 #define get_ffloat_of_mode       get_mode_ffloat
-#define get_mode_size(X)         { assert(get_mode_size_bytes(X) != -1); get_mode_size_bytes(X); }
+#define get_mode_size(X)         (assert(get_mode_size_bytes(X) != -1), get_mode_size_bytes(X))
 
 
 /* irop */
 #define floats                   op_pin_state_floats
-#define pinned                  op_pin_state_pinned
-#define op_pinned               op_pin_state
+#define pinned                   op_pin_state_pinned
+#define op_pinned                op_pin_state
 
 /* irdump */
-#define dump_cg_graph dump_ir_graph
-#define dump_cg_block_graph dump_ir_block_graph
+#define dump_cg_graph                dump_ir_graph
+#define dump_cg_block_graph          dump_ir_block_graph
 #define dont_dump_loop_information() dump_loop_information(0)
 
 /* type.h */
@@ -121,6 +121,8 @@
 #define tarval_bitpattern(X) get_tarval_bitpattern(X)
 #define tarval_sub_bits(X, Y) get_tarval_sub_bits(X, Y)
 #define tarval_classify(X) classify_tarval(X)
+#define get_tarval_P_void() get_tarval_null(mode_P)
+#define tarval_P_void       get_tarval_null(mode_P)
 
 #define tarval_is_entity(X) 0
 #define get_tarval_entity(X) ((entity *)NULL)
@@ -133,5 +135,17 @@
 /* irouts.h */
 #define compute_outs(X)   compute_irg_outs(X)
 
+/* tr_inheritance.h */
+#define is_subclass_of(low, high)       is_SubClass_of(low, high)
+#define is_subclass_ptr_of(low, high)   is_SubClass_ptr_of(low, high)
+#define is_superclass_of(high, low)     is_SuperClass_of(high, low)
+#define is_superclass_ptr_of(low, high) is_SuperClass_ptr_of(low, high)
 
-#endif
+/* previously in irvrfy.h, now in irflag.h */
+#define NODE_VERIFICATION_OFF        FIRM_VERIFICATION_OFF
+#define NODE_VERIFICATION_ON         FIRM_VERIFICATION_ON
+#define NODE_VERIFICATION_REPORT     FIRM_VERIFICATION_REPORT
+#define NODE_VERIFICATION_ERROR_ONLY FIRM_VERIFICATION_ERROR_ONLY
+
+
+#endif /* __OLD_FCTNAMES_H__ */