diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2010-07-14 01:56:32 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2010-07-14 01:56:32 +0000 |
| commit | fa86d337f691f622a4ff946b8b8e87deffb72f7f (patch) | |
| tree | bf075ab760c9643d5d25be8ef2552f0bf9631b4a /gcc/ira-int.h | |
| parent | 9140d27b2a52d6f3f0422c3391fbce84efad4442 (diff) | |
| download | gcc-fa86d337f691f622a4ff946b8b8e87deffb72f7f.tar.gz | |
ira-int.h (ira_object_conflict_iterator): Rename from ira_allocno_conflict_iterator.
* ira-int.h (ira_object_conflict_iterator): Rename from
ira_allocno_conflict_iterator.
(ira_object_conflict_iter_init): Rename from
ira_allocno_conflict_iter_init, second arg changed to
* ira.c (check_allocation): Use FOR_EACH_OBJECT_CONFLICT rather than
FOR_EACH_ALLOCNO_CONFLICT.
* ira-color.c (assign_hard_reg, push_allocno_to_stack)
setup_allocno_left_conflicts_size, coalesced_allocno_conflict_p,
ira_reassign_conflict_allocnos, ira_reassign_pseudos): Likewise.
* ira-conflicts.c (print_allocno_conflicts): Likewise.
From-SVN: r162168
Diffstat (limited to 'gcc/ira-int.h')
| -rw-r--r-- | gcc/ira-int.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/gcc/ira-int.h b/gcc/ira-int.h index 0c9d1276db3..182203d3d8e 100644 --- a/gcc/ira-int.h +++ b/gcc/ira-int.h @@ -1159,14 +1159,13 @@ typedef struct { /* The word of bit vector currently visited. It is defined only if OBJECT_CONFLICT_VEC_P is FALSE. */ unsigned IRA_INT_TYPE word; -} ira_allocno_conflict_iterator; +} ira_object_conflict_iterator; /* Initialize the iterator I with ALLOCNO conflicts. */ static inline void -ira_allocno_conflict_iter_init (ira_allocno_conflict_iterator *i, - ira_allocno_t allocno) +ira_object_conflict_iter_init (ira_object_conflict_iterator *i, + ira_object_t obj) { - ira_object_t obj = ALLOCNO_OBJECT (allocno); i->conflict_vec_p = OBJECT_CONFLICT_VEC_P (obj); i->vec = OBJECT_CONFLICT_ARRAY (obj); i->word_num = 0; @@ -1190,8 +1189,8 @@ ira_allocno_conflict_iter_init (ira_allocno_conflict_iterator *i, case *A is set to the allocno to be visited. Otherwise, return FALSE. */ static inline bool -ira_allocno_conflict_iter_cond (ira_allocno_conflict_iterator *i, - ira_allocno_t *a) +ira_object_conflict_iter_cond (ira_object_conflict_iterator *i, + ira_object_t *pobj) { ira_object_t obj; @@ -1222,13 +1221,13 @@ ira_allocno_conflict_iter_cond (ira_allocno_conflict_iterator *i, obj = ira_object_id_map[i->bit_num + i->base_conflict_id]; } - *a = OBJECT_ALLOCNO (obj); + *pobj = obj; return true; } /* Advance to the next conflicting allocno. */ static inline void -ira_allocno_conflict_iter_next (ira_allocno_conflict_iterator *i) +ira_object_conflict_iter_next (ira_object_conflict_iterator *i) { if (i->conflict_vec_p) i->word_num++; @@ -1239,14 +1238,13 @@ ira_allocno_conflict_iter_next (ira_allocno_conflict_iterator *i) } } -/* Loop over all allocnos conflicting with ALLOCNO. In each - iteration, A is set to the next conflicting allocno. ITER is an - instance of ira_allocno_conflict_iterator used to iterate the - conflicts. */ -#define FOR_EACH_ALLOCNO_CONFLICT(ALLOCNO, A, ITER) \ - for (ira_allocno_conflict_iter_init (&(ITER), (ALLOCNO)); \ - ira_allocno_conflict_iter_cond (&(ITER), &(A)); \ - ira_allocno_conflict_iter_next (&(ITER))) +/* Loop over all objects conflicting with OBJ. In each iteration, + CONF is set to the next conflicting object. ITER is an instance + of ira_object_conflict_iterator used to iterate the conflicts. */ +#define FOR_EACH_OBJECT_CONFLICT(OBJ, CONF, ITER) \ + for (ira_object_conflict_iter_init (&(ITER), (OBJ)); \ + ira_object_conflict_iter_cond (&(ITER), &(CONF)); \ + ira_object_conflict_iter_next (&(ITER))) |