From patchwork Tue Mar 14 02:04:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 69245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1515042wrd; Mon, 13 Mar 2023 19:05:17 -0700 (PDT) X-Google-Smtp-Source: AK7set8n8LvyrhrABzU/9tqeKHmAPqzLs3M5vgJgb8+E9K6HIKBarysz08Mv6pRKePMHQN+V5ktZ X-Received: by 2002:a17:906:bc46:b0:8b1:3d4:6a9d with SMTP id s6-20020a170906bc4600b008b103d46a9dmr790993ejv.19.1678759517619; Mon, 13 Mar 2023 19:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678759517; cv=none; d=google.com; s=arc-20160816; b=OSvhvSplIZnXyqNP+csOh3fdvB4+pluXQhZl+ShnmGHMRNGYa0wqeYZO8Vr2sj0qq9 6xs/olnEPNo8Gb2mEyi8EIj4HHJcrspokvrLFIRDVtO1xRVNgMz4Q7KqfUXRT45L0pmI BpzQvlNpkZzY06K4XuZ27VIBwPdGkRHKf1vJ3gVmndmAJs/0MhgGwvztfkz4SF0oOMGu D1eqQ/bqtSamWpXsXE2wimbJSIyxYJYPAqc+g9mkUjGEVjIefsRdvLNJnntLb4XnmsaN NEHfPtS/IaDhQMT7M3iAnZxxqCrCV83PmT18oXKs/geDlUKYeXhtvp41q0UsRXm9/7As qhIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=1Yt4JngMzGMfcKFfiKXYoihjdsoDwTJHfHyZtb5xASA=; b=I4sXavKXtvDBqoXevsNeKkdverkTzLMzWJoOSI6k6tBZYiWbnb42ZOPtJI9jCKofSh YTfJ0BHC5XB9UaiXh2DcEAM+cvyGmCsqMogMXM6NWqBHtKzeP09kigJCCB//RrTUxujh saYnMcBPzF0byw82DIarS3tvSb/91Tjh3XynYOsGQnuM6BIxeyfoNHyKQAHdrozGvkLZ hCF+vt0EhxKwkufGu0FFaXvYjDjxS2XIqcc82Kwc6yKZ0wUHHPLgFD+MVkKOcggQwwJU bPZvKlJ2HjIJONIU+oU4TiSevMxq6NXu5Dg2CooyAnWa4gprDS6tWXf3FcGvsViJXf2L 5Fag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=O5bFFUdI; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i17-20020a170906a29100b008b540d6ba52si1274480ejz.227.2023.03.13.19.05.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 19:05:17 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=O5bFFUdI; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C6337385B514 for ; Tue, 14 Mar 2023 02:05:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C6337385B514 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678759501; bh=1Yt4JngMzGMfcKFfiKXYoihjdsoDwTJHfHyZtb5xASA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=O5bFFUdIIl/zU9k0xIk1PJalU6x55P9zm+ZcQ/9qfW6YCPGD5tcstDb+yk1m/fmsq WdYl1p1h37VLnGgHRIHXZrz3XVsizO3AOJwId4zMaRH66R2SQ9mtlRXefMgiTJ95rN 1FTmBD1IEqikUuQrupYH1LxUI/FQzkZ63IigUiQY= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id 4AC9D3858414 for ; Tue, 14 Mar 2023 02:04:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AC9D3858414 Received: by mail-pl1-x62d.google.com with SMTP id x11so15019226pln.12 for ; Mon, 13 Mar 2023 19:04:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678759452; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1Yt4JngMzGMfcKFfiKXYoihjdsoDwTJHfHyZtb5xASA=; b=fDJTj35NDcJ2e2ycl/NK3e+/jyQAPCsbZFqN0QkhmvkL5R4fEtsDXsws2xjrPkIxoG m5S9rr2h8eTFP5PwT2CimCVSGDF2sRj170GWBnoGN9bGPVNuJKdWLuNjMZbfviZYrVH+ sP1PkrdEWCIBSmX1DV+BEHJz01aQ2HU/Z6HZviB/2pyUExJmHIZfd4Aqdfl9gykfZg/M TxwHs1Ad39qlQiGF4kW+5C2Vrc7dpEe8xorECkkNs/uzKeG53X3nOOblnzouyiL+uqdo /npjYtwcc2YoK2t1jH+wY4ihLmvBIbEPBUcn4s9WWCDZ91xjSQcc7JMv4XPqFFGmQ5qv wTMw== X-Gm-Message-State: AO0yUKU6D/txaUsBs2m5ARL3BqigGofgxoIXldpxIfBkgl3INXTB4c7M x48zi0eA+YNnvlVQGJvFz0zYd/603ng= X-Received: by 2002:a17:902:db02:b0:1a0:67ef:dc61 with SMTP id m2-20020a170902db0200b001a067efdc61mr694629plx.17.1678759452110; Mon, 13 Mar 2023 19:04:12 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:4905:9cea:8081:59ff]) by smtp.gmail.com with ESMTPSA id v7-20020a170902b7c700b001991f3d85acsm443693plz.299.2023.03.13.19.04.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 19:04:11 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 8C62C1142C71; Tue, 14 Mar 2023 12:34:09 +1030 (ACDT) Date: Tue, 14 Mar 2023 12:34:09 +1030 To: binutils@sourceware.org Subject: gas/dwarf2dbg.c init more statics Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760306939672198085?= X-GMAIL-MSGID: =?utf-8?q?1760306939672198085?= * dwarf2dbg.c (dw2_line, dw2_filename): Move to file scope and.. (dwarf2_gen_line_info): ..renamed from here. (label_num, last_used, last_used_dir_len): Move to file scope. (dwarf2_init): Init moved statics, except last_used_dir_len. diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index f04f2975b5b..331264b1f6f 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -536,6 +536,10 @@ dwarf2_gen_line_info_1 (symbolS *label, struct dwarf2_line_info *loc) /* Record an entry for LOC occurring at OFS within the current fragment. */ +static unsigned int dw2_line; +static const char *dw2_filename; +static int label_num; + void dwarf2_gen_line_info (addressT ofs, struct dwarf2_line_info *loc) { @@ -558,27 +562,23 @@ dwarf2_gen_line_info (addressT ofs, struct dwarf2_line_info *loc) uses them to determine the end of the prologue. */ if (debug_type == DEBUG_DWARF2) { - static unsigned int line = -1; - static const char *filename = NULL; - - if (line == loc->line) + if (dw2_line == loc->line) { - if (filename == loc->u.filename) + if (dw2_filename == loc->u.filename) return; - if (filename_cmp (filename, loc->u.filename) == 0) + if (filename_cmp (dw2_filename, loc->u.filename) == 0) { - filename = loc->u.filename; + dw2_filename = loc->u.filename; return; } } - line = loc->line; - filename = loc->u.filename; + dw2_line = loc->line; + dw2_filename = loc->u.filename; } if (linkrelax) { - static int label_num = 0; char name[32]; /* Use a non-fake name for the line number location, @@ -715,10 +715,12 @@ assign_file_to_slot (unsigned int i, const char *file, unsigned int dir) Returns the slot number allocated to that filename or -1 if there was a problem. */ +static int last_used; +static int last_used_dir_len; + static signed int allocate_filenum (const char * pathname) { - static signed int last_used = -1, last_used_dir_len = 0; const char *file; size_t dir_len; unsigned int i, dir; @@ -3089,6 +3091,10 @@ dwarf2_init (void) current.u.view = NULL; force_reset_view = NULL; view_assert_failed = NULL; + dw2_line = -1; + dw2_filename = NULL; + label_num = 0; + last_used = -1; /* Select the default CIE version to produce here. The global starts with a value of -1 and will be modified to a valid value