Patchwork Cleanup gcc.target/arm/interrupt-*.c for thumb mode

login
register
mail settings
Submitter Greta Yorsh
Date Feb. 13, 2013, 2:39 p.m.
Message ID <000901ce09f7$fcab2610$f6017230$@yorsh@arm.com>
Download mbox | patch
Permalink /patch/220149/
State New
Headers show

Comments

Greta Yorsh - Feb. 13, 2013, 2:39 p.m.
The tests gcc.target/arm/interrupt-*.c are for ARM mode only. 
This patch uses effective target arm_notthumb instead of __thumb_ predefine,
removes unreachable code, and fixes typos.

Ok for trunk?

Thanks,
Greta

ChangeLog

gcc/testsuite/

2012-02-13  Greta Yorsh  <Greta.Yorsh@arm.com>

        * gcc.target/arm/interrupt-1.c: Fix for thumb mode.
        * gcc.target/arm/interrupt-2.c: Likewise.
Janis Johnson - Feb. 14, 2013, 11:19 p.m.
On 02/13/2013 06:39 AM, Greta Yorsh wrote:
> The tests gcc.target/arm/interrupt-*.c are for ARM mode only. 
> This patch uses effective target arm_notthumb instead of __thumb_ predefine,
> removes unreachable code, and fixes typos.
> 
> Ok for trunk?
> 
OK

Janis

> Thanks,
> Greta
> 
> ChangeLog
> 
> gcc/testsuite/
> 
> 2012-02-13  Greta Yorsh  <Greta.Yorsh@arm.com>
> 
>         * gcc.target/arm/interrupt-1.c: Fix for thumb mode.
>         * gcc.target/arm/interrupt-2.c: Likewise.
>

Patch

diff --git a/gcc/testsuite/gcc.target/arm/interrupt-1.c b/gcc/testsuite/gcc.target/arm/interrupt-1.c
index 18379de..a384242 100644
--- a/gcc/testsuite/gcc.target/arm/interrupt-1.c
+++ b/gcc/testsuite/gcc.target/arm/interrupt-1.c
@@ -1,10 +1,10 @@ 
 /* Verify that prologue and epilogue are correct for functions with
    __attribute__ ((interrupt)).  */
 /* { dg-do compile } */
-/* { dg-options "-O0" } */
+/* { dg-require-effective-target arm_nothumb } */
+/* { dg-options "-O0 -marm" } */
 
-/* This test is not valid when -mthumb.  We just cheat.  */
-#ifndef __thumb__
+/* This test is not valid when -mthumb.  */
 extern void bar (int);
 extern void foo (void) __attribute__ ((interrupt("IRQ")));
 
@@ -12,12 +12,6 @@  void foo ()
 {
   bar (0);
 }
-#else
-void foo ()
-{
-  asm ("stmfd\tsp!, {r0, r1, r2, r3, r4, fp, ip, lr}");
-  asm ("ldmfd\tsp!, {r0, r1, r2, r3, r4, fp, ip, pc}^");
-}
-#endif
+
 /* { dg-final { scan-assembler "stmfd\tsp!, {r0, r1, r2, r3, r4, fp, ip, lr}" } } */
 /* { dg-final { scan-assembler "ldmfd\tsp!, {r0, r1, r2, r3, r4, fp, ip, pc}\\^" } } */
diff --git a/gcc/testsuite/gcc.target/arm/interrupt-2.c b/gcc/testsuite/gcc.target/arm/interrupt-2.c
index b979bf1..61d3130 100644
--- a/gcc/testsuite/gcc.target/arm/interrupt-2.c
+++ b/gcc/testsuite/gcc.target/arm/interrupt-2.c
@@ -1,26 +1,19 @@ 
 /* Verify that prologue and epilogue are correct for functions with
    __attribute__ ((interrupt)).  */
 /* { dg-do compile } */
-/* { dg-options "-O1" } */
+/* { dg-require-effective-target arm_nothumb } */
+/* { dg-options "-O1 -marm" } */
 
-/* This test is not valid when -mthum.  We just cheat.  */
-#ifndef __thumb__
+/* This test is not valid when -mthumb.  */
 extern void bar (int);
 extern void test (void) __attribute__((__interrupt__));
 
 int foo;
 void test()
 {
-  funcptrs(foo);
+  bar (foo);
   foo = 0;
 }
-#else
-void test ()
-{
-  asm ("stmfd\tsp!, {r0, r1, r2, r3, r4, r5, ip, lr}");
-  asm ("ldmfd\tsp!, {r0, r1, r2, r3, r4, r5, ip, pc}^");
-}
-#endif
 
 /* { dg-final { scan-assembler "stmfd\tsp!, {r0, r1, r2, r3, r4, r5, ip, lr}" } } */
 /* { dg-final { scan-assembler "ldmfd\tsp!, {r0, r1, r2, r3, r4, r5, ip, pc}\\^" } } */