diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-11-19 20:09:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-11-19 20:09:55 +0000 |
| commit | 714b5995a4bacf5d3b4f69e18b24f338eb290330 (patch) | |
| tree | d79c83afdc6bbcb4974a00b9ec60e7319c3abf6c /gnu | |
| parent | 540b30179745e5cc7663f8125d6e5e63e6a52a73 (diff) | |
Make sure to invoke end_sequence() before passing it to any emit_insn()
flavour. From etoh@'s gcc 3.4 tree. While there, also kill
change_arg_use_of_insns_2() which is now a dim wrapper around
change_arg_use_of_insns(), from etoh@'s tree as well.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/protector.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gnu/usr.bin/gcc/gcc/protector.c b/gnu/usr.bin/gcc/gcc/protector.c index ffec227f245..e77d2cb4144 100644 --- a/gnu/usr.bin/gcc/gcc/protector.c +++ b/gnu/usr.bin/gcc/gcc/protector.c @@ -110,8 +110,6 @@ static void move_arg_location PARAMS ((rtx insn, rtx orig, rtx new, HOST_WIDE_INT var_size)); static void change_arg_use_of_insns PARAMS ((rtx insn, rtx orig, rtx *new, HOST_WIDE_INT size)); -static void change_arg_use_of_insns_2 - PARAMS ((rtx insn, rtx orig, rtx *new, HOST_WIDE_INT size)); static void change_arg_use_in_operand PARAMS ((rtx insn, rtx x, rtx orig, rtx *new, HOST_WIDE_INT size)); static void validate_insns_of_varrefs PARAMS ((rtx insn)); @@ -1038,6 +1036,7 @@ copy_args_for_protection () if (PARM_PASSED_IN_MEMORY (parms) && DECL_NAME (parms)) { int string_p; + rtx seq; /* skip argument protection if the last argument is used @@ -1160,8 +1159,9 @@ copy_args_for_protection () DECL_INCOMING_RTL (parms) = temp_rtx; } - emit_insn_before (get_insns (), prologue_insert_point); + seq = get_insns (); end_sequence (); + emit_insn_before (seq, prologue_insert_point); #ifdef FRAME_GROWS_DOWNWARD /* process the string argument */ @@ -1602,14 +1602,6 @@ change_arg_use_of_insns (insn, orig, new, size) rtx insn, orig, *new; HOST_WIDE_INT size; { - change_arg_use_of_insns_2 (insn, orig, new, size); -} - -static void -change_arg_use_of_insns_2 (insn, orig, new, size) - rtx insn, orig, *new; - HOST_WIDE_INT size; -{ for (; insn; insn = NEXT_INSN (insn)) if (GET_CODE (insn) == INSN || GET_CODE (insn) == JUMP_INSN || GET_CODE (insn) == CALL_INSN) @@ -1751,7 +1743,7 @@ change_arg_use_in_operand (insn, x, orig, new, size) if (seq) { push_to_sequence (seq); - change_arg_use_of_insns_2 (XEXP (x, i), orig, new, size); + change_arg_use_of_insns (XEXP (x, i), orig, new, size); XEXP (x, i) = get_insns (); end_sequence (); } @@ -1900,6 +1892,8 @@ validate_operand_of_varrefs (insn, loc) pat = GEN_FCN (icode) (temp, xop0, xop1); if (pat) emit_insn (pat); + else + abort (); /* there must be add_optab handler. */ } seq = get_insns (); end_sequence (); @@ -2426,7 +2420,7 @@ push_frame_in_operand (insn, orig, push_size, boundary) { x = XEXP (x, 1); offset = AUTO_OFFSET(x); - if (x->used || abs (offset) < boundary) + if (x->used || -offset < boundary) return; XEXP (x, 1) = gen_rtx_CONST_INT (VOIDmode, offset - push_size); |