Hi,
this fixes an inconsistency with the dwarf reg size table when using
-m31 -mzarch. In this mode we use 64 bit register while still
adhering to the 31 bit ABI. This changed some of the GPR sizes
returned by __builtin_init_dwarf_reg_size_table. It is not a big
problem since it only changed for the call-clobbered GPRs. The
call-saved GPRs are marked as partially clobbered and the default
implementation of the dwarf_frame_reg_mode hook did the right thing.
Committed to mainline.
Bye,
-Andreas-
gcc/ChangeLog:
2015-08-06 Andreas Krebbel <kreb...@linux.vnet.ibm.com>
* config/s390/s390.c (s390_dwarf_frame_reg_mode): Return Pmode for
all GPRs.
gcc/testsuite/ChangeLog:
2015-08-06 Andreas Krebbel <kreb...@linux.vnet.ibm.com>
* gcc.target/s390/dwarfregtable-1.c: New test.
* gcc.target/s390/dwarfregtable-2.c: New test.
* gcc.target/s390/dwarfregtable-3.c: New test.
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 082134a..e10da7a 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -6521,6 +6521,10 @@ s390_dwarf_frame_reg_mode (int regno)
{
machine_mode save_mode = default_dwarf_frame_reg_mode (regno);
+ /* Make sure not to return DImode for any GPR with -m31 -mzarch. */
+ if (GENERAL_REGNO_P (regno))
+ save_mode = Pmode;
+
/* The rightmost 64 bits of vector registers are call-clobbered. */
if (GET_MODE_SIZE (save_mode) > 8)
save_mode = DImode;
diff --git a/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
b/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
new file mode 100644
index 0000000..b125498
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
@@ -0,0 +1,21 @@
+/* Make sure the dwarf reg size table doesn't change for 31 bit. */
+
+/* { dg-do compile { target { ! lp64 } } } */
+/* { dg-options "-mesa" } */
+
+#define DWARF_FRAME_REGISTERS 34
+
+static unsigned char dwarf_reg_size_table[DWARF_FRAME_REGISTERS + 1];
+static unsigned char ref_reg_size_table[DWARF_FRAME_REGISTERS + 1] =
+ { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 0 };
+
+int
+main ()
+{
+ __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table);
+ if (__builtin_memcmp (ref_reg_size_table,
+ dwarf_reg_size_table, DWARF_FRAME_REGISTERS + 1) != 0)
+ __builtin_abort ();
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/s390/dwarfregtable-2.c
b/gcc/testsuite/gcc.target/s390/dwarfregtable-2.c
new file mode 100644
index 0000000..bc5a9f8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/dwarfregtable-2.c
@@ -0,0 +1,21 @@
+/* Make sure the dwarf reg size table doesn't change for 31 bit zarch. */
+
+/* { dg-do compile { target { ! lp64 } } } */
+/* { dg-options "-mzarch" } */
+
+#define DWARF_FRAME_REGISTERS 34
+
+static unsigned char dwarf_reg_size_table[DWARF_FRAME_REGISTERS + 1];
+static unsigned char ref_reg_size_table[DWARF_FRAME_REGISTERS + 1] =
+ { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 0 };
+
+int
+main ()
+{
+ __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table);
+ if (__builtin_memcmp (ref_reg_size_table,
+ dwarf_reg_size_table, DWARF_FRAME_REGISTERS + 1) != 0)
+ __builtin_abort ();
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/s390/dwarfregtable-3.c
b/gcc/testsuite/gcc.target/s390/dwarfregtable-3.c
new file mode 100644
index 0000000..55711bf
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/dwarfregtable-3.c
@@ -0,0 +1,20 @@
+/* Make sure the dwarf reg size table doesn't change for 64 bit. */
+
+/* { dg-do compile { target { lp64 } } } */
+
+#define DWARF_FRAME_REGISTERS 34
+
+static unsigned char dwarf_reg_size_table[DWARF_FRAME_REGISTERS + 1];
+static unsigned char ref_reg_size_table[DWARF_FRAME_REGISTERS + 1] =
+ { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 0 };
+
+int
+main ()
+{
+ __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table);
+ if (__builtin_memcmp (ref_reg_size_table,
+ dwarf_reg_size_table, DWARF_FRAME_REGISTERS + 1) != 0)
+ __builtin_abort ();
+ return 0;
+}
