From patchwork Sat Nov 28 23:26:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 549712 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E827A1401E7 for ; Sun, 29 Nov 2015 10:27:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=rgs3cym7; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=GuUX4pvURsAjTeztE0rttKhD32eVC6Dd19X6xMIZnSHoRm7LVm eq/rR0hShKbP/eftIJlOI6dDuYNN0H34sPYoq97X0QY68sAXvUJieCwoSCzXFkdg MJtrkagMAGoPi1yf65y/9JTnoub/ePwyZX3dOE0nd4fAqy3j1TCIpKpjg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=B0cJlVCkw3DeI4dMPmJZPClUIns=; b=rgs3cym79Tbu4FY21tFa Z4jMI+VXELqiA8tUCF9guB68Advclp9Jg+wIZY99IWznQfa80jLwmf2/Mj911PGV n05rAd7dLd03BU6wK8U4Pf20uGLa8jLZnpg3Pp5mAdHnAS97bKifXKThqvB8RvIF BhlP/6icOag0b32ahnZ6XGc= Received: (qmail 128212 invoked by alias); 28 Nov 2015 23:26:53 -0000 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 Received: (qmail 128193 invoked by uid 89); 28 Nov 2015 23:26:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qk0-f179.google.com Received: from mail-qk0-f179.google.com (HELO mail-qk0-f179.google.com) (209.85.220.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Sat, 28 Nov 2015 23:26:51 +0000 Received: by qkda6 with SMTP id a6so47127747qkd.3 for ; Sat, 28 Nov 2015 15:26:49 -0800 (PST) X-Received: by 10.55.75.212 with SMTP id y203mr62676213qka.20.1448753209203; Sat, 28 Nov 2015 15:26:49 -0800 (PST) Received: from ?IPv6:2601:181:c000:c497:a2a8:cdff:fe3e:b48? ([2601:181:c000:c497:a2a8:cdff:fe3e:b48]) by smtp.googlemail.com with ESMTPSA id t101sm12151397qge.2.2015.11.28.15.26.48 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 28 Nov 2015 15:26:48 -0800 (PST) To: GCC Patches From: Nathan Sidwell Subject: [PTX] Fix CFA breakage Message-ID: <565A3837.8090002@acm.org> Date: Sat, 28 Nov 2015 18:26:47 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 The recent patch to tree-nested.c: 2015-11-26 Pierre-Marie de Rodat PR debug/53927 * tree-nested.c (finalize_nesting_tree_1): Append a field to hold the frame base address. * dwarf2out.c (gen_subprogram_die): Generate for DW_AT_static_link a location description that computes the value of this field. broke PTX, as it tried to use argp for the CFA. Fixed thusly. Also tidied up a few bits of nvptx.h while I was there. nathan 2015-11-28 Nathan Sidwell * config/nvptx/nvptx.h (FIRST_PARM_OFFSET): Add void cast. (FRAME_POINTER_CFA_OFFSET): Define. (struct nvptx_args): Use 'tree' type. (INIT_CUMULATIVE_ARGS): Remove unnecessary do...while. Index: gcc/config/nvptx/nvptx.h =================================================================== --- gcc/config/nvptx/nvptx.h (revision 231037) +++ gcc/config/nvptx/nvptx.h (working copy) @@ -166,14 +166,16 @@ enum reg_class #define OUTGOING_ARG_POINTER_REGNUM 11 #define OUTGOING_STATIC_CHAIN_REGNUM 10 -#define FIRST_PARM_OFFSET(FNDECL) 0 +#define FIRST_PARM_OFFSET(FNDECL) ((void)(FNDECL), 0) #define PUSH_ARGS_REVERSED 1 - #define ACCUMULATE_OUTGOING_ARGS 1 +/* Avoid using the argument pointer for frame-related things. */ +#define FRAME_POINTER_CFA_OFFSET(FNDECL) ((void)(FNDECL), 0) + #ifdef HOST_WIDE_INT struct nvptx_args { - union tree_node *fntype; + tree fntype; /* Number of arguments passed in registers so far. */ int count; /* Offset into the stdarg area so far. */ @@ -184,7 +186,7 @@ struct nvptx_args { #define CUMULATIVE_ARGS struct nvptx_args #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \ - do { (CUM).fntype = (FNTYPE); (CUM).count = 0; (CUM).off = 0; } while (0) + ((CUM).fntype = (FNTYPE), (CUM).count = 0, (CUM).off = 0, (void)0) #define FUNCTION_ARG_REGNO_P(r) 0