[PATCH, alpha]: Fix PR66140, ICE at extract_insn, at recog.c

[Uros Bizjak]

Hello!

As shown in the PR [1], reload can also schedule a replacement inside
memory address. Attached patch removes invalid check.

2015-05-15  Uros Bizjak  <ubiz...@gmail.com>

    PR target/66140
    * config/alpha/alpha.c (get_aligned_mem): Also look for reload
    replacements in memory addresses.
    (get_unaligned_address): Ditto.

testsuite/ChangeLog:

2015-05-15  Uros Bizjak  <ubiz...@gmail.com>

    PR target/66140
    * gcc.target/alpha/pr66140.c: New test.

Patch was bootstrapped and regression tested on alpha-linux-gnu.

OK for mainline and release branches?

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66140

Uros.

Index: testsuite/gcc.target/alpha/pr66140.c
===================================================================
--- testsuite/gcc.target/alpha/pr66140.c        (revision 0)
+++ testsuite/gcc.target/alpha/pr66140.c        (revision 0)
@@ -0,0 +1,53 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mcpu=ev4" } */
+
+struct scsi_cmnd {
+       int sc_data_direction;
+};
+struct lpfc_hba {
+       unsigned cfg_total_seg_cnt;
+};
+struct lpfc_scsi_buf {
+       struct scsi_cmnd *pCmd;
+       unsigned seg_cnt;
+       unsigned *fcp_bpl;
+};
+
+extern void *sg_next(void *sg);
+extern void *scsi_sglist(struct scsi_cmnd *cmd);
+extern unsigned scsi_sg_count(struct scsi_cmnd *cmd);
+
+static inline void dma_map_sg_attrs(void *sg, int nents, int dir)
+{
+       int i;
+
+       for (i = 0; i < nents; i++, sg = sg_next(sg))
+               ;
+
+       if (!dir)
+               asm volatile( "call_pal %0" : : "i"(129));
+}
+
+static inline void lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd 
*sc,
+                                    unsigned *pde5)
+{
+       void *sgde;
+       int i;
+
+       *pde5 = (((0x85 & 0x000000ff) << 24) | (*pde5 & ~(0x000000ff << 24)));
+       for (i = 0, sgde = scsi_sglist(sc); i < 2; i++, sgde = sg_next(sgde))
+               ;
+}
+
+void lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,
+                                 struct lpfc_scsi_buf *lpfc_cmd)
+{
+       struct scsi_cmnd *scsi_cmnd = lpfc_cmd->pCmd;
+       unsigned *bpl = lpfc_cmd->fcp_bpl;
+
+       dma_map_sg_attrs(scsi_sglist(scsi_cmnd),
+                        scsi_sg_count(scsi_cmnd),
+                        scsi_cmnd->sc_data_direction);
+       if (lpfc_cmd->seg_cnt > phba->cfg_total_seg_cnt)
+               lpfc_bg_setup_bpl(phba, scsi_cmnd, bpl);
+}
Index: config/alpha/alpha.c
===================================================================
--- config/alpha/alpha.c        (revision 223211)
+++ config/alpha/alpha.c        (working copy)
@@ -1556,8 +1556,7 @@ get_aligned_mem (rtx ref, rtx *paligned_mem, rtx *
 
   gcc_assert (MEM_P (ref));
 
-  if (reload_in_progress
-      && ! memory_address_p (GET_MODE (ref), XEXP (ref, 0)))
+  if (reload_in_progress)
     {
       base = find_replacement (&XEXP (ref, 0));
       gcc_assert (memory_address_p (GET_MODE (ref), base));
@@ -1602,11 +1601,9 @@ get_unaligned_address (rtx ref)
 
   gcc_assert (MEM_P (ref));
 
-  if (reload_in_progress
-      && ! memory_address_p (GET_MODE (ref), XEXP (ref, 0)))
+  if (reload_in_progress)
     {
       base = find_replacement (&XEXP (ref, 0));
-
       gcc_assert (memory_address_p (GET_MODE (ref), base));
     }
   else