static void swap_rtx_condition PROTO((rtx));
static void compare_for_stack_reg PROTO((rtx, stack, rtx));
static void subst_stack_regs_pat PROTO((rtx, stack, rtx));
-static rtx subst_asm_stack_regs PROTO((rtx, stack, rtx *, rtx **,
+static void subst_asm_stack_regs PROTO((rtx, stack, rtx *, rtx **,
char **, int, int));
-static rtx subst_stack_regs PROTO((rtx, stack));
+static void subst_stack_regs PROTO((rtx, stack));
static void change_stack PROTO((rtx, stack, stack, rtx (*) ()));
static void goto_block_pat PROTO((rtx, stack, rtx));
stack-like regs in asm statements. These rules are enforced by
record_asm_stack_regs; see comments there for details. Any
asm_operands left in the RTL at this point may be assume to meet the
- requirements, since record_asm_stack_regs removes any problem asm.
+ requirements, since record_asm_stack_regs removes any problem asm. */
- It returns the last new insn generated by this function. */
-
-static rtx
+static void
subst_asm_stack_regs (insn, regstack, operands, operands_loc, constraints,
n_inputs, n_outputs)
rtx insn;
break;
}
}
-
- return insn;
}
\f
/* Substitute stack hard reg numbers for stack virtual registers in
INSN. Non-stack register numbers are not changed. REGSTACK is the
current stack content. Insns may be emitted as needed to arrange the
- stack for the 387 based on the contents of the insn.
-
- It returns the last new insn generated by this function. */
+ stack for the 387 based on the contents of the insn. */
-static rtx
+static void
subst_stack_regs (insn, regstack)
rtx insn;
stack regstack;
decode_asm_operands (body, operands, operands_loc,
constraints, NULL_PTR);
get_asm_operand_lengths (body, n_operands, &n_inputs, &n_outputs);
- return subst_asm_stack_regs (insn, regstack, operands,
- operands_loc, constraints,
- n_inputs, n_outputs);
+ subst_asm_stack_regs (insn, regstack, operands, operands_loc,
+ constraints, n_inputs, n_outputs);
+ return;
}
if (GET_CODE (PATTERN (insn)) == PARALLEL)
REG_UNUSED will already have been dealt with, so just return. */
if (GET_CODE (insn) == NOTE)
- return insn;
+ return;
/* If there is a REG_UNUSED note on a stack register on this insn,
the indicated reg must be popped. The REG_UNUSED note is removed,
}
else
note_link = &XEXP (note, 1);
-
- return insn;
}
\f
/* Change the organization of the stack so that it fits a new basic
convert_regs ()
{
register int block, reg;
- register rtx insn, next, new;
+ register rtx insn, next;
struct stack_def regstack;
for (block = 0; block < blocks; block++)
do
{
insn = next;
- new = insn;
next = NEXT_INSN (insn);
/* Don't bother processing unless there is a stack reg
floating point values). */
if (GET_MODE (insn) == QImode || GET_CODE (insn) == CALL_INSN)
- /* We may have generated some new instructions here. */
- new = subst_stack_regs (insn, ®stack);
+ subst_stack_regs (insn, ®stack);
} while (insn != block_end[block]);
+
+ /* For all further actions, INSN needs to be the last insn in
+ this basic block. If subst_stack_regs inserted additional
+ instructions after INSN, it is no longer the last one at
+ this point. */
+ next = PREV_INSN (next);
+
+ /* If subst_stack_regs inserted something after a JUMP_INSN, that
+ is almost certainly a bug. */
+ if (GET_CODE (insn) == JUMP_INSN && insn != next)
+ abort ();
+ insn = next;
/* Something failed if the stack life doesn't match. */
/* Likewise handle the case where we fall into the next block. */
if ((block < blocks - 1) && block_drops_in[block+1])
- change_stack (new, ®stack, &block_stack_in[block+1],
+ change_stack (insn, ®stack, &block_stack_in[block+1],
emit_insn_after);
}