Hello,
This mainly reformats some of the asm output code in sh.c to use
multi-line strings.
Tested on rev 193061 with
make -k check RUNTESTFLAGS="--target_board=sh-sim
\{-m2/-ml,-m2/-mb,-m2a/-mb,-m4/-ml,-m4/-mb,-m4a/-ml,-m4a/-mb}"
and no new failures.
OK?
Cheers,
Oleg
gcc/ChangeLog:
* config/sh/sh.c (output_movedouble, output_far_jump,
output_ieee_ccmpeq): Use multi-line strings for asm.
(find_regmode_weight): Wrap lines.
(sh_optimize_target_register_callee_saved): Remove commented out
variable.
(emit_load_ptr): Remove prototype.
Index: gcc/config/sh/sh.c
===================================================================
--- gcc/config/sh/sh.c (revision 193061)
+++ gcc/config/sh/sh.c (working copy)
@@ -2600,21 +2600,25 @@
if (MEM_P (dst)
&& GET_CODE (XEXP (dst, 0)) == PRE_DEC)
- return "mov.l %T1,%0\n\tmov.l %1,%0";
+ return "mov.l %T1,%0" "\n"
+ " mov.l %1,%0";
if (register_operand (dst, mode)
&& register_operand (src, mode))
{
if (REGNO (src) == MACH_REG)
- return "sts mach,%S0\n\tsts macl,%R0";
+ return "sts mach,%S0" "\n"
+ " sts macl,%R0";
/* When mov.d r1,r2 do r2->r3 then r1->r2;
when mov.d r1,r0 do r1->r0 then r2->r1. */
if (REGNO (src) + 1 == REGNO (dst))
- return "mov %T1,%T0\n\tmov %1,%0";
+ return "mov %T1,%T0" "\n"
+ " mov %1,%0";
else
- return "mov %1,%0\n\tmov %T1,%T0";
+ return "mov %1,%0" "\n"
+ " mov %T1,%T0";
}
else if (CONST_INT_P (src))
{
@@ -2654,19 +2658,23 @@
break;
case LABEL_REF:
- return "mov.l %1,%0\n\tmov.l %1+4,%T0";
+ return "mov.l %1,%0" "\n"
+ " mov.l %1+4,%T0";
case POST_INC:
- return "mov.l %1,%0\n\tmov.l %1,%T0";
+ return "mov.l %1,%0" "\n"
+ " mov.l %1,%T0";
default:
gcc_unreachable ();
}
/* Work out the safe way to copy. Copy into the second half first. */
if (dreg == ptrreg)
- return "mov.l %T1,%T0\n\tmov.l %1,%0";
+ return "mov.l %T1,%T0" "\n"
+ " mov.l %1,%0";
}
- return "mov.l %1,%0\n\tmov.l %T1,%T0";
+ return "mov.l %1,%0" "\n"
+ " mov.l %T1,%T0";
}
/* Print an instruction which would have gone into a delay slot after
@@ -2698,7 +2706,8 @@
&& offset - get_attr_length (insn) <= 32766)
{
far = 0;
- jump = "mov.w %O0,%1; braf %1";
+ jump = "mov.w %O0,%1" "\n"
+ " braf %1";
}
else
{
@@ -2706,12 +2715,19 @@
if (flag_pic)
{
if (TARGET_SH2)
- jump = "mov.l %O0,%1; braf %1";
+ jump = "mov.l %O0,%1" "\n"
+ " braf %1";
else
- jump = "mov.l r0,@-r15; mova %O0,r0; mov.l @r0,%1; add r0,%1; mov.l @r15+,r0; jmp @%1";
+ jump = "mov.l r0,@-r15" "\n"
+ " mova %O0,r0" "\n"
+ " mov.l @r0,%1" "\n"
+ " add r0,%1" "\n"
+ " mov.l @r15+,r0" "\n"
+ " jmp @%1";
}
else
- jump = "mov.l %O0,%1; jmp @%1";
+ jump = "mov.l %O0,%1" "\n"
+ " jmp @%1";
}
/* If we have a scratch register available, use it. */
if (NONJUMP_INSN_P ((prev = prev_nonnote_insn (insn)))
@@ -2719,7 +2735,12 @@
{
this_jmp.reg = SET_DEST (XVECEXP (PATTERN (prev), 0, 0));
if (REGNO (this_jmp.reg) == R0_REG && flag_pic && ! TARGET_SH2)
- jump = "mov.l r1,@-r15; mova %O0,r0; mov.l @r0,r1; add r1,r0; mov.l @r15+,r1; jmp @%1";
+ jump = "mov.l r1,@-r15" "\n"
+ " mova %O0,r0" "\n"
+ " mov.l @r0,r1" "\n"
+ " add r1,r0" "\n"
+ " mov.l @r15+,r1" "\n"
+ " jmp @%1";
output_asm_insn (jump, &this_jmp.lab);
if (dbr_sequence_length ())
print_slot (final_sequence);
@@ -2738,12 +2759,12 @@
need its value across jumps, so save r13 in it instead of in
the stack. */
if (TARGET_SH5)
- output_asm_insn ("lds r13, macl", 0);
+ output_asm_insn ("lds r13,macl", 0);
else
output_asm_insn ("mov.l r13,@-r15", 0);
output_asm_insn (jump, &this_jmp.lab);
if (TARGET_SH5)
- output_asm_insn ("sts macl, r13", 0);
+ output_asm_insn ("sts macl,r13", 0);
else
output_asm_insn ("mov.l @r15+,r13", 0);
}
@@ -2911,7 +2932,8 @@
const char *
output_ieee_ccmpeq (rtx insn, rtx *operands)
{
- return output_branchy_insn (NE, "bt\t%l9\n\tfcmp/eq\t%1,%0",
+ return output_branchy_insn (NE, "bt %l9" "\n"
+ " fcmp/eq %1,%0",
insn, operands);
}
@@ -11051,10 +11073,12 @@
if (mode == SFmode)
INSN_REGMODE_WEIGHT (insn, mode) =
- find_insn_regmode_weight (insn, mode) + 2 * find_insn_regmode_weight (insn, DFmode);
+ find_insn_regmode_weight (insn, mode)
+ + 2 * find_insn_regmode_weight (insn, DFmode);
else if (mode == SImode)
INSN_REGMODE_WEIGHT (insn, mode) =
- find_insn_regmode_weight (insn, mode) + 2 * find_insn_regmode_weight (insn, DImode);
+ find_insn_regmode_weight (insn, mode)
+ + 2 * find_insn_regmode_weight (insn, DImode);
}
}
@@ -11350,15 +11374,12 @@
static bool
sh_optimize_target_register_callee_saved (bool after_prologue_epilogue_gen)
{
- HARD_REG_SET dummy;
-#if 0
- rtx insn;
-#endif
-
if (! shmedia_space_reserved_for_target_registers)
return 0;
if (after_prologue_epilogue_gen && ! TARGET_SAVE_ALL_TARGET_REGS)
return 0;
+
+ HARD_REG_SET dummy;
if (calc_live_regs (&dummy) >= 6 * 8)
return 1;
return 0;
@@ -12298,8 +12319,6 @@
return 2 * ((GET_MODE_SIZE (mode) + 3) / 4U);
}
-static rtx emit_load_ptr (rtx, rtx);
-
static rtx
emit_load_ptr (rtx reg, rtx addr)
{
