Patchwork [i386] : Prevent SImode subregs of stack pointer in addresses

login
register
mail settings
Submitter Uros Bizjak
Date Aug. 1, 2012, 12:07 p.m.
Message ID <CAFULd4YWJLzSFbiUX9c0EFRBtS7+kzspmuOaHnjBPbxWaoEPTQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/174441/
State New
Headers show

Comments

Uros Bizjak - Aug. 1, 2012, 12:07 p.m.
Hello!

For some reason simplify_subreg does not like stack pointer. We call
simplify_subreg when printing address operands, so we have to prevent
SImode subregs of stack pointers from going into the address.

2012-08-01  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/i386.c (ix86_address_subreg_operand): Reject
	stack pointer.
	(ix86_print_operand_address): Assert that parts.base and parts.index
	are non-NULL after call to simplify_subreg.

Tested on x86_64-pc-linux-gnu {,-m32} and committed to mainline SVN.
The patch will be backported to 4.7 branch.

Uros.

Patch

Index: i386.c
===================================================================
--- i386.c	(revision 190005)
+++ i386.c	(working copy)
@@ -11657,6 +11657,10 @@  ix86_address_subreg_operand (rtx op)
   if (GET_MODE_SIZE (mode) > UNITS_PER_WORD)
     return false;
 
+  /* simplify_subreg does not handle stack pointer.  */
+  if (REGNO (op) == STACK_POINTER_REGNUM)
+    return false;
+
   /* Allow only SUBREGs of non-eliminable hard registers.  */
   return register_no_elim_operand (op, mode);
 }
@@ -14823,6 +14827,7 @@  ix86_print_operand_address (FILE *file, rtx addr)
       rtx tmp = SUBREG_REG (parts.base);
       parts.base = simplify_subreg (GET_MODE (parts.base),
 				    tmp, GET_MODE (tmp), 0);
+      gcc_assert (parts.base != NULL_RTX);
     }
 
   if (parts.index && GET_CODE (parts.index) == SUBREG)
@@ -14830,6 +14835,7 @@  ix86_print_operand_address (FILE *file, rtx addr)
       rtx tmp = SUBREG_REG (parts.index);
       parts.index = simplify_subreg (GET_MODE (parts.index),
 				     tmp, GET_MODE (tmp), 0);
+      gcc_assert (parts.index != NULL_RTX);
     }
 
   base = parts.base;