From patchwork Thu Jul 22 08:30:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 59550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A86A8B70AF for ; Thu, 22 Jul 2010 18:30:41 +1000 (EST) Received: (qmail 29718 invoked by alias); 22 Jul 2010 08:30:38 -0000 Received: (qmail 29687 invoked by uid 22791); 22 Jul 2010 08:30:37 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cam-admin0.cambridge.arm.com (HELO cam-admin0.cambridge.arm.com) (217.140.96.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 22 Jul 2010 08:30:27 +0000 Received: from cam-owa1.Emea.Arm.com (cam-owa1.emea.arm.com [10.1.255.62]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id o6M8ULF9023371 for ; Thu, 22 Jul 2010 09:30:24 +0100 (BST) Received: from [10.1.66.29] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Thu, 22 Jul 2010 09:30:21 +0100 Subject: Re: [PATCH ARM] Fix PR43698 From: Ramana Radhakrishnan Reply-To: ramana.radhakrishnan@arm.com To: Richard Earnshaw Cc: gcc-patches@gcc.gnu.org In-Reply-To: <1278340142.14175.4.camel@e102346-lin.cambridge.arm.com> References: <1278332021.31141.11.camel@e102325-lin.cambridge.arm.com> <1278340142.14175.4.camel@e102346-lin.cambridge.arm.com> Date: Thu, 22 Jul 2010 09:30:20 +0100 Message-Id: <1279787420.4155.51.camel@e102325-lin.cambridge.arm.com> Mime-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org > > 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 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 +#include + + +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); +}