From patchwork Mon Jul 16 21:04:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 171252 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 A5D2B2C0197 for ; Tue, 17 Jul 2012 07:05:03 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1343077504; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Date:From:To:Subject:Message-ID:Reply-To:MIME-Version: Content-Type:Content-Disposition:User-Agent:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=cZQya+F1IlV303705l2fH2jTH28=; b=fZqHey57YJA4vR7cdGfJlZVKujHzIVZ8N43XitJFs62GyB5Rs3OliHfb/yglf4 stHzOVuuB4nQD2DTpTFFL3j1rtlr4NBarRQ9P2lZI9XdBveT6qW1Jf/sV/UaRKqg 2lD+rFK1Sg3+yNmIJPAAX9zlUGlkBg3UM8E7/q6n4K66E= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-ExtLoop1:Received:Received:Date:From:To:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Cp3fI/c7fuVRYnbhPH4iOk1UGlo4jViUG4uKyOqccS4zcjQigtDgwt5ovltedw MgHdc8rUvdtwLTZ4Z0rKG8BTPdwrhV3jtuURUcsj71iFup6avB6fmIQal3hHyzqW p36WHBoPX1agYcjx/1zumhhoh0tH6C3rBg0s9muYlipDU=; Received: (qmail 24112 invoked by alias); 16 Jul 2012 21:04:59 -0000 Received: (qmail 24090 invoked by uid 22791); 16 Jul 2012 21:04:57 -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 mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Jul 2012 21:04:42 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 16 Jul 2012 14:04:42 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by AZSMGA002.ch.intel.com with ESMTP; 16 Jul 2012 14:04:42 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id E3A6F80CCE; Mon, 16 Jul 2012 14:04:41 -0700 (PDT) Date: Mon, 16 Jul 2012 14:04:41 -0700 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Subject: PR libjava/53973: Check and and skip 67h address size prefix for x32 Message-ID: <20120716210441.GA5620@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 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. 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) \