From patchwork Thu Feb 13 17:08:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1237621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109692-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=c8iMIpyG; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MeipGQyB; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48JNKC6nb3z9s29 for ; Fri, 14 Feb 2020 04:09:19 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=D+fS0PhkeGoApFfI w3v31oZ7XUbZHA94J7kJLWCbx8gwiMB3xsN5uM2uHAf3gq9J+/RBKt2pDnDZRMgU RGPABhncnb1fyGcw76hZdUhHAf9QH0CGTX/vb4bs5xwv3Ah9lDvlt8NNAKVgqwp9 7/VuSRT2UXjOTBwjMTB5bsefYLU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=xcXOcOPDL4NJLe4+dIe4sO VZ8F8=; b=c8iMIpyG4kQ56IX8zrOMwDDMFNspYsTZsr7ZI+5DncF1SoSBQ+obuK G2ubcVruwg4GLJLdDJvpCM9dVHbDTm+Pff7XOFRrnwrUX7hi9na1SvrFqAF105H8 pCMovpU50ixNy/MuOGrU4g46sY81Mo0KomXgtxkdxyx0Wxjfy/jBU= Received: (qmail 50460 invoked by alias); 13 Feb 2020 17:08:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50350 invoked by uid 89); 13 Feb 2020 17:08:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581613700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Y8BnEaN4fdUONn1jZrBhk54g/kbEIdF8AQaD2kl1s8=; b=MeipGQyBtFntcluMnNuTcORXlPnk7pJxVHNkH8kel1MgqtCppwwxFjM+D40wjrKE5Jo3Ux g06Vcr/q1AuZdttk29C5kc8L9lTEEnPNE5haTqEKW6Zho8DH/4s8sqGxULxRAHQPT9tqOT /dtV/INIFKRMhnyAjJHMT8VMd5t66Yk= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 06/11] sparc: Implement backtrace on top In-Reply-To: References: X-From-Line: 6295c92ffea0b3540040dd12c08332a35bae8f91 Mon Sep 17 00:00:00 2001 Message-Id: <6295c92ffea0b3540040dd12c08332a35bae8f91.1581613260.git.fweimer@redhat.com> Date: Thu, 13 Feb 2020 18:08:12 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com --- sysdeps/sparc/backtrace.c | 66 +++++++++------------------------------ 1 file changed, 15 insertions(+), 51 deletions(-) diff --git a/sysdeps/sparc/backtrace.c b/sysdeps/sparc/backtrace.c index 297da33904..8cedf7fb3a 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. */