From fb5503484f7463c2a523fed993f58e58289ba59b Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 9 Dec 2011 13:27:20 +0100 Subject: [PATCH] ira-color.c (print_hard_regs_subforest): Use HOST_WIDEST_INT_PRINT_DEC instead of %lld. * ira-color.c (print_hard_regs_subforest): Use HOST_WIDEST_INT_PRINT_DEC instead of %lld. (allocno_hard_regs): Change type of cost member to HOST_WIDEST_INT. (add_allocno_hard_regs): Change type of argument cost to HOST_WIDEST_INT. * ira-conflict.c (build_conflict_bit_table): Replace use of long-long by HOST_WIDEST_INT. From-SVN: r182161 --- gcc/ChangeLog | 11 +++++++++++ gcc/ira-color.c | 6 +++--- gcc/ira-conflicts.c | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 75fae33482a..a5e4afeb8d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2011-12-09 Kai Tietz + + * ira-color.c (print_hard_regs_subforest): Use + HOST_WIDEST_INT_PRINT_DEC instead of %lld. + (allocno_hard_regs): Change type of cost member + to HOST_WIDEST_INT. + (add_allocno_hard_regs): Change type of argument cost + to HOST_WIDEST_INT. + * ira-conflict.c (build_conflict_bit_table): Replace use + of long-long by HOST_WIDEST_INT. + 2011-12-09 Georg-Johann Lay PR target/51425 diff --git a/gcc/ira-color.c b/gcc/ira-color.c index c7a7033ebc1..1c03a4ae565 100644 --- a/gcc/ira-color.c +++ b/gcc/ira-color.c @@ -53,7 +53,7 @@ struct allocno_hard_regs HARD_REG_SET set; /* Overall (spilling) cost of all allocnos with given register set. */ - long long int cost; + HOST_WIDEST_INT cost; }; typedef struct allocno_hard_regs_node *allocno_hard_regs_node_t; @@ -229,7 +229,7 @@ init_allocno_hard_regs (void) /* Add (or update info about) allocno hard registers with SET and COST. */ static allocno_hard_regs_t -add_allocno_hard_regs (HARD_REG_SET set, long long int cost) +add_allocno_hard_regs (HARD_REG_SET set, HOST_WIDEST_INT cost) { struct allocno_hard_regs temp; allocno_hard_regs_t hv; @@ -498,7 +498,7 @@ print_hard_regs_subforest (FILE *f, allocno_hard_regs_node_t roots, fprintf (f, " "); fprintf (f, "%d:(", node->preorder_num); print_hard_reg_set (f, node->hard_regs->set, false); - fprintf (f, ")@%lld\n", node->hard_regs->cost); + fprintf (f, ")@" HOST_WIDEST_INT_PRINT_DEC "\n", node->hard_regs->cost); print_hard_regs_subforest (f, node->first, level + 1); } } diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c index 225a3ab17f2..f2f13114f38 100644 --- a/gcc/ira-conflicts.c +++ b/gcc/ira-conflicts.c @@ -116,8 +116,8 @@ build_conflict_bit_table (void) = ((OBJECT_MAX (obj) - OBJECT_MIN (obj) + IRA_INT_BITS) / IRA_INT_BITS); allocated_words_num += conflict_bit_vec_words_num; - if ((unsigned long long) allocated_words_num * sizeof (IRA_INT_TYPE) - > (unsigned long long) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024) + if ((unsigned HOST_WIDEST_INT) allocated_words_num * sizeof (IRA_INT_TYPE) + > (unsigned HOST_WIDEST_INT) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024) { if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL) fprintf -- 2.43.5