/* Array, indexed by basic block number for a list of insns which modify
memory within that block. */
-static rtx * modify_mem_list;
+static VEC (rtx,heap) **modify_mem_list;
static bitmap modify_mem_list_set;
-/* This array parallels modify_mem_list, but is kept canonicalized. */
-static rtx * canon_modify_mem_list;
+typedef struct modify_pair_s
+{
+ rtx dest; /* A MEM. */
+ rtx dest_addr; /* The canonical address of `dest'. */
+} modify_pair;
+
+DEF_VEC_O(modify_pair);
+DEF_VEC_ALLOC_O(modify_pair,heap);
+
+/* This array parallels modify_mem_list, except that it stores MEMs
+ being set and their canonicalized memory addresses. */
+static VEC (modify_pair,heap) **canon_modify_mem_list;
/* Bitmap indexed by block numbers to record which blocks contain
function calls. */
static void compute_ld_motion_mems (void);
static void trim_ld_motion_mems (void);
static void update_ld_motion_stores (struct expr *);
-static void free_insn_expr_list_list (rtx *);
static void clear_modify_mem_tables (void);
static void free_modify_mem_tables (void);
static rtx gcse_emit_move_after (rtx, rtx, rtx);
/* Allocate array to keep a list of insns which modify memory in each
basic block. */
- modify_mem_list = GCNEWVEC (rtx, last_basic_block);
- canon_modify_mem_list = GCNEWVEC (rtx, last_basic_block);
+ modify_mem_list = GCNEWVEC (VEC (rtx,heap) *, last_basic_block);
+ canon_modify_mem_list = GCNEWVEC (VEC (modify_pair,heap) *,
+ last_basic_block);
modify_mem_list_set = BITMAP_ALLOC (NULL);
blocks_with_calls = BITMAP_ALLOC (NULL);
}
/* GCSE'ing constants:
We do not specifically distinguish between constant and non-constant
- expressions in PRE and Hoist. We use rtx_cost below to limit
+ expressions in PRE and Hoist. We use set_src_cost below to limit
the maximum distance simple expressions can travel.
Nevertheless, constants are much easier to GCSE, and, hence,
gcc_assert (!optimize_function_for_speed_p (cfun)
&& optimize_function_for_size_p (cfun));
- cost = rtx_cost (x, SET, 0);
+ cost = set_src_cost (x, 0);
if (cost < COSTS_N_INSNS (GCSE_UNRESTRICTED_COST))
{
static int
load_killed_in_block_p (const_basic_block bb, int uid_limit, const_rtx x, int avail_p)
{
- rtx list_entry = modify_mem_list[bb->index];
+ VEC (rtx,heap) *list = modify_mem_list[bb->index];
+ rtx setter;
+ unsigned ix;
/* If this is a readonly then we aren't going to be changing it. */
if (MEM_READONLY_P (x))
return 0;
- while (list_entry)
+ FOR_EACH_VEC_ELT_REVERSE (rtx, list, ix, setter)
{
- rtx setter;
/* Ignore entries in the list that do not apply. */
if ((avail_p
- && DF_INSN_LUID (XEXP (list_entry, 0)) < uid_limit)
+ && DF_INSN_LUID (setter) < uid_limit)
|| (! avail_p
- && DF_INSN_LUID (XEXP (list_entry, 0)) > uid_limit))
- {
- list_entry = XEXP (list_entry, 1);
- continue;
- }
-
- setter = XEXP (list_entry, 0);
+ && DF_INSN_LUID (setter) > uid_limit))
+ continue;
/* If SETTER is a call everything is clobbered. Note that calls
to pure functions are never put on the list, so we need not
note_stores (PATTERN (setter), mems_conflict_for_gcse_p, NULL);
if (gcse_mems_conflict_p)
return 1;
- list_entry = XEXP (list_entry, 1);
}
return 0;
}
{
rtx dest_addr, insn;
int bb;
+ modify_pair *pair;
while (GET_CODE (dest) == SUBREG
|| GET_CODE (dest) == ZERO_EXTRACT
insn = (rtx) v_insn;
bb = BLOCK_FOR_INSN (insn)->index;
- canon_modify_mem_list[bb] =
- alloc_EXPR_LIST (VOIDmode, dest_addr, canon_modify_mem_list[bb]);
- canon_modify_mem_list[bb] =
- alloc_EXPR_LIST (VOIDmode, dest, canon_modify_mem_list[bb]);
+ pair = VEC_safe_push (modify_pair, heap, canon_modify_mem_list[bb], NULL);
+ pair->dest = dest;
+ pair->dest_addr = dest_addr;
}
/* Record memory modification information for INSN. We do not actually care
/* load_killed_in_block_p will handle the case of calls clobbering
everything. */
- modify_mem_list[bb] = alloc_INSN_LIST (insn, modify_mem_list[bb]);
+ VEC_safe_push (rtx, heap, modify_mem_list[bb], insn);
bitmap_set_bit (modify_mem_list_set, bb);
if (CALL_P (insn))
- {
- /* Note that traversals of this loop (other than for free-ing)
- will break after encountering a CALL_INSN. So, there's no
- need to insert a pair of items, as canon_list_insert does. */
- canon_modify_mem_list[bb] =
- alloc_INSN_LIST (insn, canon_modify_mem_list[bb]);
- bitmap_set_bit (blocks_with_calls, bb);
- }
+ bitmap_set_bit (blocks_with_calls, bb);
else
note_stores (PATTERN (insn), canon_list_insert, (void*) insn);
}
\f
/* Expression tracking support. */
-/* Like free_INSN_LIST_list or free_EXPR_LIST_list, except that the node
- types may be mixed. */
-
-static void
-free_insn_expr_list_list (rtx *listp)
-{
- rtx list, next;
-
- for (list = *listp; list ; list = next)
- {
- next = XEXP (list, 1);
- if (GET_CODE (list) == EXPR_LIST)
- free_EXPR_LIST_node (list);
- else
- free_INSN_LIST_node (list);
- }
-
- *listp = NULL;
-}
-
/* Clear canon_modify_mem_list and modify_mem_list tables. */
static void
clear_modify_mem_tables (void)
EXECUTE_IF_SET_IN_BITMAP (modify_mem_list_set, 0, i, bi)
{
- free_INSN_LIST_list (modify_mem_list + i);
- free_insn_expr_list_list (canon_modify_mem_list + i);
+ VEC_free (rtx, heap, modify_mem_list[i]);
+ VEC_free (modify_pair, heap, canon_modify_mem_list[i]);
}
bitmap_clear (modify_mem_list_set);
bitmap_clear (blocks_with_calls);
blocks_with_calls,
0, bb_index, bi)
{
- rtx list_entry = canon_modify_mem_list[bb_index];
+ VEC (modify_pair,heap) *list
+ = canon_modify_mem_list[bb_index];
+ modify_pair *pair;
+ unsigned ix;
- while (list_entry)
+ FOR_EACH_VEC_ELT_REVERSE (modify_pair, list, ix, pair)
{
- rtx dest, dest_addr;
-
- /* LIST_ENTRY must be an INSN of some kind that sets memory.
- Examine each hunk of memory that is modified. */
-
- dest = XEXP (list_entry, 0);
- list_entry = XEXP (list_entry, 1);
- dest_addr = XEXP (list_entry, 0);
+ rtx dest = pair->dest;
+ rtx dest_addr = pair->dest_addr;
if (canon_true_dependence (dest, GET_MODE (dest), dest_addr,
x, NULL_RTX, rtx_addr_varies_p))
- {
- RESET_BIT (bmap[bb_index], indx);
- }
- list_entry = XEXP (list_entry, 1);
+ RESET_BIT (bmap[bb_index], indx);
}
}
}
0, /* properties_destroyed */
0, /* todo_flags_start */
TODO_df_finish | TODO_verify_rtl_sharing |
- TODO_dump_func |
TODO_verify_flow | TODO_ggc_collect /* todo_flags_finish */
}
};
0, /* properties_destroyed */
0, /* todo_flags_start */
TODO_df_finish | TODO_verify_rtl_sharing |
- TODO_dump_func |
TODO_verify_flow | TODO_ggc_collect /* todo_flags_finish */
}
};
#include "gt-gcse.h"
-
OSDN Git Service
