From 25af209f873fd55690ef7eb4f3482042a915f25f Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Sun, 17 May 2015 07:24:27 +0000 Subject: PR target/66140 * config/alpha/alpha.c (get_aligned_mem): Also look for reload replacements in memory addresses. (get_unaligned_address): Ditto. testsuite/ChangeLog: PR target/66140 * gcc.target/alpha/pr66140.c: New test. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@223266 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++ gcc/config/alpha/alpha.c | 7 ++--- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gcc.target/alpha/pr66140.c | 53 ++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.target/alpha/pr66140.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 62dbdd26f7b..b59c0e4e78f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-05-16 Uros Bizjak + + PR target/66140 + * config/alpha/alpha.c (get_aligned_mem): Also look for reload + replacements in memory addresses. + (get_unaligned_address): Ditto. + 2015-05-14 Kyrylo Tkachov Backport from mainline diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index d5c7908beb0..398a6138173 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -1389,8 +1389,7 @@ get_aligned_mem (rtx ref, rtx *paligned_mem, rtx *pbitnum) 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)); @@ -1435,11 +1434,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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b2a75c1b0d9..4670819a696 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-05-16 Uros Bizjak + + PR target/66140 + * gcc.target/alpha/pr66140.c: New test. + 2015-05-06 Uros Bizjak PR target/65990 diff --git a/gcc/testsuite/gcc.target/alpha/pr66140.c b/gcc/testsuite/gcc.target/alpha/pr66140.c new file mode 100644 index 00000000000..d559f69a02b --- /dev/null +++ b/gcc/testsuite/gcc.target/alpha/pr66140.c @@ -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); +} -- cgit v1.2.3