From 655f2bef9ad3d254b55f5639ea553d5496e294d9 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 7 Jan 2014 16:04:34 -0500 Subject: [PATCH 086/159] FIXME: reg-stack.c --- gcc/reg-stack.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index 7d3789a..928f52a 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -247,11 +247,11 @@ static int stack_regs_mentioned_p (const_rtx pat); static void pop_stack (stack_ptr, int); static rtx *get_true_reg (rtx *); -static int check_asm_stack_operands (rtx); +static int check_asm_stack_operands (rtx_base_insn); static void get_asm_operands_in_out (rtx, int *, int *); static rtx stack_result (tree); static void replace_reg (rtx *, int); -static void remove_regno_note (rtx, enum reg_note, unsigned int); +static void remove_regno_note (rtx_base_insn, enum reg_note, unsigned int); static int get_hard_regnum (stack_ptr, rtx); static rtx_base_insn emit_pop_insn (rtx_base_insn, stack_ptr, rtx, enum emit_where); @@ -259,7 +259,7 @@ static void swap_to_top (rtx_base_insn, stack_ptr, rtx, rtx); static bool move_for_stack_reg (rtx_base_insn, stack_ptr, rtx); static bool move_nan_for_stack_reg (rtx_base_insn, stack_ptr, rtx); static int swap_rtx_condition_1 (rtx); -static int swap_rtx_condition (rtx); +static int swap_rtx_condition (rtx_base_insn); static void compare_for_stack_reg (rtx_base_insn, stack_ptr, rtx); static bool subst_stack_regs_pat (rtx_base_insn, stack_ptr, rtx); static void subst_asm_stack_regs (rtx_base_insn, stack_ptr); @@ -267,7 +267,7 @@ static bool subst_stack_regs (rtx_base_insn, stack_ptr); static void change_stack (rtx_base_insn, stack_ptr, stack_ptr, enum emit_where); static void print_stack (FILE *, stack_ptr); -static rtx next_flags_user (rtx); +static rtx_base_insn next_flags_user (rtx_base_insn); /* Return nonzero if any stack register is mentioned somewhere within PAT. */ @@ -332,8 +332,8 @@ stack_regs_mentioned (const_rtx insn) static rtx ix86_flags_rtx; -static rtx -next_flags_user (rtx insn) +static rtx_base_insn +next_flags_user (rtx_base_insn insn) { /* Search forward looking for the first use of this value. Stop at block boundaries. */ @@ -346,9 +346,9 @@ next_flags_user (rtx insn) return insn; if (CALL_P (insn)) - return NULL_RTX; + return NULL_RTX_BASE_INSN; } - return NULL_RTX; + return NULL_RTX_BASE_INSN; } /* Reorganize the stack into ascending numbers, before this insn. */ @@ -455,7 +455,7 @@ static bool any_malformed_asm; numbers below refer to that explanation. */ static int -check_asm_stack_operands (rtx insn) +check_asm_stack_operands (rtx_base_insn insn) { int i; int n_clobbers; @@ -698,7 +698,7 @@ replace_reg (rtx *reg, int regno) number REGNO from INSN. Remove only one such note. */ static void -remove_regno_note (rtx insn, enum reg_note note, unsigned int regno) +remove_regno_note (rtx_base_insn insn, enum reg_note note, unsigned int regno) { rtx *note_link, this_rtx; @@ -800,7 +800,7 @@ emit_swap_insn (rtx_base_insn insn, stack_ptr regstack, rtx reg) int hard_regno; rtx swap_rtx; int tmp, other_reg; /* swap regno temps */ - rtx i1; /* the stack-reg insn prior to INSN */ + rtx_base_insn i1; /* the stack-reg insn prior to INSN */ rtx i1set = NULL_RTX; /* the SET rtx within I1 */ hard_regno = get_hard_regnum (regstack, reg); @@ -830,8 +830,8 @@ emit_swap_insn (rtx_base_insn insn, stack_ptr regstack, rtx reg) i1 = NULL; if (current_block && insn != BB_HEAD (current_block)) { - rtx tmp = PREV_INSN (insn); - rtx limit = PREV_INSN (BB_HEAD (current_block)); + rtx_base_insn tmp = PREV_INSN (insn); + rtx_base_insn limit = PREV_INSN (BB_HEAD (current_block)); while (tmp != limit) { if (LABEL_P (tmp) @@ -1142,7 +1142,7 @@ swap_rtx_condition_1 (rtx pat) } static int -swap_rtx_condition (rtx insn) +swap_rtx_condition (rtx_base_insn insn) { rtx pat = PATTERN (insn); @@ -1342,7 +1342,8 @@ subst_stack_regs_in_debug_insn (rtx *loc, void *data) the REGs in it, reset the debug insn. */ static void -subst_all_stack_regs_in_debug_insn (rtx insn, struct stack_def *regstack) +subst_all_stack_regs_in_debug_insn (rtx_base_insn insn, + struct stack_def *regstack) { int ret = for_each_rtx (&INSN_VAR_LOCATION_LOC (insn), subst_stack_regs_in_debug_insn, -- 1.7.11.7