From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/3616 Path: news.gmane.org!not-for-mail From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v3] Unwind support for ARM EABI Date: Wed, 10 Jul 2013 22:55:18 +0300 Message-ID: <1373486118-18193-1-git-send-email-timo.teras@iki.fi> References: <1373481699-17888-1-git-send-email-timo.teras@iki.fi> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1373486107 23383 80.91.229.3 (10 Jul 2013 19:55:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 10 Jul 2013 19:55:07 +0000 (UTC) Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= To: musl@lists.openwall.com Original-X-From: musl-return-3620-gllmg-musl=m.gmane.org@lists.openwall.com Wed Jul 10 21:55:08 2013 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1Ux0Tk-0005gn-0D for gllmg-musl@plane.gmane.org; Wed, 10 Jul 2013 21:55:08 +0200 Original-Received: (qmail 15900 invoked by uid 550); 10 Jul 2013 19:55:07 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 15892 invoked from network); 10 Jul 2013 19:55:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=6/1gxOFQkMHzaI7YBzIGvX1AsM3ztHlTxvng7TBeLjM=; b=j51ODG12QWcO9vi8OdDeZZkBeWpf+T9JRtHsYm0ZFnoYW2Nei3rjvpILp2HL4yilct sBXd1dbDeZDz+dHVCqzTZDj9pgNGbh9ny+ipRRQZKWI1I25kYywQdvoZzloHSkidrERa 2ajL8yYwaravpt20e+zoQbld5uPH602wFpWocRFKoOIPvMygsiOKdhpEgZm0m22ZlKBN EkpA/s1mJQ7jJL+CGgWQQ7ENmTXTfYL69JCjb/3DtRWHFrLJuen/DvO2DQa2U82Tjae4 zaQk2/jGbp3sHetFcKm+UgPS8e7Mq0Z8xiRWN1wj5Cze7uW//ZO91rlZhs+jX4+5Z5hN fNNQ== X-Received: by 10.15.55.199 with SMTP id v47mr37300149eew.41.1373486096151; Wed, 10 Jul 2013 12:54:56 -0700 (PDT) Original-Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373481699-17888-1-git-send-email-timo.teras@iki.fi> Xref: news.gmane.org gmane.linux.lib.musl.general:3616 Archived-At: ARM EABI does not use the .eh_frame and .eh_frame_hdr for unwinding. Instead the ABI specifies it's own way to unwind using .ARM.exidx and .ARM.extab. libgcc uses __gnu_Unwind_Find_exidx (libc must implement this) when unwinding using exidx. This function is implemented here. --- v3 changes per discussion at #musl: - removed Unwind_Ptr (using uintptr_t directly) - removed the redundant "if (match)" for data->exidx_* assignment arch/arm/src/find_exidx.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 arch/arm/src/find_exidx.c diff --git a/arch/arm/src/find_exidx.c b/arch/arm/src/find_exidx.c new file mode 100644 index 0000000..77c4472 --- /dev/null +++ b/arch/arm/src/find_exidx.c @@ -0,0 +1,42 @@ +#define _GNU_SOURCE +#include +#include + +struct find_exidx_data { + uintptr_t pc, exidx_start; + int exidx_len; +}; + +static int find_exidx(struct dl_phdr_info *info, size_t size, void *ptr) +{ + struct find_exidx_data *data = ptr; + const ElfW(Phdr) *phdr = info->dlpi_phdr; + uintptr_t addr, exidx_start = 0; + int i, match = 0, exidx_len = 0; + + for (i = info->dlpi_phnum; i > 0; i--, phdr++) { + addr = info->dlpi_addr + phdr->p_vaddr; + switch (phdr->p_type) { + case PT_LOAD: + match |= data->pc >= addr && data->pc < addr + phdr->p_memsz; + break; + case PT_ARM_EXIDX: + exidx_start = addr; + exidx_len = phdr->p_memsz; + break; + } + } + data->exidx_start = exidx_start; + data->exidx_len = exidx_len; + return match; +} + +uintptr_t __gnu_Unwind_Find_exidx(uintptr_t pc, int *pcount) +{ + struct find_exidx_data data; + data.pc = pc; + if (dl_iterate_phdr(find_exidx, &data) <= 0) + return 0; + *pcount = data.exidx_len / 8; + return data.exidx_start; +} -- 1.8.3.2