/* Scanning of rtl for dataflow analysis.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
- Originally contributed by Michael P. Hayes
+ 2008, 2009, 2010 Free Software Foundation, Inc.
+ 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).
#include "df.h"
#include "tree-pass.h"
+DEF_VEC_P(df_ref);
+DEF_VEC_ALLOC_P_STACK(df_ref);
+
+#define VEC_df_ref_stack_alloc(alloc) VEC_stack_alloc (df_ref, alloc)
+
+typedef struct df_mw_hardreg *df_mw_hardreg_ptr;
+
+DEF_VEC_P(df_mw_hardreg_ptr);
+DEF_VEC_ALLOC_P_STACK(df_mw_hardreg_ptr);
+
+#define VEC_df_mw_hardreg_ptr_stack_alloc(alloc) \
+ VEC_stack_alloc (df_mw_hardreg_ptr, alloc)
+
#ifndef HAVE_epilogue
#define HAVE_epilogue 0
#endif
/* 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) \
free (V); \
} while (0)
-/* The bitmap_obstack is used to hold some static variables that
- should not be reset after each function is compiled. */
-
-static bitmap_obstack persistent_obstack;
-
/* The set of hard registers in eliminables[i].from. */
static HARD_REG_SET elim_reg_set;
-/* This is a bitmap copy of regs_invalidated_by_call so that we can
- easily add it into bitmaps, etc. */
-
-bitmap df_invalidated_by_call = NULL;
-
/* Initialize ur_in and ur_out as if all hard registers were partially
available. */
struct df_collection_rec
{
- df_ref * def_vec;
- unsigned int next_def;
- df_ref * use_vec;
- unsigned int next_use;
- df_ref * eq_use_vec;
- unsigned int next_eq_use;
- struct df_mw_hardreg **mw_vec;
- unsigned int next_mw;
+ VEC(df_ref,stack) *def_vec;
+ VEC(df_ref,stack) *use_vec;
+ VEC(df_ref,stack) *eq_use_vec;
+ VEC(df_mw_hardreg_ptr,stack) *mw_vec;
};
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, enum df_ref_flags,
+ enum df_ref_type, int ref_flags,
int, int, enum machine_mode);
static void df_def_record_1 (struct df_collection_rec *, rtx,
basic_block, struct df_insn_info *,
- enum df_ref_flags);
+ int ref_flags);
static void df_defs_record (struct df_collection_rec *, rtx,
basic_block, struct df_insn_info *,
- enum df_ref_flags);
+ int ref_flags);
static void df_uses_record (enum df_ref_class, struct df_collection_rec *,
rtx *, enum df_ref_type,
basic_block, struct df_insn_info *,
- enum df_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, enum df_ref_flags,
+ 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);
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 *);
/* Internal function to shut down the scanning problem. */
-static void
+static void
df_scan_free_internal (void)
{
struct df_scan_problem_data *problem_data
/* 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);
df_grow_bb_info (df_scan);
df_scan->block_info[index] = (void *) bb_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);
/* 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;
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 ();
/* Free all of the data associated with the scan problem. */
-static void
+static void
df_scan_free (void)
{
if (df_scan->problem_data)
}
/* Dump the preamble for DF_SCAN dump. */
-static void
+static void
df_scan_start_dump (FILE *file ATTRIBUTE_UNUSED)
{
int i;
rtx insn;
fprintf (file, ";; invalidated by call \t");
- df_print_regset (file, df_invalidated_by_call);
+ df_print_regset (file, regs_invalidated_by_call_regset);
fprintf (file, ";; hardware regs used \t");
df_print_regset (file, df->hardware_regs_used);
fprintf (file, ";; regular block artificial uses \t");
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))
{
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
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. */
/* 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 ();
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)
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)
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;
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. */
/* 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_flags ref_flags,
+ enum df_ref_type ref_type,
+ int ref_flags,
int width, int offset, enum machine_mode mode)
{
df_ref ref;
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))
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)
{
#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. */
- df_set_bb_dirty (bb);
+ to mark the block dirty ourselves. */
+ if (!DEBUG_INSN_P (DF_REF_INSN (ref)))
+ df_set_bb_dirty (bb);
return 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;
reg_info = DF_REG_DEF_GET (regno);
refs = df->def_info.refs;
}
- else
+ else
{
if (DF_REF_FLAGS (ref) & DF_REF_IN_NOTE)
{
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
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))
{
{
while (*vec && *vec != ref)
vec++;
-
+
while (*vec)
{
*vec = *(vec+1);
{
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);
}
{
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);
/* 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. */
- df_set_bb_dirty (DF_REF_BB (ref));
+ 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);
}
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);
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;
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
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);
static void
df_free_collection_rec (struct df_collection_rec *collection_rec)
{
- struct df_scan_problem_data *problem_data
+ unsigned int ix;
+ struct df_scan_problem_data *problem_data
= (struct df_scan_problem_data *) df_scan->problem_data;
- df_ref *ref;
- struct df_mw_hardreg **mw;
-
- if (collection_rec->def_vec)
- for (ref = collection_rec->def_vec; *ref; ref++)
- df_free_ref (*ref);
- if (collection_rec->use_vec)
- for (ref = collection_rec->use_vec; *ref; ref++)
- df_free_ref (*ref);
- if (collection_rec->eq_use_vec)
- for (ref = collection_rec->eq_use_vec; *ref; ref++)
- df_free_ref (*ref);
- if (collection_rec->mw_vec)
- for (mw = collection_rec->mw_vec; *mw; mw++)
- pool_free (problem_data->mw_reg_pool, *mw);
+ df_ref ref;
+ struct df_mw_hardreg *mw;
+
+ for (ix = 0; VEC_iterate (df_ref, collection_rec->def_vec, ix, ref); ++ix)
+ df_free_ref (ref);
+ for (ix = 0; VEC_iterate (df_ref, collection_rec->use_vec, ix, ref); ++ix)
+ df_free_ref (ref);
+ for (ix = 0; VEC_iterate (df_ref, collection_rec->eq_use_vec, ix, ref); ++ix)
+ df_free_ref (ref);
+ for (ix = 0;
+ VEC_iterate (df_mw_hardreg_ptr, collection_rec->mw_vec, ix, mw);
+ ++ix)
+ pool_free (problem_data->mw_reg_pool, mw);
+
+ VEC_free (df_ref, stack, collection_rec->def_vec);
+ VEC_free (df_ref, stack, collection_rec->use_vec);
+ VEC_free (df_ref, stack, collection_rec->eq_use_vec);
+ VEC_free (df_mw_hardreg_ptr, stack, collection_rec->mw_vec);
}
-
/* Rescan INSN. Return TRUE if the rescanning produced any changes. */
-bool
+bool
df_insn_rescan (rtx insn)
{
unsigned int uid = INSN_UID (insn);
struct df_insn_info *insn_info = NULL;
basic_block bb = BLOCK_FOR_INSN (insn);
struct df_collection_rec collection_rec;
- collection_rec.def_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.eq_use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.mw_vec = XALLOCAVEC (struct df_mw_hardreg *, 100);
if ((!df) || (!INSN_P (insn)))
return false;
}
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));
return false;
}
+ collection_rec.def_vec = VEC_alloc (df_ref, stack, 128);
+ collection_rec.use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.eq_use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.mw_vec = VEC_alloc (df_mw_hardreg_ptr, stack, 32);
+
bitmap_clear_bit (df->insns_to_delete, uid);
bitmap_clear_bit (df->insns_to_rescan, uid);
bitmap_clear_bit (df->insns_to_notes_rescan, uid);
if (insn_info)
{
+ int luid;
bool the_same = df_insn_refs_verify (&collection_rec, bb, insn, false);
/* If there's no change, return false. */
if (the_same)
if (dump_file)
fprintf (dump_file, "rescanning insn with uid = %d.\n", uid);
- /* There's change - we need to delete the existing info. */
+ /* There's change - we need to delete the existing info.
+ Since the insn isn't moved, we can salvage its LUID. */
+ luid = DF_INSN_LUID (insn);
df_insn_delete (NULL, uid);
df_insn_create_insn_record (insn);
+ DF_INSN_LUID (insn) = luid;
}
else
{
}
df_refs_add_to_chains (&collection_rec, bb, insn);
- df_set_bb_dirty (bb);
+ if (DEBUG_INSN_P (insn))
+ df_set_bb_dirty_nonlr (bb);
+ else
+ df_set_bb_dirty (bb);
+
+ VEC_free (df_ref, stack, collection_rec.def_vec);
+ VEC_free (df_ref, stack, collection_rec.use_vec);
+ VEC_free (df_ref, stack, collection_rec.eq_use_vec);
+ VEC_free (df_mw_hardreg_ptr, stack, collection_rec.mw_vec);
+
+ return true;
+}
+
+/* Same as df_insn_rescan, but don't mark the basic block as
+ dirty. */
+
+bool
+df_insn_rescan_debug_internal (rtx insn)
+{
+ unsigned int uid = INSN_UID (insn);
+ struct df_insn_info *insn_info;
+
+ gcc_assert (DEBUG_INSN_P (insn)
+ && VAR_LOC_UNKNOWN_P (INSN_VAR_LOCATION_LOC (insn)));
+
+ if (!df)
+ return false;
+
+ insn_info = DF_INSN_UID_SAFE_GET (INSN_UID (insn));
+ if (!insn_info)
+ return false;
+
+ if (dump_file)
+ fprintf (dump_file, "deleting debug_insn with uid = %d.\n", uid);
+
+ bitmap_clear_bit (df->insns_to_delete, uid);
+ bitmap_clear_bit (df->insns_to_rescan, uid);
+ bitmap_clear_bit (df->insns_to_notes_rescan, uid);
+
+ if (!insn_info->defs)
+ return false;
+
+ if (insn_info->defs == df_null_ref_rec
+ && insn_info->uses == df_null_ref_rec
+ && insn_info->eq_uses == df_null_ref_rec
+ && insn_info->mw_hardregs == df_null_mw_rec)
+ return false;
+
+ 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->eq_uses);
+ }
+
+ df_ref_chain_delete (insn_info->defs);
+ df_ref_chain_delete (insn_info->uses);
+ df_ref_chain_delete (insn_info->eq_uses);
+
+ insn_info->defs = df_null_ref_rec;
+ insn_info->uses = df_null_ref_rec;
+ insn_info->eq_uses = df_null_ref_rec;
+ insn_info->mw_hardregs = df_null_mw_rec;
+
return true;
}
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);
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)
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);
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)
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;
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);
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++;
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++;
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++;
}
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. */
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;
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);
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++)
{
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);
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++)
{
/* 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)
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)
{
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;
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;
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);
}
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;
}
/* 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)
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)
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)
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);
}
/* 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)
{
DF_REF_PREV_REG (new_df->reg_chain) = the_ref;
new_df->reg_chain = the_ref;
new_df->n_refs++;
- df_set_bb_dirty (DF_REF_BB (the_ref));
+ if (DF_REF_BB (the_ref))
+ df_set_bb_dirty (DF_REF_BB (the_ref));
/* Need to sort the record again that the ref was in because
the regno is a sorting key. First, find the right
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)
{
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);
}
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)
/* 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);
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. */
rtx note;
struct df_collection_rec collection_rec;
unsigned int num_deleted;
+ unsigned int mw_len;
memset (&collection_rec, 0, sizeof (struct df_collection_rec));
- collection_rec.eq_use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.mw_vec = XALLOCAVEC (struct df_mw_hardreg *, 1000);
+ collection_rec.eq_use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.mw_vec = VEC_alloc (df_mw_hardreg_ptr, stack, 32);
num_deleted = df_mw_hardreg_chain_delete_eq_uses (insn_info);
df_ref_chain_delete (insn_info->eq_uses);
case REG_EQUAL:
df_uses_record (DF_REF_REGULAR, &collection_rec,
&XEXP (note, 0), DF_REF_REG_USE,
- bb, insn_info, DF_REF_IN_NOTE, -1, -1, 0);
+ bb, insn_info, DF_REF_IN_NOTE, -1, -1, VOIDmode);
default:
break;
}
/* Find some place to put any new mw_hardregs. */
df_canonize_collection_rec (&collection_rec);
- if (collection_rec.next_mw)
+ mw_len = VEC_length (df_mw_hardreg_ptr, collection_rec.mw_vec);
+ if (mw_len)
{
unsigned int count = 0;
struct df_mw_hardreg **mw_rec = insn_info->mw_hardregs;
{
/* Append to the end of the existing record after
expanding it if necessary. */
- if (collection_rec.next_mw > num_deleted)
+ if (mw_len > num_deleted)
{
- insn_info->mw_hardregs =
+ insn_info->mw_hardregs =
XRESIZEVEC (struct df_mw_hardreg *,
- insn_info->mw_hardregs,
- count + 1 + collection_rec.next_mw);
+ insn_info->mw_hardregs,
+ count + 1 + mw_len);
}
- memcpy (&insn_info->mw_hardregs[count], collection_rec.mw_vec,
- (collection_rec.next_mw + 1) * sizeof (struct df_mw_hardreg *));
- qsort (insn_info->mw_hardregs, count + collection_rec.next_mw,
+ memcpy (&insn_info->mw_hardregs[count],
+ 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,
sizeof (struct df_mw_hardreg *), df_mw_compare);
}
else
{
- /* No vector there. */
- insn_info->mw_hardregs
- = XNEWVEC (struct df_mw_hardreg*,
- count + 1 + collection_rec.next_mw);
- memcpy (insn_info->mw_hardregs, collection_rec.mw_vec,
- (collection_rec.next_mw + 1) * sizeof (struct df_mw_hardreg *));
+ /* 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),
+ mw_len * sizeof (struct df_mw_hardreg *));
+ insn_info->mw_hardregs[mw_len] = NULL;
}
}
/* Get rid of the mw_rec so that df_refs_add_to_chains will
ignore it. */
- collection_rec.mw_vec = NULL;
- collection_rec.next_mw = 0;
+ VEC_free (df_mw_hardreg_ptr, stack, collection_rec.mw_vec);
df_refs_add_to_chains (&collection_rec, bb, insn);
+ VEC_free (df_ref, stack, collection_rec.eq_use_vec);
}
else
df_insn_rescan (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
{
if (!ref2)
return false;
-
+
if (ref1 == ref2)
return true;
|| 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:
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);
if (DF_REF_EXTRACT_MODE (ref1) != DF_REF_EXTRACT_MODE (ref2))
return DF_REF_EXTRACT_MODE (ref1) - DF_REF_EXTRACT_MODE (ref2);
}
- return 0;
+ return (int)DF_REF_ORDER (ref1) - (int)DF_REF_ORDER (ref2);
}
static void
-df_swap_refs (df_ref *ref_vec, int i, int j)
+df_swap_refs (VEC(df_ref,stack) **ref_vec, int i, int j)
{
- df_ref tmp = ref_vec[i];
- ref_vec[i] = ref_vec[j];
- ref_vec[j] = tmp;
+ df_ref tmp = VEC_index (df_ref, *ref_vec, i);
+ VEC_replace (df_ref, *ref_vec, i, VEC_index (df_ref, *ref_vec, j));
+ VEC_replace (df_ref, *ref_vec, j, tmp);
}
/* Sort and compress a set of refs. */
-static unsigned int
-df_sort_and_compress_refs (df_ref *ref_vec, unsigned int count)
+static void
+df_sort_and_compress_refs (VEC(df_ref,stack) **ref_vec)
{
+ unsigned int count;
unsigned int i;
unsigned int dist = 0;
- ref_vec[count] = NULL;
+ count = VEC_length (df_ref, *ref_vec);
+
/* If there are 1 or 0 elements, there is nothing to do. */
if (count < 2)
- return count;
+ return;
else if (count == 2)
{
- if (df_ref_compare (&ref_vec[0], &ref_vec[1]) > 0)
+ df_ref r0 = VEC_index (df_ref, *ref_vec, 0);
+ df_ref r1 = VEC_index (df_ref, *ref_vec, 1);
+ if (df_ref_compare (&r0, &r1) > 0)
df_swap_refs (ref_vec, 0, 1);
}
else
{
for (i = 0; i < count - 1; i++)
- if (df_ref_compare (&ref_vec[i], &ref_vec[i+1]) >= 0)
- break;
+ {
+ df_ref r0 = VEC_index (df_ref, *ref_vec, i);
+ df_ref r1 = VEC_index (df_ref, *ref_vec, i + 1);
+ if (df_ref_compare (&r0, &r1) >= 0)
+ break;
+ }
/* If the array is already strictly ordered,
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)
- return count;
- qsort (ref_vec, count, sizeof (df_ref), df_ref_compare);
+ return;
+ qsort (VEC_address (df_ref, *ref_vec), count, sizeof (df_ref),
+ df_ref_compare);
}
for (i=0; i<count-dist; i++)
{
/* Find the next ref that is not equal to the current ref. */
- while (df_ref_equal_p (ref_vec[i], ref_vec[i + dist + 1]))
+ while (i + dist + 1 < count
+ && df_ref_equal_p (VEC_index (df_ref, *ref_vec, i),
+ VEC_index (df_ref, *ref_vec, i + dist + 1)))
{
- df_free_ref (ref_vec[i + dist + 1]);
+ df_free_ref (VEC_index (df_ref, *ref_vec, i + dist + 1));
dist++;
}
/* Copy it down to the next position. */
- if (dist)
- ref_vec[i+1] = ref_vec[i + dist + 1];
+ if (dist && i + dist + 1 < count)
+ VEC_replace (df_ref, *ref_vec, i + 1,
+ VEC_index (df_ref, *ref_vec, i + dist + 1));
}
count -= dist;
- ref_vec[count] = NULL;
- return count;
+ VEC_truncate (df_ref, *ref_vec, count);
}
-/* 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
/* Sort and compress a set of refs. */
-static unsigned int
-df_sort_and_compress_mws (struct df_mw_hardreg **mw_vec, unsigned int count)
+static void
+df_sort_and_compress_mws (VEC(df_mw_hardreg_ptr,stack) **mw_vec)
{
- struct df_scan_problem_data *problem_data
+ unsigned int count;
+ struct df_scan_problem_data *problem_data
= (struct df_scan_problem_data *) df_scan->problem_data;
unsigned int i;
unsigned int dist = 0;
- mw_vec[count] = NULL;
+ count = VEC_length (df_mw_hardreg_ptr, *mw_vec);
if (count < 2)
- return count;
+ return;
else if (count == 2)
{
- if (df_mw_compare (&mw_vec[0], &mw_vec[1]) > 0)
+ struct df_mw_hardreg *m0 = VEC_index (df_mw_hardreg_ptr, *mw_vec, 0);
+ struct df_mw_hardreg *m1 = VEC_index (df_mw_hardreg_ptr, *mw_vec, 1);
+ if (df_mw_compare (&m0, &m1) > 0)
{
- struct df_mw_hardreg *tmp = mw_vec[0];
- mw_vec[0] = mw_vec[1];
- mw_vec[1] = tmp;
+ struct df_mw_hardreg *tmp = VEC_index (df_mw_hardreg_ptr,
+ *mw_vec, 0);
+ VEC_replace (df_mw_hardreg_ptr, *mw_vec, 0,
+ VEC_index (df_mw_hardreg_ptr, *mw_vec, 1));
+ VEC_replace (df_mw_hardreg_ptr, *mw_vec, 1, tmp);
}
}
else
- qsort (mw_vec, count, sizeof (struct df_mw_hardreg *), df_mw_compare);
+ qsort (VEC_address (df_mw_hardreg_ptr, *mw_vec), count,
+ sizeof (struct df_mw_hardreg *), df_mw_compare);
for (i=0; i<count-dist; i++)
{
/* Find the next ref that is not equal to the current ref. */
- while (df_mw_equal_p (mw_vec[i], mw_vec[i + dist + 1]))
+ while (i + dist + 1 < count
+ && df_mw_equal_p (VEC_index (df_mw_hardreg_ptr, *mw_vec, i),
+ VEC_index (df_mw_hardreg_ptr, *mw_vec,
+ i + dist + 1)))
{
- pool_free (problem_data->mw_reg_pool, mw_vec[i + dist + 1]);
+ pool_free (problem_data->mw_reg_pool,
+ VEC_index (df_mw_hardreg_ptr, *mw_vec, i + dist + 1));
dist++;
}
/* Copy it down to the next position. */
- if (dist)
- mw_vec[i+1] = mw_vec[i + dist + 1];
+ if (dist && i + dist + 1 < count)
+ VEC_replace (df_mw_hardreg_ptr, *mw_vec, i + 1,
+ VEC_index (df_mw_hardreg_ptr, *mw_vec, i + dist + 1));
}
count -= dist;
- mw_vec[count] = NULL;
- return count;
+ VEC_truncate (df_mw_hardreg_ptr, *mw_vec, count);
}
static void
df_canonize_collection_rec (struct df_collection_rec *collection_rec)
{
- if (collection_rec->def_vec)
- collection_rec->next_def
- = df_sort_and_compress_refs (collection_rec->def_vec,
- collection_rec->next_def);
- if (collection_rec->use_vec)
- collection_rec->next_use
- = df_sort_and_compress_refs (collection_rec->use_vec,
- collection_rec->next_use);
- if (collection_rec->eq_use_vec)
- collection_rec->next_eq_use
- = df_sort_and_compress_refs (collection_rec->eq_use_vec,
- collection_rec->next_eq_use);
- if (collection_rec->mw_vec)
- collection_rec->next_mw
- = df_sort_and_compress_mws (collection_rec->mw_vec,
- collection_rec->next_mw);
+ df_sort_and_compress_refs (&collection_rec->def_vec);
+ df_sort_and_compress_refs (&collection_rec->use_vec);
+ df_sort_and_compress_refs (&collection_rec->eq_use_vec);
+ df_sort_and_compress_mws (&collection_rec->mw_vec);
}
/* 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)
{
df->hard_regs_live_count[regno]++;
}
- gcc_assert (DF_REF_NEXT_REG (this_ref) == NULL);
- gcc_assert (DF_REF_PREV_REG (this_ref) == NULL);
+ gcc_assert (DF_REF_NEXT_REG (this_ref) == NULL
+ && DF_REF_PREV_REG (this_ref) == NULL);
DF_REF_NEXT_REG (this_ref) = head;
if (head)
DF_REF_PREV_REG (head) = this_ref;
-
+
if (add_to_table)
{
gcc_assert (ref_info->ref_order != DF_REF_ORDER_NO_TABLE);
/* 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++;
}
static df_ref *
df_install_refs (basic_block bb,
- df_ref *old_vec, unsigned int count,
- struct df_reg_info **reg_info,
+ VEC(df_ref,stack)* old_vec,
+ struct df_reg_info **reg_info,
struct df_ref_info *ref_info,
bool is_notes)
{
+ unsigned int count;
+
+ count = VEC_length (df_ref, old_vec);
if (count)
{
- unsigned int i;
df_ref *new_vec = XNEWVEC (df_ref, count + 1);
bool add_to_table;
+ df_ref this_ref;
+ unsigned int ix;
switch (ref_info->ref_order)
{
if (add_to_table && df->analyze_subset)
add_to_table = bitmap_bit_p (df->blocks_to_analyze, bb->index);
- for (i = 0; i < count; i++)
+ for (ix = 0; VEC_iterate (df_ref, old_vec, ix, this_ref); ++ix)
{
- df_ref this_ref = old_vec[i];
- new_vec[i] = this_ref;
- df_install_ref (this_ref, reg_info[DF_REF_REGNO (this_ref)],
+ new_vec[ix] = 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;
}
insn. */
static struct df_mw_hardreg **
-df_install_mws (struct df_mw_hardreg **old_vec, unsigned int count)
+df_install_mws (VEC(df_mw_hardreg_ptr,stack) *old_vec)
{
+ unsigned int count;
+
+ 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, old_vec,
- sizeof (struct df_mw_hardreg*) * (count + 1));
+ memcpy (new_vec, VEC_address (df_mw_hardreg_ptr, old_vec),
+ sizeof (struct df_mw_hardreg*) * count);
+ new_vec[count] = NULL;
return new_vec;
}
else
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)
if (collection_rec->def_vec)
{
df_scan_free_ref_vec (insn_rec->defs);
- insn_rec->defs
- = df_install_refs (bb, collection_rec->def_vec,
- collection_rec->next_def,
+ insn_rec->defs
+ = df_install_refs (bb, collection_rec->def_vec,
df->def_regs,
&df->def_info, false);
}
if (collection_rec->use_vec)
{
df_scan_free_ref_vec (insn_rec->uses);
- insn_rec->uses
- = df_install_refs (bb, collection_rec->use_vec,
- collection_rec->next_use,
+ 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,
- collection_rec->next_eq_use,
+ 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
- = df_install_mws (collection_rec->mw_vec,
- collection_rec->next_mw);
+ insn_rec->mw_hardregs
+ = df_install_mws (collection_rec->mw_vec);
}
}
else
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
- = df_install_refs (bb, collection_rec->def_vec,
- collection_rec->next_def,
+ 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,
- collection_rec->next_use,
+ 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_flags ref_flags,
+ enum df_ref_type ref_type,
+ int ref_flags,
int width, int offset, enum machine_mode mode)
{
df_ref this_ref = NULL;
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))
if (collection_rec)
{
if (DF_REF_REG_DEF_P (this_ref))
- collection_rec->def_vec[collection_rec->next_def++] = this_ref;
+ VEC_safe_push (df_ref, stack, collection_rec->def_vec, this_ref);
else if (DF_REF_FLAGS (this_ref) & DF_REF_IN_NOTE)
- collection_rec->eq_use_vec[collection_rec->next_eq_use++] = this_ref;
+ VEC_safe_push (df_ref, stack, collection_rec->eq_use_vec, this_ref);
else
- collection_rec->use_vec[collection_rec->next_use++] = this_ref;
+ VEC_safe_push (df_ref, stack, collection_rec->use_vec, this_ref);
}
return this_ref;
/* 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
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_flags ref_flags,
- int width, int offset, enum machine_mode mode)
+ enum df_ref_type ref_type,
+ int ref_flags,
+ int width, int offset, enum machine_mode mode)
{
unsigned int regno;
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;
hardreg->start_regno = regno;
hardreg->end_regno = endregno - 1;
hardreg->mw_order = df->ref_order++;
- collection_rec->mw_vec[collection_rec->next_mw++] = hardreg;
+ VEC_safe_push (df_mw_hardreg_ptr, stack, collection_rec->mw_vec,
+ hardreg);
}
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);
}
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);
}
}
static void
df_def_record_1 (struct df_collection_rec *collection_rec,
rtx x, basic_block bb, struct df_insn_info *insn_info,
- enum df_ref_flags flags)
+ int flags)
{
rtx *loc;
rtx dst;
int offset = -1;
int width = -1;
- enum machine_mode mode = 0;
+ enum machine_mode mode = VOIDmode;
enum df_ref_class cl = DF_REF_REGULAR;
/* We may recursively call ourselves on EXPR_LIST when dealing with PARALLEL
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;
if (GET_CODE (dst) == ZERO_EXTRACT)
{
flags |= DF_REF_READ_WRITE | DF_REF_PARTIAL | DF_REF_ZERO_EXTRACT;
-
- if (GET_CODE (XEXP (dst, 1)) == CONST_INT
- && GET_CODE (XEXP (dst, 2)) == CONST_INT)
+
+ if (CONST_INT_P (XEXP (dst, 1))
+ && CONST_INT_P (XEXP (dst, 2)))
{
width = INTVAL (XEXP (dst, 1));
offset = INTVAL (XEXP (dst, 2));
/* 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)))
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);
}
}
/* 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,
- enum df_ref_flags flags)
+ int flags)
{
RTX_CODE code = GET_CODE (x);
if (code == SET || code == CLOBBER)
{
/* Mark the single def within the pattern. */
- enum df_ref_flags clobber_flags = flags;
+ int clobber_flags = flags;
clobber_flags |= (code == CLOBBER) ? DF_REF_MUST_CLOBBER : 0;
df_def_record_1 (collection_rec, x, bb, insn_info, clobber_flags);
}
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)
}
-/* 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
df_uses_record (enum df_ref_class cl, struct df_collection_rec *collection_rec,
rtx *loc, enum df_ref_type ref_type,
basic_block bb, struct df_insn_info *insn_info,
- enum df_ref_flags flags,
+ int flags,
int width, int offset, enum machine_mode mode)
{
RTX_CODE code;
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;
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;
/* If the parameters to the zero or sign extract are
constants, strip them off and recurse, otherwise there is
no information that we can gain from this operation. */
- if (GET_CODE (XEXP (x, 1)) == CONST_INT
- && GET_CODE (XEXP (x, 2)) == CONST_INT)
+ if (CONST_INT_P (XEXP (x, 1))
+ && CONST_INT_P (XEXP (x, 2)))
{
width = INTVAL (XEXP (x, 1));
offset = INTVAL (XEXP (x, 2));
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;
}
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))
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;
}
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:
/* 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;
case ZERO_EXTRACT:
{
- if (GET_CODE (XEXP (dst, 1)) == CONST_INT
- && GET_CODE (XEXP (dst, 2)) == CONST_INT)
+ if (CONST_INT_P (XEXP (dst, 1))
+ && CONST_INT_P (XEXP (dst, 2)))
{
width = INTVAL (XEXP (dst, 1));
offset = INTVAL (XEXP (dst, 2));
mode = GET_MODE (dst);
- 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);
+ 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
+ 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,
+ DF_REF_ZERO_EXTRACT,
+ width, offset, mode);
+ }
+ 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,
+ 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);
}
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;
}
break;
}
+ case VAR_LOCATION:
+ df_uses_record (cl, collection_rec,
+ &PAT_VAR_LOCATION_LOC (x),
+ DF_REF_REG_USE, bb, insn_info,
+ flags, width, offset, mode);
+ return;
+
case PRE_DEC:
case POST_DEC:
case PRE_INC:
case POST_INC:
case PRE_MODIFY:
case POST_MODIFY:
+ 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 ... */
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')
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);
}
}
static void
df_get_conditional_uses (struct df_collection_rec *collection_rec)
{
- unsigned int i;
- for (i = 0; i < collection_rec->next_def; i++)
+ unsigned int ix;
+ df_ref ref;
+
+ for (ix = 0; VEC_iterate (df_ref, collection_rec->def_vec, ix, ref); ++ix)
{
- df_ref ref = collection_rec->def_vec[i];
if (DF_REF_FLAGS_IS_SET (ref, DF_REF_CONDITIONAL))
{
int width = -1;
int offset = -1;
- enum machine_mode mode = 0;
+ enum machine_mode mode = VOIDmode;
df_ref use;
if (DF_REF_FLAGS_IS_SET (ref, DF_REF_SIGN_EXTRACT | DF_REF_ZERO_EXTRACT))
static void
df_get_call_refs (struct df_collection_rec * collection_rec,
- basic_block bb,
+ basic_block bb,
struct df_insn_info *insn_info,
- enum df_ref_flags flags)
+ int flags)
{
rtx note;
bitmap_iterator bi;
unsigned int ui;
bool is_sibling_call;
unsigned int i;
+ df_ref def;
bitmap defs_generated = BITMAP_ALLOC (&df_bitmap_obstack);
/* Do not generate clobbers for registers that are the result of the
call. This causes ordering problems in the chain building code
depending on which def is seen first. */
- for (i=0; i<collection_rec->next_def; i++)
- {
- df_ref def = collection_rec->def_vec[i];
- bitmap_set_bit (defs_generated, DF_REF_REGNO (def));
- }
+ for (i = 0; VEC_iterate (df_ref, collection_rec->def_vec, i, def); ++i)
+ bitmap_set_bit (defs_generated, DF_REF_REGNO (def));
/* Record the registers used to pass arguments, and explicitly
noted as clobbered. */
{
if (GET_CODE (XEXP (note, 0)) == USE)
df_uses_record (DF_REF_REGULAR, collection_rec, &XEXP (XEXP (note, 0), 0),
- DF_REF_REG_USE, bb, insn_info, flags, -1, -1, 0);
+ DF_REF_REG_USE, bb, insn_info, flags, -1, -1,
+ VOIDmode);
else if (GET_CODE (XEXP (note, 0)) == CLOBBER)
{
if (REG_P (XEXP (XEXP (note, 0), 0)))
}
else
df_uses_record (DF_REF_REGULAR, collection_rec, &XEXP (note, 0),
- DF_REF_REG_USE, bb, insn_info, flags, -1, -1, 0);
+ DF_REF_REG_USE, bb, insn_info, flags, -1, -1,
+ VOIDmode);
}
}
/* 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,
- -1, -1, 0);
+ DF_REF_CALL_STACK_USAGE | flags,
+ -1, -1, VOIDmode);
/* Calls may also reference any of the global registers,
so they are recorded as used. */
if (global_regs[i])
{
df_ref_record (DF_REF_BASE, collection_rec, regno_reg_rtx[i],
- NULL, bb, insn_info, DF_REF_REG_USE, flags, -1, -1, 0);
+ NULL, bb, insn_info, DF_REF_REG_USE, flags, -1, -1,
+ VOIDmode);
df_ref_record (DF_REF_BASE, collection_rec, regno_reg_rtx[i],
- NULL, bb, insn_info, DF_REF_REG_DEF, flags, -1, -1, 0);
+ NULL, bb, insn_info, DF_REF_REG_DEF, flags, -1, -1,
+ VOIDmode);
}
is_sibling_call = SIBLING_CALL_P (insn_info->insn);
- EXECUTE_IF_SET_IN_BITMAP (df_invalidated_by_call, 0, ui, bi)
+ EXECUTE_IF_SET_IN_BITMAP (regs_invalidated_by_call_regset, 0, ui, bi)
{
if (!global_regs[ui]
&& (!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,
- -1, -1, 0);
+ DF_REF_MAY_CLOBBER | flags,
+ -1, -1, VOIDmode);
}
BITMAP_FREE (defs_generated);
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);
/* Clear out the collection record. */
- collection_rec->next_def = 0;
- collection_rec->next_use = 0;
- collection_rec->next_eq_use = 0;
- collection_rec->next_mw = 0;
+ VEC_truncate (df_ref, collection_rec->def_vec, 0);
+ VEC_truncate (df_ref, collection_rec->use_vec, 0);
+ VEC_truncate (df_ref, collection_rec->eq_use_vec, 0);
+ VEC_truncate (df_mw_hardreg_ptr, collection_rec->mw_vec, 0);
/* Record register defs. */
df_defs_record (collection_rec, PATTERN (insn_info->insn), bb, insn_info, 0);
case REG_EQUAL:
df_uses_record (DF_REF_REGULAR, collection_rec,
&XEXP (note, 0), DF_REF_REG_USE,
- bb, insn_info, DF_REF_IN_NOTE, -1, -1, 0);
+ bb, insn_info, DF_REF_IN_NOTE, -1, -1, VOIDmode);
break;
case REG_NON_LOCAL_GOTO:
/* The frame ptr is used by a non-local goto. */
df_ref_record (DF_REF_BASE, collection_rec,
regno_reg_rtx[FRAME_POINTER_REGNUM],
NULL, bb, insn_info,
- DF_REF_REG_USE, 0, -1, -1, 0);
+ DF_REF_REG_USE, 0, -1, -1, VOIDmode);
#if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
df_ref_record (DF_REF_BASE, collection_rec,
regno_reg_rtx[HARD_FRAME_POINTER_REGNUM],
NULL, bb, insn_info,
- DF_REF_REG_USE, 0, -1, -1, 0);
+ DF_REF_REG_USE, 0, -1, -1, VOIDmode);
#endif
break;
default:
}
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,
- -1, -1, 0);
+ &PATTERN (insn_info->insn), DF_REF_REG_USE, bb, insn_info, 0,
+ -1, -1, VOIDmode);
/* DF_REF_CONDITIONAL needs corresponding USES. */
if (is_cond_exec)
}
-/* Returns true if the function entry needs to
- define the static chain register. */
-
-static bool
-df_need_static_chain_reg (struct function *fun)
-{
- tree fun_context = decl_function_context (fun->decl);
- return fun_context
- && DECL_NO_STATIC_CHAIN (fun_context) == false;
-}
-
-
/* Collect all artificial refs at the block level for BB and add them
to COLLECTION_REC. */
static void
df_bb_refs_collect (struct df_collection_rec *collection_rec, basic_block bb)
{
- collection_rec->next_def = 0;
- collection_rec->next_use = 0;
- collection_rec->next_eq_use = 0;
- collection_rec->next_mw = 0;
+ VEC_truncate (df_ref, collection_rec->def_vec, 0);
+ VEC_truncate (df_ref, collection_rec->use_vec, 0);
+ VEC_truncate (df_ref, collection_rec->eq_use_vec, 0);
+ VEC_truncate (df_mw_hardreg_ptr, collection_rec->mw_vec, 0);
if (bb->index == ENTRY_BLOCK)
{
if (regno == INVALID_REGNUM)
break;
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[regno], NULL,
- bb, NULL, DF_REF_REG_DEF, DF_REF_AT_TOP, -1, -1, 0);
+ bb, NULL, DF_REF_REG_DEF, DF_REF_AT_TOP, -1, -1,
+ VOIDmode);
}
}
#endif
-
-#ifdef EH_USES
- if (bb_has_eh_pred (bb))
- {
- unsigned int i;
- /* This code is putting in an artificial ref for the use at the
- TOP of the block that receives the exception. It is too
- cumbersome to actually put the ref on the edge. We could
- either model this at the top of the receiver block or the
- bottom of the sender block.
-
- The bottom of the sender block is problematic because not all
- out-edges of a block are eh-edges. However, it is true
- that all edges into a block are either eh-edges or none of
- them are eh-edges. Thus, we can model this at the top of the
- eh-receiver for all of the edges at once. */
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- if (EH_USES (i))
- df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL,
- bb, NULL, DF_REF_REG_USE, DF_REF_AT_TOP, -1, -1, 0);
- }
-#endif
-
/* Add the hard_frame_pointer if this block is the target of a
non-local goto. */
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, 0);
-
+ 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)
{
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[regno], NULL,
- bb, NULL, DF_REF_REG_USE, 0, -1, -1, 0);
+ bb, NULL, DF_REF_REG_USE, 0, -1, -1, VOIDmode);
}
}
int luid = 0;
struct df_scan_bb_info *bb_info;
struct df_collection_rec collection_rec;
- collection_rec.def_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.eq_use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.mw_vec = XALLOCAVEC (struct df_mw_hardreg *, 100);
if (!df)
return;
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);
bb_info->artificial_uses = NULL;
}
+ collection_rec.def_vec = VEC_alloc (df_ref, stack, 128);
+ collection_rec.use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.eq_use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.mw_vec = VEC_alloc (df_mw_hardreg_ptr, stack, 32);
+
if (scan_insns)
/* Scan the block an insn at a time from beginning to end. */
FOR_BB_INSNS (bb, insn)
df_bb_refs_collect (&collection_rec, bb);
df_refs_add_to_chains (&collection_rec, bb, NULL);
+ VEC_free (df_ref, stack, collection_rec.def_vec);
+ VEC_free (df_ref, stack, collection_rec.use_vec);
+ VEC_free (df_ref, stack, collection_rec.eq_use_vec);
+ VEC_free (df_mw_hardreg_ptr, stack, collection_rec.mw_vec);
+
/* Now that the block has been processed, set the block as dirty so
LR and LIVE will get it processed. */
df_set_bb_dirty (bb);
static void
df_get_regular_block_artificial_uses (bitmap regular_block_artificial_uses)
{
+#ifdef EH_USES
+ unsigned int i;
+#endif
+
bitmap_clear (regular_block_artificial_uses);
if (reload_completed)
/* 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
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
}
/* The all-important stack pointer must always be live. */
bitmap_set_bit (regular_block_artificial_uses, STACK_POINTER_REGNUM);
+
+#ifdef EH_USES
+ /* EH_USES registers are used:
+ 1) at all insns that might throw (calls or with -fnon-call-exceptions
+ trapping insns)
+ 2) in all EH edges
+ 3) to support backtraces and/or debugging, anywhere between their
+ initialization and where they the saved registers are restored
+ from them, including the cases where we don't reach the epilogue
+ (noreturn call or infinite loop). */
+ for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
+ if (EH_USES (i))
+ bitmap_set_bit (regular_block_artificial_uses, i);
+#endif
}
gcc_assert (GET_MODE (reg) != BLKmode);
- bitmap_set_bit (set, regno);
if (regno < FIRST_PSEUDO_REGISTER)
{
int n = hard_regno_nregs[regno][GET_MODE (reg)];
- while (--n > 0)
- bitmap_set_bit (set, regno + n);
+ bitmap_set_range (set, regno, n);
}
+ else
+ bitmap_set_bit (set, regno);
}
bitmap_set_bit (entry_block_defs, i);
#endif
}
-
+
/* The always important stack pointer. */
bitmap_set_bit (entry_block_defs, STACK_POINTER_REGNUM);
if ((call_used_regs[i] == 0) && (df_regs_ever_live_p (i)))
bitmap_set_bit (entry_block_defs, i);
}
- else
- {
- /* If STATIC_CHAIN_INCOMING_REGNUM == STATIC_CHAIN_REGNUM
- only STATIC_CHAIN_REGNUM is defined. If they are different,
- we only care about the STATIC_CHAIN_INCOMING_REGNUM. */
-#ifdef STATIC_CHAIN_INCOMING_REGNUM
- bitmap_set_bit (entry_block_defs, STATIC_CHAIN_INCOMING_REGNUM);
-#else
-#ifdef STATIC_CHAIN_REGNUM
- bitmap_set_bit (entry_block_defs, STATIC_CHAIN_REGNUM);
-#endif
-#endif
- }
r = targetm.calls.struct_value_rtx (current_function_decl, true);
if (r && REG_P (r))
bitmap_set_bit (entry_block_defs, REGNO (r));
+ /* If the function has an incoming STATIC_CHAIN, it has to show up
+ in the entry def set. */
+ r = targetm.calls.static_chain (current_function_decl, true);
+ if (r && REG_P (r))
+ bitmap_set_bit (entry_block_defs, REGNO (r));
+
if ((!reload_completed) || frame_pointer_needed)
{
/* Any reference to any pseudo before reload is a potential
/* These registers are live everywhere. */
if (!reload_completed)
{
-#ifdef EH_USES
- /* The ia-64, the only machine that uses this, does not define these
- until after reload. */
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- if (EH_USES (i))
- {
- bitmap_set_bit (entry_block_defs, i);
- }
-#endif
-
#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
/* Pseudos with argument area equivalences may require
reloading via the argument pointer. */
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. */
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);
- /* If the function has an incoming STATIC_CHAIN,
- it has to show up in the entry def set. */
- if (df_need_static_chain_reg (cfun))
- {
-#ifdef STATIC_CHAIN_INCOMING_REGNUM
- bitmap_set_bit (entry_block_defs, STATIC_CHAIN_INCOMING_REGNUM);
-#else
-#ifdef STATIC_CHAIN_REGNUM
- bitmap_set_bit (entry_block_defs, STATIC_CHAIN_REGNUM);
-#endif
-#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,
- ENTRY_BLOCK_PTR, NULL, DF_REF_REG_DEF, 0, -1, -1, 0);
+ 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);
}
df_canonize_collection_rec (collection_rec);
{
struct df_collection_rec collection_rec;
memset (&collection_rec, 0, sizeof (struct df_collection_rec));
- collection_rec.def_vec = XALLOCAVEC (df_ref, FIRST_PSEUDO_REGISTER);
-
+ collection_rec.def_vec = VEC_alloc (df_ref, stack, FIRST_PSEUDO_REGISTER);
df_entry_block_defs_collect (&collection_rec, entry_block_defs);
/* Process bb_refs chain */
df_refs_add_to_chains (&collection_rec, BASIC_BLOCK (ENTRY_BLOCK), NULL);
+ VEC_free (df_ref, stack, collection_rec.def_vec);
}
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);
&& 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. */
&& !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)
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)
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[i], NULL,
- EXIT_BLOCK_PTR, NULL, DF_REF_REG_USE, 0, -1, -1, 0);
+ EXIT_BLOCK_PTR, NULL, DF_REF_REG_USE, 0, -1, -1, VOIDmode);
#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])
df_ref_record (DF_REF_ARTIFICIAL, collection_rec, regno_reg_rtx[ARG_POINTER_REGNUM], NULL,
- EXIT_BLOCK_PTR, NULL, DF_REF_REG_USE, 0, -1, -1, 0);
+ EXIT_BLOCK_PTR, NULL, DF_REF_REG_USE, 0, -1, -1, VOIDmode);
#endif
df_canonize_collection_rec (collection_rec);
}
-/* 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
{
struct df_collection_rec collection_rec;
memset (&collection_rec, 0, sizeof (struct df_collection_rec));
- collection_rec.use_vec = XALLOCAVEC (df_ref, FIRST_PSEUDO_REGISTER);
+ collection_rec.use_vec = VEC_alloc (df_ref, stack, FIRST_PSEUDO_REGISTER);
df_exit_block_uses_collect (&collection_rec, exit_block_uses);
/* Process bb_refs chain */
df_refs_add_to_chains (&collection_rec, BASIC_BLOCK (EXIT_BLOCK), NULL);
+ VEC_free (df_ref, stack, collection_rec.use_vec);
}
/* Initialize some platform specific structures. */
-void
+void
df_hard_reg_init (void)
{
- int i;
#ifdef ELIMINABLE_REGS
+ int i;
static const struct {const int from, to; } eliminables[] = ELIMINABLE_REGS;
#endif
if (initialized)
return;
- bitmap_obstack_initialize (&persistent_obstack);
-
/* 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
-
- df_invalidated_by_call = BITMAP_ALLOC (&persistent_obstack);
-
- /* Inconveniently, this is only readily available in hard reg set
- form. */
- for (i = 0; i < FIRST_PSEUDO_REGISTER; ++i)
- if (TEST_HARD_REG_BIT (regs_invalidated_by_call, i))
- bitmap_set_bit (df_invalidated_by_call, i);
-
+
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;
/* 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)
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);
return df->hard_regs_live_count[reg] != 0;
}
unsigned int
df_hard_reg_used_count (unsigned int reg)
{
- gcc_assert (df);
return df->hard_regs_live_count[reg];
}
/* Get the value of regs_ever_live[REGNO]. */
-bool
+bool
df_regs_ever_live_p (unsigned int regno)
{
return regs_ever_live[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)
{
unsigned int i;
bool changed = df->redo_entry_and_exit;
-
+
if (reset)
memset (regs_ever_live, 0, sizeof (regs_ever_live));
df_reg_chain_mark (refs, regno, is_def, is_eq_use)
df_reg_chain_verify_unmarked (refs)
- df_refs_verify (ref*, ref*, bool)
+ df_refs_verify (VEC(stack,df_ref)*, ref*, bool)
df_mws_verify (mw*, mw*, bool)
df_insn_refs_verify (collection_rec, bb, insn, bool)
df_bb_refs_verify (bb, refs, bool)
/* 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;
}
-/* 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)
/* Verify that NEW_REC and OLD_REC have exactly the same members. */
static bool
-df_refs_verify (df_ref *new_rec, df_ref *old_rec,
+df_refs_verify (VEC(df_ref,stack) *new_rec, df_ref *old_rec,
bool abort_if_fail)
{
- while ((*new_rec) && (*old_rec))
+ unsigned int ix;
+ df_ref new_ref;
+
+ for (ix = 0; VEC_iterate (df_ref, new_rec, ix, new_ref); ++ix)
{
- if (!df_ref_equal_p (*new_rec, *old_rec))
+ if (*old_rec == NULL || !df_ref_equal_p (new_ref, *old_rec))
{
if (abort_if_fail)
gcc_assert (0);
DF_REF_REG_UNMARK (*old_rec);
}
- new_rec++;
old_rec++;
}
if (abort_if_fail)
- gcc_assert ((*new_rec == NULL) && (*old_rec == NULL));
+ gcc_assert (*old_rec == NULL);
else
- return ((*new_rec == NULL) && (*old_rec == NULL));
+ return *old_rec == NULL;
return false;
}
/* Verify that NEW_REC and OLD_REC have exactly the same members. */
static bool
-df_mws_verify (struct df_mw_hardreg **new_rec, struct df_mw_hardreg **old_rec,
+df_mws_verify (VEC(df_mw_hardreg_ptr,stack) *new_rec,
+ struct df_mw_hardreg **old_rec,
bool abort_if_fail)
{
- while ((*new_rec) && (*old_rec))
+ unsigned int ix;
+ struct df_mw_hardreg *new_reg;
+
+ for (ix = 0; VEC_iterate (df_mw_hardreg_ptr, new_rec, ix, new_reg); ++ix)
{
- if (!df_mw_equal_p (*new_rec, *old_rec))
+ if (*old_rec == NULL || !df_mw_equal_p (new_reg, *old_rec))
{
if (abort_if_fail)
gcc_assert (0);
else
return false;
}
- new_rec++;
old_rec++;
}
if (abort_if_fail)
- gcc_assert ((*new_rec == NULL) && (*old_rec == NULL));
+ gcc_assert (*old_rec == NULL);
else
- return ((*new_rec == NULL) && (*old_rec == NULL));
+ return *old_rec == NULL;
return false;
}
/* 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
static bool
df_insn_refs_verify (struct df_collection_rec *collection_rec,
- basic_block bb,
+ basic_block bb,
rtx insn,
bool abort_if_fail)
{
/* 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);
}
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 = XALLOCAVEC (df_ref, 1000);
- collection_rec.use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.eq_use_vec = XALLOCAVEC (df_ref, 1000);
- collection_rec.mw_vec = XALLOCAVEC (struct df_mw_hardreg *, 100);
+ collection_rec.def_vec = VEC_alloc (df_ref, stack, 128);
+ collection_rec.use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.eq_use_vec = VEC_alloc (df_ref, stack, 32);
+ collection_rec.mw_vec = VEC_alloc (df_mw_hardreg_ptr, stack, 32);
gcc_assert (bb_info);
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
}
-/* 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
/* (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));
}
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);
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
OSDN Git Service
