From 79a1fe43fb4ed62b9e66c16efe173180423730ee Mon Sep 17 00:00:00 2001 From: Oleg Endo Date: Thu, 31 Jul 2014 16:27:56 +0000 Subject: [PATCH] re PR target/61844 (ICE when building libgcc for sh64 cross-compiler) gcc/ PR target/61844 * config/sh/sh.c (sh_legitimate_address_p, sh_legitimize_reload_address): Handle reg+reg address modes when ALLOW_INDEXED_ADDRESS is false. * config/sh/predicates.md (general_movsrc_operand, general_movdst_operand): Likewise. From-SVN: r213381 --- gcc/ChangeLog | 9 +++++++++ gcc/config/sh/predicates.md | 8 ++++++++ gcc/config/sh/sh.c | 26 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b2b6aa5b567..27ec98ed163 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-07-31 Oleg Endo + + PR target/61844 + * config/sh/sh.c (sh_legitimate_address_p, + sh_legitimize_reload_address): Handle reg+reg address modes when + ALLOW_INDEXED_ADDRESS is false. + * config/sh/predicates.md (general_movsrc_operand, + general_movdst_operand): Likewise. + 2014-07-31 James Greenhalgh * config/aarch64/aarch64-builtins.c diff --git a/gcc/config/sh/predicates.md b/gcc/config/sh/predicates.md index d7251f36e35..9eb0f1a7eaa 100644 --- a/gcc/config/sh/predicates.md +++ b/gcc/config/sh/predicates.md @@ -489,6 +489,10 @@ rtx mem_rtx = MEM_P (op) ? op : SUBREG_REG (op); rtx x = XEXP (mem_rtx, 0); + if (! ALLOW_INDEXED_ADDRESS + && GET_CODE (x) == PLUS && REG_P (XEXP (x, 0)) && REG_P (XEXP (x, 1))) + return false; + if ((mode == QImode || mode == HImode) && GET_CODE (x) == PLUS && REG_P (XEXP (x, 0)) @@ -567,6 +571,10 @@ rtx mem_rtx = MEM_P (op) ? op : SUBREG_REG (op); rtx x = XEXP (mem_rtx, 0); + if (! ALLOW_INDEXED_ADDRESS + && GET_CODE (x) == PLUS && REG_P (XEXP (x, 0)) && REG_P (XEXP (x, 1))) + return false; + if ((mode == QImode || mode == HImode) && GET_CODE (x) == PLUS && REG_P (XEXP (x, 0)) diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 02468dadcdd..a19235d2411 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -10287,6 +10287,10 @@ sh_legitimate_index_p (enum machine_mode mode, rtx op, bool consider_sh2a, static bool sh_legitimate_address_p (enum machine_mode mode, rtx x, bool strict) { + if (! ALLOW_INDEXED_ADDRESS + && GET_CODE (x) == PLUS && REG_P (XEXP (x, 0)) && REG_P (XEXP (x, 1))) + return false; + if (REG_P (x) && REGNO (x) == GBR_REG) return true; @@ -10516,6 +10520,28 @@ sh_legitimize_reload_address (rtx *p, enum machine_mode mode, int opnum, enum reload_type type = (enum reload_type) itype; const int mode_sz = GET_MODE_SIZE (mode); + if (! ALLOW_INDEXED_ADDRESS + && GET_CODE (*p) == PLUS + && REG_P (XEXP (*p, 0)) && REG_P (XEXP (*p, 1))) + { + *p = copy_rtx (*p); + push_reload (*p, NULL_RTX, p, NULL, + BASE_REG_CLASS, Pmode, VOIDmode, 0, 0, opnum, type); + return true; + } + + if (! ALLOW_INDEXED_ADDRESS + && GET_CODE (*p) == PLUS + && GET_CODE (XEXP (*p, 0)) == PLUS) + { + rtx sum = gen_rtx_PLUS (Pmode, XEXP (XEXP (*p, 0), 0), + XEXP (XEXP (*p, 0), 1)); + *p = gen_rtx_PLUS (Pmode, sum, XEXP (*p, 1)); + push_reload (sum, NULL_RTX, &XEXP (*p, 0), NULL, + BASE_REG_CLASS, Pmode, VOIDmode, 0, 0, opnum, type); + return true; + } + if (TARGET_SHMEDIA) return false; -- 2.30.2