This is an archive of the discontinued LLVM Phabricator instance.

Differential D77829

[libunwind] Clean up __arm64__
ClosedPublic

Authored by MaskRay on Apr 9 2020, 2:22 PM.

Details

Reviewers
ldionne
scw
mstorsjo
Group Reviewers
Restricted Project
Commits
rGf3d460ce5874: [libunwind] Clean up __arm64__
Summary

__aarch64__ is defined for the target (since the beginning of arm64 support: clang 3.5).
__arm64__ is only defined for the Darwin OS on AArch64.

defined(__aarch64__) || defined(__arm64__) can be simplied as defined(__aarch64__)

Darwin AArch64 uses %% as the assembly separator (see AArch64MCAsmInfo.cpp).
Make the intention explicit in src/assembly.h

With this change, the libunwind code base has no reference of __arm64__/__arm64.

Diff Detail

Event Timeline

MaskRay created this revision.Apr 9 2020, 2:22 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 9 2020, 2:22 PM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, llvm-commits, danielkiss and 2 others. · View Herald Transcript
MaskRay edited the summary of this revision. (Show Details)Apr 9 2020, 2:23 PM
ldionne accepted this revision.Apr 9 2020, 2:32 PM

This LGTM.

ldionne added a comment.Apr 9 2020, 2:33 PM

(but not a code owner for libunwind)

MaskRay added a reviewer: mstorsjo.Apr 9 2020, 2:53 PM
Harbormaster failed remote builds in B52575: Diff 256409!Apr 9 2020, 2:57 PM
mstorsjo accepted this revision.Apr 9 2020, 3:09 PM

LGTM

This revision is now accepted and ready to land.Apr 9 2020, 3:09 PM
Closed by commit rGf3d460ce5874: [libunwind] Clean up __arm64__ (authored by MaskRay). · Explain WhyApr 9 2020, 3:49 PM
This revision was automatically updated to reflect the committed changes.
MaskRay mentioned this in D77786: [AArch64] Add v8.5 Branch Target Identification support..Apr 9 2020, 5:27 PM

Revision Contents

PathSize
libunwind/
src/
2 lines
2 lines
2 lines
2 lines
2 lines

Diff 256434

libunwind/src/UnwindRegistersRestore.S

Show First 20 Lines • Show All 551 Lines • ▼ Show 20 LinesLnovec:
mtctr %r0 mtctr %r0
lwz %r0, 8(%r3) // do r0 now lwz %r0, 8(%r3) // do r0 now
lwz %r5, 28(%r3) // do r5 now lwz %r5, 28(%r3) // do r5 now
lwz %r4, 24(%r3) // do r4 now lwz %r4, 24(%r3) // do r4 now
lwz %r1, 12(%r3) // do sp now lwz %r1, 12(%r3) // do sp now
lwz %r3, 20(%r3) // do r3 last lwz %r3, 20(%r3) // do r3 last
bctr bctr
#elif defined(__arm64__) || defined(__aarch64__) #elif defined(__aarch64__)
// //
// void libunwind::Registers_arm64::jumpto() // void libunwind::Registers_arm64::jumpto()
// //
// On entry: // On entry:
// thread_state pointer is in x0 // thread_state pointer is in x0
// //
.p2align 2 .p2align 2
▲ Show 20 Lines • Show All 550 Lines • Show Last 20 Lines

libunwind/src/UnwindRegistersSave.S

Show First 20 Lines • Show All 691 Lines • ▼ Show 20 Lines#define SAVE_VECTOR_UNALIGNED(_vec, _offset) \
SAVE_VECTOR_UNALIGNED(%v29, 424+0x1D0) SAVE_VECTOR_UNALIGNED(%v29, 424+0x1D0)
SAVE_VECTOR_UNALIGNED(%v30, 424+0x1E0) SAVE_VECTOR_UNALIGNED(%v30, 424+0x1E0)
SAVE_VECTOR_UNALIGNED(%v31, 424+0x1F0) SAVE_VECTOR_UNALIGNED(%v31, 424+0x1F0)
li %r3, 0 // return UNW_ESUCCESS li %r3, 0 // return UNW_ESUCCESS
blr blr
#elif defined(__arm64__) || defined(__aarch64__) #elif defined(__aarch64__)
// //
// extern int __unw_getcontext(unw_context_t* thread_state) // extern int __unw_getcontext(unw_context_t* thread_state)
// //
// On entry: // On entry:
// thread_state pointer is in x0 // thread_state pointer is in x0
// //
.p2align 2 .p2align 2
▲ Show 20 Lines • Show All 355 Lines • Show Last 20 Lines

libunwind/src/Unwind_AppleExtras.cpp

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines #define NOT_HERE_BEFORE_5_0(sym) \
extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \ extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp40 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp40 = 0; \
extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \ extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp41 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp41 = 0; \
extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \ extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp42 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp42 = 0; \
extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \ extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp43 = 0; __attribute__((visibility("default"))) const char sym##_tmp43 = 0;
#elif defined(__arm64__) #elif defined(__aarch64__)
#define NOT_HERE_BEFORE_10_6(sym) #define NOT_HERE_BEFORE_10_6(sym)
#define NEVER_HERE(sym) #define NEVER_HERE(sym)
#else #else
#define NOT_HERE_BEFORE_10_6(sym) \ #define NOT_HERE_BEFORE_10_6(sym) \
extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \ extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp4 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \ extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp5 = 0; __attribute__((visibility("default"))) const char sym##_tmp5 = 0;
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines

libunwind/src/assembly.h

Show All 22 Lines
#define PPC64_OFFS_LR 288 #define PPC64_OFFS_LR 288
#define PPC64_OFFS_CTR 296 #define PPC64_OFFS_CTR 296
#define PPC64_OFFS_VRSAVE 304 #define PPC64_OFFS_VRSAVE 304
#define PPC64_OFFS_FP 312 #define PPC64_OFFS_FP 312
#define PPC64_OFFS_V 824 #define PPC64_OFFS_V 824
#ifdef _ARCH_PWR8 #ifdef _ARCH_PWR8
#define PPC64_HAS_VMX #define PPC64_HAS_VMX
#endif #endif
#elif defined(__arm64__) #elif defined(__APPLE__) && defined(__aarch64__)
#define SEPARATOR %% #define SEPARATOR %%
#else #else
#define SEPARATOR ; #define SEPARATOR ;
#endif #endif
#if defined(__powerpc64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1) #if defined(__powerpc64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1)
#define PPC64_OPD1 .section .opd,"aw",@progbits SEPARATOR #define PPC64_OPD1 .section .opd,"aw",@progbits SEPARATOR
#define PPC64_OPD2 SEPARATOR \ #define PPC64_OPD2 SEPARATOR \
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines

libunwind/src/config.h

Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Lines
#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) #if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
#define _LIBUNWIND_SUPPORT_FRAME_APIS #define _LIBUNWIND_SUPPORT_FRAME_APIS
#endif #endif
#if defined(__i386__) || defined(__x86_64__) || \ #if defined(__i386__) || defined(__x86_64__) || \
defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || \ defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || \
(!defined(__APPLE__) && defined(__arm__)) || \ (!defined(__APPLE__) && defined(__arm__)) || \
(defined(__arm64__) || defined(__aarch64__)) || \ defined(__aarch64__) || \
defined(__mips__) || \ defined(__mips__) || \
defined(__riscv) defined(__riscv)
#if !defined(_LIBUNWIND_BUILD_SJLJ_APIS) #if !defined(_LIBUNWIND_BUILD_SJLJ_APIS)
#define _LIBUNWIND_BUILD_ZERO_COST_APIS #define _LIBUNWIND_BUILD_ZERO_COST_APIS
#endif #endif
#endif #endif
#if defined(__powerpc64__) && defined(_ARCH_PWR8) #if defined(__powerpc64__) && defined(_ARCH_PWR8)
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines