From patchwork Wed Feb 17 16:03:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42081 X-Patchwork-Delegate: carlos@redhat.com 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 DD20839450D0; Wed, 17 Feb 2021 16:02:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD20839450D0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613577768; bh=22WwaD80WHdGIqq39Zjer5va6I0wGWm8GNKA2bX5MY4=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=X5ebphd6QL6WFplB1S3TOE+DX4IBf99R9UoFh47hMk4L6oF0tLb3FT8ctDq0vlraV V6b4QyBAVUfh2qJ05r1915TF5m4bk32EF/OsNRcMJ92qeuloTx38hvyLhPLuHfIW/w Uy7QgCv5oFl7N6cU/C4UMFHHkKeT90jB3DtfjHPk= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id E1EBB39450D0 for ; Wed, 17 Feb 2021 16:02:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E1EBB39450D0 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-161-81PJjV8JNESo4ubATnwhDQ-1; Wed, 17 Feb 2021 11:02:43 -0500 X-MC-Unique: 81PJjV8JNESo4ubATnwhDQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74D431020C22 for ; Wed, 17 Feb 2021 16:02:42 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-131.ams2.redhat.com [10.36.113.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB91D60657 for ; Wed, 17 Feb 2021 16:02:41 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 06/10] sparc: Implement backtrace on top In-Reply-To: References: Message-Id: <994e0ad746c4324afa738d675cc4bead4ba95291.1613577607.git.fweimer@redhat.com> Date: Wed, 17 Feb 2021 17:03:13 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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 Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --- sysdeps/sparc/backtrace.c | 66 +++++++++------------------------------ 1 file changed, 15 insertions(+), 51 deletions(-) Reviewed-by: Carlos O'Donell diff --git a/sysdeps/sparc/backtrace.c b/sysdeps/sparc/backtrace.c index 62196f0538..1bad755b7f 100644 --- a/sysdeps/sparc/backtrace.c +++ b/sysdeps/sparc/backtrace.c @@ -21,9 +21,8 @@ #include #include #include -#include -#include #include +#include struct layout { @@ -36,45 +35,12 @@ struct layout struct trace_arg { void **array; + struct unwind_link *unwind_link; _Unwind_Word cfa; int cnt; int size; }; -#ifdef SHARED -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); -static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); -static _Unwind_Word (*unwind_getcfa) (struct _Unwind_Context *); -static void *libgcc_handle; - -/* Dummy version in case libgcc_s does not contain the real code. */ -static _Unwind_Word -dummy_getcfa (struct _Unwind_Context *ctx __attribute__ ((unused))) -{ - return 0; -} - -static void -init (void) -{ - libgcc_handle = __libc_dlopen ("libgcc_s.so.1"); - - if (libgcc_handle == NULL) - return; - - unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace"); - unwind_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP"); - if (unwind_getip == NULL) - unwind_backtrace = NULL; - unwind_getcfa = (__libc_dlsym (libgcc_handle, "_Unwind_GetCFA") - ?: dummy_getcfa); -} -#else -# define unwind_backtrace _Unwind_Backtrace -# define unwind_getip _Unwind_GetIP -# define unwind_getcfa _Unwind_GetCFA -#endif - static _Unwind_Reason_Code backtrace_helper (struct _Unwind_Context *ctx, void *a) { @@ -85,11 +51,12 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) Skip it. */ if (arg->cnt != -1) { - ip = unwind_getip (ctx); + ip = UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx); arg->array[arg->cnt] = (void *) ip; /* Check whether we make any progress. */ - _Unwind_Word cfa = unwind_getcfa (ctx); + _Unwind_Word cfa + = UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetCFA) (ctx); if (arg->cnt > 0 && arg->array[arg->cnt - 1] == arg->array[arg->cnt] && cfa == arg->cfa) @@ -104,23 +71,19 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) int __backtrace (void **array, int size) { - struct trace_arg arg = { .array = array, .cfa = 0, .size = size, .cnt = -1 }; - bool use_unwinder; int count; + struct trace_arg arg = + { + .array = array, + .unwind_link = __libc_unwind_link_get (), + .size = size, + .cnt = -1, + }; if (size <= 0) return 0; - use_unwinder = true; -#ifdef SHARED - __libc_once_define (static, once); - - __libc_once (once, init); - if (unwind_backtrace == NULL) - use_unwinder = false; -#endif - - if (use_unwinder == false) + if (arg.unwind_link == NULL) { struct layout *current; unsigned long fp, i7; @@ -145,7 +108,8 @@ __backtrace (void **array, int size) } else { - unwind_backtrace (backtrace_helper, &arg); + UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace) + (backtrace_helper, &arg); /* _Unwind_Backtrace seems to put NULL address above _start. Fix it up here. */