From: Andy Hutchinson <hutchinsonandy@aim.com>
Date: Sun, 14 Sep 2008 12:50:10 +0000 (+0000)
Subject: re PR target/19636 (Can't compile large switch statement)
X-Git-Tag: releases/gcc-4.4.0~2442
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9215065fd6861ffbe6e5d7348dca6720f594612b;p=thirdparty%2Fgcc.git

re PR target/19636 (Can't compile large switch statement)

	PR target/19636
	PR target/24894
	PR target/31644
	PR target/31786
	* config/avr/avr.c (legitimate_address_p): Fix problem where subreg
	is not recognized as a valid register usage. Allow REG_X to be used
	as a base pointer.
	* config/avr/avr.h (LEGITIMIZE_RELOAD_ADDRESS): Remove code that
	forces a reload when using a base register.

From-SVN: r140360
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af70b38b4c4c..c00089733570 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-14  Andy Hutchinson  <hutchinsonandy@aim.com>
+
+	PR target/19636
+	PR target/24894
+	PR target/31644
+	PR target/31786
+	* config/avr/avr.c (legitimate_address_p): Fix problem where subreg
+	is not recognized as a valid register usage. Allow REG_X to be used
+	as a base pointer.
+	* config/avr/avr.h (LEGITIMIZE_RELOAD_ADDRESS): Remove code that
+	forces a reload when using a base register.
+
 2008-09-14  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* config/i386/cygming-crtend.c (register_frame_ctor): If
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index fb217bb167a6..279aea525924 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -1089,6 +1089,8 @@ legitimate_address_p (enum machine_mode mode, rtx x, int strict)
 		 true_regnum (XEXP (x, 0)));
       debug_rtx (x);
     }
+  if (!strict && GET_CODE (x) == SUBREG)
+	x = SUBREG_REG (x);
   if (REG_P (x) && (strict ? REG_OK_FOR_BASE_STRICT_P (x)
                     : REG_OK_FOR_BASE_NOSTRICT_P (x)))
     r = POINTER_REGS;
@@ -1103,6 +1105,7 @@ legitimate_address_p (enum machine_mode mode, rtx x, int strict)
       if (fit)
 	{
 	  if (! strict
+	      || REGNO (XEXP (x,0)) == REG_X
 	      || REGNO (XEXP (x,0)) == REG_Y
 	      || REGNO (XEXP (x,0)) == REG_Z)
 	    r = BASE_POINTER_REGS;
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 744098518056..3b7cbbb4343e 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -483,10 +483,6 @@ do {									    \
 		           OPNUM, TYPE);				    \
 	      goto WIN;							    \
 	    }								    \
-	  push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL,	    \
-		       BASE_POINTER_REGS, GET_MODE (X), VOIDmode, 0, 0,	    \
-		       OPNUM, TYPE);					    \
-          goto WIN;							    \
 	}								    \
       else if (! (frame_pointer_needed && XEXP (X,0) == frame_pointer_rtx)) \
 	{								    \