From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15267 invoked by alias); 25 Nov 2013 17:00:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 15246 invoked by uid 89); 25 Nov 2013 17:00:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL,BAYES_40,RDNS_NONE,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mga09.intel.com Received: from Unknown (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 25 Nov 2013 16:59:51 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 25 Nov 2013 08:56:06 -0800 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 25 Nov 2013 08:59:27 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id rAPGxQse004236; Mon, 25 Nov 2013 16:59:26 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id rAPGxQPQ029787; Mon, 25 Nov 2013 17:59:26 +0100 Received: (from wtedesch@localhost) by ulvlx001.iul.intel.com with œ id rAPGxPMo029783; Mon, 25 Nov 2013 17:59:25 +0100 From: Walfred Tedeschi To: palves@redhat.com, mark.kettenis@xs4all.nl Cc: gdb-patches@sourceware.org, Walfred Tedeschi Subject: [PATCH v3 1/1] Fix PR16193 - gdbserver aborts. Date: Mon, 25 Nov 2013 17:26:00 -0000 Message-Id: <1385398764-29751-1-git-send-email-walfred.tedeschi@intel.com> X-IsSubscribed: yes X-SW-Source: 2013-11/txt/msg00790.txt.bz2 The MPX patch has broken the I386_XSTATE_SIZE macro in the case of AVX. Macro was checking the XCR0 against the size of AVX and not against the AVX state. To fix that it was decided to re-factor the macros improving eadability. 2013-12-25 Walfred Tedeschi * i386-xstate.h (I386_XSTATE_MPX): New Macro. (I386_XSTATE_MPX_MASK): Makes use of I386_XSTATE_MPX. (HAS_MPX): New macro. (HAS_AVX): New macro. (I386_XSTATE_SIZE): Uses HAS_MPX and HAS_AVX. --- gdb/common/i386-xstate.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/common/i386-xstate.h b/gdb/common/i386-xstate.h index e76ecc1..c4b8c8a 100644 --- a/gdb/common/i386-xstate.h +++ b/gdb/common/i386-xstate.h @@ -26,14 +26,13 @@ #define I386_XSTATE_AVX (1ULL << 2) #define I386_XSTATE_BNDREGS (1ULL << 3) #define I386_XSTATE_BNDCFG (1ULL << 4) +#define I386_XSTATE_MPX (I386_XSTATE_BNDREGS | I386_XSTATE_BNDCFG) /* Supported mask and size of the extended state. */ #define I386_XSTATE_X87_MASK I386_XSTATE_X87 #define I386_XSTATE_SSE_MASK (I386_XSTATE_X87 | I386_XSTATE_SSE) #define I386_XSTATE_AVX_MASK (I386_XSTATE_SSE_MASK | I386_XSTATE_AVX) -#define I386_XSTATE_MPX_MASK (I386_XSTATE_AVX_MASK \ - | I386_XSTATE_BNDREGS \ - | I386_XSTATE_BNDCFG) +#define I386_XSTATE_MPX_MASK (I386_XSTATE_AVX_MASK | I386_XSTATE_MPX) #define I386_XSTATE_ALL_MASK I386_XSTATE_MPX_MASK @@ -44,11 +43,13 @@ #define I386_XSTATE_MAX_SIZE 1088 +/* In case one of the MPX XCR0 bits is set we consider we have MPX. */ +#define HAS_MPX(XCR0) (((XCR0) & I386_XSTATE_MPX) != 0) +#define HAS_AVX(XCR0) (((XCR0) & I386_XSTATE_AVX) != 0) + /* Get I386 XSAVE extended state size. */ #define I386_XSTATE_SIZE(XCR0) \ - (((XCR0) & I386_XSTATE_BNDCFG) != 0 ? I386_XSTATE_BNDCFG_SIZE \ - : (((XCR0) & I386_XSTATE_BNDREGS) != 0 ? I386_XSTATE_BNDCFG_SIZE \ - : (((XCR0) & I386_XSTATE_AVX_SIZE) != 0 ? I386_XSTATE_AVX_SIZE \ - : I386_XSTATE_SSE_SIZE))) + (HAS_MPX (XCR0) ? I386_XSTATE_BNDCFG_SIZE : \ + (HAS_AVX (XCR0) ? I386_XSTATE_AVX_SIZE : I386_XSTATE_SSE_SIZE)) #endif /* I386_XSTATE_H */ -- 1.8.1.2