re PR target/67839 (Bit addressable instructions generated for invalid memory address)

gcc/ChangeLog

	PR target/67839
	* config/avr/predicates.md (low_io_address_operand): Don't
	consider MODE when computing upper bound.
	(io_address_operand): Likewise.

gcc/testsuite/ChangeLog

	PR target/67839
	* gcc.target/avr/pr67839.c: New test.

From-SVN: r229495

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dfe2bad37fe8e8e5b91349762eb13315a5a2d766..791aaf8fb65e6018604e8b5ddc08801fd67f07fd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-05  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
+
+       PR target/67839
+       * config/avr/predicates.md (low_io_address_operand): Don't
+       consider MODE when computing upper bound.
+       (io_address_operand): Likewise.
+
 2015-10-28  Jan Hubicka  <hubicka@ucw.cz>
 
        * fold-const.c (operand_equal_p): Do not verify that types are

diff --git a/gcc/config/avr/predicates.md b/gcc/config/avr/predicates.md
index 2d12bc690168891f0aaae52606d7f81c7a21466c..622bc0b0831a8bd9cd093db3f7419a9542a506de 100644 (file)
--- a/gcc/config/avr/predicates.md
+++ b/gcc/config/avr/predicates.md
@@ -46,7 +46,7 @@
 (define_special_predicate "low_io_address_operand"
   (ior (and (match_code "const_int")
            (match_test "IN_RANGE (INTVAL (op) - avr_arch->sfr_offset,
-                                  0, 0x20 - GET_MODE_SIZE (mode))"))
+                                  0, 0x1F)"))
        (and (match_code "symbol_ref")
            (match_test "SYMBOL_REF_FLAGS (op) & SYMBOL_FLAG_IO_LOW"))))
 
@@ -60,7 +60,7 @@
 (define_special_predicate "io_address_operand"
   (ior (and (match_code "const_int")
            (match_test "IN_RANGE (INTVAL (op) - avr_arch->sfr_offset,
-                                  0, 0x40 - GET_MODE_SIZE (mode))"))
+                                  0, 0x3F)"))
        (and (match_code "symbol_ref")
            (match_test "SYMBOL_REF_FLAGS (op) & SYMBOL_FLAG_IO"))))
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5b0c237e3203a2c89f83afcb633e97403817b17d..cc04c43bfef508879d8062d0ccc416a44cdcaaeb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-05  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
+
+       PR target/67839
+       * gcc.target/avr/pr67839.c: New test.
+
 2015-10-28  Richard Biener  <rguenther@suse.de>
 
        * gcc.dg/tree-ssa/operand-equal-2.c: Adjust.

diff --git a/gcc/testsuite/gcc.target/avr/pr67839.c b/gcc/testsuite/gcc.target/avr/pr67839.c
new file mode 100644 (file)
index 0000000..604ab4b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/avr/pr67839.c
@@ -0,0 +1,29 @@
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+/* { dg-final { scan-assembler "sbi 0x1f,0" } } */
+/* { dg-final { scan-assembler "cbi 0x1f,0" } } */
+/* { dg-final { scan-assembler-not "sbi 0x20,0" } } */
+/* { dg-final { scan-assembler-not "cbi 0x20,0" } } */
+/* { dg-final { scan-assembler "in r\\d+,__SREG__" } } */
+/* { dg-final { scan-assembler "out __SREG__,r\\d+" } } */
+/* { dg-final { scan-assembler-not "in r\\d+,0x40" } } */
+/* { dg-final { scan-assembler-not "out 0x40, r\\d+" } } */
+
+/* This testcase verifies that SBI/CBI/SBIS/SBIC
+   and IN/OUT instructions are not generated for
+   an IO addresses outside the valid range.
+*/
+#define IO_ADDR(x) (*((volatile char *)x + __AVR_SFR_OFFSET__))
+int main ()
+{
+  IO_ADDR(0x1f) |= 1;
+  IO_ADDR(0x1f) &= 0xFE;
+
+  IO_ADDR(0x20) |= 1;
+  IO_ADDR(0x20) &= 0xFE;
+
+  IO_ADDR(0x3f) = IO_ADDR(0x3f);
+
+  IO_ADDR(0x40) = IO_ADDR(0x40);
+  return 0;
+}