projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
normalize some bittest constructs
[libfirm]
/
ir
/
opt
/
jumpthreading.c
diff --git
a/ir/opt/jumpthreading.c
b/ir/opt/jumpthreading.c
index
d354e39
..
c6120ee
100644
(file)
--- a/
ir/opt/jumpthreading.c
+++ b/
ir/opt/jumpthreading.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-20
08
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-20
10
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-42,7
+42,7
@@
#include "irtools.h"
#include "irgraph.h"
#include "tv.h"
#include "irtools.h"
#include "irgraph.h"
#include "tv.h"
-#include "
opt_confirms
.h"
+#include "
iroptimize
.h"
#include "iropt_dbg.h"
#include "irpass.h"
#include "vrp.h"
#include "iropt_dbg.h"
#include "irpass.h"
#include "vrp.h"
@@
-92,7
+92,7
@@
static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode,
/* the other defs can't be marked for cases where a user of the original
* value is in the same block as the alternative definition.
* In this case we mustn't use the alternative definition.
/* the other defs can't be marked for cases where a user of the original
* value is in the same block as the alternative definition.
* In this case we mustn't use the alternative definition.
- * So we keep a flag that indicated wether we walked at least 1 block
+ * So we keep a flag that indicated w
h
ether we walked at least 1 block
* away and may use the alternative definition */
if (block == ssa_second_def_block && !first) {
return ssa_second_def;
* away and may use the alternative definition */
if (block == ssa_second_def_block && !first) {
return ssa_second_def;
@@
-232,7
+232,7
@@
static ir_node *copy_and_fix_node(const jumpthreading_env_t *env,
copy = get_Phi_pred(node, j);
/* we might have to evaluate a Phi-cascade */
if (get_irn_visited(copy) >= env->visited_nr) {
copy = get_Phi_pred(node, j);
/* we might have to evaluate a Phi-cascade */
if (get_irn_visited(copy) >= env->visited_nr) {
- copy = get_irn_link(copy);
+ copy =
(ir_node*)
get_irn_link(copy);
}
} else {
copy = exact_copy(node);
}
} else {
copy = exact_copy(node);
@@
-249,7
+249,7
@@
static ir_node *copy_and_fix_node(const jumpthreading_env_t *env,
continue;
if (get_irn_visited(pred) >= env->visited_nr) {
continue;
if (get_irn_visited(pred) >= env->visited_nr) {
- new_pred = get_irn_link(pred);
+ new_pred =
(ir_node*)
get_irn_link(pred);
} else {
new_pred = copy_and_fix_node(env, block, copy_block, j, pred);
}
} else {
new_pred = copy_and_fix_node(env, block, copy_block, j, pred);
}
@@
-317,7
+317,7
@@
static void copy_and_fix(const jumpthreading_env_t *env, ir_node *block,
* recursive find_phi_with_const() call */
assert(get_irn_visited(copy) <= env->visited_nr);
if (get_irn_visited(copy) >= env->visited_nr) {
* recursive find_phi_with_const() call */
assert(get_irn_visited(copy) <= env->visited_nr);
if (get_irn_visited(copy) >= env->visited_nr) {
- ir_node *prev_copy = get_irn_link(copy);
+ ir_node *prev_copy =
(ir_node*)
get_irn_link(copy);
if (prev_copy != NULL)
set_irn_link(node, prev_copy);
}
if (prev_copy != NULL)
set_irn_link(node, prev_copy);
}
@@
-339,7
+339,7
@@
static void copy_and_fix(const jumpthreading_env_t *env, ir_node *block,
DB((dbg, LEVEL_2, ">> Fixing users of %+F\n", node));
DB((dbg, LEVEL_2, ">> Fixing users of %+F\n", node));
- copy_node = get_irn_link(node);
+ copy_node =
(ir_node*)
get_irn_link(node);
construct_ssa(block, node, copy_block, copy_node);
}
}
construct_ssa(block, node, copy_block, copy_node);
}
}
@@
-561,14
+561,14
@@
static ir_node *find_candidate(jumpthreading_env_t *env, ir_node *jump,
if (is_Proj(value)) {
ir_node *left;
ir_node *right;
if (is_Proj(value)) {
ir_node *left;
ir_node *right;
-
int
pnc;
+
pn_Cmp
pnc;
ir_node *cmp = get_Proj_pred(value);
if (!is_Cmp(cmp))
return NULL;
left = get_Cmp_left(cmp);
right = get_Cmp_right(cmp);
ir_node *cmp = get_Proj_pred(value);
if (!is_Cmp(cmp))
return NULL;
left = get_Cmp_left(cmp);
right = get_Cmp_right(cmp);
- pnc = get_Proj_p
roj
(value);
+ pnc = get_Proj_p
n_cmp
(value);
/* we assume that the constant is on the right side, swap left/right
* if needed */
/* we assume that the constant is on the right side, swap left/right
* if needed */
@@
-619,7
+619,7
@@
static ir_node *find_candidate(jumpthreading_env_t *env, ir_node *jump,
static void thread_jumps(ir_node* block, void* data)
{
jumpthreading_env_t env;
static void thread_jumps(ir_node* block, void* data)
{
jumpthreading_env_t env;
- int *changed = data;
+ int *changed =
(int*)
data;
ir_node *selector;
ir_node *projx;
ir_node *cond;
ir_node *selector;
ir_node *projx;
ir_node *cond;
@@
-628,7
+628,7
@@
static void thread_jumps(ir_node* block, void* data)
const ir_edge_t *edge, *next;
ir_graph *irg;
ir_node *bad;
const ir_edge_t *edge, *next;
ir_graph *irg;
ir_node *bad;
-
size_t
cnst_pos;
+
int
cnst_pos;
if (get_Block_n_cfgpreds(block) != 1)
return;
if (get_Block_n_cfgpreds(block) != 1)
return;
@@
-655,7
+655,7
@@
static void thread_jumps(ir_node* block, void* data)
ir_node *left = get_Cmp_left(cmp);
ir_node *right = get_Cmp_right(cmp);
if (is_Const(left) && is_Const(right)) {
ir_node *left = get_Cmp_left(cmp);
ir_node *right = get_Cmp_right(cmp);
if (is_Const(left) && is_Const(right)) {
-
int pnc = get_Proj_proj
(selector);
+
pn_Cmp pnc = get_Proj_pn_cmp
(selector);
ir_tarval *tv_left = get_Const_tarval(left);
ir_tarval *tv_right = get_Const_tarval(right);
ir_tarval *tv_left = get_Const_tarval(left);
ir_tarval *tv_right = get_Const_tarval(right);
@@
-666,7
+666,7
@@
static void thread_jumps(ir_node* block, void* data)
* constant or the comparison could not be evaluated.
* Try with VRP information now.
*/
* constant or the comparison could not be evaluated.
* Try with VRP information now.
*/
-
int pnc = get_Proj_proj
(selector);
+
pn_Cmp pnc = get_Proj_pn_cmp
(selector);
selector_evaluated = eval_cmp_vrp(pnc, left, right);
}
selector_evaluated = eval_cmp_vrp(pnc, left, right);
}