From patchwork Fri Mar 16 10:58:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 147184 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 C5568B6FC4 for ; Fri, 16 Mar 2012 21:58:25 +1100 (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=1332500307; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:Content-Type:Content-Transfer-Encoding:Subject: Date:Message-Id:To:Mime-Version:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=atAzJBe4lTYo20J2QTLEFFDDp6Q=; b=YT5xGvlRRlZidxV YCsp5sMXACU8L80T130PG3jbhJt9W13TtYbvlicz8S3KQlzrFCkgw64KtQ4zqkXD WbzfPZbErx2AU9ofcOQb5Y/UHhUjO9ipv9manjv03erIzSYIMN59UxfVwlsMqzGF Pq7+9mZwg4IttfYiKR9nlDfq7qpg= 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:Received:Received:From:Content-Type:Content-Transfer-Encoding:Subject:Date:Message-Id:To:Mime-Version:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=dILjaYhZbQkj3QNP3bp9wZ+PUNyGCtDaTbecGlomdl67WBaowrXwBqup6NoIUf +0ni/O39zVDDh0lYfjfq8g5sSJluIkTioN/nw7kZfIHrsAiAr5SbL+/unyVKsgcx ptyiqUzlOtmlIpyOFu5/2d+0sPZRVaS2G28oi1W1gs7ME=; Received: (qmail 19937 invoked by alias); 16 Mar 2012 10:58:22 -0000 Received: (qmail 19929 invoked by uid 22791); 16 Mar 2012 10:58:21 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 16 Mar 2012 10:58:08 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 776A9290049 for ; Fri, 16 Mar 2012 11:58:09 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UVTq6hcYFzEN for ; Fri, 16 Mar 2012 11:58:09 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 87D6D290045 for ; Fri, 16 Mar 2012 11:58:07 +0100 (CET) From: Tristan Gingold Subject: [VMS/committed]: Do not use long in vms-unwind.h Date: Fri, 16 Mar 2012 11:58:05 +0100 Message-Id: To: GCC Patches Mime-Version: 1.0 (Apple Message framework v1257) 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 Hi, use of 'long' in vms-unwind.h for registers isn't correct as 'long' should be a 32 bit type on vms. Let replace it with unw_reg, now defined as unsigned __int64. Manually tested on ia64-hp-openvms. Committed on trunk. Tristan. libgcc/ 2012-03-16 Tristan Gingold * config/ia64/vms-unwind.h: Remove ulong (and replace it by unw_reg where used). Define unw_reg with __int64. Index: libgcc/config/ia64/vms-unwind.h =================================================================== --- libgcc/config/ia64/vms-unwind.h (revision 185454) +++ libgcc/config/ia64/vms-unwind.h (working copy) @@ -49,9 +49,8 @@ extern int LIB$I64_GET_CURR_INVO_CONTEXT (INVO_CONTEXT_BLK *); extern int LIB$I64_GET_PREV_INVO_CONTEXT (INVO_CONTEXT_BLK *); -typedef unsigned long ulong; typedef unsigned int uint; -typedef unsigned long uw_reg; +typedef unsigned __int64 uw_reg; typedef uw_reg * uw_loc; typedef char fp_reg[16]; @@ -179,8 +178,8 @@ if (eh_debug) printf ("User frame, " - "chfmech @ 0x%lx, chfsig64 @ 0x%lx, intstk @ 0x%lx\n", - (ulong)chfmech, (ulong)chfsig64, (ulong)intstk); + "chfmech @ 0x%p, chfsig64 @ 0x%p, intstk @ 0x%p\n", + chfmech, chfsig64, intstk); /* Step 2 : ------------------------------------------------------------------------ @@ -239,10 +238,10 @@ trick already) and how this would be handled. Blind alpha tentative below for experimentation purposes in malfunctioning cases. */ { - ulong q_bsp = (ulong) intstk->intstk$q_bsp; - ulong q_bspstore = (ulong) intstk->intstk$q_bspstore; - ulong q_bspbase = (ulong) intstk->intstk$q_bspbase; - ulong ih_bspbase = (ulong) icb->libicb$ih_bspbase; + uw_reg q_bsp = (uw_reg) intstk->intstk$q_bsp; + uw_reg q_bspstore = (uw_reg) intstk->intstk$q_bspstore; + uw_reg q_bspbase = (uw_reg) intstk->intstk$q_bspbase; + uw_reg ih_bspbase = (uw_reg) icb->libicb$ih_bspbase; if (eh_debug) printf ("q_bspstore = 0x%lx, q_bsp = 0x%lx, q_bspbase = 0x%lx\n" @@ -254,8 +253,8 @@ nothing resulted in proper behavior. */ if (q_bspstore < q_bsp && ih_bspbase && try_bs_copy) { - ulong dirty_size = q_bsp - q_bspstore; - ulong q_rnat = (ulong) intstk->intstk$q_rnat; + uw_reg dirty_size = q_bsp - q_bspstore; + uw_reg q_rnat = (uw_reg) intstk->intstk$q_rnat; if (eh_debug) printf ("Attempting an alternate backing store copy ...\n");