Skip to content

R
riscv-gcc-1
Commit c7f65aae by Jiong Wang Committed by Marcus Shawcroft
Options

[AArch64] Fix layout of frame layout code. 

From-SVN: r211409
parent e29b8d5b
Showing with 19 additions and 15 deletions
gcc/ChangeLog
2014-06-10 Jiong Wang <jiong.wang@arm.com>
* config/aarch64/aarch64.c (aarch64_save_or_restore_fprs)
(aarch64_save_or_restore_callee_save_registers): Fix layout.
2014-06-10 Marcus Shawcroft <marcus.shawcroft@arm.com>
* config/aarch64/aarch64.c (aarch64_save_or_restore_fprs): Fix
......
gcc/config/aarch64/aarch64.c
......@@ -1917,7 +1917,6 @@ aarch64_save_or_restore_fprs (int start_offset, int increment,
rtx (*gen_mem_ref)(enum machine_mode, rtx)
= (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM;
for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++)
{
if (aarch64_register_saved_on_entry (regno))
......@@ -1935,10 +1934,12 @@ aarch64_save_or_restore_fprs (int start_offset, int increment,
{
/* Empty loop. */
}
if (regno2 <= V31_REGNUM &&
aarch64_register_saved_on_entry (regno2))
{
rtx mem2;
/* Next highest register to be saved. */
mem2 = gen_mem_ref (DFmode,
plus_constant
......@@ -1964,10 +1965,10 @@ aarch64_save_or_restore_fprs (int start_offset, int increment,
gen_rtx_REG (DFmode, regno2));
}
/* The first part of a frame-related parallel insn
is always assumed to be relevant to the frame
calculations; subsequent parts, are only
frame-related if explicitly marked. */
/* The first part of a frame-related parallel insn is
always assumed to be relevant to the frame
calculations; subsequent parts, are only
frame-related if explicitly marked. */
RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1;
regno = regno2;
start_offset += increment * 2;
......@@ -1987,15 +1988,14 @@ aarch64_save_or_restore_fprs (int start_offset, int increment,
RTX_FRAME_RELATED_P (insn) = 1;
}
}
}
/* offset from the stack pointer of where the saves and
restore's have to happen. */
static void
aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
bool restore)
aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset,
bool restore)
{
rtx insn;
rtx base_rtx = stack_pointer_rtx;
......@@ -2027,6 +2027,7 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
aarch64_register_saved_on_entry (regno2))
{
rtx mem2;
/* Next highest register to be saved. */
mem2 = gen_mem_ref (Pmode,
plus_constant
......@@ -2050,12 +2051,11 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno2));
}
/* The first part of a frame-related parallel insn
is always assumed to be relevant to the frame
calculations; subsequent parts, are only
frame-related if explicitly marked. */
RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0,
1)) = 1;
/* The first part of a frame-related parallel insn is
always assumed to be relevant to the frame
calculations; subsequent parts, are only
frame-related if explicitly marked. */
RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1;
regno = regno2;
start_offset += increment * 2;
}
......@@ -2075,7 +2075,6 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
}
aarch64_save_or_restore_fprs (start_offset, increment, restore, base_rtx);
}
/* AArch64 stack frames generated by this compiler look like:
......
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