From b92af19f2110999579a65a5dceab532c97979559 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 3 Jan 2014 18:15:02 +0100 Subject: [PATCH] backends: Add aarch64 abi_cfi. Setup initial CIE values for aarch64 for use with dwarf_frame functions. Register info prefix should be the empty string (not NULL) when not used. Add an EM_AARCH64 testcase to tests/run-addrcfi.sh to check both issues. Signed-off-by: Mark Wielaard --- backends/ChangeLog | 7 ++++ backends/Makefile.am | 2 +- backends/aarch64_cfi.c | 82 ++++++++++++++++++++++++++++++++++++++ backends/aarch64_init.c | 1 + backends/aarch64_regs.c | 2 +- tests/ChangeLog | 6 +++ tests/Makefile.am | 2 +- tests/run-addrcfi.sh | 76 +++++++++++++++++++++++++++++++++++ tests/testfileaarch64.bz2 | Bin 0 -> 3441 bytes 9 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 backends/aarch64_cfi.c create mode 100755 tests/testfileaarch64.bz2 diff --git a/backends/ChangeLog b/backends/ChangeLog index 24cc63d93..2074cff31 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,10 @@ +2014-01-03 Mark Wielaard + + * Makefile.am (aarch64_SRCS): Add aarch64_cfi.c. + * aarch64_cfi.c: New file. + * aarch64_init.c (aarch64_init): Hook abi_cfi. + * aarch64_regs.c (aarch64_register_info): Set *prefix to "". + 2013-12-19 Mark Wielaard * aarch64_init.c (aarch64_init): Hook check_special_symbol. diff --git a/backends/Makefile.am b/backends/Makefile.am index 8deed2f9f..b8bea36b1 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -83,7 +83,7 @@ libebl_arm_pic_a_SOURCES = $(arm_SRCS) am_libebl_arm_pic_a_OBJECTS = $(arm_SRCS:.c=.os) aarch64_SRCS = aarch64_init.c aarch64_regs.c aarch64_symbol.c \ - aarch64_corenote.c aarch64_retval.c + aarch64_corenote.c aarch64_retval.c aarch64_cfi.c libebl_aarch64_pic_a_SOURCES = $(aarch64_SRCS) am_libebl_aarch64_pic_a_OBJECTS = $(aarch64_SRCS:.c=.os) aarch64_regs_no_Wformat = yes diff --git a/backends/aarch64_cfi.c b/backends/aarch64_cfi.c new file mode 100644 index 000000000..acbb9b695 --- /dev/null +++ b/backends/aarch64_cfi.c @@ -0,0 +1,82 @@ +/* arm ABI-specified defaults for DWARF CFI. + Copyright (C) 2013 Red Hat, Inc. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of either + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#define BACKEND aarch64_ +#include "libebl_CPU.h" + + +/* ABI-specified state of DWARF CFI based on: + + "DWARF for the ARM 64 bit architecture (AArch64) 1.0" +http://infocenter.arm.com/help/topic/com.arm.doc.ihi0057b/IHI0057B_aadwarf64.pdf + + "Procedure Call Standard for the ARM 64 bit Architecture 1.0" +http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf +*/ + +int +aarch64_abi_cfi (Ebl *ebl __attribute__ ((unused)), Dwarf_CIE *abi_info) +{ + static const uint8_t abi_cfi[] = + { + /* The initial Canonical Frame Address is the value of the + Stack Pointer (r31) as setup in the previous frame. */ + DW_CFA_def_cfa, ULEB128_7 (30), ULEB128_7 (0), + +#define SV(n) DW_CFA_same_value, ULEB128_7 (n) + /* Callee-saved regs r19-r28. */ + SV (19), SV (20), SV (21), SV (22), SV (23), + SV (24), SV (25), SV (26), SV (27), SV (28), + + /* The Frame Pointer (FP, r29) and Link Register (LR, r30). */ + SV (29), SV (30), + + /* Callee-saved fpregs v8-v15. v0 == 64. */ + SV (72), SV (73), SV (74), SV (75), + SV (76), SV (77), SV (78), SV (79), +#undef SV + + /* XXX Note: registers intentionally unused by the program, + for example as a consequence of the procedure call standard + should be initialized as if by DW_CFA_same_value. */ + }; + + abi_info->initial_instructions = abi_cfi; + abi_info->initial_instructions_end = &abi_cfi[sizeof abi_cfi]; + abi_info->data_alignment_factor = -4; + + abi_info->return_address_register = 30; /* lr. */ + + return 0; +} diff --git a/backends/aarch64_init.c b/backends/aarch64_init.c index d663d4027..a1a70606e 100644 --- a/backends/aarch64_init.c +++ b/backends/aarch64_init.c @@ -57,6 +57,7 @@ aarch64_init (elf, machine, eh, ehlen) HOOK (eh, reloc_simple_type); HOOK (eh, return_value_location); HOOK (eh, check_special_symbol); + HOOK (eh, abi_cfi); return MODVERSION; } diff --git a/backends/aarch64_regs.c b/backends/aarch64_regs.c index 5952b9691..aec201f3d 100644 --- a/backends/aarch64_regs.c +++ b/backends/aarch64_regs.c @@ -57,7 +57,7 @@ aarch64_register_info (Ebl *ebl __attribute__ ((unused)), return s + 1; } - *prefix = NULL; + *prefix = ""; *bits = 64; switch (regno) diff --git a/tests/ChangeLog b/tests/ChangeLog index 5c80e9bf5..c68ae26cd 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2014-01-03 Mark Wielaard + + * run-addrcfi.sh: Add case for EM_AARCH64. + * testfileaarch64.bz2: New testfile. + * Makefile.am (EXTRA_DIST): Add testfilesaarch64.bz2. + 2013-12-30 Mark Wielaard * backtrace-dwarf.c (report_pid): Explicitly call diff --git a/tests/Makefile.am b/tests/Makefile.am index 52eb50aab..eae64a839 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -237,7 +237,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \ run-addr2line-i-test.sh testfile-inlines.bz2 \ testfileppc32.bz2 testfileppc64.bz2 \ testfiles390.bz2 testfiles390x.bz2 \ - testfilearm.bz2 \ + testfilearm.bz2 testfileaarch64.bz2 \ run-varlocs.sh \ testfile_const_type.c testfile_const_type.bz2 \ testfile_implicit_pointer.c testfile_implicit_pointer.bz2 \ diff --git a/tests/run-addrcfi.sh b/tests/run-addrcfi.sh index c7ab71abc..a4225ac0e 100755 --- a/tests/run-addrcfi.sh +++ b/tests/run-addrcfi.sh @@ -2572,3 +2572,79 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range VFP reg286 (d30): undefined VFP reg287 (d31): undefined EOF + +# EM_AARCH64 (function bar 0x400550) +# Same as arm, 390 and ppc above. +# Note missing coverage in .eh_frame. +testfiles testfileaarch64 +testrun_compare ${abs_builddir}/addrcfi -e testfileaarch64 0x400550 <<\EOF +dwarf_cfi_addrframe (.eh_frame): no matching address range +.debug_frame has 0x400550 => [0x400550, 0x400568): + return address in reg30 + CFA location expression: bregx(31) + integer reg0 (x0): undefined + integer reg1 (x1): undefined + integer reg2 (x2): undefined + integer reg3 (x3): undefined + integer reg4 (x4): undefined + integer reg5 (x5): undefined + integer reg6 (x6): undefined + integer reg7 (x7): undefined + integer reg8 (x8): undefined + integer reg9 (x9): undefined + integer reg10 (x10): undefined + integer reg11 (x11): undefined + integer reg12 (x12): undefined + integer reg13 (x13): undefined + integer reg14 (x14): undefined + integer reg15 (x15): undefined + integer reg16 (x16): undefined + integer reg17 (x17): undefined + integer reg18 (x18): undefined + integer reg19 (x19): same_value + integer reg20 (x20): same_value + integer reg21 (x21): same_value + integer reg22 (x22): same_value + integer reg23 (x23): same_value + integer reg24 (x24): same_value + integer reg25 (x25): same_value + integer reg26 (x26): same_value + integer reg27 (x27): same_value + integer reg28 (x28): same_value + integer reg29 (x29): same_value + integer reg30 (x30): same_value + integer reg31 (sp): undefined + integer reg33 (elr): undefined + FP/SIMD reg64 (v0): undefined + FP/SIMD reg65 (v1): undefined + FP/SIMD reg66 (v2): undefined + FP/SIMD reg67 (v3): undefined + FP/SIMD reg68 (v4): undefined + FP/SIMD reg69 (v5): undefined + FP/SIMD reg70 (v6): undefined + FP/SIMD reg71 (v7): undefined + FP/SIMD reg72 (v8): same_value + FP/SIMD reg73 (v9): same_value + FP/SIMD reg74 (v10): same_value + FP/SIMD reg75 (v11): same_value + FP/SIMD reg76 (v12): same_value + FP/SIMD reg77 (v13): same_value + FP/SIMD reg78 (v14): same_value + FP/SIMD reg79 (v15): same_value + FP/SIMD reg80 (v16): undefined + FP/SIMD reg81 (v17): undefined + FP/SIMD reg82 (v18): undefined + FP/SIMD reg83 (v19): undefined + FP/SIMD reg84 (v20): undefined + FP/SIMD reg85 (v21): undefined + FP/SIMD reg86 (v22): undefined + FP/SIMD reg87 (v23): undefined + FP/SIMD reg88 (v24): undefined + FP/SIMD reg89 (v25): undefined + FP/SIMD reg90 (v26): undefined + FP/SIMD reg91 (v27): undefined + FP/SIMD reg92 (v28): undefined + FP/SIMD reg93 (v29): undefined + FP/SIMD reg94 (v30): undefined + FP/SIMD reg95 (v31): undefined +EOF diff --git a/tests/testfileaarch64.bz2 b/tests/testfileaarch64.bz2 new file mode 100755 index 0000000000000000000000000000000000000000..72e5ef0de7ca8ffaab3e19d0b34ab9acfda34da2 GIT binary patch literal 3441 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