S/390: Fix cfi for GPR 2 FPR saves

gcc/ChangeLog:

2016-01-21  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	Backported from mainline
	2015-07-24  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* 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  <krebbel@linux.vnet.ibm.com>

	Backported from mainline
	2015-07-24  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* gcc.target/s390/gpr2fprsavecfi.c: New test.

From-SVN: r232678

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4635cf8d9a9149c2b3a02874b52ec4548a3f6ac5..caa7046dcf4f413322493f6ad887b1a718e5f281 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-21  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       Backported from mainline
+       2015-07-24  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * 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  <kyrylo.tkachov@arm.com>
 
        Backport from mainline

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 8cae9ba0cc51cea0b9e746ec0e872e5a09ce1f4e..2a52db9e9e4f65cdeffd27f42dd73cfd6c515adc 100644 (file)
--- 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 d79c3527a84fe8596746e6796ac42dae9ff03b3d..1e0ef361ba8ae276302a8724eba55fbd60291def 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-21  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       Backported from mainline
+       2015-07-24  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * gcc.target/s390/gpr2fprsavecfi.c: New test.
+
 2016-01-20  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        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 (file)
index 0000000..92a0d3a
--- /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" } } */