From patchwork Thu Feb 13 17:08:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 38041 Received: (qmail 50087 invoked by alias); 13 Feb 2020 17:08:21 -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 49983 invoked by uid 89); 13 Feb 2020 17:08:20 -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, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581613697; 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=A1lTwM4iLKZ+vemalC0hy6yxuSoD3FC9C72l0oiA7Ro=; b=VxoGPLGITHr2801MeKlIkl33Ce3uOxAjNBMS0xu7iGdj3C3zjID7oHKiZ8ywQ9iA1G9V4/ epu1Reko+7afJbWB2lSlFmWfp3onQ5OnAbEhYx0Kd4J41I3bYdrPmsY3ybDB3swo+gxpkK kbYJCUrAp7vnnMBnuqyGIdmlhSFKaB4= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 05/11] m68k: Implement backtrace on top of In-Reply-To: References: X-From-Line: 963ee492b9bcab529ea419d63f4c7e9fb63aaceb Mon Sep 17 00:00:00 2001 Message-Id: <963ee492b9bcab529ea419d63f4c7e9fb63aaceb.1581613260.git.fweimer@redhat.com> Date: Thu, 13 Feb 2020 18:08:08 +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/m68k/backtrace.c | 82 +++++++++------------------------------- 1 file changed, 18 insertions(+), 64 deletions(-) diff --git a/sysdeps/m68k/backtrace.c b/sysdeps/m68k/backtrace.c index 6020acae2f..c586a14b0b 100644 --- a/sysdeps/m68k/backtrace.c +++ b/sysdeps/m68k/backtrace.c @@ -16,52 +16,18 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include #include -#include +#include struct trace_arg { void **array; + struct unwind_link *unwind_link; int cnt, size; void *lastfp, *lastsp; }; -#ifdef SHARED -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); -static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); -static _Unwind_Ptr (*unwind_getcfa) (struct _Unwind_Context *); -static _Unwind_Ptr (*unwind_getgr) (struct _Unwind_Context *, int); -static void *libgcc_handle; - -static void -init (void) -{ - libgcc_handle = __libc_dlopen ("libgcc_s.so.2"); - - if (libgcc_handle == NULL) - return; - - unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace"); - unwind_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP"); - unwind_getcfa = __libc_dlsym (libgcc_handle, "_Unwind_GetCFA"); - unwind_getgr = __libc_dlsym (libgcc_handle, "_Unwind_GetGR"); - if (unwind_getip == NULL || unwind_getgr == NULL || unwind_getcfa == NULL) - { - unwind_backtrace = NULL; - __libc_dlclose (libgcc_handle); - libgcc_handle = NULL; - } -} -#else -# define unwind_backtrace _Unwind_Backtrace -# define unwind_getip _Unwind_GetIP -# define unwind_getcfa _Unwind_GetCFA -# define unwind_getgr _Unwind_GetGR -#endif - static _Unwind_Reason_Code backtrace_helper (struct _Unwind_Context *ctx, void *a) { @@ -70,13 +36,16 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) /* We are first called with address in the __backtrace function. Skip it. */ if (arg->cnt != -1) - arg->array[arg->cnt] = (void *) unwind_getip (ctx); + arg->array[arg->cnt] + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx); if (++arg->cnt == arg->size) return _URC_END_OF_STACK; /* %fp is DWARF2 register 14 on M68K. */ - arg->lastfp = (void *) unwind_getgr (ctx, 14); - arg->lastsp = (void *) unwind_getcfa (ctx); + arg->lastfp + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetGR) (ctx, 14); + arg->lastsp + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetCFA) (ctx); return _URC_NO_REASON; } @@ -110,20 +79,19 @@ struct layout int __backtrace (void **array, int size) { - struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; - - if (size <= 0) - return 0; - -#ifdef SHARED - __libc_once_define (static, once); + struct trace_arg arg = + { + .array = array, + .unwind_link = __libc_unwind_link_get (), + .size = size, + .cnt = -1, + }; - __libc_once (once, init); - if (unwind_backtrace == NULL) + if (size <= 0 || arg.unwind_link == NULL) return 0; -#endif - unwind_backtrace (backtrace_helper, &arg); + UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace) + (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt; @@ -146,17 +114,3 @@ __backtrace (void **array, int size) } weak_alias (__backtrace, backtrace) libc_hidden_def (__backtrace) - - -#ifdef SHARED -/* Free all resources if necessary. */ -libc_freeres_fn (free_mem) -{ - unwind_backtrace = NULL; - if (libgcc_handle != NULL) - { - __libc_dlclose (libgcc_handle); - libgcc_handle = NULL; - } -} -#endif