diff options
| author | Jiong Wang <jiong.wang@arm.com> | 2014-07-23 16:04:39 +0000 |
|---|---|---|
| committer | Marcus Shawcroft <mshawcroft@gcc.gnu.org> | 2014-07-23 16:04:39 +0000 |
| commit | 0b4a9743a38af4c0f8483117813d01ae31a7e6d5 (patch) | |
| tree | 682d5761458643dce883edc505883c9c06b7d145 | |
| parent | 106d7513c6ee0c36c2862ac37754332eb9c4593d (diff) | |
| download | gcc-0b4a9743a38af4c0f8483117813d01ae31a7e6d5.zip gcc-0b4a9743a38af4c0f8483117813d01ae31a7e6d5.tar.gz gcc-0b4a9743a38af4c0f8483117813d01ae31a7e6d5.tar.bz2 | |
[AArch64] Use register offset in cfun->machine->frame.reg_offset
From-SVN: r212949
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/aarch64/aarch64.c | 49 |
2 files changed, 29 insertions, 27 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 34560ae..2b21db2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -2,6 +2,13 @@ * config/aarch64/aarch64.c (aarch64_save_or_restore_callee_save_registers) + (aarch64_save_or_restore_fprs): Use register offset in + cfun->machine->frame.reg_offset. + +2014-07-23 Jiong Wang <jiong.wang@arm.com> + + * config/aarch64/aarch64.c + (aarch64_save_or_restore_callee_save_registers) (aarch64_save_or_restore_fprs): Remove base_rtx. 2014-07-23 Jiong Wang <jiong.wang@arm.com> diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 6c71dcc..7610cef 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -1925,10 +1925,11 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment, if (aarch64_register_saved_on_entry (regno)) { rtx mem; - mem = gen_mem_ref (DFmode, - plus_constant (Pmode, - stack_pointer_rtx, - start_offset)); + + HOST_WIDE_INT offset = start_offset + + cfun->machine->frame.reg_offset[regno]; + mem = gen_mem_ref (DFmode, plus_constant (Pmode, stack_pointer_rtx, + offset)); for (regno2 = regno + 1; regno2 <= V31_REGNUM @@ -1943,12 +1944,10 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment, { rtx mem2; - /* Next highest register to be saved. */ + offset = start_offset + cfun->machine->frame.reg_offset[regno2]; mem2 = gen_mem_ref (DFmode, - plus_constant - (Pmode, - stack_pointer_rtx, - start_offset + increment)); + plus_constant (Pmode, stack_pointer_rtx, + offset)); if (restore == false) { insn = emit_insn @@ -1974,7 +1973,6 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment, frame-related if explicitly marked. */ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; regno = regno2; - start_offset += increment * 2; } else { @@ -1986,7 +1984,6 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment, add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DFmode, regno)); } - start_offset += increment; } RTX_FRAME_RELATED_P (insn) = 1; } @@ -2013,10 +2010,11 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset, if (aarch64_register_saved_on_entry (regno)) { rtx mem; - mem = gen_mem_ref (Pmode, - plus_constant (Pmode, - stack_pointer_rtx, - start_offset)); + + HOST_WIDE_INT offset = start_offset + + cfun->machine->frame.reg_offset[regno]; + mem = gen_mem_ref (Pmode, plus_constant (Pmode, stack_pointer_rtx, + offset)); for (regno2 = regno + 1; regno2 <= limit @@ -2025,17 +2023,18 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset, { /* Empty loop. */ } + if (regno2 <= limit - && aarch64_register_saved_on_entry (regno2)) + && aarch64_register_saved_on_entry (regno2) + && ((cfun->machine->frame.reg_offset[regno] + UNITS_PER_WORD) + == cfun->machine->frame.reg_offset[regno2])) { rtx mem2; - /* Next highest register to be saved. */ + offset = start_offset + cfun->machine->frame.reg_offset[regno2]; mem2 = gen_mem_ref (Pmode, - plus_constant - (Pmode, - stack_pointer_rtx, - start_offset + increment)); + plus_constant (Pmode, stack_pointer_rtx, + offset)); if (restore == false) { insn = emit_insn @@ -2061,7 +2060,6 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset, frame-related if explicitly marked. */ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; regno = regno2; - start_offset += increment * 2; } else { @@ -2073,7 +2071,6 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset, add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno)); } - start_offset += increment; } RTX_FRAME_RELATED_P (insn) = 1; } @@ -2272,8 +2269,7 @@ aarch64_expand_prologue (void) RTX_FRAME_RELATED_P (insn) = 1; } - aarch64_save_or_restore_callee_save_registers - (fp_offset + cfun->machine->frame.hardfp_offset, 0); + aarch64_save_or_restore_callee_save_registers (fp_offset, 0); } /* when offset >= 512, @@ -2344,8 +2340,7 @@ aarch64_expand_epilogue (bool for_sibcall) cfa_reg = stack_pointer_rtx; } - aarch64_save_or_restore_callee_save_registers - (fp_offset + cfun->machine->frame.hardfp_offset, 1); + aarch64_save_or_restore_callee_save_registers (fp_offset, 1); /* Restore the frame pointer and lr if the frame pointer is needed. */ if (offset > 0) |