diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-25 23:17:26 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-25 23:17:26 +0000 |
| commit | b52cb7196addd0e2bc281787a43dd9ce2b9b8cdc (patch) | |
| tree | 82345cadd98ed953ce4775edcaa47dbf2d931de3 | |
| parent | 33b4aed8ed7bd7b4beb74b45a1bc92a42c34c50e (diff) | |
| download | gcc-b52cb7196addd0e2bc281787a43dd9ce2b9b8cdc.tar.gz | |
* expr.c (emit_block_move_via_movmem): Only use 6 operand variant
if there are exactly 6 operands.
(set_storage_via_setmem): Similarly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171532 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/expr.c | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e7983a2fe44..040a83c0416 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-03-25 Richard Henderson <rth@redhat.com> + + * expr.c (emit_block_move_via_movmem): Only use 6 operand variant + if there are exactly 6 operands. + (set_storage_via_setmem): Similarly. + 2011-03-25 Kai Tietz <ktietz@redhat.com> * collect2.c (write_c_file_stat): Handle backslash diff --git a/gcc/expr.c b/gcc/expr.c index 4db1c776ba4..076b8d2f0a4 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -1294,16 +1294,20 @@ emit_block_move_via_movmem (rtx x, rtx y, rtx size, unsigned int align, that it doesn't fail the expansion because it thinks emitting the libcall would be more efficient. */ nops = insn_data[(int) code].n_operands; + /* ??? n_operands includes match_scratches; find some other + way to select the 6 operand variant, or force all targets + to have exactly 6 operands. */ + gcc_assert (nops >= 4 && nops <= 6); + create_fixed_operand (&ops[0], x); create_fixed_operand (&ops[1], y); /* The check above guarantees that this size conversion is valid. */ create_convert_operand_to (&ops[2], size, mode, true); create_integer_operand (&ops[3], align / BITS_PER_UNIT); - if (nops != 4) + if (nops == 6) { create_integer_operand (&ops[4], expected_align / BITS_PER_UNIT); create_integer_operand (&ops[5], expected_size); - nops = 6; } if (maybe_expand_insn (code, nops, ops)) { @@ -2716,16 +2720,20 @@ set_storage_via_setmem (rtx object, rtx size, rtx val, unsigned int align, unsigned int nops; nops = insn_data[(int) code].n_operands; + /* ??? n_operands includes match_scratches; find some other + way to select the 6 operand variant, or force all targets + to have exactly 6 operands. */ + gcc_assert (nops >= 4 && nops <= 6); + create_fixed_operand (&ops[0], object); /* The check above guarantees that this size conversion is valid. */ create_convert_operand_to (&ops[1], size, mode, true); create_convert_operand_from (&ops[2], val, byte_mode, true); create_integer_operand (&ops[3], align / BITS_PER_UNIT); - if (nops != 4) + if (nops == 6) { create_integer_operand (&ops[4], expected_align / BITS_PER_UNIT); create_integer_operand (&ops[5], expected_size); - nops = 6; } if (maybe_expand_insn (code, nops, ops)) return true; |