projects
/
libfirm
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bd0f73
)
adapt to firm coding conventions, avoid warnings by using INT_TO_PTR and PTR_TO_INT
author
Matthias Braun
<matze@braunis.de>
Tue, 7 Jun 2011 11:03:07 +0000
(13:03 +0200)
committer
Matthias Braun
<matze@braunis.de>
Tue, 7 Jun 2011 11:03:07 +0000
(13:03 +0200)
ir/opt/cfopt.c
patch
|
blob
|
history
diff --git
a/ir/opt/cfopt.c
b/ir/opt/cfopt.c
index
99b9116
..
d6f3c0e
100644
(file)
--- a/
ir/opt/cfopt.c
+++ b/
ir/opt/cfopt.c
@@
-79,7
+79,8
@@
static bool is_Block_removable(ir_node *block)
}
/** checks if a given Cond node is a switch Cond. */
}
/** checks if a given Cond node is a switch Cond. */
-static bool is_switch_Cond(ir_node *cond) {
+static bool is_switch_Cond(ir_node *cond)
+{
ir_node *sel = get_Cond_selector(cond);
return get_irn_mode(sel) != mode_b;
}
ir_node *sel = get_Cond_selector(cond);
return get_irn_mode(sel) != mode_b;
}
@@
-602,33
+603,46
@@
typedef enum block_flags_t {
BF_IS_UNKNOWN_JUMP_TARGET = 1 << 2,
} block_flags_t;
BF_IS_UNKNOWN_JUMP_TARGET = 1 << 2,
} block_flags_t;
-static bool get_phase_flag(ir_phase *block_info, ir_node *block, int flag) {
- return ((int)phase_get_irn_data(block_info, block)) & flag;
+static bool get_phase_flag(ir_phase *block_info, ir_node *block, int flag)
+{
+ return PTR_TO_INT(phase_get_irn_data(block_info, block)) & flag;
}
}
-static void set_phase_flag(ir_phase *block_info, ir_node *block, block_flags_t flag) {
- int data = (int)phase_get_irn_data(block_info, block);
+
+static void set_phase_flag(ir_phase *block_info, ir_node *block,
+ block_flags_t flag)
+{
+ int data = PTR_TO_INT(phase_get_irn_data(block_info, block));
data |= flag;
data |= flag;
- phase_set_irn_data(block_info, block,
(void*)data
);
+ phase_set_irn_data(block_info, block,
INT_TO_PTR(data)
);
}
}
-static bool has_operations(ir_phase *block_info, ir_node *block) {
+static bool has_operations(ir_phase *block_info, ir_node *block)
+{
return get_phase_flag(block_info, block, BF_HAS_OPERATIONS);
}
return get_phase_flag(block_info, block, BF_HAS_OPERATIONS);
}
-static void set_has_operations(ir_phase *block_info, ir_node *block) {
+
+static void set_has_operations(ir_phase *block_info, ir_node *block)
+{
set_phase_flag(block_info, block, BF_HAS_OPERATIONS);
}
set_phase_flag(block_info, block, BF_HAS_OPERATIONS);
}
-static bool has_phis(ir_phase *block_info, ir_node *block) {
+static bool has_phis(ir_phase *block_info, ir_node *block)
+{
return get_phase_flag(block_info, block, BF_HAS_PHIS);
}
return get_phase_flag(block_info, block, BF_HAS_PHIS);
}
-static void set_has_phis(ir_phase *block_info, ir_node *block) {
+
+static void set_has_phis(ir_phase *block_info, ir_node *block)
+{
set_phase_flag(block_info, block, BF_HAS_PHIS);
}
set_phase_flag(block_info, block, BF_HAS_PHIS);
}
-static bool is_unknown_jump_target(ir_phase *block_info, ir_node *block) {
+static bool is_unknown_jump_target(ir_phase *block_info, ir_node *block)
+{
return get_phase_flag(block_info, block, BF_IS_UNKNOWN_JUMP_TARGET);
}
return get_phase_flag(block_info, block, BF_IS_UNKNOWN_JUMP_TARGET);
}
-static void set_is_unknown_jump_target(ir_phase *block_info, ir_node *block) {
+
+static void set_is_unknown_jump_target(ir_phase *block_info, ir_node *block)
+{
set_phase_flag(block_info, block, BF_IS_UNKNOWN_JUMP_TARGET);
}
set_phase_flag(block_info, block, BF_IS_UNKNOWN_JUMP_TARGET);
}
@@
-723,7
+737,8
@@
static void remove_empty_blocks(ir_node *block, void *x)
/*
* Some cfg optimizations, which do not touch Phi nodes
*/
/*
* Some cfg optimizations, which do not touch Phi nodes
*/
-static void cfgopt_ignoring_phis(ir_graph *irg) {
+static void cfgopt_ignoring_phis(ir_graph *irg)
+{
ir_phase *block_info = new_phase(irg, NULL);
skip_env env = { false, block_info };
ir_phase *block_info = new_phase(irg, NULL);
skip_env env = { false, block_info };