From: Senthil Kumar Selvaraj Date: Mon, 12 May 2014 16:07:44 +0000 (+0000) Subject: backport: re PR target/60991 ([avr] Stack corruption when using 24-bit integers __int... X-Git-Tag: releases/gcc-4.8.3~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97acf42aaa760dae4932ecd36c2d0893232053eb;p=thirdparty%2Fgcc.git backport: re PR target/60991 ([avr] Stack corruption when using 24-bit integers __int24 or __memx pointers in large stack frame) Backport from mainline 2014-05-12 Senthil Kumar Selvaraj PR target/60991 * config/avr/avr.c (avr_out_store_psi): Use correct constant to restore Y. Backport from mainline 2014-05-12 Senthil Kumar Selvaraj PR target/60991 * gcc.target/avr/pr60991.c: New testcase. From-SVN: r210328 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f8d30c154aed..ac561d56e9bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-05-12 Senthil Kumar Selvaraj + + Backport from mainline + 2014-05-12 Senthil Kumar Selvaraj + + PR target/60991 + * config/avr/avr.c (avr_out_store_psi): Use correct constant + to restore Y. + 2014-05-09 Georg-Johann Lay Backport from 2014-05-09 trunk r210267 diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 05ef3860018f..86c46e9c4a24 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -3987,7 +3987,7 @@ avr_out_store_psi (rtx insn, rtx *op, int *plen) "std Y+61,%A1" CR_TAB "std Y+62,%B1" CR_TAB "std Y+63,%C1" CR_TAB - "sbiw r28,%o0-60", op, plen, -5); + "sbiw r28,%o0-61", op, plen, -5); return avr_asm_len ("subi r28,lo8(-%o0)" CR_TAB "sbci r29,hi8(-%o0)" CR_TAB diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 421bd1fac9b1..499415e52e05 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2014-05-12 Senthil Kumar Selvaraj + + Backport from mainline + 2014-05-12 Senthil Kumar Selvaraj + + PR target/60991 + * gcc.target/avr/pr60991.c: New testcase. + 2014-05-09 Georg-Johann Lay Backport from 2014-05-09 trunk r210267 diff --git a/gcc/testsuite/gcc.target/avr/pr60991.c b/gcc/testsuite/gcc.target/avr/pr60991.c new file mode 100644 index 000000000000..a09f42a62b3f --- /dev/null +++ b/gcc/testsuite/gcc.target/avr/pr60991.c @@ -0,0 +1,21 @@ +/* { dg-do run } */ +/* { dg-options "-O1" } */ + +/* This testcase (simplified from the original bug report) exposes + PR60991. The code generated for writing the __int24 value corrupts + the frame pointer if the offset is <= 63 + MAX_LD_OFFSET */ + +#include + +int main(void) +{ + volatile char junk[62]; + junk[0] = 5; + volatile __int24 staticConfig = 0; + + if (junk[0] != 5) + abort(); + + exit(0); + return 0; +}