From 20955f5acf05cd84927826a268caa847abfe3a6d Mon Sep 17 00:00:00 2001 From: Georg-Johann Lay Date: Thu, 19 Apr 2012 11:29:13 +0000 Subject: [PATCH] re PR target/53033 ([avr]: Wrong register number for 3-byte loads via X) PR target/53033 * config/avr/avr.c (avr_out_load_psi): Fix assembler template for the case *(X+const). From-SVN: r186588 --- gcc/ChangeLog | 6 ++++++ gcc/config/avr/avr.c | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 61dd836eeb77..086b8136f500 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-04-19 Georg-Johann Lay + + PR target/53033 + * config/avr/avr.c (avr_out_load_psi): Fix assembler template for + the case *(X+const). + 2012-04-19 Ramana Radhakrishnan * config/arm/sync.md (sync_optab): Change ior attribute to "or". diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index c25f8983a790..af00aeea07af 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -3476,15 +3476,16 @@ avr_out_load_psi (rtx insn, rtx *op, int *plen) "mov r27,__tmp_reg__", op, plen, -6); } - avr_asm_len ("adiw r26,%o1" CR_TAB - "ld r24,X+" CR_TAB - "ld r25,X+" CR_TAB - "ld r26,X", op, plen, -4); + avr_asm_len ("adiw r26,%o1" CR_TAB + "ld %A0,X+" CR_TAB + "ld %B0,X+" CR_TAB + "ld %C0,X", op, plen, -4); - if (reg_dest != REG_X - 2) - avr_asm_len ("sbiw r26,%o1+2", op, plen, 1); + if (reg_dest != REG_W + && !reg_unused_after (insn, XEXP (base, 0))) + avr_asm_len ("sbiw r26,%o1+2", op, plen, 1); - return ""; + return ""; } if (reg_dest == reg_base)