2009-03-30 Vladimir Makarov <vmakarov@redhat.com>

	* ira-int.h (ira_allocno): Rename left_conflicts_num to
	left_conflicts_size.
	(ALLOCNO_LEFT_CONFLICTS_NUM): Rename to
	ALLOCNO_LEFT_CONFLICTS_SIZE.

	* ira-color.c (allocno_spill_priority, push_allocno_to_stack,
	remove_allocno_from_bucket_and_push,
	allocno_spill_priority_compare, push_allocnos_to_stack,
	setup_allocno_available_regs_num): Use ALLOCNO_LEFT_CONFLICTS_SIZE
	instead of ALLOCNO_LEFT_CONFLICTS_NUM.
	(setup_allocno_left_conflicts_num): Ditto.  Rename to
	setup_allocno_left_conflicts_size.
	(put_allocno_into_bucket): Use ALLOCNO_LEFT_CONFLICTS_SIZE
	instead of ALLOCNO_LEFT_CONFLICTS_NUM and
	setup_allocno_left_conflicts_size instead of
	setup_allocno_left_conflicts_num.

	* ira-build.c (ira_create_allocno): Use
	ALLOCNO_LEFT_CONFLICTS_SIZE instead of
	ALLOCNO_LEFT_CONFLICTS_NUM.
		



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145312 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 21 deletions

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index c298376a93b..d61d39e9a01 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -683,7 +683,7 @@ static int
 allocno_spill_priority (ira_allocno_t a)
 {
   return (ALLOCNO_TEMP (a)
-	  / (ALLOCNO_LEFT_CONFLICTS_NUM (a)
+	  / (ALLOCNO_LEFT_CONFLICTS_SIZE (a)
 	     * ira_reg_class_nregs[ALLOCNO_COVER_CLASS (a)][ALLOCNO_MODE (a)]
 	     + 1));
 }
@@ -861,7 +861,7 @@ static splay_tree uncolorable_allocnos_splay_tree[N_REG_CLASSES];
 static void
 push_allocno_to_stack (ira_allocno_t allocno)
 {
-  int conflicts_num, conflict_size, size;
+  int left_conflicts_size, conflict_size, size;
   ira_allocno_t a, conflict_allocno;
   enum reg_class cover_class;
   ira_allocno_conflict_iterator aci;
@@ -896,20 +896,21 @@ push_allocno_to_stack (ira_allocno_t allocno)
 	      if (ALLOCNO_IN_GRAPH_P (conflict_allocno)
 		  && ! ALLOCNO_ASSIGNED_P (conflict_allocno))
 		{
-		  conflicts_num = ALLOCNO_LEFT_CONFLICTS_NUM (conflict_allocno);
+		  left_conflicts_size
+		    = ALLOCNO_LEFT_CONFLICTS_SIZE (conflict_allocno);
 		  conflict_size
 		    = (ira_reg_class_nregs
 		       [cover_class][ALLOCNO_MODE (conflict_allocno)]);
 		  ira_assert
-		    (ALLOCNO_LEFT_CONFLICTS_NUM (conflict_allocno) >= size);
-		  if (conflicts_num + conflict_size
+		    (ALLOCNO_LEFT_CONFLICTS_SIZE (conflict_allocno) >= size);
+		  if (left_conflicts_size + conflict_size
 		      <= ALLOCNO_AVAILABLE_REGS_NUM (conflict_allocno))
 		    {
-		      ALLOCNO_LEFT_CONFLICTS_NUM (conflict_allocno) -= size;
+		      ALLOCNO_LEFT_CONFLICTS_SIZE (conflict_allocno) -= size;
 		      continue;
 		    }
-		  conflicts_num
-		    = ALLOCNO_LEFT_CONFLICTS_NUM (conflict_allocno) - size;
+		  left_conflicts_size
+		    = ALLOCNO_LEFT_CONFLICTS_SIZE (conflict_allocno) - size;
 		  if (uncolorable_allocnos_splay_tree[cover_class] != NULL
 		      && !ALLOCNO_SPLAY_REMOVED_P (conflict_allocno)
 		      && USE_SPLAY_P (cover_class))
@@ -926,8 +927,9 @@ push_allocno_to_stack (ira_allocno_t allocno)
 				     removed_splay_allocno_vec,
 				     conflict_allocno);
 		    }
-		  ALLOCNO_LEFT_CONFLICTS_NUM (conflict_allocno) = conflicts_num;
-		  if (conflicts_num + conflict_size
+		  ALLOCNO_LEFT_CONFLICTS_SIZE (conflict_allocno)
+		    = left_conflicts_size;
+		  if (left_conflicts_size + conflict_size
 		      <= ALLOCNO_AVAILABLE_REGS_NUM (conflict_allocno))
 		    {
 		      delete_allocno_from_bucket
@@ -967,11 +969,11 @@ remove_allocno_from_bucket_and_push (ira_allocno_t allocno, bool colorable_p)
     }
   cover_class = ALLOCNO_COVER_CLASS (allocno);
   ira_assert ((colorable_p
-	       && (ALLOCNO_LEFT_CONFLICTS_NUM (allocno)
+	       && (ALLOCNO_LEFT_CONFLICTS_SIZE (allocno)
 		   + ira_reg_class_nregs[cover_class][ALLOCNO_MODE (allocno)]
 		   <= ALLOCNO_AVAILABLE_REGS_NUM (allocno)))
 	      || (! colorable_p
-		  && (ALLOCNO_LEFT_CONFLICTS_NUM (allocno)
+		  && (ALLOCNO_LEFT_CONFLICTS_SIZE (allocno)
 		      + ira_reg_class_nregs[cover_class][ALLOCNO_MODE
 							 (allocno)]
 		      > ALLOCNO_AVAILABLE_REGS_NUM (allocno))));
@@ -1084,11 +1086,11 @@ allocno_spill_priority_compare (splay_tree_key k1, splay_tree_key k2)
   ira_allocno_t a1 = (ira_allocno_t) k1, a2 = (ira_allocno_t) k2;
   
   pri1 = (ALLOCNO_TEMP (a1)
-	  / (ALLOCNO_LEFT_CONFLICTS_NUM (a1)
+	  / (ALLOCNO_LEFT_CONFLICTS_SIZE (a1)
 	     * ira_reg_class_nregs[ALLOCNO_COVER_CLASS (a1)][ALLOCNO_MODE (a1)]
 	     + 1));
   pri2 = (ALLOCNO_TEMP (a2)
-	  / (ALLOCNO_LEFT_CONFLICTS_NUM (a2)
+	  / (ALLOCNO_LEFT_CONFLICTS_SIZE (a2)
 	     * ira_reg_class_nregs[ALLOCNO_COVER_CLASS (a2)][ALLOCNO_MODE (a2)]
 	     + 1));
   if ((diff = pri1 - pri2) != 0)
@@ -1225,7 +1227,7 @@ push_allocnos_to_stack (void)
 	      allocno = VEC_pop (ira_allocno_t, removed_splay_allocno_vec);
 	      ALLOCNO_SPLAY_REMOVED_P (allocno) = false;
 	      rclass = ALLOCNO_COVER_CLASS (allocno);
-	      if (ALLOCNO_LEFT_CONFLICTS_NUM (allocno)
+	      if (ALLOCNO_LEFT_CONFLICTS_SIZE (allocno)
 		  + ira_reg_class_nregs [rclass][ALLOCNO_MODE (allocno)]
 		  > ALLOCNO_AVAILABLE_REGS_NUM (allocno))
 		splay_tree_insert
@@ -1288,7 +1290,7 @@ push_allocnos_to_stack (void)
 	}
       ira_assert (ALLOCNO_IN_GRAPH_P (allocno)
 		  && ALLOCNO_COVER_CLASS (allocno) == cover_class
-		  && (ALLOCNO_LEFT_CONFLICTS_NUM (allocno)
+		  && (ALLOCNO_LEFT_CONFLICTS_SIZE (allocno)
 		      + ira_reg_class_nregs[cover_class][ALLOCNO_MODE
 							 (allocno)]
 		      > ALLOCNO_AVAILABLE_REGS_NUM (allocno)));
@@ -1380,9 +1382,9 @@ setup_allocno_available_regs_num (ira_allocno_t allocno)
   ALLOCNO_AVAILABLE_REGS_NUM (allocno) -= n;
 }
 
-/* Set up ALLOCNO_LEFT_CONFLICTS_NUM for ALLOCNO.  */
+/* Set up ALLOCNO_LEFT_CONFLICTS_SIZE for ALLOCNO.  */
 static void
-setup_allocno_left_conflicts_num (ira_allocno_t allocno)
+setup_allocno_left_conflicts_size (ira_allocno_t allocno)
 {
   int i, hard_regs_num, hard_regno, conflict_allocnos_size;
   ira_allocno_t a, conflict_allocno;
@@ -1466,7 +1468,7 @@ setup_allocno_left_conflicts_num (ira_allocno_t allocno)
         if (a == allocno)
 	  break;
       }
-  ALLOCNO_LEFT_CONFLICTS_NUM (allocno) = conflict_allocnos_size;
+  ALLOCNO_LEFT_CONFLICTS_SIZE (allocno) = conflict_allocnos_size;
 }
 
 /* Put ALLOCNO in a bucket corresponding to its number and size of its
@@ -1482,9 +1484,9 @@ put_allocno_into_bucket (ira_allocno_t allocno)
   if (ALLOCNO_FIRST_COALESCED_ALLOCNO (allocno) != allocno)
     return;
   ALLOCNO_IN_GRAPH_P (allocno) = true;
-  setup_allocno_left_conflicts_num (allocno);
+  setup_allocno_left_conflicts_size (allocno);
   setup_allocno_available_regs_num (allocno);
-  if (ALLOCNO_LEFT_CONFLICTS_NUM (allocno)
+  if (ALLOCNO_LEFT_CONFLICTS_SIZE (allocno)
       + ira_reg_class_nregs[cover_class][ALLOCNO_MODE (allocno)]
       <= ALLOCNO_AVAILABLE_REGS_NUM (allocno))
     add_allocno_to_bucket (allocno, &colorable_allocno_bucket);