From 00a0544711bcbae399fe07d29e5e06a0c416e214 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Sun, 5 Jan 2014 01:57:47 -0500 Subject: [PATCH 074/159] FIXME: var-tracking.c --- gcc/var-tracking.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index d6dd056..0673256 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -179,7 +179,7 @@ typedef struct micro_operation_def instruction or note in the original flow (before any var-tracking notes are inserted, to simplify emission of notes), for MO_SET and MO_CLOBBER. */ - rtx insn; + rtx_base_insn insn; union { /* Location. For MO_SET and MO_COPY, this is the SET that @@ -509,7 +509,7 @@ typedef variable_table_type::iterator variable_iterator_type; typedef struct emit_note_data_def { /* The instruction which the note will be emitted before/after. */ - rtx insn; + rtx_base_insn insn; /* Where the note will be emitted (before/after insn)? */ enum emit_note_where where; @@ -622,7 +622,7 @@ static bool cselib_hook_called; /* Local function prototypes. */ static void stack_adjust_offset_pre_post (rtx, HOST_WIDE_INT *, HOST_WIDE_INT *); -static void insn_stack_adjust_offset_pre_post (rtx, HOST_WIDE_INT *, +static void insn_stack_adjust_offset_pre_post (rtx_base_insn, HOST_WIDE_INT *, HOST_WIDE_INT *); static bool vt_stack_adjustments (void); @@ -793,7 +793,7 @@ stack_adjust_offset_pre_post (rtx pattern, HOST_WIDE_INT *pre, PRE- and POST-modifying stack pointer. */ static void -insn_stack_adjust_offset_pre_post (rtx insn, HOST_WIDE_INT *pre, +insn_stack_adjust_offset_pre_post (rtx_base_insn insn, HOST_WIDE_INT *pre, HOST_WIDE_INT *post) { rtx pattern; @@ -862,7 +862,7 @@ vt_stack_adjustments (void) /* Check if the edge destination has been visited yet. */ if (!VTI (dest)->visited) { - rtx insn; + rtx_base_insn insn; HOST_WIDE_INT pre, post, offset; VTI (dest)->visited = true; VTI (dest)->in.stack_adjust = offset = VTI (src)->out.stack_adjust; @@ -1174,7 +1174,7 @@ adjust_mem_stores (rtx loc, const_rtx expr, void *data) as other sets to the insn. */ static void -adjust_insn (basic_block bb, rtx insn) +adjust_insn (basic_block bb, rtx_base_insn insn) { struct adjust_mem_data amd; rtx set; @@ -2446,7 +2446,8 @@ val_bind (dataflow_set *set, rtx val, rtx loc, bool modified) values bound to it. */ static void -val_store (dataflow_set *set, rtx val, rtx loc, rtx insn, bool modified) +val_store (dataflow_set *set, rtx val, rtx loc, rtx_base_insn insn, + bool modified) { cselib_val *v = CSELIB_VAL_PTR (val); @@ -2577,7 +2578,7 @@ val_reset (dataflow_set *set, decl_or_value dv) value. */ static void -val_resolve (dataflow_set *set, rtx val, rtx loc, rtx insn) +val_resolve (dataflow_set *set, rtx val, rtx loc, rtx_base_insn insn) { decl_or_value dv = dv_from_value (val); @@ -5255,7 +5256,7 @@ var_lowpart (enum machine_mode mode, rtx loc) struct count_use_info { /* The insn where the RTX is. */ - rtx insn; + rtx_base_insn insn; /* The basic block where insn is. */ basic_block bb; @@ -5437,7 +5438,7 @@ use_type (rtx loc, struct count_use_info *cui, enum machine_mode *modep) INSN of BB. */ static inline void -log_op_type (rtx x, basic_block bb, rtx insn, +log_op_type (rtx x, basic_block bb, rtx_base_insn insn, enum micro_operation_type mopt, FILE *out) { fprintf (out, "bb %i op %i insn %i %s ", @@ -5689,7 +5690,7 @@ add_uses_1 (rtx *x, void *cui) no longer live we can express its value as VAL - 6. */ static void -reverse_op (rtx val, const_rtx expr, rtx insn) +reverse_op (rtx val, const_rtx expr, rtx_base_insn insn) { rtx src, arg, ret; cselib_val *v; @@ -6077,7 +6078,7 @@ static rtx call_arguments; /* Compute call_arguments. */ static void -prepare_call_arguments (basic_block bb, rtx insn) +prepare_call_arguments (basic_block bb, rtx_base_insn insn) { rtx link, x, call; rtx prev, cur, next; @@ -6413,8 +6414,10 @@ prepare_call_arguments (basic_block bb, rtx insn) first place, in which case sets and n_sets will be 0). */ static void -add_with_sets (rtx insn, struct cselib_set *sets, int n_sets) +add_with_sets (rtx uncast_insn, struct cselib_set *sets, int n_sets) { + rtx_base_insn insn = uncast_insn->as_an_rtx_base_insn (); + /* TODO: eliminate the above cast. */ basic_block bb = BLOCK_FOR_INSN (insn); int n1, n2; struct count_use_info cui; @@ -6611,7 +6614,7 @@ compute_bb_dataflow (basic_block bb) FOR_EACH_VEC_ELT (VTI (bb)->mos, i, mo) { - rtx insn = mo->insn; + rtx_base_insn insn = mo->insn; switch (mo->type) { @@ -8535,7 +8538,7 @@ int emit_note_insn_var_location (variable_def **varp, emit_note_data *data) { variable var = *varp; - rtx insn = data->insn; + rtx_base_insn insn = data->insn; enum emit_note_where where = data->where; variable_table_type vars = data->vars; rtx_note note; @@ -8918,7 +8921,7 @@ process_changed_values (variable_table_type htab) the notes shall be emitted before of after instruction INSN. */ static void -emit_notes_for_changes (rtx insn, enum emit_note_where where, +emit_notes_for_changes (rtx_base_insn insn, enum emit_note_where where, shared_hash vars) { emit_note_data data; @@ -9036,7 +9039,7 @@ emit_notes_for_differences_2 (variable_def **slot, variable_table_type old_vars) NEW_SET. */ static void -emit_notes_for_differences (rtx insn, dataflow_set *old_set, +emit_notes_for_differences (rtx_base_insn insn, dataflow_set *old_set, dataflow_set *new_set) { shared_hash_htab (old_set->vars) @@ -9050,8 +9053,8 @@ emit_notes_for_differences (rtx insn, dataflow_set *old_set, /* Return the next insn after INSN that is not a NOTE_INSN_VAR_LOCATION. */ -static rtx -next_non_note_insn_var_location (rtx insn) +static rtx_base_insn +next_non_note_insn_var_location (rtx_base_insn insn) { while (insn) { @@ -9078,8 +9081,8 @@ emit_notes_in_bb (basic_block bb, dataflow_set *set) FOR_EACH_VEC_ELT (VTI (bb)->mos, i, mo) { - rtx insn = mo->insn; - rtx next_insn = next_non_note_insn_var_location (insn); + rtx_base_insn insn = mo->insn; + rtx_base_insn next_insn = next_non_note_insn_var_location (insn); switch (mo->type) { @@ -9999,7 +10002,7 @@ vt_initialize (void) FOR_EACH_BB (bb) { - rtx insn; + rtx_base_insn insn; HOST_WIDE_INT pre, post = 0; basic_block first_bb, last_bb; -- 1.7.11.7