projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapted some issues noticed during removal of unused variables.
[libfirm]
/
ir
/
ana
/
trouts.c
diff --git
a/ir/ana/trouts.c
b/ir/ana/trouts.c
index
0b0abc2
..
8d17939
100644
(file)
--- a/
ir/ana/trouts.c
+++ b/
ir/ana/trouts.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.
*
@@
-69,7
+69,7
@@
static ir_node **get_entity_access_array(const ir_entity *ent)
static void set_entity_access_array(const ir_entity *ent, ir_node **accs)
{
static void set_entity_access_array(const ir_entity *ent, ir_node **accs)
{
- ir_node **old = pmap_get(entity_access_map, ent);
+ ir_node **old =
(ir_node**)
pmap_get(entity_access_map, ent);
if (old != accs)
pmap_insert(entity_access_map, ent, (void *)accs);
}
if (old != accs)
pmap_insert(entity_access_map, ent, (void *)accs);
}
@@
-95,7
+95,7
@@
static ir_node **get_entity_reference_array(const ir_entity *ent)
static void set_entity_reference_array(const ir_entity *ent, ir_node **refs)
{
static void set_entity_reference_array(const ir_entity *ent, ir_node **refs)
{
- ir_node **old = pmap_get(entity_reference_map, ent);
+ ir_node **old =
(ir_node**)
pmap_get(entity_reference_map, ent);
if (old != refs)
pmap_insert(entity_reference_map, ent, (void *)refs);
}
if (old != refs)
pmap_insert(entity_reference_map, ent, (void *)refs);
}
@@
-121,7
+121,7
@@
static ir_node **get_type_alloc_array(const ir_type *tp)
static void set_type_alloc_array(const ir_type *tp, ir_node **alls)
{
static void set_type_alloc_array(const ir_type *tp, ir_node **alls)
{
- ir_node **old = pmap_get(type_alloc_map, tp);
+ ir_node **old =
(ir_node**)
pmap_get(type_alloc_map, tp);
if (old != alls)
pmap_insert(type_alloc_map, tp, (void *)alls);
}
if (old != alls)
pmap_insert(type_alloc_map, tp, (void *)alls);
}
@@
-146,7
+146,7
@@
static ir_node **get_type_cast_array(const ir_type *tp)
static void set_type_cast_array(const ir_type *tp, ir_node **alls)
{
static void set_type_cast_array(const ir_type *tp, ir_node **alls)
{
- ir_node **old = pmap_get(type_cast_map, tp);
+ ir_node **old =
(ir_node**)
pmap_get(type_cast_map, tp);
if (old != alls)
pmap_insert(type_cast_map, tp, (void *)alls);
}
if (old != alls)
pmap_insert(type_cast_map, tp, (void *)alls);
}
@@
-172,7
+172,7
@@
static ir_type **get_type_pointertype_array(const ir_type *tp)
static void set_type_pointertype_array(const ir_type *tp, ir_type **pts)
{
static void set_type_pointertype_array(const ir_type *tp, ir_type **pts)
{
- ir_type **old = pmap_get(type_pointertype_map, tp);
+ ir_type **old =
(ir_type**)
pmap_get(type_pointertype_map, tp);
if (old != pts)
pmap_insert(type_pointertype_map, tp, (void *)pts);
}
if (old != pts)
pmap_insert(type_pointertype_map, tp, (void *)pts);
}
@@
-198,7
+198,7
@@
static ir_type **get_type_arraytype_array(const ir_type *tp)
static void set_type_arraytype_array(const ir_type *tp, ir_type **pts)
{
static void set_type_arraytype_array(const ir_type *tp, ir_type **pts)
{
- ir_type **old = pmap_get(type_arraytype_map, tp);
+ ir_type **old =
(ir_type**)
pmap_get(type_arraytype_map, tp);
if (old != pts)
pmap_insert(type_arraytype_map, tp, (void *)pts);
}
if (old != pts)
pmap_insert(type_arraytype_map, tp, (void *)pts);
}
@@
-213,7
+213,7
@@
static void set_type_arraytype_array(const ir_type *tp, ir_type **pts)
/* Access routines for entities */
/**------------------------------------------------------------------*/
/* Access routines for entities */
/**------------------------------------------------------------------*/
-
in
t get_entity_n_accesses(const ir_entity *ent)
+
size_
t get_entity_n_accesses(const ir_entity *ent)
{
ir_node ** accs;
{
ir_node ** accs;
@@
-223,11
+223,11
@@
int get_entity_n_accesses(const ir_entity *ent)
return ARR_LEN(accs);
}
return ARR_LEN(accs);
}
-ir_node *get_entity_access(const ir_entity *ent,
in
t pos)
+ir_node *get_entity_access(const ir_entity *ent,
size_
t pos)
{
ir_node ** accs;
{
ir_node ** accs;
- assert(
0 <= pos &&
pos < get_entity_n_accesses(ent));
+ assert(pos < get_entity_n_accesses(ent));
accs = get_entity_access_array(ent);
return accs[pos];
accs = get_entity_access_array(ent);
return accs[pos];
@@
-260,7
+260,7
@@
void set_entity_access(const ir_entity *ent, int pos, ir_node *n)
/*------------------------------------------------------------------*/
/*------------------------------------------------------------------*/
-
in
t get_entity_n_references(const ir_entity *ent)
+
size_
t get_entity_n_references(const ir_entity *ent)
{
ir_node ** refs;
{
ir_node ** refs;
@@
-270,11
+270,11
@@
int get_entity_n_references(const ir_entity *ent)
return ARR_LEN(refs);
}
return ARR_LEN(refs);
}
-ir_node *get_entity_reference(const ir_entity *ent,
in
t pos)
+ir_node *get_entity_reference(const ir_entity *ent,
size_
t pos)
{
ir_node ** refs;
{
ir_node ** refs;
- assert(
0 <= pos &&
pos < get_entity_n_references(ent));
+ assert( pos < get_entity_n_references(ent));
refs = get_entity_reference_array(ent);
return refs[pos];
refs = get_entity_reference_array(ent);
return refs[pos];
@@
-310,7
+310,7
@@
void set_entity_reference(const ir_entity *ent, int pos, ir_node *n)
/**------------------------------------------------------------------*/
/* Number of Alloc nodes that create an instance of this type */
/**------------------------------------------------------------------*/
/* Number of Alloc nodes that create an instance of this type */
-
in
t get_type_n_allocs(const ir_type *tp)
+
size_
t get_type_n_allocs(const ir_type *tp)
{
ir_node **allocs;
{
ir_node **allocs;
@@
-321,10
+321,10
@@
int get_type_n_allocs(const ir_type *tp)
}
/* Alloc node that creates an instance of this type */
}
/* Alloc node that creates an instance of this type */
-ir_node *get_type_alloc(const ir_type *tp,
in
t pos)
+ir_node *get_type_alloc(const ir_type *tp,
size_
t pos)
{
ir_node **allocs;
{
ir_node **allocs;
- assert(
0 <= pos &&
pos < get_type_n_allocs(tp));
+ assert( pos < get_type_n_allocs(tp));
allocs = get_type_alloc_array(tp);
return allocs[pos];
allocs = get_type_alloc_array(tp);
return allocs[pos];
@@
-356,7
+356,7
@@
void set_type_alloc(const ir_type *tp, int pos, ir_node *n)
#endif
/* Number of Cast nodes that create an instance of this type */
#endif
/* Number of Cast nodes that create an instance of this type */
-
in
t get_type_n_casts(const ir_type *tp)
+
size_
t get_type_n_casts(const ir_type *tp)
{
ir_node **casts;
{
ir_node **casts;
@@
-367,10
+367,10
@@
int get_type_n_casts(const ir_type *tp)
}
}
-
in
t get_class_n_upcasts(const ir_type *clss)
+
size_
t get_class_n_upcasts(const ir_type *clss)
{
{
-
in
t i, n_casts = get_type_n_casts(clss);
-
in
t n_instances = 0;
+
size_
t i, n_casts = get_type_n_casts(clss);
+
size_
t n_instances = 0;
for (i = 0; i < n_casts; ++i) {
ir_node *cast = get_type_cast(clss, i);
if (is_Cast_upcast(cast))
for (i = 0; i < n_casts; ++i) {
ir_node *cast = get_type_cast(clss, i);
if (is_Cast_upcast(cast))
@@
-379,10
+379,10
@@
int get_class_n_upcasts(const ir_type *clss)
return n_instances;
}
return n_instances;
}
-
in
t get_class_n_downcasts(const ir_type *clss)
+
size_
t get_class_n_downcasts(const ir_type *clss)
{
{
-
in
t i, n_casts = get_type_n_casts(clss);
-
in
t n_instances = 0;
+
size_
t i, n_casts = get_type_n_casts(clss);
+
size_
t n_instances = 0;
for (i = 0; i < n_casts; ++i) {
ir_node *cast = get_type_cast(clss, i);
if (is_Cast_downcast(cast))
for (i = 0; i < n_casts; ++i) {
ir_node *cast = get_type_cast(clss, i);
if (is_Cast_downcast(cast))
@@
-392,10
+392,10
@@
int get_class_n_downcasts(const ir_type *clss)
}
/* Cast node that creates an instance of this type */
}
/* Cast node that creates an instance of this type */
-ir_node *get_type_cast(const ir_type *tp,
in
t pos)
+ir_node *get_type_cast(const ir_type *tp,
size_
t pos)
{
ir_node **casts;
{
ir_node **casts;
- assert(
0 <= pos &&
pos < get_type_n_casts(tp));
+ assert(pos < get_type_n_casts(tp));
casts = get_type_cast_array(tp);
return casts[pos];
casts = get_type_cast_array(tp);
return casts[pos];
@@
-414,11
+414,11
@@
void add_type_cast(const ir_type *tp, ir_node *n)
}
#if 0
}
#if 0
-void set_type_cast(const ir_type *tp,
in
t pos, ir_node *n)
+void set_type_cast(const ir_type *tp,
size_
t pos, ir_node *n)
{
ir_node **casts;
{
ir_node **casts;
- assert(
0 <= pos &&
pos < get_type_n_casts(tp));
+ assert(pos < get_type_n_casts(tp));
assert(n && is_ir_node(n));
casts = get_type_cast_array(tp);
assert(n && is_ir_node(n));
casts = get_type_cast_array(tp);
@@
-428,7
+428,7
@@
void set_type_cast(const ir_type *tp, int pos, ir_node *n)
/*------------------------------------------------------------------*/
/*------------------------------------------------------------------*/
-
in
t get_type_n_pointertypes_to(const ir_type *tp)
+
size_
t get_type_n_pointertypes_to(const ir_type *tp)
{
ir_type ** pts;
{
ir_type ** pts;
@@
-438,11
+438,11
@@
int get_type_n_pointertypes_to(const ir_type *tp)
return ARR_LEN(pts);
}
return ARR_LEN(pts);
}
-ir_type *get_type_pointertype_to(const ir_type *tp,
in
t pos)
+ir_type *get_type_pointertype_to(const ir_type *tp,
size_
t pos)
{
ir_type ** pts;
{
ir_type ** pts;
- assert(
0 <= pos &&
pos < get_type_n_pointertypes_to(tp));
+ assert(pos < get_type_n_pointertypes_to(tp));
pts = get_type_pointertype_array(tp);
return pts[pos];
pts = get_type_pointertype_array(tp);
return pts[pos];
@@
-456,7
+456,7
@@
void add_type_pointertype_to(const ir_type *tp, ir_type *ptp)
assert(ptp && is_Pointer_type(ptp));
pts = get_type_pointertype_array(tp);
assert(ptp && is_Pointer_type(ptp));
pts = get_type_pointertype_array(tp);
- ARR_APP1(ir_
node
*, pts, ptp);
+ ARR_APP1(ir_
type
*, pts, ptp);
set_type_pointertype_array(tp, pts);
}
set_type_pointertype_array(tp, pts);
}
@@
-475,7
+475,7
@@
void set_type_pointertype_to(const ir_type *tp, int pos, ir_type *ptp)
/*------------------------------------------------------------------*/
/*------------------------------------------------------------------*/
-
in
t get_type_n_arraytypes_of(const ir_type *tp)
+
size_
t get_type_n_arraytypes_of(const ir_type *tp)
{
ir_type ** pts;
{
ir_type ** pts;
@@
-485,11
+485,11
@@
int get_type_n_arraytypes_of(const ir_type *tp)
return ARR_LEN(pts);
}
return ARR_LEN(pts);
}
-ir_type *get_type_arraytype_of(const ir_type *tp,
in
t pos)
+ir_type *get_type_arraytype_of(const ir_type *tp,
size_
t pos)
{
ir_type ** pts;
{
ir_type ** pts;
- assert(
0 <= pos &&
pos < get_type_n_arraytypes_of(tp));
+ assert(pos < get_type_n_arraytypes_of(tp));
pts = get_type_arraytype_array(tp);
return pts[pos];
pts = get_type_arraytype_array(tp);
return pts[pos];
@@
-503,7
+503,7
@@
void add_type_arraytype_of(const ir_type *tp, ir_type *atp)
assert(atp && is_Array_type(atp));
pts = get_type_arraytype_array(tp);
assert(atp && is_Array_type(atp));
pts = get_type_arraytype_array(tp);
- ARR_APP1(ir_
node
*, pts, atp);
+ ARR_APP1(ir_
type
*, pts, atp);
set_type_arraytype_array(tp, pts);
}
set_type_arraytype_array(tp, pts);
}
@@
-650,20
+650,22
@@
void set_trouts_inconsistent(void)
/* compute the trouts data structures. */
void compute_trouts(void)
{
/* compute the trouts data structures. */
void compute_trouts(void)
{
-
in
t i;
+
size_
t i;
free_trouts();
init_trouts();
/* Compute outs for IR nodes. */
free_trouts();
init_trouts();
/* Compute outs for IR nodes. */
- for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
- irg_walk_graph(get_irp_irg(i), NULL, chain_accesses, NULL);
+ for (i = get_irp_n_irgs(); i > 0;) {
+ ir_graph *irg = get_irp_irg(--i);
+ irg_walk_graph(irg, NULL, chain_accesses, NULL);
}
walk_const_code(NULL, chain_accesses, NULL);
/* Compute outs for types */
}
walk_const_code(NULL, chain_accesses, NULL);
/* Compute outs for types */
- for (i = get_irp_n_types() - 1; i >= 0; --i) {
- chain_types(get_irp_type(i));
+ for (i = get_irp_n_types(); i > 0;) {
+ ir_type *type = get_irp_type(--i);
+ chain_types(type);
}
irp->trouts_state = outs_consistent;
}
irp->trouts_state = outs_consistent;