From abd9a770ee9842322f245639881a4955c8d2258b Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 21 May 2011 22:49:05 +0000 Subject: [PATCH] sparc.md (setjmp): Handle PIC mode and use the hard frame pointer. * config/sparc/sparc.md (setjmp): Handle PIC mode and use the hard frame pointer. From-SVN: r174013 --- gcc/ChangeLog | 5 +++++ gcc/config/sparc/sparc.md | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5cbd9f886cc..80233d7eff9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-05-21 Eric Botcazou + + * config/sparc/sparc.md (setjmp): Handle PIC mode and use the hard + frame pointer. + 2011-05-21 Eric Botcazou * config/sparc/sparc.c (eligible_for_return_delay): Do not return diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md index 853bd2fbdcc..5e16179a62b 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md @@ -6507,8 +6507,8 @@ (const_int 4)))]) ;; For __builtin_setjmp we need to flush register windows iff the function -;; calls alloca as well, because otherwise the register window might be -;; saved after %sp adjustment and thus setjmp would crash +;; calls alloca as well, because otherwise the current register window might +;; be saved after the %sp adjustment and thus setjmp would crash. (define_expand "builtin_setjmp_setup" [(match_operand 0 "register_operand" "r")] "" @@ -6547,19 +6547,26 @@ (eq_attr "pic" "true") (const_int 4)] (const_int 3)))]) -;; Pattern for use after a setjmp to store FP and the return register -;; into the stack area. +;; Pattern for use after a setjmp to store registers into the save area. (define_expand "setjmp" [(const_int 0)] "" { rtx mem; - + + if (flag_pic) + { + mem = gen_rtx_MEM (Pmode, + plus_constant (stack_pointer_rtx, + SPARC_STACK_BIAS + 7 * UNITS_PER_WORD)); + emit_insn (gen_rtx_SET (VOIDmode, mem, pic_offset_table_rtx)); + } + mem = gen_rtx_MEM (Pmode, plus_constant (stack_pointer_rtx, SPARC_STACK_BIAS + 14 * UNITS_PER_WORD)); - emit_insn (gen_rtx_SET (VOIDmode, mem, frame_pointer_rtx)); + emit_insn (gen_rtx_SET (VOIDmode, mem, hard_frame_pointer_rtx)); mem = gen_rtx_MEM (Pmode, plus_constant (stack_pointer_rtx, -- 2.30.2