From patchwork Tue Oct 2 07:52:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 188414 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 18B532C00A8 for ; Tue, 2 Oct 2012 17:52:38 +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=1349769159; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=tazTasK Y9LXinECyHdS2Ne1+0xE=; b=O5ykaslB4Q9XREm3YgRzjoL6/iHHDc/yBz+IGbK OliOGg1aIWoM1LY/CGyZN0GFRATn/8q1wRddsG2HmImxsL7RV2+2HO3O9Ta+z0IR ARSPwsKzZkFED5JLrHCKDMiNbnw+qEWx8zn+qV9gVfr/KUk4QXXfKl+p0vkALJu+ Gp64= 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:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=fog7SE+Eu3xwOkRgxaX25SfD1KqpRezI2kqcCas0xMHMxc4G8naq8pCV8HDTcp 9o/P5V9NQQqrjSS3AbcqRjwT1jF5kjC42tltfJIqUaINKQyPHOJbmSpEiR9DeW9W Pvc/dQBtgCTK5/1wj2MoZAlkJKLfjeSe9Te9evw/RtQiI=; Received: (qmail 16717 invoked by alias); 2 Oct 2012 07:52:32 -0000 Received: (qmail 16707 invoked by uid 22791); 2 Oct 2012 07:52:31 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_DD, TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 02 Oct 2012 07:52:26 +0000 Received: by pbbro12 with SMTP id ro12so8898330pbb.20 for ; Tue, 02 Oct 2012 00:52:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.66.81.103 with SMTP id z7mr16002101pax.57.1349164346212; Tue, 02 Oct 2012 00:52:26 -0700 (PDT) Received: by 10.66.20.232 with HTTP; Tue, 2 Oct 2012 00:52:26 -0700 (PDT) Date: Tue, 2 Oct 2012 09:52:26 +0200 Message-ID: Subject: [PATCH, libitm]: A couple of trivial x86 changes From: Uros Bizjak To: gcc-patches@gcc.gnu.org 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 Hello! 2012-10-02 Uros Bizjak * config/x86/target.h (struct gtm_jmpbuf): Merge x86_64 and ia32 declarations some more. * config/x86/sjlj.S (_ITM_beginTransaction): Move ret to common code. Tested on x86_64-pc-linux-gnu, committed to mainline SVN. Uros. Index: config/x86/sjlj.S =================================================================== --- config/x86/sjlj.S (revision 191953) +++ config/x86/sjlj.S (working copy) @@ -74,7 +74,6 @@ call SYM(GTM_begin_transaction) addq $56, %rsp cfi_def_cfa_offset(8) - ret #else leal 4(%esp), %ecx movl 4(%esp), %eax @@ -99,8 +98,8 @@ #endif addl $28, %esp cfi_def_cfa_offset(4) - ret #endif + ret cfi_endproc TYPE(_ITM_beginTransaction) Index: config/x86/target.h =================================================================== --- config/x86/target.h (revision 191953) +++ config/x86/target.h (working copy) @@ -24,11 +24,11 @@ namespace GTM HIDDEN { -#ifdef __x86_64__ /* ??? This doesn't work for Win64. */ typedef struct gtm_jmpbuf { void *cfa; +#ifdef __x86_64__ unsigned long long rbx; unsigned long long rbp; unsigned long long r12; @@ -36,18 +36,14 @@ unsigned long long r14; unsigned long long r15; unsigned long long rip; -} gtm_jmpbuf; #else -typedef struct gtm_jmpbuf -{ - void *cfa; unsigned long ebx; unsigned long esi; unsigned long edi; unsigned long ebp; unsigned long eip; -} gtm_jmpbuf; #endif +} gtm_jmpbuf; /* x86 doesn't require strict alignment for the basic types. */ #define STRICT_ALIGNMENT 0