From patchwork Thu Feb 13 17:07:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 38040 Received: (qmail 49973 invoked by alias); 13 Feb 2020 17:08:20 -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 49877 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=1581613696; 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=7OQXiq05Hxt+X7DB6rykSLHZMU1pB0eE3VmSA/KFMyw=; b=AqDeqJ1mmsI9LL7/P7KCRfBbRgJRsmITiqDcd65h2Z0dknDctZ/n/PCR6L0GgMib3lj2Ix 3sItAs5jn8OU3EDMpTLZaO8AEOkOuKyD6Sh6NY2L0vfMJFL1RVELdUG1pU03xwY7/iCCMz b0+geRZY+DhJM0pYT7+bdbgyDHR81VA= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 03/11] arm: Implement backtrace on top of In-Reply-To: References: X-From-Line: fea54a97bd5f35a794c44fa7b135d633fa47f9d3 Mon Sep 17 00:00:00 2001 Message-Id: Date: Thu, 13 Feb 2020 18:07:59 +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/arm/backtrace.c | 77 +++++++++++------------------------------ 1 file changed, 20 insertions(+), 57 deletions(-) diff --git a/sysdeps/arm/backtrace.c b/sysdeps/arm/backtrace.c index ffd3f526b2..893ca39272 100644 --- a/sysdeps/arm/backtrace.c +++ b/sysdeps/arm/backtrace.c @@ -17,58 +17,36 @@ 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; }; #ifdef SHARED -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); -static _Unwind_VRS_Result (*unwind_vrs_get) (_Unwind_Context *, - _Unwind_VRS_RegClass, - _uw, - _Unwind_VRS_DataRepresentation, - void *); - -static void *libgcc_handle; - -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_vrs_get = __libc_dlsym (libgcc_handle, "_Unwind_VRS_Get"); - if (unwind_vrs_get == NULL) - unwind_backtrace = NULL; -} - /* This function is identical to "_Unwind_GetGR", except that it uses "unwind_vrs_get" instead of "_Unwind_VRS_Get". */ static inline _Unwind_Word -unwind_getgr (_Unwind_Context *context, int regno) +unwind_getgr (struct unwind_link *unwind_link, + _Unwind_Context *context, int regno) { _uw val; - unwind_vrs_get (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); + UNWIND_LINK_PTR (unwind_link, _Unwind_VRS_Get) + (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); return val; } /* This macro is identical to the _Unwind_GetIP macro, except that it uses "unwind_getgr" instead of "_Unwind_GetGR". */ -# define unwind_getip(context) \ - (unwind_getgr (context, 15) & ~(_Unwind_Word)1) -#else -# define unwind_backtrace _Unwind_Backtrace +#define unwind_getip(context) \ + (unwind_getgr (arg->unwind_link, context, 15) & ~(_Unwind_Word)1) + +#else /* !SHARED */ # define unwind_getip _Unwind_GetIP #endif @@ -89,20 +67,19 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) 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; @@ -110,17 +87,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