From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6040 invoked by alias); 18 Jul 2012 16:30:23 -0000 Received: (qmail 6014 invoked by uid 22791); 18 Jul 2012 16:30:21 -0000 X-SWARE-Spam-Status: No, hits=-4.7 required=5.0 tests=AWL,BAYES_00,FSL_FREEMAIL_1,KHOP_RCVD_UNTRUST,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,TW_IV,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 18 Jul 2012 16:30:09 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 18 Jul 2012 09:30:08 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by AZSMGA002.ch.intel.com with ESMTP; 18 Jul 2012 09:30:08 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id E135F80D78; Wed, 18 Jul 2012 09:30:07 -0700 (PDT) Date: Wed, 18 Jul 2012 16:30:00 -0000 From: "H.J. Lu" To: Uros Bizjak , java-patches@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org Subject: Re: PR libjava/53973: Check and and skip 67h address size prefix for x32 Message-ID: <20120718163007.GA23495@intel.com> Reply-To: "H.J. Lu" References: <20120716210441.GA5620@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120716210441.GA5620@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2012-q3/txt/msg00006.txt.bz2 On Mon, Jul 16, 2012 at 02:04:41PM -0700, H.J. Lu wrote: > Hi, > > Since x32 may generate 64-bit integer divide like > > 67 48 f7 bd a0 fe ff ff idivq -0x160(%ebp) > > we need to check and skip 67h address size for x32. OK for trunk if > there are no regressions on Linux/x86-64? > > Thanks. > > H.J. > ---- > 2012-07-16 H.J. Lu > > PR libjava/53973 > * include/x86_64-signal.h (CHECK_67H_PREFIX): New. > (HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size > prefix if CHECK_67H_PREFIX is 1. > Here is the patch with the updated ChangeLog entry. OK for trunk? Thanks. H.J. --- 2012-07-16 H.J. Lu PR libjava/53973 * include/x86_64-signal.h (CHECK_67H_PREFIX): New. (HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size prefix if CHECK_67H_PREFIX is 1. Use ULL suffix for 64-bit integer. diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h index 4bd8a36..84907c3 100644 --- a/libjava/include/x86_64-signal.h +++ b/libjava/include/x86_64-signal.h @@ -21,6 +21,12 @@ details. */ #define HANDLE_SEGV 1 #define HANDLE_FPE 1 +#ifdef __ILP32__ +# define CHECK_67H_PREFIX 1 +#else +# define CHECK_67H_PREFIX 0 +#endif + #define SIGNAL_HANDLER(_name) \ static void _Jv_##_name (int, siginfo_t *, \ void *_p __attribute__ ((__unused__))) @@ -47,6 +53,10 @@ do \ \ bool _is_64_bit = false; \ \ + /* Check and skip 67h address size prefix if needed. */ \ + if (CHECK_67H_PREFIX && _rip[0] == 0x67) \ + _rip++; \ + \ if ((_rip[0] & 0xf0) == 0x40) /* REX byte present. */ \ { \ unsigned char _rex = _rip[0] & 0x0f; \ @@ -64,10 +74,10 @@ do \ { \ if (_is_64_bit) \ _min_value_dividend = \ - _gregs[REG_RAX] == (greg_t)0x8000000000000000UL; \ + _gregs[REG_RAX] == (greg_t)0x8000000000000000ULL; \ else \ _min_value_dividend = \ - (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000UL; \ + (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000ULL; \ } \ \ if (_min_value_dividend) \