From 2f33ff0a9d2192cf69aac8c057d74fd5217e1619 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 27 Aug 2014 20:40:05 +0000 Subject: Use rtx_expr_list in various places gcc/ 2014-08-27 David Malcolm * rtl.h (free_EXPR_LIST_list): Strengthen param from rtx * to rtx_expr_list **. (alloc_EXPR_LIST): Strengthen return type from rtx to rtx_expr_list *. (remove_free_EXPR_LIST_node): Likewise for param. * reload.h (struct reg_equivs_t): Strengthen field "alt_mem_list" from rtx to rtx_expr_list *. * sched-int.h (struct deps_desc): Strengthen fields "pending_read_mems" and "pending_write_mems" from rtx to rtx_expr_list *. * dwarf2out.c (decl_piece_varloc_ptr): Strengthen return type from rtx to rtx_expr_list *. * lists.c (alloc_INSN_LIST): Likewise, also for local "r". (free_EXPR_LIST_list): Strengthen param "listp" from rtx * to rtx_expr_list **. (remove_free_EXPR_LIST_node): Likewise. Strengthen local "node" from rtx to rtx_expr_list *. * loop-iv.c (simplify_using_initial_values): Strengthen local "cond_list" from rtx to rtx_expr_list *, and locals "pnode", "pnote_next" from rtx * to rtx_expr_list **. * sched-deps.c (remove_from_both_dependence_lists): Strengthen param "exprp" from rtx * to rtx_expr_list **. (add_insn_mem_dependence): Strengthen local "mem_list" from rtx * to rtx_expr_list **. Strengthen local "mem_node" from rtx to rtx_expr_list *. * sched-rgn.c (concat_insn_mem_list): Strengthen param "copy_mems" and local "new_mems" from rtx to rtx_expr_list *. Strengthen param "old_mems_p" from rtx * to rtx_expr_list **. * var-tracking.c (struct adjust_mem_data): Strengthen field "side_effects" from rtx to rtx_expr_list *. (adjust_insn): Replace NULL_RTX with NULL when assigning to rtx_expr_list *. (prepare_call_arguments): Likewise. From-SVN: r214605 --- gcc/sched-rgn.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gcc/sched-rgn.c') diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c index 92a8a27..93bebc9 100644 --- a/gcc/sched-rgn.c +++ b/gcc/sched-rgn.c @@ -240,8 +240,8 @@ static void add_branch_dependences (rtx_insn *, rtx_insn *); static void compute_block_dependences (int); static void schedule_region (int); -static void concat_insn_mem_list (rtx_insn_list *, rtx, - rtx_insn_list **, rtx *); +static void concat_insn_mem_list (rtx_insn_list *, rtx_expr_list *, + rtx_insn_list **, rtx_expr_list **); static void propagate_deps (int, struct deps_desc *); static void free_pending_lists (void); @@ -2585,19 +2585,20 @@ add_branch_dependences (rtx_insn *head, rtx_insn *tail) static struct deps_desc *bb_deps; static void -concat_insn_mem_list (rtx_insn_list *copy_insns, rtx copy_mems, +concat_insn_mem_list (rtx_insn_list *copy_insns, + rtx_expr_list *copy_mems, rtx_insn_list **old_insns_p, - rtx *old_mems_p) + rtx_expr_list **old_mems_p) { rtx_insn_list *new_insns = *old_insns_p; - rtx new_mems = *old_mems_p; + rtx_expr_list *new_mems = *old_mems_p; while (copy_insns) { new_insns = alloc_INSN_LIST (copy_insns->insn (), new_insns); - new_mems = alloc_EXPR_LIST (VOIDmode, XEXP (copy_mems, 0), new_mems); + new_mems = alloc_EXPR_LIST (VOIDmode, copy_mems->element (), new_mems); copy_insns = copy_insns->next (); - copy_mems = XEXP (copy_mems, 1); + copy_mems = copy_mems->next (); } *old_insns_p = new_insns; -- cgit v1.1