Patchwork [ARM] Fix PR43698

login
register
mail settings
Submitter Ramana Radhakrishnan
Date July 22, 2010, 8:30 a.m.
Message ID <1279787420.4155.51.camel@e102325-lin.cambridge.arm.com>
Download mbox | patch
Permalink /patch/59550/
State New
Headers show

Comments

Ramana Radhakrishnan - July 22, 2010, 8:30 a.m.
> 
> OK (both).

I found a small problem with my patch during testing because there was a
small typo (note a missing '+' in the test and a missing '?' in the
pattern for *arm_rev) when I created this patch for submission
upstream. 

Here's the revised patch I've now committed. No regressions found with
cross-testing with qemu.

cheers
Ramana

Patch

Index: gcc/config/arm/arm.md
===================================================================
--- gcc/config/arm/arm.md	(revision 162403)
+++ gcc/config/arm/arm.md	(working copy)
@@ -11305,15 +11305,21 @@ 
    (set_attr "length" "4")]
 )
 
-(define_insn "arm_rev"
+(define_insn "*arm_rev"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(bswap:SI (match_operand:SI 1 "s_register_operand" "r")))]
-  "TARGET_EITHER && arm_arch6"
-  "rev\t%0, %1"
-  [(set (attr "length")
-        (if_then_else (eq_attr "is_thumb" "yes")
-		      (const_int 2)
-		      (const_int 4)))]
+  "TARGET_32BIT && arm_arch6"
+  "rev%?\t%0, %1"
+  [(set_attr "predicable" "yes")
+   (set_attr "length" "4")]
+)
+
+(define_insn "*thumb1_rev"
+  [(set (match_operand:SI 0 "s_register_operand" "=l")
+	(bswap:SI (match_operand:SI 1 "s_register_operand" "l")))]
+  "TARGET_THUMB1 && arm_arch6"
+   "rev\t%0, %1"
+  [(set_attr "length" "2")]
 )
 
 (define_expand "arm_legacy_rev"
Index: gcc/testsuite/gcc.target/arm/pr43698.c
===================================================================
--- gcc/testsuite/gcc.target/arm/pr43698.c	(revision 0)
+++ gcc/testsuite/gcc.target/arm/pr43698.c	(revision 0)
@@ -0,0 +1,38 @@ 
+/* { dg-do run } */
+/* { dg-options "-Os -march=armv7-a" } */
+#include <stdint.h>
+#include <stdlib.h>
+
+
+char do_reverse_endian = 0;
+
+#  define bswap_32(x) \
+  ((((x) & 0xff000000) >> 24) | \
+   (((x) & 0x00ff0000) >>  8) | \
+   (((x) & 0x0000ff00) <<  8) | \
+   (((x) & 0x000000ff) << 24))
+
+#define EGET(X) \
+  (__extension__ ({ \
+      uint64_t __res; \
+      if (!do_reverse_endian) {    __res = (X); \
+      } else if (sizeof(X) == 4) { __res = bswap_32((X)); \
+      } \
+      __res; \
+    }))
+
+void __attribute__((noinline)) X(char **phdr, char **data, int *phoff)
+{
+  *phdr = *data + EGET(*phoff);
+}
+
+int main()
+{
+  char *phdr;
+  char *data = (char *)0x40164000;
+  int phoff = 0x34;
+  X(&phdr, &data, &phoff);
+  if (phdr != (char *)0x40164034)
+    abort ();
+  exit (0);
+}