diff options
| author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-07 16:58:46 +0000 |
|---|---|---|
| committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-07 16:58:46 +0000 |
| commit | d1f9b275e42cf5c753e9f05789d89cc132726607 (patch) | |
| tree | d586b7005253121ffef57e4f1d75d48de1056334 | |
| parent | 3dd2833b51262c109ebc4b6f3f93973c286cd7cd (diff) | |
| download | gcc-d1f9b275e42cf5c753e9f05789d89cc132726607.tar.gz | |
gcc/
* rtl.h (always_void_p): New function.
* gengenrtl.c (always_void_p): Likewise.
(genmacro): Don't add a mode parameter to gen_rtx_foo if rtxes
with code foo are always VOIDmode.
* genemit.c (gen_exp): Update gen_rtx_foo calls accordingly.
* builtins.c, caller-save.c, calls.c, cfgexpand.c, combine.c,
compare-elim.c, config/aarch64/aarch64.c,
config/aarch64/aarch64.md, config/alpha/alpha.c,
config/alpha/alpha.md, config/arc/arc.c, config/arc/arc.md,
config/arm/arm-fixed.md, config/arm/arm.c, config/arm/arm.md,
config/arm/ldrdstrd.md, config/arm/thumb2.md, config/arm/vfp.md,
config/avr/avr.c, config/bfin/bfin.c, config/c6x/c6x.c,
config/c6x/c6x.md, config/cr16/cr16.c, config/cris/cris.c,
config/cris/cris.md, config/darwin.c, config/epiphany/epiphany.c,
config/epiphany/epiphany.md, config/fr30/fr30.c, config/frv/frv.c,
config/frv/frv.md, config/h8300/h8300.c, config/i386/i386.c,
config/i386/i386.md, config/i386/sse.md, config/ia64/ia64.c,
config/ia64/vect.md, config/iq2000/iq2000.c,
config/iq2000/iq2000.md, config/lm32/lm32.c, config/lm32/lm32.md,
config/m32c/m32c.c, config/m32r/m32r.c, config/m68k/m68k.c,
config/m68k/m68k.md, config/mcore/mcore.c, config/mcore/mcore.md,
config/mep/mep.c, config/microblaze/microblaze.c,
config/mips/mips.c, config/mips/mips.md, config/mmix/mmix.c,
config/mn10300/mn10300.c, config/msp430/msp430.c,
config/nds32/nds32-memory-manipulation.c, config/nds32/nds32.c,
config/nds32/nds32.md, config/nios2/nios2.c, config/nvptx/nvptx.c,
config/pa/pa.c, config/pa/pa.md, config/rl78/rl78.c,
config/rs6000/altivec.md, config/rs6000/rs6000.c,
config/rs6000/rs6000.md, config/rs6000/vector.md,
config/rs6000/vsx.md, config/rx/rx.c, config/rx/rx.md,
config/s390/s390.c, config/s390/s390.md, config/sh/sh.c,
config/sh/sh.md, config/sh/sh_treg_combine.cc,
config/sparc/sparc.c, config/sparc/sparc.md, config/spu/spu.c,
config/spu/spu.md, config/stormy16/stormy16.c,
config/tilegx/tilegx.c, config/tilegx/tilegx.md,
config/tilepro/tilepro.c, config/tilepro/tilepro.md,
config/v850/v850.c, config/v850/v850.md, config/vax/vax.c,
config/visium/visium.c, config/xtensa/xtensa.c, cprop.c, dse.c,
expr.c, gcse.c, ifcvt.c, ira.c, jump.c, lower-subreg.c,
lra-constraints.c, lra-eliminations.c, lra.c, postreload.c, ree.c,
reg-stack.c, reload.c, reload1.c, reorg.c, sel-sched.c,
var-tracking.c: Update calls accordingly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222883 138bc75d-0d04-0410-961f-82ee72b054a4
111 files changed, 1525 insertions, 1845 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 500f537d845..a14a4a5bd15 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,48 @@ +2015-05-07 Richard Sandiford <richard.sandiford@arm.com> + + * rtl.h (always_void_p): New function. + * gengenrtl.c (always_void_p): Likewise. + (genmacro): Don't add a mode parameter to gen_rtx_foo if rtxes + with code foo are always VOIDmode. + * genemit.c (gen_exp): Update gen_rtx_foo calls accordingly. + * builtins.c, caller-save.c, calls.c, cfgexpand.c, combine.c, + compare-elim.c, config/aarch64/aarch64.c, + config/aarch64/aarch64.md, config/alpha/alpha.c, + config/alpha/alpha.md, config/arc/arc.c, config/arc/arc.md, + config/arm/arm-fixed.md, config/arm/arm.c, config/arm/arm.md, + config/arm/ldrdstrd.md, config/arm/thumb2.md, config/arm/vfp.md, + config/avr/avr.c, config/bfin/bfin.c, config/c6x/c6x.c, + config/c6x/c6x.md, config/cr16/cr16.c, config/cris/cris.c, + config/cris/cris.md, config/darwin.c, config/epiphany/epiphany.c, + config/epiphany/epiphany.md, config/fr30/fr30.c, config/frv/frv.c, + config/frv/frv.md, config/h8300/h8300.c, config/i386/i386.c, + config/i386/i386.md, config/i386/sse.md, config/ia64/ia64.c, + config/ia64/vect.md, config/iq2000/iq2000.c, + config/iq2000/iq2000.md, config/lm32/lm32.c, config/lm32/lm32.md, + config/m32c/m32c.c, config/m32r/m32r.c, config/m68k/m68k.c, + config/m68k/m68k.md, config/mcore/mcore.c, config/mcore/mcore.md, + config/mep/mep.c, config/microblaze/microblaze.c, + config/mips/mips.c, config/mips/mips.md, config/mmix/mmix.c, + config/mn10300/mn10300.c, config/msp430/msp430.c, + config/nds32/nds32-memory-manipulation.c, config/nds32/nds32.c, + config/nds32/nds32.md, config/nios2/nios2.c, config/nvptx/nvptx.c, + config/pa/pa.c, config/pa/pa.md, config/rl78/rl78.c, + config/rs6000/altivec.md, config/rs6000/rs6000.c, + config/rs6000/rs6000.md, config/rs6000/vector.md, + config/rs6000/vsx.md, config/rx/rx.c, config/rx/rx.md, + config/s390/s390.c, config/s390/s390.md, config/sh/sh.c, + config/sh/sh.md, config/sh/sh_treg_combine.cc, + config/sparc/sparc.c, config/sparc/sparc.md, config/spu/spu.c, + config/spu/spu.md, config/stormy16/stormy16.c, + config/tilegx/tilegx.c, config/tilegx/tilegx.md, + config/tilepro/tilepro.c, config/tilepro/tilepro.md, + config/v850/v850.c, config/v850/v850.md, config/vax/vax.c, + config/visium/visium.c, config/xtensa/xtensa.c, cprop.c, dse.c, + expr.c, gcse.c, ifcvt.c, ira.c, jump.c, lower-subreg.c, + lra-constraints.c, lra-eliminations.c, lra.c, postreload.c, ree.c, + reg-stack.c, reload.c, reload1.c, reorg.c, sel-sched.c, + var-tracking.c: Update calls accordingly. + 2015-05-07 Segher Boessenkool <segher@kernel.crashing.org> PR middle-end/192 diff --git a/gcc/builtins.c b/gcc/builtins.c index 6fe1456e92d..90e66d62909 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -1478,8 +1478,8 @@ result_vector (int savep, rtx result) reg = gen_rtx_REG (mode, savep ? regno : INCOMING_REGNO (regno)); mem = adjust_address (result, mode, size); savevec[nelts++] = (savep - ? gen_rtx_SET (VOIDmode, mem, reg) - : gen_rtx_SET (VOIDmode, reg, mem)); + ? gen_rtx_SET (mem, reg) + : gen_rtx_SET (reg, mem)); size += GET_MODE_SIZE (mode); } return gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (nelts, savevec)); diff --git a/gcc/caller-save.c b/gcc/caller-save.c index 76c3a7e5263..923cfa1d277 100644 --- a/gcc/caller-save.c +++ b/gcc/caller-save.c @@ -289,8 +289,8 @@ init_caller_save (void) test_reg = gen_rtx_REG (VOIDmode, 0); test_mem = gen_rtx_MEM (VOIDmode, address); - savepat = gen_rtx_SET (VOIDmode, test_mem, test_reg); - restpat = gen_rtx_SET (VOIDmode, test_reg, test_mem); + savepat = gen_rtx_SET (test_mem, test_reg); + restpat = gen_rtx_SET (test_reg, test_mem); saveinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, savepat, 0, -1, 0); restinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, restpat, 0, -1, 0); @@ -909,7 +909,7 @@ save_call_clobbered_regs (void) Currently we handle only single return value case. */ if (REG_P (dest)) { - newpat = gen_rtx_SET (VOIDmode, cheap, copy_rtx (dest)); + newpat = gen_rtx_SET (cheap, copy_rtx (dest)); chain = insert_one_insn (chain, 0, -1, newpat); } } @@ -1272,9 +1272,7 @@ insert_restore (struct insn_chain *chain, int before_p, int regno, gcc_assert (MIN (MAX_SUPPORTED_STACK_ALIGNMENT, GET_MODE_ALIGNMENT (GET_MODE (mem))) <= MEM_ALIGN (mem)); - pat = gen_rtx_SET (VOIDmode, - gen_rtx_REG (GET_MODE (mem), - regno), mem); + pat = gen_rtx_SET (gen_rtx_REG (GET_MODE (mem), regno), mem); code = reg_restore_code (regno, GET_MODE (mem)); new_chain = insert_one_insn (chain, before_p, code, pat); @@ -1353,9 +1351,7 @@ insert_save (struct insn_chain *chain, int before_p, int regno, gcc_assert (MIN (MAX_SUPPORTED_STACK_ALIGNMENT, GET_MODE_ALIGNMENT (GET_MODE (mem))) <= MEM_ALIGN (mem)); - pat = gen_rtx_SET (VOIDmode, mem, - gen_rtx_REG (GET_MODE (mem), - regno)); + pat = gen_rtx_SET (mem, gen_rtx_REG (GET_MODE (mem), regno)); code = reg_save_code (regno, GET_MODE (mem)); new_chain = insert_one_insn (chain, before_p, code, pat); diff --git a/gcc/calls.c b/gcc/calls.c index caa7d607059..aaac1ad701e 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -3353,7 +3353,7 @@ expand_call (tree exp, rtx target, int ignore) && GET_MODE (args[arg_nr].reg) == GET_MODE (valreg)) call_fusage = gen_rtx_EXPR_LIST (TYPE_MODE (TREE_TYPE (args[arg_nr].tree_value)), - gen_rtx_SET (VOIDmode, valreg, args[arg_nr].reg), + gen_rtx_SET (valreg, args[arg_nr].reg), call_fusage); } /* All arguments and registers used for the call must be set up by diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 5905ddb44f7..b76a219c4f4 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -2886,7 +2886,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, else if (noutputs == 1 && nclobbers == 0) { ASM_OPERANDS_OUTPUT_CONSTRAINT (body) = ggc_strdup (constraints[0]); - emit_insn (gen_rtx_SET (VOIDmode, output_rtx[0], body)); + emit_insn (gen_rtx_SET (output_rtx[0], body)); } else { @@ -2902,8 +2902,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, for (i = 0, tail = outputs; tail; tail = TREE_CHAIN (tail), i++) { XVECEXP (body, 0, i) - = gen_rtx_SET (VOIDmode, - output_rtx[i], + = gen_rtx_SET (output_rtx[i], gen_rtx_ASM_OPERANDS (GET_MODE (output_rtx[i]), ggc_strdup (TREE_STRING_POINTER (string)), diff --git a/gcc/combine.c b/gcc/combine.c index 9e3eb030a63..b8069592658 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -3104,7 +3104,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, if (added_sets_2) { if (GET_CODE (PATTERN (i2)) == PARALLEL) - i2pat = gen_rtx_SET (VOIDmode, i2dest, copy_rtx (i2src)); + i2pat = gen_rtx_SET (i2dest, copy_rtx (i2src)); else i2pat = copy_rtx (PATTERN (i2)); } @@ -3112,7 +3112,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, if (added_sets_1) { if (GET_CODE (PATTERN (i1)) == PARALLEL) - i1pat = gen_rtx_SET (VOIDmode, i1dest, copy_rtx (i1src)); + i1pat = gen_rtx_SET (i1dest, copy_rtx (i1src)); else i1pat = copy_rtx (PATTERN (i1)); } @@ -3120,7 +3120,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, if (added_sets_0) { if (GET_CODE (PATTERN (i0)) == PARALLEL) - i0pat = gen_rtx_SET (VOIDmode, i0dest, copy_rtx (i0src)); + i0pat = gen_rtx_SET (i0dest, copy_rtx (i0src)); else i0pat = copy_rtx (PATTERN (i0)); } @@ -3230,7 +3230,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, /* Create new version of i2pat if needed; the below PARALLEL creation needs this to work correctly. */ if (! rtx_equal_p (i2src, op0)) - i2pat = gen_rtx_SET (VOIDmode, i2dest, op0); + i2pat = gen_rtx_SET (i2dest, op0); i2_is_used = 1; } } @@ -3753,7 +3753,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, /* Split "X = Y op Y" as "Z = Y; X = Z op Z". */ if (rtx_equal_p (src_op0, src_op1)) { - newi2pat = gen_rtx_SET (VOIDmode, newdest, src_op0); + newi2pat = gen_rtx_SET (newdest, src_op0); SUBST (XEXP (setsrc, 0), newdest); SUBST (XEXP (setsrc, 1), newdest); subst_done = true; @@ -3777,8 +3777,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, if ((rtx_equal_p (p,r) && rtx_equal_p (q,s)) || (rtx_equal_p (p,s) && rtx_equal_p (q,r))) { - newi2pat = gen_rtx_SET (VOIDmode, newdest, - XEXP (src_op0, 0)); + newi2pat = gen_rtx_SET (newdest, XEXP (src_op0, 0)); SUBST (XEXP (setsrc, 0), newdest); SUBST (XEXP (setsrc, 1), newdest); subst_done = true; @@ -3788,7 +3787,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, else if (rtx_equal_p (p,q) && rtx_equal_p (r,s)) { rtx tmp = simplify_gen_binary (code, mode, p, r); - newi2pat = gen_rtx_SET (VOIDmode, newdest, tmp); + newi2pat = gen_rtx_SET (newdest, tmp); SUBST (XEXP (setsrc, 0), newdest); SUBST (XEXP (setsrc, 1), newdest); subst_done = true; @@ -3798,7 +3797,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, if (!subst_done) { - newi2pat = gen_rtx_SET (VOIDmode, newdest, *split); + newi2pat = gen_rtx_SET (newdest, *split); SUBST (*split, newdest); } @@ -4754,8 +4753,7 @@ find_split_point (rtx *loc, rtx_insn *insn, bool set_src) MEM_ADDR_SPACE (x))) { rtx reg = regno_reg_rtx[FIRST_PSEUDO_REGISTER]; - rtx_insn *seq = combine_split_insns (gen_rtx_SET (VOIDmode, reg, - XEXP (x, 0)), + rtx_insn *seq = combine_split_insns (gen_rtx_SET (reg, XEXP (x, 0)), subst_insn); /* This should have produced two insns, each of which sets our @@ -7191,7 +7189,7 @@ expand_field_assignment (const_rtx x) == ((GET_MODE_SIZE (GET_MODE (SUBREG_REG (SET_DEST (x)))) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD))) { - x = gen_rtx_SET (VOIDmode, SUBREG_REG (SET_DEST (x)), + x = gen_rtx_SET (SUBREG_REG (SET_DEST (x)), gen_lowpart (GET_MODE (SUBREG_REG (SET_DEST (x))), SET_SRC (x))); @@ -7246,7 +7244,7 @@ expand_field_assignment (const_rtx x) mask), pos); - x = gen_rtx_SET (VOIDmode, copy_rtx (inner), + x = gen_rtx_SET (copy_rtx (inner), simplify_gen_binary (IOR, compute_mode, cleared, masked)); } @@ -9255,7 +9253,7 @@ make_field_assignment (rtx x) assign = make_extraction (VOIDmode, dest, 0, XEXP (XEXP (src, 0), 1), 1, 1, 1, 0); if (assign != 0) - return gen_rtx_SET (VOIDmode, assign, const0_rtx); + return gen_rtx_SET (assign, const0_rtx); return x; } @@ -9272,7 +9270,7 @@ make_field_assignment (rtx x) XEXP (SUBREG_REG (XEXP (src, 0)), 1), 1, 1, 1, 0); if (assign != 0) - return gen_rtx_SET (VOIDmode, assign, const0_rtx); + return gen_rtx_SET (assign, const0_rtx); return x; } @@ -9285,7 +9283,7 @@ make_field_assignment (rtx x) assign = make_extraction (VOIDmode, dest, 0, XEXP (XEXP (src, 0), 1), 1, 1, 1, 0); if (assign != 0) - return gen_rtx_SET (VOIDmode, assign, const1_rtx); + return gen_rtx_SET (assign, const1_rtx); return x; } @@ -9308,7 +9306,7 @@ make_field_assignment (rtx x) /* Complete overlap. We can remove the source AND. */ if ((and_mask & ze_mask) == ze_mask) - return gen_rtx_SET (VOIDmode, dest, XEXP (src, 0)); + return gen_rtx_SET (dest, XEXP (src, 0)); /* Partial overlap. We can reduce the source AND. */ if ((and_mask & ze_mask) != and_mask) @@ -9316,7 +9314,7 @@ make_field_assignment (rtx x) mode = GET_MODE (src); src = gen_rtx_AND (mode, XEXP (src, 0), gen_int_mode (and_mask & ze_mask, mode)); - return gen_rtx_SET (VOIDmode, dest, src); + return gen_rtx_SET (dest, src); } } @@ -9417,7 +9415,7 @@ make_field_assignment (rtx x) == ((unsigned HOST_WIDE_INT) 1 << INTVAL (XEXP (assign, 1))) - 1) src = XEXP (src, 0); - return gen_rtx_SET (VOIDmode, assign, src); + return gen_rtx_SET (assign, src); } /* See if X is of the form (+ (* a c) (* b c)) and convert to (* (+ a b) c) diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c index 8e024df89a6..25b4cc858b0 100644 --- a/gcc/compare-elim.c +++ b/gcc/compare-elim.c @@ -293,7 +293,7 @@ can_eliminate_compare (rtx compare, rtx eh_note, struct comparison *cmp) /* Generate new comparison for substitution. */ rtx flags = gen_rtx_REG (new_mode, targetm.flags_regnum); rtx x = gen_rtx_COMPARE (new_mode, cmp->in_a, cmp->in_b); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); if (!validate_change (cmp->insn, &PATTERN (cmp->insn), x, false)) return false; @@ -625,7 +625,7 @@ try_eliminate_compare (struct comparison *cmp) /* Generate a new comparison for installation in the setter. */ x = copy_rtx (cmp_src); x = gen_rtx_COMPARE (GET_MODE (flags), x, cmp->in_b); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); /* Succeed if the new instruction is valid. Note that we may have started a change group within maybe_select_cc_mode, therefore we must continue. */ diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 7a34e4905f7..f866c7e4ec6 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -713,7 +713,7 @@ aarch64_is_extend_from_extract (machine_mode mode, rtx mult_imm, inline static rtx emit_set_insn (rtx x, rtx y) { - return emit_insn (gen_rtx_SET (VOIDmode, x, y)); + return emit_insn (gen_rtx_SET (x, y)); } /* X and Y are two things to compare using CODE. Emit the compare insn and @@ -825,7 +825,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, } case SYMBOL_TINY_ABSOLUTE: - emit_insn (gen_rtx_SET (Pmode, dest, imm)); + emit_insn (gen_rtx_SET (dest, imm)); return; case SYMBOL_SMALL_GOT: @@ -894,7 +894,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, if (mode != Pmode) tp = gen_lowpart (mode, tp); - emit_insn (gen_rtx_SET (mode, dest, gen_rtx_PLUS (mode, tp, x0))); + emit_insn (gen_rtx_SET (dest, gen_rtx_PLUS (mode, tp, x0))); set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } @@ -928,7 +928,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, emit_insn (gen_tlsie_small_sidi (tmp_reg, imm)); } - emit_insn (gen_rtx_SET (mode, dest, gen_rtx_PLUS (mode, tp, tmp_reg))); + emit_insn (gen_rtx_SET (dest, gen_rtx_PLUS (mode, tp, tmp_reg))); set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } @@ -1186,7 +1186,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (CONST_INT_P (imm) && aarch64_move_imm (INTVAL (imm), mode)) { if (generate) - emit_insn (gen_rtx_SET (VOIDmode, dest, imm)); + emit_insn (gen_rtx_SET (dest, imm)); num_insns++; return num_insns; } @@ -1198,8 +1198,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, us anything. */ if (generate) { - emit_insn (gen_rtx_SET (VOIDmode, dest, - GEN_INT (INTVAL (imm) & 0xffff))); + emit_insn (gen_rtx_SET (dest, GEN_INT (INTVAL (imm) & 0xffff))); emit_insn (gen_insv_immsi (dest, GEN_INT (16), GEN_INT ((INTVAL (imm) >> 16) & 0xffff))); } @@ -1236,7 +1235,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, mask = 0xffffll << first_not_ffff_match; if (generate) { - emit_insn (gen_rtx_SET (VOIDmode, dest, GEN_INT (val | mask))); + emit_insn (gen_rtx_SET (dest, GEN_INT (val | mask))); emit_insn (gen_insv_immdi (dest, GEN_INT (first_not_ffff_match), GEN_INT ((val >> first_not_ffff_match) & 0xffff))); @@ -1258,8 +1257,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (DImode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, - GEN_INT (val & mask))); + emit_insn (gen_rtx_SET (subtarget, GEN_INT (val & mask))); emit_insn (gen_adddi3 (dest, subtarget, GEN_INT (val - (val & mask)))); } @@ -1271,7 +1269,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (DImode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, + emit_insn (gen_rtx_SET (subtarget, GEN_INT ((val + comp) & mask))); emit_insn (gen_adddi3 (dest, subtarget, GEN_INT (val - ((val + comp) & mask)))); @@ -1284,7 +1282,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (DImode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, + emit_insn (gen_rtx_SET (subtarget, GEN_INT ((val - comp) | ~mask))); emit_insn (gen_adddi3 (dest, subtarget, GEN_INT (val - ((val - comp) | ~mask)))); @@ -1297,8 +1295,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (DImode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, - GEN_INT (val | ~mask))); + emit_insn (gen_rtx_SET (subtarget, GEN_INT (val | ~mask))); emit_insn (gen_adddi3 (dest, subtarget, GEN_INT (val - (val | ~mask)))); } @@ -1320,7 +1317,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (DImode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, + emit_insn (gen_rtx_SET (subtarget, GEN_INT (aarch64_bitmasks[i]))); emit_insn (gen_adddi3 (dest, subtarget, GEN_INT (val - aarch64_bitmasks[i]))); @@ -1335,7 +1332,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, { if (generate) { - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, GEN_INT (aarch64_bitmasks[i]))); emit_insn (gen_insv_immdi (dest, GEN_INT (j), GEN_INT ((val >> j) & 0xffff))); @@ -1359,7 +1356,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (mode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, + emit_insn (gen_rtx_SET (subtarget, GEN_INT (aarch64_bitmasks[i]))); emit_insn (gen_iordi3 (dest, subtarget, GEN_INT (aarch64_bitmasks[j]))); @@ -1378,7 +1375,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (generate) { subtarget = subtargets ? gen_reg_rtx (mode) : dest; - emit_insn (gen_rtx_SET (VOIDmode, subtarget, + emit_insn (gen_rtx_SET (subtarget, GEN_INT (aarch64_bitmasks[j]))); emit_insn (gen_anddi3 (dest, subtarget, GEN_INT (aarch64_bitmasks[i]))); @@ -1394,7 +1391,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, /* Set either first three quarters or all but the third. */ mask = 0xffffll << (16 - first_not_ffff_match); if (generate) - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, GEN_INT (val | mask | 0xffffffff00000000ull))); num_insns ++; @@ -1423,8 +1420,7 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, if (first) { if (generate) - emit_insn (gen_rtx_SET (VOIDmode, dest, - GEN_INT (val & mask))); + emit_insn (gen_rtx_SET (dest, GEN_INT (val & mask))); num_insns ++; first = false; } @@ -1478,7 +1474,7 @@ aarch64_expand_mov_immediate (rtx dest, rtx imm) gcc_assert (mem); if (mode != ptr_mode) mem = gen_rtx_ZERO_EXTEND (mode, mem); - emit_insn (gen_rtx_SET (VOIDmode, dest, mem)); + emit_insn (gen_rtx_SET (dest, mem)); return; case SYMBOL_SMALL_TLSGD: @@ -1510,12 +1506,12 @@ aarch64_expand_mov_immediate (rtx dest, rtx imm) if (!CONST_INT_P (imm)) { if (GET_CODE (imm) == HIGH) - emit_insn (gen_rtx_SET (VOIDmode, dest, imm)); + emit_insn (gen_rtx_SET (dest, imm)); else { rtx mem = force_const_mem (mode, imm); gcc_assert (mem); - emit_insn (gen_rtx_SET (VOIDmode, dest, mem)); + emit_insn (gen_rtx_SET (dest, mem)); } return; @@ -2463,7 +2459,7 @@ aarch64_expand_prologue (void) insn = emit_insn (gen_add2_insn (stack_pointer_rtx, op0)); add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -frame_size))); RTX_FRAME_RELATED_P (insn) = 1; @@ -2894,19 +2890,19 @@ aarch64_add_constant (int regnum, int scratchreg, HOST_WIDE_INT delta) { if (mdelta >= 4096) { - emit_insn (gen_rtx_SET (Pmode, scratch_rtx, GEN_INT (mdelta / 4096))); + emit_insn (gen_rtx_SET (scratch_rtx, GEN_INT (mdelta / 4096))); rtx shift = gen_rtx_ASHIFT (Pmode, scratch_rtx, GEN_INT (12)); if (delta < 0) - emit_insn (gen_rtx_SET (Pmode, this_rtx, + emit_insn (gen_rtx_SET (this_rtx, gen_rtx_MINUS (Pmode, this_rtx, shift))); else - emit_insn (gen_rtx_SET (Pmode, this_rtx, + emit_insn (gen_rtx_SET (this_rtx, gen_rtx_PLUS (Pmode, this_rtx, shift))); } if (mdelta % 4096 != 0) { scratch_rtx = GEN_INT ((delta < 0 ? -1 : 1) * (mdelta % 4096)); - emit_insn (gen_rtx_SET (Pmode, this_rtx, + emit_insn (gen_rtx_SET (this_rtx, gen_rtx_PLUS (Pmode, this_rtx, scratch_rtx))); } } @@ -9250,7 +9246,7 @@ aarch64_expand_compare_and_swap (rtx operands[]) x = gen_rtx_REG (CCmode, CC_REGNUM); x = gen_rtx_EQ (SImode, x, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, bval, x)); + emit_insn (gen_rtx_SET (bval, x)); } /* Split a compare and swap pattern. */ @@ -9286,7 +9282,7 @@ aarch64_split_compare_and_swap (rtx operands[]) x = gen_rtx_NE (VOIDmode, cond, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label2), pc_rtx); - aarch64_emit_unlikely_jump (gen_rtx_SET (VOIDmode, pc_rtx, x)); + aarch64_emit_unlikely_jump (gen_rtx_SET (pc_rtx, x)); aarch64_emit_store_exclusive (mode, scratch, mem, newval, operands[5]); @@ -9295,13 +9291,13 @@ aarch64_split_compare_and_swap (rtx operands[]) x = gen_rtx_NE (VOIDmode, scratch, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label1), pc_rtx); - aarch64_emit_unlikely_jump (gen_rtx_SET (VOIDmode, pc_rtx, x)); + aarch64_emit_unlikely_jump (gen_rtx_SET (pc_rtx, x)); } else { cond = gen_rtx_REG (CCmode, CC_REGNUM); x = gen_rtx_COMPARE (CCmode, scratch, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, cond, x)); + emit_insn (gen_rtx_SET (cond, x)); } emit_label (label2); @@ -9339,9 +9335,9 @@ aarch64_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, case NOT: x = gen_rtx_AND (wmode, old_out, value); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); x = gen_rtx_NOT (wmode, new_out); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); break; case MINUS: @@ -9354,7 +9350,7 @@ aarch64_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, default: x = gen_rtx_fmt_ee (code, wmode, old_out, value); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); break; } @@ -9364,7 +9360,7 @@ aarch64_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, x = gen_rtx_NE (VOIDmode, cond, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label), pc_rtx); - aarch64_emit_unlikely_jump (gen_rtx_SET (VOIDmode, pc_rtx, x)); + aarch64_emit_unlikely_jump (gen_rtx_SET (pc_rtx, x)); } static void @@ -11359,14 +11355,13 @@ aarch64_gen_adjusted_ldpstp (rtx *operands, bool load, } /* Emit adjusting instruction. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[8], - plus_constant (DImode, base, adj_off))); + emit_insn (gen_rtx_SET (operands[8], plus_constant (DImode, base, adj_off))); /* Emit ldp/stp instructions. */ - t1 = gen_rtx_SET (VOIDmode, operands[0], operands[1]); - t2 = gen_rtx_SET (VOIDmode, operands[2], operands[3]); + t1 = gen_rtx_SET (operands[0], operands[1]); + t2 = gen_rtx_SET (operands[2], operands[3]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); - t1 = gen_rtx_SET (VOIDmode, operands[4], operands[5]); - t2 = gen_rtx_SET (VOIDmode, operands[6], operands[7]); + t1 = gen_rtx_SET (operands[4], operands[5]); + t2 = gen_rtx_SET (operands[6], operands[7]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); return true; } diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 1c2c5fba4c3..b715f175de3 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -2194,14 +2194,13 @@ && GP_REGNUM_P (REGNO (operands[1]))" [(const_int 0)] { - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_XOR (DImode, gen_rtx_ASHIFTRT (DImode, operands[1], GEN_INT (63)), operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_MINUS (DImode, operands[0], gen_rtx_ASHIFTRT (DImode, @@ -2633,7 +2632,7 @@ (match_operand 3 "const0_operand")]))] "" "{ - emit_insn (gen_rtx_SET (SImode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4487,7 +4486,7 @@ cc_reg = SET_DEST (cmp); bcomp = gen_rtx_NE (VOIDmode, cc_reg, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands [1]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); DONE; diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index 5ed4dc6154b..3ce2b7942b6 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -1127,7 +1127,7 @@ alpha_legitimize_address_1 (rtx x, rtx scratch, machine_mode mode) if (alpha_tls_size == 64) { dest = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, dest, eqv)); + emit_insn (gen_rtx_SET (dest, eqv)); emit_insn (gen_adddi3 (dest, dest, scratch)); return dest; } @@ -1136,7 +1136,7 @@ alpha_legitimize_address_1 (rtx x, rtx scratch, machine_mode mode) insn = gen_rtx_HIGH (Pmode, eqv); insn = gen_rtx_PLUS (Pmode, scratch, insn); scratch = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, scratch, insn)); + emit_insn (gen_rtx_SET (scratch, insn)); } return gen_rtx_LO_SUM (Pmode, scratch, eqv); @@ -1148,7 +1148,7 @@ alpha_legitimize_address_1 (rtx x, rtx scratch, machine_mode mode) dest = gen_reg_rtx (Pmode); emit_insn (gen_get_thread_pointerdi (tp)); - emit_insn (gen_rtx_SET (VOIDmode, scratch, eqv)); + emit_insn (gen_rtx_SET (scratch, eqv)); emit_insn (gen_adddi3 (dest, tp, scratch)); return dest; @@ -1163,7 +1163,7 @@ alpha_legitimize_address_1 (rtx x, rtx scratch, machine_mode mode) insn = gen_rtx_HIGH (Pmode, eqv); insn = gen_rtx_PLUS (Pmode, tp, insn); tp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, tp, insn)); + emit_insn (gen_rtx_SET (tp, insn)); } return gen_rtx_LO_SUM (Pmode, tp, eqv); @@ -1179,8 +1179,7 @@ alpha_legitimize_address_1 (rtx x, rtx scratch, machine_mode mode) { if (can_create_pseudo_p ()) scratch = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, scratch, - gen_rtx_HIGH (Pmode, x))); + emit_insn (gen_rtx_SET (scratch, gen_rtx_HIGH (Pmode, x))); return gen_rtx_LO_SUM (Pmode, scratch, x); } } @@ -1805,7 +1804,7 @@ alpha_emit_set_const_1 (rtx target, machine_mode mode, return pc_rtx; if (target == NULL) target = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, target, GEN_INT (c))); + emit_insn (gen_rtx_SET (target, GEN_INT (c))); return target; } else if (n >= 2 + (extra != 0)) @@ -1814,7 +1813,7 @@ alpha_emit_set_const_1 (rtx target, machine_mode mode, return pc_rtx; if (!can_create_pseudo_p ()) { - emit_insn (gen_rtx_SET (VOIDmode, target, GEN_INT (high << 16))); + emit_insn (gen_rtx_SET (target, GEN_INT (high << 16))); temp = target; } else @@ -1832,7 +1831,7 @@ alpha_emit_set_const_1 (rtx target, machine_mode mode, if (! subtarget) subtarget = gen_reg_rtx (mode); insn = gen_rtx_PLUS (mode, temp, GEN_INT (extra << 16)); - insn = gen_rtx_SET (VOIDmode, subtarget, insn); + insn = gen_rtx_SET (subtarget, insn); emit_insn (insn); temp = subtarget; } @@ -1840,7 +1839,7 @@ alpha_emit_set_const_1 (rtx target, machine_mode mode, if (target == NULL) target = gen_reg_rtx (mode); insn = gen_rtx_PLUS (mode, temp, GEN_INT (low)); - insn = gen_rtx_SET (VOIDmode, target, insn); + insn = gen_rtx_SET (target, insn); emit_insn (insn); return target; } @@ -2517,7 +2516,7 @@ alpha_emit_floatuns (rtx operands[2]) emit_cmp_and_jump_insns (in, const0_rtx, LT, const0_rtx, DImode, 0, neglab); - emit_insn (gen_rtx_SET (VOIDmode, out, gen_rtx_FLOAT (mode, in))); + emit_insn (gen_rtx_SET (out, gen_rtx_FLOAT (mode, in))); emit_jump_insn (gen_jump (donelab)); emit_barrier (); @@ -2526,8 +2525,8 @@ alpha_emit_floatuns (rtx operands[2]) emit_insn (gen_lshrdi3 (i0, in, const1_rtx)); emit_insn (gen_anddi3 (i1, in, const1_rtx)); emit_insn (gen_iordi3 (i0, i0, i1)); - emit_insn (gen_rtx_SET (VOIDmode, f0, gen_rtx_FLOAT (mode, i0))); - emit_insn (gen_rtx_SET (VOIDmode, out, gen_rtx_PLUS (mode, f0, f0))); + emit_insn (gen_rtx_SET (f0, gen_rtx_FLOAT (mode, i0))); + emit_insn (gen_rtx_SET (out, gen_rtx_PLUS (mode, f0, f0))); emit_label (donelab); } @@ -2653,7 +2652,7 @@ alpha_emit_conditional_branch (rtx operands[], machine_mode cmp_mode) } /* Emit the branch instruction. */ - tem = gen_rtx_SET (VOIDmode, pc_rtx, + tem = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_fmt_ee (branch_code, branch_mode, tem, @@ -2735,16 +2734,16 @@ alpha_emit_setcc (rtx operands[], machine_mode cmp_mode) if (cmp_code != UNKNOWN) { tmp = gen_reg_rtx (cmp_mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_fmt_ee (cmp_code, cmp_mode, op0, op1))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_fmt_ee (cmp_code, cmp_mode, + op0, op1))); op0 = cmp_mode != DImode ? gen_lowpart (DImode, tmp) : tmp; op1 = const0_rtx; } /* Emit the setcc instruction. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], - gen_rtx_fmt_ee (code, DImode, op0, op1))); + emit_insn (gen_rtx_SET (operands[0], gen_rtx_fmt_ee (code, DImode, + op0, op1))); return true; } @@ -2830,9 +2829,8 @@ alpha_emit_conditional_move (rtx cmp, machine_mode mode) } tem = gen_reg_rtx (cmp_mode); - emit_insn (gen_rtx_SET (VOIDmode, tem, - gen_rtx_fmt_ee (cmp_code, cmp_mode, - op0, op1))); + emit_insn (gen_rtx_SET (tem, gen_rtx_fmt_ee (cmp_code, cmp_mode, + op0, op1))); cmp_mode = cmp_mode == DImode ? DFmode : DImode; op0 = gen_lowpart (cmp_mode, tem); @@ -2956,16 +2954,16 @@ alpha_split_conditional_move (enum rtx_code code, rtx dest, rtx cond, && (diff <= 8 || alpha_tune == PROCESSOR_EV6)) { tmp = gen_rtx_fmt_ee (code, DImode, cond, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (subtarget), tmp)); + emit_insn (gen_rtx_SET (copy_rtx (subtarget), tmp)); tmp = gen_rtx_ASHIFT (DImode, copy_rtx (subtarget), GEN_INT (exact_log2 (t))); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); } else if (f == 0 && t == -1) { tmp = gen_rtx_fmt_ee (code, DImode, cond, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (subtarget), tmp)); + emit_insn (gen_rtx_SET (copy_rtx (subtarget), tmp)); emit_insn (gen_negdi2 (target, copy_rtx (subtarget))); } @@ -2974,7 +2972,7 @@ alpha_split_conditional_move (enum rtx_code code, rtx dest, rtx cond, rtx add_op; tmp = gen_rtx_fmt_ee (code, DImode, cond, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (subtarget), tmp)); + emit_insn (gen_rtx_SET (copy_rtx (subtarget), tmp)); if (diff == 1) emit_insn (gen_adddi3 (target, copy_rtx (subtarget), GEN_INT (f))); @@ -2986,7 +2984,7 @@ alpha_split_conditional_move (enum rtx_code code, rtx dest, rtx cond, tmp = gen_rtx_MULT (DImode, copy_rtx (subtarget), GEN_INT (diff)); tmp = gen_rtx_PLUS (DImode, tmp, add_op); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); } else return 0; @@ -3701,7 +3699,7 @@ alpha_expand_unaligned_load_words (rtx *out_regs, rtx smem, { emit_insn (gen_extql (data_regs[i], data_regs[i], sreg)); emit_insn (gen_extqh (ext_tmps[i], data_regs[i+1], sreg)); - emit_insn (gen_rtx_SET (VOIDmode, ext_tmps[i], + emit_insn (gen_rtx_SET (ext_tmps[i], gen_rtx_IF_THEN_ELSE (DImode, gen_rtx_EQ (DImode, areg, const0_rtx), @@ -4408,7 +4406,7 @@ emit_unlikely_jump (rtx cond, rtx label) rtx x; x = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, label, pc_rtx); - x = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, x)); + x = emit_jump_insn (gen_rtx_SET (pc_rtx, x)); add_int_reg_note (x, REG_BR_PROB, very_unlikely); } @@ -4516,15 +4514,15 @@ alpha_split_atomic_op (enum rtx_code code, rtx mem, rtx val, rtx before, if (code == NOT) { x = gen_rtx_AND (mode, before, val); - emit_insn (gen_rtx_SET (VOIDmode, val, x)); + emit_insn (gen_rtx_SET (val, x)); x = gen_rtx_NOT (mode, val); } else x = gen_rtx_fmt_ee (code, mode, before, val); if (after) - emit_insn (gen_rtx_SET (VOIDmode, after, copy_rtx (x))); - emit_insn (gen_rtx_SET (VOIDmode, scratch, x)); + emit_insn (gen_rtx_SET (after, copy_rtx (x))); + emit_insn (gen_rtx_SET (scratch, x)); emit_store_conditional (mode, cond, mem, scratch); @@ -4576,7 +4574,7 @@ alpha_split_compare_and_swap (rtx operands[]) else { x = gen_rtx_EQ (DImode, x, oldval); - emit_insn (gen_rtx_SET (VOIDmode, cond, x)); + emit_insn (gen_rtx_SET (cond, x)); x = gen_rtx_EQ (DImode, cond, const0_rtx); } emit_unlikely_jump (x, label2); @@ -4691,7 +4689,7 @@ alpha_split_compare_and_swap_12 (rtx operands[]) else { x = gen_rtx_EQ (DImode, dest, oldval); - emit_insn (gen_rtx_SET (VOIDmode, cond, x)); + emit_insn (gen_rtx_SET (cond, x)); x = gen_rtx_EQ (DImode, cond, const0_rtx); } emit_unlikely_jump (x, label2); @@ -7712,7 +7710,7 @@ emit_frame_store_1 (rtx value, rtx base_reg, HOST_WIDE_INT frame_bias, } add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, frame_reg)); + gen_rtx_SET (mem, frame_reg)); } } @@ -7893,7 +7891,7 @@ alpha_expand_prologue (void) note it looks at instead. */ RTX_FRAME_RELATED_P (seq) = 1; add_reg_note (seq, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -frame_size))); } diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md index 7b46347afcc..2f6a8a221e7 100644 --- a/gcc/config/alpha/alpha.md +++ b/gcc/config/alpha/alpha.md @@ -2336,8 +2336,7 @@ bit at bit 48 of the fraction, which is representable in DFmode, which prevents rounding error in the final conversion to SFmode. */ - emit_insn (gen_rtx_SET (VOIDmode, sticky, - gen_rtx_NE (DImode, lo, const0_rtx))); + emit_insn (gen_rtx_SET (sticky, gen_rtx_NE (DImode, lo, const0_rtx))); emit_insn (gen_iordi3 (hi, hi, sticky)); emit_insn (gen_trunctfdf2 (tmpf, arg)); emit_insn (gen_truncdfsf2 (operands[0], tmpf)); @@ -4203,7 +4202,7 @@ emit_insn (gen_movdi (operand_subword (target, 1, 0, TImode), out[1])); if (target != operands[0]) - emit_insn (gen_rtx_SET (VOIDmode, operands[0], target)); + emit_insn (gen_rtx_SET (operands[0], target)); DONE; } diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 74089e8f413..afcbc29832c 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -1583,7 +1583,7 @@ gen_compare_reg (rtx comparison, machine_mode omode) } if (mode != CC_FPXmode) - emit_insn (gen_rtx_SET (VOIDmode, cc_reg, + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, gen_rtx_REG (CC_FPXmode, 61), const0_rtx))); @@ -1620,8 +1620,7 @@ gen_compare_reg (rtx comparison, machine_mode omode) emit_insn (gen_cmp_float (cc_reg, gen_rtx_COMPARE (mode, op0, op1))); } else - emit_insn (gen_rtx_SET (omode, cc_reg, - gen_rtx_COMPARE (mode, x, y))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, x, y))); return gen_rtx_fmt_ee (code, omode, cc_reg, const0_rtx); } @@ -1777,7 +1776,7 @@ frame_insn (rtx x) static rtx frame_move (rtx dst, rtx src) { - return frame_insn (gen_rtx_SET (VOIDmode, dst, src)); + return frame_insn (gen_rtx_SET (dst, src)); } /* Like frame_move, but add a REG_INC note for REG if ADDR contains an @@ -2191,9 +2190,9 @@ arc_save_restore (rtx base_reg, = gen_frame_mem (SImode, plus_constant (Pmode, base_reg, off)); if (epilogue_p) - XVECEXP (insn, 0, i) = gen_rtx_SET (VOIDmode, reg, mem); + XVECEXP (insn, 0, i) = gen_rtx_SET (reg, mem); else - XVECEXP (insn, 0, i) = gen_rtx_SET (VOIDmode, mem, reg); + XVECEXP (insn, 0, i) = gen_rtx_SET (mem, reg); gmask = gmask & ~(1L << r); } if (epilogue_p == 2) @@ -2235,10 +2234,10 @@ arc_save_restore (rtx base_reg, { rtx r12 = gen_rtx_REG (Pmode, 12); - frame_insn (gen_rtx_SET (VOIDmode, r12, GEN_INT (offset))); + frame_insn (gen_rtx_SET (r12, GEN_INT (offset))); XVECEXP (sibthunk_insn, 0, 0) = ret_rtx; XVECEXP (sibthunk_insn, 0, 1) - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, r12)); sibthunk_insn = emit_jump_insn (sibthunk_insn); RTX_FRAME_RELATED_P (sibthunk_insn) = 1; @@ -2550,7 +2549,7 @@ arc_finalize_pic (void) pat = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, pat), ARC_UNSPEC_GOT); pat = gen_rtx_CONST (Pmode, pat); - pat = gen_rtx_SET (VOIDmode, baseptr_rtx, pat); + pat = gen_rtx_SET (baseptr_rtx, pat); emit_insn (pat); } @@ -5939,8 +5938,7 @@ arc_reorg (void) if (next_active_insn (top_label) == insn) { rtx lc_set - = gen_rtx_SET (VOIDmode, - XEXP (XVECEXP (PATTERN (lp), 0, 3), 0), + = gen_rtx_SET (XEXP (XVECEXP (PATTERN (lp), 0, 3), 0), const0_rtx); rtx_insn *lc_set_insn = emit_insn_before (lc_set, insn); @@ -6204,7 +6202,7 @@ arc_reorg (void) brcc_insn = gen_rtx_IF_THEN_ELSE (VOIDmode, op, label, pc_rtx); - brcc_insn = gen_rtx_SET (VOIDmode, pc_rtx, brcc_insn); + brcc_insn = gen_rtx_SET (pc_rtx, brcc_insn); cc_clob_rtx = gen_rtx_CLOBBER (VOIDmode, cc_clob_rtx); brcc_insn = gen_rtx_PARALLEL @@ -7614,7 +7612,7 @@ prepare_move_operands (rtx *operands, machine_mode mode) variables. */ operands[1] = arc_rewrite_small_data (operands[1]); - emit_insn (gen_rtx_SET (mode, operands[0],operands[1])); + emit_insn (gen_rtx_SET (operands[0],operands[1])); /* ??? This note is useless, since it only restates the set itself. We should rather use the original SYMBOL_REF. However, there is the problem that we are lying to the compiler about these @@ -7686,7 +7684,7 @@ prepare_extend_operands (rtx *operands, enum rtx_code code, variables. */ operands[1] = gen_rtx_fmt_e (code, omode, arc_rewrite_small_data (operands[1])); - emit_insn (gen_rtx_SET (omode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); set_unique_reg_note (get_last_insn (), REG_EQUAL, operands[1]); /* Take care of the REG_EQUAL note that will be attached to mark the @@ -8223,7 +8221,7 @@ conditionalize_nonjump (rtx pat, rtx cond, rtx insn, bool annulled) /* Leave add_n alone - the canonical form is to have the complex summand first. */ && REG_P (src0)) - pat = gen_rtx_SET (VOIDmode, dst, + pat = gen_rtx_SET (dst, gen_rtx_fmt_ee (GET_CODE (src), GET_MODE (src), src1, src0)); } @@ -8365,7 +8363,7 @@ arc_ifcvt (void) else if (JUMP_P (insn) && ANY_RETURN_P (PATTERN (insn))) { pat = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, pat, pc_rtx); - pat = gen_rtx_SET (VOIDmode, pc_rtx, pat); + pat = gen_rtx_SET (pc_rtx, pat); } else gcc_unreachable (); @@ -8928,7 +8926,7 @@ arc_process_double_reg_moves (rtx *operands) if (TARGET_DPFP_DISABLE_LRSR) { /* gen *movdf_insn_nolrsr */ - rtx set = gen_rtx_SET (VOIDmode, dest, src); + rtx set = gen_rtx_SET (dest, src); rtx use1 = gen_rtx_USE (VOIDmode, const1_rtx); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, use1))); } @@ -8940,12 +8938,10 @@ arc_process_double_reg_moves (rtx *operands) rtx destLow = simplify_gen_subreg(SImode, dest, DFmode, 0); /* Produce the two LR insns to get the high and low parts. */ - emit_insn (gen_rtx_SET (VOIDmode, - destHigh, + emit_insn (gen_rtx_SET (destHigh, gen_rtx_UNSPEC_VOLATILE (Pmode, gen_rtvec (1, src), VUNSPEC_LR_HIGH))); - emit_insn (gen_rtx_SET (VOIDmode, - destLow, + emit_insn (gen_rtx_SET (destLow, gen_rtx_UNSPEC_VOLATILE (Pmode, gen_rtvec (1, src), VUNSPEC_LR))); } @@ -9042,8 +9038,8 @@ arc_split_move (rtx *operands) operands[5-swap] = xop[3]; start_sequence (); - emit_insn (gen_rtx_SET (VOIDmode, operands[2], operands[3])); - emit_insn (gen_rtx_SET (VOIDmode, operands[4], operands[5])); + emit_insn (gen_rtx_SET (operands[2], operands[3])); + emit_insn (gen_rtx_SET (operands[4], operands[5])); val = get_insns (); end_sequence (); diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md index ce601822302..931f9a18703 100644 --- a/gcc/config/arc/arc.md +++ b/gcc/config/arc/arc.md @@ -2287,7 +2287,7 @@ (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_LTU (VOIDmode, gen_rtx_REG (CC_Cmode, CC_REG), GEN_INT (0)), - gen_rtx_SET (VOIDmode, h0, plus_constant (SImode, h0, 1)))); + gen_rtx_SET (h0, plus_constant (SImode, h0, 1)))); DONE; } emit_insn (gen_add_f (l0, l1, l2)); @@ -2512,13 +2512,13 @@ { h1 = simplify_gen_binary (MINUS, SImode, h1, h2); if (!rtx_equal_p (h0, h1)) - emit_insn (gen_rtx_SET (VOIDmode, h0, h1)); + emit_insn (gen_rtx_SET (h0, h1)); emit_insn (gen_sub_f (l0, l1, l2)); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_LTU (VOIDmode, gen_rtx_REG (CC_Cmode, CC_REG), GEN_INT (0)), - gen_rtx_SET (VOIDmode, h0, plus_constant (SImode, h0, -1)))); + gen_rtx_SET (h0, plus_constant (SImode, h0, -1)))); DONE; } emit_insn (gen_sub_f (l0, l1, l2)); @@ -3544,7 +3544,7 @@ x = gen_rtx_GTU (VOIDmode, gen_rtx_REG (CCmode, CC_REG), const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (VOIDmode, operands[4]), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, x)); + emit_jump_insn (gen_rtx_SET (pc_rtx, x)); if (TARGET_COMPACT_CASESI) { emit_jump_insn (gen_casesi_compact_jump (operands[5], operands[7])); @@ -4079,13 +4079,12 @@ (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_LT (VOIDmode, gen_rtx_REG (CC_ZNmode, CC_REG), const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], const0_rtx))); + gen_rtx_SET (operands[0], const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_GE (VOIDmode, gen_rtx_REG (CC_ZNmode, CC_REG), const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], - plus_constant (SImode, operands[0], 1)))); + gen_rtx_SET (operands[0], plus_constant (SImode, operands[0], 1)))); DONE; }) @@ -4108,13 +4107,12 @@ (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_LT (VOIDmode, gen_rtx_REG (CC_ZNmode, CC_REG), const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], GEN_INT (32)))); + gen_rtx_SET (operands[0], GEN_INT (32)))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_GE (VOIDmode, gen_rtx_REG (CC_ZNmode, CC_REG), const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], - gen_rtx_MINUS (SImode, GEN_INT (31), temp)))); + gen_rtx_SET (operands[0], gen_rtx_MINUS (SImode, GEN_INT (31), temp)))); DONE; }) diff --git a/gcc/config/arm/arm-fixed.md b/gcc/config/arm/arm-fixed.md index bdccfc15fc5..f4c2f03ce2e 100644 --- a/gcc/config/arm/arm-fixed.md +++ b/gcc/config/arm/arm-fixed.md @@ -372,7 +372,7 @@ rshift = gen_rtx_ASHIFTRT (SImode, tmp, GEN_INT (7)); - emit_insn (gen_rtx_SET (VOIDmode, gen_lowpart (HImode, operands[0]), + emit_insn (gen_rtx_SET (gen_lowpart (HImode, operands[0]), gen_rtx_SS_TRUNCATE (HImode, rshift))); DONE; diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 9f808be41af..1b3a6fc5006 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -2234,7 +2234,7 @@ arm_constant_limit (bool size_p) inline static rtx_insn * emit_set_insn (rtx x, rtx y) { - return emit_insn (gen_rtx_SET (VOIDmode, x, y)); + return emit_insn (gen_rtx_SET (x, y)); } /* Return the number of bits set in VALUE. */ @@ -4136,7 +4136,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, GEN_INT (ARM_SIGN_EXTEND (val)))); return 1; } @@ -4147,8 +4147,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, return 0; if (generate) - emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, source)); + emit_constant_insn (cond, gen_rtx_SET (target, source)); return 1; } break; @@ -4157,8 +4156,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, if (remainder == 0) { if (generate) - emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, const0_rtx)); + emit_constant_insn (cond, gen_rtx_SET (target, const0_rtx)); return 1; } if (remainder == 0xffffffff) @@ -4166,8 +4164,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, if (reload_completed && rtx_equal_p (target, source)) return 0; if (generate) - emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, source)); + emit_constant_insn (cond, gen_rtx_SET (target, source)); return 1; } can_invert = 1; @@ -4179,8 +4176,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, if (reload_completed && rtx_equal_p (target, source)) return 0; if (generate) - emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, source)); + emit_constant_insn (cond, gen_rtx_SET (target, source)); return 1; } @@ -4188,7 +4184,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_NOT (mode, source))); return 1; } @@ -4202,7 +4198,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_NEG (mode, source))); return 1; } @@ -4210,7 +4206,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_MINUS (mode, GEN_INT (val), source))); return 1; @@ -4227,7 +4223,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, (source ? gen_rtx_fmt_ee (code, mode, source, GEN_INT (val)) @@ -4314,8 +4310,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { rtx new_src = subtargets ? gen_reg_rtx (mode) : target; emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, new_src, - GEN_INT (temp1))); + gen_rtx_SET (new_src, GEN_INT (temp1))); emit_constant_insn (cond, gen_ashrsi3 (target, new_src, GEN_INT (set_sign_bit_copies - 1))); @@ -4331,8 +4326,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { rtx new_src = subtargets ? gen_reg_rtx (mode) : target; emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, new_src, - GEN_INT (temp1))); + gen_rtx_SET (new_src, GEN_INT (temp1))); emit_constant_insn (cond, gen_ashrsi3 (target, new_src, GEN_INT (set_sign_bit_copies - 1))); @@ -4365,8 +4359,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { rtx new_src = subtargets ? gen_reg_rtx (mode) : target; emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, new_src, - GEN_INT (temp1))); + gen_rtx_SET (new_src, GEN_INT (temp1))); emit_constant_insn (cond, gen_addsi3 (target, new_src, GEN_INT (-temp2))); @@ -4402,7 +4395,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, emit_constant_insn (cond, gen_rtx_SET - (VOIDmode, target, + (target, gen_rtx_IOR (mode, gen_rtx_ASHIFT (mode, source, GEN_INT (i)), @@ -4426,7 +4419,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, if (generate) emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_IOR (mode, gen_rtx_LSHIFTRT (mode, source, @@ -4454,10 +4447,9 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, rtx sub = subtargets ? gen_reg_rtx (mode) : target; emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, sub, - GEN_INT (val))); + gen_rtx_SET (sub, GEN_INT (val))); emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_fmt_ee (code, mode, source, sub))); } @@ -4489,14 +4481,14 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, sub, + gen_rtx_SET (sub, gen_rtx_NOT (mode, gen_rtx_ASHIFT (mode, source, shift)))); emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_NOT (mode, gen_rtx_LSHIFTRT (mode, sub, shift)))); @@ -4524,14 +4516,14 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, sub, + gen_rtx_SET (sub, gen_rtx_NOT (mode, gen_rtx_LSHIFTRT (mode, source, shift)))); emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_NOT (mode, gen_rtx_ASHIFT (mode, sub, shift)))); @@ -4552,17 +4544,17 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, { rtx sub = subtargets ? gen_reg_rtx (mode) : target; emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, sub, + gen_rtx_SET (sub, gen_rtx_NOT (mode, source))); source = sub; if (subtargets) sub = gen_reg_rtx (mode); emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, sub, + gen_rtx_SET (sub, gen_rtx_AND (mode, source, GEN_INT (temp1)))); emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, target, + gen_rtx_SET (target, gen_rtx_NOT (mode, sub))); } return 3; @@ -4728,9 +4720,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, else temp1_rtx = gen_rtx_fmt_ee (code, mode, source, temp1_rtx); - emit_constant_insn (cond, - gen_rtx_SET (VOIDmode, new_src, - temp1_rtx)); + emit_constant_insn (cond, gen_rtx_SET (new_src, temp1_rtx)); source = new_src; if (code == SET) @@ -4747,7 +4737,7 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond, if (final_invert) { if (generate) - emit_constant_insn (cond, gen_rtx_SET (VOIDmode, target, + emit_constant_insn (cond, gen_rtx_SET (target, gen_rtx_NOT (mode, source))); insns++; } @@ -6840,7 +6830,7 @@ arm_load_pic_register (unsigned long saved_regs ATTRIBUTE_UNUSED) pic_rtx = gen_rtx_CONST (Pmode, pic_rtx); emit_insn (gen_pic_load_addr_32bit (pic_reg, pic_rtx)); - emit_insn (gen_rtx_SET (Pmode, pic_reg, gen_rtx_MEM (Pmode, pic_reg))); + emit_insn (gen_rtx_SET (pic_reg, gen_rtx_MEM (Pmode, pic_reg))); pic_tmp = gen_rtx_SYMBOL_REF (Pmode, VXWORKS_GOTT_INDEX); emit_insn (gen_pic_offset_arm (pic_reg, pic_reg, pic_tmp)); @@ -12634,8 +12624,7 @@ neon_expand_vector_init (rtx target, rtx vals) if (all_same && GET_MODE_SIZE (inner_mode) <= 4) { x = copy_to_mode_reg (inner_mode, XVECEXP (vals, 0, 0)); - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_VEC_DUPLICATE (mode, x))); + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_DUPLICATE (mode, x))); return; } @@ -13837,15 +13826,14 @@ arm_gen_load_multiple_1 (int count, int *regs, rtx *mems, rtx basereg, if (wback_offset != 0) { XVECEXP (result, 0, 0) - = gen_rtx_SET (VOIDmode, basereg, - plus_constant (Pmode, basereg, wback_offset)); + = gen_rtx_SET (basereg, plus_constant (Pmode, basereg, wback_offset)); i = 1; count++; } for (j = 0; i < count; i++, j++) XVECEXP (result, 0, i) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (SImode, regs[j]), mems[j]); + = gen_rtx_SET (gen_rtx_REG (SImode, regs[j]), mems[j]); return result; } @@ -13889,15 +13877,14 @@ arm_gen_store_multiple_1 (int count, int *regs, rtx *mems, rtx basereg, if (wback_offset != 0) { XVECEXP (result, 0, 0) - = gen_rtx_SET (VOIDmode, basereg, - plus_constant (Pmode, basereg, wback_offset)); + = gen_rtx_SET (basereg, plus_constant (Pmode, basereg, wback_offset)); i = 1; count++; } for (j = 0; i < count; i++, j++) XVECEXP (result, 0, i) - = gen_rtx_SET (VOIDmode, mems[j], gen_rtx_REG (SImode, regs[j])); + = gen_rtx_SET (mems[j], gen_rtx_REG (SImode, regs[j])); return result; } @@ -15179,7 +15166,7 @@ arm_gen_compare_reg (enum rtx_code code, rtx x, rtx y, rtx scratch) scratch = gen_rtx_SCRATCH (SImode); clobber = gen_rtx_CLOBBER (VOIDmode, scratch); - set = gen_rtx_SET (VOIDmode, cc_reg, gen_rtx_COMPARE (mode, x, y)); + set = gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, x, y)); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, clobber))); } else @@ -17049,7 +17036,7 @@ thumb1_reorg (void) dest = copy_rtx (dest); src = copy_rtx (src); src = gen_rtx_MINUS (SImode, src, const0_rtx); - PATTERN (prev) = gen_rtx_SET (VOIDmode, dest, src); + PATTERN (prev) = gen_rtx_SET (dest, src); INSN_CODE (prev) = -1; /* Set test register in INSN to dest. */ XEXP (XEXP (SET_SRC (pat), 0), 0) = copy_rtx (dest); @@ -17250,7 +17237,7 @@ thumb2_reorg (void) src = copy_rtx (src); XEXP (src, 0) = op1; XEXP (src, 1) = op0; - pat = gen_rtx_SET (VOIDmode, dst, src); + pat = gen_rtx_SET (dst, src); vec = gen_rtvec (2, pat, clobber); } else /* action == CONV */ @@ -17611,8 +17598,7 @@ vfp_emit_fstmd (int base_reg, int count) base_reg += 2; XVECEXP (par, 0, 0) - = gen_rtx_SET (VOIDmode, - gen_frame_mem + = gen_rtx_SET (gen_frame_mem (BLKmode, gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, @@ -17624,14 +17610,12 @@ vfp_emit_fstmd (int base_reg, int count) gen_rtvec (1, reg), UNSPEC_PUSH_MULT)); - tmp = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -(count * 8))); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 0) = tmp; - tmp = gen_rtx_SET (VOIDmode, - gen_frame_mem (DFmode, stack_pointer_rtx), - reg); + tmp = gen_rtx_SET (gen_frame_mem (DFmode, stack_pointer_rtx), reg); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 1) = tmp; @@ -17641,8 +17625,7 @@ vfp_emit_fstmd (int base_reg, int count) base_reg += 2; XVECEXP (par, 0, i) = gen_rtx_USE (VOIDmode, reg); - tmp = gen_rtx_SET (VOIDmode, - gen_frame_mem (DFmode, + tmp = gen_rtx_SET (gen_frame_mem (DFmode, plus_constant (Pmode, stack_pointer_rtx, i * 8)), @@ -19636,9 +19619,8 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask) dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (num_regs + 1)); /* Describe the stack adjustment. */ - tmp = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); + tmp = gen_rtx_SET (stack_pointer_rtx, + plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 0) = tmp; @@ -19667,13 +19649,12 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask) plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs))); - tmp = gen_rtx_SET (VOIDmode, mem, reg); + tmp = gen_rtx_SET (mem, reg); RTX_FRAME_RELATED_P (tmp) = 1; insn = emit_insn (tmp); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); - tmp = gen_rtx_SET (VOIDmode, gen_frame_mem (Pmode, stack_pointer_rtx), - reg); + tmp = gen_rtx_SET (gen_frame_mem (Pmode, stack_pointer_rtx), reg); RTX_FRAME_RELATED_P (tmp) = 1; i++; regno++; @@ -19707,11 +19688,11 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask) mem2 = gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, -4 * (num_regs - 1))); - tmp0 = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + tmp0 = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 * (num_regs))); - tmp1 = gen_rtx_SET (VOIDmode, mem1, reg1); - tmp2 = gen_rtx_SET (VOIDmode, mem2, reg2); + tmp1 = gen_rtx_SET (mem1, reg1); + tmp2 = gen_rtx_SET (mem2, reg2); RTX_FRAME_RELATED_P (tmp0) = 1; RTX_FRAME_RELATED_P (tmp1) = 1; RTX_FRAME_RELATED_P (tmp2) = 1; @@ -19731,8 +19712,8 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask) mem2 = gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, 4 * (i + 1))); - tmp1 = gen_rtx_SET (VOIDmode, mem1, reg1); - tmp2 = gen_rtx_SET (VOIDmode, mem2, reg2); + tmp1 = gen_rtx_SET (mem1, reg1); + tmp2 = gen_rtx_SET (mem2, reg2); RTX_FRAME_RELATED_P (tmp1) = 1; RTX_FRAME_RELATED_P (tmp2) = 1; par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); @@ -19742,14 +19723,12 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask) } /* Create unwind information. This is an approximation. */ - tmp1 = gen_rtx_SET (VOIDmode, - gen_frame_mem (Pmode, + tmp1 = gen_rtx_SET (gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, 4 * i)), reg1); - tmp2 = gen_rtx_SET (VOIDmode, - gen_frame_mem (Pmode, + tmp2 = gen_rtx_SET (gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, 4 * (i + 1))), @@ -19800,8 +19779,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (num_regs + 1)); /* For dwarf info, we generate explicit stack update. */ - tmp = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_index++) = tmp; @@ -19833,7 +19811,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) else mem = gen_frame_mem (DImode, stack_pointer_rtx); - tmp = gen_rtx_SET (DImode, mem, gen_rtx_REG (DImode, j)); + tmp = gen_rtx_SET (mem, gen_rtx_REG (DImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; tmp = emit_insn (tmp); @@ -19846,7 +19824,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) plus_constant (Pmode, stack_pointer_rtx, offset)); - tmp = gen_rtx_SET (SImode, mem, gen_rtx_REG (SImode, j)); + tmp = gen_rtx_SET (mem, gen_rtx_REG (SImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_index++) = tmp; @@ -19854,7 +19832,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) plus_constant (Pmode, stack_pointer_rtx, offset + 4)); - tmp = gen_rtx_SET (SImode, mem, gen_rtx_REG (SImode, j + 1)); + tmp = gen_rtx_SET (mem, gen_rtx_REG (SImode, j + 1)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_index++) = tmp; @@ -19880,7 +19858,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) else mem = gen_frame_mem (SImode, stack_pointer_rtx); - tmp = gen_rtx_SET (SImode, mem, gen_rtx_REG (SImode, j)); + tmp = gen_rtx_SET (mem, gen_rtx_REG (SImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; tmp = emit_insn (tmp); @@ -19893,7 +19871,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) plus_constant(Pmode, stack_pointer_rtx, offset)); - tmp = gen_rtx_SET (SImode, mem, gen_rtx_REG (SImode, j)); + tmp = gen_rtx_SET (mem, gen_rtx_REG (SImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_index++) = tmp; @@ -19992,8 +19970,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) reg = gen_rtx_REG (SImode, i); XVECEXP (par, 0, 0) - = gen_rtx_SET (VOIDmode, - gen_frame_mem + = gen_rtx_SET (gen_frame_mem (BLKmode, gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, @@ -20007,8 +19984,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) if (dwarf_regs_mask & (1 << i)) { - tmp = gen_rtx_SET (VOIDmode, - gen_frame_mem (SImode, stack_pointer_rtx), + tmp = gen_rtx_SET (gen_frame_mem (SImode, stack_pointer_rtx), reg); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_par_index++) = tmp; @@ -20029,8 +20005,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) if (dwarf_regs_mask & (1 << i)) { tmp - = gen_rtx_SET (VOIDmode, - gen_frame_mem + = gen_rtx_SET (gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, 4 * j)), @@ -20045,8 +20020,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) par = emit_insn (par); - tmp = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 0) = tmp; @@ -20065,7 +20039,7 @@ arm_add_cfa_adjust_cfa_note (rtx insn, int size, rtx dest, rtx src) rtx dwarf; RTX_FRAME_RELATED_P (insn) = 1; - dwarf = gen_rtx_SET (VOIDmode, dest, plus_constant (Pmode, src, size)); + dwarf = gen_rtx_SET (dest, plus_constant (Pmode, src, size)); add_reg_note (insn, REG_CFA_ADJUST_CFA, dwarf); } @@ -20108,8 +20082,7 @@ arm_emit_multi_reg_pop (unsigned long saved_regs_mask) { /* Increment the stack pointer, based on there being num_regs 4-byte registers to restore. */ - tmp = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, 4 * num_regs)); @@ -20128,13 +20101,12 @@ arm_emit_multi_reg_pop (unsigned long saved_regs_mask) tmp = gen_frame_mem (SImode, gen_rtx_POST_INC (Pmode, stack_pointer_rtx)); - tmp = emit_insn (gen_rtx_SET (VOIDmode, reg, tmp)); + tmp = emit_insn (gen_rtx_SET (reg, tmp)); REG_NOTES (tmp) = alloc_reg_note (REG_CFA_RESTORE, reg, dwarf); return; } - tmp = gen_rtx_SET (VOIDmode, - reg, + tmp = gen_rtx_SET (reg, gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, 4 * j))); @@ -20202,9 +20174,7 @@ arm_emit_vfp_multi_reg_pop (int first_reg, int num_regs, rtx base_reg) /* Increment the stack pointer, based on there being num_regs 8-byte registers to restore. */ - tmp = gen_rtx_SET (VOIDmode, - base_reg, - plus_constant (Pmode, base_reg, 8 * num_regs)); + tmp = gen_rtx_SET (base_reg, plus_constant (Pmode, base_reg, 8 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (par, 0, 0) = tmp; @@ -20213,8 +20183,7 @@ arm_emit_vfp_multi_reg_pop (int first_reg, int num_regs, rtx base_reg) { reg = gen_rtx_REG (DFmode, i); - tmp = gen_rtx_SET (VOIDmode, - reg, + tmp = gen_rtx_SET (reg, gen_frame_mem (DFmode, plus_constant (Pmode, base_reg, 8 * j))); @@ -20280,8 +20249,7 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) { /* Create RTX for memory load. */ reg = gen_rtx_REG (SImode, j); - tmp = gen_rtx_SET (SImode, - reg, + tmp = gen_rtx_SET (reg, gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, 4 * i))); @@ -20325,8 +20293,7 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) /* Increment the stack pointer, based on there being num_regs 4-byte registers to restore. */ - tmp = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, 4 * i)); RTX_FRAME_RELATED_P (tmp) = 1; tmp = emit_insn (tmp); @@ -20352,7 +20319,7 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) set_mem_alias_set (tmp1, get_frame_alias_set ()); reg = gen_rtx_REG (SImode, j); - tmp = gen_rtx_SET (SImode, reg, tmp1); + tmp = gen_rtx_SET (reg, tmp1); RTX_FRAME_RELATED_P (tmp) = 1; dwarf = alloc_reg_note (REG_CFA_RESTORE, reg, dwarf); @@ -20425,7 +20392,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) else mem = gen_frame_mem (DImode, stack_pointer_rtx); - tmp = gen_rtx_SET (DImode, gen_rtx_REG (DImode, j), mem); + tmp = gen_rtx_SET (gen_rtx_REG (DImode, j), mem); tmp = emit_insn (tmp); RTX_FRAME_RELATED_P (tmp) = 1; @@ -20454,7 +20421,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) else mem = gen_frame_mem (SImode, stack_pointer_rtx); - tmp = gen_rtx_SET (SImode, gen_rtx_REG (SImode, j), mem); + tmp = gen_rtx_SET (gen_rtx_REG (SImode, j), mem); tmp = emit_insn (tmp); RTX_FRAME_RELATED_P (tmp) = 1; @@ -20475,8 +20442,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) /* Update the stack. */ if (offset > 0) { - tmp = gen_rtx_SET (Pmode, - stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset)); @@ -20491,8 +20457,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) /* Only PC is to be popped. */ par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); XVECEXP (par, 0, 0) = ret_rtx; - tmp = gen_rtx_SET (SImode, - gen_rtx_REG (SImode, PC_REGNUM), + tmp = gen_rtx_SET (gen_rtx_REG (SImode, PC_REGNUM), gen_frame_mem (SImode, gen_rtx_POST_INC (SImode, stack_pointer_rtx))); @@ -20968,7 +20933,7 @@ thumb_set_frame_pointer (arm_stack_offsets *offsets) hard_frame_pointer_rtx, stack_pointer_rtx)); } - dwarf = gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + dwarf = gen_rtx_SET (hard_frame_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, amount)); RTX_FRAME_RELATED_P (dwarf) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); @@ -21101,7 +21066,7 @@ arm_expand_prologue (void) fp_offset = 4; /* Just tell the dwarf backend that we adjusted SP. */ - dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + dwarf = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -fp_offset)); RTX_FRAME_RELATED_P (insn) = 1; @@ -21135,7 +21100,7 @@ arm_expand_prologue (void) /* Just tell the dwarf backend that we adjusted SP. */ dwarf - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -args_to_push)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); @@ -23271,8 +23236,8 @@ neon_split_vcombine (rtx operands[3]) /* Special case of reversed high/low parts. Use VSWP. */ if (src2 == dest && src1 == dest + halfregs) { - rtx x = gen_rtx_SET (VOIDmode, destlo, operands[1]); - rtx y = gen_rtx_SET (VOIDmode, desthi, operands[2]); + rtx x = gen_rtx_SET (destlo, operands[1]); + rtx y = gen_rtx_SET (desthi, operands[2]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, x, y))); return; } @@ -23334,7 +23299,7 @@ thumb1_emit_multi_reg_push (unsigned long mask, unsigned long real_regs) tmp = plus_constant (Pmode, stack_pointer_rtx, -4 * i); tmp = gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, tmp); tmp = gen_frame_mem (BLKmode, tmp); - tmp = gen_rtx_SET (VOIDmode, tmp, par[0]); + tmp = gen_rtx_SET (tmp, par[0]); par[0] = tmp; tmp = gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (i, par)); @@ -23342,7 +23307,7 @@ thumb1_emit_multi_reg_push (unsigned long mask, unsigned long real_regs) /* Always build the stack adjustment note for unwind info. */ tmp = plus_constant (Pmode, stack_pointer_rtx, -4 * i); - tmp = gen_rtx_SET (VOIDmode, stack_pointer_rtx, tmp); + tmp = gen_rtx_SET (stack_pointer_rtx, tmp); par[0] = tmp; /* Build the parallel of the registers recorded as saved for unwind. */ @@ -23353,7 +23318,7 @@ thumb1_emit_multi_reg_push (unsigned long mask, unsigned long real_regs) tmp = plus_constant (Pmode, stack_pointer_rtx, j * 4); tmp = gen_frame_mem (SImode, tmp); - tmp = gen_rtx_SET (VOIDmode, tmp, reg); + tmp = gen_rtx_SET (tmp, reg); RTX_FRAME_RELATED_P (tmp) = 1; par[j + 1] = tmp; } @@ -24510,7 +24475,7 @@ thumb1_expand_prologue (void) insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, reg)); - dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + dwarf = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -amount)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); @@ -24566,7 +24531,7 @@ thumb2_expand_return (bool simple_return) stack_pointer_rtx)); set_mem_alias_set (addr, get_frame_alias_set ()); XVECEXP (par, 0, 0) = ret_rtx; - XVECEXP (par, 0, 1) = gen_rtx_SET (SImode, reg, addr); + XVECEXP (par, 0, 1) = gen_rtx_SET (reg, addr); RTX_FRAME_RELATED_P (XVECEXP (par, 0, 1)) = 1; emit_jump_insn (par); } @@ -24999,8 +24964,7 @@ arm_expand_epilogue (bool really_return) { insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); XVECEXP (insn, 0, 0) = ret_rtx; - XVECEXP (insn, 0, 1) = gen_rtx_SET (SImode, - gen_rtx_REG (SImode, i), + XVECEXP (insn, 0, 1) = gen_rtx_SET (gen_rtx_REG (SImode, i), addr); RTX_FRAME_RELATED_P (XVECEXP (insn, 0, 1)) = 1; insn = emit_jump_insn (insn); @@ -27497,7 +27461,7 @@ arm_expand_compare_and_swap (rtx operands[]) in a subsequent branch, post optimization. */ x = gen_rtx_REG (CCmode, CC_REGNUM); x = gen_rtx_EQ (SImode, x, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, bval, x)); + emit_insn (gen_rtx_SET (bval, x)); } /* Split a compare and swap pattern. It is IMPLEMENTATION DEFINED whether @@ -27554,7 +27518,7 @@ arm_split_compare_and_swap (rtx operands[]) x = gen_rtx_NE (VOIDmode, cond, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label2), pc_rtx); - emit_unlikely_jump (gen_rtx_SET (VOIDmode, pc_rtx, x)); + emit_unlikely_jump (gen_rtx_SET (pc_rtx, x)); arm_emit_store_exclusive (mode, scratch, mem, newval, use_release); @@ -27562,14 +27526,14 @@ arm_split_compare_and_swap (rtx operands[]) match the flags that we got from the compare above. */ cond = gen_rtx_REG (CCmode, CC_REGNUM); x = gen_rtx_COMPARE (CCmode, scratch, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, cond, x)); + emit_insn (gen_rtx_SET (cond, x)); if (!is_weak) { x = gen_rtx_NE (VOIDmode, cond, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label1), pc_rtx); - emit_unlikely_jump (gen_rtx_SET (VOIDmode, pc_rtx, x)); + emit_unlikely_jump (gen_rtx_SET (pc_rtx, x)); } if (mod_f != MEMMODEL_RELAXED) @@ -27628,9 +27592,9 @@ arm_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, case NOT: x = gen_rtx_AND (wmode, old_out, value); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); x = gen_rtx_NOT (wmode, new_out); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); break; case MINUS: @@ -27662,7 +27626,7 @@ arm_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, default: x = gen_rtx_fmt_ee (code, wmode, old_out, value); - emit_insn (gen_rtx_SET (VOIDmode, new_out, x)); + emit_insn (gen_rtx_SET (new_out, x)); break; } @@ -28382,7 +28346,7 @@ arm_emit_coreregs_64bit_shift (enum rtx_code code, rtx out, rtx in, gen_addsi3_compare0 ((DEST), (SRC), \ GEN_INT (-32)) #define SET(DEST,SRC) \ - gen_rtx_SET (SImode, (DEST), (SRC)) + gen_rtx_SET ((DEST), (SRC)) #define SHIFT(CODE,SRC,AMOUNT) \ gen_rtx_fmt_ee ((CODE), SImode, (SRC), (AMOUNT)) #define LSHIFT(CODE,SRC,AMOUNT) \ diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 130eb702db6..7c87bcdeca1 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -3277,7 +3277,7 @@ if (operands[2] == const0_rtx || operands[2] == constm1_rtx) { /* No need for a clobber of the condition code register here. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_SMAX (SImode, operands[1], operands[2]))); DONE; @@ -3339,7 +3339,7 @@ if (operands[2] == const0_rtx) { /* No need for a clobber of the condition code register here. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_SMIN (SImode, operands[1], operands[2]))); DONE; @@ -4420,13 +4420,13 @@ rsc Rhi, Rhi, #0 (thumb2: sbc Rhi, Rhi, Rhi, lsl #1). */ rtx cc_reg = gen_rtx_REG (CC_Cmode, CC_REGNUM); - emit_insn (gen_rtx_SET (VOIDmode, high, + emit_insn (gen_rtx_SET (high, gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)))); emit_insn (gen_subsi3_compare (low, const0_rtx, operands[1])); if (TARGET_ARM) - emit_insn (gen_rtx_SET (VOIDmode, high, + emit_insn (gen_rtx_SET (high, gen_rtx_MINUS (SImode, gen_rtx_MINUS (SImode, const0_rtx, @@ -4437,7 +4437,7 @@ else { rtx two_x = gen_rtx_ASHIFT (SImode, high, GEN_INT (1)); - emit_insn (gen_rtx_SET (VOIDmode, high, + emit_insn (gen_rtx_SET (high, gen_rtx_MINUS (SImode, gen_rtx_MINUS (SImode, high, @@ -4454,13 +4454,12 @@ bic Rhi, Rlo, Rin asr Rhi, Rhi, #31 Flags not needed for this sequence. */ - emit_insn (gen_rtx_SET (VOIDmode, low, - gen_rtx_NEG (SImode, operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, high, + emit_insn (gen_rtx_SET (low, gen_rtx_NEG (SImode, operands[1]))); + emit_insn (gen_rtx_SET (high, gen_rtx_AND (SImode, gen_rtx_NOT (SImode, operands[1]), low))); - emit_insn (gen_rtx_SET (VOIDmode, high, + emit_insn (gen_rtx_SET (high, gen_rtx_ASHIFTRT (SImode, high, GEN_INT (31)))); } @@ -4531,15 +4530,13 @@ (cond_exec (lt:CC (reg:CC CC_REGNUM) (const_int 0)) (set (match_dup 0) (minus:SI (const_int 0) (match_dup 1))))] */ - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_REG (CCmode, CC_REGNUM), + emit_insn (gen_rtx_SET (gen_rtx_REG (CCmode, CC_REGNUM), gen_rtx_COMPARE (CCmode, operands[0], const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, (gen_rtx_LT (SImode, gen_rtx_REG (CCmode, CC_REGNUM), const0_rtx)), - (gen_rtx_SET (VOIDmode, - operands[0], + (gen_rtx_SET (operands[0], (gen_rtx_MINUS (SImode, const0_rtx, operands[1])))))); @@ -4556,15 +4553,13 @@ (minus:SI (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31))))] */ - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_XOR (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)), operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_MINUS (SImode, operands[0], gen_rtx_ASHIFTRT (SImode, @@ -4595,15 +4590,13 @@ /* Emit the pattern: cmp\\t%0, #0\;rsbgt\\t%0, %0, #0 */ - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_REG (CCmode, CC_REGNUM), + emit_insn (gen_rtx_SET (gen_rtx_REG (CCmode, CC_REGNUM), gen_rtx_COMPARE (CCmode, operands[0], const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_GT (SImode, gen_rtx_REG (CCmode, CC_REGNUM), const0_rtx), - gen_rtx_SET (VOIDmode, - operands[0], + gen_rtx_SET (operands[0], (gen_rtx_MINUS (SImode, const0_rtx, operands[1]))))); @@ -4613,15 +4606,13 @@ /* Emit the pattern: eor%?\\t%0, %1, %1, asr #31\;rsb%?\\t%0, %0, %1, asr #31 */ - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_XOR (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)), operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_MINUS (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], @@ -4885,7 +4876,7 @@ if (src_mode == SImode) emit_move_insn (lo_part, operands[1]); else - emit_insn (gen_rtx_SET (VOIDmode, lo_part, + emit_insn (gen_rtx_SET (lo_part, gen_rtx_ZERO_EXTEND (SImode, operands[1]))); operands[1] = lo_part; } @@ -4912,7 +4903,7 @@ if (src_mode == SImode) emit_move_insn (lo_part, operands[1]); else - emit_insn (gen_rtx_SET (VOIDmode, lo_part, + emit_insn (gen_rtx_SET (lo_part, gen_rtx_SIGN_EXTEND (SImode, operands[1]))); operands[1] = lo_part; } @@ -5237,8 +5228,7 @@ { if (arm_arch4 && MEM_P (operands[1])) { - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_SIGN_EXTEND (HImode, operands[1]))); DONE; } @@ -5697,7 +5687,7 @@ if (offset < -0x8000 || offset > 0x7fff) { arm_emit_movpair (operands[0], operands[1]); - emit_insn (gen_rtx_SET (SImode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_PLUS (SImode, operands[0], operands[2]))); } else @@ -6625,8 +6615,7 @@ emit_insn (gen_addsi3 (operands[2], XEXP (XEXP (operands[0], 0), 0), XEXP (XEXP (operands[0], 0), 1))); - emit_insn (gen_rtx_SET (VOIDmode, - replace_equiv_address (operands[0], operands[2]), + emit_insn (gen_rtx_SET (replace_equiv_address (operands[0], operands[2]), operands[1])); if (code == POST_DEC) @@ -7459,9 +7448,7 @@ emit_insn (gen_rtx_COND_EXEC (VOIDmode, operands[3], - gen_rtx_SET (VOIDmode, - operands[0], - operands[1]))); + gen_rtx_SET (operands[0], operands[1]))); rev_code = GET_CODE (operands[3]); mode = GET_MODE (operands[4]); @@ -7476,9 +7463,7 @@ const0_rtx); emit_insn (gen_rtx_COND_EXEC (VOIDmode, rev_cond, - gen_rtx_SET (VOIDmode, - operands[0], - operands[2]))); + gen_rtx_SET (operands[0], operands[2]))); DONE; } [(set_attr "length" "4,4,4,4,8,8,8,8") @@ -9252,8 +9237,7 @@ if (GET_CODE (operands[3]) == LT && operands[2] == const0_rtx) { /* Emit mov\\t%0, %1, asr #31 */ - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)))); @@ -9272,16 +9256,14 @@ gen_rtx_NE (SImode, cc_reg, const0_rtx), - gen_rtx_SET (SImode, - operands[0], + gen_rtx_SET (operands[0], GEN_INT (~0)))); DONE; } else { /* Emit: cmp\\t%1, %2\;mov%D3\\t%0, #0\;mvn%d3\\t%0, #0 */ - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (CCmode, operands[1], operands[2]))); enum rtx_code rc = GET_CODE (operands[3]); @@ -9291,15 +9273,14 @@ VOIDmode, cc_reg, const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], const0_rtx))); + gen_rtx_SET (operands[0], const0_rtx))); rc = GET_CODE (operands[3]); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_fmt_ee (rc, VOIDmode, cc_reg, const0_rtx), - gen_rtx_SET (VOIDmode, - operands[0], + gen_rtx_SET (operands[0], GEN_INT (~0)))); DONE; } @@ -11244,7 +11225,7 @@ emit_move_insn (scratch1, op2_high); emit_move_insn (scratch2, op1_high); - emit_insn(gen_rtx_SET(SImode, scratch1, + emit_insn(gen_rtx_SET(scratch1, gen_rtx_LSHIFTRT (SImode, op2_high, GEN_INT(31)))); emit_insn(gen_insv_t2(scratch2, GEN_INT(1), GEN_INT(31), scratch1)); emit_move_insn (op0_low, op1_low); diff --git a/gcc/config/arm/ldrdstrd.md b/gcc/config/arm/ldrdstrd.md index 3713c4d8ff2..ce0ab114ffd 100644 --- a/gcc/config/arm/ldrdstrd.md +++ b/gcc/config/arm/ldrdstrd.md @@ -43,7 +43,7 @@ operands[0] = gen_rtx_REG (DImode, REGNO (operands[0])); operands[2] = adjust_address (operands[2], DImode, 0); /* Emit [(set (match_dup 0) (match_dup 2))] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[2])); + emit_insn (gen_rtx_SET (operands[0], operands[2])); DONE; } else if (TARGET_THUMB2) @@ -51,8 +51,8 @@ /* Emit the pattern: [(parallel [(set (match_dup 0) (match_dup 2)) (set (match_dup 1) (match_dup 3))])] */ - rtx t1 = gen_rtx_SET (VOIDmode, operands[0], operands[2]); - rtx t2 = gen_rtx_SET (VOIDmode, operands[1], operands[3]); + rtx t1 = gen_rtx_SET (operands[0], operands[2]); + rtx t2 = gen_rtx_SET (operands[1], operands[3]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); DONE; } @@ -77,7 +77,7 @@ operands[0] = gen_rtx_REG (DImode, REGNO (operands[0])); operands[2] = adjust_address (operands[2], DImode, 0); /* Emit [(set (match_dup 2) (match_dup 0))] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[2], operands[0])); + emit_insn (gen_rtx_SET (operands[2], operands[0])); DONE; } else if (TARGET_THUMB2) @@ -85,8 +85,8 @@ /* Emit the pattern: [(parallel [(set (match_dup 2) (match_dup 0)) (set (match_dup 3) (match_dup 1))])] */ - rtx t1 = gen_rtx_SET (VOIDmode, operands[2], operands[0]); - rtx t2 = gen_rtx_SET (VOIDmode, operands[3], operands[1]); + rtx t1 = gen_rtx_SET (operands[2], operands[0]); + rtx t2 = gen_rtx_SET (operands[3], operands[1]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); DONE; } @@ -117,9 +117,9 @@ [(set (match_dup 0) (match_dup 4)) (set (match_dup 1) (match_dup 5)) (set (match_dup 2) tmp)] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[4])); - emit_insn (gen_rtx_SET (VOIDmode, operands[1], operands[5])); - emit_insn (gen_rtx_SET (VOIDmode, operands[2], tmp)); + emit_insn (gen_rtx_SET (operands[0], operands[4])); + emit_insn (gen_rtx_SET (operands[1], operands[5])); + emit_insn (gen_rtx_SET (operands[2], tmp)); DONE; } else if (TARGET_THUMB2) @@ -129,10 +129,10 @@ (set (match_dup 1) (match_dup 5)) (parallel [(set (match_dup 2) (match_dup 0)) (set (match_dup 3) (match_dup 1))])] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[4])); - emit_insn (gen_rtx_SET (VOIDmode, operands[1], operands[5])); - rtx t1 = gen_rtx_SET (VOIDmode, operands[2], operands[0]); - rtx t2 = gen_rtx_SET (VOIDmode, operands[3], operands[1]); + emit_insn (gen_rtx_SET (operands[0], operands[4])); + emit_insn (gen_rtx_SET (operands[1], operands[5])); + rtx t1 = gen_rtx_SET (operands[2], operands[0]); + rtx t2 = gen_rtx_SET (operands[3], operands[1]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); DONE; } @@ -162,9 +162,9 @@ [(set (match_dup 0) (match_dup 4)) (set (match_dup 1) (match_dup 5)) (set (match_dup 2) tmp)] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[4])); - emit_insn (gen_rtx_SET (VOIDmode, operands[1], operands[5])); - emit_insn (gen_rtx_SET (VOIDmode, operands[2], tmp)); + emit_insn (gen_rtx_SET (operands[0], operands[4])); + emit_insn (gen_rtx_SET (operands[1], operands[5])); + emit_insn (gen_rtx_SET (operands[2], tmp)); DONE; } else if (TARGET_THUMB2) @@ -174,10 +174,10 @@ (set (match_dup 1) (match_dup 5)) (parallel [(set (match_dup 2) (match_dup 0)) (set (match_dup 3) (match_dup 1))])] */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[4])); - emit_insn (gen_rtx_SET (VOIDmode, operands[1], operands[5])); - rtx t1 = gen_rtx_SET (VOIDmode, operands[2], operands[0]); - rtx t2 = gen_rtx_SET (VOIDmode, operands[3], operands[1]); + emit_insn (gen_rtx_SET (operands[0], operands[4])); + emit_insn (gen_rtx_SET (operands[1], operands[5])); + rtx t1 = gen_rtx_SET (operands[2], operands[0]); + rtx t2 = gen_rtx_SET (operands[3], operands[1]); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, t1, t2))); DONE; } diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md index 2c91542efa3..8c754d90d58 100644 --- a/gcc/config/arm/thumb2.md +++ b/gcc/config/arm/thumb2.md @@ -167,30 +167,26 @@ { rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM); - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_COMPARE (CCmode, operands[0], const0_rtx))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (CCmode, operands[0], + const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, (gen_rtx_LT (SImode, cc_reg, const0_rtx)), - (gen_rtx_SET (VOIDmode, - operands[0], + (gen_rtx_SET (operands[0], (gen_rtx_MINUS (SImode, const0_rtx, operands[1])))))); } else { - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_XOR (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)), operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_MINUS (SImode, operands[0], gen_rtx_ASHIFTRT (SImode, @@ -225,30 +221,26 @@ { rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM); - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_COMPARE (CCmode, operands[0], const0_rtx))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (CCmode, operands[0], + const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, (gen_rtx_GT (SImode, cc_reg, const0_rtx)), - (gen_rtx_SET (VOIDmode, - operands[0], + (gen_rtx_SET (operands[0], (gen_rtx_MINUS (SImode, const0_rtx, operands[1])))))); } else { - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_XOR (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)), operands[1]))); - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_MINUS (SImode, gen_rtx_ASHIFTRT (SImode, operands[1], @@ -521,9 +513,7 @@ emit_insn (gen_rtx_COND_EXEC (VOIDmode, operands[3], - gen_rtx_SET (VOIDmode, - operands[0], - operands[1]))); + gen_rtx_SET (operands[0], operands[1]))); rev_code = GET_CODE (operands[3]); mode = GET_MODE (operands[4]); if (mode == CCFPmode || mode == CCFPEmode) @@ -537,9 +527,7 @@ const0_rtx); emit_insn (gen_rtx_COND_EXEC (VOIDmode, rev_cond, - gen_rtx_SET (VOIDmode, - operands[0], - operands[2]))); + gen_rtx_SET (operands[0], operands[2]))); DONE; } [(set_attr "length" "4,4,6,6,6,6,10,8,10,10,10,6") @@ -806,14 +794,14 @@ break; default: gcc_unreachable (); } - emit_insn (gen_rtx_SET (VOIDmode, operands[0], op)); + emit_insn (gen_rtx_SET (operands[0], op)); DONE; } /* "cmp %2, %3" */ - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_REG (CCmode, CC_REGNUM), - gen_rtx_COMPARE (CCmode, operands[2], operands[3]))); + emit_insn (gen_rtx_SET (gen_rtx_REG (CCmode, CC_REGNUM), + gen_rtx_COMPARE (CCmode, operands[2], + operands[3]))); if (GET_CODE (operands[5]) == AND) { @@ -821,10 +809,11 @@ it%D4 mov%D4 %0, #0 */ enum rtx_code rc = reverse_condition (GET_CODE (operands[4])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], gen_rtx_AND (SImode, operands[1], GEN_INT (1)))); + emit_insn (gen_rtx_SET (operands[0], gen_rtx_AND (SImode, operands[1], + GEN_INT (1)))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_fmt_ee (rc, VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM), const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], const0_rtx))); + gen_rtx_SET (operands[0], const0_rtx))); DONE; } else @@ -834,7 +823,7 @@ emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_fmt_ee (GET_CODE (operands[4]), VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM), const0_rtx), - gen_rtx_SET(VOIDmode, operands[0], + gen_rtx_SET (operands[0], gen_rtx_PLUS (SImode, operands[1], GEN_INT (1))))); @@ -895,8 +884,7 @@ if (GET_CODE (operands[3]) == LT && operands[2] == const0_rtx) { /* Emit asr\\t%0, %1, #31 */ - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_ASHIFTRT (SImode, operands[1], GEN_INT (31)))); @@ -915,8 +903,7 @@ gen_rtx_NE (SImode, cc_reg, const0_rtx), - gen_rtx_SET (SImode, - operands[0], + gen_rtx_SET (operands[0], GEN_INT (~0)))); DONE; } @@ -927,18 +914,17 @@ machine_mode mode = SELECT_CC_MODE (rc, operands[1], operands[2]); rtx tmp1 = gen_rtx_REG (mode, CC_REGNUM); - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_COMPARE (CCmode, operands[1], operands[2]))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (CCmode, operands[1], + operands[2]))); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], GEN_INT (~0))); + emit_insn (gen_rtx_SET (operands[0], GEN_INT (~0))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_fmt_ee (rc, VOIDmode, tmp1, const0_rtx), - gen_rtx_SET (VOIDmode, operands[0], const0_rtx))); + gen_rtx_SET (operands[0], const0_rtx))); DONE; } FAIL; @@ -1628,7 +1614,7 @@ cc_reg = SET_DEST (cmp); bcomp = gen_rtx_NE (VOIDmode, cc_reg, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands [1]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); DONE; diff --git a/gcc/config/arm/vfp.md b/gcc/config/arm/vfp.md index ea136e82f34..f62ff793462 100644 --- a/gcc/config/arm/vfp.md +++ b/gcc/config/arm/vfp.md @@ -645,13 +645,13 @@ if (REGNO (in_lo) == REGNO (out_hi)) { - emit_insn (gen_rtx_SET (SImode, out_lo, in_lo)); + emit_insn (gen_rtx_SET (out_lo, in_lo)); operands[0] = out_hi; operands[1] = in_hi; } else { - emit_insn (gen_rtx_SET (SImode, out_hi, in_hi)); + emit_insn (gen_rtx_SET (out_hi, in_hi)); operands[0] = out_lo; operands[1] = in_lo; } diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 205fcdb02bf..7436b59a970 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -1129,7 +1129,7 @@ emit_push_byte (unsigned regno, bool frame_related_p) mem = gen_frame_mem (QImode, mem); reg = gen_rtx_REG (QImode, regno); - insn = emit_insn (gen_rtx_SET (VOIDmode, mem, reg)); + insn = emit_insn (gen_rtx_SET (mem, reg)); if (frame_related_p) RTX_FRAME_RELATED_P (insn) = 1; @@ -1209,9 +1209,9 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) is going to be permanent in the function is frame_pointer_needed. */ add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, (frame_pointer_needed - ? frame_pointer_rtx - : stack_pointer_rtx), + gen_rtx_SET ((frame_pointer_needed + ? frame_pointer_rtx + : stack_pointer_rtx), plus_constant (Pmode, stack_pointer_rtx, -(size + live_seq)))); @@ -1229,7 +1229,7 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) m = gen_rtx_MEM (QImode, plus_constant (Pmode, stack_pointer_rtx, offset)); r = gen_rtx_REG (QImode, reg); - add_reg_note (insn, REG_CFA_OFFSET, gen_rtx_SET (VOIDmode, m, r)); + add_reg_note (insn, REG_CFA_OFFSET, gen_rtx_SET (m, r)); } cfun->machine->stack_usage += size + live_seq; @@ -1341,7 +1341,7 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) { RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, fp, stack_pointer_rtx)); + gen_rtx_SET (fp, stack_pointer_rtx)); } insn = emit_move_insn (my_fp, plus_constant (GET_MODE (my_fp), @@ -1351,9 +1351,8 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) { RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, fp, - plus_constant (Pmode, fp, - -size_cfa))); + gen_rtx_SET (fp, plus_constant (Pmode, fp, + -size_cfa))); } /* Copy to stack pointer. Note that since we've already @@ -1379,7 +1378,7 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) { RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -size_cfa))); @@ -1404,7 +1403,7 @@ avr_prologue_setup_frame (HOST_WIDE_INT size, HARD_REG_SET set) -size)); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -size_cfa))); @@ -1574,7 +1573,7 @@ emit_pop_byte (unsigned regno) mem = gen_frame_mem (QImode, mem); reg = gen_rtx_REG (QImode, regno); - emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + emit_insn (gen_rtx_SET (reg, mem)); } /* Output RTL epilogue. */ @@ -8473,7 +8472,7 @@ avr_out_round (rtx_insn *insn ATTRIBUTE_UNUSED, rtx *xop, int *plen) xsrc = SIGNED_FIXED_POINT_MODE_P (mode) ? gen_rtx_SS_PLUS (mode, xop[1], xadd) : gen_rtx_US_PLUS (mode, xop[1], xadd); - xpattern = gen_rtx_SET (VOIDmode, xop[0], xsrc); + xpattern = gen_rtx_SET (xop[0], xsrc); op[0] = xop[0]; op[1] = xop[1]; @@ -8490,7 +8489,7 @@ avr_out_round (rtx_insn *insn ATTRIBUTE_UNUSED, rtx *xop, int *plen) rtx xreg = simplify_gen_subreg (imode, xop[0], mode, 0); rtx xmask = immed_wide_int_const (-wi_add - wi_add, imode); - xpattern = gen_rtx_SET (VOIDmode, xreg, gen_rtx_AND (imode, xreg, xmask)); + xpattern = gen_rtx_SET (xreg, gen_rtx_AND (imode, xreg, xmask)); op[0] = xreg; op[1] = xreg; diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c index e8e8a4f99b9..2768266e0ec 100644 --- a/gcc/config/bfin/bfin.c +++ b/gcc/config/bfin/bfin.c @@ -399,7 +399,7 @@ expand_prologue_reg_save (rtx spreg, int saveall, bool is_inthandler) XVECEXP (pat, 0, 0) = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, val), UNSPEC_PUSH_MULTIPLE); - XVECEXP (pat, 0, total_consec + 1) = gen_rtx_SET (VOIDmode, spreg, + XVECEXP (pat, 0, total_consec + 1) = gen_rtx_SET (spreg, gen_rtx_PLUS (Pmode, spreg, val)); @@ -415,14 +415,12 @@ expand_prologue_reg_save (rtx spreg, int saveall, bool is_inthandler) rtx subpat; if (d_to_save > 0) { - subpat = gen_rtx_SET (VOIDmode, memref, gen_rtx_REG (word_mode, - dregno++)); + subpat = gen_rtx_SET (memref, gen_rtx_REG (word_mode, dregno++)); d_to_save--; } else { - subpat = gen_rtx_SET (VOIDmode, memref, gen_rtx_REG (word_mode, - pregno++)); + subpat = gen_rtx_SET (memref, gen_rtx_REG (word_mode, pregno++)); } XVECEXP (pat, 0, i + 1) = subpat; RTX_FRAME_RELATED_P (subpat) = 1; @@ -529,9 +527,8 @@ expand_epilogue_reg_restore (rtx spreg, bool saveall, bool is_inthandler) { rtx pat = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (total_consec + 1)); XVECEXP (pat, 0, 0) - = gen_rtx_SET (VOIDmode, spreg, - gen_rtx_PLUS (Pmode, spreg, - GEN_INT (total_consec * 4))); + = gen_rtx_SET (spreg, gen_rtx_PLUS (Pmode, spreg, + GEN_INT (total_consec * 4))); if (npregs_consec > 0) regno = REG_P5 + 1; @@ -547,7 +544,7 @@ expand_epilogue_reg_restore (rtx spreg, bool saveall, bool is_inthandler) regno--; XVECEXP (pat, 0, i + 1) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (word_mode, regno), memref); + = gen_rtx_SET (gen_rtx_REG (word_mode, regno), memref); if (npregs_consec > 0) { @@ -2133,7 +2130,7 @@ bfin_expand_call (rtx retval, rtx fnaddr, rtx callarg1, rtx cookie, int sibcall) call = gen_rtx_CALL (VOIDmode, fnaddr, callarg1); if (retval) - call = gen_rtx_SET (VOIDmode, retval, call); + call = gen_rtx_SET (retval, call); pat = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nelts)); n = 0; @@ -2556,8 +2553,7 @@ bfin_gen_compare (rtx cmp, machine_mode mode ATTRIBUTE_UNUSED) code2 = EQ; break; } - emit_insn (gen_rtx_SET (VOIDmode, tem, - gen_rtx_fmt_ee (code1, BImode, op0, op1))); + emit_insn (gen_rtx_SET (tem, gen_rtx_fmt_ee (code1, BImode, op0, op1))); } return gen_rtx_fmt_ee (code2, BImode, tem, CONST0_RTX (BImode)); diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c index 03f6b3f3f29..db85b5333d8 100644 --- a/gcc/config/c6x/c6x.c +++ b/gcc/config/c6x/c6x.c @@ -1293,8 +1293,7 @@ c6x_expand_call (rtx retval, rtx address, bool sibcall) if (retval == NULL_RTX) call_insn = emit_call_insn (call_insn); else - call_insn = emit_call_insn (gen_rtx_SET (GET_MODE (retval), retval, - call_insn)); + call_insn = emit_call_insn (gen_rtx_SET (retval, call_insn)); } if (flag_pic) use_reg (&CALL_INSN_FUNCTION_USAGE (call_insn), pic_offset_table_rtx); @@ -1493,20 +1492,20 @@ c6x_expand_compare (rtx comparison, machine_mode mode) cmp1 = gen_reg_rtx (SImode); cmp2 = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, cmp1, - gen_rtx_fmt_ee (code, SImode, high[0], high[1]))); + emit_insn (gen_rtx_SET (cmp1, gen_rtx_fmt_ee (code, SImode, + high[0], high[1]))); if (code == EQ) { if (c6x_force_op_for_comparison_p (code, lo[1])) lo[1] = force_reg (SImode, lo[1]); - emit_insn (gen_rtx_SET (VOIDmode, cmp2, - gen_rtx_fmt_ee (code, SImode, lo[0], lo[1]))); + emit_insn (gen_rtx_SET (cmp2, gen_rtx_fmt_ee (code, SImode, + lo[0], lo[1]))); emit_insn (gen_andsi3 (cmp1, cmp1, cmp2)); } else { - emit_insn (gen_rtx_SET (VOIDmode, cmp2, - gen_rtx_EQ (SImode, high[0], high[1]))); + emit_insn (gen_rtx_SET (cmp2, gen_rtx_EQ (SImode, high[0], + high[1]))); if (code == GT) code = GTU; else if (code == LT) @@ -1564,8 +1563,7 @@ c6x_expand_compare (rtx comparison, machine_mode mode) } cmp = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, cmp, - gen_rtx_fmt_ee (code1, SImode, op0, op1))); + emit_insn (gen_rtx_SET (cmp, gen_rtx_fmt_ee (code1, SImode, op0, op1))); fn = op_mode == DFmode ? gen_cmpdf_ior : gen_cmpsf_ior; emit_insn (fn (cmp, gen_rtx_fmt_ee (code2, SImode, op0, op1), op0, op1, cmp)); @@ -1641,8 +1639,8 @@ c6x_expand_compare (rtx comparison, machine_mode mode) cmp = gen_reg_rtx (SImode); if (c6x_force_op_for_comparison_p (code, op1)) op1 = force_reg (SImode, op1); - emit_insn (gen_rtx_SET (VOIDmode, cmp, - gen_rtx_fmt_ee (code, SImode, op0, op1))); + emit_insn (gen_rtx_SET (cmp, gen_rtx_fmt_ee (code, SImode, + op0, op1))); } } @@ -2775,7 +2773,7 @@ emit_add_sp_const (HOST_WIDE_INT offset, bool frame_related_p) { if (REG_P (to_add)) add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, orig_to_add))); @@ -5398,7 +5396,7 @@ undo_split_delayed_nonbranch (rtx_insn *insn) && type == TYPE_LOAD_SHADOW) || (XINT (prev_pat, 1) == UNSPEC_REAL_MULT && type == TYPE_MULT_SHADOW))); - insn_pat = gen_rtx_SET (VOIDmode, SET_DEST (insn_pat), + insn_pat = gen_rtx_SET (SET_DEST (insn_pat), XVECEXP (prev_pat, 0, 1)); insn_pat = duplicate_cond (insn_pat, prev); PATTERN (insn) = insn_pat; diff --git a/gcc/config/c6x/c6x.md b/gcc/config/c6x/c6x.md index e957eca6e38..075968d9892 100644 --- a/gcc/config/c6x/c6x.md +++ b/gcc/config/c6x/c6x.md @@ -1224,7 +1224,7 @@ rtx tmpreg = gen_reg_rtx (SImode); rtx t = gen_rtx_fmt_ee (reverse_condition (GET_CODE (operands[1])), SImode, operands[2], operands[3]); - emit_insn (gen_rtx_SET (VOIDmode, tmpreg, t)); + emit_insn (gen_rtx_SET (tmpreg, t)); emit_insn (gen_scmpsi_insn (operands[0], gen_rtx_fmt_ee (EQ, SImode, tmpreg, const0_rtx), tmpreg, const0_rtx)); diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c index 47468b1bbdf..f6c5a0bf518 100644 --- a/gcc/config/cr16/cr16.c +++ b/gcc/config/cr16/cr16.c @@ -1881,8 +1881,7 @@ cr16_create_dwarf_for_multi_push (rtx insn) } reg = gen_rtx_REG (mode, j); offset += 2 * inc; - tmp = gen_rtx_SET (VOIDmode, - gen_frame_mem (mode, + tmp = gen_rtx_SET (gen_frame_mem (mode, plus_constant (Pmode, stack_pointer_rtx, total_push_bytes - offset)), @@ -1912,7 +1911,7 @@ cr16_create_dwarf_for_multi_push (rtx insn) from = i--; } - tmp = gen_rtx_SET (SImode, stack_pointer_rtx, + tmp = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (SImode, stack_pointer_rtx, GEN_INT (-offset))); RTX_FRAME_RELATED_P (tmp) = 1; diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 650402e422e..a9451b57174 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -2922,12 +2922,10 @@ cris_split_movdx (rtx *operands) /* We normally copy the low-numbered register first. However, if the first register operand 0 is the same as the second register of operand 1, we must copy in the opposite order. */ - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, reverse, TRUE, mode), operand_subword (src, reverse, TRUE, mode))); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, !reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, !reverse, TRUE, mode), operand_subword (src, !reverse, TRUE, mode))); } /* Constant-to-reg copy. */ @@ -2935,12 +2933,10 @@ cris_split_movdx (rtx *operands) { rtx words[2]; split_double (src, &words[0], &words[1]); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 0, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 0, TRUE, mode), words[0])); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 1, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 1, TRUE, mode), words[1])); } /* Mem-to-reg copy. */ @@ -2969,8 +2965,7 @@ cris_split_movdx (rtx *operands) manually. */ mem = change_address (src, SImode, addr); insn - = gen_rtx_SET (VOIDmode, - operand_subword (dest, 0, TRUE, mode), mem); + = gen_rtx_SET (operand_subword (dest, 0, TRUE, mode), mem); insn = emit_insn (insn); if (GET_CODE (XEXP (mem, 0)) == POST_INC) REG_NOTES (insn) @@ -2979,8 +2974,7 @@ cris_split_movdx (rtx *operands) mem = copy_rtx (mem); insn - = gen_rtx_SET (VOIDmode, - operand_subword (dest, 1, TRUE, mode), mem); + = gen_rtx_SET (operand_subword (dest, 1, TRUE, mode), mem); insn = emit_insn (insn); if (GET_CODE (XEXP (mem, 0)) == POST_INC) REG_NOTES (insn) @@ -2997,15 +2991,13 @@ cris_split_movdx (rtx *operands) fatal_insn ("unexpected side-effects in address", addr); emit_insn (gen_rtx_SET - (VOIDmode, - operand_subword (dest, reverse, TRUE, mode), + (operand_subword (dest, reverse, TRUE, mode), change_address (src, SImode, plus_constant (Pmode, addr, reverse * UNITS_PER_WORD)))); emit_insn (gen_rtx_SET - (VOIDmode, - operand_subword (dest, ! reverse, TRUE, mode), + (operand_subword (dest, ! reverse, TRUE, mode), change_address (src, SImode, plus_constant (Pmode, addr, @@ -3033,8 +3025,7 @@ cris_split_movdx (rtx *operands) ourselves, we must add a post-inc note manually. */ mem = change_address (dest, SImode, addr); insn - = gen_rtx_SET (VOIDmode, - mem, operand_subword (src, 0, TRUE, mode)); + = gen_rtx_SET (mem, operand_subword (src, 0, TRUE, mode)); insn = emit_insn (insn); if (GET_CODE (XEXP (mem, 0)) == POST_INC) REG_NOTES (insn) @@ -3042,10 +3033,7 @@ cris_split_movdx (rtx *operands) REG_NOTES (insn)); mem = copy_rtx (mem); - insn - = gen_rtx_SET (VOIDmode, - mem, - operand_subword (src, 1, TRUE, mode)); + insn = gen_rtx_SET (mem, operand_subword (src, 1, TRUE, mode)); insn = emit_insn (insn); if (GET_CODE (XEXP (mem, 0)) == POST_INC) REG_NOTES (insn) @@ -3061,13 +3049,11 @@ cris_split_movdx (rtx *operands) fatal_insn ("unexpected side-effects in address", addr); emit_insn (gen_rtx_SET - (VOIDmode, - change_address (dest, SImode, addr), + (change_address (dest, SImode, addr), operand_subword (src, 0, TRUE, mode))); emit_insn (gen_rtx_SET - (VOIDmode, - change_address (dest, SImode, + (change_address (dest, SImode, plus_constant (Pmode, addr, UNITS_PER_WORD)), operand_subword (src, 1, TRUE, mode))); @@ -3138,8 +3124,7 @@ cris_expand_prologue (void) stdarg_regs > 0; regno--, pretend -= 4, stdarg_regs--) { - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4))); @@ -3167,8 +3152,7 @@ cris_expand_prologue (void) /* Save SRP if not a leaf function. */ if (return_address_on_stack) { - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 - pretend))); pretend = 0; @@ -3184,8 +3168,7 @@ cris_expand_prologue (void) /* Set up the frame pointer, if needed. */ if (frame_pointer_needed) { - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 - pretend))); pretend = 0; @@ -3250,8 +3233,7 @@ cris_expand_prologue (void) else { insn - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -(n_saved * 4 + size))); insn = emit_insn (insn); @@ -3268,8 +3250,7 @@ cris_expand_prologue (void) size = 0; } - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 - size))); @@ -3310,8 +3291,7 @@ cris_expand_prologue (void) else { insn - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -(n_saved * 4 + size))); insn = emit_insn (insn); @@ -3326,8 +3306,7 @@ cris_expand_prologue (void) /* We have to put outgoing argument space after regs. */ if (cfoa_size) { - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -cfoa_size))); @@ -3337,8 +3316,7 @@ cris_expand_prologue (void) } else if ((size + cfoa_size) > 0) { - insn = emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -(cfoa_size + size)))); @@ -3436,8 +3414,7 @@ cris_expand_epilogue (void) { /* There is an area for outgoing parameters located before the saved registers. We have to adjust for that. */ - emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, argspace_offset))); /* Make sure we only do this once. */ @@ -3462,8 +3439,7 @@ cris_expand_epilogue (void) if (argspace_offset) { - emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, argspace_offset))); argspace_offset = 0; @@ -3521,8 +3497,7 @@ cris_expand_epilogue (void) yet. */ size += argspace_offset; - emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, size))); } @@ -3583,8 +3558,7 @@ cris_expand_epilogue (void) = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); } - emit_insn (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, pretend))); } @@ -3634,20 +3608,19 @@ cris_gen_movem_load (rtx src, rtx nregs_rtx, int nprefix) if (GET_CODE (XEXP (src, 0)) == POST_INC) { RTVEC_ELT (vec, nprefix + 1) - = gen_rtx_SET (VOIDmode, srcreg, - plus_constant (Pmode, srcreg, nregs * 4)); + = gen_rtx_SET (srcreg, plus_constant (Pmode, srcreg, nregs * 4)); eltno++; } src = replace_equiv_address (src, srcreg); RTVEC_ELT (vec, nprefix) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (SImode, regno), src); + = gen_rtx_SET (gen_rtx_REG (SImode, regno), src); regno += regno_inc; for (i = 1; i < nregs; i++, eltno++) { RTVEC_ELT (vec, nprefix + eltno) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (SImode, regno), + = gen_rtx_SET (gen_rtx_REG (SImode, regno), adjust_address_nv (src, SImode, i * 4)); regno += regno_inc; } @@ -3690,7 +3663,7 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, registers so there's a three cycles penalty for use. */ if (nregs == 1) { - rtx mov = gen_rtx_SET (VOIDmode, dest, gen_rtx_REG (SImode, 0)); + rtx mov = gen_rtx_SET (dest, gen_rtx_REG (SImode, 0)); if (increment == 0) { @@ -3705,9 +3678,8 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, vec = rtvec_alloc (2); RTVEC_ELT (vec, 0) = mov; - RTVEC_ELT (vec, 1) = gen_rtx_SET (VOIDmode, destreg, - plus_constant (Pmode, destreg, - increment)); + RTVEC_ELT (vec, 1) = gen_rtx_SET (destreg, plus_constant (Pmode, destreg, + increment)); if (frame_related) { RTX_FRAME_RELATED_P (mov) = 1; @@ -3718,8 +3690,7 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, { vec = rtvec_alloc (nregs + (increment != 0 ? 1 : 0)); RTVEC_ELT (vec, 0) - = gen_rtx_SET (VOIDmode, - replace_equiv_address (dest, + = gen_rtx_SET (replace_equiv_address (dest, plus_constant (Pmode, destreg, increment)), gen_rtx_REG (SImode, regno)); @@ -3734,10 +3705,9 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, if (increment != 0) { RTVEC_ELT (vec, 1) - = gen_rtx_SET (VOIDmode, destreg, - plus_constant (Pmode, destreg, - increment != 0 - ? increment : nregs * 4)); + = gen_rtx_SET (destreg, plus_constant (Pmode, destreg, + increment != 0 + ? increment : nregs * 4)); eltno++; if (frame_related) @@ -3752,7 +3722,7 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, for (i = 1; i < nregs; i++, eltno++) { RTVEC_ELT (vec, eltno) - = gen_rtx_SET (VOIDmode, adjust_address_nv (dest, SImode, i * 4), + = gen_rtx_SET (adjust_address_nv (dest, SImode, i * 4), gen_rtx_REG (SImode, regno)); if (frame_related) RTX_FRAME_RELATED_P (RTVEC_ELT (vec, eltno)) = 1; diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md index bcc91a38de4..04104d9ea81 100644 --- a/gcc/config/cris/cris.md +++ b/gcc/config/cris/cris.md @@ -2754,8 +2754,7 @@ reg1 = reg0; } - emit_insn (gen_rtx_SET (SImode, reg0, - gen_rtx_AND (SImode, reg1, operands[2]))); + emit_insn (gen_rtx_SET (reg0, gen_rtx_AND (SImode, reg1, operands[2]))); /* Make sure we get the right *final* destination. */ if (! REG_P (operands[0])) @@ -2856,8 +2855,7 @@ reg1 = reg0; } - emit_insn (gen_rtx_SET (HImode, reg0, - gen_rtx_AND (HImode, reg1, operands[2]))); + emit_insn (gen_rtx_SET (reg0, gen_rtx_AND (HImode, reg1, operands[2]))); /* Make sure we get the right destination. */ if (! REG_P (operands[0])) diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 40804b8d11a..ef4d163269b 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -687,10 +687,10 @@ machopic_indirect_data_reference (rtx orig, rtx reg) gcc_assert (reg); - emit_insn (gen_rtx_SET (Pmode, hi_sum_reg, + emit_insn (gen_rtx_SET (hi_sum_reg, gen_rtx_PLUS (Pmode, pic_offset_table_rtx, gen_rtx_HIGH (Pmode, offset)))); - emit_insn (gen_rtx_SET (Pmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_LO_SUM (Pmode, hi_sum_reg, copy_rtx (offset)))); @@ -700,11 +700,9 @@ machopic_indirect_data_reference (rtx orig, rtx reg) { gcc_assert (reg); - emit_insn (gen_rtx_SET (VOIDmode, reg, - gen_rtx_HIGH (Pmode, offset))); - emit_insn (gen_rtx_SET (VOIDmode, reg, - gen_rtx_LO_SUM (Pmode, reg, - copy_rtx (offset)))); + emit_insn (gen_rtx_SET (reg, gen_rtx_HIGH (Pmode, offset))); + emit_insn (gen_rtx_SET (reg, gen_rtx_LO_SUM (Pmode, reg, + copy_rtx (offset)))); emit_use (pic_offset_table_rtx); orig = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, reg); @@ -725,7 +723,7 @@ machopic_indirect_data_reference (rtx orig, rtx reg) && reg && MACHO_DYNAMIC_NO_PIC_P) { - emit_insn (gen_rtx_SET (Pmode, reg, ptr_ref)); + emit_insn (gen_rtx_SET (reg, ptr_ref)); ptr_ref = reg; } @@ -874,7 +872,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) mem = gen_const_mem (GET_MODE (orig), gen_rtx_LO_SUM (Pmode, temp_reg, copy_rtx (asym))); - emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + emit_insn (gen_rtx_SET (reg, mem)); #else /* Some other CPU -- WriteMe! but right now there are no other platforms that can use dynamic-no-pic */ @@ -901,24 +899,24 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) if (! MACHO_DYNAMIC_NO_PIC_P) sum = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, sum); - emit_insn (gen_rtx_SET (Pmode, hi_sum_reg, sum)); + emit_insn (gen_rtx_SET (hi_sum_reg, sum)); mem = gen_const_mem (GET_MODE (orig), gen_rtx_LO_SUM (Pmode, hi_sum_reg, copy_rtx (offset))); - insn = emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + insn = emit_insn (gen_rtx_SET (reg, mem)); set_unique_reg_note (insn, REG_EQUAL, pic_ref); pic_ref = reg; #else emit_use (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM)); - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_HIGH (Pmode, gen_rtx_CONST (Pmode, offset)))); - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_LO_SUM (Pmode, reg, gen_rtx_CONST (Pmode, copy_rtx (offset))))); @@ -969,22 +967,21 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) hi_sum_reg = reg; - emit_insn (gen_rtx_SET (Pmode, hi_sum_reg, + emit_insn (gen_rtx_SET (hi_sum_reg, (MACHO_DYNAMIC_NO_PIC_P) ? gen_rtx_HIGH (Pmode, offset) : gen_rtx_PLUS (Pmode, pic_offset_table_rtx, gen_rtx_HIGH (Pmode, offset)))); - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_LO_SUM (Pmode, hi_sum_reg, copy_rtx (offset)))); pic_ref = reg; #else - emit_insn (gen_rtx_SET (VOIDmode, reg, - gen_rtx_HIGH (Pmode, offset))); - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_HIGH (Pmode, offset))); + emit_insn (gen_rtx_SET (reg, gen_rtx_LO_SUM (Pmode, reg, copy_rtx (offset)))); pic_ref = gen_rtx_PLUS (Pmode, diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c index 12aac13c268..e1f77c2a5a1 100644 --- a/gcc/config/epiphany/epiphany.c +++ b/gcc/config/epiphany/epiphany.c @@ -669,7 +669,7 @@ gen_compare_reg (machine_mode cmode, enum rtx_code code, else x = force_reg (in_mode, x); - pat = gen_rtx_SET (VOIDmode, cc_reg, gen_rtx_COMPARE (mode, x, y)); + pat = gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, x, y)); if (mode == CC_FP_EQmode || mode == CC_FP_GTEmode) { const char *name = mode == CC_FP_EQmode ? "__eqsf2" : "__gtesf2"; @@ -1570,7 +1570,7 @@ frame_subreg_note (rtx set, int offset) rtx src = simplify_gen_subreg (SImode, SET_SRC (set), DImode, offset); rtx dst = simplify_gen_subreg (SImode, SET_DEST (set), DImode, offset); - set = gen_rtx_SET (VOIDmode, dst ,src); + set = gen_rtx_SET (dst ,src); RTX_FRAME_RELATED_P (set) = 1; return set; } @@ -1625,7 +1625,7 @@ frame_insn (rtx x) static rtx_insn * frame_move_insn (rtx to, rtx from) { - return frame_insn (gen_rtx_SET (VOIDmode, to, from)); + return frame_insn (gen_rtx_SET (to, from)); } /* Generate a MEM referring to a varargs argument slot. */ @@ -1867,11 +1867,10 @@ epiphany_expand_prologue (void) /* Instruction scheduling can separate the instruction setting IP from INSN so that dwarf2out_frame_debug_expr becomes confused what the temporary register is. Example: _gcov.o */ - note = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + note = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, off)); note = gen_rtx_PARALLEL (VOIDmode, - gen_rtvec (2, gen_rtx_SET (VOIDmode, mem2, reg), - note)); + gen_rtvec (2, gen_rtx_SET (mem2, reg), note)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, note); } /* If there is only one or no register to save, yet we have a large frame, diff --git a/gcc/config/epiphany/epiphany.md b/gcc/config/epiphany/epiphany.md index 5dfde21190c..428092601c0 100644 --- a/gcc/config/epiphany/epiphany.md +++ b/gcc/config/epiphany/epiphany.md @@ -1870,7 +1870,7 @@ { if (operands[3] != const0_rtx) operands[2] = gen_rtx_MINUS (SImode, operands[2], operands[3]); - operands[2] = gen_rtx_SET (VOIDmode, operands[0], operands[2]); + operands[2] = gen_rtx_SET (operands[0], operands[2]); operands[3] = operands[0]; } operands[4] = gen_rtx_fmt_ee (cmp_code, SImode, @@ -2269,7 +2269,7 @@ (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, gen_rtx_SET - (VOIDmode, operands[0], + (operands[0], gen_rtx_CALL (VOIDmode, operands[1], operands[2])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (SImode, GPR_LR))))); @@ -2312,7 +2312,7 @@ (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, gen_rtx_SET - (VOIDmode, operands[0], + (operands[0], gen_rtx_CALL (VOIDmode, operands[1], operands[2])), ret_rtx))); emit_insn (target_uninterruptible ? gen_gie (): gen_gid ()); @@ -2628,7 +2628,7 @@ (VOIDmode, gen_rtvec (4, - gen_rtx_SET (VOIDmode, operands[5], + gen_rtx_SET (operands[5], gen_rtx_MULT (SImode, operands[6], operands[4])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CC_FPmode, CCFP_REGNUM)), operands[9], operands[10]))); @@ -2640,7 +2640,7 @@ (VOIDmode, gen_rtvec (4, - gen_rtx_SET (VOIDmode, operands[7], + gen_rtx_SET (operands[7], gen_rtx_MULT (SImode, operands[8], operands[4])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CC_FPmode, CCFP_REGNUM)), operands[9], operands[10]))); diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c index 55fc0781863..4fbe5490bc1 100644 --- a/gcc/config/fr30/fr30.c +++ b/gcc/config/fr30/fr30.c @@ -945,13 +945,12 @@ fr30_move_double (rtx * operands) /* We normally copy the low-numbered register first. However, if the first register of operand 0 is the same as the second register of operand 1, we must copy in the opposite order. */ - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, reverse, TRUE, mode), operand_subword (src, reverse, TRUE, mode))); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, !reverse, TRUE, mode), - operand_subword (src, !reverse, TRUE, mode))); + emit_insn + (gen_rtx_SET (operand_subword (dest, !reverse, TRUE, mode), + operand_subword (src, !reverse, TRUE, mode))); } else if (src_code == MEM) { @@ -963,28 +962,24 @@ fr30_move_double (rtx * operands) gcc_assert (GET_CODE (addr) == REG); /* Copy the address before clobbering it. See PR 34174. */ - emit_insn (gen_rtx_SET (SImode, dest1, addr)); - emit_insn (gen_rtx_SET (VOIDmode, dest0, - adjust_address (src, SImode, 0))); - emit_insn (gen_rtx_SET (SImode, dest1, - plus_constant (SImode, dest1, - UNITS_PER_WORD))); + emit_insn (gen_rtx_SET (dest1, addr)); + emit_insn (gen_rtx_SET (dest0, adjust_address (src, SImode, 0))); + emit_insn (gen_rtx_SET (dest1, plus_constant (SImode, dest1, + UNITS_PER_WORD))); new_mem = gen_rtx_MEM (SImode, dest1); MEM_COPY_ATTRIBUTES (new_mem, src); - emit_insn (gen_rtx_SET (VOIDmode, dest1, new_mem)); + emit_insn (gen_rtx_SET (dest1, new_mem)); } else if (src_code == CONST_INT || src_code == CONST_DOUBLE) { rtx words[2]; split_double (src, &words[0], &words[1]); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 0, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 0, TRUE, mode), words[0])); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 1, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 1, TRUE, mode), words[1])); } } @@ -1003,8 +998,7 @@ fr30_move_double (rtx * operands) if (REGNO (addr) == STACK_POINTER_REGNUM || REGNO (addr) == FRAME_POINTER_REGNUM) - emit_insn (gen_rtx_SET (VOIDmode, - adjust_address (dest, SImode, UNITS_PER_WORD), + emit_insn (gen_rtx_SET (adjust_address (dest, SImode, UNITS_PER_WORD), src1)); else { diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c index 4105fb36ec1..e01fd1af2a7 100644 --- a/gcc/config/frv/frv.c +++ b/gcc/config/frv/frv.c @@ -1593,8 +1593,7 @@ frv_frame_mem (machine_mode mode, rtx base, int offset) static rtx frv_dwarf_store (rtx reg, int offset) { - rtx set = gen_rtx_SET (VOIDmode, - gen_rtx_MEM (GET_MODE (reg), + rtx set = gen_rtx_SET (gen_rtx_MEM (GET_MODE (reg), plus_constant (Pmode, stack_pointer_rtx, offset)), reg); @@ -1647,8 +1646,8 @@ frv_frame_access (frv_frame_accessor_t *accessor, rtx reg, int stack_offset) if (SPR_P (REGNO (reg))) { rtx temp = gen_rtx_REG (mode, TEMP_REGNO); - emit_insn (gen_rtx_SET (VOIDmode, temp, mem)); - emit_insn (gen_rtx_SET (VOIDmode, reg, temp)); + emit_insn (gen_rtx_SET (temp, mem)); + emit_insn (gen_rtx_SET (reg, temp)); } else { @@ -1665,7 +1664,7 @@ frv_frame_access (frv_frame_accessor_t *accessor, rtx reg, int stack_offset) XEXP (XEXP (mem, 0), 1))); mem = gen_rtx_MEM (DImode, temp); } - emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + emit_insn (gen_rtx_SET (reg, mem)); } emit_use (reg); } @@ -1674,8 +1673,8 @@ frv_frame_access (frv_frame_accessor_t *accessor, rtx reg, int stack_offset) if (SPR_P (REGNO (reg))) { rtx temp = gen_rtx_REG (mode, TEMP_REGNO); - emit_insn (gen_rtx_SET (VOIDmode, temp, reg)); - frv_frame_insn (gen_rtx_SET (Pmode, mem, temp), + emit_insn (gen_rtx_SET (temp, reg)); + frv_frame_insn (gen_rtx_SET (mem, temp), frv_dwarf_store (reg, stack_offset)); } else if (mode == DImode) @@ -1699,12 +1698,12 @@ frv_frame_access (frv_frame_accessor_t *accessor, rtx reg, int stack_offset) mem = gen_rtx_MEM (DImode, temp); } - frv_frame_insn (gen_rtx_SET (Pmode, mem, reg), + frv_frame_insn (gen_rtx_SET (mem, reg), gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set1, set2))); } else - frv_frame_insn (gen_rtx_SET (Pmode, mem, reg), + frv_frame_insn (gen_rtx_SET (mem, reg), frv_dwarf_store (reg, stack_offset)); } } @@ -1819,9 +1818,7 @@ frv_expand_prologue (void) rtx dwarf_offset = GEN_INT (-info->total_size); frv_frame_insn (gen_stack_adjust (sp, sp, asm_offset), - gen_rtx_SET (Pmode, - sp, - gen_rtx_PLUS (Pmode, sp, dwarf_offset))); + gen_rtx_SET (sp, gen_rtx_PLUS (Pmode, sp, dwarf_offset))); } /* If the frame pointer is needed, store the old one at (sp + FP_OFFSET) @@ -1841,8 +1838,8 @@ frv_expand_prologue (void) frv_frame_access (&accessor, fp, fp_offset); /* Set up the new frame pointer. */ - frv_frame_insn (gen_rtx_SET (VOIDmode, fp, asm_src), - gen_rtx_SET (VOIDmode, fp, dwarf_src)); + frv_frame_insn (gen_rtx_SET (fp, asm_src), + gen_rtx_SET (fp, dwarf_src)); /* Access region C from the frame pointer. */ accessor.base = fp; @@ -1935,7 +1932,7 @@ frv_expand_epilogue (bool emit_return) /* Load the old link register into a GPR. */ return_addr = gen_rtx_REG (Pmode, TEMP_REGNO); - emit_insn (gen_rtx_SET (VOIDmode, return_addr, mem)); + emit_insn (gen_rtx_SET (return_addr, mem)); } else return_addr = gen_rtx_REG (Pmode, LR_REGNO); @@ -1944,7 +1941,7 @@ frv_expand_epilogue (bool emit_return) the load is preserved. */ if (frame_pointer_needed) { - emit_insn (gen_rtx_SET (VOIDmode, fp, gen_rtx_MEM (Pmode, fp))); + emit_insn (gen_rtx_SET (fp, gen_rtx_MEM (Pmode, fp))); emit_use (fp); } @@ -2301,8 +2298,8 @@ frv_expand_block_move (rtx operands[]) tmp_reg = gen_reg_rtx (mode); src_mem = change_address (orig_src, mode, src_addr); dest_mem = change_address (orig_dest, mode, dest_addr); - emit_insn (gen_rtx_SET (VOIDmode, tmp_reg, src_mem)); - stores[num_reg++] = gen_rtx_SET (VOIDmode, dest_mem, tmp_reg); + emit_insn (gen_rtx_SET (tmp_reg, src_mem)); + stores[num_reg++] = gen_rtx_SET (dest_mem, tmp_reg); if (num_reg >= MAX_MOVE_REG) { @@ -2381,7 +2378,7 @@ frv_expand_block_clear (rtx operands[]) clear_bytes = GET_MODE_SIZE (mode); dest_mem = change_address (orig_dest, mode, dest_addr); - emit_insn (gen_rtx_SET (VOIDmode, dest_mem, const0_rtx)); + emit_insn (gen_rtx_SET (dest_mem, const0_rtx)); } return TRUE; @@ -3608,9 +3605,7 @@ frv_legitimize_tls_address (rtx addr, enum tls_model model) } reg = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, reg, - gen_rtx_PLUS (Pmode, - retval, tp))); + emit_insn (gen_rtx_SET (reg, gen_rtx_PLUS (Pmode, retval, tp))); dest = gen_tlsmoff (addr, reg); @@ -3996,7 +3991,7 @@ frv_emit_move (machine_mode mode, rtx dest, rtx src) gcc_unreachable (); } - emit_insn (gen_rtx_SET (VOIDmode, dest, src)); + emit_insn (gen_rtx_SET (dest, src)); } /* Emit code to handle a MOVSI, adding in the small data register or pic @@ -4023,7 +4018,7 @@ frv_emit_movsi (rtx dest, rtx src) FIRST_VIRTUAL_REGISTER, LAST_VIRTUAL_POINTER_REGISTER)))) { - emit_insn (gen_rtx_SET (VOIDmode, dest, copy_to_mode_reg (SImode, src))); + emit_insn (gen_rtx_SET (dest, copy_to_mode_reg (SImode, src))); return TRUE; } @@ -4756,8 +4751,7 @@ frv_emit_comparison (enum rtx_code test, rtx op0, rtx op1) : gen_rtx_REG (cc_mode, (cc_mode == CC_FPmode) ? FCC_FIRST : ICC_FIRST)); - emit_insn (gen_rtx_SET (VOIDmode, cc_reg, - gen_rtx_COMPARE (cc_mode, op0, op1))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (cc_mode, op0, op1))); return cc_reg; } @@ -4785,7 +4779,7 @@ frv_emit_cond_branch (rtx operands[]) label_ref = gen_rtx_LABEL_REF (VOIDmode, operands[3]); test_rtx = gen_rtx_fmt_ee (test, cc_mode, cc_reg, const0_rtx); if_else = gen_rtx_IF_THEN_ELSE (cc_mode, test_rtx, label_ref, pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, if_else)); + emit_jump_insn (gen_rtx_SET (pc_rtx, if_else)); return TRUE; } @@ -4806,7 +4800,7 @@ frv_emit_scc (rtx operands[]) (parallel [(set <target> (<test>, <cc_reg>, (const_int 0)) (clobber (<ccr_reg>))]) */ test_rtx = gen_rtx_fmt_ee (test, SImode, cc_reg, const0_rtx); - set = gen_rtx_SET (VOIDmode, operands[0], test_rtx); + set = gen_rtx_SET (operands[0], test_rtx); cr_reg = ((TARGET_ALLOC_CC) ? gen_reg_rtx (CC_CCRmode) @@ -4832,8 +4826,7 @@ frv_split_scc (rtx dest, rtx test, rtx cc_reg, rtx cr_reg, HOST_WIDE_INT value) start_sequence (); /* Set the appropriate CCR bit. */ - emit_insn (gen_rtx_SET (VOIDmode, - cr_reg, + emit_insn (gen_rtx_SET (cr_reg, gen_rtx_fmt_ee (GET_CODE (test), GET_MODE (cr_reg), cc_reg, @@ -4847,7 +4840,7 @@ frv_split_scc (rtx dest, rtx test, rtx cc_reg, rtx cr_reg, HOST_WIDE_INT value) gen_rtx_EQ (GET_MODE (cr_reg), cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, const0_rtx))); + gen_rtx_SET (dest, const0_rtx))); /* Finish up, return sequence. */ ret = get_insns (); @@ -4921,7 +4914,7 @@ frv_emit_cond_move (rtx dest, rtx test_rtx, rtx src1, rtx src2) test2 = gen_rtx_fmt_ee (test, cc_mode, cc_reg, const0_rtx); if_rtx = gen_rtx_IF_THEN_ELSE (GET_MODE (dest), test2, src1, src2); - set = gen_rtx_SET (VOIDmode, dest, if_rtx); + set = gen_rtx_SET (dest, if_rtx); cr_reg = ((TARGET_ALLOC_CC) ? gen_reg_rtx (CC_CCRmode) @@ -4952,8 +4945,7 @@ frv_split_cond_move (rtx operands[]) start_sequence (); /* Set the appropriate CCR bit. */ - emit_insn (gen_rtx_SET (VOIDmode, - cr_reg, + emit_insn (gen_rtx_SET (cr_reg, gen_rtx_fmt_ee (GET_CODE (test), GET_MODE (cr_reg), cc_reg, @@ -4973,7 +4965,7 @@ frv_split_cond_move (rtx operands[]) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src1))); + gen_rtx_SET (dest, src1))); } else if (value2 == 0) @@ -4982,7 +4974,7 @@ frv_split_cond_move (rtx operands[]) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_EQ (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src2))); + gen_rtx_SET (dest, src2))); } /* If the first value is within an addi range and also the difference @@ -5000,8 +4992,7 @@ frv_split_cond_move (rtx operands[]) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest_si, - const0_rtx))); + gen_rtx_SET (dest_si, const0_rtx))); emit_insn (gen_addsi3 (dest_si, dest_si, src1)); } @@ -5014,13 +5005,13 @@ frv_split_cond_move (rtx operands[]) if (! rtx_equal_p (dest, src1)) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src1))); + gen_rtx_SET (dest, src1))); /* Emit the conditional move for the test being false if needed. */ if (! rtx_equal_p (dest, src2)) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_EQ (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src2))); + gen_rtx_SET (dest, src2))); } /* Finish up, return sequence. */ @@ -5117,18 +5108,14 @@ frv_split_minmax (rtx operands[]) } /* Issue the compare instruction. */ - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_COMPARE (GET_MODE (cc_reg), - src1, src2))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (GET_MODE (cc_reg), + src1, src2))); /* Set the appropriate CCR bit. */ - emit_insn (gen_rtx_SET (VOIDmode, - cr_reg, - gen_rtx_fmt_ee (test_code, - GET_MODE (cr_reg), - cc_reg, - const0_rtx))); + emit_insn (gen_rtx_SET (cr_reg, gen_rtx_fmt_ee (test_code, + GET_MODE (cr_reg), + cc_reg, + const0_rtx))); /* If are taking the min/max of a nonzero constant, load that first, and then do a conditional move of the other value. */ @@ -5139,7 +5126,7 @@ frv_split_minmax (rtx operands[]) emit_move_insn (dest, src2); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src1))); + gen_rtx_SET (dest, src1))); } /* Otherwise, do each half of the move. */ @@ -5149,13 +5136,13 @@ frv_split_minmax (rtx operands[]) if (! rtx_equal_p (dest, src1)) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src1))); + gen_rtx_SET (dest, src1))); /* Emit the conditional move for the test being false if needed. */ if (! rtx_equal_p (dest, src2)) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_EQ (cr_mode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src2))); + gen_rtx_SET (dest, src2))); } /* Finish up, return sequence. */ @@ -5180,14 +5167,11 @@ frv_split_abs (rtx operands[]) start_sequence (); /* Issue the compare < 0 instruction. */ - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_COMPARE (CCmode, src, const0_rtx))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (CCmode, src, const0_rtx))); /* Set the appropriate CCR bit. */ - emit_insn (gen_rtx_SET (VOIDmode, - cr_reg, - gen_rtx_fmt_ee (LT, CC_CCRmode, cc_reg, const0_rtx))); + emit_insn (gen_rtx_SET (cr_reg, gen_rtx_fmt_ee (LT, CC_CCRmode, + cc_reg, const0_rtx))); /* Emit the conditional negate if the value is negative. */ emit_insn (gen_rtx_COND_EXEC (VOIDmode, @@ -5198,7 +5182,7 @@ frv_split_abs (rtx operands[]) if (! rtx_equal_p (dest, src)) emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_EQ (CC_CCRmode, cr_reg, const0_rtx), - gen_rtx_SET (VOIDmode, dest, src))); + gen_rtx_SET (dest, src))); /* Finish up, return sequence. */ ret = get_insns (); @@ -5576,8 +5560,8 @@ frv_ifcvt_modify_tests (ce_if_block *ce_info, rtx *p_true, rtx *p_false) code_false = EQ; } - check_insn = gen_rtx_SET (VOIDmode, cr, - gen_rtx_fmt_ee (code, CC_CCRmode, cc, const0_rtx)); + check_insn = gen_rtx_SET (cr, gen_rtx_fmt_ee (code, CC_CCRmode, + cc, const0_rtx)); /* Record the check insn to be inserted later. */ frv_ifcvt_add_insn (check_insn, BB_END (test_bb), TRUE); @@ -5705,7 +5689,7 @@ frv_ifcvt_modify_multiple_tests (ce_if_block *ce_info, compare = gen_rtx_fmt_ee (GET_CODE (test_expr), CC_CCRmode, cc, const0_rtx); if_else = gen_rtx_IF_THEN_ELSE (CC_CCRmode, old_test, compare, const0_rtx); - check_insn = gen_rtx_SET (VOIDmode, new_cr, if_else); + check_insn = gen_rtx_SET (new_cr, if_else); /* Add the new check insn to the list of check insns that need to be inserted. */ @@ -5788,7 +5772,7 @@ frv_ifcvt_load_value (rtx value, rtx insn ATTRIBUTE_UNUSED) } frv_ifcvt.cur_scratch_regs++; - frv_ifcvt.scratch_regs[num_alloc] = gen_rtx_SET (VOIDmode, reg, value); + frv_ifcvt.scratch_regs[num_alloc] = gen_rtx_SET (reg, value); if (dump_file) { @@ -5982,9 +5966,9 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info, op1 = frv_ifcvt_load_value (op1, insn); if (op1) COND_EXEC_CODE (pattern) - = gen_rtx_SET (VOIDmode, dest, gen_rtx_fmt_ee (GET_CODE (src), - GET_MODE (src), - op0, op1)); + = gen_rtx_SET (dest, gen_rtx_fmt_ee (GET_CODE (src), + GET_MODE (src), + op0, op1)); else goto fail; } @@ -6004,8 +5988,7 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info, { op1 = gen_rtx_SIGN_EXTEND (DImode, op1); COND_EXEC_CODE (pattern) - = gen_rtx_SET (VOIDmode, dest, - gen_rtx_MULT (DImode, op0, op1)); + = gen_rtx_SET (dest, gen_rtx_MULT (DImode, op0, op1)); } else goto fail; @@ -6095,7 +6078,7 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info, /* If either src or destination changed, redo SET. */ if (changed_p) - COND_EXEC_CODE (pattern) = gen_rtx_SET (VOIDmode, dest, src); + COND_EXEC_CODE (pattern) = gen_rtx_SET (dest, src); } /* Rewrite a nested set cccr in terms of IF_THEN_ELSE. Also deal with @@ -6117,7 +6100,7 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info, } if_else = gen_rtx_IF_THEN_ELSE (CC_CCRmode, test, src, const0_rtx); - pattern = gen_rtx_SET (VOIDmode, dest, if_else); + pattern = gen_rtx_SET (dest, if_else); } /* Remap a nested compare instruction to use the paired CC/CR reg. */ @@ -6131,7 +6114,7 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info, { PUT_MODE (frv_ifcvt.nested_cc_reg, GET_MODE (dest)); COND_EXEC_CODE (pattern) - = gen_rtx_SET (VOIDmode, frv_ifcvt.nested_cc_reg, copy_rtx (src)); + = gen_rtx_SET (frv_ifcvt.nested_cc_reg, copy_rtx (src)); } } @@ -8945,7 +8928,7 @@ frv_expand_voidbinop_builtin (enum insn_code icode, tree call) if (! offsettable_address_p (0, mode0, op0)) { reg = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, reg, op0)); + emit_insn (gen_rtx_SET (reg, op0)); } op0 = gen_rtx_MEM (SImode, reg); diff --git a/gcc/config/frv/frv.md b/gcc/config/frv/frv.md index 35e1c022b77..96f78b1dfbf 100644 --- a/gcc/config/frv/frv.md +++ b/gcc/config/frv/frv.md @@ -1995,22 +1995,20 @@ start_sequence (); - emit_insn (gen_rtx_SET (VOIDmode, icr, - gen_rtx_LT (CC_CCRmode, icc, const0_rtx))); + emit_insn (gen_rtx_SET (icr, gen_rtx_LT (CC_CCRmode, icc, const0_rtx))); emit_insn (gen_movsi (dest, const1_rtx)); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (CC_CCRmode, icr, const0_rtx), - gen_rtx_SET (VOIDmode, dest, + gen_rtx_SET (dest, gen_rtx_NEG (SImode, dest)))); - emit_insn (gen_rtx_SET (VOIDmode, icr, - gen_rtx_EQ (CC_CCRmode, icc, const0_rtx))); + emit_insn (gen_rtx_SET (icr, gen_rtx_EQ (CC_CCRmode, icc, const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (CC_CCRmode, icr, const0_rtx), - gen_rtx_SET (VOIDmode, dest, const0_rtx))); + gen_rtx_SET (dest, const0_rtx))); operands[3] = get_insns (); end_sequence (); @@ -2063,8 +2061,7 @@ start_sequence (); - emit_insn (gen_rtx_SET (VOIDmode, icr, - gen_rtx_GTU (CC_CCRmode, icc, const0_rtx))); + emit_insn (gen_rtx_SET (icr, gen_rtx_GTU (CC_CCRmode, icc, const0_rtx))); emit_insn (gen_movsi (dest, const1_rtx)); @@ -2072,12 +2069,11 @@ gen_rtx_NE (CC_CCRmode, icr, const0_rtx), gen_addsi3 (dest, dest, dest))); - emit_insn (gen_rtx_SET (VOIDmode, icr, - gen_rtx_LTU (CC_CCRmode, icc, const0_rtx))); + emit_insn (gen_rtx_SET (icr, gen_rtx_LTU (CC_CCRmode, icc, const0_rtx))); emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_NE (CC_CCRmode, icr, const0_rtx), - gen_rtx_SET (VOIDmode, dest, const0_rtx))); + gen_rtx_SET (dest, const0_rtx))); operands[3] = get_insns (); end_sequence (); @@ -2332,8 +2328,7 @@ gen_rtx_EQ (CC_CCRmode, operands[1], const0_rtx), - gen_rtx_SET (VOIDmode, int_op0, - const0_rtx))); + gen_rtx_SET (int_op0, const0_rtx))); operands[2] = get_insns (); end_sequence (); diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c index 00087f30318..e6141d48fd9 100644 --- a/gcc/config/h8300/h8300.c +++ b/gcc/config/h8300/h8300.c @@ -727,13 +727,12 @@ h8300_push_pop (int regno, int nregs, bool pop_p, bool return_p) lhs = gen_rtx_MEM (SImode, plus_constant (Pmode, sp, (j + 1) * -4)); rhs = gen_rtx_REG (SImode, regno + j); } - RTVEC_ELT (vec, i + j) = gen_rtx_SET (VOIDmode, lhs, rhs); + RTVEC_ELT (vec, i + j) = gen_rtx_SET (lhs, rhs); } /* Add the stack adjustment. */ offset = GEN_INT ((pop_p ? nregs : -nregs) * 4); - RTVEC_ELT (vec, i + j) = gen_rtx_SET (VOIDmode, sp, - gen_rtx_PLUS (Pmode, sp, offset)); + RTVEC_ELT (vec, i + j) = gen_rtx_SET (sp, gen_rtx_PLUS (Pmode, sp, offset)); x = gen_rtx_PARALLEL (VOIDmode, vec); if (!pop_p) @@ -2772,7 +2771,7 @@ h8300_swap_into_er6 (rtx addr) 2 * UNITS_PER_WORD)); else add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, 4))); emit_move_insn (hard_frame_pointer_rtx, addr); @@ -2800,7 +2799,7 @@ h8300_swap_out_of_er6 (rtx addr) 2 * UNITS_PER_WORD)); else add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4))); } @@ -3699,13 +3698,13 @@ h8300_expand_branch (rtx operands[]) rtx tmp; tmp = gen_rtx_COMPARE (VOIDmode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, cc0_rtx, tmp)); + emit_insn (gen_rtx_SET (cc0_rtx, tmp)); tmp = gen_rtx_fmt_ee (code, VOIDmode, cc0_rtx, const0_rtx); tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); } @@ -3721,10 +3720,10 @@ h8300_expand_store (rtx operands[]) rtx tmp; tmp = gen_rtx_COMPARE (VOIDmode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, cc0_rtx, tmp)); + emit_insn (gen_rtx_SET (cc0_rtx, tmp)); tmp = gen_rtx_fmt_ee (code, GET_MODE (dest), cc0_rtx, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, dest, tmp)); + emit_insn (gen_rtx_SET (dest, tmp)); } /* Shifts. @@ -3881,7 +3880,7 @@ expand_a_shift (machine_mode mode, enum rtx_code code, rtx operands[]) emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, copy_rtx (operands[0]), + gen_rtx_SET (copy_rtx (operands[0]), gen_rtx_fmt_ee (code, mode, copy_rtx (operands[0]), operands[2])), gen_rtx_CLOBBER (VOIDmode, diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 627ef6537dd..7bd9ff307b6 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -9877,8 +9877,7 @@ gen_push (rtx arg) if (REG_P (arg) && GET_MODE (arg) != word_mode) arg = gen_rtx_REG (word_mode, REGNO (arg)); - return gen_rtx_SET (VOIDmode, - gen_rtx_MEM (word_mode, + return gen_rtx_SET (gen_rtx_MEM (word_mode, gen_rtx_PRE_DEC (Pmode, stack_pointer_rtx)), arg); @@ -9892,8 +9891,7 @@ gen_pop (rtx arg) if (REG_P (arg) && GET_MODE (arg) != word_mode) arg = gen_rtx_REG (word_mode, REGNO (arg)); - return gen_rtx_SET (VOIDmode, - arg, + return gen_rtx_SET (arg, gen_rtx_MEM (word_mode, gen_rtx_POST_INC (Pmode, stack_pointer_rtx))); @@ -10448,8 +10446,7 @@ ix86_emit_save_reg_using_mov (machine_mode mode, unsigned int regno, addr = plus_constant (Pmode, hard_frame_pointer_rtx, cfun->machine->fs.fp_offset - cfa_offset); mem = gen_rtx_MEM (mode, addr); - add_reg_note (insn, REG_CFA_EXPRESSION, - gen_rtx_SET (VOIDmode, mem, reg)); + add_reg_note (insn, REG_CFA_EXPRESSION, gen_rtx_SET (mem, reg)); } } @@ -10461,7 +10458,7 @@ ix86_emit_save_reg_using_mov (machine_mode mode, unsigned int regno, addr = plus_constant (Pmode, m->fs.cfa_reg, m->fs.cfa_offset - cfa_offset); mem = gen_rtx_MEM (mode, addr); - add_reg_note (insn, REG_CFA_OFFSET, gen_rtx_SET (VOIDmode, mem, reg)); + add_reg_note (insn, REG_CFA_OFFSET, gen_rtx_SET (mem, reg)); } } @@ -10567,7 +10564,7 @@ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset, && dest != hard_frame_pointer_rtx); tmp = hard_frame_pointer_rtx; } - insn = emit_insn (gen_rtx_SET (DImode, tmp, offset)); + insn = emit_insn (gen_rtx_SET (tmp, offset)); if (style < 0) add_frame_related_expr = true; @@ -10587,7 +10584,7 @@ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset, m->fs.cfa_reg = dest; r = gen_rtx_PLUS (Pmode, src, offset); - r = gen_rtx_SET (VOIDmode, dest, r); + r = gen_rtx_SET (dest, r); add_reg_note (insn, REG_CFA_ADJUST_CFA, r); RTX_FRAME_RELATED_P (insn) = 1; } @@ -10597,7 +10594,7 @@ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset, if (add_frame_related_expr) { rtx r = gen_rtx_PLUS (Pmode, src, offset); - r = gen_rtx_SET (VOIDmode, dest, r); + r = gen_rtx_SET (dest, r); add_reg_note (insn, REG_FRAME_RELATED_EXPR, r); } } @@ -10871,7 +10868,7 @@ release_scratch_register_on_entry (struct scratch_reg *sr) /* The RTX_FRAME_RELATED_P mechanism doesn't know about pop. */ RTX_FRAME_RELATED_P (insn) = 1; x = gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (UNITS_PER_WORD)); - x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x); + x = gen_rtx_SET (stack_pointer_rtx, x); add_reg_note (insn, REG_FRAME_RELATED_EXPR, x); m->fs.sp_offset -= UNITS_PER_WORD; } @@ -10913,7 +10910,7 @@ ix86_adjust_stack_and_probe (const HOST_WIDE_INT size) else adjust = PROBE_INTERVAL; - emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -adjust))); emit_stack_probe (stack_pointer_rtx); @@ -10924,13 +10921,13 @@ ix86_adjust_stack_and_probe (const HOST_WIDE_INT size) else adjust = size + PROBE_INTERVAL - i; - emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -adjust))); emit_stack_probe (stack_pointer_rtx); /* Adjust back to account for the additional first interval. */ - last = emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + last = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, PROBE_INTERVAL + dope))); } @@ -10956,13 +10953,13 @@ ix86_adjust_stack_and_probe (const HOST_WIDE_INT size) /* Step 2: compute initial and final value of the loop counter. */ /* SP = SP_0 + PROBE_INTERVAL. */ - emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, - (PROBE_INTERVAL + dope)))); /* LAST_ADDR = SP_0 + PROBE_INTERVAL + ROUNDED_SIZE. */ emit_move_insn (sr.reg, GEN_INT (-rounded_size)); - emit_insn (gen_rtx_SET (VOIDmode, sr.reg, + emit_insn (gen_rtx_SET (sr.reg, gen_rtx_PLUS (Pmode, sr.reg, stack_pointer_rtx))); @@ -10986,14 +10983,14 @@ ix86_adjust_stack_and_probe (const HOST_WIDE_INT size) if (size != rounded_size) { - emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, rounded_size - size))); emit_stack_probe (stack_pointer_rtx); } /* Adjust back to account for the additional first interval. */ - last = emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + last = emit_insn (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, PROBE_INTERVAL + dope))); @@ -11009,10 +11006,10 @@ ix86_adjust_stack_and_probe (const HOST_WIDE_INT size) { rtx expr = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2)); XVECEXP (expr, 0, 0) - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -size)); XVECEXP (expr, 0, 1) - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, PROBE_INTERVAL + dope + size)); add_reg_note (last, REG_FRAME_RELATED_EXPR, expr); @@ -11390,7 +11387,7 @@ ix86_expand_prologue (void) insn = emit_insn (gen_blockage ()); push = gen_push (hard_frame_pointer_rtx); - mov = gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + mov = gen_rtx_SET (hard_frame_pointer_rtx, stack_pointer_rtx); RTX_FRAME_RELATED_P (push) = 1; RTX_FRAME_RELATED_P (mov) = 1; @@ -11425,7 +11422,7 @@ ix86_expand_prologue (void) only as a stack adjustment. The real copy of the register as a save will be done later, if needed. */ t = plus_constant (Pmode, stack_pointer_rtx, -UNITS_PER_WORD); - t = gen_rtx_SET (VOIDmode, stack_pointer_rtx, t); + t = gen_rtx_SET (stack_pointer_rtx, t); add_reg_note (insn, REG_CFA_ADJUST_CFA, t); RTX_FRAME_RELATED_P (insn) = 1; } @@ -11446,7 +11443,7 @@ ix86_expand_prologue (void) /* Grab the argument pointer. */ t = plus_constant (Pmode, stack_pointer_rtx, m->fs.sp_offset); - insn = emit_insn (gen_rtx_SET (VOIDmode, crtl->drap_reg, t)); + insn = emit_insn (gen_rtx_SET (crtl->drap_reg, t)); RTX_FRAME_RELATED_P (insn) = 1; m->fs.cfa_reg = crtl->drap_reg; m->fs.cfa_offset = 0; @@ -11682,7 +11679,7 @@ ix86_expand_prologue (void) m->fs.cfa_offset += UNITS_PER_WORD; RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -UNITS_PER_WORD))); } @@ -11699,7 +11696,7 @@ ix86_expand_prologue (void) m->fs.cfa_offset += UNITS_PER_WORD; RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -UNITS_PER_WORD))); } @@ -11722,7 +11719,7 @@ ix86_expand_prologue (void) m->fs.cfa_offset += allocate; RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -allocate))); } @@ -11790,7 +11787,7 @@ ix86_expand_prologue (void) isn't necessary, here we will emit prologue to setup DRAP without stack realign adjustment */ t = choose_baseaddr (0); - emit_insn (gen_rtx_SET (VOIDmode, crtl->drap_reg, t)); + emit_insn (gen_rtx_SET (crtl->drap_reg, t)); } /* Prevent instructions from being scheduled into register save push @@ -11844,7 +11841,7 @@ ix86_emit_restore_reg_using_pop (rtx reg) if (m->fs.cfa_reg == stack_pointer_rtx) { rtx x = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD); - x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x); + x = gen_rtx_SET (stack_pointer_rtx, x); add_reg_note (insn, REG_CFA_ADJUST_CFA, x); RTX_FRAME_RELATED_P (insn) = 1; @@ -12111,7 +12108,7 @@ ix86_expand_epilogue (int style) { t = gen_rtx_PLUS (Pmode, hard_frame_pointer_rtx, sa); t = plus_constant (Pmode, t, m->fs.fp_offset - UNITS_PER_WORD); - emit_insn (gen_rtx_SET (VOIDmode, sa, t)); + emit_insn (gen_rtx_SET (sa, t)); t = gen_frame_mem (Pmode, hard_frame_pointer_rtx); insn = emit_move_insn (hard_frame_pointer_rtx, t); @@ -12141,7 +12138,7 @@ ix86_expand_epilogue (int style) { t = gen_rtx_PLUS (Pmode, stack_pointer_rtx, sa); t = plus_constant (Pmode, t, m->fs.sp_offset - UNITS_PER_WORD); - insn = emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx, t)); + insn = emit_insn (gen_rtx_SET (stack_pointer_rtx, t)); ix86_add_queued_cfa_restore_notes (insn); gcc_assert (m->fs.cfa_reg == stack_pointer_rtx); @@ -12238,7 +12235,7 @@ ix86_expand_epilogue (int style) param_ptr_offset += UNITS_PER_WORD; insn = emit_insn (gen_rtx_SET - (VOIDmode, stack_pointer_rtx, + (stack_pointer_rtx, gen_rtx_PLUS (Pmode, crtl->drap_reg, GEN_INT (-param_ptr_offset)))); @@ -12300,10 +12297,9 @@ ix86_expand_epilogue (int style) m->fs.sp_offset -= UNITS_PER_WORD; rtx x = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD); - x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x); + x = gen_rtx_SET (stack_pointer_rtx, x); add_reg_note (insn, REG_CFA_ADJUST_CFA, x); - add_reg_note (insn, REG_CFA_REGISTER, - gen_rtx_SET (VOIDmode, ecx, pc_rtx)); + add_reg_note (insn, REG_CFA_REGISTER, gen_rtx_SET (ecx, pc_rtx)); RTX_FRAME_RELATED_P (insn) = 1; pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx, @@ -12492,7 +12488,7 @@ ix86_expand_split_stack_prologue (void) /* We don't use ix86_gen_add3 in this case because it will want to split to lea, but when not optimizing the insn will not be split after this point. */ - emit_insn (gen_rtx_SET (VOIDmode, scratch_reg, + emit_insn (gen_rtx_SET (scratch_reg, gen_rtx_PLUS (Pmode, stack_pointer_rtx, offset))); } @@ -12664,7 +12660,7 @@ ix86_expand_split_stack_prologue (void) So we add five words to get to the stack arguments. */ words = TARGET_64BIT ? 3 : 5; - emit_insn (gen_rtx_SET (VOIDmode, scratch_reg, + emit_insn (gen_rtx_SET (scratch_reg, gen_rtx_PLUS (Pmode, frame_reg, GEN_INT (words * UNITS_PER_WORD)))); @@ -12683,7 +12679,7 @@ ix86_expand_split_stack_prologue (void) case we need to set it based on the stack pointer. */ if (cfun->machine->split_stack_varargs_pointer != NULL_RTX) { - emit_insn (gen_rtx_SET (VOIDmode, scratch_reg, + emit_insn (gen_rtx_SET (scratch_reg, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (UNITS_PER_WORD)))); @@ -17229,7 +17225,7 @@ ix86_expand_clear (rtx dest) /* Avoid HImode and its attendant prefix byte. */ if (GET_MODE_SIZE (GET_MODE (dest)) < 4) dest = gen_rtx_REG (SImode, REGNO (dest)); - tmp = gen_rtx_SET (VOIDmode, dest, const0_rtx); + tmp = gen_rtx_SET (dest, const0_rtx); if (!TARGET_USE_MOV0 || optimize_insn_for_size_p ()) { @@ -17322,7 +17318,7 @@ ix86_expand_move (machine_mode mode, rtx operands[]) } if (op0 != op1 && GET_CODE (op0) != MEM) { - rtx insn = gen_rtx_SET (VOIDmode, op0, op1); + rtx insn = gen_rtx_SET (op0, op1); emit_insn (insn); return; } @@ -17388,14 +17384,14 @@ ix86_expand_move (machine_mode mode, rtx operands[]) if (!register_operand (op0, mode)) { rtx temp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, op1)); + emit_insn (gen_rtx_SET (temp, op1)); emit_move_insn (op0, temp); return; } } } - emit_insn (gen_rtx_SET (VOIDmode, op0, op1)); + emit_insn (gen_rtx_SET (op0, op1)); } void @@ -17453,7 +17449,7 @@ ix86_expand_vector_move (machine_mode mode, rtx operands[]) return; } - emit_insn (gen_rtx_SET (VOIDmode, op0, op1)); + emit_insn (gen_rtx_SET (op0, op1)); } /* Split 32-byte AVX unaligned load and store if needed. */ @@ -17508,7 +17504,7 @@ ix86_avx256_split_vector_move_misalign (rtx op0, rtx op1) is true, and without the UNSPEC it can be combined with arithmetic instructions. */ else if (misaligned_operand (op1, GET_MODE (op1))) - emit_insn (gen_rtx_SET (VOIDmode, op0, op1)); + emit_insn (gen_rtx_SET (op0, op1)); else emit_insn (load_unaligned (op0, op1)); } @@ -17689,7 +17685,7 @@ ix86_expand_vector_move_misalign (machine_mode mode, rtx operands[]) && (GET_MODE_CLASS (mode) == MODE_VECTOR_INT || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT) && misaligned_operand (op1, GET_MODE (op1))) - emit_insn (gen_rtx_SET (VOIDmode, op0, op1)); + emit_insn (gen_rtx_SET (op0, op1)); /* ??? If we have typed data, then it would appear that using movdqu is the only way to get unaligned data loaded with integer type. */ @@ -17960,7 +17956,7 @@ ix86_expand_binary_operator (enum rtx_code code, machine_mode mode, /* Emit the instruction. */ - op = gen_rtx_SET (VOIDmode, dst, gen_rtx_fmt_ee (code, mode, src1, src2)); + op = gen_rtx_SET (dst, gen_rtx_fmt_ee (code, mode, src1, src2)); if (reload_completed && code == PLUS @@ -18039,7 +18035,7 @@ ix86_expand_vector_logical_operator (enum rtx_code code, machine_mode mode, op1 = SUBREG_REG (op1); if (!nonimmediate_operand (op1, GET_MODE (dst))) op1 = force_reg (GET_MODE (dst), op1); - emit_insn (gen_rtx_SET (VOIDmode, dst, + emit_insn (gen_rtx_SET (dst, gen_rtx_fmt_ee (code, GET_MODE (dst), op1, op2))); emit_move_insn (operands[0], gen_lowpart (mode, dst)); @@ -18053,7 +18049,7 @@ ix86_expand_vector_logical_operator (enum rtx_code code, machine_mode mode, if (!nonimmediate_operand (operands[2], mode)) operands[2] = force_reg (mode, operands[2]); ix86_fixup_binary_operands_no_copy (code, mode, operands); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_fmt_ee (code, mode, operands[1], operands[2]))); } @@ -18127,7 +18123,7 @@ ix86_expand_unary_operator (enum rtx_code code, machine_mode mode, /* Emit the instruction. */ - op = gen_rtx_SET (VOIDmode, dst, gen_rtx_fmt_e (code, mode, src)); + op = gen_rtx_SET (dst, gen_rtx_fmt_e (code, mode, src)); if (code == NOT) emit_insn (op); @@ -18188,7 +18184,7 @@ ix86_split_idivmod (machine_mode mode, rtx operands[], tmp0 = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp0, gen_rtx_LABEL_REF (VOIDmode, qimode_label), pc_rtx); - insn = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp0)); + insn = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp0)); predict_jump (REG_BR_PROB_BASE * 50 / 100); JUMP_LABEL (insn) = qimode_label; @@ -18805,7 +18801,7 @@ ix86_emit_binop (enum rtx_code code, machine_mode mode, { rtx op, clob; - op = gen_rtx_SET (VOIDmode, dst, gen_rtx_fmt_ee (code, mode, dst, src)); + op = gen_rtx_SET (dst, gen_rtx_fmt_ee (code, mode, dst, src)); clob = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, FLAGS_REG)); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, op, clob))); @@ -18894,7 +18890,7 @@ ix86_split_lea_for_addr (rtx_insn *insn, rtx operands[], machine_mode mode) { /* r1 = r2 + r3 * C case. Need to move r3 into r1. */ if (regno0 != regno2) - emit_insn (gen_rtx_SET (VOIDmode, target, parts.index)); + emit_insn (gen_rtx_SET (target, parts.index)); /* Use shift for scaling. */ ix86_emit_binop (ASHIFT, mode, target, @@ -18910,19 +18906,19 @@ ix86_split_lea_for_addr (rtx_insn *insn, rtx operands[], machine_mode mode) else if (!parts.base && !parts.index) { gcc_assert(parts.disp); - emit_insn (gen_rtx_SET (VOIDmode, target, parts.disp)); + emit_insn (gen_rtx_SET (target, parts.disp)); } else { if (!parts.base) { if (regno0 != regno2) - emit_insn (gen_rtx_SET (VOIDmode, target, parts.index)); + emit_insn (gen_rtx_SET (target, parts.index)); } else if (!parts.index) { if (regno0 != regno1) - emit_insn (gen_rtx_SET (VOIDmode, target, parts.base)); + emit_insn (gen_rtx_SET (target, parts.base)); } else { @@ -18941,7 +18937,7 @@ ix86_split_lea_for_addr (rtx_insn *insn, rtx operands[], machine_mode mode) else tmp = parts.base, tmp1 = parts.index; - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); if (parts.disp && parts.disp != const0_rtx) ix86_emit_binop (PLUS, mode, target, parts.disp); @@ -19128,13 +19124,13 @@ ix86_split_convert_uns_si_sse (rtx operands[]) emit_move_insn (zero_or_two31, MEM_P (two31) ? large : two31); x = gen_rtx_fmt_ee (LE, vecmode, large, value); - emit_insn (gen_rtx_SET (VOIDmode, large, x)); + emit_insn (gen_rtx_SET (large, x)); x = gen_rtx_AND (vecmode, zero_or_two31, large); - emit_insn (gen_rtx_SET (VOIDmode, zero_or_two31, x)); + emit_insn (gen_rtx_SET (zero_or_two31, x)); x = gen_rtx_MINUS (vecmode, value, zero_or_two31); - emit_insn (gen_rtx_SET (VOIDmode, value, x)); + emit_insn (gen_rtx_SET (value, x)); large = gen_rtx_REG (V4SImode, REGNO (large)); emit_insn (gen_ashlv4si3 (large, large, GEN_INT (31))); @@ -19534,7 +19530,7 @@ ix86_expand_fp_absneg_operator (enum rtx_code code, machine_mode mode, src = operands[1]; set = gen_rtx_fmt_e (code, mode, src); - set = gen_rtx_SET (VOIDmode, dst, set); + set = gen_rtx_SET (dst, set); if (mask) { @@ -19644,12 +19640,12 @@ ix86_split_copysign_const (rtx operands[]) dest = simplify_gen_subreg (vmode, dest, mode, 0); x = gen_rtx_AND (vmode, dest, mask); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); if (op0 != CONST0_RTX (vmode)) { x = gen_rtx_IOR (vmode, dest, op0); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } } @@ -19685,13 +19681,13 @@ ix86_split_copysign_var (rtx operands[]) gcc_assert (REGNO (op1) == REGNO (scratch)); x = gen_rtx_AND (vmode, scratch, mask); - emit_insn (gen_rtx_SET (VOIDmode, scratch, x)); + emit_insn (gen_rtx_SET (scratch, x)); dest = mask; op0 = simplify_gen_subreg (vmode, op0, mode, 0); x = gen_rtx_NOT (vmode, dest); x = gen_rtx_AND (vmode, x, op0); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } else { @@ -19705,7 +19701,7 @@ ix86_split_copysign_var (rtx operands[]) op1 = simplify_gen_subreg (vmode, op1, mode, 0); x = gen_rtx_AND (vmode, scratch, op1); } - emit_insn (gen_rtx_SET (VOIDmode, scratch, x)); + emit_insn (gen_rtx_SET (scratch, x)); if (REGNO (op0) == REGNO (dest)) /* alternative 1,2 */ { @@ -19719,11 +19715,11 @@ ix86_split_copysign_var (rtx operands[]) op0 = simplify_gen_subreg (vmode, op0, mode, 0); x = gen_rtx_AND (vmode, dest, op0); } - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } x = gen_rtx_IOR (vmode, dest, scratch); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } /* Return TRUE or FALSE depending on whether the first SET in INSN @@ -19795,7 +19791,7 @@ ix86_expand_int_compare (enum rtx_code code, rtx op0, rtx op1) /* This is very simple, but making the interface the same as in the FP case makes the rest of the code easier. */ tmp = gen_rtx_COMPARE (cmpmode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, flags, tmp)); + emit_insn (gen_rtx_SET (flags, tmp)); /* Return the test that should be put into the flags user, i.e. the bcc, scc, or cmov instruction. */ @@ -20167,16 +20163,14 @@ ix86_expand_fp_compare (enum rtx_code code, rtx op0, rtx op1, rtx scratch) case IX86_FPCMP_COMI: intcmp_mode = fpcmp_mode; tmp = gen_rtx_COMPARE (fpcmp_mode, op0, op1); - tmp = gen_rtx_SET (VOIDmode, gen_rtx_REG (fpcmp_mode, FLAGS_REG), - tmp); + tmp = gen_rtx_SET (gen_rtx_REG (fpcmp_mode, FLAGS_REG), tmp); emit_insn (tmp); break; case IX86_FPCMP_SAHF: intcmp_mode = fpcmp_mode; tmp = gen_rtx_COMPARE (fpcmp_mode, op0, op1); - tmp = gen_rtx_SET (VOIDmode, gen_rtx_REG (fpcmp_mode, FLAGS_REG), - tmp); + tmp = gen_rtx_SET (gen_rtx_REG (fpcmp_mode, FLAGS_REG), tmp); if (!scratch) scratch = gen_reg_rtx (HImode); @@ -20190,7 +20184,7 @@ ix86_expand_fp_compare (enum rtx_code code, rtx op0, rtx op1, rtx scratch) tmp2 = gen_rtx_UNSPEC (HImode, gen_rtvec (1, tmp), UNSPEC_FNSTSW); if (!scratch) scratch = gen_reg_rtx (HImode); - emit_insn (gen_rtx_SET (VOIDmode, scratch, tmp2)); + emit_insn (gen_rtx_SET (scratch, tmp2)); /* In the unordered case, we have to check C2 for NaN's, which doesn't happen to work out to anything nice combination-wise. @@ -20355,7 +20349,7 @@ ix86_expand_branch (enum rtx_code code, rtx op0, rtx op1, rtx label) tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); return; case DImode: @@ -20502,7 +20496,7 @@ ix86_split_fp_branch (enum rtx_code code, rtx op1, rtx op2, tmp); i = emit_jump_insn (gen_rtx_SET - (VOIDmode, pc_rtx, + (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, condition, target1, target2))); if (split_branch_probability >= 0) @@ -20518,7 +20512,7 @@ ix86_expand_setcc (rtx dest, enum rtx_code code, rtx op0, rtx op1) ret = ix86_expand_compare (code, op0, op1); PUT_MODE (ret, QImode); - emit_insn (gen_rtx_SET (VOIDmode, dest, ret)); + emit_insn (gen_rtx_SET (dest, ret)); } /* Expand comparison setting or clearing carry flag. Return true when @@ -20959,7 +20953,7 @@ ix86_expand_int_movcc (rtx operands[]) if (nops == 1) out = force_operand (tmp, copy_rtx (out)); else - emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (out), copy_rtx (tmp))); + emit_insn (gen_rtx_SET (copy_rtx (out), copy_rtx (tmp))); } if (!rtx_equal_p (out, operands[0])) emit_move_insn (operands[0], copy_rtx (out)); @@ -21142,7 +21136,7 @@ ix86_expand_int_movcc (rtx operands[]) operands[3] = force_reg (mode, operands[3]); emit_insn (compare_seq); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_IF_THEN_ELSE (mode, compare_op, operands[2], operands[3]))); @@ -21261,7 +21255,7 @@ ix86_expand_sse_fp_minmax (rtx dest, enum rtx_code code, rtx cmp_op0, tmp = gen_rtx_fmt_ee (code, mode, if_true, if_false); } - emit_insn (gen_rtx_SET (VOIDmode, dest, tmp)); + emit_insn (gen_rtx_SET (dest, tmp)); return true; } @@ -21340,7 +21334,7 @@ ix86_expand_sse_cmp (rtx dest, enum rtx_code code, rtx cmp_op0, rtx cmp_op1, convert_move (dest, x, false); } else - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); return dest; } @@ -21363,14 +21357,14 @@ ix86_expand_sse_movcc (rtx dest, rtx cmp, rtx op_true, rtx op_false) && rtx_equal_p (op_false, CONST0_RTX (mode)) && !maskcmp) { - emit_insn (gen_rtx_SET (VOIDmode, dest, cmp)); + emit_insn (gen_rtx_SET (dest, cmp)); } else if (op_false == CONST0_RTX (mode) && !maskcmp) { op_true = force_reg (mode, op_true); x = gen_rtx_AND (mode, cmp, op_true); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } else if (op_true == CONST0_RTX (mode) && !maskcmp) @@ -21378,14 +21372,14 @@ ix86_expand_sse_movcc (rtx dest, rtx cmp, rtx op_true, rtx op_false) op_false = force_reg (mode, op_false); x = gen_rtx_NOT (mode, cmp); x = gen_rtx_AND (mode, x, op_false); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } else if (INTEGRAL_MODE_P (mode) && op_true == CONSTM1_RTX (mode) && !maskcmp) { op_false = force_reg (mode, op_false); x = gen_rtx_IOR (mode, cmp, op_false); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } else if (TARGET_XOP && !maskcmp) @@ -21395,10 +21389,9 @@ ix86_expand_sse_movcc (rtx dest, rtx cmp, rtx op_true, rtx op_false) if (!nonimmediate_operand (op_false, mode)) op_false = force_reg (mode, op_false); - emit_insn (gen_rtx_SET (mode, dest, - gen_rtx_IF_THEN_ELSE (mode, cmp, - op_true, - op_false))); + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (mode, cmp, + op_true, + op_false))); } else { @@ -21497,14 +21490,14 @@ ix86_expand_sse_movcc (rtx dest, rtx cmp, rtx op_true, rtx op_false) t3 = dest; x = gen_rtx_AND (mode, op_true, cmp); - emit_insn (gen_rtx_SET (VOIDmode, t2, x)); + emit_insn (gen_rtx_SET (t2, x)); x = gen_rtx_NOT (mode, cmp); x = gen_rtx_AND (mode, x, op_false); - emit_insn (gen_rtx_SET (VOIDmode, t3, x)); + emit_insn (gen_rtx_SET (t3, x)); x = gen_rtx_IOR (mode, t3, t2); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } } } @@ -21564,7 +21557,7 @@ ix86_expand_fp_movcc (rtx operands[]) compare_op = ix86_expand_compare (NE, tmp, const0_rtx); } - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_IF_THEN_ELSE (mode, compare_op, operands[2], operands[3]))); @@ -21787,8 +21780,7 @@ ix86_expand_int_vcond (rtx operands[]) case V8HImode: /* Perform a parallel unsigned saturating subtraction. */ x = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, x, - gen_rtx_US_MINUS (mode, cop0, cop1))); + emit_insn (gen_rtx_SET (x, gen_rtx_US_MINUS (mode, cop0, cop1))); cop0 = x; cop1 = CONST0_RTX (mode); @@ -22846,7 +22838,7 @@ ix86_split_long_move (rtx operands[]) if (GET_MODE (base) != Pmode) base = gen_rtx_REG (Pmode, REGNO (base)); - emit_insn (gen_rtx_SET (VOIDmode, base, XEXP (part[1][0], 0))); + emit_insn (gen_rtx_SET (base, XEXP (part[1][0], 0))); part[1][0] = replace_equiv_address (part[1][0], base); for (i = 1; i < nparts; i++) { @@ -23028,12 +23020,12 @@ ix86_split_ashl (rtx *operands, rtx scratch, machine_mode mode) d = gen_lowpart (QImode, low[0]); d = gen_rtx_STRICT_LOW_PART (VOIDmode, d); s = gen_rtx_EQ (QImode, flags, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, d, s)); + emit_insn (gen_rtx_SET (d, s)); d = gen_lowpart (QImode, high[0]); d = gen_rtx_STRICT_LOW_PART (VOIDmode, d); s = gen_rtx_NE (QImode, flags, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, d, s)); + emit_insn (gen_rtx_SET (d, s)); } /* Otherwise, we can get the same results by manually performing @@ -23071,7 +23063,7 @@ ix86_split_ashl (rtx *operands, rtx scratch, machine_mode mode) x = gen_rtx_ZERO_EXTEND (half_mode, operands[2]); else x = gen_lowpart (half_mode, operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, high[0], x)); + emit_insn (gen_rtx_SET (high[0], x)); emit_insn (gen_lshr3 (high[0], high[0], GEN_INT (bits))); emit_insn (gen_and3 (high[0], high[0], const1_rtx)); @@ -25311,17 +25303,16 @@ ix86_expand_strlensi_unroll_1 (rtx out, rtx src, rtx align_rtx) emit_insn (gen_testsi_ccno_1 (tmpreg, GEN_INT (0x8080))); tmp = gen_rtx_REG (CCNOmode, FLAGS_REG); tmp = gen_rtx_EQ (VOIDmode, tmp, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, tmpreg, + emit_insn (gen_rtx_SET (tmpreg, gen_rtx_IF_THEN_ELSE (SImode, tmp, reg, tmpreg))); /* Emit lea manually to avoid clobbering of flags. */ - emit_insn (gen_rtx_SET (SImode, reg2, - gen_rtx_PLUS (Pmode, out, const2_rtx))); + emit_insn (gen_rtx_SET (reg2, gen_rtx_PLUS (Pmode, out, const2_rtx))); tmp = gen_rtx_REG (CCNOmode, FLAGS_REG); tmp = gen_rtx_EQ (VOIDmode, tmp, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, out, + emit_insn (gen_rtx_SET (out, gen_rtx_IF_THEN_ELSE (Pmode, tmp, reg2, out))); @@ -25337,7 +25328,7 @@ ix86_expand_strlensi_unroll_1 (rtx out, rtx src, rtx align_rtx) tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, end_2_label), pc_rtx); - tmp = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + tmp = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); JUMP_LABEL (tmp) = end_2_label; /* Not in the first two. Move two bytes forward. */ @@ -25531,14 +25522,14 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1, } } - call = gen_rtx_SET (VOIDmode, retval, call); + call = gen_rtx_SET (retval, call); } vec[vec_len++] = call; if (pop) { pop = gen_rtx_PLUS (Pmode, stack_pointer_rtx, pop); - pop = gen_rtx_SET (VOIDmode, stack_pointer_rtx, pop); + pop = gen_rtx_SET (stack_pointer_rtx, pop); vec[vec_len++] = pop; } @@ -36166,8 +36157,7 @@ ix86_expand_sse_comi (const struct builtin_description *d, tree exp, if (! pat) return 0; emit_insn (pat); - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_STRICT_LOW_PART (VOIDmode, target), + emit_insn (gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, target), gen_rtx_fmt_ee (comparison, QImode, SET_DEST (pat), const0_rtx))); @@ -36281,8 +36271,7 @@ ix86_expand_sse_ptest (const struct builtin_description *d, tree exp, if (! pat) return 0; emit_insn (pat); - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_STRICT_LOW_PART (VOIDmode, target), + emit_insn (gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, target), gen_rtx_fmt_ee (comparison, QImode, SET_DEST (pat), const0_rtx))); @@ -36383,7 +36372,7 @@ ix86_expand_sse_pcmpestr (const struct builtin_description *d, target = gen_rtx_SUBREG (QImode, target, 0); emit_insn - (gen_rtx_SET (VOIDmode, gen_rtx_STRICT_LOW_PART (VOIDmode, target), + (gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, target), gen_rtx_fmt_ee (EQ, QImode, gen_rtx_REG ((machine_mode) d->flag, FLAGS_REG), @@ -36478,7 +36467,7 @@ ix86_expand_sse_pcmpistr (const struct builtin_description *d, target = gen_rtx_SUBREG (QImode, target, 0); emit_insn - (gen_rtx_SET (VOIDmode, gen_rtx_STRICT_LOW_PART (VOIDmode, target), + (gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, target), gen_rtx_fmt_ee (EQ, QImode, gen_rtx_REG ((machine_mode) d->flag, FLAGS_REG), @@ -37618,8 +37607,7 @@ ix86_expand_sse_comi_round (const struct builtin_description *d, } emit_insn (pat); - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_STRICT_LOW_PART (VOIDmode, target), + emit_insn (gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, target), gen_rtx_fmt_ee (comparison, QImode, set_dst, const0_rtx))); @@ -38366,9 +38354,8 @@ ix86_emit_cmove (rtx dst, rtx src, enum rtx_code code, rtx op1, rtx op2) if (TARGET_CMOVE) { t = ix86_expand_compare (code, op1, op2); - emit_insn (gen_rtx_SET (VOIDmode, dst, - gen_rtx_IF_THEN_ELSE (GET_MODE (dst), t, - src, dst))); + emit_insn (gen_rtx_SET (dst, gen_rtx_IF_THEN_ELSE (GET_MODE (dst), t, + src, dst))); } else { @@ -39240,7 +39227,7 @@ rdrand_step: pat = gen_rtx_GEU (VOIDmode, gen_rtx_REG (CCCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, target, + emit_insn (gen_rtx_SET (target, gen_rtx_IF_THEN_ELSE (SImode, pat, op2, op1))); return target; @@ -39275,7 +39262,7 @@ rdseed_step: pat = gen_rtx_LTU (QImode, gen_rtx_REG (CCCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, op2, pat)); + emit_insn (gen_rtx_SET (op2, pat)); if (target == 0 || !register_operand (target, SImode)) @@ -39345,7 +39332,7 @@ addcarryx: target = gen_reg_rtx (QImode); PUT_MODE (pat, QImode); - emit_insn (gen_rtx_SET (VOIDmode, target, pat)); + emit_insn (gen_rtx_SET (target, pat)); return target; case IX86_BUILTIN_READ_FLAGS: @@ -39394,7 +39381,7 @@ addcarryx: op1 = simplify_gen_subreg (mode0, op1, GET_MODE (op1), 0); target = gen_reg_rtx (QImode); - emit_insn (gen_rtx_SET (mode0, target, const0_rtx)); + emit_insn (gen_rtx_SET (target, const0_rtx)); /* Emit kortest. */ emit_insn (GEN_FCN (icode) (op0, op1)); @@ -43611,7 +43598,7 @@ x86_emit_floatuns (rtx operands[2]) expand_float (f0, i0, 0); - emit_insn (gen_rtx_SET (VOIDmode, out, gen_rtx_PLUS (mode, f0, f0))); + emit_insn (gen_rtx_SET (out, gen_rtx_PLUS (mode, f0, f0))); emit_label (donelab); } @@ -43646,7 +43633,7 @@ ix86_vector_duplicate_value (machine_mode mode, rtx target, rtx val) /* First attempt to recognize VAL as-is. */ dup = gen_rtx_VEC_DUPLICATE (mode, val); - insn = emit_insn (gen_rtx_SET (VOIDmode, target, dup)); + insn = emit_insn (gen_rtx_SET (target, dup)); if (recog_memoized (insn) < 0) { rtx_insn *seq; @@ -43706,7 +43693,7 @@ ix86_expand_vector_init_duplicate (bool mmx_ok, machine_mode mode, val = gen_lowpart (SImode, val); x = gen_rtx_TRUNCATE (HImode, val); x = gen_rtx_VEC_DUPLICATE (mode, x); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); return true; } goto widen; @@ -43793,7 +43780,7 @@ ix86_expand_vector_init_duplicate (bool mmx_ok, machine_mode mode, gcc_assert (ok); x = gen_rtx_VEC_CONCAT (mode, x, x); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); } return true; @@ -43810,7 +43797,7 @@ ix86_expand_vector_init_duplicate (bool mmx_ok, machine_mode mode, gcc_assert (ok); x = gen_rtx_VEC_CONCAT (mode, x, x); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); } return true; @@ -43870,7 +43857,7 @@ ix86_expand_vector_init_one_nonzero (bool mmx_ok, machine_mode mode, if (use_vector_set) { - emit_insn (gen_rtx_SET (VOIDmode, target, CONST0_RTX (mode))); + emit_insn (gen_rtx_SET (target, CONST0_RTX (mode))); var = force_reg (GET_MODE_INNER (mode), var); ix86_expand_vector_set (mmx_ok, target, var, one_var); return true; @@ -43890,7 +43877,7 @@ ix86_expand_vector_init_one_nonzero (bool mmx_ok, machine_mode mode, return false; var = force_reg (GET_MODE_INNER (mode), var); x = gen_rtx_VEC_CONCAT (mode, var, CONST0_RTX (GET_MODE_INNER (mode))); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); return true; case V4SFmode: @@ -43902,7 +43889,7 @@ ix86_expand_vector_init_one_nonzero (bool mmx_ok, machine_mode mode, var = force_reg (GET_MODE_INNER (mode), var); x = gen_rtx_VEC_DUPLICATE (mode, var); x = gen_rtx_VEC_MERGE (mode, x, CONST0_RTX (mode), const1_rtx); - emit_insn (gen_rtx_SET (VOIDmode, new_target, x)); + emit_insn (gen_rtx_SET (new_target, x)); if (one_var != 0) { /* We need to shuffle the value to the correct position, so @@ -44130,9 +44117,8 @@ ix86_expand_vector_init_concat (machine_mode mode, ops[1] = force_reg (cmode, ops[1]); if (!register_operand (ops[0], cmode)) ops[0] = force_reg (cmode, ops[0]); - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_VEC_CONCAT (mode, ops[0], - ops[1]))); + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_CONCAT (mode, ops[0], + ops[1]))); break; case 4: @@ -44303,7 +44289,7 @@ ix86_expand_vector_init_interleave (machine_mode mode, op0), CONST0_RTX (V4SImode), const1_rtx); - emit_insn (gen_rtx_SET (VOIDmode, op1, op0)); + emit_insn (gen_rtx_SET (op1, op0)); /* Cast the V4SImode vector back to a vector in orignal mode. */ op0 = gen_reg_rtx (mode); @@ -44357,8 +44343,7 @@ ix86_expand_vector_init_interleave (machine_mode mode, /* Cast the SECOND_IMODE vector back to a vector on original mode. */ - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_lowpart (mode, op0))); + emit_insn (gen_rtx_SET (target, gen_lowpart (mode, op0))); break; default: @@ -44422,8 +44407,7 @@ half: n >> 2); ix86_expand_vector_init_interleave (half_mode, op1, &ops [n >> 1], n >> 2); - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_VEC_CONCAT (mode, op0, op1))); + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_CONCAT (mode, op0, op1))); return; case V64QImode: @@ -44454,12 +44438,9 @@ quarter: &ops [n >> 1], n >> 3); ix86_expand_vector_init_interleave (quarter_mode, op3, &ops [(n >> 1) | (n >> 2)], n >> 3); - emit_insn (gen_rtx_SET (VOIDmode, op4, - gen_rtx_VEC_CONCAT (half_mode, op0, op1))); - emit_insn (gen_rtx_SET (VOIDmode, op5, - gen_rtx_VEC_CONCAT (half_mode, op2, op3))); - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_VEC_CONCAT (mode, op4, op5))); + emit_insn (gen_rtx_SET (op4, gen_rtx_VEC_CONCAT (half_mode, op0, op1))); + emit_insn (gen_rtx_SET (op5, gen_rtx_VEC_CONCAT (half_mode, op2, op3))); + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_CONCAT (mode, op4, op5))); return; case V16QImode: @@ -44644,7 +44625,7 @@ ix86_expand_vector_set (bool mmx_ok, rtx target, rtx val, int elt) tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); else tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); return; } break; @@ -44660,7 +44641,7 @@ ix86_expand_vector_set (bool mmx_ok, rtx target, rtx val, int elt) tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); else tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); return; case V2DFmode: @@ -44679,7 +44660,7 @@ ix86_expand_vector_set (bool mmx_ok, rtx target, rtx val, int elt) op0 = tmp, op1 = val; tmp = gen_rtx_VEC_CONCAT (mode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); } return; @@ -44848,8 +44829,7 @@ half: if (TARGET_AVX512F) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512f_blendmv8df (target, tmp, target, force_reg (QImode, GEN_INT (1 << elt)))); return; @@ -44860,8 +44840,7 @@ half: if (TARGET_AVX512F) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512f_blendmv8di (target, tmp, target, force_reg (QImode, GEN_INT (1 << elt)))); return; @@ -44872,8 +44851,7 @@ half: if (TARGET_AVX512F) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512f_blendmv16sf (target, tmp, target, force_reg (HImode, GEN_INT (1 << elt)))); return; @@ -44884,8 +44862,7 @@ half: if (TARGET_AVX512F) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512f_blendmv16si (target, tmp, target, force_reg (HImode, GEN_INT (1 << elt)))); return; @@ -44896,8 +44873,7 @@ half: if (TARGET_AVX512F && TARGET_AVX512BW) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512bw_blendmv32hi (target, tmp, target, force_reg (SImode, GEN_INT (1 << elt)))); return; @@ -44908,8 +44884,7 @@ half: if (TARGET_AVX512F && TARGET_AVX512BW) { tmp = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_VEC_DUPLICATE (mode, val))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_VEC_DUPLICATE (mode, val))); emit_insn (gen_avx512bw_blendmv64qi (target, tmp, target, force_reg (DImode, GEN_INT (1 << elt)))); return; @@ -44925,7 +44900,7 @@ half: { tmp = gen_rtx_VEC_DUPLICATE (mode, val); tmp = gen_rtx_VEC_MERGE (mode, tmp, target, GEN_INT (1 << elt)); - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); } else { @@ -45204,7 +45179,7 @@ ix86_expand_vector_extract (bool mmx_ok, rtx target, rtx vec, int elt) target = gen_lowpart (SImode, target); } - emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + emit_insn (gen_rtx_SET (target, tmp)); } else { @@ -45531,7 +45506,7 @@ ix86_emit_fp_unordered_jump (rtx label) temp = gen_rtx_IF_THEN_ELSE (VOIDmode, temp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - temp = gen_rtx_SET (VOIDmode, pc_rtx, temp); + temp = gen_rtx_SET (pc_rtx, temp); emit_jump_insn (temp); predict_jump (REG_BR_PROB_BASE * 10 / 100); @@ -45629,7 +45604,7 @@ void ix86_emit_i387_round (rtx op0, rtx op1) /* round(a) = sgn(a) * floor(fabs(a) + 0.5) */ /* scratch = fxam(op1) */ - emit_insn (gen_rtx_SET (VOIDmode, scratch, + emit_insn (gen_rtx_SET (scratch, gen_rtx_UNSPEC (HImode, gen_rtvec (1, op1), UNSPEC_FXAM))); /* e1 = fabs(op1) */ @@ -45637,16 +45612,14 @@ void ix86_emit_i387_round (rtx op0, rtx op1) /* e2 = e1 + 0.5 */ half = force_reg (inmode, half); - emit_insn (gen_rtx_SET (VOIDmode, e2, - gen_rtx_PLUS (inmode, e1, half))); + emit_insn (gen_rtx_SET (e2, gen_rtx_PLUS (inmode, e1, half))); /* res = floor(e2) */ if (inmode != XFmode) { tmp1 = gen_reg_rtx (XFmode); - emit_insn (gen_rtx_SET (VOIDmode, tmp1, - gen_rtx_FLOAT_EXTEND (XFmode, e2))); + emit_insn (gen_rtx_SET (tmp1, gen_rtx_FLOAT_EXTEND (XFmode, e2))); } else tmp1 = e2; @@ -45660,7 +45633,7 @@ void ix86_emit_i387_round (rtx op0, rtx op1) emit_insn (gen_frndintxf2_floor (tmp0, tmp1)); - emit_insn (gen_rtx_SET (VOIDmode, res, + emit_insn (gen_rtx_SET (res, gen_rtx_UNSPEC (outmode, gen_rtvec (1, tmp0), UNSPEC_TRUNC_NOOP))); } @@ -45689,7 +45662,7 @@ void ix86_emit_i387_round (rtx op0, rtx op1) gen_rtx_EQ (VOIDmode, flags, const0_rtx), gen_rtx_LABEL_REF (VOIDmode, jump_label), pc_rtx); - insn = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + insn = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); predict_jump (REG_BR_PROB_BASE * 50 / 100); JUMP_LABEL (insn) = jump_label; @@ -45719,33 +45692,26 @@ void ix86_emit_swdivsf (rtx res, rtx a, rtx b, machine_mode mode) /* x0 = rcp(b) estimate */ if (mode == V16SFmode || mode == V8DFmode) - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_UNSPEC (mode, gen_rtvec (1, b), - UNSPEC_RCP14))); + emit_insn (gen_rtx_SET (x0, gen_rtx_UNSPEC (mode, gen_rtvec (1, b), + UNSPEC_RCP14))); else - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_UNSPEC (mode, gen_rtvec (1, b), - UNSPEC_RCP))); + emit_insn (gen_rtx_SET (x0, gen_rtx_UNSPEC (mode, gen_rtvec (1, b), + UNSPEC_RCP))); /* e0 = x0 * b */ - emit_insn (gen_rtx_SET (VOIDmode, e0, - gen_rtx_MULT (mode, x0, b))); + emit_insn (gen_rtx_SET (e0, gen_rtx_MULT (mode, x0, b))); /* e0 = x0 * e0 */ - emit_insn (gen_rtx_SET (VOIDmode, e0, - gen_rtx_MULT (mode, x0, e0))); + emit_insn (gen_rtx_SET (e0, gen_rtx_MULT (mode, x0, e0))); /* e1 = x0 + x0 */ - emit_insn (gen_rtx_SET (VOIDmode, e1, - gen_rtx_PLUS (mode, x0, x0))); + emit_insn (gen_rtx_SET (e1, gen_rtx_PLUS (mode, x0, x0))); /* x1 = e1 - e0 */ - emit_insn (gen_rtx_SET (VOIDmode, x1, - gen_rtx_MINUS (mode, e1, e0))); + emit_insn (gen_rtx_SET (x1, gen_rtx_MINUS (mode, e1, e0))); /* res = a * x1 */ - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_MULT (mode, a, x1))); + emit_insn (gen_rtx_SET (res, gen_rtx_MULT (mode, a, x1))); } /* Output code to perform a Newton-Rhapson approximation of a @@ -45786,9 +45752,8 @@ void ix86_emit_swsqrtsf (rtx res, rtx a, machine_mode mode, a = force_reg (mode, a); /* x0 = rsqrt(a) estimate */ - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_UNSPEC (mode, gen_rtvec (1, a), - unspec))); + emit_insn (gen_rtx_SET (x0, gen_rtx_UNSPEC (mode, gen_rtvec (1, a), + unspec))); /* If (a == 0.0) Filter out infinity to prevent NaN for sqrt(0.0). */ if (!recip) @@ -45810,38 +45775,30 @@ void ix86_emit_swsqrtsf (rtx res, rtx a, machine_mode mode, } else { - emit_insn (gen_rtx_SET (VOIDmode, mask, - gen_rtx_NE (mode, zero, a))); + emit_insn (gen_rtx_SET (mask, gen_rtx_NE (mode, zero, a))); - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_AND (mode, x0, mask))); + emit_insn (gen_rtx_SET (x0, gen_rtx_AND (mode, x0, mask))); } } /* e0 = x0 * a */ - emit_insn (gen_rtx_SET (VOIDmode, e0, - gen_rtx_MULT (mode, x0, a))); + emit_insn (gen_rtx_SET (e0, gen_rtx_MULT (mode, x0, a))); /* e1 = e0 * x0 */ - emit_insn (gen_rtx_SET (VOIDmode, e1, - gen_rtx_MULT (mode, e0, x0))); + emit_insn (gen_rtx_SET (e1, gen_rtx_MULT (mode, e0, x0))); /* e2 = e1 - 3. */ mthree = force_reg (mode, mthree); - emit_insn (gen_rtx_SET (VOIDmode, e2, - gen_rtx_PLUS (mode, e1, mthree))); + emit_insn (gen_rtx_SET (e2, gen_rtx_PLUS (mode, e1, mthree))); mhalf = force_reg (mode, mhalf); if (recip) /* e3 = -.5 * x0 */ - emit_insn (gen_rtx_SET (VOIDmode, e3, - gen_rtx_MULT (mode, x0, mhalf))); + emit_insn (gen_rtx_SET (e3, gen_rtx_MULT (mode, x0, mhalf))); else /* e3 = -.5 * e0 */ - emit_insn (gen_rtx_SET (VOIDmode, e3, - gen_rtx_MULT (mode, e0, mhalf))); + emit_insn (gen_rtx_SET (e3, gen_rtx_MULT (mode, e0, mhalf))); /* ret = e2 * e3 */ - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_MULT (mode, e2, e3))); + emit_insn (gen_rtx_SET (res, gen_rtx_MULT (mode, e2, e3))); } #ifdef TARGET_SOLARIS @@ -45963,15 +45920,13 @@ ix86_sse_copysign_to_positive (rtx result, rtx abs_value, rtx sign, rtx mask) rtx tmp = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (1, const0_rtx)); tmp = gen_rtx_VEC_SELECT (mode, mask, tmp); mask = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, mask, tmp)); + emit_insn (gen_rtx_SET (mask, tmp)); } } else mask = gen_rtx_NOT (mode, mask); - emit_insn (gen_rtx_SET (VOIDmode, sgn, - gen_rtx_AND (mode, mask, sign))); - emit_insn (gen_rtx_SET (VOIDmode, result, - gen_rtx_IOR (mode, abs_value, sgn))); + emit_insn (gen_rtx_SET (sgn, gen_rtx_AND (mode, mask, sign))); + emit_insn (gen_rtx_SET (result, gen_rtx_IOR (mode, abs_value, sgn))); } /* Expand fabs (OP0) and return a new rtx that holds the result. The @@ -45997,10 +45952,9 @@ ix86_expand_sse_fabs (rtx op0, rtx *smask) rtx tmp = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (1, const0_rtx)); tmp = gen_rtx_VEC_SELECT (mode, mask, tmp); mask = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, mask, tmp)); + emit_insn (gen_rtx_SET (mask, tmp)); } - emit_insn (gen_rtx_SET (VOIDmode, xa, - gen_rtx_AND (mode, op0, mask))); + emit_insn (gen_rtx_SET (xa, gen_rtx_AND (mode, op0, mask))); if (smask) *smask = mask; @@ -46025,12 +45979,11 @@ ix86_expand_sse_compare_and_jump (enum rtx_code code, rtx op0, rtx op1, label = gen_label_rtx (); tmp = gen_rtx_REG (fpcmp_mode, FLAGS_REG); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_COMPARE (fpcmp_mode, op0, op1))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_COMPARE (fpcmp_mode, op0, op1))); tmp = gen_rtx_fmt_ee (code, VOIDmode, tmp, const0_rtx); tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - tmp = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + tmp = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); JUMP_LABEL (tmp) = label; return label; @@ -46225,8 +46178,7 @@ ix86_expand_floorceildf_32 (rtx operand0, rtx operand1, bool do_floor) /* Compensate: xa = xa - (xa > operand1 ? 1 : 0) */ tmp = ix86_expand_sse_compare_mask (UNGT, xa, res, !do_floor); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_AND (mode, one, tmp))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp))); /* We always need to subtract here to preserve signed zero. */ tmp = expand_simple_binop (mode, MINUS, xa, tmp, NULL_RTX, 0, OPTAB_DIRECT); @@ -46285,8 +46237,7 @@ ix86_expand_floorceil (rtx operand0, rtx operand1, bool do_floor) /* Compensate: xa = xa - (xa > operand1 ? 1 : 0) */ tmp = ix86_expand_sse_compare_mask (UNGT, xa, res, !do_floor); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_AND (mode, one, tmp))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp))); tmp = expand_simple_binop (mode, do_floor ? MINUS : PLUS, xa, tmp, NULL_RTX, 0, OPTAB_DIRECT); emit_move_insn (res, tmp); @@ -46356,13 +46307,11 @@ ix86_expand_rounddf_32 (rtx operand0, rtx operand1) tmp = gen_reg_rtx (mode); /* xa2 = xa2 - (dxa > 0.5 ? 1 : 0) */ tmp = ix86_expand_sse_compare_mask (UNGT, dxa, half, false); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_AND (mode, one, tmp))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp))); xa2 = expand_simple_binop (mode, MINUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT); /* xa2 = xa2 + (dxa <= -0.5 ? 1 : 0) */ tmp = ix86_expand_sse_compare_mask (UNGE, mhalf, dxa, false); - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_AND (mode, one, tmp))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp))); xa2 = expand_simple_binop (mode, PLUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT); /* res = copysign (xa2, operand1) */ @@ -46463,8 +46412,7 @@ ix86_expand_truncdf_32 (rtx operand0, rtx operand1) /* Compensate: res = xa2 - (res > xa ? 1 : 0) */ mask = ix86_expand_sse_compare_mask (UNGT, res, xa, false); - emit_insn (gen_rtx_SET (VOIDmode, mask, - gen_rtx_AND (mode, mask, one))); + emit_insn (gen_rtx_SET (mask, gen_rtx_AND (mode, mask, one))); tmp = expand_simple_binop (mode, MINUS, res, mask, NULL_RTX, 0, OPTAB_DIRECT); emit_move_insn (res, tmp); @@ -46712,7 +46660,7 @@ init_vselect_insn (void) XVECEXP (x, 0, i) = const0_rtx; x = gen_rtx_VEC_SELECT (V2DFmode, gen_rtx_VEC_CONCAT (V4DFmode, const0_rtx, const0_rtx), x); - x = gen_rtx_SET (VOIDmode, const0_rtx, x); + x = gen_rtx_SET (const0_rtx, x); start_sequence (); vselect_insn = emit_insn (x); end_sequence (); @@ -46967,7 +46915,7 @@ expand_vec_perm_blend (struct expand_vec_perm_d *d) /* This matches five different patterns with the different modes. */ x = gen_rtx_VEC_MERGE (vmode, op1, op0, GEN_INT (mask)); - x = gen_rtx_SET (VOIDmode, target, x); + x = gen_rtx_SET (target, x); emit_insn (x); if (target != d->target) emit_move_insn (d->target, gen_lowpart (d->vmode, target)); @@ -49861,7 +49809,7 @@ ix86_expand_mul_widen_hilo (rtx dest, rtx op1, rtx op2, ix86_expand_sse_unpack (t1, op1, uns_p, high_p); ix86_expand_sse_unpack (t2, op2, uns_p, high_p); - emit_insn (gen_rtx_SET (VOIDmode, dest, gen_rtx_MULT (wmode, t1, t2))); + emit_insn (gen_rtx_SET (dest, gen_rtx_MULT (wmode, t1, t2))); break; default: diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index fc320f67b54..938f3985493 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -1862,7 +1862,7 @@ emit_move_insn (operands[2], addr); mem = replace_equiv_address_nv (mem, operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, mem, operands[1])); + emit_insn (gen_rtx_SET (mem, operands[1])); DONE; }) @@ -1878,7 +1878,7 @@ emit_move_insn (operands[2], addr); mem = replace_equiv_address_nv (mem, operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], mem)); + emit_insn (gen_rtx_SET (operands[0], mem)); DONE; }) @@ -4937,7 +4937,7 @@ t = gen_rtx_FLOAT (mode, operands[1]); t = gen_rtx_VEC_DUPLICATE (vmode, t); t = gen_rtx_VEC_MERGE (vmode, t, op0, const1_rtx); - emit_insn (gen_rtx_SET (VOIDmode, op0, t)); + emit_insn (gen_rtx_SET (op0, t)); DONE; }) @@ -5518,7 +5518,7 @@ pat = gen_rtx_PLUS (mode, operands[1], operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; }) @@ -6007,7 +6007,7 @@ pat = gen_rtx_PLUS (mode, gen_rtx_PLUS (mode, operands[1], operands[2]), operands[3]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; } [(set_attr "type" "lea") @@ -6037,7 +6037,7 @@ pat = gen_rtx_PLUS (mode, gen_rtx_MULT (mode, operands[1], operands[2]), operands[3]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; } [(set_attr "type" "lea") @@ -6072,7 +6072,7 @@ operands[3]), operands[4]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; } [(set_attr "type" "lea") @@ -6111,7 +6111,7 @@ pat = plus_constant (mode, gen_rtx_MULT (mode, operands[1], operands[2]), INTVAL (operands[3])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; } [(set_attr "type" "lea") @@ -9325,7 +9325,7 @@ tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - tmp = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + tmp = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); JUMP_LABEL (tmp) = label; emit_move_insn (operands[0], operands[1]); @@ -9665,7 +9665,7 @@ pat = gen_rtx_MULT (mode, operands[1], operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat)); + emit_insn (gen_rtx_SET (operands[0], pat)); DONE; }) @@ -9988,7 +9988,7 @@ tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - tmp = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + tmp = emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); JUMP_LABEL (tmp) = label; emit_move_insn (operands[0], operands[1]); @@ -13058,7 +13058,7 @@ cond = gen_rtx_fmt_ee (ORDERED, QImode, gen_rtx_REG (CCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, scratch, cond)); + emit_insn (gen_rtx_SET (scratch, cond)); if (TARGET_64BIT) emit_insn (gen_zero_extendqidi2 (operands[0], scratch)); @@ -13085,7 +13085,7 @@ cond = gen_rtx_fmt_ee (ORDERED, QImode, gen_rtx_REG (CCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, scratch, cond)); + emit_insn (gen_rtx_SET (scratch, cond)); emit_insn (gen_zero_extendqisi2 (operands[0], scratch)); DONE; @@ -15844,7 +15844,7 @@ cond = gen_rtx_fmt_ee (EQ, QImode, gen_rtx_REG (CCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, res, cond)); + emit_insn (gen_rtx_SET (res, cond)); emit_insn (gen_zero_extendqisi2 (operands[0], res)); DONE; }) @@ -15880,7 +15880,7 @@ cond = gen_rtx_fmt_ee (EQ, QImode, gen_rtx_REG (CCmode, FLAGS_REG), const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, res, cond)); + emit_insn (gen_rtx_SET (res, cond)); emit_insn (gen_zero_extendqisi2 (operands[0], res)); DONE; }) diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index c61098d9225..21c6c6cd5be 100644 --- a/gcc/config/i386/sse.md +++ b/gcc/config/i386/sse.md @@ -1146,7 +1146,7 @@ src = gen_rtx_VEC_MERGE (<MODE>mode, operands[1], operands[2 * <mask_applied>], operands[3 * <mask_applied>]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], src)); + emit_insn (gen_rtx_SET (operands[0], src)); DONE; } }) @@ -1291,7 +1291,7 @@ src = gen_rtx_VEC_MERGE (<MODE>mode, operands[1], operands[2 * <mask_applied>], operands[3 * <mask_applied>]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], src)); + emit_insn (gen_rtx_SET (operands[0], src)); DONE; } }) @@ -1310,7 +1310,7 @@ src = gen_rtx_VEC_MERGE (<MODE>mode, operands[1], operands[2 * <mask_applied>], operands[3 * <mask_applied>]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], src)); + emit_insn (gen_rtx_SET (operands[0], src)); DONE; } }) @@ -1329,7 +1329,7 @@ src = gen_rtx_VEC_MERGE (<MODE>mode, operands[1], operands[2 * <mask_applied>], operands[3 * <mask_applied>]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], src)); + emit_insn (gen_rtx_SET (operands[0], src)); DONE; } }) @@ -1621,7 +1621,7 @@ absneg_op = GET_CODE (operands[3]) == NEG ? XOR : AND; t = gen_rtx_fmt_ee (absneg_op, <MODE>mode, op1, op2); - t = gen_rtx_SET (VOIDmode, operands[0], t); + t = gen_rtx_SET (operands[0], t); emit_insn (t); DONE; } @@ -5159,7 +5159,7 @@ rtx tmp = gen_reg_rtx (<sseunpackmode>mode); emit_insn (gen_vec_unpacks_hi_<mode> (tmp, operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_FLOAT (<sseunpackfltmode>mode, tmp))); DONE; }) @@ -5172,7 +5172,7 @@ rtx tmp = gen_reg_rtx (<sseunpackmode>mode); emit_insn (gen_vec_unpacks_lo_<mode> (tmp, operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_FLOAT (<sseunpackfltmode>mode, tmp))); DONE; }) @@ -5185,7 +5185,7 @@ rtx tmp = gen_reg_rtx (<sseunpackmode>mode); emit_insn (gen_vec_unpacku_hi_<mode> (tmp, operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_FLOAT (<sseunpackfltmode>mode, tmp))); DONE; }) @@ -5198,7 +5198,7 @@ rtx tmp = gen_reg_rtx (<sseunpackmode>mode); emit_insn (gen_vec_unpacku_lo_<mode> (tmp, operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_FLOAT (<sseunpackfltmode>mode, tmp))); DONE; }) @@ -5356,8 +5356,7 @@ tmp[i] = gen_reg_rtx (V4DFmode); emit_insn (gen_vec_extract_hi_v8si (tmp[5], operands[1])); emit_insn (gen_floatv4siv4df2 (tmp[2], tmp[5])); - emit_insn (gen_rtx_SET (VOIDmode, tmp[3], - gen_rtx_LT (V4DFmode, tmp[2], tmp[0]))); + emit_insn (gen_rtx_SET (tmp[3], gen_rtx_LT (V4DFmode, tmp[2], tmp[0]))); emit_insn (gen_andv4df3 (tmp[4], tmp[3], tmp[1])); emit_insn (gen_addv4df3 (operands[0], tmp[2], tmp[4])); DONE; @@ -5382,8 +5381,7 @@ emit_insn (gen_vec_extract_hi_v16si (tmp[3], operands[1])); emit_insn (gen_floatv8siv8df2 (tmp[2], tmp[3])); - emit_insn (gen_rtx_SET (VOIDmode, k, - gen_rtx_LT (QImode, tmp[2], tmp[0]))); + emit_insn (gen_rtx_SET (k, gen_rtx_LT (QImode, tmp[2], tmp[0]))); emit_insn (gen_addv8df3_mask (tmp[2], tmp[2], tmp[1], tmp[2], k)); emit_move_insn (operands[0], tmp[2]); DONE; @@ -5407,8 +5405,7 @@ for (i = 2; i < 5; i++) tmp[i] = gen_reg_rtx (V4DFmode); emit_insn (gen_avx_cvtdq2pd256_2 (tmp[2], operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, tmp[3], - gen_rtx_LT (V4DFmode, tmp[2], tmp[0]))); + emit_insn (gen_rtx_SET (tmp[3], gen_rtx_LT (V4DFmode, tmp[2], tmp[0]))); emit_insn (gen_andv4df3 (tmp[4], tmp[3], tmp[1])); emit_insn (gen_addv4df3 (operands[0], tmp[2], tmp[4])); DONE; @@ -5431,8 +5428,7 @@ k = gen_reg_rtx (QImode); emit_insn (gen_avx512f_cvtdq2pd512_2 (tmp[2], operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, k, - gen_rtx_LT (QImode, tmp[2], tmp[0]))); + emit_insn (gen_rtx_SET (k, gen_rtx_LT (QImode, tmp[2], tmp[0]))); emit_insn (gen_addv8df3_mask (tmp[2], tmp[2], tmp[1], tmp[2], k)); emit_move_insn (operands[0], tmp[2]); DONE; @@ -9876,7 +9872,7 @@ { rtx t = gen_reg_rtx (<sseunpackmode>mode); emit_insn (gen_<sse2_avx2>_pmaddwd<SDOT_PMADD_SUF> (t, operands[1], operands[2])); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_PLUS (<sseunpackmode>mode, operands[3], t))); DONE; @@ -16488,8 +16484,7 @@ for (regno = 0; regno < nregs; regno++) XVECEXP (operands[0], 0, regno + 1) - = gen_rtx_SET (VOIDmode, - gen_rtx_REG (V8SImode, SSE_REGNO (regno)), + = gen_rtx_SET (gen_rtx_REG (V8SImode, SSE_REGNO (regno)), CONST0_RTX (V8SImode)); }) @@ -17422,7 +17417,7 @@ operands[1], operands[2]); t1 = gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (nelt, perm)); t2 = gen_rtx_VEC_SELECT (<MODE>mode, t2, t1); - t2 = gen_rtx_SET (VOIDmode, operands[0], t2); + t2 = gen_rtx_SET (operands[0], t2); emit_insn (t2); DONE; } diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c index 40e6ebe4c4e..c3ed9bb5e70 100644 --- a/gcc/config/ia64/ia64.c +++ b/gcc/config/ia64/ia64.c @@ -1173,15 +1173,15 @@ ia64_expand_load_address (rtx dest, rtx src) tmp = gen_rtx_HIGH (Pmode, src); tmp = gen_rtx_PLUS (Pmode, tmp, pic_offset_table_rtx); - emit_insn (gen_rtx_SET (VOIDmode, dest, tmp)); + emit_insn (gen_rtx_SET (dest, tmp)); tmp = gen_rtx_LO_SUM (Pmode, gen_const_mem (Pmode, dest), src); - emit_insn (gen_rtx_SET (VOIDmode, dest, tmp)); + emit_insn (gen_rtx_SET (dest, tmp)); if (addend) { tmp = gen_rtx_PLUS (Pmode, dest, GEN_INT (addend)); - emit_insn (gen_rtx_SET (VOIDmode, dest, tmp)); + emit_insn (gen_rtx_SET (dest, tmp)); } } @@ -1375,7 +1375,7 @@ ia64_expand_move (rtx op0, rtx op1) { rtx subtarget = !can_create_pseudo_p () ? op0 : gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, subtarget, op1)); + emit_insn (gen_rtx_SET (subtarget, op1)); op1 = expand_simple_binop (mode, PLUS, subtarget, GEN_INT (addend), op0, 1, OPTAB_DIRECT); @@ -1620,11 +1620,11 @@ ia64_split_tmode_move (rtx operands[]) || GET_CODE (XEXP (EXP, 0)) == POST_DEC)) \ add_reg_note (insn, REG_INC, XEXP (XEXP (EXP, 0), 0)) - insn = emit_insn (gen_rtx_SET (VOIDmode, out[0], in[0])); + insn = emit_insn (gen_rtx_SET (out[0], in[0])); MAYBE_ADD_REG_INC_NOTE (insn, in[0]); MAYBE_ADD_REG_INC_NOTE (insn, out[0]); - insn = emit_insn (gen_rtx_SET (VOIDmode, out[1], in[1])); + insn = emit_insn (gen_rtx_SET (out[1], in[1])); MAYBE_ADD_REG_INC_NOTE (insn, in[1]); MAYBE_ADD_REG_INC_NOTE (insn, out[1]); @@ -1867,9 +1867,8 @@ ia64_expand_compare (rtx *expr, rtx *op0, rtx *op1) *op0, TFmode, *op1, TFmode, GEN_INT (magic), DImode); cmp = gen_reg_rtx (BImode); - emit_insn (gen_rtx_SET (VOIDmode, cmp, - gen_rtx_fmt_ee (ncode, BImode, - ret, const0_rtx))); + emit_insn (gen_rtx_SET (cmp, gen_rtx_fmt_ee (ncode, BImode, + ret, const0_rtx))); insns = get_insns (); end_sequence (); @@ -1881,8 +1880,7 @@ ia64_expand_compare (rtx *expr, rtx *op0, rtx *op1) else { cmp = gen_reg_rtx (BImode); - emit_insn (gen_rtx_SET (VOIDmode, cmp, - gen_rtx_fmt_ee (code, BImode, *op0, *op1))); + emit_insn (gen_rtx_SET (cmp, gen_rtx_fmt_ee (code, BImode, *op0, *op1))); code = NE; } @@ -1961,8 +1959,7 @@ ia64_expand_vecint_compare (enum rtx_code code, machine_mode mode, case V4HImode: /* Perform a parallel unsigned saturating subtraction. */ x = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, x, - gen_rtx_US_MINUS (mode, op0, op1))); + emit_insn (gen_rtx_SET (x, gen_rtx_US_MINUS (mode, op0, op1))); code = EQ; op0 = x; @@ -1976,7 +1973,7 @@ ia64_expand_vecint_compare (enum rtx_code code, machine_mode mode, } x = gen_rtx_fmt_ee (code, mode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); return negate; } @@ -2008,12 +2005,12 @@ ia64_expand_vecint_cmov (rtx operands[]) x = gen_rtx_NOT (mode, cmp); x = gen_rtx_AND (mode, x, of); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); } else if (of == CONST0_RTX (mode)) { x = gen_rtx_AND (mode, cmp, ot); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); } else { @@ -2021,15 +2018,15 @@ ia64_expand_vecint_cmov (rtx operands[]) t = gen_reg_rtx (mode); x = gen_rtx_AND (mode, cmp, operands[1+negate]); - emit_insn (gen_rtx_SET (VOIDmode, t, x)); + emit_insn (gen_rtx_SET (t, x)); f = gen_reg_rtx (mode); x = gen_rtx_NOT (mode, cmp); x = gen_rtx_AND (mode, x, operands[2-negate]); - emit_insn (gen_rtx_SET (VOIDmode, f, x)); + emit_insn (gen_rtx_SET (f, x)); x = gen_rtx_IOR (mode, t, f); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); } } @@ -2053,7 +2050,7 @@ ia64_expand_vecint_minmax (enum rtx_code code, machine_mode mode, rtx x, tmp = gen_reg_rtx (mode); x = gen_rtx_US_MINUS (mode, operands[1], operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, tmp, x)); + emit_insn (gen_rtx_SET (tmp, x)); emit_insn (gen_addv4hi3 (operands[0], tmp, operands[2])); return true; @@ -3230,8 +3227,7 @@ do_spill (rtx (*move_fn) (rtx, rtx, rtx), rtx reg, HOST_WIDE_INT cfa_off, } add_reg_note (insn, REG_CFA_OFFSET, - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (GET_MODE (reg), + gen_rtx_SET (gen_rtx_MEM (GET_MODE (reg), plus_constant (Pmode, base, off)), frame_reg)); @@ -3295,9 +3291,8 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, emit_move_insn (r2, GEN_INT (-(first + size))); /* Compare current value of BSP and SP registers. */ - emit_insn (gen_rtx_SET (VOIDmode, p6, - gen_rtx_fmt_ee (LTU, BImode, - r3, stack_pointer_rtx))); + emit_insn (gen_rtx_SET (p6, gen_rtx_fmt_ee (LTU, BImode, + r3, stack_pointer_rtx))); /* Compute the address of the probe for the Backing Store (which grows towards higher addresses). We probe only at the first offset of @@ -3307,18 +3302,15 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, size is at least 4096 - (96 + 2) * 8 = 3312 bytes, which is enough. Also compute the address of the last probe for the memory stack (which grows towards lower addresses). */ - emit_insn (gen_rtx_SET (VOIDmode, r3, plus_constant (Pmode, r3, 4095))); - emit_insn (gen_rtx_SET (VOIDmode, r2, - gen_rtx_PLUS (Pmode, stack_pointer_rtx, r2))); + emit_insn (gen_rtx_SET (r3, plus_constant (Pmode, r3, 4095))); + emit_insn (gen_rtx_SET (r2, gen_rtx_PLUS (Pmode, stack_pointer_rtx, r2))); /* Compare them and raise SEGV if the former has topped the latter. */ emit_insn (gen_rtx_COND_EXEC (VOIDmode, gen_rtx_fmt_ee (NE, VOIDmode, p6, const0_rtx), - gen_rtx_SET (VOIDmode, p6, - gen_rtx_fmt_ee (GEU, BImode, - r3, r2)))); - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_ZERO_EXTRACT (DImode, r3, GEN_INT (12), + gen_rtx_SET (p6, gen_rtx_fmt_ee (GEU, BImode, + r3, r2)))); + emit_insn (gen_rtx_SET (gen_rtx_ZERO_EXTRACT (DImode, r3, GEN_INT (12), const0_rtx), const0_rtx)); emit_insn (gen_rtx_COND_EXEC (VOIDmode, @@ -3346,7 +3338,7 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, HOST_WIDE_INT i; emit_move_insn (r2, GEN_INT (-(first + PROBE_INTERVAL))); - emit_insn (gen_rtx_SET (VOIDmode, r2, + emit_insn (gen_rtx_SET (r2, gen_rtx_PLUS (Pmode, stack_pointer_rtx, r2))); emit_stack_probe (r2); @@ -3355,12 +3347,12 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, generate any code. Then probe at FIRST + SIZE. */ for (i = 2 * PROBE_INTERVAL; i < size; i += PROBE_INTERVAL) { - emit_insn (gen_rtx_SET (VOIDmode, r2, + emit_insn (gen_rtx_SET (r2, plus_constant (Pmode, r2, -PROBE_INTERVAL))); emit_stack_probe (r2); } - emit_insn (gen_rtx_SET (VOIDmode, r2, + emit_insn (gen_rtx_SET (r2, plus_constant (Pmode, r2, (i - PROBE_INTERVAL) - size))); emit_stack_probe (r2); @@ -3386,19 +3378,18 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, /* Step 2: compute initial and final value of the loop counter. */ /* TEST_ADDR = SP + FIRST. */ - emit_insn (gen_rtx_SET (VOIDmode, r2, + emit_insn (gen_rtx_SET (r2, gen_rtx_PLUS (Pmode, stack_pointer_rtx, r2))); /* LAST_ADDR = SP + FIRST + ROUNDED_SIZE. */ if (rounded_size > (1 << 21)) { emit_move_insn (r3, GEN_INT (-rounded_size)); - emit_insn (gen_rtx_SET (VOIDmode, r3, gen_rtx_PLUS (Pmode, r2, r3))); + emit_insn (gen_rtx_SET (r3, gen_rtx_PLUS (Pmode, r2, r3))); } else - emit_insn (gen_rtx_SET (VOIDmode, r3, - gen_rtx_PLUS (Pmode, r2, - GEN_INT (-rounded_size)))); + emit_insn (gen_rtx_SET (r3, gen_rtx_PLUS (Pmode, r2, + GEN_INT (-rounded_size)))); /* Step 3: the loop @@ -3421,9 +3412,8 @@ ia64_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size, /* TEMP = SIZE - ROUNDED_SIZE. */ if (size != rounded_size) { - emit_insn (gen_rtx_SET (VOIDmode, r2, - plus_constant (Pmode, r2, - rounded_size - size))); + emit_insn (gen_rtx_SET (r2, plus_constant (Pmode, r2, + rounded_size - size))); emit_stack_probe (r2); } } @@ -3626,8 +3616,7 @@ ia64_expand_prologue (void) { RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_REGISTER, - gen_rtx_SET (VOIDmode, - ar_pfs_save_reg, + gen_rtx_SET (ar_pfs_save_reg, gen_rtx_REG (DImode, AR_PFS_REGNUM))); } } @@ -3669,8 +3658,7 @@ ia64_expand_prologue (void) { RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (DImode, stack_pointer_rtx, frame_size_rtx))); @@ -3817,8 +3805,7 @@ ia64_expand_prologue (void) reg_emitted (reg_save_b0); insn = emit_move_insn (alt_reg, reg); RTX_FRAME_RELATED_P (insn) = 1; - add_reg_note (insn, REG_CFA_REGISTER, - gen_rtx_SET (VOIDmode, alt_reg, pc_rtx)); + add_reg_note (insn, REG_CFA_REGISTER, gen_rtx_SET (alt_reg, pc_rtx)); /* Even if we're not going to generate an epilogue, we still need to save the register so that EH works. */ @@ -4124,8 +4111,7 @@ ia64_expand_epilogue (int sibcall_p) RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (DImode, stack_pointer_rtx, frame_size_rtx))); @@ -11290,7 +11276,7 @@ expand_vselect (rtx target, rtx op0, const unsigned char *perm, unsigned nelt) x = gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (nelt, rperm)); x = gen_rtx_VEC_SELECT (GET_MODE (target), op0, x); - x = gen_rtx_SET (VOIDmode, target, x); + x = gen_rtx_SET (target, x); rtx_insn *insn = emit_insn (x); if (recog_memoized (insn) < 0) @@ -11630,14 +11616,14 @@ expand_vec_perm_v4hi_5 (struct expand_vec_perm_d *d) gcc_assert (ok); x = gen_rtx_AND (V4HImode, mask, t0); - emit_insn (gen_rtx_SET (VOIDmode, t0, x)); + emit_insn (gen_rtx_SET (t0, x)); x = gen_rtx_NOT (V4HImode, mask); x = gen_rtx_AND (V4HImode, x, t1); - emit_insn (gen_rtx_SET (VOIDmode, t1, x)); + emit_insn (gen_rtx_SET (t1, x)); x = gen_rtx_IOR (V4HImode, t0, t1); - emit_insn (gen_rtx_SET (VOIDmode, d->target, x)); + emit_insn (gen_rtx_SET (d->target, x)); return true; } diff --git a/gcc/config/ia64/vect.md b/gcc/config/ia64/vect.md index 48555c6cc5b..9e75e9a8a29 100644 --- a/gcc/config/ia64/vect.md +++ b/gcc/config/ia64/vect.md @@ -425,7 +425,7 @@ x = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (4, const1_rtx, const0_rtx, GEN_INT (3), const2_rtx)); x = gen_rtx_VEC_SELECT (V4HImode, op1h, x); - emit_insn (gen_rtx_SET (VOIDmode, t0, x)); + emit_insn (gen_rtx_SET (t0, x)); /* T1 = DZ.l, CY.l, BX.l, AW.l. */ emit_insn (gen_mulv4hi3 (t1, op1h, op2h)); @@ -1037,7 +1037,7 @@ op2 = force_reg (SImode, op2); x = gen_rtx_VEC_CONCAT (V2SImode, op1, op2); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1273,10 +1273,10 @@ cmp = gen_reg_rtx (V2SFmode); PUT_MODE (operands[3], V2SFmode); - emit_insn (gen_rtx_SET (VOIDmode, cmp, operands[3])); + emit_insn (gen_rtx_SET (cmp, operands[3])); x = gen_rtx_IF_THEN_ELSE (V2SFmode, cmp, operands[1], operands[2]); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c index 86bcaa6b4bc..28f9fc91989 100644 --- a/gcc/config/iq2000/iq2000.c +++ b/gcc/config/iq2000/iq2000.c @@ -1106,7 +1106,7 @@ gen_conditional_branch (rtx operands[], machine_mode mode) label1 = pc_rtx; } - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_fmt_ee (test_code, VOIDmode, @@ -1820,7 +1820,7 @@ iq2000_emit_frame_related_store (rtx mem, rtx reg, HOST_WIDE_INT offset) rtx dwarf_mem = gen_rtx_MEM (GET_MODE (reg), dwarf_address); iq2000_annotate_frame_insn (emit_move_insn (mem, reg), - gen_rtx_SET (GET_MODE (reg), dwarf_mem, reg)); + gen_rtx_SET (dwarf_mem, reg)); } /* Emit instructions to save/restore registers, as determined by STORE_P. */ @@ -2064,7 +2064,7 @@ iq2000_expand_prologue (void) insn = emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, adjustment_rtx)); - dwarf_pattern = gen_rtx_SET (Pmode, stack_pointer_rtx, + dwarf_pattern = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -tsize)); @@ -3305,8 +3305,7 @@ iq2000_legitimize_address (rtx xinsn, rtx old_x ATTRIBUTE_UNUSED, emit_move_insn (int_reg, GEN_INT (INTVAL (xplus1) & ~ 0x7fff)); - emit_insn (gen_rtx_SET (VOIDmode, - ptr_reg, + emit_insn (gen_rtx_SET (ptr_reg, gen_rtx_PLUS (Pmode, xplus0, int_reg))); return plus_constant (Pmode, ptr_reg, INTVAL (xplus1) & 0x7fff); diff --git a/gcc/config/iq2000/iq2000.md b/gcc/config/iq2000/iq2000.md index cf5b5acc3da..d0eee18aa0e 100644 --- a/gcc/config/iq2000/iq2000.md +++ b/gcc/config/iq2000/iq2000.md @@ -695,8 +695,7 @@ rtx tem = ((reload_in_progress | reload_completed) ? operands[0] : gen_reg_rtx (mode)); - emit_insn (gen_rtx_SET (VOIDmode, tem, - gen_rtx_HIGH (mode, operands[1]))); + emit_insn (gen_rtx_SET (tem, gen_rtx_HIGH (mode, operands[1]))); operands[1] = gen_rtx_LO_SUM (mode, tem, operands[1]); } @@ -722,8 +721,7 @@ rtx tem = ((reload_in_progress | reload_completed) ? operands[0] : gen_reg_rtx (SImode)); - emit_insn (gen_rtx_SET (VOIDmode, tem, - gen_rtx_HIGH (SImode, operands[1]))); + emit_insn (gen_rtx_SET (tem, gen_rtx_HIGH (SImode, operands[1]))); operands[1] = gen_rtx_LO_SUM (SImode, tem, operands[1]); } }") diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c index b13329721a4..df58eebb090 100644 --- a/gcc/config/lm32/lm32.c +++ b/gcc/config/lm32/lm32.c @@ -237,9 +237,8 @@ gen_int_relational (enum rtx_code code, /* Generate conditional branch instruction. */ cond = gen_rtx_fmt_ee (code, mode, cmp0, cmp1); label = gen_rtx_LABEL_REF (VOIDmode, destination); - insn = gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_IF_THEN_ELSE (VOIDmode, - cond, label, pc_rtx)); + insn = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, + cond, label, pc_rtx)); emit_jump_insn (insn); } else diff --git a/gcc/config/lm32/lm32.md b/gcc/config/lm32/lm32.md index c35ffd5e6cd..5c87072cb67 100644 --- a/gcc/config/lm32/lm32.md +++ b/gcc/config/lm32/lm32.md @@ -195,8 +195,9 @@ } else if (!flag_pic && reloc_operand (operands[1], GET_MODE (operands[1]))) { - emit_insn (gen_rtx_SET (SImode, operands[0], gen_rtx_HIGH (SImode, operands[1]))); - emit_insn (gen_rtx_SET (SImode, operands[0], gen_rtx_LO_SUM (SImode, operands[0], operands[1]))); + emit_insn (gen_rtx_SET (operands[0], gen_rtx_HIGH (SImode, operands[1]))); + emit_insn (gen_rtx_SET (operands[0], gen_rtx_LO_SUM (SImode, operands[0], + operands[1]))); DONE; } else if (GET_CODE (operands[1]) == CONST_INT) diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c index f4c29f5de80..ad627750100 100644 --- a/gcc/config/m32c/m32c.c +++ b/gcc/config/m32c/m32c.c @@ -1215,8 +1215,7 @@ m32c_pushm_popm (Push_Pop_Type ppt) addr = gen_rtx_PLUS (GET_MODE (addr), addr, GEN_INT (byte_count)); dwarf_set[n_dwarfs++] = - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (mode, addr), + gen_rtx_SET (gen_rtx_MEM (mode, addr), gen_rtx_REG (mode, pushm_info[i].reg1)); F (dwarf_set[n_dwarfs - 1]); @@ -1247,8 +1246,7 @@ m32c_pushm_popm (Push_Pop_Type ppt) if (reg_mask) { XVECEXP (note, 0, 0) - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (GET_MODE (stack_pointer_rtx), stack_pointer_rtx, GEN_INT (-byte_count))); @@ -1885,7 +1883,7 @@ m32c_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, /* reload FB to A_REGS */ rtx temp = gen_reg_rtx (Pmode); x = copy_rtx (x); - emit_insn (gen_rtx_SET (VOIDmode, temp, XEXP (x, 0))); + emit_insn (gen_rtx_SET (temp, XEXP (x, 0))); XEXP (x, 0) = temp; } @@ -3380,7 +3378,7 @@ m32c_prepare_move (rtx * operands, machine_mode mode) rtx dest_reg = XEXP (pmv, 0); rtx dest_mod = XEXP (pmv, 1); - emit_insn (gen_rtx_SET (Pmode, dest_reg, dest_mod)); + emit_insn (gen_rtx_SET (dest_reg, dest_mod)); operands[0] = gen_rtx_MEM (mode, dest_reg); } if (can_create_pseudo_p () && MEM_P (operands[0]) && MEM_P (operands[1])) diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index f9c0493fda8..4c33b93eb18 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -1081,12 +1081,10 @@ gen_split_move_double (rtx operands[]) /* We normally copy the low-numbered register first. However, if the first register operand 0 is the same as the second register of operand 1, we must copy in the opposite order. */ - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, reverse, TRUE, mode), operand_subword (src, reverse, TRUE, mode))); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, !reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, !reverse, TRUE, mode), operand_subword (src, !reverse, TRUE, mode))); } @@ -1095,12 +1093,10 @@ gen_split_move_double (rtx operands[]) { rtx words[2]; split_double (src, &words[0], &words[1]); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 0, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 0, TRUE, mode), words[0])); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, 1, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, 1, TRUE, mode), words[1])); } @@ -1122,13 +1118,11 @@ gen_split_move_double (rtx operands[]) ld r1,r3+; ld r2,r3; addi r3,-4 which saves 2 bytes and doesn't force longword alignment. */ - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, reverse, TRUE, mode), adjust_address (src, SImode, reverse * UNITS_PER_WORD))); - emit_insn (gen_rtx_SET (VOIDmode, - operand_subword (dest, !reverse, TRUE, mode), + emit_insn (gen_rtx_SET (operand_subword (dest, !reverse, TRUE, mode), adjust_address (src, SImode, !reverse * UNITS_PER_WORD))); } @@ -1150,12 +1144,10 @@ gen_split_move_double (rtx operands[]) which saves 2 bytes and doesn't force longword alignment. */ else if (MEM_P (dest) && REG_P (src)) { - emit_insn (gen_rtx_SET (VOIDmode, - adjust_address (dest, SImode, 0), + emit_insn (gen_rtx_SET (adjust_address (dest, SImode, 0), operand_subword (src, 0, TRUE, mode))); - emit_insn (gen_rtx_SET (VOIDmode, - adjust_address (dest, SImode, UNITS_PER_WORD), + emit_insn (gen_rtx_SET (adjust_address (dest, SImode, UNITS_PER_WORD), operand_subword (src, 1, TRUE, mode))); } diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c index fb82105a9a7..87d9ef9307d 100644 --- a/gcc/config/m68k/m68k.c +++ b/gcc/config/m68k/m68k.c @@ -959,7 +959,7 @@ m68k_emit_movem (rtx base, HOST_WIDE_INT offset, (count * GET_MODE_SIZE (mode) * (HOST_WIDE_INT) (store_p ? -1 : 1))); - XVECEXP (body, 0, i++) = gen_rtx_SET (VOIDmode, base, src); + XVECEXP (body, 0, i++) = gen_rtx_SET (base, src); } for (; mask != 0; mask >>= 1, regno++) @@ -969,7 +969,7 @@ m68k_emit_movem (rtx base, HOST_WIDE_INT offset, operands[!store_p] = gen_frame_mem (mode, addr); operands[store_p] = gen_rtx_REG (mode, regno); XVECEXP (body, 0, i++) - = gen_rtx_SET (VOIDmode, operands[0], operands[1]); + = gen_rtx_SET (operands[0], operands[1]); offset += GET_MODE_SIZE (mode); } gcc_assert (i == XVECLEN (body, 0)); @@ -3740,8 +3740,7 @@ emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) } else emit_move_insn (scratch_reg, XEXP (operand1, 0)); - emit_insn (gen_rtx_SET (VOIDmode, operand0, - gen_rtx_MEM (mode, scratch_reg))); + emit_insn (gen_rtx_SET (operand0, gen_rtx_MEM (mode, scratch_reg))); return 1; } else if (fp_reg_operand (operand1, mode) @@ -3774,8 +3773,7 @@ emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) } else emit_move_insn (scratch_reg, XEXP (operand0, 0)); - emit_insn (gen_rtx_SET (VOIDmode, gen_rtx_MEM (mode, scratch_reg), - operand1)); + emit_insn (gen_rtx_SET (gen_rtx_MEM (mode, scratch_reg), operand1)); return 1; } /* Handle secondary reloads for loads of FP registers from constant @@ -3802,11 +3800,10 @@ emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) memory location into scratch_reg. */ xoperands[0] = scratch_reg; xoperands[1] = XEXP (force_const_mem (mode, operand1), 0); - emit_insn (gen_rtx_SET (mode, scratch_reg, xoperands[1])); + emit_insn (gen_rtx_SET (scratch_reg, xoperands[1])); /* Now load the destination register. */ - emit_insn (gen_rtx_SET (mode, operand0, - gen_rtx_MEM (mode, scratch_reg))); + emit_insn (gen_rtx_SET (operand0, gen_rtx_MEM (mode, scratch_reg))); return 1; } @@ -5101,7 +5098,7 @@ m68k_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED, addr = plus_constant (Pmode, tmp, vcall_offset); if (!m68k_legitimate_address_p (Pmode, addr, true)) { - emit_insn (gen_rtx_SET (VOIDmode, tmp, addr)); + emit_insn (gen_rtx_SET (tmp, addr)); addr = tmp; } diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md index 6bb296e9e0d..7f4195a9f2f 100644 --- a/gcc/config/m68k/m68k.md +++ b/gcc/config/m68k/m68k.md @@ -1134,7 +1134,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }) @@ -1148,7 +1148,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }) @@ -1277,7 +1277,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }) @@ -1291,7 +1291,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }) diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c index 868b1ed43f0..e229609ce63 100644 --- a/gcc/config/mcore/mcore.c +++ b/gcc/config/mcore/mcore.c @@ -689,9 +689,7 @@ mcore_gen_compare (enum rtx_code code, rtx op0, rtx op1) break; } - emit_insn (gen_rtx_SET (VOIDmode, - cc_reg, - gen_rtx_fmt_ee (code, CCmode, op0, op1))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_fmt_ee (code, CCmode, op0, op1))); return invert; } @@ -1481,14 +1479,16 @@ mcore_expand_insv (rtx operands[]) if ((INTVAL (operands[3]) & 1) == 0) { mask = ~(1 << posn); - emit_insn (gen_rtx_SET (SImode, operands[0], - gen_rtx_AND (SImode, operands[0], GEN_INT (mask)))); + emit_insn (gen_rtx_SET (operands[0], + gen_rtx_AND (SImode, operands[0], + GEN_INT (mask)))); } else { mask = 1 << posn; - emit_insn (gen_rtx_SET (SImode, operands[0], - gen_rtx_IOR (SImode, operands[0], GEN_INT (mask)))); + emit_insn (gen_rtx_SET (operands[0], + gen_rtx_IOR (SImode, operands[0], + GEN_INT (mask)))); } return 1; @@ -1517,8 +1517,8 @@ mcore_expand_insv (rtx operands[]) && INTVAL (operands[3]) == ((1 << width) - 1)) { mreg = force_reg (SImode, GEN_INT (INTVAL (operands[3]) << posn)); - emit_insn (gen_rtx_SET (SImode, operands[0], - gen_rtx_IOR (SImode, operands[0], mreg))); + emit_insn (gen_rtx_SET (operands[0], + gen_rtx_IOR (SImode, operands[0], mreg))); return 1; } @@ -1526,8 +1526,8 @@ mcore_expand_insv (rtx operands[]) mreg = force_reg (SImode, GEN_INT (~(((1 << width) - 1) << posn))); /* Clear the field, to overlay it later with the source. */ - emit_insn (gen_rtx_SET (SImode, operands[0], - gen_rtx_AND (SImode, operands[0], mreg))); + emit_insn (gen_rtx_SET (operands[0], + gen_rtx_AND (SImode, operands[0], mreg))); /* If the source is constant 0, we've nothing to add back. */ if (GET_CODE (operands[3]) == CONST_INT && INTVAL (operands[3]) == 0) @@ -1546,17 +1546,16 @@ mcore_expand_insv (rtx operands[]) if (width + posn != (int) GET_MODE_SIZE (SImode)) { ereg = force_reg (SImode, GEN_INT ((1 << width) - 1)); - emit_insn (gen_rtx_SET (SImode, sreg, - gen_rtx_AND (SImode, sreg, ereg))); + emit_insn (gen_rtx_SET (sreg, gen_rtx_AND (SImode, sreg, ereg))); } /* Insert source value in dest. */ if (posn != 0) - emit_insn (gen_rtx_SET (SImode, sreg, - gen_rtx_ASHIFT (SImode, sreg, GEN_INT (posn)))); + emit_insn (gen_rtx_SET (sreg, gen_rtx_ASHIFT (SImode, sreg, + GEN_INT (posn)))); - emit_insn (gen_rtx_SET (SImode, operands[0], - gen_rtx_IOR (SImode, operands[0], sreg))); + emit_insn (gen_rtx_SET (operands[0], + gen_rtx_IOR (SImode, operands[0], sreg))); return 1; } @@ -1627,7 +1626,7 @@ block_move_sequence (rtx dst_mem, rtx src_mem, int size, int align) temp[next] = gen_reg_rtx (mode[next]); x = adjust_address (src_mem, mode[next], offset_ld); - emit_insn (gen_rtx_SET (VOIDmode, temp[next], x)); + emit_insn (gen_rtx_SET (temp[next], x)); offset_ld += next_amount; size -= next_amount; @@ -1639,7 +1638,7 @@ block_move_sequence (rtx dst_mem, rtx src_mem, int size, int align) active[phase] = false; x = adjust_address (dst_mem, mode[phase], offset_st); - emit_insn (gen_rtx_SET (VOIDmode, x, temp[phase])); + emit_insn (gen_rtx_SET (x, temp[phase])); offset_st += amount[phase]; } diff --git a/gcc/config/mcore/mcore.md b/gcc/config/mcore/mcore.md index 33ee0fae326..6e7b02590d5 100644 --- a/gcc/config/mcore/mcore.md +++ b/gcc/config/mcore/mcore.md @@ -1145,9 +1145,9 @@ else low = 4, high = 0; - emit_insn (gen_rtx_SET (VOIDmode, gen_rtx_SUBREG (SImode, operands[0], low), + emit_insn (gen_rtx_SET (gen_rtx_SUBREG (SImode, operands[0], low), operands[1])); - emit_insn (gen_rtx_SET (VOIDmode, gen_rtx_SUBREG (SImode, operands[0], high), + emit_insn (gen_rtx_SET (gen_rtx_SUBREG (SImode, operands[0], high), gen_rtx_ASHIFTRT (SImode, gen_rtx_SUBREG (SImode, operands[0], low), GEN_INT (31)))); @@ -1378,8 +1378,7 @@ for (i = 0; i < count; i++) XVECEXP (operands[3], 0, i) - = gen_rtx_SET (VOIDmode, - gen_rtx_REG (SImode, regno + i), + = gen_rtx_SET (gen_rtx_REG (SImode, regno + i), gen_rtx_MEM (SImode, plus_constant (Pmode, stack_pointer_rtx, i * 4))); }") @@ -1417,7 +1416,7 @@ for (i = 0; i < count; i++) XVECEXP (operands[3], 0, i) - = gen_rtx_SET (VOIDmode, + = gen_rtx_SET ( gen_rtx_MEM (SImode, plus_constant (Pmode, stack_pointer_rtx, i * 4)), gen_rtx_REG (SImode, regno + i)); @@ -2336,10 +2335,10 @@ ; rtx lshft = GEN_INT (32 - (INTVAL (operands[2]) + INTVAL (operands[3]))); ; rtx rshft = GEN_INT (32 - INTVAL (operands[2])); ; -; emit_insn (gen_rtx_SET (SImode, operands[0], operands[1])); -; emit_insn (gen_rtx_SET (SImode, operands[0], +; emit_insn (gen_rtx_SET (operands[0], operands[1])); +; emit_insn (gen_rtx_SET (operands[0], ; gen_rtx_ASHIFT (SImode, operands[0], lshft))); -; emit_insn (gen_rtx_SET (SImode, operands[0], +; emit_insn (gen_rtx_SET (operands[0], ; gen_rtx_ASHIFTRT (SImode, operands[0], rshft))); ; DONE; ; } @@ -2371,10 +2370,10 @@ rtx tmp1 = gen_reg_rtx (SImode); rtx tmp2 = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (SImode, tmp1, operands[1])); - emit_insn (gen_rtx_SET (SImode, tmp2, + emit_insn (gen_rtx_SET (tmp1, operands[1])); + emit_insn (gen_rtx_SET (tmp2, gen_rtx_ASHIFT (SImode, tmp1, lshft))); - emit_insn (gen_rtx_SET (SImode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_ASHIFTRT (SImode, tmp2, rshft))); DONE; } @@ -2416,10 +2415,10 @@ { rtx rshft = GEN_INT (INTVAL (operands[3])); shifted = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (SImode, shifted, + emit_insn (gen_rtx_SET (shifted, gen_rtx_LSHIFTRT (SImode, operands[1], rshft))); } - emit_insn (gen_rtx_SET (SImode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_AND (SImode, shifted, mask))); DONE; } @@ -2432,10 +2431,10 @@ rtx tmp1 = gen_reg_rtx (SImode); rtx tmp2 = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (SImode, tmp1, operands[1])); - emit_insn (gen_rtx_SET (SImode, tmp2, + emit_insn (gen_rtx_SET (tmp1, operands[1])); + emit_insn (gen_rtx_SET (tmp2, gen_rtx_ASHIFT (SImode, tmp1, lshft))); - emit_insn (gen_rtx_SET (SImode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_LSHIFTRT (SImode, tmp2, rshft))); DONE; } diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c index 251e69cbe43..fb54f307a8c 100644 --- a/gcc/config/mep/mep.c +++ b/gcc/config/mep/mep.c @@ -1420,7 +1420,7 @@ mep_expand_mov (rtx *operands, machine_mode mode) n = gen_rtx_PLUS (mode, (t == 'b' ? mep_tp_rtx () : mep_gp_rtx ()), n); - n = emit_insn (gen_rtx_SET (mode, operands[0], n)); + n = emit_insn (gen_rtx_SET (operands[0], n)); #if DEBUG_EXPAND_MOV fprintf(stderr, "mep_expand_mov emitting "); debug_rtx(n); @@ -1686,8 +1686,7 @@ mep_expand_setcc_1 (enum rtx_code code, rtx dest, rtx op1, rtx op2) case LT: case LTU: op1 = force_reg (SImode, op1); - emit_insn (gen_rtx_SET (VOIDmode, dest, - gen_rtx_fmt_ee (code, SImode, op1, op2))); + emit_insn (gen_rtx_SET (dest, gen_rtx_fmt_ee (code, SImode, op1, op2))); return true; case EQ: @@ -1716,8 +1715,7 @@ mep_expand_setcc_1 (enum rtx_code code, rtx dest, rtx op1, rtx op2) op2 = gen_reg_rtx (SImode); mep_expand_setcc_1 (LTU, op2, op1, const1_rtx); - emit_insn (gen_rtx_SET (VOIDmode, dest, - gen_rtx_XOR (SImode, op2, const1_rtx))); + emit_insn (gen_rtx_SET (dest, gen_rtx_XOR (SImode, op2, const1_rtx))); return true; case LE: @@ -2629,8 +2627,7 @@ add_constant (int dest, int src, int value, int mark_frame) { RTX_FRAME_RELATED_P(insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (SImode, - gen_rtx_REG (SImode, dest), + gen_rtx_SET (gen_rtx_REG (SImode, dest), gen_rtx_PLUS (SImode, gen_rtx_REG (SImode, dest), GEN_INT (value)))); @@ -2790,8 +2787,7 @@ mep_expand_prologue (void) RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - copy_rtx (mem), + gen_rtx_SET (copy_rtx (mem), gen_rtx_REG (rmode, i))); mem = gen_rtx_MEM (SImode, plus_constant (Pmode, stack_pointer_rtx, @@ -2812,8 +2808,7 @@ mep_expand_prologue (void) RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - copy_rtx (mem), + gen_rtx_SET (copy_rtx (mem), gen_rtx_REG (rmode, i))); } } diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c index 372be5d8742..55be2d11674 100644 --- a/gcc/config/microblaze/microblaze.c +++ b/gcc/config/microblaze/microblaze.c @@ -592,7 +592,7 @@ load_tls_operand (rtx x, rtx reg) tmp = gen_rtx_CONST (Pmode, x); - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_PLUS (Pmode, pic_offset_table_rtx, tmp))); return reg; @@ -1023,8 +1023,7 @@ microblaze_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, emit_move_insn (int_reg, GEN_INT (INTVAL (xplus1) & ~0x7fff)); - emit_insn (gen_rtx_SET (VOIDmode, - ptr_reg, + emit_insn (gen_rtx_SET (ptr_reg, gen_rtx_PLUS (Pmode, xplus0, int_reg))); result = gen_rtx_PLUS (Pmode, ptr_reg, diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index bf69850edf2..16ed5f0f31a 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -2825,8 +2825,7 @@ mips_emit_move_or_split (rtx dest, rtx src, enum mips_split_type split_type) static void mips_emit_unary (enum rtx_code code, rtx target, rtx op0) { - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_fmt_e (code, GET_MODE (op0), op0))); + emit_insn (gen_rtx_SET (target, gen_rtx_fmt_e (code, GET_MODE (op0), op0))); } /* Compute (CODE OP0) and store the result in a new register of mode MODE. @@ -2847,8 +2846,8 @@ mips_force_unary (machine_mode mode, enum rtx_code code, rtx op0) void mips_emit_binary (enum rtx_code code, rtx target, rtx op0, rtx op1) { - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_fmt_ee (code, GET_MODE (target), op0, op1))); + emit_insn (gen_rtx_SET (target, gen_rtx_fmt_ee (code, GET_MODE (target), + op0, op1))); } /* Compute (CODE OP0 OP1) and store the result in a new register @@ -3228,8 +3227,8 @@ mips_call_tls_get_addr (rtx sym, enum mips_symbol_type type, rtx v0) start_sequence (); - emit_insn (gen_rtx_SET (Pmode, a0, - gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, loc))); + emit_insn (gen_rtx_SET (a0, gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, + loc))); insn = mips_expand_call (MIPS_CALL_NORMAL, v0, mips_tls_symbol, const0_rtx, NULL_RTX, false); RTL_CONST_CALL_P (insn) = 1; @@ -3432,7 +3431,7 @@ mips_move_integer (rtx temp, rtx dest, unsigned HOST_WIDE_INT value) { if (!can_create_pseudo_p ()) { - emit_insn (gen_rtx_SET (VOIDmode, temp, x)); + emit_insn (gen_rtx_SET (temp, x)); x = temp; } else @@ -3440,7 +3439,7 @@ mips_move_integer (rtx temp, rtx dest, unsigned HOST_WIDE_INT value) x = gen_rtx_fmt_ee (codes[i].code, mode, x, GEN_INT (codes[i].value)); } - emit_insn (gen_rtx_SET (VOIDmode, dest, x)); + emit_insn (gen_rtx_SET (dest, x)); } /* Subroutine of mips_legitimize_move. Move constant SRC into register @@ -3462,7 +3461,7 @@ mips_legitimize_const_move (machine_mode mode, rtx dest, rtx src) /* Split moves of symbolic constants into high/low pairs. */ if (mips_split_symbol (dest, src, MAX_MACHINE_MODE, &src)) { - emit_insn (gen_rtx_SET (VOIDmode, dest, src)); + emit_insn (gen_rtx_SET (dest, src)); return; } @@ -5220,20 +5219,19 @@ mips_expand_conditional_move (rtx *operands) rtx temp = gen_reg_rtx (mode); rtx temp2 = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, + emit_insn (gen_rtx_SET (temp, gen_rtx_IF_THEN_ELSE (mode, cond, operands[2], const0_rtx))); /* Flip the test for the second operand. */ cond = gen_rtx_fmt_ee ((code == EQ) ? NE : EQ, GET_MODE (op0), op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, temp2, + emit_insn (gen_rtx_SET (temp2, gen_rtx_IF_THEN_ELSE (mode, cond, operands[3], const0_rtx))); /* Merge the two results, at least one is guaranteed to be zero. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], - gen_rtx_IOR (mode, temp, temp2))); + emit_insn (gen_rtx_SET (operands[0], gen_rtx_IOR (mode, temp, temp2))); } else { @@ -5243,7 +5241,7 @@ mips_expand_conditional_move (rtx *operands) operands[3] = force_reg (GET_MODE (operands[0]), operands[3]); } - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_IF_THEN_ELSE (GET_MODE (operands[0]), cond, operands[2], operands[3]))); } @@ -6603,7 +6601,7 @@ mips_load_call_address (enum mips_call_type type, rtx dest, rtx addr) && mips_ok_for_lazy_binding_p (addr)) { addr = mips_got_load (dest, addr, SYMBOL_GOTOFF_CALL); - emit_insn (gen_rtx_SET (VOIDmode, dest, addr)); + emit_insn (gen_rtx_SET (dest, addr)); return true; } else @@ -7773,8 +7771,7 @@ mips_expand_atomic_qihi (union mips_gen_fn_ptrs generator, /* Compute the equivalent exclusive mask. */ inverted_mask = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, inverted_mask, - gen_rtx_NOT (SImode, mask))); + emit_insn (gen_rtx_SET (inverted_mask, gen_rtx_NOT (SImode, mask))); /* Shift the old value into place. */ if (oldval != const0_rtx) @@ -9364,7 +9361,7 @@ mips_frame_set (rtx mem, rtx reg) { rtx set; - set = gen_rtx_SET (VOIDmode, mem, reg); + set = gen_rtx_SET (mem, reg); RTX_FRAME_RELATED_P (set) = 1; return set; @@ -9572,10 +9569,10 @@ mips16e_save_restore_reg (bool restore_p, bool reg_parm_p, if (restore_p) { mips_add_cfa_restore (reg); - return gen_rtx_SET (VOIDmode, reg, mem); + return gen_rtx_SET (reg, mem); } if (reg_parm_p) - return gen_rtx_SET (VOIDmode, mem, reg); + return gen_rtx_SET (mem, reg); return mips_frame_set (mem, reg); } @@ -9625,7 +9622,7 @@ mips16e_build_save_restore (bool restore_p, unsigned int *mask_ptr, n = 0; /* Add the stack pointer adjustment. */ - set = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + set = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, restore_p ? size : -size)); RTX_FRAME_RELATED_P (set) = 1; @@ -10890,7 +10887,7 @@ umips_build_save_restore (mips_save_restore_fn fn, set = mips_frame_set (mem, reg); else { - set = gen_rtx_SET (VOIDmode, reg, mem); + set = gen_rtx_SET (reg, mem); mips_add_cfa_restore (reg); } XVECEXP (pattern, 0, j) = set; @@ -10907,7 +10904,7 @@ umips_build_save_restore (mips_save_restore_fn fn, set = mips_frame_set (mem, reg); else { - set = gen_rtx_SET (VOIDmode, reg, mem); + set = gen_rtx_SET (reg, mem); mips_add_cfa_restore (reg); } XVECEXP (pattern, 0, j) = set; @@ -11318,20 +11315,18 @@ mips_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) /* Step 2: compute initial and final value of the loop counter. */ /* TEST_ADDR = SP + FIRST. */ - emit_insn (gen_rtx_SET (VOIDmode, r3, - plus_constant (Pmode, stack_pointer_rtx, - -first))); + emit_insn (gen_rtx_SET (r3, plus_constant (Pmode, stack_pointer_rtx, + -first))); /* LAST_ADDR = SP + FIRST + ROUNDED_SIZE. */ if (rounded_size > 32768) { emit_move_insn (r12, GEN_INT (rounded_size)); - emit_insn (gen_rtx_SET (VOIDmode, r12, - gen_rtx_MINUS (Pmode, r3, r12))); + emit_insn (gen_rtx_SET (r12, gen_rtx_MINUS (Pmode, r3, r12))); } else - emit_insn (gen_rtx_SET (VOIDmode, r12, - plus_constant (Pmode, r3, -rounded_size))); + emit_insn (gen_rtx_SET (r12, plus_constant (Pmode, r3, + -rounded_size))); /* Step 3: the loop @@ -11618,7 +11613,7 @@ mips_expand_prologue (void) /* Describe the combined effect of the previous instructions. */ mips_set_frame_expr - (gen_rtx_SET (VOIDmode, stack_pointer_rtx, + (gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -size))); } mips_frame_barrier (); @@ -11649,7 +11644,7 @@ mips_expand_prologue (void) hard_frame_pointer_rtx, MIPS_PROLOGUE_TEMP (Pmode))); mips_set_frame_expr - (gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + (gen_rtx_SET (hard_frame_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset))); } } @@ -16777,10 +16772,9 @@ mips16_load_branch_target (rtx dest, rtx src) mips_emit_move (dest, pic_offset_table_rtx); page = mips_unspec_address (src, SYMBOL_GOTOFF_PAGE); low = mips_unspec_address (src, SYMBOL_GOT_PAGE_OFST); - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, PMODE_INSN (gen_unspec_got, (dest, page)))); - emit_insn (gen_rtx_SET (VOIDmode, dest, - gen_rtx_LO_SUM (Pmode, dest, low))); + emit_insn (gen_rtx_SET (dest, gen_rtx_LO_SUM (Pmode, dest, low))); } else { @@ -18644,7 +18638,7 @@ mips_expand_vselect (rtx target, rtx op0, x = gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (nelt, rperm)); x = gen_rtx_VEC_SELECT (GET_MODE (target), op0, x); - x = gen_rtx_SET (VOIDmode, target, x); + x = gen_rtx_SET (target, x); insn = emit_insn (x); if (recog_memoized (insn) < 0) @@ -18765,14 +18759,14 @@ mips_expand_vpc_loongson_pshufh (struct expand_vec_perm_d *d) merge = force_reg (V4HImode, merge); x = gen_rtx_AND (V4HImode, merge, t1); - emit_insn (gen_rtx_SET (VOIDmode, t1, x)); + emit_insn (gen_rtx_SET (t1, x)); x = gen_rtx_NOT (V4HImode, merge); x = gen_rtx_AND (V4HImode, x, t0); - emit_insn (gen_rtx_SET (VOIDmode, t0, x)); + emit_insn (gen_rtx_SET (t0, x)); x = gen_rtx_IOR (V4HImode, t0, t1); - emit_insn (gen_rtx_SET (VOIDmode, d->target, x)); + emit_insn (gen_rtx_SET (d->target, x)); } return true; @@ -19154,7 +19148,7 @@ mips_expand_vector_init (rtx target, rtx vals) rtx op0 = force_reg (imode, XVECEXP (vals, 0, 0)); rtx op1 = force_reg (imode, XVECEXP (vals, 0, 1)); x = gen_rtx_VEC_CONCAT (vmode, op0, op1); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); return; } @@ -19266,14 +19260,14 @@ mips_expand_vec_minmax (rtx target, rtx op0, rtx op1, emit_insn (cmp (tc, op0, op1)); x = gen_rtx_AND (vmode, tc, (min_p ? op1 : op0)); - emit_insn (gen_rtx_SET (VOIDmode, t0, x)); + emit_insn (gen_rtx_SET (t0, x)); x = gen_rtx_NOT (vmode, tc); x = gen_rtx_AND (vmode, x, (min_p ? op0 : op1)); - emit_insn (gen_rtx_SET (VOIDmode, t1, x)); + emit_insn (gen_rtx_SET (t1, x)); x = gen_rtx_IOR (vmode, t0, t1); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); } /* Implement HARD_REGNO_CALLER_SAVE_MODE. */ diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index ed4c0ba65f8..76f210877cc 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -3877,8 +3877,8 @@ emit_jump_insn (gen_cbranchdf4 (test, operands[1], reg1, label1)); emit_insn (gen_fix_truncdfsi2 (operands[0], operands[1])); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_LABEL_REF (VOIDmode, label2))); + emit_jump_insn (gen_rtx_SET (pc_rtx, + gen_rtx_LABEL_REF (VOIDmode, label2))); emit_barrier (); emit_label (label1); @@ -3921,8 +3921,7 @@ emit_jump_insn (gen_cbranchdf4 (test, operands[1], reg1, label1)); emit_insn (gen_fix_truncdfdi2 (operands[0], operands[1])); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_LABEL_REF (VOIDmode, label2))); + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, label2))); emit_barrier (); emit_label (label1); @@ -3964,8 +3963,7 @@ emit_jump_insn (gen_cbranchsf4 (test, operands[1], reg1, label1)); emit_insn (gen_fix_truncsfsi2 (operands[0], operands[1])); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_LABEL_REF (VOIDmode, label2))); + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, label2))); emit_barrier (); emit_label (label1); @@ -4007,8 +4005,7 @@ emit_jump_insn (gen_cbranchsf4 (test, operands[1], reg1, label1)); emit_insn (gen_fix_truncsfdi2 (operands[0], operands[1])); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_LABEL_REF (VOIDmode, label2))); + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, label2))); emit_barrier (); emit_label (label1); diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c index 23364005fbe..faedd4331d7 100644 --- a/gcc/config/mmix/mmix.c +++ b/gcc/config/mmix/mmix.c @@ -2102,8 +2102,7 @@ mmix_expand_prologue (void) tmpreg); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (DImode, + gen_rtx_SET (gen_rtx_MEM (DImode, plus_constant (Pmode, stack_pointer_rtx, offset)), diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c index 58c97e8cf7d..0c51269eba5 100644 --- a/gcc/config/mn10300/mn10300.c +++ b/gcc/config/mn10300/mn10300.c @@ -748,7 +748,7 @@ mn10300_gen_multiple_store (unsigned int mask) ++count; x = plus_constant (Pmode, stack_pointer_rtx, count * -4); x = gen_frame_mem (SImode, x); - x = gen_rtx_SET (VOIDmode, x, gen_rtx_REG (SImode, regno)); + x = gen_rtx_SET (x, gen_rtx_REG (SImode, regno)); elts[count] = F(x); /* Remove the register from the mask so that... */ @@ -761,7 +761,7 @@ mn10300_gen_multiple_store (unsigned int mask) /* Create the instruction that updates the stack pointer. */ x = plus_constant (Pmode, stack_pointer_rtx, count * -4); - x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x); + x = gen_rtx_SET (stack_pointer_rtx, x); elts[0] = F(x); /* We need one PARALLEL element to update the stack pointer and @@ -2904,12 +2904,12 @@ mn10300_split_cbranch (machine_mode cmp_mode, rtx cmp_op, rtx label_ref) flags = gen_rtx_REG (cmp_mode, CC_REG); x = gen_rtx_COMPARE (cmp_mode, XEXP (cmp_op, 0), XEXP (cmp_op, 1)); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (GET_CODE (cmp_op), VOIDmode, flags, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, label_ref, pc_rtx); - x = gen_rtx_SET (VOIDmode, pc_rtx, x); + x = gen_rtx_SET (pc_rtx, x); emit_jump_insn (x); } diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index 3658dfcc89a..19564274644 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -1984,13 +1984,15 @@ msp430_expand_prologue (void) p = emit_insn (gen_grow_and_swap ()); /* Document the stack decrement... */ - note = F (gen_rtx_SET (Pmode, stack_pointer_rtx, + note = F (gen_rtx_SET (stack_pointer_rtx, gen_rtx_MINUS (Pmode, stack_pointer_rtx, GEN_INT (2)))); add_reg_note (p, REG_FRAME_RELATED_EXPR, note); /* ...and the establishment of a new location for the return address. */ - note = F (gen_rtx_SET (Pmode, gen_rtx_MEM (Pmode, - gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (-2))), + note = F (gen_rtx_SET (gen_rtx_MEM (Pmode, + gen_rtx_PLUS (Pmode, + stack_pointer_rtx, + GEN_INT (-2))), pc_rtx)); add_reg_note (p, REG_CFA_OFFSET, note); F (p); @@ -2015,11 +2017,10 @@ msp430_expand_prologue (void) note = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (count + 1)); XVECEXP (note, 0, 0) - = F (gen_rtx_SET (VOIDmode, - stack_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (count * (TARGET_LARGE ? -4 : -2))))); + = F (gen_rtx_SET (stack_pointer_rtx, + gen_rtx_PLUS (Pmode, + stack_pointer_rtx, + GEN_INT (count * (TARGET_LARGE ? -4 : -2))))); /* *sp-- = R[i-j] */ /* sp+N R10 @@ -2036,8 +2037,7 @@ msp430_expand_prologue (void) addr = stack_pointer_rtx; XVECEXP (note, 0, j + 1) = - F (gen_rtx_SET (VOIDmode, - gen_rtx_MEM (Pmode, addr), + F (gen_rtx_SET (gen_rtx_MEM (Pmode, addr), gen_rtx_REG (Pmode, i - j)) ); } diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c index 2f333371d78..9dc52f20de0 100644 --- a/gcc/config/nds32/nds32-memory-manipulation.c +++ b/gcc/config/nds32/nds32-memory-manipulation.c @@ -108,7 +108,7 @@ nds32_expand_load_multiple (int base_regno, int count, new_addr, offset); reg = gen_rtx_REG (SImode, base_regno + par_index); - XVECEXP (result, 0, par_index) = gen_rtx_SET (VOIDmode, reg, mem); + XVECEXP (result, 0, par_index) = gen_rtx_SET (reg, mem); } return result; @@ -136,7 +136,7 @@ nds32_expand_store_multiple (int base_regno, int count, new_addr, offset); reg = gen_rtx_REG (SImode, base_regno + par_index); - XVECEXP (result, 0, par_index) = gen_rtx_SET (VOIDmode, mem, reg); + XVECEXP (result, 0, par_index) = gen_rtx_SET (mem, reg); } return result; diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c index b79e33e873a..e617bbf26b5 100644 --- a/gcc/config/nds32/nds32.c +++ b/gcc/config/nds32/nds32.c @@ -470,7 +470,7 @@ nds32_emit_stack_push_multiple (rtx Rb, rtx Re, rtx En4, bool vaarg_p) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -484,7 +484,7 @@ nds32_emit_stack_push_multiple (rtx Rb, rtx Re, rtx En4, bool vaarg_p) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -496,7 +496,7 @@ nds32_emit_stack_push_multiple (rtx Rb, rtx Re, rtx En4, bool vaarg_p) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -508,7 +508,7 @@ nds32_emit_stack_push_multiple (rtx Rb, rtx Re, rtx En4, bool vaarg_p) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -520,8 +520,7 @@ nds32_emit_stack_push_multiple (rtx Rb, rtx Re, rtx En4, bool vaarg_p) /* We need to re-calculate the offset value again for adjustment. */ offset = -(num_use_regs * 4); adjust_sp_rtx - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset)); XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; RTX_FRAME_RELATED_P (adjust_sp_rtx) = 1; @@ -624,7 +623,7 @@ nds32_emit_stack_pop_multiple (rtx Rb, rtx Re, rtx En4) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -640,7 +639,7 @@ nds32_emit_stack_pop_multiple (rtx Rb, rtx Re, rtx En4) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -654,7 +653,7 @@ nds32_emit_stack_pop_multiple (rtx Rb, rtx Re, rtx En4) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -668,7 +667,7 @@ nds32_emit_stack_pop_multiple (rtx Rb, rtx Re, rtx En4) mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -681,8 +680,7 @@ nds32_emit_stack_pop_multiple (rtx Rb, rtx Re, rtx En4) /* The offset value is already in place. No need to re-calculate it. */ adjust_sp_rtx - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset)); XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; @@ -766,7 +764,7 @@ nds32_emit_stack_v3push (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -778,7 +776,7 @@ nds32_emit_stack_v3push (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -788,7 +786,7 @@ nds32_emit_stack_v3push (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -798,7 +796,7 @@ nds32_emit_stack_v3push (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - push_rtx = gen_rtx_SET (VOIDmode, mem, reg); + push_rtx = gen_rtx_SET (mem, reg); XVECEXP (parallel_insn, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; @@ -809,8 +807,7 @@ nds32_emit_stack_v3push (rtx Rb, /* We need to re-calculate the offset value again for adjustment. */ offset = -(num_use_regs * 4); adjust_sp_rtx - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset - INTVAL (imm8u))); @@ -892,7 +889,7 @@ nds32_emit_stack_v3pop (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -906,7 +903,7 @@ nds32_emit_stack_v3pop (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -918,7 +915,7 @@ nds32_emit_stack_v3pop (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -930,7 +927,7 @@ nds32_emit_stack_v3pop (rtx Rb, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, offset)); - pop_rtx = gen_rtx_SET (VOIDmode, reg, mem); + pop_rtx = gen_rtx_SET (reg, mem); XVECEXP (parallel_insn, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; @@ -941,8 +938,7 @@ nds32_emit_stack_v3pop (rtx Rb, /* The offset value is already in place. No need to re-calculate it. */ adjust_sp_rtx - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset + INTVAL (imm8u))); @@ -1019,7 +1015,7 @@ nds32_force_addi_stack_int (int full_value) rtx set_rtx; plus_rtx = plus_constant (Pmode, stack_pointer_rtx, full_value); - set_rtx = gen_rtx_SET (VOIDmode, stack_pointer_rtx, plus_rtx); + set_rtx = gen_rtx_SET (stack_pointer_rtx, plus_rtx); add_reg_note (sp_adjust_insn, REG_FRAME_RELATED_EXPR, set_rtx); RTX_FRAME_RELATED_P (sp_adjust_insn) = 1; diff --git a/gcc/config/nds32/nds32.md b/gcc/config/nds32/nds32.md index 64823a13a47..487127b9a8a 100644 --- a/gcc/config/nds32/nds32.md +++ b/gcc/config/nds32/nds32.md @@ -889,9 +889,8 @@ } else /* This emit_insn will create corresponding 'slt/slts' insturction. */ - emit_insn (gen_rtx_SET (VOIDmode, tmp, - gen_rtx_fmt_ee (new_code, SImode, - cmp_op0, cmp_op1))); + emit_insn (gen_rtx_SET (tmp, gen_rtx_fmt_ee (new_code, SImode, + cmp_op0, cmp_op1))); /* Change comparison semantic into (eq X 0) or (ne X 0) behavior so that cmovz or cmovn will be matched later. diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c index 848cc513537..d83c393ed60 100644 --- a/gcc/config/nios2/nios2.c +++ b/gcc/config/nios2/nios2.c @@ -566,7 +566,7 @@ nios2_expand_prologue (void) if (sp_offset) { rtx sp_adjust - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, sp_offset)); if (SMALL_INT (sp_offset)) insn = emit_insn (sp_adjust); @@ -632,7 +632,7 @@ nios2_expand_epilogue (bool sibcall_p) emit_move_insn (tmp, gen_int_mode (cfun->machine->save_regs_offset, Pmode)); insn = emit_insn (gen_add2_insn (stack_pointer_rtx, tmp)); - cfa_adj = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + cfa_adj = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, cfun->machine->save_regs_offset)); add_reg_note (insn, REG_CFA_ADJUST_CFA, cfa_adj); @@ -659,7 +659,7 @@ nios2_expand_epilogue (bool sibcall_p) { insn = emit_insn (gen_add2_insn (stack_pointer_rtx, gen_int_mode (sp_adjust, Pmode))); - cfa_adj = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + cfa_adj = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, sp_adjust)); add_reg_note (insn, REG_CFA_ADJUST_CFA, cfa_adj); @@ -1978,7 +1978,7 @@ nios2_adjust_call_address (rtx *call_op, rtx reg) if (!reg) reg = gen_reg_rtx (Pmode); addr = nios2_load_pic_address (addr, UNSPEC_PIC_CALL_SYM, tmp); - emit_insn (gen_rtx_SET (VOIDmode, reg, addr)); + emit_insn (gen_rtx_SET (reg, addr)); *call_op = reg; } } @@ -2711,7 +2711,7 @@ nios2_expand_custom_builtin (tree exp, unsigned int index, rtx target) unspec_args[argno] = const0_rtx; insn = (has_target_p - ? gen_rtx_SET (VOIDmode, target, + ? gen_rtx_SET (target, gen_rtx_UNSPEC_VOLATILE (tmode, gen_rtvec_v (3, unspec_args), UNSPECV_CUSTOM_XNXX)) diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 53922bc8e85..a434bde73a3 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -842,7 +842,7 @@ nvptx_expand_call (rtx retval, rtx address) { if (!nvptx_register_operand (retval, GET_MODE (retval))) tmp_retval = gen_reg_rtx (GET_MODE (retval)); - t = gen_rtx_SET (VOIDmode, tmp_retval, t); + t = gen_rtx_SET (tmp_retval, t); } XVECEXP (pat, 0, 0) = t; if (!REG_P (callee) @@ -1061,7 +1061,7 @@ nvptx_expand_compare (rtx compare) rtx pred = gen_reg_rtx (BImode); rtx cmp = gen_rtx_fmt_ee (GET_CODE (compare), BImode, XEXP (compare, 0), XEXP (compare, 1)); - emit_insn (gen_rtx_SET (VOIDmode, pred, cmp)); + emit_insn (gen_rtx_SET (pred, cmp)); return gen_rtx_NE (BImode, pred, const0_rtx); } @@ -1101,9 +1101,8 @@ nvptx_maybe_convert_symbolic_operand (rtx orig_op) : as == ADDR_SPACE_CONST ? UNSPEC_FROM_CONST : UNSPEC_FROM_PARAM); rtx dest = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, dest, - gen_rtx_UNSPEC (Pmode, gen_rtvec (1, orig_op), - code))); + emit_insn (gen_rtx_SET (dest, gen_rtx_UNSPEC (Pmode, gen_rtvec (1, orig_op), + code))); return dest; } @@ -1956,7 +1955,7 @@ nvptx_reorg (void) else code = TRUNCATE; - rtx pat = gen_rtx_SET (VOIDmode, new_reg, + rtx pat = gen_rtx_SET (new_reg, gen_rtx_fmt_e (code, outer_mode, inner)); emit_insn_before (pat, insn); } @@ -1970,7 +1969,7 @@ nvptx_reorg (void) else code = ZERO_EXTEND; - rtx pat = gen_rtx_SET (VOIDmode, inner, + rtx pat = gen_rtx_SET (inner, gen_rtx_fmt_e (code, inner_mode, new_reg)); emit_insn_after (pat, insn); } diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index d5b0c5081a8..42ead8fed95 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -806,7 +806,7 @@ legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) So instead we just emit the raw set, which avoids the movXX expanders completely. */ mark_reg_pointer (reg, BITS_PER_UNIT); - insn = emit_insn (gen_rtx_SET (VOIDmode, reg, orig)); + insn = emit_insn (gen_rtx_SET (reg, orig)); /* Put a REG_EQUAL note on this insn, so that it can be optimized. */ add_reg_note (insn, REG_EQUAL, orig); @@ -1699,7 +1699,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) } else emit_move_insn (scratch_reg, XEXP (operand1, 0)); - emit_insn (gen_rtx_SET (VOIDmode, operand0, + emit_insn (gen_rtx_SET (operand0, replace_equiv_address (operand1, scratch_reg))); return 1; } @@ -1735,8 +1735,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) } else emit_move_insn (scratch_reg, XEXP (operand0, 0)); - emit_insn (gen_rtx_SET (VOIDmode, - replace_equiv_address (operand0, scratch_reg), + emit_insn (gen_rtx_SET (replace_equiv_address (operand0, scratch_reg), operand1)); return 1; } @@ -1753,7 +1752,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) if (operand1 == CONST0_RTX (mode)) { - emit_insn (gen_rtx_SET (VOIDmode, operand0, operand1)); + emit_insn (gen_rtx_SET (operand0, operand1)); return 1; } @@ -1770,7 +1769,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) pa_emit_move_sequence (xoperands, Pmode, 0); /* Now load the destination register. */ - emit_insn (gen_rtx_SET (mode, operand0, + emit_insn (gen_rtx_SET (operand0, replace_equiv_address (const_mem, scratch_reg))); return 1; } @@ -1892,7 +1891,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) } } - emit_insn (gen_rtx_SET (VOIDmode, operand0, operand1)); + emit_insn (gen_rtx_SET (operand0, operand1)); return 1; } } @@ -1903,14 +1902,14 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) { rtx temp = gen_reg_rtx (DFmode); - emit_insn (gen_rtx_SET (VOIDmode, temp, operand1)); - emit_insn (gen_rtx_SET (VOIDmode, operand0, temp)); + emit_insn (gen_rtx_SET (temp, operand1)); + emit_insn (gen_rtx_SET (operand0, temp)); return 1; } if (register_operand (operand1, mode) || operand1 == CONST0_RTX (mode)) { /* Run this case quickly. */ - emit_insn (gen_rtx_SET (VOIDmode, operand0, operand1)); + emit_insn (gen_rtx_SET (operand0, operand1)); return 1; } if (! (reload_in_progress || reload_completed)) @@ -2077,15 +2076,12 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) mark_reg_pointer (temp, BITS_PER_UNIT); if (ishighonly) - set = gen_rtx_SET (mode, operand0, temp); + set = gen_rtx_SET (operand0, temp); else - set = gen_rtx_SET (VOIDmode, - operand0, + set = gen_rtx_SET (operand0, gen_rtx_LO_SUM (mode, temp, operand1)); - emit_insn (gen_rtx_SET (VOIDmode, - temp, - gen_rtx_HIGH (mode, operand1))); + emit_insn (gen_rtx_SET (temp, gen_rtx_HIGH (mode, operand1))); emit_insn (set); } @@ -2181,13 +2177,12 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) low = value - high; - emit_insn (gen_rtx_SET (VOIDmode, temp, GEN_INT (high))); + emit_insn (gen_rtx_SET (temp, GEN_INT (high))); operands[1] = gen_rtx_PLUS (mode, temp, GEN_INT (low)); } else { - emit_insn (gen_rtx_SET (VOIDmode, temp, - gen_rtx_HIGH (mode, operand1))); + emit_insn (gen_rtx_SET (temp, gen_rtx_HIGH (mode, operand1))); operands[1] = gen_rtx_LO_SUM (mode, temp, operand1); } @@ -2209,7 +2204,7 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg) { operand1 = GEN_INT (insv); - emit_insn (gen_rtx_SET (VOIDmode, temp, + emit_insn (gen_rtx_SET (temp, gen_rtx_HIGH (mode, operand1))); emit_move_insn (temp, gen_rtx_LO_SUM (mode, temp, operand1)); if (mode == DImode) @@ -3560,7 +3555,7 @@ store_reg (int reg, HOST_WIDE_INT disp, int base) if (DO_FRAME_NOTES) { add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, tmpreg, + gen_rtx_SET (tmpreg, gen_rtx_PLUS (Pmode, basereg, delta))); RTX_FRAME_RELATED_P (insn) = 1; } @@ -3578,8 +3573,7 @@ store_reg (int reg, HOST_WIDE_INT disp, int base) insn = emit_move_insn (dest, src); if (DO_FRAME_NOTES) add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (word_mode, + gen_rtx_SET (gen_rtx_MEM (word_mode, gen_rtx_PLUS (word_mode, basereg, delta)), @@ -3646,7 +3640,7 @@ set_reg_plus_d (int reg, int base, HOST_WIDE_INT disp, int note) gen_rtx_PLUS (Pmode, tmpreg, basereg)); if (DO_FRAME_NOTES) add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, tmpreg, + gen_rtx_SET (tmpreg, gen_rtx_PLUS (Pmode, basereg, delta))); } else @@ -4078,7 +4072,7 @@ pa_expand_prologue (void) plus_constant (Pmode, base, offset)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, reg)); + gen_rtx_SET (mem, reg)); } else { @@ -4090,8 +4084,8 @@ pa_expand_prologue (void) offset + 4)); rtx regl = gen_rtx_REG (SFmode, i); rtx regr = gen_rtx_REG (SFmode, i + 1); - rtx setl = gen_rtx_SET (VOIDmode, meml, regl); - rtx setr = gen_rtx_SET (VOIDmode, memr, regr); + rtx setl = gen_rtx_SET (meml, regl); + rtx setr = gen_rtx_SET (memr, regr); rtvec vec; RTX_FRAME_RELATED_P (setl) = 1; @@ -4673,10 +4667,10 @@ pa_emit_bcond_fp (rtx operands[]) rtx operand1 = operands[2]; rtx label = operands[3]; - emit_insn (gen_rtx_SET (VOIDmode, gen_rtx_REG (CCFPmode, 0), + emit_insn (gen_rtx_SET (gen_rtx_REG (CCFPmode, 0), gen_rtx_fmt_ee (code, CCFPmode, operand0, operand1))); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_fmt_ee (NE, VOIDmode, @@ -5768,7 +5762,7 @@ pa_emit_hpdiv_const (rtx *operands, int unsignedp) emit (gen_rtx_PARALLEL (VOIDmode, - gen_rtvec (6, gen_rtx_SET (VOIDmode, gen_rtx_REG (SImode, 29), + gen_rtvec (6, gen_rtx_SET (gen_rtx_REG (SImode, 29), gen_rtx_fmt_ee (unsignedp ? UDIV : DIV, SImode, gen_rtx_REG (SImode, 26), diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md index 2fd2059fafe..0e9b2f6feee 100644 --- a/gcc/config/pa/pa.md +++ b/gcc/config/pa/pa.md @@ -2163,7 +2163,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -2180,7 +2180,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -2197,7 +2197,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -2879,7 +2879,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -2896,7 +2896,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -3039,7 +3039,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -3056,7 +3056,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -3341,7 +3341,7 @@ operands[7] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[7], addr)); + emit_insn (gen_rtx_SET (operands[7], addr)); operands[0] = replace_equiv_address (operands[0], operands[7]); } @@ -3350,7 +3350,7 @@ operands[8] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[8], addr)); + emit_insn (gen_rtx_SET (operands[8], addr)); operands[1] = replace_equiv_address (operands[1], operands[8]); } }") @@ -3529,7 +3529,7 @@ operands[7] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[7], addr)); + emit_insn (gen_rtx_SET (operands[7], addr)); operands[0] = replace_equiv_address (operands[0], operands[7]); } @@ -3538,7 +3538,7 @@ operands[8] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[8], addr)); + emit_insn (gen_rtx_SET (operands[8], addr)); operands[1] = replace_equiv_address (operands[1], operands[8]); } }") @@ -3655,7 +3655,7 @@ operands[4] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[4], addr)); + emit_insn (gen_rtx_SET (operands[4], addr)); operands[0] = replace_equiv_address (operands[0], operands[4]); } }") @@ -3769,7 +3769,7 @@ operands[4] = addr; else { - emit_insn (gen_rtx_SET (VOIDmode, operands[4], addr)); + emit_insn (gen_rtx_SET (operands[4], addr)); operands[0] = replace_equiv_address (operands[0], operands[4]); } }") @@ -3810,7 +3810,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -3827,7 +3827,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -3844,7 +3844,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4083,7 +4083,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4100,7 +4100,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4117,7 +4117,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4361,7 +4361,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4378,7 +4378,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -4395,7 +4395,7 @@ DONE; /* We don't want the clobber emitted, so handle this ourselves. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); DONE; }") @@ -5161,7 +5161,7 @@ } else if (pa_cint_ok_for_move (-intval)) { - emit_insn (gen_rtx_SET (VOIDmode, operands[4], GEN_INT (-intval))); + emit_insn (gen_rtx_SET (operands[4], GEN_INT (-intval))); emit_insn (gen_subsi3 (operands[0], operands[1], operands[4])); DONE; } diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c index 48318931404..0e4c2278974 100644 --- a/gcc/config/rl78/rl78.c +++ b/gcc/config/rl78/rl78.c @@ -1367,8 +1367,8 @@ rl78_expand_prologue (void) emit_insn (gen_subhi3 (ax, ax, GEN_INT (fs))); insn = F (emit_move_insn (sp, ax)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (SImode, sp, - gen_rtx_PLUS (HImode, sp, GEN_INT (-fs)))); + gen_rtx_SET (sp, gen_rtx_PLUS (HImode, sp, + GEN_INT (-fs)))); } else { diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md index f7684026b27..deca396bcec 100644 --- a/gcc/config/rs6000/altivec.md +++ b/gcc/config/rs6000/altivec.md @@ -262,7 +262,7 @@ RTVEC_ELT (v, i) = constm1_rtx; emit_insn (gen_vec_initv4si (dest, gen_rtx_PARALLEL (mode, v))); - emit_insn (gen_rtx_SET (VOIDmode, dest, gen_rtx_ASHIFT (mode, dest, dest))); + emit_insn (gen_rtx_SET (dest, gen_rtx_ASHIFT (mode, dest, dest))); DONE; }) @@ -887,7 +887,7 @@ } x = gen_rtx_VEC_SELECT (V16QImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -947,7 +947,7 @@ } x = gen_rtx_VEC_SELECT (V8HImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1001,7 +1001,7 @@ } x = gen_rtx_VEC_SELECT (V4SImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1076,7 +1076,7 @@ } x = gen_rtx_VEC_SELECT (V16QImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1136,7 +1136,7 @@ } x = gen_rtx_VEC_SELECT (V8HImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1190,7 +1190,7 @@ } x = gen_rtx_VEC_SELECT (V4SImode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1700,7 +1700,7 @@ v = gen_rtvec (1, operands[2]); x = gen_rtx_VEC_SELECT (QImode, operands[1], gen_rtx_PARALLEL (VOIDmode, v)); x = gen_rtx_VEC_DUPLICATE (V16QImode, x); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1748,7 +1748,7 @@ v = gen_rtvec (1, operands[2]); x = gen_rtx_VEC_SELECT (HImode, operands[1], gen_rtx_PARALLEL (VOIDmode, v)); x = gen_rtx_VEC_DUPLICATE (V8HImode, x); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1796,7 +1796,7 @@ v = gen_rtvec (1, operands[2]); x = gen_rtx_VEC_SELECT (SImode, operands[1], gen_rtx_PARALLEL (VOIDmode, v)); x = gen_rtx_VEC_DUPLICATE (V4SImode, x); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -1844,7 +1844,7 @@ v = gen_rtvec (1, operands[2]); x = gen_rtx_VEC_SELECT (SFmode, operands[1], gen_rtx_PARALLEL (VOIDmode, v)); x = gen_rtx_VEC_DUPLICATE (V4SFmode, x); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -2318,7 +2318,7 @@ constv = force_reg (V16QImode, constv); vperm = gen_rtx_UNSPEC (V16QImode, gen_rtvec (3, mask, mask, constv), UNSPEC_VPERM); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], vperm)); + emit_insn (gen_rtx_SET (operands[0], vperm)); } DONE; }) @@ -2350,7 +2350,7 @@ constv = force_reg (V16QImode, constv); vperm = gen_rtx_UNSPEC (V16QImode, gen_rtvec (3, mask, mask, constv), UNSPEC_VPERM); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], vperm)); + emit_insn (gen_rtx_SET (operands[0], vperm)); } DONE; }) @@ -2376,8 +2376,7 @@ addr = XEXP (operands[1], 0); temp = gen_reg_rtx (GET_MODE (addr)); - emit_insn (gen_rtx_SET (VOIDmode, temp, - gen_rtx_NEG (GET_MODE (addr), addr))); + emit_insn (gen_rtx_SET (temp, gen_rtx_NEG (GET_MODE (addr), addr))); emit_insn (gen_altivec_lvsr (operands[0], replace_equiv_address (operands[1], temp))); DONE; diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index c74c7d14b87..7c59ac85bf8 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -5780,14 +5780,13 @@ rs6000_expand_vector_init (rtx target, rtx vals) if ((int_vector_p || TARGET_VSX) && all_const_zero) { /* Zero register. */ - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_XOR (mode, target, target))); + emit_insn (gen_rtx_SET (target, gen_rtx_XOR (mode, target, target))); return; } else if (int_vector_p && easy_vector_constant (const_vec, mode)) { /* Splat immediate. */ - emit_insn (gen_rtx_SET (VOIDmode, target, const_vec)); + emit_insn (gen_rtx_SET (target, const_vec)); return; } else @@ -5872,14 +5871,12 @@ rs6000_expand_vector_init (rtx target, rtx vals) gen_rtvec (1, const0_rtx), UNSPEC_LVE); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, - target, mem), + gen_rtx_SET (target, mem), x))); x = gen_rtx_VEC_SELECT (inner_mode, target, gen_rtx_PARALLEL (VOIDmode, gen_rtvec (1, const0_rtx))); - emit_insn (gen_rtx_SET (VOIDmode, target, - gen_rtx_VEC_DUPLICATE (mode, x))); + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_DUPLICATE (mode, x))); return; } @@ -5943,8 +5940,7 @@ rs6000_expand_vector_set (rtx target, rtx val, int elt) gen_rtvec (1, const0_rtx), UNSPEC_LVE); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, - reg, mem), + gen_rtx_SET (reg, mem), x))); /* Linear sequence. */ @@ -5973,14 +5969,14 @@ rs6000_expand_vector_set (rtx target, rtx val, int elt) ? gen_rtx_IOR (V16QImode, notx, notx) : gen_rtx_AND (V16QImode, notx, notx)); rtx tmp = gen_reg_rtx (V16QImode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, iorx)); + emit_insn (gen_rtx_SET (tmp, iorx)); /* Permute with operands reversed and adjusted selector. */ x = gen_rtx_UNSPEC (mode, gen_rtvec (3, reg, target, tmp), UNSPEC_VPERM); } - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); } /* Extract field ELT from VEC into TARGET. */ @@ -6380,7 +6376,7 @@ quad_load_store_p (rtx op0, rtx op1) { fprintf (stderr, "\n========== quad_load_store, return %s\n", ret ? "true" : "false"); - debug_rtx (gen_rtx_SET (VOIDmode, op0, op1)); + debug_rtx (gen_rtx_SET (op0, op1)); } return ret; @@ -7293,10 +7289,10 @@ rs6000_legitimize_tls_address_aix (rtx addr, enum tls_model model) set_mem_alias_set (modmem, get_TOC_alias_set ()); rtx modreg = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, modreg, modmem)); + emit_insn (gen_rtx_SET (modreg, modmem)); tmpreg = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, tmpreg, mem)); + emit_insn (gen_rtx_SET (tmpreg, mem)); dest = gen_reg_rtx (Pmode); if (TARGET_32BIT) @@ -7316,7 +7312,7 @@ rs6000_legitimize_tls_address_aix (rtx addr, enum tls_model model) /* Load the TOC value into temporary register. */ tmpreg = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, tmpreg, mem)); + emit_insn (gen_rtx_SET (tmpreg, mem)); set_unique_reg_note (get_last_insn (), REG_EQUAL, gen_rtx_MINUS (Pmode, addr, tlsreg)); @@ -7493,8 +7489,7 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model) else insn = gen_tls_got_dtprel_32 (tmp2, got, addr); emit_insn (insn); - insn = gen_rtx_SET (Pmode, dest, - gen_rtx_PLUS (Pmode, tmp2, tmp1)); + insn = gen_rtx_SET (dest, gen_rtx_PLUS (Pmode, tmp2, tmp1)); } emit_insn (insn); } @@ -8145,15 +8140,15 @@ rs6000_emit_set_const (rtx dest, rtx source) { case QImode: case HImode: - emit_insn (gen_rtx_SET (VOIDmode, dest, source)); + emit_insn (gen_rtx_SET (dest, source)); return true; case SImode: temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (temp), + emit_insn (gen_rtx_SET (copy_rtx (temp), GEN_INT (c & ~(HOST_WIDE_INT) 0xffff))); - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, gen_rtx_IOR (SImode, copy_rtx (temp), GEN_INT (c & 0xffff)))); break; @@ -8377,8 +8372,8 @@ rs6000_emit_le_vsx_load (rtx dest, rtx source, machine_mode mode) tmp = can_create_pseudo_p () ? gen_reg_rtx_and_attrs (dest) : dest; permute_mem = rs6000_gen_le_vsx_permute (source, mode); permute_reg = rs6000_gen_le_vsx_permute (tmp, mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, permute_mem)); - emit_insn (gen_rtx_SET (VOIDmode, dest, permute_reg)); + emit_insn (gen_rtx_SET (tmp, permute_mem)); + emit_insn (gen_rtx_SET (dest, permute_reg)); } /* Emit a little-endian store to vector memory location DEST from VSX @@ -8406,8 +8401,8 @@ rs6000_emit_le_vsx_store (rtx dest, rtx source, machine_mode mode) tmp = can_create_pseudo_p () ? gen_reg_rtx_and_attrs (source) : source; permute_src = rs6000_gen_le_vsx_permute (source, mode); permute_tmp = rs6000_gen_le_vsx_permute (tmp, mode); - emit_insn (gen_rtx_SET (VOIDmode, tmp, permute_src)); - emit_insn (gen_rtx_SET (VOIDmode, dest, permute_tmp)); + emit_insn (gen_rtx_SET (tmp, permute_src)); + emit_insn (gen_rtx_SET (dest, permute_tmp)); } /* Emit a sequence representing a little-endian VSX load or store, @@ -8761,7 +8756,7 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) || GET_CODE (operands[1]) == CONST) && small_data_operand (operands[1], mode)) { - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); return; } @@ -8813,8 +8808,7 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) operands[1] = rs6000_machopic_legitimize_pic_address ( operands[1], mode, operands[0]); if (operands[0] != operands[1]) - emit_insn (gen_rtx_SET (VOIDmode, - operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); return; } #endif @@ -8860,7 +8854,7 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) rs6000_machopic_legitimize_pic_address (operands[1], mode, operands[0]); if (operands[0] != operands[1]) - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); return; } #endif @@ -8913,7 +8907,7 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) break; default: - fatal_insn ("bad move", gen_rtx_SET (VOIDmode, dest, source)); + fatal_insn ("bad move", gen_rtx_SET (dest, source)); } /* Above, we may have called force_const_mem which may have returned @@ -8923,7 +8917,7 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) operands[1] = validize_mem (operands[1]); emit_set: - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[1])); + emit_insn (gen_rtx_SET (operands[0], operands[1])); } /* Return true if a structure, union or array containing FIELD should be @@ -11201,8 +11195,7 @@ setup_incoming_varargs (cumulative_args_t cum, machine_mode mode, * UNITS_PER_FP_WORD); emit_jump_insn - (gen_rtx_SET (VOIDmode, - pc_rtx, + (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_NE (VOIDmode, cr1, const0_rtx), @@ -12428,7 +12421,7 @@ void altivec_expand_lvx_be (rtx op0, rtx op1, machine_mode mode, unsigned unspec) { rtx tmp = gen_reg_rtx (mode); - rtx load = gen_rtx_SET (VOIDmode, tmp, op1); + rtx load = gen_rtx_SET (tmp, op1); rtx lvx = gen_rtx_UNSPEC (mode, gen_rtvec (1, const0_rtx), unspec); rtx par = gen_rtx_PARALLEL (mode, gen_rtvec (2, load, lvx)); rtx sel = swap_selector_for_mode (mode); @@ -12436,7 +12429,7 @@ altivec_expand_lvx_be (rtx op0, rtx op1, machine_mode mode, unsigned unspec) gcc_assert (REG_P (op0)); emit_insn (par); - emit_insn (gen_rtx_SET (VOIDmode, op0, vperm)); + emit_insn (gen_rtx_SET (op0, vperm)); } /* Generate code for a "stvx" or "stvxl" built-in for a little endian target @@ -12446,7 +12439,7 @@ void altivec_expand_stvx_be (rtx op0, rtx op1, machine_mode mode, unsigned unspec) { rtx tmp = gen_reg_rtx (mode); - rtx store = gen_rtx_SET (VOIDmode, op0, tmp); + rtx store = gen_rtx_SET (op0, tmp); rtx stvx = gen_rtx_UNSPEC (mode, gen_rtvec (1, const0_rtx), unspec); rtx par = gen_rtx_PARALLEL (mode, gen_rtvec (2, store, stvx)); rtx sel = swap_selector_for_mode (mode); @@ -12454,7 +12447,7 @@ altivec_expand_stvx_be (rtx op0, rtx op1, machine_mode mode, unsigned unspec) gcc_assert (REG_P (op1)); vperm = gen_rtx_UNSPEC (mode, gen_rtvec (3, op1, op1, sel), UNSPEC_VPERM); - emit_insn (gen_rtx_SET (VOIDmode, tmp, vperm)); + emit_insn (gen_rtx_SET (tmp, vperm)); emit_insn (par); } @@ -12471,8 +12464,8 @@ altivec_expand_stvex_be (rtx op0, rtx op1, machine_mode mode, unsigned unspec) gcc_assert (REG_P (op1)); vperm = gen_rtx_UNSPEC (mode, gen_rtvec (3, op1, op1, sel), UNSPEC_VPERM); - emit_insn (gen_rtx_SET (VOIDmode, tmp, vperm)); - emit_insn (gen_rtx_SET (VOIDmode, op0, stvx)); + emit_insn (gen_rtx_SET (tmp, vperm)); + emit_insn (gen_rtx_SET (op0, stvx)); } static rtx @@ -12845,10 +12838,10 @@ htm_expand_builtin (tree exp, rtx target, bool * expandedp) to start a transaction. We do this by placing the 1's complement of CR's EQ bit into TARGET. */ rtx scratch = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, scratch, + emit_insn (gen_rtx_SET (scratch, gen_rtx_EQ (SImode, cr, const0_rtx))); - emit_insn (gen_rtx_SET (VOIDmode, target, + emit_insn (gen_rtx_SET (target, gen_rtx_XOR (SImode, scratch, GEN_INT (1)))); } @@ -14222,8 +14215,7 @@ rs6000_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, { /* For the load case need to negate the address. */ op = gen_reg_rtx (GET_MODE (addr)); - emit_insn (gen_rtx_SET (VOIDmode, op, - gen_rtx_NEG (GET_MODE (addr), addr))); + emit_insn (gen_rtx_SET (op, gen_rtx_NEG (GET_MODE (addr), addr))); } op = gen_rtx_MEM (mode, op); @@ -17411,9 +17403,9 @@ rs6000_secondary_reload_trace (int line, rtx reg, rtx mem, rtx scratch, store_p ? "store" : "load"); if (store_p) - set = gen_rtx_SET (VOIDmode, mem, reg); + set = gen_rtx_SET (mem, reg); else - set = gen_rtx_SET (VOIDmode, reg, mem); + set = gen_rtx_SET (reg, mem); clobber = gen_rtx_CLOBBER (VOIDmode, scratch); debug_rtx (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, clobber))); @@ -17505,7 +17497,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) if ((addr_mask & RELOAD_REG_PRE_MODIFY) == 0) { - emit_insn (gen_rtx_SET (VOIDmode, op0, op1)); + emit_insn (gen_rtx_SET (op0, op1)); new_addr = reg; } break; @@ -17522,7 +17514,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) else if (GET_CODE (op1) == PLUS) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, op1)); + emit_insn (gen_rtx_SET (scratch, op1)); op_reg = scratch; } @@ -17531,7 +17523,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) and_op = gen_rtx_AND (GET_MODE (scratch), op_reg, op1); cc_clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (CCmode)); - rv = gen_rtvec (2, gen_rtx_SET (VOIDmode, scratch, and_op), cc_clobber); + rv = gen_rtvec (2, gen_rtx_SET (scratch, and_op), cc_clobber); emit_insn (gen_rtx_PARALLEL (VOIDmode, rv)); new_addr = scratch; } @@ -17542,7 +17534,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) case SUBREG: if (!base_reg_operand (addr, GET_MODE (addr))) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, addr)); + emit_insn (gen_rtx_SET (scratch, addr)); new_addr = scratch; } break; @@ -17559,7 +17551,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) { if ((addr_mask & RELOAD_REG_INDEXED) == 0) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, addr)); + emit_insn (gen_rtx_SET (scratch, addr)); new_addr = scratch; } } @@ -17569,7 +17561,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) { if ((addr_mask & RELOAD_REG_OFFSET) == 0) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, addr)); + emit_insn (gen_rtx_SET (scratch, addr)); new_addr = scratch; } } @@ -17589,7 +17581,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) { if ((addr_mask & RELOAD_REG_INDEXED) == 0) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, addr)); + emit_insn (gen_rtx_SET (scratch, addr)); new_addr = scratch; } } @@ -17599,7 +17591,7 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) { if ((addr_mask & RELOAD_REG_OFFSET) == 0) { - emit_insn (gen_rtx_SET (VOIDmode, scratch, addr)); + emit_insn (gen_rtx_SET (scratch, addr)); new_addr = scratch; } } @@ -17630,9 +17622,9 @@ rs6000_secondary_reload_inner (rtx reg, rtx mem, rtx scratch, bool store_p) /* Now create the move. */ if (store_p) - emit_insn (gen_rtx_SET (VOIDmode, mem, reg)); + emit_insn (gen_rtx_SET (mem, reg)); else - emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + emit_insn (gen_rtx_SET (reg, mem)); return; } @@ -17681,9 +17673,9 @@ rs6000_secondary_reload_gpr (rtx reg, rtx mem, rtx scratch, bool store_p) /* Now create the move. */ if (store_p) - emit_insn (gen_rtx_SET (VOIDmode, mem, reg)); + emit_insn (gen_rtx_SET (mem, reg)); else - emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); + emit_insn (gen_rtx_SET (reg, mem)); return; } @@ -18248,7 +18240,7 @@ rs6000_output_move_128bit (rtx operands[]) if (TARGET_DEBUG_ADDR) { fprintf (stderr, "\n===== Bad 128 bit move:\n"); - debug_rtx (gen_rtx_SET (VOIDmode, dest, src)); + debug_rtx (gen_rtx_SET (dest, src)); } gcc_unreachable (); @@ -19561,8 +19553,7 @@ rs6000_generate_compare (rtx cmp, machine_mode mode) && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128) emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (10, - gen_rtx_SET (VOIDmode, - compare_result, + gen_rtx_SET (compare_result, gen_rtx_COMPARE (comp_mode, op0, op1)), gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (DFmode)), gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (DFmode)), @@ -19585,7 +19576,7 @@ rs6000_generate_compare (rtx cmp, machine_mode mode) emit_insn (gen_stack_protect_testsi (compare_result, op0, op1b)); } else - emit_insn (gen_rtx_SET (VOIDmode, compare_result, + emit_insn (gen_rtx_SET (compare_result, gen_rtx_COMPARE (comp_mode, op0, op1))); } @@ -19619,7 +19610,7 @@ rs6000_generate_compare (rtx cmp, machine_mode mode) compare2_rtx = gen_rtx_COMPARE (CCEQmode, gen_rtx_IOR (SImode, or1_rtx, or2_rtx), const_true_rtx); - emit_insn (gen_rtx_SET (VOIDmode, or_result, compare2_rtx)); + emit_insn (gen_rtx_SET (or_result, compare2_rtx)); compare_result = or_result; code = EQ; @@ -19652,9 +19643,9 @@ rs6000_emit_eqne (machine_mode mode, rtx op1, rtx op2, rtx scratch) scratch = gen_reg_rtx (mode); if (logical_operand (op2, mode)) - emit_insn (gen_rtx_SET (VOIDmode, scratch, gen_rtx_XOR (mode, op1, op2))); + emit_insn (gen_rtx_SET (scratch, gen_rtx_XOR (mode, op1, op2))); else - emit_insn (gen_rtx_SET (VOIDmode, scratch, + emit_insn (gen_rtx_SET (scratch, gen_rtx_PLUS (mode, op1, negate_rtx (mode, op2)))); return scratch; @@ -19702,7 +19693,7 @@ rs6000_emit_sCOND (machine_mode mode, rtx operands[]) rev_cond_rtx = gen_rtx_fmt_ee (rs6000_reverse_condition (cc_mode, cond_code), SImode, XEXP (condition_rtx, 0), const0_rtx); not_op = gen_rtx_COMPARE (CCEQmode, rev_cond_rtx, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, not_result, not_op)); + emit_insn (gen_rtx_SET (not_result, not_op)); condition_rtx = gen_rtx_EQ (VOIDmode, not_result, const0_rtx); } @@ -19718,7 +19709,7 @@ rs6000_emit_sCOND (machine_mode mode, rtx operands[]) else { PUT_MODE (condition_rtx, SImode); - emit_insn (gen_rtx_SET (VOIDmode, result, condition_rtx)); + emit_insn (gen_rtx_SET (result, condition_rtx)); } } @@ -19731,7 +19722,7 @@ rs6000_emit_cbranch (machine_mode mode, rtx operands[]) condition_rtx = rs6000_generate_compare (operands[0], mode); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands[3]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, condition_rtx, loc_ref, pc_rtx))); } @@ -19915,9 +19906,7 @@ rs6000_emit_vector_compare_inner (enum rtx_code code, rtx op0, rtx op1) case UNEQ: case LTGT: mask = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, - mask, - gen_rtx_fmt_ee (code, mode, op0, op1))); + emit_insn (gen_rtx_SET (mask, gen_rtx_fmt_ee (code, mode, op0, op1))); return mask; } @@ -20119,8 +20108,7 @@ rs6000_emit_vector_cond_expr (rtx dest, rtx op_true, rtx op_false, cond2 = gen_rtx_fmt_ee (NE, cc_mode, gen_lowpart (dest_mode, mask), CONST0_RTX (dest_mode)); - emit_insn (gen_rtx_SET (VOIDmode, - dest, + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (dest_mode, cond2, op_true, @@ -20222,8 +20210,7 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) if (! is_against_zero) { temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, - gen_rtx_MINUS (compare_mode, op0, op1))); + emit_insn (gen_rtx_SET (temp, gen_rtx_MINUS (compare_mode, op0, op1))); op0 = temp; op1 = CONST0_RTX (compare_mode); } @@ -20257,19 +20244,19 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) case LE: temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, gen_rtx_NEG (compare_mode, op0))); + emit_insn (gen_rtx_SET (temp, gen_rtx_NEG (compare_mode, op0))); op0 = temp; break; case ORDERED: temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, gen_rtx_ABS (compare_mode, op0))); + emit_insn (gen_rtx_SET (temp, gen_rtx_ABS (compare_mode, op0))); op0 = temp; break; case EQ: temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, + emit_insn (gen_rtx_SET (temp, gen_rtx_NEG (compare_mode, gen_rtx_ABS (compare_mode, op0)))); op0 = temp; @@ -20278,7 +20265,7 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) case UNGE: /* a UNGE 0 <-> (a GE 0 || -a UNLT 0) */ temp = gen_reg_rtx (result_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, + emit_insn (gen_rtx_SET (temp, gen_rtx_IF_THEN_ELSE (result_mode, gen_rtx_GE (VOIDmode, op0, op1), @@ -20287,14 +20274,14 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) true_cond = temp; temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, gen_rtx_NEG (compare_mode, op0))); + emit_insn (gen_rtx_SET (temp, gen_rtx_NEG (compare_mode, op0))); op0 = temp; break; case GT: /* a GT 0 <-> (a GE 0 && -a UNLT 0) */ temp = gen_reg_rtx (result_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, + emit_insn (gen_rtx_SET (temp, gen_rtx_IF_THEN_ELSE (result_mode, gen_rtx_GE (VOIDmode, op0, op1), @@ -20303,7 +20290,7 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) false_cond = temp; temp = gen_reg_rtx (compare_mode); - emit_insn (gen_rtx_SET (VOIDmode, temp, gen_rtx_NEG (compare_mode, op0))); + emit_insn (gen_rtx_SET (temp, gen_rtx_NEG (compare_mode, op0))); op0 = temp; break; @@ -20311,7 +20298,7 @@ rs6000_emit_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond) gcc_unreachable (); } - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (result_mode, gen_rtx_GE (VOIDmode, op0, op1), @@ -20399,9 +20386,7 @@ rs6000_emit_minmax (rtx dest, enum rtx_code code, rtx op0, rtx op1) && (VECTOR_UNIT_ALTIVEC_OR_VSX_P (mode) || (mode == SFmode && VECTOR_UNIT_VSX_P (DFmode)))) { - emit_insn (gen_rtx_SET (VOIDmode, - dest, - gen_rtx_fmt_ee (code, mode, op0, op1))); + emit_insn (gen_rtx_SET (dest, gen_rtx_fmt_ee (code, mode, op0, op1))); return; } @@ -20431,7 +20416,7 @@ emit_unlikely_jump (rtx cond, rtx label) rtx x; x = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, label, pc_rtx); - x = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, x)); + x = emit_jump_insn (gen_rtx_SET (pc_rtx, x)); add_int_reg_note (x, REG_BR_PROB, very_unlikely); } @@ -20615,10 +20600,9 @@ rs6000_mask_atomic_subword (rtx oldval, rtx newval, rtx mask) rtx x; x = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (VOIDmode, x, - gen_rtx_AND (SImode, - gen_rtx_NOT (SImode, mask), - oldval))); + emit_insn (gen_rtx_SET (x, gen_rtx_AND (SImode, + gen_rtx_NOT (SImode, mask), + oldval))); x = expand_simple_binop (SImode, IOR, newval, x, x, 1, OPTAB_LIB_WIDEN); @@ -20725,7 +20709,7 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[]) x = gen_rtx_COMPARE (CCmode, or_result, const0_rtx); } - emit_insn (gen_rtx_SET (VOIDmode, cond, x)); + emit_insn (gen_rtx_SET (cond, x)); x = gen_rtx_NE (VOIDmode, cond, const0_rtx); emit_unlikely_jump (x, label2); @@ -20757,7 +20741,7 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[]) /* In all cases, CR0 contains EQ on success, and NE on failure. */ x = gen_rtx_EQ (SImode, cond, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, boolval, x)); + emit_insn (gen_rtx_SET (boolval, x)); } /* Expand an atomic exchange operation. */ @@ -20869,7 +20853,7 @@ rs6000_expand_atomic_op (enum rtx_code code, rtx mem, rtx val, set, that will be sufficient to not affect other bits. */ x = gen_rtx_NOT (SImode, mask); x = gen_rtx_IOR (SImode, x, val); - emit_insn (gen_rtx_SET (VOIDmode, val, x)); + emit_insn (gen_rtx_SET (val, x)); mask = NULL; break; @@ -21017,7 +21001,7 @@ rs6000_split_multireg_move (rtx dst, rtx src) p_dst = simplify_gen_subreg (reg_mode, dst, mode, i * reg_mode_size); - emit_insn (gen_rtx_SET (VOIDmode, p_dst, p_src)); + emit_insn (gen_rtx_SET (p_dst, p_src)); } return; @@ -21029,8 +21013,7 @@ rs6000_split_multireg_move (rtx dst, rtx src) overlap. */ int i; for (i = nregs - 1; i >= 0; i--) - emit_insn (gen_rtx_SET (VOIDmode, - simplify_gen_subreg (reg_mode, dst, mode, + emit_insn (gen_rtx_SET (simplify_gen_subreg (reg_mode, dst, mode, i * reg_mode_size), simplify_gen_subreg (reg_mode, src, mode, i * reg_mode_size))); @@ -21065,19 +21048,20 @@ rs6000_split_multireg_move (rtx dst, rtx src) if (TARGET_UPDATE) { rtx ndst = simplify_gen_subreg (reg_mode, dst, mode, 0); - emit_insn (gen_rtx_SET (VOIDmode, ndst, - gen_rtx_MEM (reg_mode, XEXP (src, 0)))); + emit_insn (gen_rtx_SET (ndst, + gen_rtx_MEM (reg_mode, + XEXP (src, 0)))); used_update = true; } else - emit_insn (gen_rtx_SET (VOIDmode, basereg, - XEXP (XEXP (src, 0), 1))); + emit_insn (gen_rtx_SET (basereg, + XEXP (XEXP (src, 0), 1))); src = replace_equiv_address (src, basereg); } else { rtx basereg = gen_rtx_REG (Pmode, reg); - emit_insn (gen_rtx_SET (VOIDmode, basereg, XEXP (src, 0))); + emit_insn (gen_rtx_SET (basereg, XEXP (src, 0))); src = replace_equiv_address (src, basereg); } } @@ -21132,13 +21116,14 @@ rs6000_split_multireg_move (rtx dst, rtx src) if (TARGET_UPDATE) { rtx nsrc = simplify_gen_subreg (reg_mode, src, mode, 0); - emit_insn (gen_rtx_SET (VOIDmode, - gen_rtx_MEM (reg_mode, XEXP (dst, 0)), nsrc)); + emit_insn (gen_rtx_SET (gen_rtx_MEM (reg_mode, + XEXP (dst, 0)), + nsrc)); used_update = true; } else - emit_insn (gen_rtx_SET (VOIDmode, basereg, - XEXP (XEXP (dst, 0), 1))); + emit_insn (gen_rtx_SET (basereg, + XEXP (XEXP (dst, 0), 1))); dst = replace_equiv_address (dst, basereg); } else @@ -21176,8 +21161,7 @@ rs6000_split_multireg_move (rtx dst, rtx src) if (j == 0 && used_update) continue; - emit_insn (gen_rtx_SET (VOIDmode, - simplify_gen_subreg (reg_mode, dst, mode, + emit_insn (gen_rtx_SET (simplify_gen_subreg (reg_mode, dst, mode, j * reg_mode_size), simplify_gen_subreg (reg_mode, src, mode, j * reg_mode_size))); @@ -22620,7 +22604,7 @@ rs6000_emit_stack_tie (rtx fp, bool hard_frame_needed) while (--i >= 0) { rtx mem = gen_frame_mem (BLKmode, regs[i]); - RTVEC_ELT (p, i) = gen_rtx_SET (VOIDmode, mem, const0_rtx); + RTVEC_ELT (p, i) = gen_rtx_SET (mem, const0_rtx); } emit_insn (gen_stack_tie (gen_rtx_PARALLEL (VOIDmode, p))); @@ -22712,9 +22696,8 @@ rs6000_emit_allocate_stack (HOST_WIDE_INT size, rtx copy_reg, int copy_off) RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_reg, - gen_rtx_PLUS (Pmode, stack_reg, - GEN_INT (-size)))); + gen_rtx_SET (stack_reg, gen_rtx_PLUS (Pmode, stack_reg, + GEN_INT (-size)))); } #define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP) @@ -22768,20 +22751,18 @@ rs6000_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) /* Step 2: compute initial and final value of the loop counter. */ /* TEST_ADDR = SP + FIRST. */ - emit_insn (gen_rtx_SET (VOIDmode, r12, - plus_constant (Pmode, stack_pointer_rtx, - -first))); + emit_insn (gen_rtx_SET (r12, plus_constant (Pmode, stack_pointer_rtx, + -first))); /* LAST_ADDR = SP + FIRST + ROUNDED_SIZE. */ if (rounded_size > 32768) { emit_move_insn (r0, GEN_INT (-rounded_size)); - emit_insn (gen_rtx_SET (VOIDmode, r0, - gen_rtx_PLUS (Pmode, r12, r0))); + emit_insn (gen_rtx_SET (r0, gen_rtx_PLUS (Pmode, r12, r0))); } else - emit_insn (gen_rtx_SET (VOIDmode, r0, - plus_constant (Pmode, r12, -rounded_size))); + emit_insn (gen_rtx_SET (r0, plus_constant (Pmode, r12, + -rounded_size))); /* Step 3: the loop @@ -22971,8 +22952,7 @@ generate_set_vrsave (rtx reg, rs6000_stack_t *info, int epiloguep) rtx vrsave = gen_rtx_REG (SImode, VRSAVE_REGNO); clobs[0] - = gen_rtx_SET (VOIDmode, - vrsave, + = gen_rtx_SET (vrsave, gen_rtx_UNSPEC_VOLATILE (SImode, gen_rtvec (2, reg, vrsave), UNSPECV_SET_VRSAVE)); @@ -23004,8 +22984,7 @@ generate_set_vrsave (rtx reg, rs6000_stack_t *info, int epiloguep) rtx reg = gen_rtx_REG (V4SImode, i); clobs[nclobs++] - = gen_rtx_SET (VOIDmode, - reg, + = gen_rtx_SET (reg, gen_rtx_UNSPEC (V4SImode, gen_rtvec (1, reg), 27)); } @@ -23026,7 +23005,7 @@ gen_frame_set (rtx reg, rtx frame_reg, int offset, bool store) addr = gen_rtx_PLUS (Pmode, frame_reg, GEN_INT (offset)); mem = gen_frame_mem (GET_MODE (reg), addr); - return gen_rtx_SET (VOIDmode, store ? mem : reg, store ? reg : mem); + return gen_rtx_SET (store ? mem : reg, store ? reg : mem); } static rtx @@ -23426,7 +23405,7 @@ rs6000_emit_move_from_cr (rtx reg) RTVEC_ELT (r, 0) = gen_rtx_REG (CCmode, CR0_REGNO + cr_reg[0]); RTVEC_ELT (r, 1) = GEN_INT (1 << (7 - cr_reg[0])); RTVEC_ELT (p, 0) - = gen_rtx_SET (VOIDmode, reg, + = gen_rtx_SET (reg, gen_rtx_UNSPEC (SImode, r, UNSPEC_MOVESI_FROM_CR)); emit_insn (gen_rtx_PARALLEL (VOIDmode, p)); @@ -23636,7 +23615,7 @@ rs6000_emit_prologue (void) /* Explain what happens to the stack pointer. */ { rtx newval = gen_rtx_PLUS (Pmode, sp_reg_rtx, treg); - RTVEC_ELT (p, j++) = gen_rtx_SET (VOIDmode, sp_reg_rtx, newval); + RTVEC_ELT (p, j++) = gen_rtx_SET (sp_reg_rtx, newval); } insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, p)); @@ -24003,7 +23982,7 @@ rs6000_emit_prologue (void) compare_result = gen_rtx_REG (CCUNSmode, CR0_REGNO); validate_condition_mode (EQ, CCUNSmode); lo = gen_int_mode (toc_restore_insn & 0xffff, SImode); - emit_insn (gen_rtx_SET (VOIDmode, compare_result, + emit_insn (gen_rtx_SET (compare_result, gen_rtx_COMPARE (CCUNSmode, tmp_reg_si, lo))); toc_save_done = gen_label_rtx (); jump = gen_rtx_IF_THEN_ELSE (VOIDmode, @@ -24011,7 +23990,7 @@ rs6000_emit_prologue (void) const0_rtx), gen_rtx_LABEL_REF (VOIDmode, toc_save_done), pc_rtx); - jump = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, jump)); + jump = emit_jump_insn (gen_rtx_SET (pc_rtx, jump)); JUMP_LABEL (jump) = toc_save_done; LABEL_NUSES (toc_save_done) += 1; @@ -24085,7 +24064,7 @@ rs6000_emit_prologue (void) int n_crsave = 0; int i; - crsave_v[n_crsave++] = gen_rtx_SET (VOIDmode, mem, cr_save_rtx); + crsave_v[n_crsave++] = gen_rtx_SET (mem, cr_save_rtx); for (i = 0; i < 8; i++) if (save_reg_p (CR0_REGNO + i)) crsave_v[n_crsave++] @@ -24118,8 +24097,7 @@ rs6000_emit_prologue (void) if (save_reg_p (CR0_REGNO + i)) { crframe[n_crframe] - = gen_rtx_SET (VOIDmode, mem, - gen_rtx_REG (SImode, CR0_REGNO + i)); + = gen_rtx_SET (mem, gen_rtx_REG (SImode, CR0_REGNO + i)); RTX_FRAME_RELATED_P (crframe[n_crframe]) = 1; n_crframe++; @@ -24134,8 +24112,7 @@ rs6000_emit_prologue (void) /* In other ABIs, by convention, we use a single CR regnum to represent the fact that all call-saved CR fields are saved. We use CR2_REGNO to be compatible with gcc-2.95 on Linux. */ - rtx set = gen_rtx_SET (VOIDmode, mem, - gen_rtx_REG (SImode, CR2_REGNO)); + rtx set = gen_rtx_SET (mem, gen_rtx_REG (SImode, CR2_REGNO)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, set); } } @@ -24328,7 +24305,7 @@ rs6000_emit_prologue (void) if (TARGET_MACHO) emit_insn (gen_get_vrsave_internal (reg)); else - emit_insn (gen_rtx_SET (VOIDmode, reg, vrsave)); + emit_insn (gen_rtx_SET (reg, vrsave)); /* Save VRSAVE. */ offset = info->vrsave_save_offset + frame_off; @@ -24532,7 +24509,7 @@ load_cr_save (int regno, rtx frame_reg_rtx, int offset, bool exit_func) if (!exit_func && DEFAULT_ABI == ABI_V4) { rtx cr = gen_rtx_REG (SImode, CR2_REGNO); - rtx set = gen_rtx_SET (VOIDmode, reg, cr); + rtx set = gen_rtx_SET (reg, cr); add_reg_note (insn, REG_CFA_REGISTER, set); RTX_FRAME_RELATED_P (insn) = 1; @@ -24572,7 +24549,7 @@ restore_saved_cr (rtx reg, int using_mfcr_multiple, bool exit_func) RTVEC_ELT (r, 0) = reg; RTVEC_ELT (r, 1) = GEN_INT (1 << (7-i)); RTVEC_ELT (p, ndx) = - gen_rtx_SET (VOIDmode, gen_rtx_REG (CCmode, CR0_REGNO + i), + gen_rtx_SET (gen_rtx_REG (CCmode, CR0_REGNO + i), gen_rtx_UNSPEC (CCmode, r, UNSPEC_MOVESI_TO_CR)); ndx++; } @@ -30970,7 +30947,7 @@ rs6000_emit_nmsub (rtx dst, rtx m1, rtx m2, rtx a) r = gen_rtx_NEG (mode, a); r = gen_rtx_FMA (mode, m1, m2, r); r = gen_rtx_NEG (mode, r); - emit_insn (gen_rtx_SET (VOIDmode, dst, r)); + emit_insn (gen_rtx_SET (dst, r)); } /* Newton-Raphson approximation of floating point divide DST = N/D. If NOTE_P, @@ -31002,9 +30979,8 @@ rs6000_emit_swdiv (rtx dst, rtx n, rtx d, bool note_p) /* x0 = 1./d estimate */ x0 = gen_reg_rtx (mode); - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_UNSPEC (mode, gen_rtvec (1, d), - UNSPEC_FRES))); + emit_insn (gen_rtx_SET (x0, gen_rtx_UNSPEC (mode, gen_rtvec (1, d), + UNSPEC_FRES))); /* Each iteration but the last calculates x_(i+1) = x_i * (2 - d * x_i). */ if (passes > 1) { @@ -31083,9 +31059,8 @@ rs6000_emit_swrsqrt (rtx dst, rtx src) halfthree = rs6000_load_constant_and_splat (mode, dconst3_2); /* x0 = rsqrt estimate */ - emit_insn (gen_rtx_SET (VOIDmode, x0, - gen_rtx_UNSPEC (mode, gen_rtvec (1, src), - UNSPEC_RSQRT))); + emit_insn (gen_rtx_SET (x0, gen_rtx_UNSPEC (mode, gen_rtvec (1, src), + UNSPEC_RSQRT))); /* y = 0.5 * src = 1.5 * src - src -> fewer constants */ rs6000_emit_msub (y, src, halfthree, src); @@ -31343,7 +31318,7 @@ altivec_expand_vec_perm_le (rtx operands[4]) iorx = (TARGET_P8_VECTOR ? gen_rtx_IOR (V16QImode, notx, notx) : gen_rtx_AND (V16QImode, notx, notx)); - emit_insn (gen_rtx_SET (VOIDmode, norreg, iorx)); + emit_insn (gen_rtx_SET (norreg, iorx)); /* Permute with operands reversed and adjusted selector. */ unspec = gen_rtx_UNSPEC (mode, gen_rtvec (3, op1, op0, norreg), @@ -31630,7 +31605,7 @@ rs6000_expand_vec_perm_const_1 (rtx target, rtx op0, rtx op1, x = gen_rtx_VEC_CONCAT (dmode, op0, op1); v = gen_rtvec (2, GEN_INT (perm0), GEN_INT (perm1)); x = gen_rtx_VEC_SELECT (vmode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, target, x)); + emit_insn (gen_rtx_SET (target, x)); } return true; } @@ -33178,7 +33153,7 @@ rs6000_call_aix (rtx value, rtx func_desc, rtx flag, rtx cookie) rtx stack_toc_unspec = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, stack_toc_offset), UNSPEC_TOCSLOT); - toc_restore = gen_rtx_SET (VOIDmode, toc_reg, stack_toc_unspec); + toc_restore = gen_rtx_SET (toc_reg, stack_toc_unspec); /* Can we optimize saving the TOC in the prologue or do we need to do it at every call? */ @@ -33252,7 +33227,7 @@ rs6000_call_aix (rtx value, rtx func_desc, rtx flag, rtx cookie) /* Create the call. */ call[0] = gen_rtx_CALL (VOIDmode, gen_rtx_MEM (SImode, func_addr), flag); if (value != NULL_RTX) - call[0] = gen_rtx_SET (VOIDmode, value, call[0]); + call[0] = gen_rtx_SET (value, call[0]); n_call = 1; if (toc_load) @@ -33284,7 +33259,7 @@ rs6000_sibcall_aix (rtx value, rtx func_desc, rtx flag, rtx cookie) /* Create the call. */ call[0] = gen_rtx_CALL (VOIDmode, gen_rtx_MEM (SImode, func_desc), flag); if (value != NULL_RTX) - call[0] = gen_rtx_SET (VOIDmode, value, call[0]); + call[0] = gen_rtx_SET (value, call[0]); call[1] = simple_return_rtx; @@ -33433,14 +33408,14 @@ rs6000_split_logical_inner (rtx dest, { if (value == 0) { - emit_insn (gen_rtx_SET (VOIDmode, dest, const0_rtx)); + emit_insn (gen_rtx_SET (dest, const0_rtx)); return; } else if (value == mask) { if (!rtx_equal_p (dest, op1)) - emit_insn (gen_rtx_SET (VOIDmode, dest, op1)); + emit_insn (gen_rtx_SET (dest, op1)); return; } } @@ -33452,7 +33427,7 @@ rs6000_split_logical_inner (rtx dest, if (value == 0) { if (!rtx_equal_p (dest, op1)) - emit_insn (gen_rtx_SET (VOIDmode, dest, op1)); + emit_insn (gen_rtx_SET (dest, op1)); return; } } @@ -33482,7 +33457,7 @@ rs6000_split_logical_inner (rtx dest, if (complement_final_p) bool_rtx = gen_rtx_NOT (mode, bool_rtx); - emit_insn (gen_rtx_SET (VOIDmode, dest, bool_rtx)); + emit_insn (gen_rtx_SET (dest, bool_rtx)); } /* Split a DImode AND/IOR/XOR with a constant on a 32-bit system. These @@ -33768,7 +33743,7 @@ expand_fusion_gpr_load (rtx *operands) new_mem = gen_rtx_UNSPEC (extend_mode, gen_rtvec (1, new_mem), UNSPEC_FUSION_GPR); - emit_insn (gen_rtx_SET (VOIDmode, target, new_mem)); + emit_insn (gen_rtx_SET (target, new_mem)); if (extend == SIGN_EXTEND) { @@ -33778,7 +33753,7 @@ expand_fusion_gpr_load (rtx *operands) rtx sign_reg = simplify_subreg (target_mode, target, extend_mode, sub_off); - emit_insn (gen_rtx_SET (VOIDmode, target, + emit_insn (gen_rtx_SET (target, gen_rtx_SIGN_EXTEND (extend_mode, sign_reg))); } @@ -34856,7 +34831,7 @@ replace_swap_with_copy (swap_web_entry *insn_entry, unsigned i) rtx_insn *insn = insn_entry[i].insn; rtx body = PATTERN (insn); rtx src_reg = XEXP (SET_SRC (body), 0); - rtx copy = gen_rtx_SET (VOIDmode, SET_DEST (body), src_reg); + rtx copy = gen_rtx_SET (SET_DEST (body), src_reg); rtx_insn *new_insn = emit_insn_before (copy, insn); set_block_for_insn (new_insn, BLOCK_FOR_INSN (insn)); df_insn_rescan (new_insn); diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index 7fc2bb1b4ad..09099861266 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -1435,8 +1435,7 @@ cr0 = gen_rtx_REG (CCmode, CR0_REGNO); emit_insn (gen_dlmzb (scratch_dlmzb, word1, word2, cr0)); cond = gen_rtx_NE (VOIDmode, cr0, const0_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, - pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, cond, gen_rtx_LABEL_REF @@ -1444,8 +1443,7 @@ end_label), pc_rtx))); emit_insn (gen_addsi3 (scratch_string, scratch_string, GEN_INT (8))); - emit_jump_insn (gen_rtx_SET (VOIDmode, - pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, loop_label))); emit_barrier (); emit_label (end_label); @@ -9161,7 +9159,7 @@ for (i = 0; i < count; i++) XVECEXP (operands[3], 0, i) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (SImode, regno + i), + = gen_rtx_SET (gen_rtx_REG (SImode, regno + i), adjust_address_nv (op1, SImode, i * 4)); }") @@ -9324,14 +9322,13 @@ op0 = replace_equiv_address (operands[0], to); XVECEXP (operands[3], 0, 0) - = gen_rtx_SET (VOIDmode, adjust_address_nv (op0, SImode, 0), operands[1]); + = gen_rtx_SET (adjust_address_nv (op0, SImode, 0), operands[1]); XVECEXP (operands[3], 0, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (SImode)); for (i = 1; i < count; i++) XVECEXP (operands[3], 0, i + 1) - = gen_rtx_SET (VOIDmode, - adjust_address_nv (op0, SImode, i * 4), + = gen_rtx_SET (adjust_address_nv (op0, SImode, i * 4), gen_rtx_REG (SImode, regno + i)); }") @@ -10623,8 +10620,7 @@ operands[3] = gen_frame_mem (Pmode, operands[0]); operands[4] = gen_frame_mem (Pmode, operands[1]); p = rtvec_alloc (1); - RTVEC_ELT (p, 0) = gen_rtx_SET (VOIDmode, - gen_frame_mem (BLKmode, operands[0]), + RTVEC_ELT (p, 0) = gen_rtx_SET (gen_frame_mem (BLKmode, operands[0]), const0_rtx); operands[5] = gen_rtx_PARALLEL (VOIDmode, p); }") @@ -10664,8 +10660,7 @@ operands[4] = adjust_address_nv (operands[1], Pmode, units_per_word); operands[5] = gen_frame_mem (Pmode, operands[3]); p = rtvec_alloc (1); - RTVEC_ELT (p, 0) = gen_rtx_SET (VOIDmode, - gen_frame_mem (BLKmode, operands[0]), + RTVEC_ELT (p, 0) = gen_rtx_SET (gen_frame_mem (BLKmode, operands[0]), const0_rtx); operands[6] = gen_rtx_PARALLEL (VOIDmode, p); }") diff --git a/gcc/config/rs6000/vector.md b/gcc/config/rs6000/vector.md index 668bad1d24f..27be1609acf 100644 --- a/gcc/config/rs6000/vector.md +++ b/gcc/config/rs6000/vector.md @@ -1049,7 +1049,7 @@ /* We need to make a note that we clobber SPEFSCR. */ rtx par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); - XVECEXP (par, 0, 0) = gen_rtx_SET (VOIDmode, operands[0], + XVECEXP (par, 0, 0) = gen_rtx_SET (operands[0], gen_rtx_PLUS (V2SFmode, operands[1], operands[2])); XVECEXP (par, 0, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (SImode, SPEFSCR_REGNO)); emit_insn (par); @@ -1069,7 +1069,7 @@ /* We need to make a note that we clobber SPEFSCR. */ rtx par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); - XVECEXP (par, 0, 0) = gen_rtx_SET (VOIDmode, operands[0], + XVECEXP (par, 0, 0) = gen_rtx_SET (operands[0], gen_rtx_MINUS (V2SFmode, operands[1], operands[2])); XVECEXP (par, 0, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (SImode, SPEFSCR_REGNO)); emit_insn (par); @@ -1089,7 +1089,7 @@ /* We need to make a note that we clobber SPEFSCR. */ rtx par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); - XVECEXP (par, 0, 0) = gen_rtx_SET (VOIDmode, operands[0], + XVECEXP (par, 0, 0) = gen_rtx_SET (operands[0], gen_rtx_MULT (V2SFmode, operands[1], operands[2])); XVECEXP (par, 0, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (SImode, SPEFSCR_REGNO)); emit_insn (par); @@ -1109,7 +1109,7 @@ /* We need to make a note that we clobber SPEFSCR. */ rtx par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); - XVECEXP (par, 0, 0) = gen_rtx_SET (VOIDmode, operands[0], + XVECEXP (par, 0, 0) = gen_rtx_SET (operands[0], gen_rtx_DIV (V2SFmode, operands[1], operands[2])); XVECEXP (par, 0, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (SImode, SPEFSCR_REGNO)); emit_insn (par); diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index 787f96ae245..314b272bc42 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -2017,7 +2017,7 @@ } x = gen_rtx_VEC_SELECT (<MODE>mode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) @@ -2043,7 +2043,7 @@ } x = gen_rtx_VEC_SELECT (<MODE>mode, x, gen_rtx_PARALLEL (VOIDmode, v)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], x)); + emit_insn (gen_rtx_SET (operands[0], x)); DONE; }) diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c index 9180fe20f66..fd985f5fc94 100644 --- a/gcc/config/rx/rx.c +++ b/gcc/config/rx/rx.c @@ -1633,14 +1633,13 @@ gen_rx_store_vector (unsigned int low, unsigned int high) vector = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count)); XVECEXP (vector, 0, 0) = - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_MINUS (SImode, stack_pointer_rtx, GEN_INT ((count - 1) * UNITS_PER_WORD))); for (i = 0; i < count - 1; i++) XVECEXP (vector, 0, i + 1) = - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (SImode, + gen_rtx_SET (gen_rtx_MEM (SImode, gen_rtx_MINUS (SImode, stack_pointer_rtx, GEN_INT ((i + 1) * UNITS_PER_WORD))), gen_rtx_REG (SImode, high - i)); @@ -1708,8 +1707,7 @@ gen_safe_add (rtx dest, rtx src, rtx val, bool is_frame_related) as the dwarf2out code cannot be expected to grok our unspec. */ add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (SImode, dest, - gen_rtx_PLUS (SImode, src, val))); + gen_rtx_SET (dest, gen_rtx_PLUS (SImode, src, val))); return; } @@ -1966,13 +1964,12 @@ gen_rx_rtsd_vector (unsigned int adjust, unsigned int low, unsigned int high) vector = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count)); XVECEXP (vector, 0, 0) = - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, adjust)); for (i = 0; i < count - 2; i++) XVECEXP (vector, 0, i + 1) = - gen_rtx_SET (VOIDmode, - gen_rtx_REG (SImode, low + i), + gen_rtx_SET (gen_rtx_REG (SImode, low + i), gen_rtx_MEM (SImode, i == 0 ? stack_pointer_rtx : plus_constant (Pmode, stack_pointer_rtx, @@ -1995,14 +1992,13 @@ gen_rx_popm_vector (unsigned int low, unsigned int high) vector = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count)); XVECEXP (vector, 0, 0) = - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, (count - 1) * UNITS_PER_WORD)); for (i = 0; i < count - 1; i++) XVECEXP (vector, 0, i + 1) = - gen_rtx_SET (VOIDmode, - gen_rtx_REG (SImode, low + i), + gen_rtx_SET (gen_rtx_REG (SImode, low + i), gen_rtx_MEM (SImode, i == 0 ? stack_pointer_rtx : plus_constant (Pmode, stack_pointer_rtx, @@ -3188,12 +3184,12 @@ rx_split_cbranch (machine_mode cc_mode, enum rtx_code cmp1, flags = gen_rtx_REG (cc_mode, CC_REG); x = gen_rtx_COMPARE (cc_mode, c1, c2); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (cmp1, VOIDmode, flags, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, label, pc_rtx); - x = gen_rtx_SET (VOIDmode, pc_rtx, x); + x = gen_rtx_SET (pc_rtx, x); emit_jump_insn (x); } diff --git a/gcc/config/rx/rx.md b/gcc/config/rx/rx.md index 1e10327871d..9cb0451bda9 100644 --- a/gcc/config/rx/rx.md +++ b/gcc/config/rx/rx.md @@ -679,11 +679,11 @@ flags = gen_rtx_REG (CCmode, CC_REG); x = gen_rtx_COMPARE (CCmode, operands[2], operands[3]); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (GET_CODE (operands[1]), SImode, flags, const0_rtx); - x = gen_rtx_SET (VOIDmode, operands[0], x); + x = gen_rtx_SET (operands[0], x); emit_insn (x); DONE; }) @@ -711,11 +711,11 @@ flags = gen_rtx_REG (CC_Fmode, CC_REG); x = gen_rtx_COMPARE (CC_Fmode, operands[2], operands[3]); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (GET_CODE (operands[1]), SImode, flags, const0_rtx); - x = gen_rtx_SET (VOIDmode, operands[0], x); + x = gen_rtx_SET (operands[0], x); emit_insn (x); DONE; }) @@ -756,7 +756,7 @@ flags = gen_rtx_REG (CCmode, CC_REG); x = gen_rtx_COMPARE (CCmode, operands[3], operands[4]); - emit_insn (gen_rtx_SET (VOIDmode, flags, x)); + emit_insn (gen_rtx_SET (flags, x)); cmp_code = GET_CODE (operands[5]); op0 = operands[0]; @@ -781,7 +781,7 @@ x = gen_rtx_fmt_ee (cmp_code, VOIDmode, flags, const0_rtx); x = gen_rtx_IF_THEN_ELSE (SImode, x, op1, op0); - emit_insn (gen_rtx_SET (VOIDmode, op0, x)); + emit_insn (gen_rtx_SET (op0, x)); DONE; }) @@ -2057,7 +2057,7 @@ flags = gen_rtx_REG (CC_ZSmode, CC_REG); x = gen_rtx_AND (SImode, operands[2], const1_rtx); x = gen_rtx_COMPARE (CC_ZSmode, x, const0_rtx); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); /* Emit bmne. */ @@ -2083,7 +2083,7 @@ flags = gen_rtx_REG (CCmode, CC_REG); x = gen_rtx_COMPARE (CCmode, operands[2], operands[3]); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[4]), SImode, diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 7d16048db8e..e6e43fa02bf 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -1047,7 +1047,7 @@ s390_emit_compare (enum rtx_code code, rtx op0, rtx op1) else { cc = gen_rtx_REG (mode, CC_REGNUM); - emit_insn (gen_rtx_SET (VOIDmode, cc, gen_rtx_COMPARE (mode, op0, op1))); + emit_insn (gen_rtx_SET (cc, gen_rtx_COMPARE (mode, op0, op1))); } return gen_rtx_fmt_ee (code, VOIDmode, cc, const0_rtx); @@ -1080,7 +1080,7 @@ s390_emit_jump (rtx target, rtx cond) if (cond) target = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, target, pc_rtx); - insn = gen_rtx_SET (VOIDmode, pc_rtx, target); + insn = gen_rtx_SET (pc_rtx, target); return emit_jump_insn (insn); } @@ -1648,7 +1648,7 @@ s390_expand_logical_operator (enum rtx_code code, machine_mode mode, } /* Emit the instruction. */ - op = gen_rtx_SET (VOIDmode, dst, gen_rtx_fmt_ee (code, wmode, src1, src2)); + op = gen_rtx_SET (dst, gen_rtx_fmt_ee (code, wmode, src1, src2)); clob = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM)); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, op, clob))); @@ -3847,7 +3847,7 @@ legitimize_tls_address (rtx addr, rtx reg) new_rtx = gen_rtx_UNSPEC (Pmode, gen_rtvec (2, new_rtx, addr), UNSPEC_TLS_LOAD); temp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (Pmode, temp, new_rtx)); + emit_insn (gen_rtx_SET (temp, new_rtx)); } else { @@ -3864,7 +3864,7 @@ legitimize_tls_address (rtx addr, rtx reg) new_rtx = gen_const_mem (Pmode, new_rtx); new_rtx = gen_rtx_UNSPEC (Pmode, gen_rtvec (2, new_rtx, addr), UNSPEC_TLS_LOAD); temp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (Pmode, temp, new_rtx)); + emit_insn (gen_rtx_SET (temp, new_rtx)); } new_rtx = gen_rtx_PLUS (Pmode, s390_get_thread_pointer (), temp); @@ -4426,7 +4426,7 @@ s390_expand_cmpmem (rtx target, rtx op0, rtx op1, rtx len) temp = gen_rtx_NE (VOIDmode, ccreg, const0_rtx); temp = gen_rtx_IF_THEN_ELSE (VOIDmode, temp, gen_rtx_LABEL_REF (VOIDmode, end_label), pc_rtx); - temp = gen_rtx_SET (VOIDmode, pc_rtx, temp); + temp = gen_rtx_SET (pc_rtx, temp); emit_jump_insn (temp); s390_load_address (addr0, @@ -4536,7 +4536,7 @@ s390_expand_addcc (enum rtx_code cmp_code, rtx cmp_op0, rtx cmp_op1, if (!register_operand (cmp_op0, cmp_mode)) cmp_op0 = force_reg (cmp_mode, cmp_op0); - insn = gen_rtx_SET (VOIDmode, gen_rtx_REG (cc_mode, CC_REGNUM), + insn = gen_rtx_SET (gen_rtx_REG (cc_mode, CC_REGNUM), gen_rtx_COMPARE (cc_mode, cmp_op0, cmp_op1)); /* We use insn_invalid_p here to add clobbers if required. */ ret = insn_invalid_p (emit_insn (insn), false); @@ -4558,7 +4558,7 @@ s390_expand_addcc (enum rtx_code cmp_code, rtx cmp_op0, rtx cmp_op1, p = rtvec_alloc (2); RTVEC_ELT (p, 0) = - gen_rtx_SET (VOIDmode, dst, op_res); + gen_rtx_SET (dst, op_res); RTVEC_ELT (p, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM)); emit_insn (gen_rtx_PARALLEL (VOIDmode, p)); @@ -4608,7 +4608,7 @@ s390_expand_addcc (enum rtx_code cmp_code, rtx cmp_op0, rtx cmp_op1, if (!register_operand (cmp_op0, cmp_mode)) cmp_op0 = force_reg (cmp_mode, cmp_op0); - insn = gen_rtx_SET (VOIDmode, gen_rtx_REG (cc_mode, CC_REGNUM), + insn = gen_rtx_SET (gen_rtx_REG (cc_mode, CC_REGNUM), gen_rtx_COMPARE (cc_mode, cmp_op0, cmp_op1)); /* We use insn_invalid_p here to add clobbers if required. */ ret = insn_invalid_p (emit_insn (insn), false); @@ -4625,7 +4625,7 @@ s390_expand_addcc (enum rtx_code cmp_code, rtx cmp_op0, rtx cmp_op1, const0_rtx)); p = rtvec_alloc (2); RTVEC_ELT (p, 0) = - gen_rtx_SET (VOIDmode, dst, op_res); + gen_rtx_SET (dst, op_res); RTVEC_ELT (p, 1) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM)); emit_insn (gen_rtx_PARALLEL (VOIDmode, p)); @@ -4753,7 +4753,7 @@ s390_expand_insv (rtx dest, rtx op1, rtx op2, rtx src) if (smode_bsize == bitsize && bitpos == mode_bsize - smode_bsize) { op = gen_rtx_STRICT_LOW_PART (VOIDmode, gen_lowpart (smode, dest)); - op = gen_rtx_SET (VOIDmode, op, gen_lowpart (smode, src)); + op = gen_rtx_SET (op, gen_lowpart (smode, src)); clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, CC_REGNUM)); emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, op, clobber))); return true; @@ -4781,7 +4781,7 @@ s390_expand_insv (rtx dest, rtx op1, rtx op2, rtx src) } op = gen_rtx_ZERO_EXTRACT (mode, dest, op1, op2), - op = gen_rtx_SET (VOIDmode, op, src); + op = gen_rtx_SET (op, src); if (!TARGET_ZEC12) { @@ -6057,7 +6057,8 @@ s390_split_branches (void) { new_literal = 1; rtx mem = force_const_mem (Pmode, *label); - rtx_insn *set_insn = emit_insn_before (gen_rtx_SET (Pmode, temp_reg, mem), insn); + rtx_insn *set_insn = emit_insn_before (gen_rtx_SET (temp_reg, mem), + insn); INSN_ADDRESSES_NEW (set_insn, -1); annotate_constant_pool_refs (&PATTERN (set_insn)); @@ -6070,7 +6071,8 @@ s390_split_branches (void) UNSPEC_LTREL_OFFSET); target = gen_rtx_CONST (Pmode, target); target = force_const_mem (Pmode, target); - rtx_insn *set_insn = emit_insn_before (gen_rtx_SET (Pmode, temp_reg, target), insn); + rtx_insn *set_insn = emit_insn_before (gen_rtx_SET (temp_reg, target), + insn); INSN_ADDRESSES_NEW (set_insn, -1); annotate_constant_pool_refs (&PATTERN (set_insn)); @@ -8844,7 +8846,7 @@ s390_emit_prologue (void) if (DISP_IN_RANGE (INTVAL (frame_off))) { - insn = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + insn = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, frame_off)); insn = emit_insn (insn); @@ -8861,7 +8863,7 @@ s390_emit_prologue (void) RTX_FRAME_RELATED_P (insn) = 1; real_frame_off = GEN_INT (-cfun_frame_layout.frame_size); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, real_frame_off))); @@ -8915,8 +8917,7 @@ s390_emit_prologue (void) offset += 8; RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (DFmode, addr), + gen_rtx_SET (gen_rtx_MEM (DFmode, addr), gen_rtx_REG (DFmode, i))); } } @@ -9006,11 +9007,11 @@ s390_emit_epilogue (bool sibcall) offset = area_bottom < 0 ? -area_bottom : 0; frame_off = GEN_INT (cfun_frame_layout.frame_size - offset); - cfa = gen_rtx_SET (VOIDmode, frame_pointer, + cfa = gen_rtx_SET (frame_pointer, gen_rtx_PLUS (Pmode, frame_pointer, frame_off)); if (DISP_IN_RANGE (INTVAL (frame_off))) { - insn = gen_rtx_SET (VOIDmode, frame_pointer, + insn = gen_rtx_SET (frame_pointer, gen_rtx_PLUS (Pmode, frame_pointer, frame_off)); insn = emit_insn (insn); } @@ -10813,7 +10814,7 @@ s390_emit_call (rtx addr_location, rtx tls_call, rtx result_reg, call = gen_rtx_CALL (VOIDmode, addr_location, const0_rtx); if (result_reg != NULL_RTX) - call = gen_rtx_SET (VOIDmode, result_reg, call); + call = gen_rtx_SET (result_reg, call); if (retaddr_reg != NULL_RTX) { @@ -11155,7 +11156,7 @@ s390_fix_long_loop_prediction (rtx_insn *insn) new_label = gen_label_rtx (); uncond_jump = emit_jump_insn_after ( - gen_rtx_SET (VOIDmode, pc_rtx, + gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, code_label)), insn); emit_label_after (new_label, uncond_jump); diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 76dca0a68ae..a377a1f0876 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -1900,7 +1900,7 @@ { rtx tmp = gen_reg_rtx (SImode); rtx ext = gen_rtx_SIGN_EXTEND (SImode, operands[1]); - emit_insn (gen_rtx_SET (VOIDmode, tmp, ext)); + emit_insn (gen_rtx_SET (tmp, ext)); operands[1] = gen_lowpart (HImode, tmp); } }) @@ -1959,7 +1959,7 @@ { rtx tmp = gen_reg_rtx (DImode); rtx ext = gen_rtx_ZERO_EXTEND (DImode, operands[1]); - emit_insn (gen_rtx_SET (VOIDmode, tmp, ext)); + emit_insn (gen_rtx_SET (tmp, ext)); operands[1] = gen_lowpart (QImode, tmp); } }) @@ -2446,7 +2446,7 @@ for (i = 0; i < count; i++) XVECEXP (operands[3], 0, i) - = gen_rtx_SET (VOIDmode, gen_rtx_REG (mode, regno + i), + = gen_rtx_SET (gen_rtx_REG (mode, regno + i), change_address (operands[1], mode, plus_constant (Pmode, from, off + i * GET_MODE_SIZE (mode)))); @@ -2537,8 +2537,7 @@ for (i = 0; i < count; i++) XVECEXP (operands[3], 0, i) - = gen_rtx_SET (VOIDmode, - change_address (operands[0], mode, + = gen_rtx_SET (change_address (operands[0], mode, plus_constant (Pmode, to, off + i * GET_MODE_SIZE (mode))), gen_rtx_REG (mode, regno + i)); diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index a4c9c4c0ba2..9bcb423c11d 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -2118,7 +2118,7 @@ expand_cbranchsi4 (rtx *operands, enum rtx_code comparison, int probability) branch_expander = gen_branch_false; default: ; } - emit_insn (gen_rtx_SET (VOIDmode, get_t_reg_rtx (), + emit_insn (gen_rtx_SET (get_t_reg_rtx (), gen_rtx_fmt_ee (comparison, SImode, operands[1], operands[2]))); rtx_insn *jump = emit_jump_insn (branch_expander (operands[3])); @@ -2432,7 +2432,7 @@ sh_emit_scc_to_t (enum rtx_code code, rtx op0, rtx op1) || (TARGET_SH2E && GET_MODE_CLASS (mode) == MODE_FLOAT)) op1 = force_reg (mode, op1); - sh_emit_set_t_insn (gen_rtx_SET (VOIDmode, t_reg, + sh_emit_set_t_insn (gen_rtx_SET (t_reg, gen_rtx_fmt_ee (code, SImode, op0, op1)), mode); } @@ -2561,8 +2561,7 @@ sh_emit_compare_and_branch (rtx *operands, machine_mode mode) gcc_unreachable (); } - insn = gen_rtx_SET (VOIDmode, - get_t_reg_rtx (), + insn = gen_rtx_SET (get_t_reg_rtx (), gen_rtx_fmt_ee (branch_code, SImode, op0, op1)); sh_emit_set_t_insn (insn, mode); @@ -3974,7 +3973,7 @@ gen_shifty_op (int code, rtx *operands) /* This can happen even when optimizing, if there were subregs before reload. Don't output a nop here, as this is never optimized away; use a no-op move instead. */ - emit_insn (gen_rtx_SET (VOIDmode, operands[0], operands[0])); + emit_insn (gen_rtx_SET (operands[0], operands[0])); return; } @@ -6546,7 +6545,7 @@ sh_reorg (void) newsrc = gen_rtx_LABEL_REF (VOIDmode, lab); newsrc = gen_const_mem (mode, newsrc); } - *patp = gen_rtx_SET (VOIDmode, dst, newsrc); + *patp = gen_rtx_SET (dst, newsrc); INSN_CODE (scan) = -1; } } @@ -7087,9 +7086,8 @@ output_stack_adjust (int size, rtx reg, int epilogue_p, insn = emit_fn (GEN_ADD3 (reg, reg, const_reg)); } add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, reg, - gen_rtx_PLUS (SImode, reg, - GEN_INT (size)))); + gen_rtx_SET (reg, gen_rtx_PLUS (SImode, reg, + GEN_INT (size)))); } } } @@ -7159,7 +7157,7 @@ pop (int rn) : SET_DEST (PATTERN (x))); add_reg_note (x, REG_CFA_RESTORE, reg); add_reg_note (x, REG_CFA_ADJUST_CFA, - gen_rtx_SET (SImode, sp_reg, + gen_rtx_SET (sp_reg, plus_constant (SImode, sp_reg, GET_MODE_SIZE (GET_MODE (reg))))); add_reg_note (x, REG_INC, gen_rtx_REG (SImode, STACK_POINTER_REGNUM)); @@ -7242,11 +7240,10 @@ push_regs (HARD_REG_SET *mask, int interrupt_handler) { mem = gen_rtx_MEM (SImode, plus_constant (Pmode, sp_reg, i * 4)); reg = gen_rtx_REG (SImode, i); - add_reg_note (x, REG_CFA_OFFSET, gen_rtx_SET (SImode, mem, reg)); + add_reg_note (x, REG_CFA_OFFSET, gen_rtx_SET (mem, reg)); } - set = gen_rtx_SET (SImode, sp_reg, - plus_constant (Pmode, sp_reg, - 32)); + set = gen_rtx_SET (sp_reg, plus_constant (Pmode, sp_reg, - 32)); add_reg_note (x, REG_CFA_ADJUST_CFA, set); emit_insn (gen_blockage ()); } @@ -7917,7 +7914,7 @@ sh_expand_prologue (void) { rtx set; - set = gen_rtx_SET (VOIDmode, mem_rtx, orig_reg_rtx); + set = gen_rtx_SET (mem_rtx, orig_reg_rtx); add_reg_note (insn, REG_FRAME_RELATED_EXPR, set); } @@ -7930,7 +7927,7 @@ sh_expand_prologue (void) stack_pointer_rtx, GEN_INT (offset))); - set = gen_rtx_SET (VOIDmode, mem_rtx, reg_rtx); + set = gen_rtx_SET (mem_rtx, reg_rtx); add_reg_note (insn, REG_FRAME_RELATED_EXPR, set); } } @@ -14173,7 +14170,7 @@ sh_recog_treg_set_expr (rtx op, machine_mode mode) have to capture its current state and restore it afterwards. */ recog_data_d prev_recog_data = recog_data; - rtx_insn* i = make_insn_raw (gen_rtx_SET (VOIDmode, get_t_reg_rtx (), op)); + rtx_insn* i = make_insn_raw (gen_rtx_SET (get_t_reg_rtx (), op)); SET_PREV_INSN (i) = NULL; SET_NEXT_INSN (i) = NULL; @@ -14286,7 +14283,7 @@ sh_split_treg_set_expr (rtx x, rtx_insn* curr_insn) scope_counter in_treg_set_expr (sh_recog_treg_set_expr_reent_count); - rtx_insn* i = make_insn_raw (gen_rtx_SET (VOIDmode, get_t_reg_rtx (), x)); + rtx_insn* i = make_insn_raw (gen_rtx_SET (get_t_reg_rtx (), x)); SET_PREV_INSN (i) = NULL; SET_NEXT_INSN (i) = NULL; diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md index 5c0e7077601..d3d7dee2863 100644 --- a/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md @@ -10417,7 +10417,7 @@ label: mach as operand 2, so let the instructions that preserve r0 be optimized away if r0 turns out to be dead. */ - emit_insn_before (gen_rtx_SET (SImode, tmp, r0), insn); + emit_insn_before (gen_rtx_SET (tmp, r0), insn); emit_move_insn (r0, tmp); break; } diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc index e4f3581099c..e5ed77cbbec 100644 --- a/gcc/config/sh/sh_treg_combine.cc +++ b/gcc/config/sh/sh_treg_combine.cc @@ -960,8 +960,8 @@ sh_treg_combine::make_not_reg_insn (rtx dst_reg, rtx src_reg) const start_sequence (); - emit_insn (gen_rtx_SET (VOIDmode, m_ccreg, - gen_rtx_fmt_ee (EQ, SImode, src_reg, const0_rtx))); + emit_insn (gen_rtx_SET (m_ccreg, gen_rtx_fmt_ee (EQ, SImode, + src_reg, const0_rtx))); if (GET_MODE (dst_reg) == SImode) emit_move_insn (dst_reg, m_ccreg); @@ -983,7 +983,7 @@ rtx_insn * sh_treg_combine::make_inv_ccreg_insn (void) const { start_sequence (); - rtx_insn *i = emit_insn (gen_rtx_SET (VOIDmode, m_ccreg, + rtx_insn *i = emit_insn (gen_rtx_SET (m_ccreg, gen_rtx_fmt_ee (XOR, GET_MODE (m_ccreg), m_ccreg, const1_rtx))); end_sequence (); diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 3484809c1e3..aab6f3d35dd 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -1917,22 +1917,18 @@ sparc_emit_set_const32 (rtx op0, rtx op1) /* Emit them as real moves instead of a HIGH/LO_SUM, this way CSE can see everything and reuse intermediate values if it wants. */ - emit_insn (gen_rtx_SET (VOIDmode, temp, - GEN_INT (INTVAL (op1) - & ~(HOST_WIDE_INT)0x3ff))); + emit_insn (gen_rtx_SET (temp, GEN_INT (INTVAL (op1) + & ~(HOST_WIDE_INT) 0x3ff))); - emit_insn (gen_rtx_SET (VOIDmode, - op0, + emit_insn (gen_rtx_SET (op0, gen_rtx_IOR (mode, temp, GEN_INT (INTVAL (op1) & 0x3ff)))); } else { /* A symbol, emit in the traditional way. */ - emit_insn (gen_rtx_SET (VOIDmode, temp, - gen_rtx_HIGH (mode, op1))); - emit_insn (gen_rtx_SET (VOIDmode, - op0, gen_rtx_LO_SUM (mode, temp, op1))); + emit_insn (gen_rtx_SET (temp, gen_rtx_HIGH (mode, op1))); + emit_insn (gen_rtx_SET (op0, gen_rtx_LO_SUM (mode, temp, op1))); } } @@ -1974,8 +1970,8 @@ sparc_emit_set_symbolic_const64 (rtx op0, rtx op1, rtx temp) else temp1 = gen_reg_rtx (DImode); - emit_insn (gen_rtx_SET (VOIDmode, temp1, gen_rtx_HIGH (DImode, op1))); - emit_insn (gen_rtx_SET (VOIDmode, op0, gen_rtx_LO_SUM (DImode, temp1, op1))); + emit_insn (gen_rtx_SET (temp1, gen_rtx_HIGH (DImode, op1))); + emit_insn (gen_rtx_SET (op0, gen_rtx_LO_SUM (DImode, temp1, op1))); break; case CM_MEDMID: @@ -2006,7 +2002,7 @@ sparc_emit_set_symbolic_const64 (rtx op0, rtx op1, rtx temp) emit_insn (gen_seth44 (temp1, op1)); emit_insn (gen_setm44 (temp2, temp1, op1)); - emit_insn (gen_rtx_SET (VOIDmode, temp3, + emit_insn (gen_rtx_SET (temp3, gen_rtx_ASHIFT (DImode, temp2, GEN_INT (12)))); emit_insn (gen_setl44 (op0, temp3, op1)); break; @@ -2054,10 +2050,9 @@ sparc_emit_set_symbolic_const64 (rtx op0, rtx op1, rtx temp) emit_insn (gen_sethh (temp1, op1)); emit_insn (gen_setlm (temp2, op1)); emit_insn (gen_sethm (temp3, temp1, op1)); - emit_insn (gen_rtx_SET (VOIDmode, temp4, + emit_insn (gen_rtx_SET (temp4, gen_rtx_ASHIFT (DImode, temp3, GEN_INT (32)))); - emit_insn (gen_rtx_SET (VOIDmode, temp5, - gen_rtx_PLUS (DImode, temp4, temp2))); + emit_insn (gen_rtx_SET (temp5, gen_rtx_PLUS (DImode, temp4, temp2))); emit_insn (gen_setlo (op0, temp5, op1)); break; @@ -2126,10 +2121,9 @@ sparc_emit_set_symbolic_const64 (rtx op0, rtx op1, rtx temp) emit_insn (gen_embmedany_textuhi (temp1, op1)); emit_insn (gen_embmedany_texthi (temp2, op1)); emit_insn (gen_embmedany_textulo (temp3, temp1, op1)); - emit_insn (gen_rtx_SET (VOIDmode, temp4, + emit_insn (gen_rtx_SET (temp4, gen_rtx_ASHIFT (DImode, temp3, GEN_INT (32)))); - emit_insn (gen_rtx_SET (VOIDmode, temp5, - gen_rtx_PLUS (DImode, temp4, temp2))); + emit_insn (gen_rtx_SET (temp5, gen_rtx_PLUS (DImode, temp4, temp2))); emit_insn (gen_embmedany_textlo (op0, temp5, op1)); } break; @@ -2162,13 +2156,13 @@ static rtx gen_safe_XOR64 (rtx, HOST_WIDE_INT); static rtx gen_safe_HIGH64 (rtx dest, HOST_WIDE_INT val) { - return gen_rtx_SET (VOIDmode, dest, GEN_INT (val & ~(HOST_WIDE_INT)0x3ff)); + return gen_rtx_SET (dest, GEN_INT (val & ~(HOST_WIDE_INT)0x3ff)); } static rtx gen_safe_SET64 (rtx dest, HOST_WIDE_INT val) { - return gen_rtx_SET (VOIDmode, dest, GEN_INT (val)); + return gen_rtx_SET (dest, GEN_INT (val)); } static rtx @@ -2208,8 +2202,7 @@ sparc_emit_set_const64_quick1 (rtx op0, rtx temp, emit_insn (gen_safe_HIGH64 (temp, high_bits)); if (!is_neg) { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_safe_OR64 (temp, (high_bits & 0x3ff)))); + emit_insn (gen_rtx_SET (op0, gen_safe_OR64 (temp, (high_bits & 0x3ff)))); } else { @@ -2218,12 +2211,11 @@ sparc_emit_set_const64_quick1 (rtx op0, rtx temp, such as ANDN later on and substitute. */ if ((low_bits & 0x3ff) == 0x3ff) { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_NOT (DImode, temp))); + emit_insn (gen_rtx_SET (op0, gen_rtx_NOT (DImode, temp))); } else { - emit_insn (gen_rtx_SET (VOIDmode, op0, + emit_insn (gen_rtx_SET (op0, gen_safe_XOR64 (temp, (-(HOST_WIDE_INT)0x400 | (low_bits & 0x3ff))))); @@ -2246,7 +2238,7 @@ sparc_emit_set_const64_quick2 (rtx op0, rtx temp, { emit_insn (gen_safe_HIGH64 (temp, high_bits)); if ((high_bits & ~0xfffffc00) != 0) - emit_insn (gen_rtx_SET (VOIDmode, op0, + emit_insn (gen_rtx_SET (op0, gen_safe_OR64 (temp, (high_bits & 0x3ff)))); else temp2 = temp; @@ -2258,15 +2250,13 @@ sparc_emit_set_const64_quick2 (rtx op0, rtx temp, } /* Now shift it up into place. */ - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_ASHIFT (DImode, temp2, - GEN_INT (shift_count)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, temp2, + GEN_INT (shift_count)))); /* If there is a low immediate part piece, finish up by putting that in as well. */ if (low_immediate != 0) - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_safe_OR64 (op0, low_immediate))); + emit_insn (gen_rtx_SET (op0, gen_safe_OR64 (op0, low_immediate))); } static void sparc_emit_set_const64_longway (rtx, rtx, unsigned HOST_WIDE_INT, @@ -2288,8 +2278,7 @@ sparc_emit_set_const64_longway (rtx op0, rtx temp, { emit_insn (gen_safe_HIGH64 (temp, high_bits)); if ((high_bits & ~0xfffffc00) != 0) - emit_insn (gen_rtx_SET (VOIDmode, - sub_temp, + emit_insn (gen_rtx_SET (sub_temp, gen_safe_OR64 (temp, (high_bits & 0x3ff)))); else sub_temp = temp; @@ -2306,22 +2295,19 @@ sparc_emit_set_const64_longway (rtx op0, rtx temp, rtx temp3 = gen_reg_rtx (DImode); rtx temp4 = gen_reg_rtx (DImode); - emit_insn (gen_rtx_SET (VOIDmode, temp4, - gen_rtx_ASHIFT (DImode, sub_temp, - GEN_INT (32)))); + emit_insn (gen_rtx_SET (temp4, gen_rtx_ASHIFT (DImode, sub_temp, + GEN_INT (32)))); emit_insn (gen_safe_HIGH64 (temp2, low_bits)); if ((low_bits & ~0xfffffc00) != 0) { - emit_insn (gen_rtx_SET (VOIDmode, temp3, + emit_insn (gen_rtx_SET (temp3, gen_safe_OR64 (temp2, (low_bits & 0x3ff)))); - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_PLUS (DImode, temp4, temp3))); + emit_insn (gen_rtx_SET (op0, gen_rtx_PLUS (DImode, temp4, temp3))); } else { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_PLUS (DImode, temp4, temp2))); + emit_insn (gen_rtx_SET (op0, gen_rtx_PLUS (DImode, temp4, temp2))); } } else @@ -2336,11 +2322,9 @@ sparc_emit_set_const64_longway (rtx op0, rtx temp, avoid emitting truly stupid code. */ if (low1 != const0_rtx) { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_ASHIFT (DImode, sub_temp, - GEN_INT (to_shift)))); - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_IOR (DImode, op0, low1))); + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, sub_temp, + GEN_INT (to_shift)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_IOR (DImode, op0, low1))); sub_temp = op0; to_shift = 12; } @@ -2350,11 +2334,9 @@ sparc_emit_set_const64_longway (rtx op0, rtx temp, } if (low2 != const0_rtx) { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_ASHIFT (DImode, sub_temp, - GEN_INT (to_shift)))); - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_IOR (DImode, op0, low2))); + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, sub_temp, + GEN_INT (to_shift)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_IOR (DImode, op0, low2))); sub_temp = op0; to_shift = 8; } @@ -2362,12 +2344,10 @@ sparc_emit_set_const64_longway (rtx op0, rtx temp, { to_shift += 8; } - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_ASHIFT (DImode, sub_temp, - GEN_INT (to_shift)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, sub_temp, + GEN_INT (to_shift)))); if (low3 != const0_rtx) - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_IOR (DImode, op0, low3))); + emit_insn (gen_rtx_SET (op0, gen_rtx_IOR (DImode, op0, low3))); /* phew... */ } } @@ -2565,17 +2545,11 @@ sparc_emit_set_const64 (rtx op0, rtx op1) emit_insn (gen_safe_SET64 (temp, the_const)); if (shift > 0) - emit_insn (gen_rtx_SET (VOIDmode, - op0, - gen_rtx_ASHIFT (DImode, - temp, - GEN_INT (shift)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, temp, + GEN_INT (shift)))); else if (shift < 0) - emit_insn (gen_rtx_SET (VOIDmode, - op0, - gen_rtx_LSHIFTRT (DImode, - temp, - GEN_INT (-shift)))); + emit_insn (gen_rtx_SET (op0, gen_rtx_LSHIFTRT (DImode, temp, + GEN_INT (-shift)))); return; } @@ -2598,13 +2572,11 @@ sparc_emit_set_const64 (rtx op0, rtx op1) /* If lowest_bit_set == 10 then a sethi alone could have done it. */ if (lowest_bit_set < 10) - emit_insn (gen_rtx_SET (VOIDmode, - op0, + emit_insn (gen_rtx_SET (op0, gen_rtx_LSHIFTRT (DImode, temp, GEN_INT (10 - lowest_bit_set)))); else if (lowest_bit_set > 10) - emit_insn (gen_rtx_SET (VOIDmode, - op0, + emit_insn (gen_rtx_SET (op0, gen_rtx_ASHIFT (DImode, temp, GEN_INT (lowest_bit_set - 10)))); return; @@ -2671,13 +2643,11 @@ sparc_emit_set_const64 (rtx op0, rtx op1) such as ANDN later on and substitute. */ if (trailing_bits == 0x3ff) { - emit_insn (gen_rtx_SET (VOIDmode, op0, - gen_rtx_NOT (DImode, temp))); + emit_insn (gen_rtx_SET (op0, gen_rtx_NOT (DImode, temp))); } else { - emit_insn (gen_rtx_SET (VOIDmode, - op0, + emit_insn (gen_rtx_SET (op0, gen_safe_XOR64 (temp, (-0x400 | trailing_bits)))); } @@ -2839,7 +2809,7 @@ gen_compare_reg_1 (enum rtx_code code, rtx x, rtx y) /* We shouldn't get there for TFmode if !TARGET_HARD_QUAD. If we do, this will only result in an unrecognizable insn so no point in asserting. */ - emit_insn (gen_rtx_SET (VOIDmode, cc_reg, gen_rtx_COMPARE (mode, x, y))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, x, y))); return cc_reg; } @@ -2896,7 +2866,7 @@ gen_v9_scc (rtx dest, enum rtx_code compare_code, rtx x, rtx y) && GET_MODE (dest) == DImode && rtx_equal_p (op0, dest)) { - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (DImode, gen_rtx_fmt_ee (compare_code, DImode, op0, const0_rtx), @@ -2913,7 +2883,7 @@ gen_v9_scc (rtx dest, enum rtx_code compare_code, rtx x, rtx y) emit_move_insn (op0, x); } - emit_insn (gen_rtx_SET (VOIDmode, dest, const0_rtx)); + emit_insn (gen_rtx_SET (dest, const0_rtx)); if (GET_MODE (op0) != DImode) { temp = gen_reg_rtx (DImode); @@ -2921,7 +2891,7 @@ gen_v9_scc (rtx dest, enum rtx_code compare_code, rtx x, rtx y) } else temp = op0; - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (GET_MODE (dest), gen_rtx_fmt_ee (compare_code, DImode, temp, const0_rtx), @@ -2937,8 +2907,8 @@ gen_v9_scc (rtx dest, enum rtx_code compare_code, rtx x, rtx y) gcc_assert (GET_MODE (x) != CC_NOOVmode && GET_MODE (x) != CCX_NOOVmode); - emit_insn (gen_rtx_SET (VOIDmode, dest, const0_rtx)); - emit_insn (gen_rtx_SET (VOIDmode, dest, + emit_insn (gen_rtx_SET (dest, const0_rtx)); + emit_insn (gen_rtx_SET (dest, gen_rtx_IF_THEN_ELSE (GET_MODE (dest), gen_rtx_fmt_ee (compare_code, GET_MODE (x), x, y), @@ -3047,7 +3017,7 @@ emit_scc_insn (rtx operands[]) if (code == LTU || (!TARGET_VIS3 && code == GEU)) { - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_fmt_ee (code, GET_MODE (operands[0]), gen_compare_reg_1 (code, x, y), const0_rtx))); @@ -3071,8 +3041,7 @@ emit_scc_insn (rtx operands[]) static void emit_v9_brxx_insn (enum rtx_code code, rtx op0, rtx label) { - emit_jump_insn (gen_rtx_SET (VOIDmode, - pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_fmt_ee (code, GET_MODE (op0), op0, const0_rtx), @@ -3095,7 +3064,7 @@ emit_cbcond_insn (enum rtx_code code, rtx op0, rtx op1, rtx label) gen_rtx_LABEL_REF (VOIDmode, label), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, if_then_else)); + emit_jump_insn (gen_rtx_SET (pc_rtx, if_then_else)); } void @@ -3414,7 +3383,7 @@ emit_hard_tfmode_operation (enum rtx_code code, rtx *operands) else dest = gen_reg_rtx (GET_MODE (operands[0])); - emit_insn (gen_rtx_SET (VOIDmode, dest, op)); + emit_insn (gen_rtx_SET (dest, op)); if (dest != operands[0]) emit_move_insn (operands[0], dest); @@ -5127,7 +5096,7 @@ sparc_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) if (size <= PROBE_INTERVAL) { emit_move_insn (g1, GEN_INT (first)); - emit_insn (gen_rtx_SET (VOIDmode, g1, + emit_insn (gen_rtx_SET (g1, gen_rtx_MINUS (Pmode, stack_pointer_rtx, g1))); emit_stack_probe (plus_constant (Pmode, g1, -size)); } @@ -5139,7 +5108,7 @@ sparc_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) HOST_WIDE_INT i; emit_move_insn (g1, GEN_INT (first + PROBE_INTERVAL)); - emit_insn (gen_rtx_SET (VOIDmode, g1, + emit_insn (gen_rtx_SET (g1, gen_rtx_MINUS (Pmode, stack_pointer_rtx, g1))); emit_stack_probe (g1); @@ -5148,7 +5117,7 @@ sparc_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) generate any code. Then probe at FIRST + SIZE. */ for (i = 2 * PROBE_INTERVAL; i < size; i += PROBE_INTERVAL) { - emit_insn (gen_rtx_SET (VOIDmode, g1, + emit_insn (gen_rtx_SET (g1, plus_constant (Pmode, g1, -PROBE_INTERVAL))); emit_stack_probe (g1); } @@ -5179,11 +5148,11 @@ sparc_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) /* Step 2: compute initial and final value of the loop counter. */ /* TEST_ADDR = SP + FIRST. */ - emit_insn (gen_rtx_SET (VOIDmode, g1, + emit_insn (gen_rtx_SET (g1, gen_rtx_MINUS (Pmode, stack_pointer_rtx, g1))); /* LAST_ADDR = SP + FIRST + ROUNDED_SIZE. */ - emit_insn (gen_rtx_SET (VOIDmode, g4, gen_rtx_MINUS (Pmode, g1, g4))); + emit_insn (gen_rtx_SET (g4, gen_rtx_MINUS (Pmode, g1, g4))); /* Step 3: the loop @@ -5357,14 +5326,12 @@ emit_save_or_restore_regs (unsigned int low, unsigned int high, rtx base, rtx set1, set2; mem = gen_frame_mem (SImode, plus_constant (Pmode, base, offset)); - set1 = gen_rtx_SET (VOIDmode, mem, - gen_rtx_REG (SImode, regno)); + set1 = gen_rtx_SET (mem, gen_rtx_REG (SImode, regno)); RTX_FRAME_RELATED_P (set1) = 1; mem = gen_frame_mem (SImode, plus_constant (Pmode, base, offset + 4)); - set2 = gen_rtx_SET (VOIDmode, mem, - gen_rtx_REG (SImode, regno + 1)); + set2 = gen_rtx_SET (mem, gen_rtx_REG (SImode, regno + 1)); RTX_FRAME_RELATED_P (set2) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, gen_rtx_PARALLEL (VOIDmode, @@ -5394,8 +5361,7 @@ emit_adjust_base_to_offset (rtx base, int offset) lose (the result will be clobbered). */ rtx new_base = gen_rtx_REG (Pmode, 1); emit_move_insn (new_base, GEN_INT (offset)); - emit_insn (gen_rtx_SET (VOIDmode, - new_base, gen_rtx_PLUS (Pmode, base, new_base))); + emit_insn (gen_rtx_SET (new_base, gen_rtx_PLUS (Pmode, base, new_base))); return new_base; } @@ -5442,8 +5408,7 @@ emit_window_save (rtx increment) /* The incoming return address (%o7) is saved in %i7. */ add_reg_note (insn, REG_CFA_REGISTER, - gen_rtx_SET (VOIDmode, - gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM), + gen_rtx_SET (gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM), gen_rtx_REG (Pmode, INCOMING_RETURN_ADDR_REGNUM))); @@ -5463,8 +5428,7 @@ emit_window_save (rtx increment) static rtx gen_stack_pointer_inc (rtx increment) { - return gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + return gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, increment)); @@ -5672,14 +5636,14 @@ sparc_flat_expand_prologue (void) if (frame_pointer_needed) { - insn = emit_insn (gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + insn = emit_insn (gen_rtx_SET (hard_frame_pointer_rtx, gen_rtx_MINUS (Pmode, stack_pointer_rtx, size_rtx))); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + gen_rtx_SET (hard_frame_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, size))); } @@ -5692,8 +5656,7 @@ sparc_flat_expand_prologue (void) insn = emit_move_insn (i7, o7); RTX_FRAME_RELATED_P (insn) = 1; - add_reg_note (insn, REG_CFA_REGISTER, - gen_rtx_SET (VOIDmode, i7, o7)); + add_reg_note (insn, REG_CFA_REGISTER, gen_rtx_SET (i7, o7)); /* Prevent this instruction from ever being considered dead, even if this function has no epilogue. */ @@ -8090,7 +8053,7 @@ sparc_emit_floatunsdi (rtx *operands, machine_mode mode) emit_cmp_and_jump_insns (in, const0_rtx, LT, const0_rtx, DImode, 0, neglab); - emit_insn (gen_rtx_SET (VOIDmode, out, gen_rtx_FLOAT (mode, in))); + emit_insn (gen_rtx_SET (out, gen_rtx_FLOAT (mode, in))); emit_jump_insn (gen_jump (donelab)); emit_barrier (); @@ -8099,8 +8062,8 @@ sparc_emit_floatunsdi (rtx *operands, machine_mode mode) emit_insn (gen_lshrdi3 (i0, in, const1_rtx)); emit_insn (gen_anddi3 (i1, in, const1_rtx)); emit_insn (gen_iordi3 (i0, i0, i1)); - emit_insn (gen_rtx_SET (VOIDmode, f0, gen_rtx_FLOAT (mode, i0))); - emit_insn (gen_rtx_SET (VOIDmode, out, gen_rtx_PLUS (mode, f0, f0))); + emit_insn (gen_rtx_SET (f0, gen_rtx_FLOAT (mode, i0))); + emit_insn (gen_rtx_SET (out, gen_rtx_PLUS (mode, f0, f0))); emit_label (donelab); } @@ -8127,17 +8090,15 @@ sparc_emit_fixunsdi (rtx *operands, machine_mode mode) REAL_VALUE_ATOF ("9223372036854775808.0", mode), mode)); emit_cmp_and_jump_insns (in, limit, GE, NULL_RTX, mode, 0, neglab); - emit_insn (gen_rtx_SET (VOIDmode, - out, + emit_insn (gen_rtx_SET (out, gen_rtx_FIX (DImode, gen_rtx_FIX (mode, in)))); emit_jump_insn (gen_jump (donelab)); emit_barrier (); emit_label (neglab); - emit_insn (gen_rtx_SET (VOIDmode, f0, gen_rtx_MINUS (mode, in, limit))); - emit_insn (gen_rtx_SET (VOIDmode, - i0, + emit_insn (gen_rtx_SET (f0, gen_rtx_MINUS (mode, in, limit))); + emit_insn (gen_rtx_SET (i0, gen_rtx_FIX (DImode, gen_rtx_FIX (mode, f0)))); emit_insn (gen_movdi (i1, const1_rtx)); emit_insn (gen_ashldi3 (i1, i1, GEN_INT (63))); @@ -11271,17 +11232,15 @@ emit_and_preserve (rtx seq, rtx reg, rtx reg2) SPARC_STACK_BIAS + offset)); emit_insn (gen_stack_pointer_inc (GEN_INT (-size))); - emit_insn (gen_rtx_SET (VOIDmode, slot, reg)); + emit_insn (gen_rtx_SET (slot, reg)); if (reg2) - emit_insn (gen_rtx_SET (VOIDmode, - adjust_address (slot, word_mode, UNITS_PER_WORD), + emit_insn (gen_rtx_SET (adjust_address (slot, word_mode, UNITS_PER_WORD), reg2)); emit_insn (seq); if (reg2) - emit_insn (gen_rtx_SET (VOIDmode, - reg2, + emit_insn (gen_rtx_SET (reg2, adjust_address (slot, word_mode, UNITS_PER_WORD))); - emit_insn (gen_rtx_SET (VOIDmode, reg, slot)); + emit_insn (gen_rtx_SET (reg, slot)); emit_insn (gen_stack_pointer_inc (GEN_INT (size))); } @@ -11440,11 +11399,9 @@ sparc_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED, } else if (TARGET_ARCH32) { - emit_insn (gen_rtx_SET (VOIDmode, - scratch, + emit_insn (gen_rtx_SET (scratch, gen_rtx_HIGH (SImode, funexp))); - emit_insn (gen_rtx_SET (VOIDmode, - scratch, + emit_insn (gen_rtx_SET (scratch, gen_rtx_LO_SUM (SImode, scratch, funexp))); } else /* TARGET_ARCH64 */ @@ -11724,13 +11681,11 @@ sparc_expand_compare_and_swap_12 (rtx bool_result, rtx result, rtx mem, rtx resv = gen_reg_rtx (SImode); rtx memsi, val, mask, cc; - emit_insn (gen_rtx_SET (VOIDmode, addr, - gen_rtx_AND (Pmode, addr1, GEN_INT (-4)))); + emit_insn (gen_rtx_SET (addr, gen_rtx_AND (Pmode, addr1, GEN_INT (-4)))); if (Pmode != SImode) addr1 = gen_lowpart (SImode, addr1); - emit_insn (gen_rtx_SET (VOIDmode, off, - gen_rtx_AND (SImode, addr1, GEN_INT (3)))); + emit_insn (gen_rtx_SET (off, gen_rtx_AND (SImode, addr1, GEN_INT (3)))); memsi = gen_rtx_MEM (SImode, addr); set_mem_alias_set (memsi, ALIAS_SET_MEMORY_BARRIER); @@ -11738,49 +11693,41 @@ sparc_expand_compare_and_swap_12 (rtx bool_result, rtx result, rtx mem, val = copy_to_reg (memsi); - emit_insn (gen_rtx_SET (VOIDmode, off, + emit_insn (gen_rtx_SET (off, gen_rtx_XOR (SImode, off, GEN_INT (GET_MODE (mem) == QImode ? 3 : 2)))); - emit_insn (gen_rtx_SET (VOIDmode, off, - gen_rtx_ASHIFT (SImode, off, GEN_INT (3)))); + emit_insn (gen_rtx_SET (off, gen_rtx_ASHIFT (SImode, off, GEN_INT (3)))); if (GET_MODE (mem) == QImode) mask = force_reg (SImode, GEN_INT (0xff)); else mask = force_reg (SImode, GEN_INT (0xffff)); - emit_insn (gen_rtx_SET (VOIDmode, mask, - gen_rtx_ASHIFT (SImode, mask, off))); + emit_insn (gen_rtx_SET (mask, gen_rtx_ASHIFT (SImode, mask, off))); - emit_insn (gen_rtx_SET (VOIDmode, val, + emit_insn (gen_rtx_SET (val, gen_rtx_AND (SImode, gen_rtx_NOT (SImode, mask), val))); oldval = gen_lowpart (SImode, oldval); - emit_insn (gen_rtx_SET (VOIDmode, oldv, - gen_rtx_ASHIFT (SImode, oldval, off))); + emit_insn (gen_rtx_SET (oldv, gen_rtx_ASHIFT (SImode, oldval, off))); newval = gen_lowpart_common (SImode, newval); - emit_insn (gen_rtx_SET (VOIDmode, newv, - gen_rtx_ASHIFT (SImode, newval, off))); + emit_insn (gen_rtx_SET (newv, gen_rtx_ASHIFT (SImode, newval, off))); - emit_insn (gen_rtx_SET (VOIDmode, oldv, - gen_rtx_AND (SImode, oldv, mask))); + emit_insn (gen_rtx_SET (oldv, gen_rtx_AND (SImode, oldv, mask))); - emit_insn (gen_rtx_SET (VOIDmode, newv, - gen_rtx_AND (SImode, newv, mask))); + emit_insn (gen_rtx_SET (newv, gen_rtx_AND (SImode, newv, mask))); rtx_code_label *end_label = gen_label_rtx (); rtx_code_label *loop_label = gen_label_rtx (); emit_label (loop_label); - emit_insn (gen_rtx_SET (VOIDmode, oldvalue, - gen_rtx_IOR (SImode, oldv, val))); + emit_insn (gen_rtx_SET (oldvalue, gen_rtx_IOR (SImode, oldv, val))); - emit_insn (gen_rtx_SET (VOIDmode, newvalue, - gen_rtx_IOR (SImode, newv, val))); + emit_insn (gen_rtx_SET (newvalue, gen_rtx_IOR (SImode, newv, val))); emit_move_insn (bool_result, const1_rtx); @@ -11788,14 +11735,14 @@ sparc_expand_compare_and_swap_12 (rtx bool_result, rtx result, rtx mem, emit_cmp_and_jump_insns (res, oldvalue, EQ, NULL, SImode, 0, end_label); - emit_insn (gen_rtx_SET (VOIDmode, resv, + emit_insn (gen_rtx_SET (resv, gen_rtx_AND (SImode, gen_rtx_NOT (SImode, mask), res))); emit_move_insn (bool_result, const0_rtx); cc = gen_compare_reg_1 (NE, resv, val); - emit_insn (gen_rtx_SET (VOIDmode, val, resv)); + emit_insn (gen_rtx_SET (val, resv)); /* Use cbranchcc4 to separate the compare and branch! */ emit_jump_insn (gen_cbranchcc4 (gen_rtx_NE (VOIDmode, cc, const0_rtx), @@ -11803,11 +11750,9 @@ sparc_expand_compare_and_swap_12 (rtx bool_result, rtx result, rtx mem, emit_label (end_label); - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_AND (SImode, res, mask))); + emit_insn (gen_rtx_SET (res, gen_rtx_AND (SImode, res, mask))); - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_LSHIFTRT (SImode, res, off))); + emit_insn (gen_rtx_SET (res, gen_rtx_LSHIFTRT (SImode, res, off))); emit_move_insn (result, gen_lowpart (GET_MODE (result), res)); } @@ -12467,7 +12412,7 @@ sparc_expand_conditional_move (machine_mode mode, rtx *operands) cmp = gen_rtx_fmt_ee (rc, GET_MODE (cc_reg), cc_reg, const0_rtx); - emit_insn (gen_rtx_SET (VOIDmode, dst, + emit_insn (gen_rtx_SET (dst, gen_rtx_IF_THEN_ELSE (mode, cmp, operands[2], dst))); if (dst != operands[0]) @@ -12513,10 +12458,10 @@ sparc_expand_vcond (machine_mode mode, rtx *operands, int ccode, int fcode) gen_rtvec (3, operands[1], operands[2], gsr), UNSPEC_BSHUFFLE); - emit_insn (gen_rtx_SET (VOIDmode, mask, fcmp)); - emit_insn (gen_rtx_SET (VOIDmode, gsr, cmask)); + emit_insn (gen_rtx_SET (mask, fcmp)); + emit_insn (gen_rtx_SET (gsr, cmask)); - emit_insn (gen_rtx_SET (VOIDmode, operands[0], bshuf)); + emit_insn (gen_rtx_SET (operands[0], bshuf)); } /* On sparc, any mode which naturally allocates into the float diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md index 5ec0bf1777d..d059cc189d0 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md @@ -3681,7 +3681,7 @@ if (! TARGET_ARCH64) { emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, operands[0], + gen_rtx_SET (operands[0], gen_rtx_PLUS (DImode, operands[1], operands[2])), gen_rtx_CLOBBER (VOIDmode, @@ -3871,7 +3871,7 @@ if (! TARGET_ARCH64) { emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, operands[0], + gen_rtx_SET (operands[0], gen_rtx_MINUS (DImode, operands[1], operands[2])), gen_rtx_CLOBBER (VOIDmode, @@ -5152,7 +5152,7 @@ emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, operand0, + gen_rtx_SET (operand0, gen_rtx_NEG (DImode, operand1)), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CCmode, @@ -6209,7 +6209,7 @@ (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (3, - gen_rtx_SET (VOIDmode, pc_rtx, XEXP (operands[0], 0)), + gen_rtx_SET (pc_rtx, XEXP (operands[0], 0)), operands[3], gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, 15))))); else @@ -6217,7 +6217,7 @@ (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, - gen_rtx_SET (VOIDmode, pc_rtx, XEXP (operands[0], 0)), + gen_rtx_SET (pc_rtx, XEXP (operands[0], 0)), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, 15))))); goto finish_call; } @@ -6361,7 +6361,7 @@ fn_rtx = operands[1]; vec = gen_rtvec (2, - gen_rtx_SET (VOIDmode, operands[0], + gen_rtx_SET (operands[0], gen_rtx_CALL (VOIDmode, fn_rtx, const0_rtx)), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, 15))); diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c index e99cea37d05..a03b87e635c 100644 --- a/gcc/config/spu/spu.c +++ b/gcc/config/spu/spu.c @@ -467,7 +467,7 @@ spu_expand_extv (rtx ops[], int unsignedp) gcc_assert (REG_P (r) && SCALAR_INT_MODE_P (GET_MODE (r))); s0 = gen_reg_rtx (TImode); if (GET_MODE_SIZE (GET_MODE (r)) < GET_MODE_SIZE (TImode)) - emit_insn (gen_rtx_SET (VOIDmode, s0, gen_rtx_ZERO_EXTEND (TImode, r))); + emit_insn (gen_rtx_SET (s0, gen_rtx_ZERO_EXTEND (TImode, r))); else emit_move_insn (s0, src); } @@ -960,7 +960,7 @@ spu_emit_branch_or_set (int is_set, rtx cmp, rtx operands[]) bcomp = gen_rtx_NE (comp_mode, compare_result, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands[3]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); } @@ -1003,7 +1003,7 @@ spu_emit_branch_or_set (int is_set, rtx cmp, rtx operands[]) { rtx target = operands[0]; if (reverse_test) - emit_insn (gen_rtx_SET (VOIDmode, compare_result, + emit_insn (gen_rtx_SET (compare_result, gen_rtx_NOT (comp_mode, compare_result))); if (GET_MODE (target) == SImode && GET_MODE (compare_result) == HImode) emit_insn (gen_extendhisi2 (target, compare_result)); @@ -1552,8 +1552,7 @@ spu_split_immediate (rtx * ops) hi = array_to_constant (imode, arrhi); lo = array_to_constant (imode, arrlo); emit_move_insn (temp, hi); - emit_insn (gen_rtx_SET - (VOIDmode, to, gen_rtx_IOR (imode, temp, lo))); + emit_insn (gen_rtx_SET (to, gen_rtx_IOR (imode, temp, lo))); return 1; } case IC_FSMBI2: @@ -1582,8 +1581,7 @@ spu_split_immediate (rtx * ops) reg_fsmbi = array_to_constant (imode, arr_fsmbi); reg_and = array_to_constant (imode, arr_andbi); emit_move_insn (to, reg_fsmbi); - emit_insn (gen_rtx_SET - (VOIDmode, to, gen_rtx_AND (imode, to, reg_and))); + emit_insn (gen_rtx_SET (to, gen_rtx_AND (imode, to, reg_and))); return 1; } case IC_POOL: @@ -4381,7 +4379,7 @@ ea_load_store_inline (rtx mem, bool is_store, rtx ea_addr, rtx data_addr) hit_label = gen_label_rtx (); hit_ref = gen_rtx_LABEL_REF (VOIDmode, hit_label); bcomp = gen_rtx_NE (SImode, tag_eq_pack_si, const0_rtx); - insn = emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + insn = emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, hit_ref, pc_rtx))); /* Say that this branch is very likely to happen. */ @@ -4551,7 +4549,7 @@ spu_convert_move (rtx dst, rtx src) rtx reg; gcc_assert (GET_MODE (src) == TImode); reg = int_mode != mode ? gen_reg_rtx (int_mode) : dst; - emit_insn (gen_rtx_SET (VOIDmode, reg, + emit_insn (gen_rtx_SET (reg, gen_rtx_TRUNCATE (int_mode, gen_rtx_LSHIFTRT (TImode, src, GEN_INT (int_mode == DImode ? 64 : 96))))); @@ -6500,8 +6498,7 @@ spu_expand_builtin_1 (struct spu_builtin_description *d, /* negate addr */ op = gen_reg_rtx (GET_MODE (addr)); - emit_insn (gen_rtx_SET (VOIDmode, op, - gen_rtx_NEG (GET_MODE (addr), addr))); + emit_insn (gen_rtx_SET (op, gen_rtx_NEG (GET_MODE (addr), addr))); op = gen_rtx_MEM (mode, op); pat = GEN_FCN (icode) (target, op); diff --git a/gcc/config/spu/spu.md b/gcc/config/spu/spu.md index e6655db58b0..1dc07adb1ab 100644 --- a/gcc/config/spu/spu.md +++ b/gcc/config/spu/spu.md @@ -4014,7 +4014,7 @@ selb\t%0,%4,%0,%3" (unspec [(match_operand 1 "spu_reg_operand" "r")] UNSPEC_EXTEND_CMP))] "" { - emit_insn (gen_rtx_SET (VOIDmode, operands[0], + emit_insn (gen_rtx_SET (operands[0], gen_rtx_UNSPEC (GET_MODE (operands[0]), gen_rtvec (1, operands[1]), UNSPEC_EXTEND_CMP))); @@ -4516,7 +4516,7 @@ selb\t%0,%4,%0,%3" emit_move_insn (s0, gen_rtx_PLUS (SImode, s0, GEN_INT (-1))); bcomp = gen_rtx_NE(SImode, s0, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands [1]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); @@ -5078,9 +5078,9 @@ DONE; loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands[2]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, - gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, - loc_ref, pc_rtx))); + emit_jump_insn (gen_rtx_SET (pc_rtx, + gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, + loc_ref, pc_rtx))); DONE; }) diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c index 1a43b58e4e0..b97b230edfd 100644 --- a/gcc/config/stormy16/stormy16.c +++ b/gcc/config/stormy16/stormy16.c @@ -256,7 +256,7 @@ xstormy16_emit_cbranch (enum rtx_code code, rtx op0, rtx op1, rtx loc) condition_rtx = gen_rtx_fmt_ee (code, mode, op0, op1); loc_ref = gen_rtx_LABEL_REF (VOIDmode, loc); - branch = gen_rtx_SET (VOIDmode, pc_rtx, + branch = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, condition_rtx, loc_ref, pc_rtx)); @@ -270,7 +270,7 @@ xstormy16_emit_cbranch (enum rtx_code code, rtx op0, rtx op1, rtx loc) { rtx sub; #if 0 - sub = gen_rtx_SET (VOIDmode, op0, gen_rtx_MINUS (SImode, op0, op1)); + sub = gen_rtx_SET (op0, gen_rtx_MINUS (SImode, op0, op1)); #else sub = gen_rtx_CLOBBER (SImode, op0); #endif @@ -865,7 +865,7 @@ xstormy16_split_move (machine_mode mode, rtx dest, rtx src) gcc_assert (GET_CODE (w_src) != SUBREG && GET_CODE (w_dest) != SUBREG); - insn = emit_insn (gen_rtx_SET (VOIDmode, w_dest, w_src)); + insn = emit_insn (gen_rtx_SET (w_dest, w_src)); if (auto_inc_reg_rtx) REG_NOTES (insn) = alloc_EXPR_LIST (REG_INC, auto_inc_reg_rtx, @@ -884,7 +884,7 @@ xstormy16_expand_move (machine_mode mode, rtx dest, rtx src) rtx pmv = XEXP (dest, 0); rtx dest_reg = XEXP (pmv, 0); rtx dest_mod = XEXP (pmv, 1); - rtx set = gen_rtx_SET (Pmode, dest_reg, dest_mod); + rtx set = gen_rtx_SET (dest_reg, dest_mod); rtx clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (BImode, CARRY_REGNUM)); dest = gen_rtx_MEM (mode, dest_reg); @@ -895,7 +895,7 @@ xstormy16_expand_move (machine_mode mode, rtx dest, rtx src) rtx pmv = XEXP (src, 0); rtx src_reg = XEXP (pmv, 0); rtx src_mod = XEXP (pmv, 1); - rtx set = gen_rtx_SET (Pmode, src_reg, src_mod); + rtx set = gen_rtx_SET (src_reg, src_mod); rtx clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (BImode, CARRY_REGNUM)); src = gen_rtx_MEM (mode, src_reg); @@ -921,7 +921,7 @@ xstormy16_expand_move (machine_mode mode, rtx dest, rtx src) return; } - emit_insn (gen_rtx_SET (VOIDmode, dest, src)); + emit_insn (gen_rtx_SET (dest, src)); } /* Stack Layout: @@ -1047,7 +1047,7 @@ emit_addhi3_postreload (rtx dest, rtx src0, rtx src1) { rtx set, clobber, insn; - set = gen_rtx_SET (VOIDmode, dest, gen_rtx_PLUS (HImode, src0, src1)); + set = gen_rtx_SET (dest, gen_rtx_PLUS (HImode, src0, src1)); clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (BImode, CARRY_REGNUM)); insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, clobber))); return insn; @@ -1098,10 +1098,9 @@ xstormy16_expand_prologue (void) dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2)); - XVECEXP (dwarf, 0, 0) = gen_rtx_SET (VOIDmode, - gen_rtx_MEM (Pmode, stack_pointer_rtx), + XVECEXP (dwarf, 0, 0) = gen_rtx_SET (gen_rtx_MEM (Pmode, stack_pointer_rtx), reg); - XVECEXP (dwarf, 0, 1) = gen_rtx_SET (Pmode, stack_pointer_rtx, + XVECEXP (dwarf, 0, 1) = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, GET_MODE_SIZE (Pmode))); @@ -1122,10 +1121,9 @@ xstormy16_expand_prologue (void) dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2)); - XVECEXP (dwarf, 0, 0) = gen_rtx_SET (VOIDmode, - gen_rtx_MEM (Pmode, stack_pointer_rtx), + XVECEXP (dwarf, 0, 0) = gen_rtx_SET (gen_rtx_MEM (Pmode, stack_pointer_rtx), reg); - XVECEXP (dwarf, 0, 1) = gen_rtx_SET (Pmode, stack_pointer_rtx, + XVECEXP (dwarf, 0, 1) = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, GET_MODE_SIZE (Pmode))); @@ -1960,7 +1958,7 @@ xstormy16_expand_call (rtx retval, rtx dest, rtx counter) call = gen_rtx_CALL (mode, gen_rtx_MEM (FUNCTION_MODE, dest), counter); if (retval) - call = gen_rtx_SET (VOIDmode, retval, call); + call = gen_rtx_SET (retval, call); if (! CONSTANT_P (dest)) { @@ -2028,10 +2026,10 @@ xstormy16_expand_arith (machine_mode mode, enum rtx_code code, sub_1 = gen_rtx_MINUS (HImode, w_src0, gen_rtx_ZERO_EXTEND (HImode, gen_rtx_REG (BImode, CARRY_REGNUM))); - sub = gen_rtx_SET (VOIDmode, w_dest, + sub = gen_rtx_SET (w_dest, gen_rtx_MINUS (HImode, sub_1, w_src1)); clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (BImode, CARRY_REGNUM)); - branch = gen_rtx_SET (VOIDmode, pc_rtx, + branch = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_EQ (HImode, sub_1, @@ -2059,12 +2057,12 @@ xstormy16_expand_arith (machine_mode mode, enum rtx_code code, && INTVAL (w_src1) == -(code == AND)) continue; - insn = gen_rtx_SET (VOIDmode, w_dest, gen_rtx_fmt_ee (code, mode, - w_src0, w_src1)); + insn = gen_rtx_SET (w_dest, gen_rtx_fmt_ee (code, mode, + w_src0, w_src1)); break; case NOT: - insn = gen_rtx_SET (VOIDmode, w_dest, gen_rtx_NOT (mode, w_src0)); + insn = gen_rtx_SET (w_dest, gen_rtx_NOT (mode, w_src0)); break; default: diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c index e403c326579..129ac8a6aee 100644 --- a/gcc/config/tilegx/tilegx.c +++ b/gcc/config/tilegx/tilegx.c @@ -2456,8 +2456,7 @@ tilegx_emit_setcc_internal (rtx res, enum rtx_code code, rtx op0, rtx op1, op1 = force_reg (cmp_mode, op1); /* Return the setcc comparison. */ - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_fmt_ee (code, DImode, op0, op1))); + emit_insn (gen_rtx_SET (res, gen_rtx_fmt_ee (code, DImode, op0, op1))); return true; } @@ -2627,7 +2626,7 @@ tilegx_emit_conditional_branch (rtx operands[], machine_mode cmp_mode) rtx cmp_rtx = tilegx_emit_cc_test (GET_CODE (operands[0]), operands[1], operands[2], cmp_mode, false); - rtx branch_rtx = gen_rtx_SET (VOIDmode, pc_rtx, + rtx branch_rtx = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, cmp_rtx, gen_rtx_LABEL_REF (VOIDmode, @@ -3778,7 +3777,7 @@ frame_emit_store (int regno, int regno_note, rtx addr, rtx cfa, rtx reg_note = gen_rtx_REG (DImode, regno_note); rtx cfa_relative_addr = gen_rtx_PLUS (Pmode, cfa, GEN_INT (cfa_offset)); rtx cfa_relative_mem = gen_frame_mem (DImode, cfa_relative_addr); - rtx real = gen_rtx_SET (VOIDmode, cfa_relative_mem, reg_note); + rtx real = gen_rtx_SET (cfa_relative_mem, reg_note); add_reg_note (mov, REG_CFA_OFFSET, real); return emit_insn (mov); @@ -3874,7 +3873,7 @@ emit_sp_adjust (int offset, int *next_scratch_regno, bool frame_related, /* Describe what just happened in a way that dwarf understands. */ if (frame_related) { - rtx real = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + rtx real = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, imm_rtx)); RTX_FRAME_RELATED_P (insn) = 1; @@ -3960,7 +3959,7 @@ compute_frame_addr (int offset_from_fp, int *next_scratch_regno) offset_rtx = tmp_reg_rtx; } - emit_insn (gen_rtx_SET (VOIDmode, tmp_reg_rtx, + emit_insn (gen_rtx_SET (tmp_reg_rtx, gen_rtx_PLUS (Pmode, base_reg_rtx, offset_rtx))); return tmp_reg_rtx; @@ -4097,7 +4096,7 @@ tilegx_expand_prologue (void) original stack pointer, not the one after we have pushed the frame. */ rtx p = gen_rtx_PLUS (Pmode, stack_pointer_rtx, size_rtx); - emit_insn (gen_rtx_SET (VOIDmode, chain_addr, p)); + emit_insn (gen_rtx_SET (chain_addr, p)); emit_sp_adjust (-total_size, &next_scratch_regno, !frame_pointer_needed, NULL_RTX); } @@ -4110,7 +4109,7 @@ tilegx_expand_prologue (void) !frame_pointer_needed, NULL_RTX); p = gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (UNITS_PER_WORD)); - emit_insn (gen_rtx_SET (VOIDmode, chain_addr, p)); + emit_insn (gen_rtx_SET (chain_addr, p)); } /* Save our frame pointer for backtrace chaining. */ @@ -4144,7 +4143,7 @@ tilegx_expand_prologue (void) register. */ int stride = ROUND_ROBIN_SIZE * -UNITS_PER_WORD; rtx p = gen_rtx_PLUS (Pmode, r, GEN_INT (stride)); - emit_insn (gen_rtx_SET (VOIDmode, r, p)); + emit_insn (gen_rtx_SET (r, p)); } /* Save this register to the stack (but use the old fp value @@ -4237,7 +4236,7 @@ tilegx_expand_epilogue (bool sibcall_p) /* Advance to the next stack slot to store this register. */ int stride = ROUND_ROBIN_SIZE * -UNITS_PER_WORD; rtx p = gen_rtx_PLUS (Pmode, r, GEN_INT (stride)); - emit_insn (gen_rtx_SET (VOIDmode, r, p)); + emit_insn (gen_rtx_SET (r, p)); } if (fp_copy_regno >= 0 && regno == HARD_FRAME_POINTER_REGNUM) diff --git a/gcc/config/tilegx/tilegx.md b/gcc/config/tilegx/tilegx.md index 7ece171a1ec..731828bd16f 100644 --- a/gcc/config/tilegx/tilegx.md +++ b/gcc/config/tilegx/tilegx.md @@ -2444,7 +2444,7 @@ emit_move_insn (s0, gen_rtx_PLUS (mode, s0, GEN_INT (-1))); bcomp = gen_rtx_NE(mode, s0, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands [1]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); DONE; @@ -5533,7 +5533,7 @@ rtx ssp_addr = gen_rtx_PLUS (Pmode, tp, GEN_INT (TARGET_THREAD_SSP_OFFSET)); rtx ssp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, ssp, ssp_addr)); + emit_insn (gen_rtx_SET (ssp, ssp_addr)); operands[1] = gen_rtx_MEM (Pmode, ssp); #endif @@ -5580,7 +5580,7 @@ rtx ssp_addr = gen_rtx_PLUS (Pmode, tp, GEN_INT (TARGET_THREAD_SSP_OFFSET)); rtx ssp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, ssp, ssp_addr)); + emit_insn (gen_rtx_SET (ssp, ssp_addr)); operands[1] = gen_rtx_MEM (Pmode, ssp); #endif @@ -5598,7 +5598,7 @@ loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands[2]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c index f534b036e33..6ed4a04df9f 100644 --- a/gcc/config/tilepro/tilepro.c +++ b/gcc/config/tilepro/tilepro.c @@ -2279,8 +2279,7 @@ tilepro_emit_setcc_internal (rtx res, enum rtx_code code, rtx op0, rtx op1, op1 = force_reg (SImode, op1); /* Return the setcc comparison. */ - emit_insn (gen_rtx_SET (VOIDmode, res, - gen_rtx_fmt_ee (code, SImode, op0, op1))); + emit_insn (gen_rtx_SET (res, gen_rtx_fmt_ee (code, SImode, op0, op1))); return true; } @@ -2431,7 +2430,7 @@ tilepro_emit_conditional_branch (rtx operands[], machine_mode cmp_mode) rtx cmp_rtx = tilepro_emit_cc_test (GET_CODE (operands[0]), operands[1], operands[2], cmp_mode, false); - rtx branch_rtx = gen_rtx_SET (VOIDmode, pc_rtx, + rtx branch_rtx = gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, cmp_rtx, gen_rtx_LABEL_REF (VOIDmode, @@ -3324,7 +3323,7 @@ frame_emit_store (int regno, int regno_note, rtx addr, rtx cfa, rtx reg_note = gen_rtx_REG (Pmode, regno_note); rtx cfa_relative_addr = gen_rtx_PLUS (Pmode, cfa, gen_int_si (cfa_offset)); rtx cfa_relative_mem = gen_frame_mem (Pmode, cfa_relative_addr); - rtx real = gen_rtx_SET (VOIDmode, cfa_relative_mem, reg_note); + rtx real = gen_rtx_SET (cfa_relative_mem, reg_note); add_reg_note (mov, REG_CFA_OFFSET, real); return emit_insn (mov); @@ -3415,7 +3414,7 @@ emit_sp_adjust (int offset, int *next_scratch_regno, bool frame_related, /* Describe what just happened in a way that dwarf understands. */ if (frame_related) { - rtx real = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + rtx real = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, imm_rtx)); RTX_FRAME_RELATED_P (insn) = 1; @@ -3497,7 +3496,7 @@ compute_frame_addr (int offset_from_fp, int *next_scratch_regno) if (!tilepro_expand_addsi (tmp_reg_rtx, base_reg_rtx, offset_rtx)) { - emit_insn (gen_rtx_SET (VOIDmode, tmp_reg_rtx, + emit_insn (gen_rtx_SET (tmp_reg_rtx, gen_rtx_PLUS (Pmode, base_reg_rtx, offset_rtx))); } @@ -3635,7 +3634,7 @@ tilepro_expand_prologue (void) original stack pointer, not the one after we have pushed the frame. */ rtx p = gen_rtx_PLUS (Pmode, stack_pointer_rtx, size_rtx); - emit_insn (gen_rtx_SET (VOIDmode, chain_addr, p)); + emit_insn (gen_rtx_SET (chain_addr, p)); emit_sp_adjust (-total_size, &next_scratch_regno, !frame_pointer_needed, NULL_RTX); } @@ -3648,7 +3647,7 @@ tilepro_expand_prologue (void) !frame_pointer_needed, NULL_RTX); p = gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (UNITS_PER_WORD)); - emit_insn (gen_rtx_SET (VOIDmode, chain_addr, p)); + emit_insn (gen_rtx_SET (chain_addr, p)); } /* Save our frame pointer for backtrace chaining. */ @@ -3675,14 +3674,14 @@ tilepro_expand_prologue (void) r = gen_rtx_REG (word_mode, next_scratch_regno--); reg_save_addr[which_scratch] = r; - emit_insn (gen_rtx_SET (VOIDmode, r, p)); + emit_insn (gen_rtx_SET (r, p)); } else { /* Advance to the next stack slot to store this register. */ int stride = ROUND_ROBIN_SIZE * -UNITS_PER_WORD; rtx p = gen_rtx_PLUS (Pmode, r, GEN_INT (stride)); - emit_insn (gen_rtx_SET (VOIDmode, r, p)); + emit_insn (gen_rtx_SET (r, p)); } /* Save this register to the stack (but use the old fp value @@ -3776,7 +3775,7 @@ tilepro_expand_epilogue (bool sibcall_p) register. */ int stride = ROUND_ROBIN_SIZE * -UNITS_PER_WORD; rtx p = gen_rtx_PLUS (Pmode, r, GEN_INT (stride)); - emit_insn (gen_rtx_SET (VOIDmode, r, p)); + emit_insn (gen_rtx_SET (r, p)); } if (fp_copy_regno >= 0 && regno == HARD_FRAME_POINTER_REGNUM) diff --git a/gcc/config/tilepro/tilepro.md b/gcc/config/tilepro/tilepro.md index 21807db7ee9..a97ebf9eb22 100644 --- a/gcc/config/tilepro/tilepro.md +++ b/gcc/config/tilepro/tilepro.md @@ -1336,7 +1336,7 @@ emit_move_insn (s0, gen_rtx_PLUS (SImode, s0, GEN_INT (-1))); bcomp = gen_rtx_NE(SImode, s0, const0_rtx); loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands [1]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); DONE; @@ -3741,7 +3741,7 @@ rtx ssp_addr = gen_rtx_PLUS (Pmode, tp, GEN_INT (TARGET_THREAD_SSP_OFFSET)); rtx ssp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, ssp, ssp_addr)); + emit_insn (gen_rtx_SET (ssp, ssp_addr)); operands[1] = gen_rtx_MEM (Pmode, ssp); #endif @@ -3776,7 +3776,7 @@ rtx ssp_addr = gen_rtx_PLUS (Pmode, tp, GEN_INT (TARGET_THREAD_SSP_OFFSET)); rtx ssp = gen_reg_rtx (Pmode); - emit_insn (gen_rtx_SET (VOIDmode, ssp, ssp_addr)); + emit_insn (gen_rtx_SET (ssp, ssp_addr)); operands[1] = gen_rtx_MEM (Pmode, ssp); #endif @@ -3790,7 +3790,7 @@ loc_ref = gen_rtx_LABEL_REF (VOIDmode, operands[2]); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, bcomp, loc_ref, pc_rtx))); diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c index f9cc3efb6a5..58f6601a632 100644 --- a/gcc/config/v850/v850.c +++ b/gcc/config/v850/v850.c @@ -928,7 +928,7 @@ output_move_single (rtx * operands) return "%S0st%W0 %.,%0"; } - fatal_insn ("output_move_single:", gen_rtx_SET (VOIDmode, dst, src)); + fatal_insn ("output_move_single:", gen_rtx_SET (dst, src)); return ""; } @@ -1034,7 +1034,7 @@ v850_gen_compare (enum rtx_code cond, machine_mode mode, rtx op0, rtx op1) rtx cc_reg; mode = v850_gen_float_compare (cond, mode, op0, op1); cc_reg = gen_rtx_REG (mode, CC_REGNUM); - emit_insn (gen_rtx_SET(mode, cc_reg, gen_rtx_REG (mode, FCC_REGNUM))); + emit_insn (gen_rtx_SET (cc_reg, gen_rtx_REG (mode, FCC_REGNUM))); return gen_rtx_fmt_ee (cond, mode, cc_reg, const0_rtx); } @@ -1240,10 +1240,10 @@ Saved %d bytes (%d uses of register %s) in function %s, starting as insn %d, end && SET_SRC (PATTERN (insn)) == *p_r1) delete_insn (insn); else - emit_insn_before (gen_rtx_SET (Pmode, *p_r1, *p_ep), first_insn); + emit_insn_before (gen_rtx_SET (*p_r1, *p_ep), first_insn); - emit_insn_before (gen_rtx_SET (Pmode, *p_ep, reg), first_insn); - emit_insn_before (gen_rtx_SET (Pmode, *p_ep, *p_r1), last_insn); + emit_insn_before (gen_rtx_SET (*p_ep, reg), first_insn); + emit_insn_before (gen_rtx_SET (*p_ep, *p_r1), last_insn); } @@ -1745,8 +1745,7 @@ expand_prologue (void) + (TARGET_DISABLE_CALLT ? (TARGET_LONG_CALLS ? 2 : 1) : 0))); XVECEXP (save_all, 0, 0) - = gen_rtx_SET (VOIDmode, - stack_pointer_rtx, + = gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT(-alloc_stack))); @@ -1754,8 +1753,7 @@ expand_prologue (void) { offset -= 4; XVECEXP (save_all, 0, i+1) - = gen_rtx_SET (VOIDmode, - gen_rtx_MEM (Pmode, + = gen_rtx_SET (gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT(offset))), @@ -1903,17 +1901,16 @@ expand_epilogue (void) rtvec_alloc (num_restore + 2)); XVECEXP (restore_all, 0, 0) = ret_rtx; XVECEXP (restore_all, 0, 1) - = gen_rtx_SET (VOIDmode, stack_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (alloc_stack))); + = gen_rtx_SET (stack_pointer_rtx, + gen_rtx_PLUS (Pmode, + stack_pointer_rtx, + GEN_INT (alloc_stack))); offset = alloc_stack - 4; for (i = 0; i < num_restore; i++) { XVECEXP (restore_all, 0, i+2) - = gen_rtx_SET (VOIDmode, - restore_regs[i], + = gen_rtx_SET (restore_regs[i], gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, stack_pointer_rtx, diff --git a/gcc/config/v850/v850.md b/gcc/config/v850/v850.md index 1ed76d1f8ad..7f2c5bb1bfb 100644 --- a/gcc/config/v850/v850.md +++ b/gcc/config/v850/v850.md @@ -318,9 +318,8 @@ else temp = gen_reg_rtx (SImode); - emit_insn (gen_rtx_SET (SImode, temp, - gen_rtx_HIGH (SImode, operand1))); - emit_insn (gen_rtx_SET (SImode, operand0, + emit_insn (gen_rtx_SET (temp, gen_rtx_HIGH (SImode, operand1))); + emit_insn (gen_rtx_SET (operand0, gen_rtx_LO_SUM (SImode, temp, operand1))); DONE; } @@ -468,11 +467,11 @@ mode = v850_gen_float_compare (cond, VOIDmode, v850_compare_op0, v850_compare_op1); fcc_reg = gen_rtx_REG (mode, FCC_REGNUM); cc_reg = gen_rtx_REG (mode, CC_REGNUM); - emit_insn(gen_rtx_SET (mode, cc_reg, fcc_reg)); + emit_insn (gen_rtx_SET (cc_reg, fcc_reg)); tmp = gen_rtx_fmt_ee (cond, mode, cc_reg, const0_rtx); tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, operands[3]), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); DONE; }) @@ -522,11 +521,11 @@ mode = v850_gen_float_compare (cond, VOIDmode, v850_compare_op0, v850_compare_op1); fcc_reg = gen_rtx_REG (mode, FCC_REGNUM); cc_reg = gen_rtx_REG (mode, CC_REGNUM); - emit_insn(gen_rtx_SET (mode, cc_reg, fcc_reg)); + emit_insn (gen_rtx_SET (cc_reg, fcc_reg)); tmp = gen_rtx_fmt_ee (cond, mode, cc_reg, const0_rtx); tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp, gen_rtx_LABEL_REF (VOIDmode, operands[3]), pc_rtx); - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, tmp)); + emit_jump_insn (gen_rtx_SET (pc_rtx, tmp)); DONE; }) diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c index 3a2a6508da8..0b0d21be50b 100644 --- a/gcc/config/vax/vax.c +++ b/gcc/config/vax/vax.c @@ -172,7 +172,7 @@ vax_add_reg_cfa_offset (rtx insn, int offset, rtx src) x = plus_constant (Pmode, frame_pointer_rtx, offset); x = gen_rtx_MEM (SImode, x); - x = gen_rtx_SET (VOIDmode, x, src); + x = gen_rtx_SET (x, src); add_reg_note (insn, REG_CFA_OFFSET, x); } diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c index e656af941c1..bac91acc145 100644 --- a/gcc/config/visium/visium.c +++ b/gcc/config/visium/visium.c @@ -2076,7 +2076,7 @@ visium_expand_copysign (rtx *operands, enum machine_mode mode) x = force_reg (SImode, gen_rtx_IOR (SImode, op0, op1)); /* And move the result to the destination. */ - emit_insn (gen_rtx_SET (VOIDmode, dest, gen_lowpart (SFmode, x))); + emit_insn (gen_rtx_SET (dest, gen_lowpart (SFmode, x))); } /* Expand a cstore of OPERANDS in MODE for EQ/NE/LTU/GTU/GEU/LEU. We generate @@ -2138,7 +2138,7 @@ visium_expand_int_cstore (rtx *operands, enum machine_mode mode) emit_insn (gen_add3_insn (op0, tmp, const1_rtx)); } else - emit_insn (gen_rtx_SET (VOIDmode, op0, sltu)); + emit_insn (gen_rtx_SET (op0, sltu)); } /* Expand a cstore of OPERANDS in MODE for LT/GT/UNGE/UNLE. We generate the @@ -2186,7 +2186,7 @@ visium_expand_fp_cstore (rtx *operands, emit_insn (gen_add3_insn (op0, tmp, const1_rtx)); } else - emit_insn (gen_rtx_SET (VOIDmode, op0, slt)); + emit_insn (gen_rtx_SET (op0, slt)); } /* Split a compare-and-store with CODE, operands OP2 and OP3, combined with @@ -2204,7 +2204,7 @@ visium_split_cstore (enum rtx_code op_code, rtx op0, rtx op1, rtx flags = gen_rtx_REG (cc_mode, FLAGS_REGNUM); rtx x = gen_rtx_COMPARE (cc_mode, op2, op3); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (code, SImode, flags, const0_rtx); @@ -2224,7 +2224,7 @@ visium_split_cstore (enum rtx_code op_code, rtx op0, rtx op1, } rtx pat = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (2)); - XVECEXP (pat, 0, 0) = gen_rtx_SET (VOIDmode, op0, x); + XVECEXP (pat, 0, 0) = gen_rtx_SET (op0, x); flags = gen_rtx_REG (CCmode, FLAGS_REGNUM); XVECEXP (pat, 0, 1) = gen_rtx_CLOBBER (VOIDmode, flags); emit_insn (pat); @@ -2253,8 +2253,7 @@ expand_block_move_4 (rtx dst, rtx dst_reg, rtx src, rtx src_reg, rtx bytes_rtx) insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (8)); XVECEXP (insn, 0, 0) - = gen_rtx_SET (VOIDmode, - replace_equiv_address_nv (dst, regno_reg_rtx[1]), + = gen_rtx_SET (replace_equiv_address_nv (dst, regno_reg_rtx[1]), replace_equiv_address_nv (src, regno_reg_rtx[2])); XVECEXP (insn, 0, 1) = gen_rtx_USE (VOIDmode, regno_reg_rtx[3]); for (i = 1; i <= 6; i++) @@ -2764,13 +2763,13 @@ visium_split_cbranch (enum rtx_code code, rtx op0, rtx op1, rtx label) rtx flags = gen_rtx_REG (cc_mode, FLAGS_REGNUM); rtx x = gen_rtx_COMPARE (cc_mode, op0, op1); - x = gen_rtx_SET (VOIDmode, flags, x); + x = gen_rtx_SET (flags, x); emit_insn (x); x = gen_rtx_fmt_ee (code, VOIDmode, flags, const0_rtx); x = gen_rtx_IF_THEN_ELSE (VOIDmode, x, gen_rtx_LABEL_REF (Pmode, label), pc_rtx); - x = gen_rtx_SET (VOIDmode, pc_rtx, x); + x = gen_rtx_SET (pc_rtx, x); emit_jump_insn (x); visium_flags_exposed = true; @@ -3600,7 +3599,7 @@ visium_save_regs (int alloc, int offset, int low_regno, int high_regno) { insn = emit_frame_insn (gen_movdi (mem, tmp)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, reg)); + gen_rtx_SET (mem, reg)); } } break; @@ -3617,7 +3616,7 @@ visium_save_regs (int alloc, int offset, int low_regno, int high_regno) emit_insn (gen_movsi (tmp, reg)); insn = emit_frame_insn (gen_movsi (mem, tmp)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, reg)); + gen_rtx_SET (mem, reg)); } break; @@ -3633,7 +3632,7 @@ visium_save_regs (int alloc, int offset, int low_regno, int high_regno) emit_insn (gen_movsf (tmp, reg)); insn = emit_frame_insn (gen_movsf (mem, tmp)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, reg)); + gen_rtx_SET (mem, reg)); } break; @@ -3711,7 +3710,7 @@ visium_expand_prologue (void) stack_pointer_rtx, tmp)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (-alloc_size)))); } @@ -3899,7 +3898,7 @@ visium_restore_regs (int dealloc, int offset, int high_regno, int low_regno) /* Deallocate the stack space. */ rtx insn = emit_frame_insn (gen_stack_pop (GEN_INT (dealloc))); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (dealloc)))); visium_add_queued_cfa_restore_notes (insn); @@ -3952,7 +3951,7 @@ visium_expand_epilogue (void) rtx insn = emit_frame_insn (gen_movsi (hard_frame_pointer_rtx, src)); add_reg_note (insn, REG_CFA_ADJUST_CFA, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, hard_frame_pointer_rtx)); visium_add_cfa_restore_note (hard_frame_pointer_rtx); } @@ -4004,7 +4003,7 @@ visium_expand_epilogue (void) else insn = emit_frame_insn (gen_stack_pop (GEN_INT (pop_size))); add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, stack_pointer_rtx, + gen_rtx_SET (stack_pointer_rtx, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (pop_size)))); visium_add_queued_cfa_restore_notes (insn); diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c index eb039bac56a..1e8ecebc353 100644 --- a/gcc/config/xtensa/xtensa.c +++ b/gcc/config/xtensa/xtensa.c @@ -859,7 +859,7 @@ xtensa_expand_conditional_branch (rtx *operands, machine_mode mode) label1 = pc_rtx; } - emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx, + emit_jump_insn (gen_rtx_SET (pc_rtx, gen_rtx_IF_THEN_ELSE (VOIDmode, cmp, label1, label2))); @@ -1335,7 +1335,7 @@ xtensa_expand_block_move (rtx *operands) temp[next] = gen_reg_rtx (mode[next]); x = adjust_address (src_mem, mode[next], offset_ld); - emit_insn (gen_rtx_SET (VOIDmode, temp[next], x)); + emit_insn (gen_rtx_SET (temp[next], x)); offset_ld += next_amount; bytes -= next_amount; @@ -1347,7 +1347,7 @@ xtensa_expand_block_move (rtx *operands) active[phase] = false; x = adjust_address (dst_mem, mode[phase], offset_st); - emit_insn (gen_rtx_SET (VOIDmode, x, temp[phase])); + emit_insn (gen_rtx_SET (x, temp[phase])); offset_st += amount[phase]; } @@ -1981,8 +1981,8 @@ xtensa_legitimize_address (rtx x, { rtx temp = gen_reg_rtx (Pmode); rtx addmi_offset = GEN_INT (INTVAL (plus1) & ~0xff); - emit_insn (gen_rtx_SET (Pmode, temp, - gen_rtx_PLUS (Pmode, plus0, addmi_offset))); + emit_insn (gen_rtx_SET (temp, gen_rtx_PLUS (Pmode, plus0, + addmi_offset))); return gen_rtx_PLUS (Pmode, temp, GEN_INT (INTVAL (plus1) & 0xff)); } } @@ -2727,7 +2727,7 @@ xtensa_expand_prologue (void) insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, GEN_INT (-total_size))); RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + note_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -total_size)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); @@ -2743,7 +2743,7 @@ xtensa_expand_prologue (void) insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, GEN_INT (-xtensa_callee_save_size))); RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + note_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -xtensa_callee_save_size)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); @@ -2756,7 +2756,7 @@ xtensa_expand_prologue (void) insn = emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, tmp_reg)); RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + note_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -total_size)); add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); @@ -2776,7 +2776,7 @@ xtensa_expand_prologue (void) insn = emit_move_insn (mem, reg); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, mem, reg)); + gen_rtx_SET (mem, reg)); } } if (total_size > 1024) @@ -2787,7 +2787,7 @@ xtensa_expand_prologue (void) insn = emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, tmp_reg)); RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (VOIDmode, stack_pointer_rtx, + note_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, xtensa_callee_save_size - total_size)); @@ -2826,7 +2826,7 @@ xtensa_expand_prologue (void) stack_pointer_rtx)); if (!TARGET_WINDOWED_ABI) { - note_rtx = gen_rtx_SET (VOIDmode, hard_frame_pointer_rtx, + note_rtx = gen_rtx_SET (hard_frame_pointer_rtx, stack_pointer_rtx); RTX_FRAME_RELATED_P (insn) = 1; add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); @@ -2839,9 +2839,9 @@ xtensa_expand_prologue (void) /* Create a note to describe the CFA. Because this is only used to set DW_AT_frame_base for debug info, don't bother tracking changes through each instruction in the prologue. It just takes up space. */ - note_rtx = gen_rtx_SET (VOIDmode, (frame_pointer_needed - ? hard_frame_pointer_rtx - : stack_pointer_rtx), + note_rtx = gen_rtx_SET ((frame_pointer_needed + ? hard_frame_pointer_rtx + : stack_pointer_rtx), plus_constant (Pmode, stack_pointer_rtx, -total_size)); RTX_FRAME_RELATED_P (insn) = 1; @@ -2933,8 +2933,7 @@ xtensa_set_return_address (rtx address, rtx scratch) hard_frame_pointer_rtx : stack_pointer_rtx; rtx a0_addr = plus_constant (Pmode, frame, total_size - UNITS_PER_WORD); - rtx note = gen_rtx_SET (VOIDmode, - gen_frame_mem (SImode, a0_addr), + rtx note = gen_rtx_SET (gen_frame_mem (SImode, a0_addr), gen_rtx_REG (SImode, A0_REG)); rtx insn; diff --git a/gcc/cprop.c b/gcc/cprop.c index 845b6444b2e..57c44ef58b1 100644 --- a/gcc/cprop.c +++ b/gcc/cprop.c @@ -326,7 +326,7 @@ hash_scan_set (rtx set, rtx_insn *insn, struct hash_table_d *table, && REG_NOTE_KIND (note) == REG_EQUAL && !REG_P (src) && cprop_constant_p (XEXP (note, 0))) - src = XEXP (note, 0), set = gen_rtx_SET (VOIDmode, dest, src); + src = XEXP (note, 0), set = gen_rtx_SET (dest, src); /* Record sets for constant/copy propagation. */ if ((cprop_reg_p (src) @@ -1420,8 +1420,7 @@ find_implicit_sets (void) (implicit_sets_size - old_implicit_sets_size) * sizeof (rtx)); } - new_rtx = gen_rtx_SET (VOIDmode, XEXP (cond, 0), - XEXP (cond, 1)); + new_rtx = gen_rtx_SET (XEXP (cond, 0), XEXP (cond, 1)); implicit_sets[dest->index] = new_rtx; if (dump_file) { diff --git a/gcc/dse.c b/gcc/dse.c index 603cdbdbf77..4c9b6ed7ee9 100644 --- a/gcc/dse.c +++ b/gcc/dse.c @@ -2608,7 +2608,7 @@ scan_insn (bb_info_t bb_info, rtx_insn *insn) { rtx mem = gen_rtx_MEM (BLKmode, args[0]); set_mem_size (mem, INTVAL (args[2])); - body = gen_rtx_SET (VOIDmode, mem, args[1]); + body = gen_rtx_SET (mem, args[1]); mems_found += record_store (body, bb_info); if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, "handling memset as BLKmode store\n"); diff --git a/gcc/expr.c b/gcc/expr.c index 25aa11f06e6..a02676832d0 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -210,7 +210,7 @@ init_expr_target (void) reg = gen_rtx_REG (VOIDmode, -1); insn = rtx_alloc (INSN); - pat = gen_rtx_SET (VOIDmode, NULL_RTX, NULL_RTX); + pat = gen_rtx_SET (NULL_RTX, NULL_RTX); PATTERN (insn) = pat; for (mode = VOIDmode; (int) mode < NUM_MACHINE_MODES; diff --git a/gcc/gcse.c b/gcc/gcse.c index cf02bab5bff..d9c5106fb60 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -586,7 +586,7 @@ compute_can_copy (void) can_copy[i] = 0; #else reg = gen_rtx_REG ((machine_mode) i, LAST_VIRTUAL_REGISTER + 1); - insn = emit_insn (gen_rtx_SET (VOIDmode, reg, reg)); + insn = emit_insn (gen_rtx_SET (reg, reg)); if (recog (PATTERN (insn), insn, NULL) >= 0) can_copy[i] = 1; #endif @@ -884,8 +884,7 @@ can_assign_to_reg_without_clobbers_p (rtx x) if (test_insn == 0) { test_insn - = make_insn_raw (gen_rtx_SET (VOIDmode, - gen_rtx_REG (word_mode, + = make_insn_raw (gen_rtx_SET (gen_rtx_REG (word_mode, FIRST_PSEUDO_REGISTER * 2), const0_rtx)); SET_NEXT_INSN (test_insn) = SET_PREV_INSN (test_insn) = 0; @@ -1288,7 +1287,7 @@ hash_scan_set (rtx set, rtx_insn *insn, struct gcse_hash_table_d *table) && REG_NOTE_KIND (note) == REG_EQUAL && !REG_P (src) && want_to_gcse_p (XEXP (note, 0), NULL)) - src = XEXP (note, 0), set = gen_rtx_SET (VOIDmode, dest, src); + src = XEXP (note, 0), set = gen_rtx_SET (dest, src); /* Only record sets of pseudo-regs in the hash table. */ if (regno >= FIRST_PSEUDO_REGISTER @@ -2008,7 +2007,7 @@ process_insert_insn (struct gcse_expr *expr) insn will be recognized (this also adds any needed CLOBBERs). */ else { - rtx_insn *insn = emit_insn (gen_rtx_SET (VOIDmode, reg, exp)); + rtx_insn *insn = emit_insn (gen_rtx_SET (reg, exp)); if (insn_invalid_p (insn, false)) gcc_unreachable (); diff --git a/gcc/genemit.c b/gcc/genemit.c index 1bcb66b682b..ec8c86cc9ec 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -94,6 +94,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used) int i; int len; const char *fmt; + const char *sep = ""; if (x == 0) { @@ -215,7 +216,12 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used) printf ("gen_rtx_"); print_code (code); - printf (" (%smode", GET_MODE_NAME (GET_MODE (x))); + printf (" ("); + if (!always_void_p (code)) + { + printf ("%smode", GET_MODE_NAME (GET_MODE (x))); + sep = ",\n\t"; + } fmt = GET_RTX_FORMAT (code); len = GET_RTX_LENGTH (code); @@ -223,7 +229,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used) { if (fmt[i] == '0') break; - printf (",\n\t"); + fputs (sep, stdout); switch (fmt[i]) { case 'e': case 'u': @@ -254,6 +260,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used) default: gcc_unreachable (); } + sep = ",\n\t"; } printf (")"); } diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c index ae765bfaa70..1662f2714da 100644 --- a/gcc/gengenrtl.c +++ b/gcc/gengenrtl.c @@ -116,6 +116,14 @@ special_format (const char *fmt) || strchr (fmt, 'n') != 0); } +/* Return true if CODE always has VOIDmode. */ + +static inline bool +always_void_p (int idx) +{ + return strcmp (defs[idx].enumname, "SET") == 0; +} + /* Return nonzero if the RTL code given by index IDX is one that we should generate a gen_rtx_raw_FOO macro for, not gen_rtx_FOO (because gen_rtx_FOO is a wrapper in emit-rtl.c). */ @@ -181,6 +189,7 @@ static void genmacro (int idx) { const char *p; + const char *sep = ""; int i; /* We write a macro that defines gen_rtx_RTLCODE to be an equivalent to @@ -190,15 +199,25 @@ genmacro (int idx) /* Don't define a macro for this code. */ return; - printf ("#define gen_rtx_%s%s(MODE", + bool has_mode_p = !always_void_p (idx); + printf ("#define gen_rtx_%s%s(", special_rtx (idx) ? "raw_" : "", defs[idx].enumname); + if (has_mode_p) + { + printf ("MODE"); + sep = ", "; + } for (p = defs[idx].format, i = 0; *p != 0; p++) if (*p != '0') - printf (", ARG%d", i++); - - printf (") \\\n gen_rtx_fmt_%s (%s, (MODE)", - defs[idx].format, defs[idx].enumname); + { + printf ("%sARG%d", sep, i++); + sep = ", "; + } + + printf (") \\\n gen_rtx_fmt_%s (%s, %s", + defs[idx].format, defs[idx].enumname, + has_mode_p ? "(MODE)" : "VOIDmode"); for (p = defs[idx].format, i = 0; *p != 0; p++) if (*p != '0') diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 8d8d4a84640..fc7c4f1f518 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -895,7 +895,7 @@ noce_emit_store_flag (struct noce_if_info *if_info, rtx x, int reversep, { rtx src = gen_rtx_fmt_ee (code, GET_MODE (x), XEXP (cond, 0), XEXP (cond, 1)); - rtx set = gen_rtx_SET (VOIDmode, x, src); + rtx set = gen_rtx_SET (x, src); start_sequence (); rtx_insn *insn = emit_insn (set); @@ -945,7 +945,7 @@ noce_emit_move_insn (rtx x, rtx y) otherwise construct a suitable SET pattern ourselves. */ insn = (OBJECT_P (y) || CONSTANT_P (y) || GET_CODE (y) == SUBREG) ? emit_move_insn (x, y) - : emit_insn (gen_rtx_SET (VOIDmode, x, y)); + : emit_insn (gen_rtx_SET (x, y)); seq = get_insns (); end_sequence (); @@ -1477,7 +1477,7 @@ noce_emit_cmove (struct noce_if_info *if_info, rtx x, enum rtx_code code, rtx cond = gen_rtx_fmt_ee (code, GET_MODE (if_info->cond), cmp_a, cmp_b); rtx if_then_else = gen_rtx_IF_THEN_ELSE (GET_MODE (x), cond, vtrue, vfalse); - rtx set = gen_rtx_SET (VOIDmode, x, if_then_else); + rtx set = gen_rtx_SET (x, if_then_else); start_sequence (); rtx_insn *insn = emit_insn (set); @@ -1724,7 +1724,7 @@ noce_try_cmove_arith (struct noce_if_info *if_info) if (is_mem) { rtx reg = gen_reg_rtx (GET_MODE (a)); - insn = emit_insn (gen_rtx_SET (VOIDmode, reg, a)); + insn = emit_insn (gen_rtx_SET (reg, a)); } else if (! insn_a) goto end_seq_and_fail; @@ -1748,7 +1748,7 @@ noce_try_cmove_arith (struct noce_if_info *if_info) if (is_mem) { rtx reg = gen_reg_rtx (GET_MODE (b)); - pat = gen_rtx_SET (VOIDmode, reg, b); + pat = gen_rtx_SET (reg, b); } else if (! insn_b) goto end_seq_and_fail; diff --git a/gcc/ira.c b/gcc/ira.c index ab8e9cee86c..bba26e501dc 100644 --- a/gcc/ira.c +++ b/gcc/ira.c @@ -1769,7 +1769,7 @@ setup_prohibited_mode_move_regs (void) ira_prohibited_mode_move_regs_initialized_p = true; test_reg1 = gen_rtx_REG (VOIDmode, 0); test_reg2 = gen_rtx_REG (VOIDmode, 0); - move_pat = gen_rtx_SET (VOIDmode, test_reg1, test_reg2); + move_pat = gen_rtx_SET (test_reg1, test_reg2); move_insn = gen_rtx_INSN (VOIDmode, 0, 0, 0, move_pat, 0, -1, 0); for (i = 0; i < NUM_MACHINE_MODES; i++) { diff --git a/gcc/jump.c b/gcc/jump.c index bc91550b510..513eb6e7741 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -1503,7 +1503,7 @@ redirect_exp_1 (rtx *loc, rtx olabel, rtx nlabel, rtx insn) { x = redirect_target (nlabel); if (GET_CODE (x) == LABEL_REF && loc == &PATTERN (insn)) - x = gen_rtx_SET (VOIDmode, pc_rtx, x); + x = gen_rtx_SET (pc_rtx, x); validate_change (insn, loc, x, 1); return; } diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c index 9d5fd3be31f..3535a07a5af 100644 --- a/gcc/lower-subreg.c +++ b/gcc/lower-subreg.c @@ -304,7 +304,7 @@ init_lower_subreg (void) rtxes.target = gen_rtx_REG (word_mode, FIRST_PSEUDO_REGISTER); rtxes.source = gen_rtx_REG (word_mode, FIRST_PSEUDO_REGISTER + 1); - rtxes.set = gen_rtx_SET (VOIDmode, rtxes.target, rtxes.source); + rtxes.set = gen_rtx_SET (rtxes.target, rtxes.source); rtxes.zext = gen_rtx_ZERO_EXTEND (twice_word_mode, rtxes.source); rtxes.shift = gen_rtx_ASHIFT (twice_word_mode, rtxes.source, const0_rtx); diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 5c4c2f26792..1088b25f70e 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -2688,7 +2688,7 @@ base_to_reg (struct address_info *ad) : *ad->disp_term); if (!valid_address_p (ad->mode, new_inner, ad->as)) return NULL_RTX; - insn = emit_insn (gen_rtx_SET (ad->mode, new_reg, *ad->base_term)); + insn = emit_insn (gen_rtx_SET (new_reg, *ad->base_term)); code = recog_memoized (insn); if (code < 0) { @@ -2967,7 +2967,7 @@ process_address_1 (int nop, bool check_only_p, /* addr => lo_sum (new_base, addr), case (2) above. */ insn = emit_insn (gen_rtx_SET - (VOIDmode, new_reg, + (new_reg, gen_rtx_HIGH (Pmode, copy_rtx (addr)))); code = recog_memoized (insn); if (code >= 0) @@ -2977,7 +2977,7 @@ process_address_1 (int nop, bool check_only_p, { /* Try to put lo_sum into register. */ insn = emit_insn (gen_rtx_SET - (VOIDmode, new_reg, + (new_reg, gen_rtx_LO_SUM (Pmode, new_reg, addr))); code = recog_memoized (insn); if (code >= 0) diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c index f7c8e402467..acf8c8adc11 100644 --- a/gcc/lra-eliminations.c +++ b/gcc/lra-eliminations.c @@ -1076,8 +1076,7 @@ eliminate_regs_in_insn (rtx_insn *insn, bool replace_p, bool first_p, constraint pass fix it up. */ if (! validate_change (insn, &SET_SRC (old_set), new_src, 0)) { - rtx new_pat = gen_rtx_SET (VOIDmode, - SET_DEST (old_set), new_src); + rtx new_pat = gen_rtx_SET (SET_DEST (old_set), new_src); if (! validate_change (insn, &PATTERN (insn), new_pat, 0)) SET_SRC (old_set) = new_src; diff --git a/gcc/lra.c b/gcc/lra.c index f4d7a3c071f..edef13d08dd 100644 --- a/gcc/lra.c +++ b/gcc/lra.c @@ -329,8 +329,8 @@ emit_add3_insn (rtx x, rtx y, rtx z) return insn; } - rtx_insn *insn = emit_insn (gen_rtx_SET (VOIDmode, x, - gen_rtx_PLUS (GET_MODE (y), y, z))); + rtx_insn *insn = emit_insn (gen_rtx_SET (x, gen_rtx_PLUS (GET_MODE (y), + y, z))); if (recog_memoized (insn) < 0) { delete_insns_since (last); diff --git a/gcc/postreload.c b/gcc/postreload.c index 948fcbd8e0c..99b1fc26900 100644 --- a/gcc/postreload.c +++ b/gcc/postreload.c @@ -1822,8 +1822,7 @@ move2add_use_add2_insn (rtx reg, rtx sym, rtx off, rtx_insn *insn) rtx narrow_src = gen_int_mode (INTVAL (off), narrow_mode); rtx new_set - = gen_rtx_SET (VOIDmode, - gen_rtx_STRICT_LOW_PART (VOIDmode, + = gen_rtx_SET (gen_rtx_STRICT_LOW_PART (VOIDmode, narrow_reg), narrow_src); get_full_set_rtx_cost (new_set, &newcst); @@ -2051,7 +2050,7 @@ reload_cse_move2add (rtx_insn *first) if (costs_lt_p (&newcst, &oldcst, speed) && have_add2_insn (reg, new_src)) { - rtx newpat = gen_rtx_SET (VOIDmode, reg, tem); + rtx newpat = gen_rtx_SET (reg, tem); success = validate_change (next, &PATTERN (next), newpat, 0); @@ -2150,7 +2149,7 @@ reload_cse_move2add (rtx_insn *first) && CONST_INT_P (XEXP (cnd, 1))) { rtx implicit_set = - gen_rtx_SET (VOIDmode, XEXP (cnd, 0), XEXP (cnd, 1)); + gen_rtx_SET (XEXP (cnd, 0), XEXP (cnd, 1)); move2add_note_store (SET_DEST (implicit_set), implicit_set, insn); } } diff --git a/gcc/ree.c b/gcc/ree.c index c85ca0afb82..031577abc62 100644 --- a/gcc/ree.c +++ b/gcc/ree.c @@ -386,7 +386,7 @@ combine_set_extension (ext_cand *cand, rtx_insn *curr_insn, rtx *orig_set) && HOST_BITS_PER_WIDE_INT >= GET_MODE_BITSIZE (cand->mode)) { if (INTVAL (orig_src) >= 0 || cand->code == SIGN_EXTEND) - new_set = gen_rtx_SET (VOIDmode, new_reg, orig_src); + new_set = gen_rtx_SET (new_reg, orig_src); else { /* Zero-extend the negative constant by masking out the bits outside @@ -394,7 +394,7 @@ combine_set_extension (ext_cand *cand, rtx_insn *curr_insn, rtx *orig_set) rtx new_const_int = gen_int_mode (INTVAL (orig_src) & GET_MODE_MASK (orig_mode), GET_MODE (new_reg)); - new_set = gen_rtx_SET (VOIDmode, new_reg, new_const_int); + new_set = gen_rtx_SET (new_reg, new_const_int); } } else if (GET_MODE (orig_src) == VOIDmode) @@ -410,7 +410,7 @@ combine_set_extension (ext_cand *cand, rtx_insn *curr_insn, rtx *orig_set) rtx simplified_temp_extension = simplify_rtx (temp_extension); if (simplified_temp_extension) temp_extension = simplified_temp_extension; - new_set = gen_rtx_SET (VOIDmode, new_reg, temp_extension); + new_set = gen_rtx_SET (new_reg, temp_extension); } else if (GET_CODE (orig_src) == IF_THEN_ELSE) { @@ -426,7 +426,7 @@ combine_set_extension (ext_cand *cand, rtx_insn *curr_insn, rtx *orig_set) rtx simplified_temp_extension = simplify_rtx (temp_extension); if (simplified_temp_extension) temp_extension = simplified_temp_extension; - new_set = gen_rtx_SET (VOIDmode, new_reg, temp_extension); + new_set = gen_rtx_SET (new_reg, temp_extension); } /* This change is a part of a group of changes. Hence, @@ -481,7 +481,7 @@ transform_ifelse (ext_cand *cand, rtx_insn *def_insn) map_srcreg2 = gen_rtx_REG (cand->mode, REGNO (srcreg2)); map_dstreg = gen_rtx_REG (cand->mode, REGNO (dstreg)); ifexpr = gen_rtx_IF_THEN_ELSE (cand->mode, cond, map_srcreg, map_srcreg2); - new_set = gen_rtx_SET (VOIDmode, map_dstreg, ifexpr); + new_set = gen_rtx_SET (map_dstreg, ifexpr); if (validate_change (def_insn, &PATTERN (def_insn), new_set, true) && update_reg_equal_equiv_notes (def_insn, cand->mode, GET_MODE (dstreg), @@ -1232,7 +1232,7 @@ find_and_remove_re (void) REGNO (XEXP (SET_SRC (pat), 0))); rtx new_src = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)), REGNO (SET_DEST (pat))); - rtx set = gen_rtx_SET (VOIDmode, new_dst, new_src); + rtx set = gen_rtx_SET (new_dst, new_src); emit_insn_after (set, def_insn); } diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index b040c463643..c5d52c1d686 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -782,7 +782,7 @@ emit_pop_insn (rtx_insn *insn, stack_ptr regstack, rtx reg, enum emit_where wher gcc_assert (hard_regno >= FIRST_STACK_REG); - pop_rtx = gen_rtx_SET (VOIDmode, FP_MODE_REG (hard_regno, DFmode), + pop_rtx = gen_rtx_SET (FP_MODE_REG (hard_regno, DFmode), FP_MODE_REG (FIRST_STACK_REG, DFmode)); if (where == EMIT_AFTER) @@ -1112,7 +1112,7 @@ move_nan_for_stack_reg (rtx_insn *insn, stack_ptr regstack, rtx dest) rtx pat; dest = FP_MODE_REG (REGNO (dest), SFmode); - pat = gen_rtx_SET (VOIDmode, dest, not_a_num); + pat = gen_rtx_SET (dest, not_a_num); PATTERN (insn) = pat; INSN_CODE (insn) = -1; @@ -2437,8 +2437,8 @@ change_stack (rtx_insn *insn, stack_ptr old, stack_ptr new_stack, { old->reg[++old->top] = i; SET_HARD_REG_BIT (old->reg_set, i); - emit_insn_before (gen_rtx_SET (VOIDmode, - FP_MODE_REG (i, SFmode), not_a_num), insn); + emit_insn_before (gen_rtx_SET (FP_MODE_REG (i, SFmode), not_a_num), + insn); } /* Pop any registers that are not needed in the new block. */ @@ -2663,8 +2663,7 @@ convert_regs_entry (void) bi->stack_in.reg[++top] = reg; - init = gen_rtx_SET (VOIDmode, - FP_MODE_REG (FIRST_STACK_REG, SFmode), + init = gen_rtx_SET (FP_MODE_REG (FIRST_STACK_REG, SFmode), not_a_num); insert_insn_on_edge (init, e); inserted = 1; @@ -3032,7 +3031,7 @@ convert_regs_1 (basic_block block) if (dump_file) fprintf (dump_file, "Emitting insn initializing reg %d\n", reg); - set = gen_rtx_SET (VOIDmode, FP_MODE_REG (reg, SFmode), not_a_num); + set = gen_rtx_SET (FP_MODE_REG (reg, SFmode), not_a_num); insn = emit_insn_after (set, insn); control_flow_insn_deleted |= subst_stack_regs (insn, ®stack); } diff --git a/gcc/reload.c b/gcc/reload.c index bb5dae7634f..dde70b2bcd8 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -935,7 +935,7 @@ can_reload_into (rtx in, int regno, machine_mode mode) /* If we can make a simple SET insn that does the job, everything should be fine. */ dst = gen_rtx_REG (mode, regno); - test_insn = make_insn_raw (gen_rtx_SET (VOIDmode, dst, in)); + test_insn = make_insn_raw (gen_rtx_SET (dst, in)); save_recog_data = recog_data; if (recog_memoized (test_insn) >= 0) { diff --git a/gcc/reload1.c b/gcc/reload1.c index 4c479069256..d2c5524ddcf 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -3452,8 +3452,7 @@ eliminate_regs_in_insn (rtx_insn *insn, int replace) the INSN_CODE the same and let reload fix it up. */ if (!validate_change (insn, &SET_SRC (old_set), new_src, 0)) { - rtx new_pat = gen_rtx_SET (VOIDmode, - SET_DEST (old_set), new_src); + rtx new_pat = gen_rtx_SET (SET_DEST (old_set), new_src); if (!validate_change (insn, &PATTERN (insn), new_pat, 0)) SET_SRC (old_set) = new_src; @@ -5740,7 +5739,7 @@ gen_reload_chain_without_interm_reg_p (int r1, int r2) || CONSTANT_P (XEXP (in, 1)) || MEM_P (XEXP (in, 1)))) { - insn = emit_insn (gen_rtx_SET (VOIDmode, out, in)); + insn = emit_insn (gen_rtx_SET (out, in)); code = recog_memoized (insn); result = false; @@ -8710,7 +8709,7 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type) if (op0 != XEXP (in, 0) || op1 != XEXP (in, 1)) in = gen_rtx_PLUS (GET_MODE (in), op0, op1); - insn = emit_insn_if_valid_for_reload (gen_rtx_SET (VOIDmode, out, in)); + insn = emit_insn_if_valid_for_reload (gen_rtx_SET (out, in)); if (insn) return insn; @@ -8799,7 +8798,7 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type) in = gen_rtx_fmt_e (GET_CODE (in), GET_MODE (in), op1); /* First, try a plain SET. */ - set = emit_insn_if_valid_for_reload (gen_rtx_SET (VOIDmode, out, in)); + set = emit_insn_if_valid_for_reload (gen_rtx_SET (out, in)); if (set) return set; @@ -8814,10 +8813,8 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type) gen_reload (out_moded, op1, opnum, type); - insn - = gen_rtx_SET (VOIDmode, out, - gen_rtx_fmt_e (GET_CODE (in), GET_MODE (in), - out_moded)); + insn = gen_rtx_SET (out, gen_rtx_fmt_e (GET_CODE (in), GET_MODE (in), + out_moded)); insn = emit_insn_if_valid_for_reload (insn); if (insn) { @@ -8842,7 +8839,7 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type) /* Otherwise, just write (set OUT IN) and hope for the best. */ else - emit_insn (gen_rtx_SET (VOIDmode, out, in)); + emit_insn (gen_rtx_SET (out, in)); /* Return the first insn emitted. We can not just return get_last_insn, because there may have @@ -9236,7 +9233,7 @@ inc_for_reload (rtx reloadreg, rtx in, rtx value, int inc_amount) that in gen_reload. */ last = get_last_insn (); - add_insn = emit_insn (gen_rtx_SET (VOIDmode, incloc, + add_insn = emit_insn (gen_rtx_SET (incloc, gen_rtx_PLUS (GET_MODE (incloc), incloc, inc))); diff --git a/gcc/reorg.c b/gcc/reorg.c index a0674e4e0ad..cb251eebb9a 100644 --- a/gcc/reorg.c +++ b/gcc/reorg.c @@ -2788,8 +2788,7 @@ fill_slots_from_thread (rtx_insn *insn, rtx condition, rtx thread_or_return, new_arith = gen_rtx_fmt_ee (GET_CODE (src) == PLUS ? MINUS : PLUS, GET_MODE (src), dest, other); - ninsn = emit_insn_after (gen_rtx_SET (VOIDmode, dest, new_arith), - insn); + ninsn = emit_insn_after (gen_rtx_SET (dest, new_arith), insn); if (recog_memoized (ninsn) < 0 || (extract_insn (ninsn), diff --git a/gcc/rtl.h b/gcc/rtl.h index e5e4560d3ae..273e2d56274 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -1787,6 +1787,14 @@ rhs_regno (const_rtx x) not to use an rtx with this cost under any circumstances. */ #define MAX_COST INT_MAX +/* Return true if CODE always has VOIDmode. */ + +static inline bool +always_void_p (enum rtx_code code) +{ + return code == SET; +} + /* A structure to hold all available cost information about an rtl expression. */ struct full_rtx_costs @@ -3597,5 +3605,4 @@ extern void _fatal_insn (const char *, const_rtx, const char *, int, const char /* reginfo.c */ extern tree GTY(()) global_regs_decl[FIRST_PSEUDO_REGISTER]; - #endif /* ! GCC_RTL_H */ diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 7daeec3b2bf..b8ed356a2a2 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -863,7 +863,7 @@ create_insn_rtx_with_rhs (vinsn_t vi, rtx rhs_rtx) lhs_rtx = copy_rtx (VINSN_LHS (vi)); - pattern = gen_rtx_SET (VOIDmode, lhs_rtx, rhs_rtx); + pattern = gen_rtx_SET (lhs_rtx, rhs_rtx); insn_rtx = create_insn_rtx_from_pattern (pattern, NULL_RTX); return insn_rtx; @@ -944,7 +944,7 @@ create_insn_rtx_with_lhs (vinsn_t vi, rtx lhs_rtx) rhs_rtx = copy_rtx (VINSN_RHS (vi)); - pattern = gen_rtx_SET (VOIDmode, lhs_rtx, rhs_rtx); + pattern = gen_rtx_SET (lhs_rtx, rhs_rtx); insn_rtx = create_insn_rtx_from_pattern (pattern, NULL_RTX); return insn_rtx; @@ -2110,7 +2110,7 @@ implicit_clobber_conflict_p (insn_t through_insn, expr_t expr) /* Make a new insn with it. */ rhs = copy_rtx (VINSN_RHS (EXPR_VINSN (expr))); - pat = gen_rtx_SET (VOIDmode, reg, rhs); + pat = gen_rtx_SET (reg, rhs); start_sequence (); insn = emit_insn (pat); end_sequence (); diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 685fcc38c58..460f6e75278 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -1098,8 +1098,7 @@ adjust_mems (rtx loc, const_rtx old_rtx, void *data) tem = simplify_replace_fn_rtx (tem, old_rtx, adjust_mems, data); amd->store = store_save; amd->side_effects = alloc_EXPR_LIST (0, - gen_rtx_SET (VOIDmode, - XEXP (loc, 0), tem), + gen_rtx_SET (XEXP (loc, 0), tem), amd->side_effects); return addr; case PRE_MODIFY: @@ -1115,8 +1114,7 @@ adjust_mems (rtx loc, const_rtx old_rtx, void *data) adjust_mems, data); amd->store = store_save; amd->side_effects = alloc_EXPR_LIST (0, - gen_rtx_SET (VOIDmode, - XEXP (loc, 0), tem), + gen_rtx_SET (XEXP (loc, 0), tem), amd->side_effects); return addr; case SUBREG: @@ -1227,7 +1225,7 @@ adjust_insn (basic_block bb, rtx_insn *insn) FOR_EACH_VEC_SAFE_ELT (windowed_parm_regs, i, p) { XVECEXP (rtl, 0, i * 2) - = gen_rtx_SET (VOIDmode, p->incoming, p->outgoing); + = gen_rtx_SET (p->incoming, p->outgoing); /* Do not clobber the attached DECL, but only the REG. */ XVECEXP (rtl, 0, i * 2 + 1) = gen_rtx_CLOBBER (GET_MODE (p->outgoing), @@ -5883,7 +5881,7 @@ add_stores (rtx loc, const_rtx expr, void *cuip) && find_use_val (loc, mode, cui)) { gcc_checking_assert (type == MO_VAL_SET); - mo.u.loc = gen_rtx_SET (VOIDmode, loc, SET_SRC (expr)); + mo.u.loc = gen_rtx_SET (loc, SET_SRC (expr)); } } else @@ -5901,7 +5899,7 @@ add_stores (rtx loc, const_rtx expr, void *cuip) } else { - rtx xexpr = gen_rtx_SET (VOIDmode, loc, src); + rtx xexpr = gen_rtx_SET (loc, src); if (same_variable_part_p (src, REG_EXPR (loc), REG_OFFSET (loc))) { /* If this is an instruction copying (part of) a parameter @@ -5966,7 +5964,7 @@ add_stores (rtx loc, const_rtx expr, void *cuip) } else { - rtx xexpr = gen_rtx_SET (VOIDmode, loc, src); + rtx xexpr = gen_rtx_SET (loc, src); if (same_variable_part_p (SET_SRC (xexpr), MEM_EXPR (loc), INT_MEM_OFFSET (loc))) @@ -6065,7 +6063,7 @@ add_stores (rtx loc, const_rtx expr, void *cuip) } if (nloc && nloc != SET_SRC (mo.u.loc)) - oloc = gen_rtx_SET (GET_MODE (mo.u.loc), oloc, nloc); + oloc = gen_rtx_SET (oloc, nloc); else { if (oloc == SET_DEST (mo.u.loc)) |