Commit ecc114f7 by Richard Henderson Committed by Richard Henderson

re PR inline-asm/5099 (m68k-aout/3.0.2/cc1 aborts on asm("movw sr,%0":"=hd"(a));)

        PR middle-end/5099
        * stmt.c (expand_asm_operands): Validate outputs vs asm_operand_ok.
        Support copies into and out of memory.  Don't accept allows_reg
        and allows_mem as gospel.

From-SVN: r51884
parent c4484b8f
2002-04-04 Richard Henderson <rth@redhat.com> 2002-04-04 Richard Henderson <rth@redhat.com>
PR middle-end/5099
* stmt.c (expand_asm_operands): Validate outputs vs asm_operand_ok.
Support copies into and out of memory. Don't accept allows_reg
and allows_mem as gospel.
2002-04-04 Richard Henderson <rth@redhat.com>
PR opt/6165 PR opt/6165
* alias.c (true_dependence): Force (mem:blk (scratch)) to conflict. * alias.c (true_dependence): Force (mem:blk (scratch)) to conflict.
(write_dependence_p): Likewise. (write_dependence_p): Likewise.
......
...@@ -1740,25 +1740,48 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) ...@@ -1740,25 +1740,48 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line)
&& (allows_mem || GET_CODE (DECL_RTL (val)) == REG) && (allows_mem || GET_CODE (DECL_RTL (val)) == REG)
&& ! (GET_CODE (DECL_RTL (val)) == REG && ! (GET_CODE (DECL_RTL (val)) == REG
&& GET_MODE (DECL_RTL (val)) != TYPE_MODE (type))) && GET_MODE (DECL_RTL (val)) != TYPE_MODE (type)))
|| ! allows_reg
|| is_inout) || is_inout)
{ {
output_rtx[i] = expand_expr (val, NULL_RTX, VOIDmode, EXPAND_WRITE); enum { do_not_copy, do_copy_reg, do_copy_mem } do_copy;
rtx op;
if (! allows_reg && GET_CODE (output_rtx[i]) != MEM) op = expand_expr (val, NULL_RTX, VOIDmode, EXPAND_WRITE);
output_rtx[i] = op;
if (! allows_reg && GET_CODE (op) != MEM)
error ("output number %d not directly addressable", i); error ("output number %d not directly addressable", i);
if ((! allows_mem && GET_CODE (output_rtx[i]) == MEM)
|| GET_CODE (output_rtx[i]) == CONCAT) do_copy = do_not_copy;
if (! allows_mem && GET_CODE (op) == MEM)
do_copy = do_copy_reg;
else if (GET_CODE (op) == CONCAT)
do_copy = do_copy_reg;
else if (asm_operand_ok (op, constraints[i]) <= 0)
{
if (allows_reg && !register_operand (op, VOIDmode))
do_copy = do_copy_reg;
else if (allows_mem && GET_CODE (op) != MEM)
do_copy = do_copy_mem;
else
warning ("asm operand %d probably doesn't match constraints", i);
}
if (do_copy == do_copy_reg)
{
real_output_rtx[i] = protect_from_queue (op, 1);
output_rtx[i] = gen_reg_rtx (GET_MODE (op));
}
else if (do_copy == do_copy_mem)
{ {
real_output_rtx[i] = protect_from_queue (output_rtx[i], 1); real_output_rtx[i] = op;
output_rtx[i] = gen_reg_rtx (GET_MODE (output_rtx[i])); output_rtx[i] = assign_temp (type, 0, 1, 1);
if (is_inout)
emit_move_insn (output_rtx[i], real_output_rtx[i]);
} }
if (do_copy && is_inout)
emit_move_insn (output_rtx[i], real_output_rtx[i]);
} }
else else
{ {
output_rtx[i] = assign_temp (type, 0, 0, 1); output_rtx[i] = assign_temp (type, 0, !allows_reg, 1);
TREE_VALUE (tail) = make_tree (type, output_rtx[i]); TREE_VALUE (tail) = make_tree (type, output_rtx[i]);
} }
...@@ -1812,9 +1835,9 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) ...@@ -1812,9 +1835,9 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line)
if (asm_operand_ok (op, constraint) <= 0) if (asm_operand_ok (op, constraint) <= 0)
{ {
if (allows_reg) if (allows_reg && !register_operand (op, VOIDmode))
op = force_reg (TYPE_MODE (type), op); op = force_reg (TYPE_MODE (type), op);
else if (!allows_mem) else if (!allows_mem || GET_CODE (op) == MEM)
warning ("asm operand %d probably doesn't match constraints", warning ("asm operand %d probably doesn't match constraints",
i + noutputs); i + noutputs);
else if (CONSTANT_P (op)) else if (CONSTANT_P (op))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment