From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id 42F863858001 for ; Sun, 10 Dec 2023 21:41:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42F863858001 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 42F863858001 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702244487; cv=none; b=vyG39CyzOeWKpBp4LxNV2hbnrlfvnAnrdsNYjpBjXKtZjcP0zesCG8bl0UtvHEFsg5idGdehVMsRAEsjwGMdK17wxkl2Cpx3ocw0xJNr5BDOBsc1f69zFBM9jhoggBkpNXir7MRmalVWCM/4JARsxaJ3NGTxypoPF5hpd2f6QuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702244487; c=relaxed/simple; bh=izgePG+4vTiiCkgFFgmbwf4Jy+FU+Xzf5vev7tMiJew=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=F3qR8J/3GB0pxjzHfEYcQRhLsn/ZwRe5Qkaog3TQthDY+68ovBOvvSf9mgm9vMx44fo/UdycgyKK9QU7I8rnLLzOvnia3JAw8qh4jN3G2ZJFVmSlDWN6Y49aNcU/JSYZjYhOnzNT4QSRS5p/y7iePYbzawBcEj1NrkhutxUJaaU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id CPy8rweFpgpyECRYAr9E0L; Sun, 10 Dec 2023 21:41:23 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id CRYArgVmiBOccCRYAr5lyI; Sun, 10 Dec 2023 21:41:22 +0000 X-Authority-Analysis: v=2.4 cv=J+25USrS c=1 sm=1 tr=0 ts=65763082 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=e2cXIFwxEfEA:10 a=Qbun_eYptAEA:10 a=GGLZ98FOSB4N0hhARMAA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=g9Jhe8ty8bLrLas6aZH41VJtKvYhJ8Tws2lptU6EGEo=; b=AdpkeAJeQ4IHq8gFCrkyoqIDzA s+I46Z7gIs8vh4EPejDPT79ce6bfxq2MNj8ntxRolFNjd8lj6q/8LCtyvWtrRLeAeitV3mmHQvfO/ CxHwp3OyhsR+zrIiHEa84YSFE; Received: from [198.59.47.65] (port=52450 helo=[192.168.131.83]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rCRY9-000SHj-2m for gdb-patches@sourceware.org; Sun, 10 Dec 2023 14:41:21 -0700 From: Tom Tromey Date: Sun, 10 Dec 2023 14:41:23 -0700 Subject: [PATCH v4 15/19] Change current_language to be a macro MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231210-t-bg-dwarf-reading-v4-15-b978c32fd12f@tromey.com> References: <20231210-t-bg-dwarf-reading-v4-0-b978c32fd12f@tromey.com> In-Reply-To: <20231210-t-bg-dwarf-reading-v4-0-b978c32fd12f@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 198.59.47.65 X-Source-L: No X-Exim-ID: 1rCRY9-000SHj-2m X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.131.83]) [198.59.47.65]:52450 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfHao0wNOAW0lePFQBwBvUtbewqsrLdBveVQ125+VnDyMoZSWL35r96aMeLSYfnYoI+I1kLjLosYYff7EyZRHExV8VnS0GE0ZEGOKJo/NI371yd9c8lNb CIPohS68gCIGW6zAgA/xwrSYPnxRSdd6NZrFx3VyW5CU6ky/LDgfyisOaoWfEah5Y7Rz9+n6SPCx82u1Du6AT1iiEO8vOqzTaM0= X-Spam-Status: No, score=-3024.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This changes the 'current_language' global to be a macro that wraps a function call. This change will let a subsequent patch introduce lazy language setting. --- gdb/language.c | 16 ++++++++++++---- gdb/language.h | 7 ++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gdb/language.c b/gdb/language.c index cfd4a621e6b..12a953eaa96 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -79,9 +79,17 @@ enum case_sensitivity case_sensitivity = case_sensitive_on; /* The current language and language_mode (see language.h). */ -const struct language_defn *current_language = nullptr; +static const struct language_defn *global_current_language; enum language_mode language_mode = language_mode_auto; +/* See language.h. */ + +const struct language_defn * +get_current_language () +{ + return global_current_language; +} + /* The language that the user expects to be typing in (the language of main(), or the last language we notified them about, or C). */ @@ -177,9 +185,9 @@ set_language (const char *language) /* Found it! Go into manual mode, and use this language. */ language_mode = language_mode_manual; - current_language = lang; + global_current_language = lang; set_range_case (); - expected_language = current_language; + expected_language = lang; return; } @@ -364,7 +372,7 @@ set_range_case (void) void set_language (enum language lang) { - current_language = language_def (lang); + global_current_language = language_def (lang); set_range_case (); } diff --git a/gdb/language.h b/gdb/language.h index 6ee8f6160e1..6ff6f5eb95f 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -680,6 +680,11 @@ struct language_defn (const lookup_name_info &lookup_name) const; }; +/* Return the current language. Normally code just uses the + 'current_language' macro. */ + +extern const struct language_defn *get_current_language (); + /* Pointer to the language_defn for our current language. This pointer always points to *some* valid struct; it can be used without checking it for validity. @@ -696,7 +701,7 @@ struct language_defn the language of symbol files (e.g. detecting when ".c" files are C++), it should be a separate setting from the current_language. */ -extern const struct language_defn *current_language; +#define current_language (get_current_language ()) /* Pointer to the language_defn expected by the user, e.g. the language of main(), or the language we last mentioned in a message, or C. */ -- 2.43.0