From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 27C4B3858D28 for ; Mon, 17 Oct 2022 09:06:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 27C4B3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665997597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=9k7yIjZtuqQu4q78Ua8MUPeFt6/1IPxN+vaRQqiNrzI=; b=RQ4FnSgYyLX4LZKWfvEExiZZ4IsQQAN+xB4e04sw+SxqzYVGSwS9qi3f2lFeZ+XdAyYBUc kldesmfYgytjvMlkHRmNgmLtX/ZZzhOiOrioJj9A0RzY5rsFssQC0LGzh3/gM3Q3Nczb70 LOJGjTdzFUrEo6rWFwyA1J25DPv7rCw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-248-xdJsDfTAP7KERkLDhXCLCA-1; Mon, 17 Oct 2022 05:06:36 -0400 X-MC-Unique: xdJsDfTAP7KERkLDhXCLCA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85A5929AA2F1 for ; Mon, 17 Oct 2022 09:06:36 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE6464030C0 for ; Mon, 17 Oct 2022 09:06:34 +0000 (UTC) From: Florian Weimer To: gcc-patches@gcc.gnu.org Subject: [PATCH] libgcc: Special-case BFD ld unwind table encodings in find_fde_tail Date: Mon, 17 Oct 2022 11:06:33 +0200 Message-ID: <87zgdun7ja.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.3 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_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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 List-Id: BFD ld (and the other linkers) only produce one encoding of these values. It is not necessary to use the general read_encoded_value_with_base decoding routine. This avoids the data-dependent branches in its implementation. libgcc/ * unwind-dw2-fde-dip.c (find_fde_tail): Special-case encoding values actually used by BFD ld. --- libgcc/unwind-dw2-fde-dip.c | 58 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index 7f9be5e6b02..f370c1279ae 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -396,10 +396,21 @@ find_fde_tail (_Unwind_Ptr pc, if (hdr->version != 1) return NULL; - p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, - base_from_cb_data (hdr->eh_frame_ptr_enc, - dbase), - p, &eh_frame); + if (__builtin_expect (hdr->eh_frame_ptr_enc == (DW_EH_PE_sdata4 + | DW_EH_PE_pcrel), 1)) + { + /* Specialized version of read_encoded_value_with_base, based on what + BFD ld generates. */ + signed value __attribute__ ((mode (SI))); + memcpy (&value, p, sizeof (value)); + p += sizeof (value); + dbase = value; /* No adjustment because pcrel has base 0. */ + } + else + p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, + base_from_cb_data (hdr->eh_frame_ptr_enc, + dbase), + p, &eh_frame); /* We require here specific table encoding to speed things up. Also, DW_EH_PE_datarel here means using PT_GNU_EH_FRAME start @@ -409,10 +420,20 @@ find_fde_tail (_Unwind_Ptr pc, { _Unwind_Ptr fde_count; - p = read_encoded_value_with_base (hdr->fde_count_enc, - base_from_cb_data (hdr->fde_count_enc, - dbase), - p, &fde_count); + if (__builtin_expect (hdr->fde_count_enc == DW_EH_PE_udata4, 1)) + { + /* Specialized version of read_encoded_value_with_base, based on + what BFD ld generates. */ + unsigned value __attribute__ ((mode (SI))); + memcpy (&value, p, sizeof (value)); + p += sizeof (value); + fde_count = value; + } + else + p = read_encoded_value_with_base (hdr->fde_count_enc, + base_from_cb_data (hdr->fde_count_enc, + dbase), + p, &fde_count); /* Shouldn't happen. */ if (fde_count == 0) return NULL; @@ -454,8 +475,25 @@ find_fde_tail (_Unwind_Ptr pc, f = (fde *) (table[mid].fde + data_base); f_enc = get_fde_encoding (f); f_enc_size = size_of_encoded_value (f_enc); - read_encoded_value_with_base (f_enc & 0x0f, 0, - &f->pc_begin[f_enc_size], &range); + + /* BFD ld uses DW_EH_PE_sdata4 | DW_EH_PE_pcrel on non-FDPIC targets, + so optimize for that. + + This optimization is not valid for FDPIC targets. f_enc & 0x0f as + passed to read_encoded_value_with_base masks away the base flags, + but they are implicit for FDPIC. */ +#ifndef __FDPIC__ + if (__builtin_expect (f_enc == (DW_EH_PE_sdata4 | DW_EH_PE_pcrel), + 1)) + { + signed value __attribute__ ((mode (SI))); + memcpy (&value, &f->pc_begin[f_enc_size], sizeof (value)); + range = value; + } + else +#endif + read_encoded_value_with_base (f_enc & 0x0f, 0, + &f->pc_begin[f_enc_size], &range); _Unwind_Ptr func = table[mid].initial_loc + data_base; if (pc < table[mid].initial_loc + data_base + range) { base-commit: de7d6310862c6045cf2dfb0ef209ff0e0923e648