aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSenthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>2014-05-12 15:33:00 +0000
committerDenis Chertykov <denisc@gcc.gnu.org>2014-05-12 19:33:00 +0400
commit079f14208faf1d627da8e9873c1bc6bb1f0ef6a6 (patch)
tree8a2fec6d9b34d0a86fca75c51bd4b9df184fbfb9 /gcc
parentc7ae26aab85ec0ddb4afeb808a32427c1f4b902b (diff)
downloadgcc-079f14208faf1d627da8e9873c1bc6bb1f0ef6a6.zip
gcc-079f14208faf1d627da8e9873c1bc6bb1f0ef6a6.tar.gz
gcc-079f14208faf1d627da8e9873c1bc6bb1f0ef6a6.tar.bz2
re PR target/60991 ([avr] Stack corruption when using 24-bit integers __int24 or __memx pointers in large stack frame)
gcc/ChangeLog PR target/60991 * config/avr/avr.c (avr_out_store_psi): Use correct constant to restore Y. gcc/testsuite/ChangeLog PR target/60991 * gcc.target/avr/pr60991.c: New testcase. From-SVN: r210325
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/avr/avr.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/avr/pr60991.c21
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41c1e80..b5cf3b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-12 Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
+
+ PR target/60991
+ * config/avr/avr.c (avr_out_store_psi): Use correct constant
+ to restore Y.
+
2014-05-12 Georg-Johann Lay <avr@gjlay.de>
* config/arm/arm.h (License): Add GCC Runtime Library Exception.
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 536fe68..fc6c9f6 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -3999,7 +3999,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 84ff764..746aa41 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12 Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
+
+ PR target/60991
+ * gcc.target/avr/pr60991.c: New testcase.
+
2014-05-12 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60054
diff --git a/gcc/testsuite/gcc.target/avr/pr60991.c b/gcc/testsuite/gcc.target/avr/pr60991.c
new file mode 100644
index 0000000..a09f42a
--- /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 <stdlib.h>
+
+int main(void)
+{
+ volatile char junk[62];
+ junk[0] = 5;
+ volatile __int24 staticConfig = 0;
+
+ if (junk[0] != 5)
+ abort();
+
+ exit(0);
+ return 0;
+}