projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- C99 feature removed and simplified code
[libfirm]
/
ir
/
be
/
betranshlp.c
diff --git
a/ir/be/betranshlp.c
b/ir/be/betranshlp.c
index
b7cb271
..
91a18da
100644
(file)
--- a/
ir/be/betranshlp.c
+++ b/
ir/be/betranshlp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-24,9
+24,7
@@
* @date 14.06.2007
* @version $Id$
*/
* @date 14.06.2007
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include "pdeq.h"
#include "irop_t.h"
#include "pdeq.h"
#include "irop_t.h"
@@
-46,8
+44,6
@@
typedef struct be_transform_env_t {
ir_graph *irg; /**< The irg, the node should be created in */
typedef struct be_transform_env_t {
ir_graph *irg; /**< The irg, the node should be created in */
- int visited; /**< visited count that indicates whether a
- node is already transformed */
waitq *worklist; /**< worklist of nodes that still need to be
transformed */
ir_node *old_anchor; /**< the old anchor node in the old irg */
waitq *worklist; /**< worklist of nodes that still need to be
transformed */
ir_node *old_anchor; /**< the old anchor node in the old irg */
@@
-56,17
+52,23
@@
typedef struct be_transform_env_t {
static be_transform_env_t env;
static be_transform_env_t env;
-void be_set_transformed_node(ir_node *old_node, ir_node *new_node) {
+void be_set_transformed_node(ir_node *old_node, ir_node *new_node)
+{
set_irn_link(old_node, new_node);
set_irn_link(old_node, new_node);
+ mark_irn_visited(old_node);
}
int be_is_transformed(const ir_node *node) {
return irn_visited(node);
}
}
int be_is_transformed(const ir_node *node) {
return irn_visited(node);
}
-static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
- assert(irn_visited(old_node));
- return (ir_node*) get_irn_link(old_node);
+static inline ir_node *be_get_transformed_node(ir_node *old_node) {
+ if (irn_visited(old_node)) {
+ ir_node *new_node = get_irn_link(old_node);
+ assert(new_node != NULL);
+ return new_node;
+ }
+ return NULL;
}
void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
}
void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
@@
-81,6
+83,14
@@
void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
}
}
}
}
+void be_dep_on_frame(ir_node* node)
+{
+ ir_graph *const irg = current_ir_graph;
+
+ if (get_irg_start_block(irg) == get_nodes_block(node))
+ add_irn_dep(node, get_irg_frame(irg));
+}
+
ir_node *be_duplicate_node(ir_node *node) {
ir_node *block = be_transform_node(get_nodes_block(node));
ir_graph *irg = env.irg;
ir_node *be_duplicate_node(ir_node *node) {
ir_node *block = be_transform_node(get_nodes_block(node));
ir_graph *irg = env.irg;
@@
-99,7
+109,7
@@
ir_node *be_duplicate_node(ir_node *node) {
add_irn_n(new_node, in);
}
} else {
add_irn_n(new_node, in);
}
} else {
- ir_node **ins =
alloca(arity * sizeof(ins[0])
);
+ ir_node **ins =
ALLOCAN(ir_node*, arity
);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
ins[i] = be_transform_node(in);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
ins[i] = be_transform_node(in);
@@
-122,16
+132,12
@@
ir_node *be_duplicate_node(ir_node *node) {
* Calls transformation function for given node and marks it visited.
*/
ir_node *be_transform_node(ir_node *node) {
* Calls transformation function for given node and marks it visited.
*/
ir_node *be_transform_node(ir_node *node) {
- ir_node *new_node;
ir_op *op;
ir_op *op;
+ ir_node *new_node = be_get_transformed_node(node);
- if (irn_visited(node)) {
- new_node = be_get_transformed_node(node);
- assert(new_node != NULL);
+ if (new_node != NULL)
return new_node;
return new_node;
- }
- mark_irn_visited(node);
DEBUG_ONLY(be_set_transformed_node(node, NULL));
op = get_irn_op(node);
DEBUG_ONLY(be_set_transformed_node(node, NULL));
op = get_irn_op(node);
@@
-145,7
+151,6
@@
ir_node *be_transform_node(ir_node *node) {
}
be_set_transformed_node(node, new_node);
}
be_set_transformed_node(node, new_node);
- mark_irn_visited(new_node);
hook_dead_node_elim_subst(current_ir_graph, node, new_node);
return new_node;
}
hook_dead_node_elim_subst(current_ir_graph, node, new_node);
return new_node;
}
@@
-173,11
+178,9
@@
static void fix_loops(ir_node *node) {
assert(node_is_in_irgs_storage(env.irg, node));
assert(node_is_in_irgs_storage(env.irg, node));
- if (irn_visited(node))
+ if (irn_visited
_else_mark
(node))
return;
return;
- mark_irn_visited(node);
-
changed = 0;
if (! is_Block(node)) {
ir_node *block = get_nodes_block(node);
changed = 0;
if (! is_Block(node)) {
ir_node *block = get_nodes_block(node);
@@
-237,11
+240,6
@@
ir_node *be_pre_transform_node(ir_node *place) {
return be_transform_node(place);
}
return be_transform_node(place);
}
-ir_node *be_get_old_anchor(int anchor)
-{
- return get_irn_n(env.old_anchor, anchor);
-}
-
static void pre_transform_anchor(int anchor)
{
ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
static void pre_transform_anchor(int anchor)
{
ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
@@
-261,8
+259,7
@@
static void kill_unused_anchor(int anchor)
/**
* Transforms all nodes. Deletes the old obstack and creates a new one.
*/
/**
* Transforms all nodes. Deletes the old obstack and creates a new one.
*/
-static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
- void *cg)
+static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
{
int i;
ir_node *old_end, *new_anchor;
{
int i;
ir_node *old_end, *new_anchor;
@@
-272,7
+269,6
@@
static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
inc_irg_visited(irg);
env.irg = irg;
inc_irg_visited(irg);
env.irg = irg;
- env.visited = get_irg_visited(irg);
env.worklist = new_waitq();
env.old_anchor = irg->anchor;
env.worklist = new_waitq();
env.old_anchor = irg->anchor;
@@
-300,7
+296,7
@@
static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
kill_unused_anchor(anchor_tls);
if (pre_transform)
kill_unused_anchor(anchor_tls);
if (pre_transform)
-
(*pre_transform)(cg
);
+
pre_transform(
);
/* process worklist (this should transform all nodes in the graph) */
while (! waitq_empty(env.worklist)) {
/* process worklist (this should transform all nodes in the graph) */
while (! waitq_empty(env.worklist)) {
@@
-320,7
+316,7
@@
static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
fix_loops(anchor);
set_irn_n(new_anchor, i, anchor);
}
fix_loops(anchor);
set_irn_n(new_anchor, i, anchor);
}
- set_
irn_n(new_anchor, -1
, get_irg_anchor(irg, anchor_end_block));
+ set_
nodes_block(new_anchor
, get_irg_anchor(irg, anchor_end_block));
del_waitq(env.worklist);
free_End(old_end);
del_waitq(env.worklist);
free_End(old_end);
@@
-355,14
+351,12
@@
static ir_node *gen_Block(ir_node *node) {
#endif
if (node == macroblock) {
/* this node is a macroblock header */
#endif
if (node == macroblock) {
/* this node is a macroblock header */
- set_
irn_n(block, -1
, block);
+ set_
Block_MacroBlock(block
, block);
} else {
macroblock = be_transform_node(macroblock);
} else {
macroblock = be_transform_node(macroblock);
- set_
irn_n(block, -1
, macroblock);
+ set_
Block_MacroBlock(block
, macroblock);
}
}
- be_set_transformed_node(node, block);
-
/* put the preds in the worklist */
be_enqueue_preds(node);
/* put the preds in the worklist */
be_enqueue_preds(node);
@@
-382,7
+376,6
@@
static ir_node *gen_End(ir_node *node) {
be_duplicate_deps(node, new_end);
set_irg_end(irg, new_end);
be_duplicate_deps(node, new_end);
set_irg_end(irg, new_end);
- be_set_transformed_node(new_end, new_end);
/* transform preds */
arity = get_irn_arity(node);
/* transform preds */
arity = get_irn_arity(node);
@@
-396,7
+389,7
@@
static ir_node *gen_End(ir_node *node) {
return new_end;
}
return new_end;
}
-void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func
, void *cg
)
+void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func)
{
ir_graph *irg = birg->irg;
ir_graph *old_current_ir_graph = current_ir_graph;
{
ir_graph *irg = birg->irg;
ir_graph *old_current_ir_graph = current_ir_graph;
@@
-407,7
+400,7
@@
void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
/* create a new obstack */
old_obst = irg->obst;
/* create a new obstack */
old_obst = irg->obst;
- new_obst =
xmalloc(sizeof(*new_obst)
);
+ new_obst =
XMALLOC(struct obstack
);
obstack_init(new_obst);
irg->obst = new_obst;
irg->last_node_idx = 0;
obstack_init(new_obst);
irg->obst = new_obst;
irg->last_node_idx = 0;
@@
-421,10
+414,7
@@
void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
op_End->ops.generic = (op_func)gen_End;
/* do the main transformation */
op_End->ops.generic = (op_func)gen_End;
/* do the main transformation */
- transform_nodes(irg, func, cg);
-
- /* we don't want the globals anchor anymore */
- set_irg_globals(irg, new_r_Bad(irg));
+ transform_nodes(irg, func);
/* free the old obstack */
obstack_free(old_obst, 0);
/* free the old obstack */
obstack_free(old_obst, 0);
@@
-451,6
+441,6
@@
void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
if (birg->lv) {
be_liveness_free(birg->lv);
if (birg->lv) {
be_liveness_free(birg->lv);
- birg->lv = be_liveness(
b
irg);
+ birg->lv = be_liveness(irg);
}
}
}
}