projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consider that unreachble blocks might have no bitinfo.
[libfirm]
/
ir
/
tr
/
typewalk.c
diff --git
a/ir/tr/typewalk.c
b/ir/tr/typewalk.c
index
3a545b6
..
b0725f3
100644
(file)
--- a/
ir/tr/typewalk.c
+++ b/
ir/tr/typewalk.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-20
08
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-20
11
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-60,7
+60,7
@@
static void walk_initializer(ir_initializer_t *initializer,
type_walk_func *pre, type_walk_func *post,
void *env)
{
type_walk_func *pre, type_walk_func *post,
void *env)
{
- switch(initializer->kind) {
+ switch
(initializer->kind) {
case IR_INITIALIZER_CONST:
irn_type_walker(initializer->consti.value, pre, post, env);
return;
case IR_INITIALIZER_CONST:
irn_type_walker(initializer->consti.value, pre, post, env);
return;
@@
-70,7
+70,7
@@
static void walk_initializer(ir_initializer_t *initializer,
case IR_INITIALIZER_COMPOUND: {
size_t i;
case IR_INITIALIZER_COMPOUND: {
size_t i;
- for(i = 0; i < initializer->compound.n_initializers; ++i) {
+ for
(i = 0; i < initializer->compound.n_initializers; ++i) {
ir_initializer_t *subinitializer
= initializer->compound.initializers[i];
walk_initializer(subinitializer, pre, post, env);
ir_initializer_t *subinitializer
= initializer->compound.initializers[i];
walk_initializer(subinitializer, pre, post, env);
@@
-90,7
+90,7
@@
static void do_type_walk(type_or_ent tore,
type_walk_func *post,
void *env)
{
type_walk_func *post,
void *env)
{
-
int
i, n_types, n_mem;
+
size_t
i, n_types, n_mem;
ir_entity *ent = NULL;
ir_type *tp = NULL;
ir_node *n;
ir_entity *ent = NULL;
ir_type *tp = NULL;
ir_node *n;
@@
-130,7
+130,7
@@
static void do_type_walk(type_or_ent tore,
if (ent->initializer != NULL) {
walk_initializer(ent->initializer, pre, post, env);
} else if (entity_has_compound_ent_values(ent)) {
if (ent->initializer != NULL) {
walk_initializer(ent->initializer, pre, post, env);
} else if (entity_has_compound_ent_values(ent)) {
- n_mem = get_compound_ent_n_values(ent);
+
size_t i,
n_mem = get_compound_ent_n_values(ent);
for (i = 0; i < n_mem; ++i) {
n = get_compound_ent_value(ent, i);
irn_type_walker(n, pre, post, env);
for (i = 0; i < n_mem; ++i) {
n = get_compound_ent_value(ent, i);
irn_type_walker(n, pre, post, env);
@@
-243,8
+243,9
@@
static void irn_type_walker(
/** Check whether node contains types or entities as an attribute.
If so start a walk over that information. */
/** Check whether node contains types or entities as an attribute.
If so start a walk over that information. */
-static void start_type_walk(ir_node *node, void *ctx) {
- type_walk_env *env = ctx;
+static void start_type_walk(ir_node *node, void *ctx)
+{
+ type_walk_env *env = (type_walk_env*)ctx;
type_walk_func *pre;
type_walk_func *post;
void *envi;
type_walk_func *pre;
type_walk_func *post;
void *envi;
@@
-257,10
+258,12
@@
static void start_type_walk(ir_node *node, void *ctx) {
}
/* walker: walks over all types */
}
/* walker: walks over all types */
-void type_walk(type_walk_func *pre, type_walk_func *post, void *env) {
- int i, n_types = get_irp_n_types();
+void type_walk(type_walk_func *pre, type_walk_func *post, void *env)
+{
+ size_t i, n_types = get_irp_n_types();
type_or_ent cont;
type_or_ent cont;
+ irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
inc_master_type_visited();
for (i = 0; i < n_types; ++i) {
cont.typ = get_irp_type(i);
inc_master_type_visited();
for (i = 0; i < n_types; ++i) {
cont.typ = get_irp_type(i);
@@
-268,10
+271,12
@@
void type_walk(type_walk_func *pre, type_walk_func *post, void *env) {
}
cont.typ = get_glob_type();
do_type_walk(cont, pre, post, env);
}
cont.typ = get_glob_type();
do_type_walk(cont, pre, post, env);
+ irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
}
}
-void type_walk_prog(type_walk_func *pre, type_walk_func *post, void *env) {
- int i, n_irgs = get_irp_n_irgs();
+void type_walk_prog(type_walk_func *pre, type_walk_func *post, void *env)
+{
+ size_t i, n_irgs = get_irp_n_irgs();
type_or_ent cont;
type_walk(pre, post, env);
type_or_ent cont;
type_walk(pre, post, env);
@@
-282,13
+287,13
@@
void type_walk_prog(type_walk_func *pre, type_walk_func *post, void *env) {
do_type_walk(cont, pre, post, env);
cont.typ = get_method_value_param_type(get_entity_type(get_irg_entity(irg)));
do_type_walk(cont, pre, post, env);
cont.typ = get_method_value_param_type(get_entity_type(get_irg_entity(irg)));
- if(cont.typ)
+ if
(cont.typ)
do_type_walk(cont, pre, post, env);
}
for (i = IR_SEGMENT_FIRST; i <= IR_SEGMENT_LAST; ++i) {
cont.typ = get_segment_type((ir_segment_t) i);
do_type_walk(cont, pre, post, env);
}
for (i = IR_SEGMENT_FIRST; i <= IR_SEGMENT_LAST; ++i) {
cont.typ = get_segment_type((ir_segment_t) i);
- if(cont.typ)
+ if
(cont.typ)
do_type_walk(cont, pre, post, env);
}
}
do_type_walk(cont, pre, post, env);
}
}
@@
-319,6
+324,7
@@
void type_walk_irg(ir_graph *irg,
Here we initially increase the flag. We only call do_type_walk that does
not increase the flag.
*/
Here we initially increase the flag. We only call do_type_walk that does
not increase the flag.
*/
+ irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
inc_master_type_visited();
irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env);
inc_master_type_visited();
irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env);
@@
-329,6
+335,7
@@
void type_walk_irg(ir_graph *irg,
do_type_walk(cont, pre, post, env);
current_ir_graph = rem;
do_type_walk(cont, pre, post, env);
current_ir_graph = rem;
+ irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
}
static void type_walk_s2s_2(type_or_ent tore,
}
static void type_walk_s2s_2(type_or_ent tore,
@@
-337,7
+344,6
@@
static void type_walk_s2s_2(type_or_ent tore,
void *env)
{
type_or_ent cont;
void *env)
{
type_or_ent cont;
- int i, n;
/* marked? */
switch (get_kind(tore.ent)) {
/* marked? */
switch (get_kind(tore.ent)) {
@@
-360,6
+366,8
@@
static void type_walk_s2s_2(type_or_ent tore,
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
+ size_t i, n;
+
n = get_class_n_supertypes(tp);
for (i = 0; i < n; ++i) {
cont.typ = get_class_supertype(tp, i);
n = get_class_n_supertypes(tp);
for (i = 0; i < n; ++i) {
cont.typ = get_class_supertype(tp, i);
@@
-408,8
+416,9
@@
void type_walk_super2sub(type_walk_func *pre,
void *env)
{
type_or_ent cont;
void *env)
{
type_or_ent cont;
-
int
i, n_types = get_irp_n_types();
+
size_t
i, n_types = get_irp_n_types();
+ irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
inc_master_type_visited();
cont.typ = get_glob_type();
type_walk_s2s_2(cont, pre, post, env);
inc_master_type_visited();
cont.typ = get_glob_type();
type_walk_s2s_2(cont, pre, post, env);
@@
-417,17
+426,15
@@
void type_walk_super2sub(type_walk_func *pre,
cont.typ = get_irp_type(i);
type_walk_s2s_2(cont, pre, post, env);
}
cont.typ = get_irp_type(i);
type_walk_s2s_2(cont, pre, post, env);
}
+ irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
}
/*****************************************************************************/
}
/*****************************************************************************/
-static void
-type_walk_super_2(type_or_ent tore,
- type_walk_func *pre,
- type_walk_func *post,
- void *env) {
+static void type_walk_super_2(type_or_ent tore, type_walk_func *pre,
+ type_walk_func *post, void *env)
+{
type_or_ent cont;
type_or_ent cont;
- int i, n;
/* marked? */
switch (get_kind(tore.ent)) {
/* marked? */
switch (get_kind(tore.ent)) {
@@
-452,6
+459,8
@@
type_walk_super_2(type_or_ent tore,
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
+ size_t i, n;
+
/* execute pre method */
if (pre)
pre(tore, env);
/* execute pre method */
if (pre)
pre(tore, env);
@@
-490,12
+499,12
@@
type_walk_super_2(type_or_ent tore,
}
}
}
}
-void type_walk_super(type_walk_func *pre,
- type_walk_func *post,
- void *env) {
- int i, n_types = get_irp_n_types();
+void type_walk_super(type_walk_func *pre, type_walk_func *post, void *env)
+{
+ size_t i, n_types = get_irp_n_types();
type_or_ent cont;
type_or_ent cont;
+ irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
inc_master_type_visited();
cont.typ = get_glob_type();
type_walk_super_2(cont, pre, post, env);
inc_master_type_visited();
cont.typ = get_glob_type();
type_walk_super_2(cont, pre, post, env);
@@
-503,18
+512,16
@@
void type_walk_super(type_walk_func *pre,
cont.typ = get_irp_type(i);
type_walk_super_2(cont, pre, post, env);
}
cont.typ = get_irp_type(i);
type_walk_super_2(cont, pre, post, env);
}
+ irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
}
/*****************************************************************************/
}
/*****************************************************************************/
-static void
-class_walk_s2s_2(ir_type *tp,
- class_walk_func *pre,
- class_walk_func *post,
- void *env)
+static void class_walk_s2s_2(ir_type *tp, class_walk_func *pre,
+ class_walk_func *post, void *env)
{
{
-
in
t i, n;
+
size_
t i, n;
/* marked? */
if (type_visited(tp)) return;
/* marked? */
if (type_visited(tp)) return;
@@
-546,9
+553,10
@@
void class_walk_super2sub(class_walk_func *pre,
class_walk_func *post,
void *env)
{
class_walk_func *post,
void *env)
{
-
in
t i, n_types = get_irp_n_types();
+
size_
t i, n_types = get_irp_n_types();
ir_type *tp;
ir_type *tp;
+ irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
inc_master_type_visited();
for (i = 0; i < n_types; i++) {
tp = get_irp_type(i);
inc_master_type_visited();
for (i = 0; i < n_types; i++) {
tp = get_irp_type(i);
@@
-560,6
+568,7
@@
void class_walk_super2sub(class_walk_func *pre,
class_walk_s2s_2(tp, pre, post, env);
}
}
class_walk_s2s_2(tp, pre, post, env);
}
}
+ irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
}
}
@@
-568,7
+577,7
@@
void walk_types_entities(ir_type *tp,
entity_walk_func *doit,
void *env)
{
entity_walk_func *doit,
void *env)
{
-
in
t i, n;
+
size_
t i, n;
switch (get_type_tpop_code(tp)) {
case tpo_class:
switch (get_type_tpop_code(tp)) {
case tpo_class: