re PR target/79242 (ICE in simplify_subreg, at simplify-rtx.c:6029)

2018-02-14  Jozef Lawrynowicz <jozefl.gcc@gmail.com>

	PR target/79242
	* machmode.def: Define a complex mode for PARTIAL_INT.
	* genmodes.c (complex_class): Return MODE_COMPLEX_INT for
	MODE_PARTIAL_INT.
	* doc/rtl.texi: Document CSPImode.
	* config/msp430/msp430.c (msp430_hard_regno_nregs): Add CPSImode
	handling.
	(msp430_hard_regno_nregs_with_padding): Likewise.

	PR target/79242
	* gcc.target/msp430/pr79242.c: New test.

From-SVN: r257653

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ddfff6564b53d49789f346a425f92018b83bdc1..bcaf137e461e07690903301afc65e9c5dc310c9d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2018-02-14  Jozef Lawrynowicz <jozefl.gcc@gmail.com>
+
+       PR target/79242
+       * machmode.def: Define a complex mode for PARTIAL_INT.
+       * genmodes.c (complex_class): Return MODE_COMPLEX_INT for
+       MODE_PARTIAL_INT.
+       * doc/rtl.texi: Document CSPImode.
+       * config/msp430/msp430.c (msp430_hard_regno_nregs): Add CPSImode
+       handling.
+       (msp430_hard_regno_nregs_with_padding): Likewise.
+
 2018-02-13  Peter Bergner  <bergner@vnet.ibm.com>
 
        PR target/84279

diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 83e9e38af4cefab737380e646d377564f096b9ee..a8fed123f7a7fae75d9c61e29fe30f6f78906d72 100644 (file)
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -914,6 +914,8 @@ msp430_hard_regno_nregs (unsigned int, machine_mode mode)
 {
   if (mode == PSImode && msp430x)
     return 1;
+  if (mode == CPSImode && msp430x)
+    return 2;
   return ((GET_MODE_SIZE (mode) + UNITS_PER_WORD - 1)
          / UNITS_PER_WORD);
 }
@@ -936,6 +938,8 @@ msp430_hard_regno_nregs_with_padding (int regno ATTRIBUTE_UNUSED,
 {
   if (mode == PSImode)
     return 2;
+  if (mode == CPSImode)
+    return 4;
   return msp430_hard_regno_nregs (regno, mode);
 }
 

diff --git a/gcc/doc/rtl.texi b/gcc/doc/rtl.texi
index 43d5405ddb47e78983380845a2fdde9c3041efee..b5410f9689d7e966903d16ec869ad9b3c6378c28 100644 (file)
--- a/gcc/doc/rtl.texi
+++ b/gcc/doc/rtl.texi
@@ -1303,10 +1303,11 @@ point values.  The floating point values are in @code{QFmode},
 @findex CDImode
 @findex CTImode
 @findex COImode
-@item CQImode, CHImode, CSImode, CDImode, CTImode, COImode
+@findex CPSImode
+@item CQImode, CHImode, CSImode, CDImode, CTImode, COImode, CPSImode
 These modes stand for a complex number represented as a pair of integer
 values.  The integer values are in @code{QImode}, @code{HImode},
-@code{SImode}, @code{DImode}, @code{TImode}, and @code{OImode},
+@code{SImode}, @code{DImode}, @code{TImode}, @code{OImode}, and @code{PSImode},
 respectively.
 
 @findex BND32mode

diff --git a/gcc/genmodes.c b/gcc/genmodes.c
index a70f0967859b13a349c83086cde4527d2a3648e9..af0d280e208055dc8088fb4b8394e49998092cc1 100644 (file)
--- a/gcc/genmodes.c
+++ b/gcc/genmodes.c
@@ -119,6 +119,7 @@ complex_class (enum mode_class c)
   switch (c)
     {
     case MODE_INT: return MODE_COMPLEX_INT;
+    case MODE_PARTIAL_INT: return MODE_COMPLEX_INT;
     case MODE_FLOAT: return MODE_COMPLEX_FLOAT;
     default:
       error ("no complex class for class %s", mode_class_names[c]);

diff --git a/gcc/machmode.def b/gcc/machmode.def
index d5d5efc22ab318d0910822c3e2a445f10aa894ed..9505cc3e6df8a37568d0974eb6c29fbb77939f7e 100644 (file)
--- a/gcc/machmode.def
+++ b/gcc/machmode.def
@@ -260,6 +260,7 @@ UACCUM_MODE (UTA, 16, 64, 64); /* 64.64 */
 
 /* Complex modes.  */
 COMPLEX_MODES (INT);
+COMPLEX_MODES (PARTIAL_INT);
 COMPLEX_MODES (FLOAT);
 
 /* Decimal floating point modes.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a2203185ef10cbecd576c4a78102f2f78b6e13d..a8dc606ad358b692c202faa9ada7d435fc63801b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-14  Jozef Lawrynowicz <jozefl.gcc@gmail.com>
+
+       PR target/79242
+       * gcc.target/msp430/pr79242.c: New test.
+
 2018-02-13  Peter Bergner  <bergner@vnet.ibm.com>
 
        PR target/84372

diff --git a/gcc/testsuite/gcc.target/msp430/pr79242.c b/gcc/testsuite/gcc.target/msp430/pr79242.c
new file mode 100644 (file)
index 0000000..d7ff8d3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/pr79242.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { "*-*-*" } { "-mcpu=msp430" "-msmall" } { "" } } */
+/* { dg-options "-mcpu=msp430x" } */
+
+typedef _Complex __int20 C;
+
+C
+foo (C x, C y)
+{
+  return x + y;
+}