From: Andreas Krebbel Date: Thu, 21 Jan 2016 15:42:36 +0000 (+0000) Subject: S/390: Fix cfi for GPR 2 FPR saves X-Git-Tag: releases/gcc-4.9.4~383 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=446737256313a98405c42afd63405a10025d52ed;p=thirdparty%2Fgcc.git S/390: Fix cfi for GPR 2 FPR saves gcc/ChangeLog: 2016-01-21 Andreas Krebbel Backported from mainline 2015-07-24 Andreas Krebbel * config/s390/s390.c (s390_save_gprs_to_fprs): Add CFA_REGISTER reg note to the GPR -> FPR save instructions. gcc/testsuite/ChangeLog: 2016-01-21 Andreas Krebbel Backported from mainline 2015-07-24 Andreas Krebbel * gcc.target/s390/gpr2fprsavecfi.c: New test. From-SVN: r232678 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4635cf8d9a91..caa7046dcf4f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-01-21 Andreas Krebbel + + Backported from mainline + 2015-07-24 Andreas Krebbel + + * config/s390/s390.c (s390_save_gprs_to_fprs): Add CFA_REGISTER + reg note to the GPR -> FPR save instructions. + 2016-01-20 Kyrylo Tkachov Backport from mainline diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 8cae9ba0cc51..2a52db9e9e4f 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -8595,6 +8595,10 @@ s390_save_gprs_to_fprs (void) emit_move_insn (gen_rtx_REG (DImode, cfun_gpr_save_slot (i)), gen_rtx_REG (DImode, i)); RTX_FRAME_RELATED_P (insn) = 1; + /* This prevents dwarf2cfi from interpreting the set. Doing + so it might emit def_cfa_register infos setting an FPR as + new CFA. */ + add_reg_note (insn, REG_CFA_REGISTER, PATTERN (insn)); } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d79c3527a84f..1e0ef361ba8a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-01-21 Andreas Krebbel + + Backported from mainline + 2015-07-24 Andreas Krebbel + + * gcc.target/s390/gpr2fprsavecfi.c: New test. + 2016-01-20 Kyrylo Tkachov Backport from mainline diff --git a/gcc/testsuite/gcc.target/s390/gpr2fprsavecfi.c b/gcc/testsuite/gcc.target/s390/gpr2fprsavecfi.c new file mode 100644 index 000000000000..92a0d3ae29a3 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/gpr2fprsavecfi.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -march=z10 -mzarch -fdwarf2-cfi-asm" } */ + +char *gl[100]; + +long +foo () +{ + long r = 0; + char bla[100]; + int i; + + __builtin_memcpy (bla, gl, 100); + + for (i = 0; i < 100; i++) + r += bla[i]; + + return r; +} + +/* { dg-final { scan-assembler-not "cfi_def_cfa_register" } } */ +/* { dg-final { scan-assembler "cfi_register" } } */ +/* { dg-final { scan-assembler "cfi_def_cfa_offset" } } */