diff options
Diffstat (limited to 'gcc/df-scan.c')
-rw-r--r-- | gcc/df-scan.c | 580 |
1 files changed, 290 insertions, 290 deletions
diff --git a/gcc/df-scan.c b/gcc/df-scan.c index c12c00e..4428b88 100644 --- a/gcc/df-scan.c +++ b/gcc/df-scan.c @@ -1,7 +1,7 @@ /* Scanning of rtl for dataflow analysis. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - Originally contributed by Michael P. Hayes + Originally contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz, mhayes@redhat.com) Major rewrite contributed by Danny Berlin (dberlin@dberlin.org) and Kenneth Zadeck (zadeck@naturalbridge.com). @@ -75,7 +75,7 @@ DEF_VEC_ALLOC_P_STACK(df_mw_hardreg_ptr); /* The following two macros free the vecs that hold either the refs or the mw refs. They are a little tricky because the vec has 0 - elements is special and is not to be freed. */ + elements is special and is not to be freed. */ #define df_scan_free_ref_vec(V) \ do { \ if (V && *V) \ @@ -107,7 +107,7 @@ static df_ref df_null_ref_rec[1]; static struct df_mw_hardreg * df_null_mw_rec[1]; static void df_ref_record (enum df_ref_class, struct df_collection_rec *, - rtx, rtx *, + rtx, rtx *, basic_block, struct df_insn_info *, enum df_ref_type, int ref_flags, int, int, enum machine_mode); @@ -120,17 +120,17 @@ static void df_defs_record (struct df_collection_rec *, rtx, static void df_uses_record (enum df_ref_class, struct df_collection_rec *, rtx *, enum df_ref_type, basic_block, struct df_insn_info *, - int ref_flags, + int ref_flags, int, int, enum machine_mode); -static df_ref df_ref_create_structure (enum df_ref_class, - struct df_collection_rec *, rtx, rtx *, +static df_ref df_ref_create_structure (enum df_ref_class, + struct df_collection_rec *, rtx, rtx *, basic_block, struct df_insn_info *, enum df_ref_type, int ref_flags, int, int, enum machine_mode); -static void df_insn_refs_collect (struct df_collection_rec*, - basic_block, struct df_insn_info *); +static void df_insn_refs_collect (struct df_collection_rec*, + basic_block, struct df_insn_info *); static void df_canonize_collection_rec (struct df_collection_rec *); static void df_get_regular_block_artificial_uses (bitmap); @@ -144,13 +144,13 @@ static void df_grow_ref_info (struct df_ref_info *, unsigned int); static void df_ref_chain_delete_du_chain (df_ref *); static void df_ref_chain_delete (df_ref *); -static void df_refs_add_to_chains (struct df_collection_rec *, +static void df_refs_add_to_chains (struct df_collection_rec *, basic_block, rtx); static bool df_insn_refs_verify (struct df_collection_rec *, basic_block, rtx, bool); static void df_entry_block_defs_collect (struct df_collection_rec *, bitmap); static void df_exit_block_uses_collect (struct df_collection_rec *, bitmap); -static void df_install_ref (df_ref, struct df_reg_info *, +static void df_install_ref (df_ref, struct df_reg_info *, struct df_ref_info *, bool); static int df_ref_compare (const void *, const void *); @@ -193,7 +193,7 @@ typedef struct df_scan_bb_info *df_scan_bb_info_t; /* Internal function to shut down the scanning problem. */ -static void +static void df_scan_free_internal (void) { struct df_scan_problem_data *problem_data @@ -282,7 +282,7 @@ df_scan_free_internal (void) /* Set basic block info. */ static void -df_scan_set_bb_info (unsigned int index, +df_scan_set_bb_info (unsigned int index, struct df_scan_bb_info *bb_info) { gcc_assert (df_scan); @@ -307,10 +307,10 @@ df_scan_free_bb_info (basic_block bb, void *vbb_info) /* Record defs within INSN. */ df_insn_delete (bb, INSN_UID (insn)); } - + if (bb_index < df_scan->block_info_size) bb_info = df_scan_get_bb_info (bb_index); - + /* Get rid of any artificial uses or defs. */ df_ref_chain_delete_du_chain (bb_info->artificial_defs); df_ref_chain_delete_du_chain (bb_info->artificial_uses); @@ -326,7 +326,7 @@ df_scan_free_bb_info (basic_block bb, void *vbb_info) /* Allocate the problem data for the scanning problem. This should be called when the problem is created or when the entire function is to be rescanned. */ -void +void df_scan_alloc (bitmap all_blocks ATTRIBUTE_UNUSED) { struct df_scan_problem_data *problem_data; @@ -339,41 +339,41 @@ df_scan_alloc (bitmap all_blocks ATTRIBUTE_UNUSED) if (df_scan->problem_data) df_scan_free_internal (); - df_scan->block_pool - = create_alloc_pool ("df_scan_block pool", - sizeof (struct df_scan_bb_info), + df_scan->block_pool + = create_alloc_pool ("df_scan_block pool", + sizeof (struct df_scan_bb_info), block_size); problem_data = XNEW (struct df_scan_problem_data); df_scan->problem_data = problem_data; df_scan->computed = true; - problem_data->ref_base_pool - = create_alloc_pool ("df_scan ref base", + problem_data->ref_base_pool + = create_alloc_pool ("df_scan ref base", sizeof (struct df_base_ref), block_size); - problem_data->ref_artificial_pool - = create_alloc_pool ("df_scan ref artificial", + problem_data->ref_artificial_pool + = create_alloc_pool ("df_scan ref artificial", sizeof (struct df_artificial_ref), block_size); - problem_data->ref_regular_pool - = create_alloc_pool ("df_scan ref regular", + problem_data->ref_regular_pool + = create_alloc_pool ("df_scan ref regular", sizeof (struct df_regular_ref), block_size); - problem_data->ref_extract_pool - = create_alloc_pool ("df_scan ref extract", + problem_data->ref_extract_pool + = create_alloc_pool ("df_scan ref extract", sizeof (struct df_extract_ref), block_size); - problem_data->insn_pool - = create_alloc_pool ("df_scan insn", + problem_data->insn_pool + = create_alloc_pool ("df_scan insn", sizeof (struct df_insn_info), block_size); - problem_data->reg_pool - = create_alloc_pool ("df_scan reg", + problem_data->reg_pool + = create_alloc_pool ("df_scan reg", sizeof (struct df_reg_info), block_size); - problem_data->mw_reg_pool - = create_alloc_pool ("df_scan mw_reg", + problem_data->mw_reg_pool + = create_alloc_pool ("df_scan mw_reg", sizeof (struct df_mw_hardreg), block_size); bitmap_obstack_initialize (&problem_data->reg_bitmaps); bitmap_obstack_initialize (&problem_data->insn_bitmaps); - insn_num += insn_num / 4; + insn_num += insn_num / 4; df_grow_reg_info (); df_grow_insn_info (); @@ -406,7 +406,7 @@ df_scan_alloc (bitmap all_blocks ATTRIBUTE_UNUSED) /* Free all of the data associated with the scan problem. */ -static void +static void df_scan_free (void) { if (df_scan->problem_data) @@ -422,7 +422,7 @@ df_scan_free (void) } /* Dump the preamble for DF_SCAN dump. */ -static void +static void df_scan_start_dump (FILE *file ATTRIBUTE_UNUSED) { int i; @@ -451,7 +451,7 @@ df_scan_start_dump (FILE *file ATTRIBUTE_UNUSED) if (df_regs_ever_live_p (i)) fprintf (file, " %d[%s]", i, reg_names[i]); fprintf (file, "\n;; ref usage \t"); - + for (i = 0; i < (int)df->regs_inited; i++) if (DF_REG_DEF_COUNT (i) || DF_REG_USE_COUNT (i) || DF_REG_EQ_USE_COUNT (i)) { @@ -488,12 +488,12 @@ df_scan_start_dump (FILE *file ATTRIBUTE_UNUSED) icount++; } - fprintf (file, "\n;; total ref usage %d{%dd,%du,%de} in %d{%d regular + %d call} insns.\n", + fprintf (file, "\n;; total ref usage %d{%dd,%du,%de} in %d{%d regular + %d call} insns.\n", dcount + ucount + ecount, dcount, ucount, ecount, icount + ccount, icount, ccount); } /* Dump the bb_info for a given basic block. */ -static void +static void df_scan_start_block (basic_block bb, FILE *file) { struct df_scan_bb_info *bb_info @@ -527,8 +527,8 @@ static struct df_problem problem_SCAN = NULL, /* Local compute function. */ NULL, /* Init the solution specific data. */ NULL, /* Iterative solver. */ - NULL, /* Confluence operator 0. */ - NULL, /* Confluence operator n. */ + NULL, /* Confluence operator 0. */ + NULL, /* Confluence operator n. */ NULL, /* Transfer function. */ NULL, /* Finalize function. */ df_scan_free, /* Free all of the problem information. */ @@ -562,12 +562,12 @@ df_scan_add_problem (void) /* First, grow the reg_info information. If the current size is less than the number of pseudos, grow to 25% more than the number of - pseudos. + pseudos. Second, assure that all of the slots up to max_reg_num have been filled with reg_info structures. */ -void +void df_grow_reg_info (void) { unsigned int max_reg = max_reg_num (); @@ -608,14 +608,14 @@ df_grow_reg_info (void) df->use_info.begin[i] = 0; df->use_info.count[i] = 0; } - + df->regs_inited = max_reg; } /* Grow the ref information. */ -static void +static void df_grow_ref_info (struct df_ref_info *ref_info, unsigned int new_size) { if (ref_info->refs_size < new_size) @@ -634,7 +634,7 @@ df_grow_ref_info (struct df_ref_info *ref_info, unsigned int new_size) ref_info->total_size. */ static void -df_check_and_grow_ref_info (struct df_ref_info *ref_info, +df_check_and_grow_ref_info (struct df_ref_info *ref_info, unsigned bitmap_addend) { if (ref_info->refs_size < ref_info->total_size + bitmap_addend) @@ -650,7 +650,7 @@ df_check_and_grow_ref_info (struct df_ref_info *ref_info, number of instructions, grow to 25% more than the number of instructions. */ -void +void df_grow_insn_info (void) { unsigned int new_size = get_max_uid () + 1; @@ -685,7 +685,7 @@ df_scan_blocks (void) df_get_regular_block_artificial_uses (df->regular_block_artificial_uses); df_get_eh_block_artificial_uses (df->eh_block_artificial_uses); - bitmap_ior_into (df->eh_block_artificial_uses, + bitmap_ior_into (df->eh_block_artificial_uses, df->regular_block_artificial_uses); /* ENTRY and EXIT blocks have special defs/uses. */ @@ -706,17 +706,17 @@ df_scan_blocks (void) /* Create a new ref of type DF_REF_TYPE for register REG at address - LOC within INSN of BB. This function is only used externally. + LOC within INSN of BB. This function is only used externally. If the REF_FLAGS field contain DF_REF_SIGN_EXTRACT or DF_REF_ZERO_EXTRACT. WIDTH, OFFSET and MODE are used to access the fields if they were constants. Otherwise they should be -1 if those flags were set. */ -df_ref -df_ref_create (rtx reg, rtx *loc, rtx insn, +df_ref +df_ref_create (rtx reg, rtx *loc, rtx insn, basic_block bb, - enum df_ref_type ref_type, + enum df_ref_type ref_type, int ref_flags, int width, int offset, enum machine_mode mode) { @@ -741,7 +741,7 @@ df_ref_create (rtx reg, rtx *loc, rtx insn, else cl = DF_REF_BASE; ref = df_ref_create_structure (cl, NULL, reg, loc, bb, DF_INSN_INFO_GET (insn), - ref_type, ref_flags, + ref_type, ref_flags, width, offset, mode); if (DF_REF_REG_DEF_P (ref)) @@ -781,7 +781,7 @@ df_ref_create (rtx reg, rtx *loc, rtx insn, add_to_table = bitmap_bit_p (df->blocks_to_analyze, bb->index); df_install_ref (ref, reg_info[DF_REF_REGNO (ref)], ref_info, add_to_table); - + if (add_to_table) switch (ref_info->ref_order) { @@ -828,7 +828,7 @@ df_ref_create (rtx reg, rtx *loc, rtx insn, #endif /* By adding the ref directly, df_insn_rescan my not find any differences even though the block will have changed. So we need - to mark the block dirty ourselves. */ + to mark the block dirty ourselves. */ if (!DEBUG_INSN_P (DF_REF_INSN (ref))) df_set_bb_dirty (bb); @@ -872,9 +872,9 @@ df_free_ref (df_ref ref) Also delete the def-use or use-def chain if it exists. */ static void -df_reg_chain_unlink (df_ref ref) +df_reg_chain_unlink (df_ref ref) { - df_ref next = DF_REF_NEXT_REG (ref); + df_ref next = DF_REF_NEXT_REG (ref); df_ref prev = DF_REF_PREV_REG (ref); int id = DF_REF_ID (ref); struct df_reg_info *reg_info; @@ -886,7 +886,7 @@ df_reg_chain_unlink (df_ref ref) reg_info = DF_REG_DEF_GET (regno); refs = df->def_info.refs; } - else + else { if (DF_REF_FLAGS (ref) & DF_REF_IN_NOTE) { @@ -919,7 +919,7 @@ df_reg_chain_unlink (df_ref ref) else refs[id] = NULL; } - + /* Delete any def-use or use-def chains that start here. It is possible that there is trash in this field. This happens for insns that have been deleted when rescanning has been deferred @@ -927,7 +927,7 @@ df_reg_chain_unlink (df_ref ref) code skips deleted insns. */ if (df_chain && DF_REF_CHAIN (ref)) df_chain_unlink (ref); - + reg_info->n_refs--; if (DF_REF_FLAGS_IS_SET (ref, DF_HARD_REG_LIVE)) { @@ -962,7 +962,7 @@ df_ref_compress_rec (df_ref **vec_ptr, df_ref ref) { while (*vec && *vec != ref) vec++; - + while (*vec) { *vec = *(vec+1); @@ -994,7 +994,7 @@ df_ref_remove (df_ref ref) { if (DF_REF_IS_ARTIFICIAL (ref)) { - struct df_scan_bb_info *bb_info + struct df_scan_bb_info *bb_info = df_scan_get_bb_info (DF_REF_BBNO (ref)); df_ref_compress_rec (&bb_info->artificial_defs, ref); } @@ -1009,11 +1009,11 @@ df_ref_remove (df_ref ref) { if (DF_REF_IS_ARTIFICIAL (ref)) { - struct df_scan_bb_info *bb_info + struct df_scan_bb_info *bb_info = df_scan_get_bb_info (DF_REF_BBNO (ref)); df_ref_compress_rec (&bb_info->artificial_uses, ref); } - else + else { unsigned int uid = DF_REF_INSN_UID (ref); struct df_insn_info *insn_rec = DF_INSN_UID_GET (uid); @@ -1027,7 +1027,7 @@ df_ref_remove (df_ref ref) /* By deleting the ref directly, df_insn_rescan my not find any differences even though the block will have changed. So we need - to mark the block dirty ourselves. */ + to mark the block dirty ourselves. */ if (!DEBUG_INSN_P (DF_REF_INSN (ref))) df_set_bb_dirty (DF_REF_BB (ref)); df_reg_chain_unlink (ref); @@ -1065,7 +1065,7 @@ df_ref_chain_delete_du_chain (df_ref *ref_rec) while (*ref_rec) { df_ref ref = *ref_rec; - /* CHAIN is allocated by DF_CHAIN. So make sure to + /* CHAIN is allocated by DF_CHAIN. So make sure to pass df_scan instance for the problem. */ if (DF_REF_CHAIN (ref)) df_chain_unlink (ref); @@ -1117,7 +1117,7 @@ df_mw_hardreg_chain_delete (struct df_mw_hardreg **hardregs) except when called from df_process_deferred_rescans to mark the block as dirty. */ -void +void df_insn_delete (basic_block bb, unsigned int uid) { struct df_insn_info *insn_info = NULL; @@ -1157,7 +1157,7 @@ df_insn_delete (basic_block bb, unsigned int uid) bitmap_clear_bit (df->insns_to_notes_rescan, uid); if (insn_info) { - struct df_scan_problem_data *problem_data + struct df_scan_problem_data *problem_data = (struct df_scan_problem_data *) df_scan->problem_data; /* In general, notes do not have the insn_info fields @@ -1168,14 +1168,14 @@ df_insn_delete (basic_block bb, unsigned int uid) if (insn_info->defs) { df_mw_hardreg_chain_delete (insn_info->mw_hardregs); - + if (df_chain) { df_ref_chain_delete_du_chain (insn_info->defs); - df_ref_chain_delete_du_chain (insn_info->uses); + df_ref_chain_delete_du_chain (insn_info->uses); df_ref_chain_delete_du_chain (insn_info->eq_uses); } - + df_ref_chain_delete (insn_info->defs); df_ref_chain_delete (insn_info->uses); df_ref_chain_delete (insn_info->eq_uses); @@ -1192,7 +1192,7 @@ static void df_free_collection_rec (struct df_collection_rec *collection_rec) { unsigned int ix; - struct df_scan_problem_data *problem_data + struct df_scan_problem_data *problem_data = (struct df_scan_problem_data *) df_scan->problem_data; df_ref ref; struct df_mw_hardreg *mw; @@ -1216,7 +1216,7 @@ df_free_collection_rec (struct df_collection_rec *collection_rec) /* Rescan INSN. Return TRUE if the rescanning produced any changes. */ -bool +bool df_insn_rescan (rtx insn) { unsigned int uid = INSN_UID (insn); @@ -1256,7 +1256,7 @@ df_insn_rescan (rtx insn) } if (dump_file) fprintf (dump_file, "deferring rescan insn with uid = %d.\n", uid); - + bitmap_clear_bit (df->insns_to_delete, uid); bitmap_clear_bit (df->insns_to_notes_rescan, uid); bitmap_set_bit (df->insns_to_rescan, INSN_UID (insn)); @@ -1382,13 +1382,13 @@ df_insn_rescan_all (void) bitmap_iterator bi; unsigned int uid; bitmap tmp = BITMAP_ALLOC (&df_bitmap_obstack); - + if (df->changeable_flags & DF_NO_INSN_RESCAN) { df_clear_flags (DF_NO_INSN_RESCAN); no_insn_rescan = true; } - + if (df->changeable_flags & DF_DEFER_INSN_RESCAN) { df_clear_flags (DF_DEFER_INSN_RESCAN); @@ -1408,7 +1408,7 @@ df_insn_rescan_all (void) bitmap_clear (df->insns_to_rescan); bitmap_clear (df->insns_to_notes_rescan); - FOR_EACH_BB (bb) + FOR_EACH_BB (bb) { rtx insn; FOR_BB_INSNS (bb, insn) @@ -1434,13 +1434,13 @@ df_process_deferred_rescans (void) bitmap_iterator bi; unsigned int uid; bitmap tmp = BITMAP_ALLOC (&df_bitmap_obstack); - + if (df->changeable_flags & DF_NO_INSN_RESCAN) { df_clear_flags (DF_NO_INSN_RESCAN); no_insn_rescan = true; } - + if (df->changeable_flags & DF_DEFER_INSN_RESCAN) { df_clear_flags (DF_DEFER_INSN_RESCAN); @@ -1502,13 +1502,13 @@ df_process_deferred_rescans (void) INCLUDE_EQ_USES. */ static unsigned int -df_count_refs (bool include_defs, bool include_uses, +df_count_refs (bool include_defs, bool include_uses, bool include_eq_uses) { unsigned int regno; int size = 0; unsigned int m = df->regs_inited; - + for (regno = 0; regno < m; regno++) { if (include_defs) @@ -1526,10 +1526,10 @@ df_count_refs (bool include_defs, bool include_uses, or reg-def chains. This version processes the refs in reg order which is likely to be best if processing the whole function. */ -static void +static void df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, - bool include_defs, - bool include_uses, + bool include_defs, + bool include_uses, bool include_eq_uses) { unsigned int m = df->regs_inited; @@ -1546,7 +1546,7 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, else start = 0; - ref_info->total_size + ref_info->total_size = df_count_refs (include_defs, include_uses, include_eq_uses); df_check_and_grow_ref_info (ref_info, 1); @@ -1558,7 +1558,7 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, if (include_defs) { df_ref ref = DF_REG_DEF_CHAIN (regno); - while (ref) + while (ref) { ref_info->refs[offset] = ref; DF_REF_ID (ref) = offset++; @@ -1570,7 +1570,7 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, if (include_uses) { df_ref ref = DF_REG_USE_CHAIN (regno); - while (ref) + while (ref) { ref_info->refs[offset] = ref; DF_REF_ID (ref) = offset++; @@ -1582,7 +1582,7 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, if (include_eq_uses) { df_ref ref = DF_REG_EQ_USE_CHAIN (regno); - while (ref) + while (ref) { ref_info->refs[offset] = ref; DF_REF_ID (ref) = offset++; @@ -1593,7 +1593,7 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, } ref_info->count[regno] = count; } - + /* The bitmap size is not decremented when refs are deleted. So reset it now that we have squished out all of the empty slots. */ @@ -1606,10 +1606,10 @@ df_reorganize_refs_by_reg_by_reg (struct df_ref_info *ref_info, which is likely to be best if processing some segment of the function. */ -static void +static void df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, - bool include_defs, - bool include_uses, + bool include_defs, + bool include_uses, bool include_eq_uses) { bitmap_iterator bi; @@ -1617,7 +1617,7 @@ df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, unsigned int m = df->regs_inited; unsigned int offset = 0; unsigned int r; - unsigned int start + unsigned int start = (df->changeable_flags & DF_NO_HARD_REGS) ? FIRST_PSEUDO_REGISTER : 0; memset (ref_info->begin, 0, sizeof (int) * df->regs_inited); @@ -1650,7 +1650,7 @@ df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, if (INSN_P (insn)) { unsigned int uid = INSN_UID (insn); - + if (include_defs) for (ref_rec = DF_INSN_UID_DEFS (uid); *ref_rec; ref_rec++) { @@ -1679,7 +1679,7 @@ df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, offset += ref_info->count[r]; ref_info->count[r] = 0; } - + EXECUTE_IF_SET_IN_BITMAP (df->blocks_to_analyze, 0, bb_index, bi) { basic_block bb = BASIC_BLOCK (bb_index); @@ -1718,7 +1718,7 @@ df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, if (INSN_P (insn)) { unsigned int uid = INSN_UID (insn); - + if (include_defs) for (ref_rec = DF_INSN_UID_DEFS (uid); *ref_rec; ref_rec++) { @@ -1772,25 +1772,25 @@ df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info, /* Take build ref table for either the uses or defs from the reg-use or reg-def chains. */ -static void +static void df_reorganize_refs_by_reg (struct df_ref_info *ref_info, - bool include_defs, - bool include_uses, + bool include_defs, + bool include_uses, bool include_eq_uses) { if (df->analyze_subset) - df_reorganize_refs_by_reg_by_insn (ref_info, include_defs, + df_reorganize_refs_by_reg_by_insn (ref_info, include_defs, include_uses, include_eq_uses); else - df_reorganize_refs_by_reg_by_reg (ref_info, include_defs, + df_reorganize_refs_by_reg_by_reg (ref_info, include_defs, include_uses, include_eq_uses); } /* Add the refs in REF_VEC to the table in REF_INFO starting at OFFSET. */ -static unsigned int -df_add_refs_to_table (unsigned int offset, - struct df_ref_info *ref_info, +static unsigned int +df_add_refs_to_table (unsigned int offset, + struct df_ref_info *ref_info, df_ref *ref_vec) { while (*ref_vec) @@ -1813,18 +1813,18 @@ df_add_refs_to_table (unsigned int offset, eq_uses if INCLUDE_EQ_USES. */ static unsigned int -df_reorganize_refs_by_insn_bb (basic_block bb, unsigned int offset, +df_reorganize_refs_by_insn_bb (basic_block bb, unsigned int offset, struct df_ref_info *ref_info, - bool include_defs, bool include_uses, + bool include_defs, bool include_uses, bool include_eq_uses) { rtx insn; if (include_defs) - offset = df_add_refs_to_table (offset, ref_info, + offset = df_add_refs_to_table (offset, ref_info, df_get_artificial_defs (bb->index)); if (include_uses) - offset = df_add_refs_to_table (offset, ref_info, + offset = df_add_refs_to_table (offset, ref_info, df_get_artificial_uses (bb->index)); FOR_BB_INSNS (bb, insn) @@ -1832,13 +1832,13 @@ df_reorganize_refs_by_insn_bb (basic_block bb, unsigned int offset, { unsigned int uid = INSN_UID (insn); if (include_defs) - offset = df_add_refs_to_table (offset, ref_info, + offset = df_add_refs_to_table (offset, ref_info, DF_INSN_UID_DEFS (uid)); if (include_uses) - offset = df_add_refs_to_table (offset, ref_info, + offset = df_add_refs_to_table (offset, ref_info, DF_INSN_UID_USES (uid)); if (include_eq_uses) - offset = df_add_refs_to_table (offset, ref_info, + offset = df_add_refs_to_table (offset, ref_info, DF_INSN_UID_EQ_USES (uid)); } return offset; @@ -1852,7 +1852,7 @@ df_reorganize_refs_by_insn_bb (basic_block bb, unsigned int offset, static void df_reorganize_refs_by_insn (struct df_ref_info *ref_info, - bool include_defs, bool include_uses, + bool include_defs, bool include_uses, bool include_eq_uses) { basic_block bb; @@ -1867,8 +1867,8 @@ df_reorganize_refs_by_insn (struct df_ref_info *ref_info, EXECUTE_IF_SET_IN_BITMAP (df->blocks_to_analyze, 0, index, bi) { - offset = df_reorganize_refs_by_insn_bb (BASIC_BLOCK (index), offset, ref_info, - include_defs, include_uses, + offset = df_reorganize_refs_by_insn_bb (BASIC_BLOCK (index), offset, ref_info, + include_defs, include_uses, include_eq_uses); } @@ -1877,8 +1877,8 @@ df_reorganize_refs_by_insn (struct df_ref_info *ref_info, else { FOR_ALL_BB (bb) - offset = df_reorganize_refs_by_insn_bb (bb, offset, ref_info, - include_defs, include_uses, + offset = df_reorganize_refs_by_insn_bb (bb, offset, ref_info, + include_defs, include_uses, include_eq_uses); ref_info->table_size = offset; } @@ -1887,7 +1887,7 @@ df_reorganize_refs_by_insn (struct df_ref_info *ref_info, /* If the use refs in DF are not organized, reorganize them. */ -void +void df_maybe_reorganize_use_refs (enum df_ref_order order) { if (order == df->use_info.ref_order) @@ -1922,14 +1922,14 @@ df_maybe_reorganize_use_refs (enum df_ref_order order) gcc_unreachable (); break; } - + df->use_info.ref_order = order; } /* If the def refs in DF are not organized, reorganize them. */ -void +void df_maybe_reorganize_def_refs (enum df_ref_order order) { if (order == df->def_info.ref_order) @@ -1958,14 +1958,14 @@ df_maybe_reorganize_def_refs (enum df_ref_order order) gcc_unreachable (); break; } - + df->def_info.ref_order = order; } /* Change all of the basic block references in INSN to use the insn's - current basic block. This function is called from routines that move - instructions from one block to another. */ + current basic block. This function is called from routines that move + instructions from one block to another. */ void df_insn_change_bb (rtx insn, basic_block new_bb) @@ -2001,7 +2001,7 @@ df_insn_change_bb (rtx insn, basic_block new_bb) if (old_bb) { if (dump_file) - fprintf (dump_file, " from %d to %d\n", + fprintf (dump_file, " from %d to %d\n", old_bb->index, new_bb->index); df_set_bb_dirty (old_bb); } @@ -2014,7 +2014,7 @@ df_insn_change_bb (rtx insn, basic_block new_bb) /* Helper function for df_ref_change_reg_with_loc. */ static void -df_ref_change_reg_with_loc_1 (struct df_reg_info *old_df, +df_ref_change_reg_with_loc_1 (struct df_reg_info *old_df, struct df_reg_info *new_df, int new_regno, rtx loc) { @@ -2062,11 +2062,11 @@ df_ref_change_reg_with_loc_1 (struct df_reg_info *old_df, else ref_vec = insn_info->uses; if (dump_file) - fprintf (dump_file, "changing reg in insn %d\n", - DF_REF_INSN_UID (the_ref)); - + fprintf (dump_file, "changing reg in insn %d\n", + DF_REF_INSN_UID (the_ref)); + ref_vec_t = ref_vec; - + /* Find the length. */ while (*ref_vec_t) { @@ -2096,11 +2096,11 @@ df_ref_change_reg_with_loc (int old_regno, int new_regno, rtx loc) df_grow_reg_info (); - df_ref_change_reg_with_loc_1 (DF_REG_DEF_GET (old_regno), + df_ref_change_reg_with_loc_1 (DF_REG_DEF_GET (old_regno), DF_REG_DEF_GET (new_regno), new_regno, loc); - df_ref_change_reg_with_loc_1 (DF_REG_USE_GET (old_regno), + df_ref_change_reg_with_loc_1 (DF_REG_USE_GET (old_regno), DF_REG_USE_GET (new_regno), new_regno, loc); - df_ref_change_reg_with_loc_1 (DF_REG_EQ_USE_GET (old_regno), + df_ref_change_reg_with_loc_1 (DF_REG_EQ_USE_GET (old_regno), DF_REG_EQ_USE_GET (new_regno), new_regno, loc); } @@ -2113,7 +2113,7 @@ df_mw_hardreg_chain_delete_eq_uses (struct df_insn_info *insn_info) struct df_mw_hardreg **mw_vec = insn_info->mw_hardregs; unsigned int deleted = 0; unsigned int count = 0; - struct df_scan_problem_data *problem_data + struct df_scan_problem_data *problem_data = (struct df_scan_problem_data *) df_scan->problem_data; if (!*mw_vec) @@ -2130,7 +2130,7 @@ df_mw_hardreg_chain_delete_eq_uses (struct df_insn_info *insn_info) /* Shove the remaining ones down one to fill the gap. While this looks n**2, it is highly unusual to have any mw regs in eq_notes and the chances of more than one are almost - non existent. */ + non existent. */ while (*temp_vec) { *temp_vec = *(temp_vec + 1); @@ -2190,7 +2190,7 @@ df_notes_rescan (rtx insn) insn_info->eq_uses = df_null_ref_rec; insn_info->mw_hardregs = df_null_mw_rec; } - + bitmap_clear_bit (df->insns_to_delete, uid); /* If the insn is set to be rescanned, it does not need to also be notes rescanned. */ @@ -2253,22 +2253,22 @@ df_notes_rescan (rtx insn) expanding it if necessary. */ if (mw_len > num_deleted) { - insn_info->mw_hardregs = + insn_info->mw_hardregs = XRESIZEVEC (struct df_mw_hardreg *, insn_info->mw_hardregs, count + 1 + mw_len); } memcpy (&insn_info->mw_hardregs[count], - VEC_address (df_mw_hardreg_ptr, collection_rec.mw_vec), + VEC_address (df_mw_hardreg_ptr, collection_rec.mw_vec), mw_len * sizeof (struct df_mw_hardreg *)); insn_info->mw_hardregs[count + mw_len] = NULL; - qsort (insn_info->mw_hardregs, count + mw_len, + qsort (insn_info->mw_hardregs, count + mw_len, sizeof (struct df_mw_hardreg *), df_mw_compare); } else { - /* No vector there. */ - insn_info->mw_hardregs + /* No vector there. */ + insn_info->mw_hardregs = XNEWVEC (struct df_mw_hardreg*, 1 + mw_len); memcpy (insn_info->mw_hardregs, VEC_address (df_mw_hardreg_ptr, collection_rec.mw_vec), @@ -2294,7 +2294,7 @@ df_notes_rescan (rtx insn) ----------------------------------------------------------------------------*/ -/* Return true if the contents of two df_ref's are identical. +/* Return true if the contents of two df_ref's are identical. It ignores DF_REF_MARKER. */ static bool @@ -2302,7 +2302,7 @@ df_ref_equal_p (df_ref ref1, df_ref ref2) { if (!ref2) return false; - + if (ref1 == ref2) return true; @@ -2310,12 +2310,12 @@ df_ref_equal_p (df_ref ref1, df_ref ref2) || DF_REF_REGNO (ref1) != DF_REF_REGNO (ref2) || DF_REF_REG (ref1) != DF_REF_REG (ref2) || DF_REF_TYPE (ref1) != DF_REF_TYPE (ref2) - || ((DF_REF_FLAGS (ref1) & ~(DF_REF_REG_MARKER + DF_REF_MW_HARDREG)) + || ((DF_REF_FLAGS (ref1) & ~(DF_REF_REG_MARKER + DF_REF_MW_HARDREG)) != (DF_REF_FLAGS (ref2) & ~(DF_REF_REG_MARKER + DF_REF_MW_HARDREG))) || DF_REF_BB (ref1) != DF_REF_BB (ref2) || DF_REF_INSN_INFO (ref1) != DF_REF_INSN_INFO (ref2)) return false; - + switch (DF_REF_CLASS (ref1)) { case DF_REF_ARTIFICIAL: @@ -2357,7 +2357,7 @@ df_ref_compare (const void *r1, const void *r2) if (DF_REF_REGNO (ref1) != DF_REF_REGNO (ref2)) return (int)DF_REF_REGNO (ref1) - (int)DF_REF_REGNO (ref2); - + if (DF_REF_TYPE (ref1) != DF_REF_TYPE (ref2)) return (int)DF_REF_TYPE (ref1) - (int)DF_REF_TYPE (ref2); @@ -2439,7 +2439,7 @@ df_sort_and_compress_refs (VEC(df_ref,stack) **ref_vec) which is the most common case for large COUNT case (which happens for CALL INSNs), no need to sort and filter out duplicate. - Simply return the count. + Simply return the count. Make sure DF_GET_ADD_REFS adds refs in the increasing order of DF_REF_COMPARE. */ if (i == count - 1) @@ -2469,7 +2469,7 @@ df_sort_and_compress_refs (VEC(df_ref,stack) **ref_vec) } -/* Return true if the contents of two df_ref's are identical. +/* Return true if the contents of two df_ref's are identical. It ignores DF_REF_MARKER. */ static bool @@ -2522,7 +2522,7 @@ static void df_sort_and_compress_mws (VEC(df_mw_hardreg_ptr,stack) **mw_vec) { unsigned int count; - struct df_scan_problem_data *problem_data + struct df_scan_problem_data *problem_data = (struct df_scan_problem_data *) df_scan->problem_data; unsigned int i; unsigned int dist = 0; @@ -2585,8 +2585,8 @@ df_canonize_collection_rec (struct df_collection_rec *collection_rec) /* Add the new df_ref to appropriate reg_info/ref_info chains. */ static void -df_install_ref (df_ref this_ref, - struct df_reg_info *reg_info, +df_install_ref (df_ref this_ref, + struct df_reg_info *reg_info, struct df_ref_info *ref_info, bool add_to_table) { @@ -2613,7 +2613,7 @@ df_install_ref (df_ref this_ref, if (head) DF_REF_PREV_REG (head) = this_ref; - + if (add_to_table) { gcc_assert (ref_info->ref_order != DF_REF_ORDER_NO_TABLE); @@ -2622,10 +2622,10 @@ df_install_ref (df_ref this_ref, /* Add the ref to the big array of defs. */ ref_info->refs[ref_info->table_size] = this_ref; ref_info->table_size++; - } + } else DF_REF_ID (this_ref) = -1; - + ref_info->total_size++; } @@ -2637,7 +2637,7 @@ df_install_ref (df_ref this_ref, static df_ref * df_install_refs (basic_block bb, VEC(df_ref,stack)* old_vec, - struct df_reg_info **reg_info, + struct df_reg_info **reg_info, struct df_ref_info *ref_info, bool is_notes) { @@ -2677,10 +2677,10 @@ df_install_refs (basic_block bb, for (ix = 0; VEC_iterate (df_ref, old_vec, ix, this_ref); ++ix) { new_vec[ix] = this_ref; - df_install_ref (this_ref, reg_info[DF_REF_REGNO (this_ref)], + df_install_ref (this_ref, reg_info[DF_REF_REGNO (this_ref)], ref_info, add_to_table); } - + new_vec[count] = NULL; return new_vec; } @@ -2700,9 +2700,9 @@ df_install_mws (VEC(df_mw_hardreg_ptr,stack) *old_vec) count = VEC_length (df_mw_hardreg_ptr, old_vec); if (count) { - struct df_mw_hardreg **new_vec + struct df_mw_hardreg **new_vec = XNEWVEC (struct df_mw_hardreg*, count + 1); - memcpy (new_vec, VEC_address (df_mw_hardreg_ptr, old_vec), + memcpy (new_vec, VEC_address (df_mw_hardreg_ptr, old_vec), sizeof (struct df_mw_hardreg*) * count); new_vec[count] = NULL; return new_vec; @@ -2716,7 +2716,7 @@ df_install_mws (VEC(df_mw_hardreg_ptr,stack) *old_vec) chains and update other necessary information. */ static void -df_refs_add_to_chains (struct df_collection_rec *collection_rec, +df_refs_add_to_chains (struct df_collection_rec *collection_rec, basic_block bb, rtx insn) { if (insn) @@ -2728,7 +2728,7 @@ df_refs_add_to_chains (struct df_collection_rec *collection_rec, if (collection_rec->def_vec) { df_scan_free_ref_vec (insn_rec->defs); - insn_rec->defs + insn_rec->defs = df_install_refs (bb, collection_rec->def_vec, df->def_regs, &df->def_info, false); @@ -2736,23 +2736,23 @@ df_refs_add_to_chains (struct df_collection_rec *collection_rec, if (collection_rec->use_vec) { df_scan_free_ref_vec (insn_rec->uses); - insn_rec->uses - = df_install_refs (bb, collection_rec->use_vec, + insn_rec->uses + = df_install_refs (bb, collection_rec->use_vec, df->use_regs, &df->use_info, false); } if (collection_rec->eq_use_vec) { df_scan_free_ref_vec (insn_rec->eq_uses); - insn_rec->eq_uses - = df_install_refs (bb, collection_rec->eq_use_vec, + insn_rec->eq_uses + = df_install_refs (bb, collection_rec->eq_use_vec, df->eq_use_regs, &df->use_info, true); } if (collection_rec->mw_vec) { df_scan_free_mws_vec (insn_rec->mw_hardregs); - insn_rec->mw_hardregs + insn_rec->mw_hardregs = df_install_mws (collection_rec->mw_vec); } } @@ -2761,32 +2761,32 @@ df_refs_add_to_chains (struct df_collection_rec *collection_rec, struct df_scan_bb_info *bb_info = df_scan_get_bb_info (bb->index); df_scan_free_ref_vec (bb_info->artificial_defs); - bb_info->artificial_defs + bb_info->artificial_defs = df_install_refs (bb, collection_rec->def_vec, df->def_regs, &df->def_info, false); df_scan_free_ref_vec (bb_info->artificial_uses); - bb_info->artificial_uses - = df_install_refs (bb, collection_rec->use_vec, + bb_info->artificial_uses + = df_install_refs (bb, collection_rec->use_vec, df->use_regs, &df->use_info, false); } } -/* Allocate a ref and initialize its fields. +/* Allocate a ref and initialize its fields. If the REF_FLAGS field contain DF_REF_SIGN_EXTRACT or DF_REF_ZERO_EXTRACT. WIDTH, OFFSET and MODE are used to access the fields if they were constants. Otherwise they should be -1 if those flags were set. */ -static df_ref -df_ref_create_structure (enum df_ref_class cl, +static df_ref +df_ref_create_structure (enum df_ref_class cl, struct df_collection_rec *collection_rec, - rtx reg, rtx *loc, + rtx reg, rtx *loc, basic_block bb, struct df_insn_info *info, - enum df_ref_type ref_type, + enum df_ref_type ref_type, int ref_flags, int width, int offset, enum machine_mode mode) { @@ -2842,7 +2842,7 @@ df_ref_create_structure (enum df_ref_class cl, DF_REF_FLAGS_CLEAR (this_ref, DF_HARD_REG_LIVE); /* See if this ref needs to have DF_HARD_REG_LIVE bit set. */ - if ((regno < FIRST_PSEUDO_REGISTER) + if ((regno < FIRST_PSEUDO_REGISTER) && (!DF_REF_IS_ARTIFICIAL (this_ref))) { if (DF_REF_REG_DEF_P (this_ref)) @@ -2871,7 +2871,7 @@ df_ref_create_structure (enum df_ref_class cl, /* Create new references of type DF_REF_TYPE for each part of register REG - at address LOC within INSN of BB. + at address LOC within INSN of BB. If the REF_FLAGS field contain DF_REF_SIGN_EXTRACT or DF_REF_ZERO_EXTRACT. WIDTH, OFFSET and MODE are used to access the @@ -2880,13 +2880,13 @@ df_ref_create_structure (enum df_ref_class cl, static void -df_ref_record (enum df_ref_class cl, +df_ref_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, - rtx reg, rtx *loc, + rtx reg, rtx *loc, basic_block bb, struct df_insn_info *insn_info, - enum df_ref_type ref_type, + enum df_ref_type ref_type, int ref_flags, - int width, int offset, enum machine_mode mode) + int width, int offset, enum machine_mode mode) { unsigned int regno; @@ -2916,7 +2916,7 @@ df_ref_record (enum df_ref_class cl, and REG_UNUSED notes. */ if ((endregno != regno + 1) && insn_info) { - /* Sets to a subreg of a multiword register are partial. + /* Sets to a subreg of a multiword register are partial. Sets to a non-subreg of a multiword register are not. */ if (GET_CODE (reg) == SUBREG) ref_flags |= DF_REF_PARTIAL; @@ -2935,8 +2935,8 @@ df_ref_record (enum df_ref_class cl, for (i = regno; i < endregno; i++) { - ref = df_ref_create_structure (cl, collection_rec, regno_reg_rtx[i], loc, - bb, insn_info, ref_type, ref_flags, + ref = df_ref_create_structure (cl, collection_rec, regno_reg_rtx[i], loc, + bb, insn_info, ref_type, ref_flags, width, offset, mode); gcc_assert (ORIGINAL_REGNO (DF_REF_REG (ref)) == i); @@ -2944,7 +2944,7 @@ df_ref_record (enum df_ref_class cl, } else { - df_ref_create_structure (cl, collection_rec, reg, loc, bb, insn_info, + df_ref_create_structure (cl, collection_rec, reg, loc, bb, insn_info, ref_type, ref_flags, width, offset, mode); } } @@ -3003,8 +3003,8 @@ df_def_record_1 (struct df_collection_rec *collection_rec, if (GET_CODE (temp) == EXPR_LIST || GET_CODE (temp) == CLOBBER || GET_CODE (temp) == SET) df_def_record_1 (collection_rec, - temp, bb, insn_info, - GET_CODE (temp) == CLOBBER + temp, bb, insn_info, + GET_CODE (temp) == CLOBBER ? flags | DF_REF_MUST_CLOBBER : flags); } return; @@ -3021,7 +3021,7 @@ df_def_record_1 (struct df_collection_rec *collection_rec, if (GET_CODE (dst) == ZERO_EXTRACT) { flags |= DF_REF_READ_WRITE | DF_REF_PARTIAL | DF_REF_ZERO_EXTRACT; - + if (CONST_INT_P (XEXP (dst, 1)) && CONST_INT_P (XEXP (dst, 2))) { @@ -3038,15 +3038,15 @@ df_def_record_1 (struct df_collection_rec *collection_rec, /* At this point if we do not have a reg or a subreg, just return. */ if (REG_P (dst)) { - df_ref_record (cl, collection_rec, - dst, loc, bb, insn_info, DF_REF_REG_DEF, flags, + df_ref_record (cl, collection_rec, + dst, loc, bb, insn_info, DF_REF_REG_DEF, flags, width, offset, mode); /* We want to keep sp alive everywhere - by making all writes to sp also use of sp. */ if (REGNO (dst) == STACK_POINTER_REGNUM) df_ref_record (DF_REF_BASE, collection_rec, - dst, NULL, bb, insn_info, DF_REF_REG_USE, flags, + dst, NULL, bb, insn_info, DF_REF_REG_USE, flags, width, offset, mode); } else if (GET_CODE (dst) == SUBREG && REG_P (SUBREG_REG (dst))) @@ -3056,8 +3056,8 @@ df_def_record_1 (struct df_collection_rec *collection_rec, flags |= DF_REF_SUBREG; - df_ref_record (cl, collection_rec, - dst, loc, bb, insn_info, DF_REF_REG_DEF, flags, + df_ref_record (cl, collection_rec, + dst, loc, bb, insn_info, DF_REF_REG_DEF, flags, width, offset, mode); } } @@ -3066,7 +3066,7 @@ df_def_record_1 (struct df_collection_rec *collection_rec, /* Process all the registers defined in the pattern rtx, X. */ static void -df_defs_record (struct df_collection_rec *collection_rec, +df_defs_record (struct df_collection_rec *collection_rec, rtx x, basic_block bb, struct df_insn_info *insn_info, int flags) { @@ -3081,7 +3081,7 @@ df_defs_record (struct df_collection_rec *collection_rec, } else if (code == COND_EXEC) { - df_defs_record (collection_rec, COND_EXEC_CODE (x), + df_defs_record (collection_rec, COND_EXEC_CODE (x), bb, insn_info, DF_REF_CONDITIONAL); } else if (code == PARALLEL) @@ -3095,7 +3095,7 @@ df_defs_record (struct df_collection_rec *collection_rec, } -/* Process all the registers used in the rtx at address LOC. +/* Process all the registers used in the rtx at address LOC. If the REF_FLAGS field contain DF_REF_SIGN_EXTRACT or DF_REF_ZERO_EXTRACT. WIDTH, OFFSET and MODE are used to access the @@ -3147,8 +3147,8 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, case MEM: df_uses_record (cl, collection_rec, - &XEXP (x, 0), DF_REF_REG_MEM_LOAD, - bb, insn_info, flags & DF_REF_IN_NOTE, + &XEXP (x, 0), DF_REF_REG_MEM_LOAD, + bb, insn_info, flags & DF_REF_IN_NOTE, width, offset, mode); return; @@ -3159,16 +3159,16 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, if (!REG_P (SUBREG_REG (x))) { loc = &SUBREG_REG (x); - df_uses_record (cl, collection_rec, loc, ref_type, bb, insn_info, flags, + df_uses_record (cl, collection_rec, loc, ref_type, bb, insn_info, flags, width, offset, mode); return; } /* ... Fall through ... */ case REG: - df_ref_record (cl, collection_rec, + df_ref_record (cl, collection_rec, x, loc, bb, insn_info, - ref_type, flags, + ref_type, flags, width, offset, mode); return; @@ -3191,7 +3191,7 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, flags |= DF_REF_SIGN_EXTRACT; df_uses_record (DF_REF_EXTRACT, collection_rec, - &XEXP (x, 0), ref_type, bb, insn_info, flags, + &XEXP (x, 0), ref_type, bb, insn_info, flags, width, offset, mode); return; } @@ -3203,7 +3203,7 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, rtx dst = SET_DEST (x); gcc_assert (!(flags & DF_REF_IN_NOTE)); df_uses_record (cl, collection_rec, - &SET_SRC (x), DF_REF_REG_USE, bb, insn_info, flags, + &SET_SRC (x), DF_REF_REG_USE, bb, insn_info, flags, width, offset, mode); switch (GET_CODE (dst)) @@ -3211,9 +3211,9 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, case SUBREG: if (df_read_modify_subreg_p (dst)) { - df_uses_record (cl, collection_rec, &SUBREG_REG (dst), - DF_REF_REG_USE, bb, insn_info, - flags | DF_REF_READ_WRITE | DF_REF_SUBREG, + df_uses_record (cl, collection_rec, &SUBREG_REG (dst), + DF_REF_REG_USE, bb, insn_info, + flags | DF_REF_READ_WRITE | DF_REF_SUBREG, width, offset, mode); break; } @@ -3226,7 +3226,7 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, break; case MEM: df_uses_record (cl, collection_rec, &XEXP (dst, 0), - DF_REF_REG_MEM_STORE, bb, insn_info, flags, + DF_REF_REG_MEM_STORE, bb, insn_info, flags, width, offset, mode); break; case STRICT_LOW_PART: @@ -3235,10 +3235,10 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, /* A strict_low_part uses the whole REG and not just the SUBREG. */ dst = XEXP (dst, 0); - df_uses_record (cl, collection_rec, - (GET_CODE (dst) == SUBREG) ? &SUBREG_REG (dst) : temp, + df_uses_record (cl, collection_rec, + (GET_CODE (dst) == SUBREG) ? &SUBREG_REG (dst) : temp, DF_REF_REG_USE, bb, insn_info, - DF_REF_READ_WRITE | DF_REF_STRICT_LOW_PART, + DF_REF_READ_WRITE | DF_REF_STRICT_LOW_PART, width, offset, mode); } break; @@ -3253,7 +3253,7 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, if (GET_CODE (XEXP (dst,0)) == MEM) { /* Handle the case of zero_extract(mem(...)) in the set dest. - This special case is allowed only if the mem is a single byte and + This special case is allowed only if the mem is a single byte and is useful to set a bitfield in memory. */ df_uses_record (DF_REF_EXTRACT, collection_rec, &XEXP (XEXP (dst,0), 0), DF_REF_REG_MEM_STORE, bb, insn_info, @@ -3262,23 +3262,23 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, } else { - df_uses_record (DF_REF_EXTRACT, collection_rec, &XEXP (dst, 0), - DF_REF_REG_USE, bb, insn_info, - DF_REF_READ_WRITE | DF_REF_ZERO_EXTRACT, + df_uses_record (DF_REF_EXTRACT, collection_rec, &XEXP (dst, 0), + DF_REF_REG_USE, bb, insn_info, + DF_REF_READ_WRITE | DF_REF_ZERO_EXTRACT, width, offset, mode); } } - else + else { - df_uses_record (cl, collection_rec, &XEXP (dst, 1), - DF_REF_REG_USE, bb, insn_info, flags, + df_uses_record (cl, collection_rec, &XEXP (dst, 1), + DF_REF_REG_USE, bb, insn_info, flags, width, offset, mode); - df_uses_record (cl, collection_rec, &XEXP (dst, 2), - DF_REF_REG_USE, bb, insn_info, flags, + df_uses_record (cl, collection_rec, &XEXP (dst, 2), + DF_REF_REG_USE, bb, insn_info, flags, width, offset, mode); - df_uses_record (cl, collection_rec, &XEXP (dst, 0), - DF_REF_REG_USE, bb, insn_info, - DF_REF_READ_WRITE | DF_REF_ZERO_EXTRACT, + df_uses_record (cl, collection_rec, &XEXP (dst, 0), + DF_REF_REG_USE, bb, insn_info, + DF_REF_READ_WRITE | DF_REF_ZERO_EXTRACT, width, offset, mode); } @@ -3331,7 +3331,7 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, for (j = 0; j < ASM_OPERANDS_INPUT_LENGTH (x); j++) df_uses_record (cl, collection_rec, &ASM_OPERANDS_INPUT (x, j), - DF_REF_REG_USE, bb, insn_info, flags, + DF_REF_REG_USE, bb, insn_info, flags, width, offset, mode); return; } @@ -3354,9 +3354,9 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, gcc_assert (!DEBUG_INSN_P (insn_info->insn)); /* Catch the def of the register being modified. */ df_ref_record (cl, collection_rec, XEXP (x, 0), &XEXP (x, 0), - bb, insn_info, + bb, insn_info, DF_REF_REG_DEF, - flags | DF_REF_READ_WRITE | DF_REF_PRE_POST_MODIFY, + flags | DF_REF_READ_WRITE | DF_REF_PRE_POST_MODIFY, width, offset, mode); /* ... Fall through to handle uses ... */ @@ -3380,8 +3380,8 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, loc = &XEXP (x, 0); goto retry; } - df_uses_record (cl, collection_rec, &XEXP (x, i), ref_type, - bb, insn_info, flags, + df_uses_record (cl, collection_rec, &XEXP (x, i), ref_type, + bb, insn_info, flags, width, offset, mode); } else if (fmt[i] == 'E') @@ -3389,8 +3389,8 @@ df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec, int j; for (j = 0; j < XVECLEN (x, i); j++) df_uses_record (cl, collection_rec, - &XVECEXP (x, i, j), ref_type, - bb, insn_info, flags, + &XVECEXP (x, i, j), ref_type, + bb, insn_info, flags, width, offset, mode); } } @@ -3439,7 +3439,7 @@ df_get_conditional_uses (struct df_collection_rec *collection_rec) static void df_get_call_refs (struct df_collection_rec * collection_rec, - basic_block bb, + basic_block bb, struct df_insn_info *insn_info, int flags) { @@ -3485,7 +3485,7 @@ df_get_call_refs (struct df_collection_rec * collection_rec, /* The stack ptr is used (honorarily) by a CALL insn. */ df_ref_record (DF_REF_BASE, collection_rec, regno_reg_rtx[STACK_POINTER_REGNUM], NULL, bb, insn_info, DF_REF_REG_USE, - DF_REF_CALL_STACK_USAGE | flags, + DF_REF_CALL_STACK_USAGE | flags, -1, -1, VOIDmode); /* Calls may also reference any of the global registers, @@ -3508,11 +3508,11 @@ df_get_call_refs (struct df_collection_rec * collection_rec, && (!bitmap_bit_p (defs_generated, ui)) && (!is_sibling_call || !bitmap_bit_p (df->exit_block_uses, ui) - || refers_to_regno_p (ui, ui+1, + || refers_to_regno_p (ui, ui+1, crtl->return_rtx, NULL))) - df_ref_record (DF_REF_BASE, collection_rec, regno_reg_rtx[ui], + df_ref_record (DF_REF_BASE, collection_rec, regno_reg_rtx[ui], NULL, bb, insn_info, DF_REF_REG_DEF, - DF_REF_MAY_CLOBBER | flags, + DF_REF_MAY_CLOBBER | flags, -1, -1, VOIDmode); } @@ -3526,8 +3526,8 @@ df_get_call_refs (struct df_collection_rec * collection_rec, and reg chains. */ static void -df_insn_refs_collect (struct df_collection_rec* collection_rec, - basic_block bb, struct df_insn_info *insn_info) +df_insn_refs_collect (struct df_collection_rec* collection_rec, + basic_block bb, struct df_insn_info *insn_info) { rtx note; bool is_cond_exec = (GET_CODE (PATTERN (insn_info->insn)) == COND_EXEC); @@ -3572,12 +3572,12 @@ df_insn_refs_collect (struct df_collection_rec* collection_rec, } if (CALL_P (insn_info->insn)) - df_get_call_refs (collection_rec, bb, insn_info, + df_get_call_refs (collection_rec, bb, insn_info, (is_cond_exec) ? DF_REF_CONDITIONAL : 0); /* Record the register uses. */ df_uses_record (DF_REF_REGULAR, collection_rec, - &PATTERN (insn_info->insn), DF_REF_REG_USE, bb, insn_info, 0, + &PATTERN (insn_info->insn), DF_REF_REG_USE, bb, insn_info, 0, -1, -1, VOIDmode); /* DF_REF_CONDITIONAL needs corresponding USES. */ @@ -3660,14 +3660,14 @@ df_bb_refs_collect (struct df_collection_rec *collection_rec, basic_block bb) if (bb->flags & BB_NON_LOCAL_GOTO_TARGET) df_ref_record (DF_REF_ARTIFICIAL, collection_rec, hard_frame_pointer_rtx, NULL, bb, NULL, DF_REF_REG_DEF, DF_REF_AT_TOP, -1, -1, VOIDmode); - + /* Add the artificial uses. */ if (bb->index >= NUM_FIXED_BLOCKS) { bitmap_iterator bi; unsigned int regno; - bitmap au = bb_has_eh_pred (bb) - ? df->eh_block_artificial_uses + bitmap au = bb_has_eh_pred (bb) + ? df->eh_block_artificial_uses : df->regular_block_artificial_uses; EXECUTE_IF_SET_IN_BITMAP (au, 0, regno, bi) @@ -3697,7 +3697,7 @@ df_bb_refs_record (int bb_index, bool scan_insns) bb_info = df_scan_get_bb_info (bb_index); - /* Need to make sure that there is a record in the basic block info. */ + /* Need to make sure that there is a record in the basic block info. */ if (!bb_info) { bb_info = (struct df_scan_bb_info *) pool_alloc (df_scan->block_pool); @@ -3769,7 +3769,7 @@ df_get_regular_block_artificial_uses (bitmap regular_block_artificial_uses) /* Any reference to any pseudo before reload is a potential reference of the frame pointer. */ bitmap_set_bit (regular_block_artificial_uses, FRAME_POINTER_REGNUM); - + #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM bitmap_set_bit (regular_block_artificial_uses, HARD_FRAME_POINTER_REGNUM); #endif @@ -3780,7 +3780,7 @@ df_get_regular_block_artificial_uses (bitmap regular_block_artificial_uses) if (fixed_regs[ARG_POINTER_REGNUM]) bitmap_set_bit (regular_block_artificial_uses, ARG_POINTER_REGNUM); #endif - + /* Any constant, or pseudo with constant equivalences, may require reloading from memory using the pic register. */ if ((unsigned) PIC_OFFSET_TABLE_REGNUM != INVALID_REGNUM @@ -3880,7 +3880,7 @@ df_get_entry_block_def_set (bitmap entry_block_defs) bitmap_set_bit (entry_block_defs, i); #endif } - + /* The always important stack pointer. */ bitmap_set_bit (entry_block_defs, STACK_POINTER_REGNUM); @@ -3926,7 +3926,7 @@ df_get_entry_block_def_set (bitmap entry_block_defs) if (fixed_regs[ARG_POINTER_REGNUM]) bitmap_set_bit (entry_block_defs, ARG_POINTER_REGNUM); #endif - + #ifdef PIC_OFFSET_TABLE_REGNUM /* Any constant, or pseudo with constant equivalences, may require reloading from memory using the pic register. */ @@ -3940,26 +3940,26 @@ df_get_entry_block_def_set (bitmap entry_block_defs) if (REG_P (INCOMING_RETURN_ADDR_RTX)) bitmap_set_bit (entry_block_defs, REGNO (INCOMING_RETURN_ADDR_RTX)); #endif - + targetm.live_on_entry (entry_block_defs); } /* Return the (conservative) set of hard registers that are defined on - entry to the function. - It uses df->entry_block_defs to determine which register + entry to the function. + It uses df->entry_block_defs to determine which register reference to include. */ static void -df_entry_block_defs_collect (struct df_collection_rec *collection_rec, +df_entry_block_defs_collect (struct df_collection_rec *collection_rec, bitmap entry_block_defs) { - unsigned int i; + unsigned int i; bitmap_iterator bi; EXECUTE_IF_SET_IN_BITMAP (entry_block_defs, 0, i, bi) { - df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL, + df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL, ENTRY_BLOCK_PTR, NULL, DF_REF_REG_DEF, 0, -1, -1, VOIDmode); } @@ -4028,17 +4028,17 @@ df_update_entry_block_defs (void) static void df_get_exit_block_use_set (bitmap exit_block_uses) { - unsigned int i; + unsigned int i; bitmap_clear (exit_block_uses); /* Stack pointer is always live at the exit. */ bitmap_set_bit (exit_block_uses, STACK_POINTER_REGNUM); - + /* Mark the frame pointer if needed at the end of the function. If we end up eliminating it, it will be removed from the live list of each basic block by reload. */ - + if ((!reload_completed) || frame_pointer_needed) { bitmap_set_bit (exit_block_uses, FRAME_POINTER_REGNUM); @@ -4057,14 +4057,14 @@ df_get_exit_block_use_set (bitmap exit_block_uses) && fixed_regs[PIC_OFFSET_TABLE_REGNUM]) bitmap_set_bit (exit_block_uses, PIC_OFFSET_TABLE_REGNUM); #endif - + /* Mark all global registers, and all registers used by the epilogue as being live at the end of the function since they may be referenced by our caller. */ for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) if (global_regs[i] || EPILOGUE_USES (i)) bitmap_set_bit (exit_block_uses, i); - + if (HAVE_epilogue && epilogue_completed) { /* Mark all call-saved registers that we actually used. */ @@ -4073,7 +4073,7 @@ df_get_exit_block_use_set (bitmap exit_block_uses) && !TEST_HARD_REG_BIT (regs_invalidated_by_call, i)) bitmap_set_bit (exit_block_uses, i); } - + #ifdef EH_RETURN_DATA_REGNO /* Mark the registers that will contain data for the handler. */ if (reload_completed && crtl->calls_eh_return) @@ -4104,20 +4104,20 @@ df_get_exit_block_use_set (bitmap exit_block_uses) if (tmp && REG_P (tmp)) df_mark_reg (tmp, exit_block_uses); } -#endif +#endif /* Mark function return value. */ diddle_return_value (df_mark_reg, (void*) exit_block_uses); } -/* Return the refs of hard registers that are used in the exit block. +/* Return the refs of hard registers that are used in the exit block. It uses df->exit_block_uses to determine register to include. */ static void df_exit_block_uses_collect (struct df_collection_rec *collection_rec, bitmap exit_block_uses) { - unsigned int i; + unsigned int i; bitmap_iterator bi; EXECUTE_IF_SET_IN_BITMAP (exit_block_uses, 0, i, bi) @@ -4127,7 +4127,7 @@ df_exit_block_uses_collect (struct df_collection_rec *collection_rec, bitmap exi #if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM /* It is deliberate that this is not put in the exit block uses but I do not know why. */ - if (reload_completed + if (reload_completed && !bitmap_bit_p (exit_block_uses, ARG_POINTER_REGNUM) && bb_has_eh_pred (EXIT_BLOCK_PTR) && fixed_regs[ARG_POINTER_REGNUM]) @@ -4139,7 +4139,7 @@ df_exit_block_uses_collect (struct df_collection_rec *collection_rec, bitmap exi } -/* Record the set of hard registers that are used in the exit block. +/* Record the set of hard registers that are used in the exit block. It uses df->exit_block_uses to determine which bit to include. */ static void @@ -4199,7 +4199,7 @@ static bool initialized = false; /* Initialize some platform specific structures. */ -void +void df_hard_reg_init (void) { #ifdef ELIMINABLE_REGS @@ -4212,22 +4212,22 @@ df_hard_reg_init (void) /* Record which registers will be eliminated. We use this in mark_used_regs. */ CLEAR_HARD_REG_SET (elim_reg_set); - + #ifdef ELIMINABLE_REGS for (i = 0; i < (int) ARRAY_SIZE (eliminables); i++) SET_HARD_REG_BIT (elim_reg_set, eliminables[i].from); #else SET_HARD_REG_BIT (elim_reg_set, FRAME_POINTER_REGNUM); #endif - + initialized = true; } /* Recompute the parts of scanning that are based on regs_ever_live - because something changed in that array. */ + because something changed in that array. */ -void +void df_update_entry_exit_and_calls (void) { basic_block bb; @@ -4237,7 +4237,7 @@ df_update_entry_exit_and_calls (void) /* The call insns need to be rescanned because there may be changes in the set of registers clobbered across the call. */ - FOR_EACH_BB (bb) + FOR_EACH_BB (bb) { rtx insn; FOR_BB_INSNS (bb, insn) @@ -4254,7 +4254,7 @@ df_update_entry_exit_and_calls (void) this array. See the comment in df.h for df->hard_regs_live_count for the conditions that this array is set. */ -bool +bool df_hard_reg_used_p (unsigned int reg) { gcc_assert (df); @@ -4279,7 +4279,7 @@ df_hard_reg_used_count (unsigned int reg) /* Get the value of regs_ever_live[REGNO]. */ -bool +bool df_regs_ever_live_p (unsigned int regno) { return regs_ever_live[regno]; @@ -4289,7 +4289,7 @@ df_regs_ever_live_p (unsigned int regno) /* Set regs_ever_live[REGNO] to VALUE. If this cause regs_ever_live to change, schedule that change for the next update. */ -void +void df_set_regs_ever_live (unsigned int regno, bool value) { if (regs_ever_live[regno] == value) @@ -4309,7 +4309,7 @@ df_compute_regs_ever_live (bool reset) { unsigned int i; bool changed = df->redo_entry_and_exit; - + if (reset) memset (regs_ever_live, 0, sizeof (regs_ever_live)); @@ -4342,10 +4342,10 @@ df_compute_regs_ever_live (bool reset) /* Mark all refs in the reg chain. Verify that all of the registers -are in the correct chain. */ +are in the correct chain. */ static unsigned int -df_reg_chain_mark (df_ref refs, unsigned int regno, +df_reg_chain_mark (df_ref refs, unsigned int regno, bool is_def, bool is_eq_use) { unsigned int count = 0; @@ -4380,7 +4380,7 @@ df_reg_chain_mark (df_ref refs, unsigned int regno, } -/* Verify that all of the registers in the chain are unmarked. */ +/* Verify that all of the registers in the chain are unmarked. */ static void df_reg_chain_verify_unmarked (df_ref refs) @@ -4461,7 +4461,7 @@ df_mws_verify (VEC(df_mw_hardreg_ptr,stack) *new_rec, /* Return true if the existing insn refs information is complete and correct. Otherwise (i.e. if there's any missing or extra refs), - return the correct df_ref chain in REFS_RETURN. + return the correct df_ref chain in REFS_RETURN. If ABORT_IF_FAIL, leave the refs that are verified (already in the ref chain) as DF_REF_MARKED(). If it's false, then it's a per-insn @@ -4472,7 +4472,7 @@ df_mws_verify (VEC(df_mw_hardreg_ptr,stack) *new_rec, static bool df_insn_refs_verify (struct df_collection_rec *collection_rec, - basic_block bb, + basic_block bb, rtx insn, bool abort_if_fail) { @@ -4487,19 +4487,19 @@ df_insn_refs_verify (struct df_collection_rec *collection_rec, /* The insn_rec was created but it was never filled out. */ if (abort_if_fail) gcc_assert (0); - else + else return false; } /* Unfortunately we cannot opt out early if one of these is not right because the marks will not get cleared. */ - ret1 = df_refs_verify (collection_rec->def_vec, DF_INSN_UID_DEFS (uid), + ret1 = df_refs_verify (collection_rec->def_vec, DF_INSN_UID_DEFS (uid), abort_if_fail); - ret2 = df_refs_verify (collection_rec->use_vec, DF_INSN_UID_USES (uid), + ret2 = df_refs_verify (collection_rec->use_vec, DF_INSN_UID_USES (uid), abort_if_fail); - ret3 = df_refs_verify (collection_rec->eq_use_vec, DF_INSN_UID_EQ_USES (uid), + ret3 = df_refs_verify (collection_rec->eq_use_vec, DF_INSN_UID_EQ_USES (uid), abort_if_fail); - ret4 = df_mws_verify (collection_rec->mw_vec, DF_INSN_UID_MWS (uid), + ret4 = df_mws_verify (collection_rec->mw_vec, DF_INSN_UID_MWS (uid), abort_if_fail); return (ret1 && ret2 && ret3 && ret4); } @@ -4515,7 +4515,7 @@ df_bb_verify (basic_block bb) rtx insn; struct df_scan_bb_info *bb_info = df_scan_get_bb_info (bb->index); struct df_collection_rec collection_rec; - + memset (&collection_rec, 0, sizeof (struct df_collection_rec)); collection_rec.def_vec = VEC_alloc (df_ref, stack, 128); collection_rec.use_vec = VEC_alloc (df_ref, stack, 32); @@ -4538,12 +4538,12 @@ df_bb_verify (basic_block bb) df_refs_verify (collection_rec.def_vec, df_get_artificial_defs (bb->index), true); df_refs_verify (collection_rec.use_vec, df_get_artificial_uses (bb->index), true); df_free_collection_rec (&collection_rec); - + return true; } -/* Returns true if the entry block has correct and complete df_ref set. +/* Returns true if the entry block has correct and complete df_ref set. If not it either aborts if ABORT_IF_FAIL is true or returns false. */ static bool @@ -4572,7 +4572,7 @@ df_entry_block_bitmap_verify (bool abort_if_fail) } -/* Returns true if the exit block has correct and complete df_ref set. +/* Returns true if the exit block has correct and complete df_ref set. If not it either aborts if ABORT_IF_FAIL is true or returns false. */ static bool @@ -4620,11 +4620,11 @@ df_scan_verify (void) /* (1) All of the refs are marked by going thru the reg chains. */ for (i = 0; i < DF_REG_SIZE (df); i++) { - gcc_assert (df_reg_chain_mark (DF_REG_DEF_CHAIN (i), i, true, false) + gcc_assert (df_reg_chain_mark (DF_REG_DEF_CHAIN (i), i, true, false) == DF_REG_DEF_COUNT(i)); - gcc_assert (df_reg_chain_mark (DF_REG_USE_CHAIN (i), i, false, false) + gcc_assert (df_reg_chain_mark (DF_REG_USE_CHAIN (i), i, false, false) == DF_REG_USE_COUNT(i)); - gcc_assert (df_reg_chain_mark (DF_REG_EQ_USE_CHAIN (i), i, false, true) + gcc_assert (df_reg_chain_mark (DF_REG_EQ_USE_CHAIN (i), i, false, true) == DF_REG_EQ_USE_COUNT(i)); } @@ -4637,13 +4637,13 @@ df_scan_verify (void) df_get_regular_block_artificial_uses (regular_block_artificial_uses); df_get_eh_block_artificial_uses (eh_block_artificial_uses); - bitmap_ior_into (eh_block_artificial_uses, + bitmap_ior_into (eh_block_artificial_uses, regular_block_artificial_uses); /* Check artificial_uses bitmaps didn't change. */ - gcc_assert (bitmap_equal_p (regular_block_artificial_uses, + gcc_assert (bitmap_equal_p (regular_block_artificial_uses, df->regular_block_artificial_uses)); - gcc_assert (bitmap_equal_p (eh_block_artificial_uses, + gcc_assert (bitmap_equal_p (eh_block_artificial_uses, df->eh_block_artificial_uses)); BITMAP_FREE (regular_block_artificial_uses); @@ -4653,7 +4653,7 @@ df_scan_verify (void) the refs are verified in df_bb_verify. */ df_entry_block_bitmap_verify (true); df_exit_block_bitmap_verify (true); - + /* (3) All of the insns in all of the blocks are traversed and the marks are cleared both in the artificial refs attached to the blocks and the real refs inside the insns. It is a failure to |