From patchwork Wed Nov 3 16:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 47013 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2BAFF385841C for ; Wed, 3 Nov 2021 16:39:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2BAFF385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635957558; bh=YuHMe4z3BFhXdhfe+qXL5Vl2HiGaRCMl72hQuD0FCNg=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=K4CClEuZiKkaCy1kvxb+ccmcbWe0ZmpAHDJq9hgl1tmoHRrb2zS+l6gHpLyrELJKQ R3tlRQdrwF2YADQMEH6mXw2Ylvq2N/zCb3IZQ/fzsjmJ5Z3K5vJKkZD01/cZsqF+cX uDi0vNfd+7gwNgxf5nggTSeb/HIHWxbjqyencSRg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C2EE43858437 for ; Wed, 3 Nov 2021 16:28:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C2EE43858437 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-UjepW000MAeb0S_PNqu98Q-1; Wed, 03 Nov 2021 12:28:46 -0400 X-MC-Unique: UjepW000MAeb0S_PNqu98Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F7B218125C2; Wed, 3 Nov 2021 16:28:45 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA96A5F4F5; Wed, 3 Nov 2021 16:28:43 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/4] libgcc: Remove dbase member from struct unw_eh_callback_data if NULL In-Reply-To: References: X-From-Line: f885ea5d19633e1281b083d93bb67ca6d18f86c0 Mon Sep 17 00:00:00 2001 Message-Id: Date: Wed, 03 Nov 2021 17:28:41 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: Jakub Jelinek , libc-alpha@sourceware.org, Jason Merrill Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Only i386 and nios2 need this member at present. libgcc/ChangeLog * unwind-dw2-fde-dip.c (NEED_DBASE_MEMBER): Define. (struct unw_eh_callback_data): Make dbase member conditional. (unw_eh_callback_data_dbase): New function. (base_from_cb_data): Simplify for the non-dbase case. (_Unwind_IteratePhdrCallback): Adjust. (_Unwind_Find_FDE): Likewise. --- libgcc/unwind-dw2-fde-dip.c | 46 +++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index 4a4d990f455..3f302826d2d 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -101,15 +101,35 @@ static const fde * _Unwind_Find_registered_FDE (void *pc, struct dwarf_eh_bases #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550) #endif +#ifdef CRT_GET_RFIB_DATA +#define NEED_DBASE_MEMBER 1 +#else +#define NEED_DBASE_MEMBER 0 +#endif + struct unw_eh_callback_data { _Unwind_Ptr pc; +#if NEED_DBASE_MEMBER void *dbase; +#endif void *func; const fde *ret; int check_cache; }; +/* Returns DATA->dbase if available, else NULL. */ +static inline _Unwind_Ptr +unw_eh_callback_data_dbase (const struct unw_eh_callback_data *data + __attribute__ ((unused))) +{ +#if NEED_DBASE_MEMBER + return (_Unwind_Ptr) data->dbase; +#else + return 0; +#endif +} + struct unw_eh_frame_hdr { unsigned char version; @@ -139,9 +159,11 @@ static struct frame_hdr_cache_element *frame_hdr_cache_head; /* Like base_of_encoded_value, but take the base from a struct unw_eh_callback_data instead of an _Unwind_Context. */ -static _Unwind_Ptr -base_from_cb_data (unsigned char encoding, struct unw_eh_callback_data *data) +static inline _Unwind_Ptr +base_from_cb_data (unsigned char encoding __attribute__ ((unused)), + _Unwind_Ptr dbase __attribute__ ((unused))) { +#if NEED_DBASE_MEMBER if (encoding == DW_EH_PE_omit) return 0; @@ -155,10 +177,13 @@ base_from_cb_data (unsigned char encoding, struct unw_eh_callback_data *data) case DW_EH_PE_textrel: return 0; case DW_EH_PE_datarel: - return (_Unwind_Ptr) data->dbase; + return dbase; default: gcc_unreachable (); } +#else /* !NEED_DBASE_MEMBER */ + return 0; +#endif } static int @@ -358,9 +383,10 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) # endif #endif + _Unwind_Ptr dbase = unw_eh_callback_data_dbase (data); p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, base_from_cb_data (hdr->eh_frame_ptr_enc, - data), + dbase), (const unsigned char *) (hdr + 1), &eh_frame); @@ -374,7 +400,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) p = read_encoded_value_with_base (hdr->fde_count_enc, base_from_cb_data (hdr->fde_count_enc, - data), + dbase), p, &fde_count); /* Shouldn't happen. */ if (fde_count == 0) @@ -431,7 +457,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) removed, we could cache this (and thus use search_object). */ ob.pc_begin = NULL; ob.tbase = NULL; - ob.dbase = data->dbase; + ob.dbase = (void *) dbase; ob.u.single = (fde *) eh_frame; ob.s.i = 0; ob.s.b.mixed_encoding = 1; /* Need to assume worst case. */ @@ -442,7 +468,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) unsigned int encoding = get_fde_encoding (data->ret); read_encoded_value_with_base (encoding, - base_from_cb_data (encoding, data), + base_from_cb_data (encoding, dbase), data->ret->pc_begin, &func); data->func = (void *) func; } @@ -460,7 +486,9 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) return ret; data.pc = (_Unwind_Ptr) pc; +#if NEED_DBASE_MEMBER data.dbase = NULL; +#endif data.func = NULL; data.ret = NULL; data.check_cache = 1; @@ -471,7 +499,11 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) if (data.ret) { bases->tbase = NULL; +#if NEED_DBASE_MEMBER bases->dbase = data.dbase; +#else + bases->dbase = NULL; +#endif bases->func = data.func; } return data.ret;