+2000-08-31 Geoffrey Keating <geoffk@cygnus.com>
+
+ * stmt.c (expand_asm_operands): Twiddle generating_concat_p
+ so that CONCATs are not generated for ASMs.
+ * emit-rtl.c (gen_reg_rtx): Don't generate CONCATs when
+ not generating_concat_p.
+ * function.c (pop_function_context_from): Reset
+ generating_concat_p.
+ (prepare_function_start): Likewise.
+ * rtl.c (generating_concat_p): Define.
+ * rtl.h (generating_concat_p): Declare.
+ * toplev.c (rest_of_compilation): No CONCATs after RTL generation.
+
2000-08-22 Philipp Thomas <pthomas@suse.de>
Masanobu Yuhara <yuhara@flab.fujitsu.co.jp>
/* Reset variables that have known state during rtx generation. */
rtx_equal_function_value_matters = 1;
virtuals_instantiated = 0;
+ generating_concat_p = 1;
}
void
/* Indicate that we have not instantiated virtual registers yet. */
virtuals_instantiated = 0;
+ /* Indicate that we want CONCATs now. */
+ generating_concat_p = 1;
+
/* Indicate we have no need of a frame pointer yet. */
frame_pointer_needed = 0;
= (enum machine_mode *) alloca (noutputs * sizeof (enum machine_mode));
/* The insn we have emitted. */
rtx insn;
+ int old_generating_concat_p = generating_concat_p;
/* An ASM with no outputs needs to be treated as volatile, for now. */
if (noutputs == 0)
Make the asm insn write into that, then our caller will copy it to
the real output operand. Likewise for promoted variables. */
+ generating_concat_p = 0;
+
real_output_rtx[i] = NULL_RTX;
if ((TREE_CODE (val) == INDIRECT_REF
&& allows_mem)
if (! allows_reg && GET_CODE (output_rtx[i]) != MEM)
error ("output number %d not directly addressable", i);
- if (! allows_mem && GET_CODE (output_rtx[i]) == MEM)
+ if ((! allows_mem && GET_CODE (output_rtx[i]) == MEM)
+ || GET_CODE (output_rtx[i]) == CONCAT)
{
real_output_rtx[i] = protect_from_queue (output_rtx[i], 1);
output_rtx[i] = gen_reg_rtx (GET_MODE (output_rtx[i]));
TREE_VALUE (tail) = make_tree (type, output_rtx[i]);
}
+ generating_concat_p = old_generating_concat_p;
+
if (is_inout)
{
inout_mode[ninout] = TYPE_MODE (TREE_TYPE (TREE_VALUE (tail)));
op = expand_expr (TREE_VALUE (tail), NULL_RTX, VOIDmode, 0);
+ /* Never pass a CONCAT to an ASM. */
+ generating_concat_p = 0;
+ if (GET_CODE (op) == CONCAT)
+ op = force_reg (GET_MODE (op), op);
+
if (asm_operand_ok (op, constraint) <= 0)
{
if (allows_reg)
not satisfied. */
warning ("asm operand %d probably doesn't match constraints", i);
}
+ generating_concat_p = old_generating_concat_p;
XVECEXP (body, 3, i) = op;
XVECEXP (body, 4, i) /* constraints */
/* Protect all the operands from the queue now that they have all been
evaluated. */
+ generating_concat_p = 0;
+
for (i = 0; i < ninputs - ninout; i++)
XVECEXP (body, 3, i) = protect_from_queue (XVECEXP (body, 3, i), 0);
= gen_rtx_ASM_INPUT (inout_mode[i], digit_strings[j]);
}
+ generating_concat_p = old_generating_concat_p;
+
/* Now, for each output, construct an rtx
(set OUTPUT (asm_operands INSN OUTPUTNUMBER OUTPUTCONSTRAINT
ARGVEC CONSTRAINTS))