From 9de2db757e115c83bf1452e16f7f9b755a1b1f0d Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 31 Dec 2013 05:18:28 -0500 Subject: [PATCH 040/159] FIXME: types within bt-load.c --- gcc/bt-load.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/bt-load.c b/gcc/bt-load.c index 09eea06..3a67e3a 100644 --- a/gcc/bt-load.c +++ b/gcc/bt-load.c @@ -53,7 +53,7 @@ typedef struct btr_user_s struct btr_user_s *next; basic_block bb; int luid; - rtx insn; + rtx_base_insn insn; /* If INSN has a single use of a single branch register, then USE points to it within INSN. If there is more than one branch register use, or the use is in some way ambiguous, @@ -79,7 +79,7 @@ typedef struct btr_def_s struct btr_def_s *next_this_group; basic_block bb; int luid; - rtx insn; + rtx_base_insn insn; int btr; int cost; /* For a branch register setting insn that has a constant @@ -117,9 +117,9 @@ static rtx *find_btr_use (rtx); static int btr_referenced_p (rtx, rtx *); static int find_btr_reference (rtx *, void *); static void find_btr_def_group (btr_def_group *, btr_def); -static btr_def add_btr_def (fibheap_t, basic_block, int, rtx, +static btr_def add_btr_def (fibheap_t, basic_block, int, rtx_base_insn, unsigned int, int, btr_def_group *); -static btr_user new_btr_user (basic_block, int, rtx); +static btr_user new_btr_user (basic_block, int, rtx_base_insn); static void dump_hard_reg_set (HARD_REG_SET); static void dump_btrs_live (int); static void note_other_use_this_block (unsigned int, btr_user); @@ -297,7 +297,8 @@ find_btr_def_group (btr_def_group *all_btr_def_groups, btr_def def) block BB, instruction INSN, and insert it into ALL_BTR_DEFS. Return the new definition. */ static btr_def -add_btr_def (fibheap_t all_btr_defs, basic_block bb, int insn_luid, rtx insn, +add_btr_def (fibheap_t all_btr_defs, basic_block bb, int insn_luid, + rtx_base_insn insn, unsigned int dest_reg, int other_btr_uses_before_def, btr_def_group *all_btr_def_groups) { @@ -330,7 +331,7 @@ add_btr_def (fibheap_t all_btr_defs, basic_block bb, int insn_luid, rtx insn, /* Create a new target register user structure, for a use in block BB, instruction INSN. Return the new user. */ static btr_user -new_btr_user (basic_block bb, int insn_luid, rtx insn) +new_btr_user (basic_block bb, int insn_luid, rtx_base_insn insn) { /* This instruction reads target registers. We need to decide whether we can replace all target register @@ -463,7 +464,7 @@ compute_defs_uses_and_gen (fibheap_t all_btr_defs, btr_def *def_array, basic_block bb = BASIC_BLOCK (i); int reg; btr_def defs_this_bb = NULL; - rtx insn; + rtx_base_insn insn; rtx last; int can_throw = 0; @@ -671,7 +672,7 @@ link_btr_uses (btr_def *def_array, btr_user *use_array, sbitmap *bb_out, for (i = NUM_FIXED_BLOCKS; i < last_basic_block; i++) { basic_block bb = BASIC_BLOCK (i); - rtx insn; + rtx_base_insn insn; rtx last; bitmap_union_of_preds (reaching_defs, bb_out, BASIC_BLOCK (i)); -- 1.7.11.7