This is an archive of the discontinued LLVM Phabricator instance.

Differential D38381

[libunwind] Skip building x86 parts of UnwindRegisters*.S when targeting SjLj
ClosedPublic

Authored by mstorsjo on Sep 28 2017, 1:30 PM.

Details

Reviewers
compnerd
Commits
rGc2ec6ce65c50: Skip building x86 parts of UnwindRegisters*.S when targeting SjLj
rUNW314492: Skip building x86 parts of UnwindRegisters*.S when targeting SjLj
rL314492: Skip building x86 parts of UnwindRegisters*.S when targeting SjLj
Summary

This extends SVN r314197 (D38249) from the arm parts to the whole file (the x86 parts as well).

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 28 2017, 1:30 PM
Herald added subscribers: kristof.beyls, aemerson. · View Herald TranscriptSep 28 2017, 1:30 PM
compnerd accepted this revision.Sep 28 2017, 10:16 PM

I really wish that there was a way to handle this in the build system instead.

This revision is now accepted and ready to land.Sep 28 2017, 10:16 PM
Closed by commit rL314492: Skip building x86 parts of UnwindRegisters*.S when targeting SjLj (authored by mstorsjo). · Explain WhySep 28 2017, 11:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 117047

src/UnwindRegistersRestore.S

//===-------------------- UnwindRegistersRestore.S ------------------------===// //===-------------------- UnwindRegistersRestore.S ------------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is dual licensed under the MIT and the University of Illinois Open // This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details. // Source Licenses. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "assembly.h" #include "assembly.h"
.text .text
#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__)
#if defined(__i386__) #if defined(__i386__)
DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_x866jumptoEv) DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_x866jumptoEv)
# #
# void libunwind::Registers_x86::jumpto() # void libunwind::Registers_x86::jumpto()
# #
# On entry: # On entry:
# + + # + +
# +-----------------------+ # +-----------------------+
▲ Show 20 Lines • Show All 281 Lines • ▼ Show 20 LinesDEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_arm646jumptoEv)
ldp d26,d27, [x0, #0x1E0] ldp d26,d27, [x0, #0x1E0]
ldp d28,d29, [x0, #0x1F0] ldp d28,d29, [x0, #0x1F0]
ldr d30, [x0, #0x200] ldr d30, [x0, #0x200]
ldr d31, [x0, #0x208] ldr d31, [x0, #0x208]
ldp x0, x1, [x0, #0x000] // restore x0,x1 ldp x0, x1, [x0, #0x000] // restore x0,x1
ret x30 // jump to pc ret x30 // jump to pc
#elif defined(__arm__) && !(defined(__APPLE__) || defined(__USING_SJLJ_EXCEPTIONS__)) #elif defined(__arm__)
#if !defined(__ARM_ARCH_ISA_ARM) #if !defined(__ARM_ARCH_ISA_ARM)
.thumb .thumb
#endif #endif
@ @
@ void libunwind::Registers_arm::restoreCoreAndJumpTo() @ void libunwind::Registers_arm::restoreCoreAndJumpTo()
@ @
▲ Show 20 Lines • Show All 166 Lines • ▼ Show 20 Lines#
l.lwz r3, 12(r3) l.lwz r3, 12(r3)
# jump to pc # jump to pc
l.jr r9 l.jr r9
l.nop l.nop
#endif #endif
#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

src/UnwindRegistersSave.S

//===------------------------ UnwindRegistersSave.S -----------------------===// //===------------------------ UnwindRegistersSave.S -----------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is dual licensed under the MIT and the University of Illinois Open // This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details. // Source Licenses. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "assembly.h" #include "assembly.h"
.text .text
#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__)
#if defined(__i386__) #if defined(__i386__)
# #
# extern int unw_getcontext(unw_context_t* thread_state) # extern int unw_getcontext(unw_context_t* thread_state)
# #
# On entry: # On entry:
# + + # + +
# +-----------------------+ # +-----------------------+
▲ Show 20 Lines • Show All 262 Lines • ▼ Show 20 LinesDEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
stp d24,d25, [x0, #0x1D0] stp d24,d25, [x0, #0x1D0]
stp d26,d27, [x0, #0x1E0] stp d26,d27, [x0, #0x1E0]
stp d28,d29, [x0, #0x1F0] stp d28,d29, [x0, #0x1F0]
str d30, [x0, #0x200] str d30, [x0, #0x200]
str d31, [x0, #0x208] str d31, [x0, #0x208]
mov x0, #0 // return UNW_ESUCCESS mov x0, #0 // return UNW_ESUCCESS
ret ret
#elif defined(__arm__) && !(defined(__APPLE__) || defined(__USING_SJLJ_EXCEPTIONS__)) #elif defined(__arm__)
#if !defined(__ARM_ARCH_ISA_ARM) #if !defined(__ARM_ARCH_ISA_ARM)
.thumb .thumb
#endif #endif
@ @
@ extern int unw_getcontext(unw_context_t* thread_state) @ extern int unw_getcontext(unw_context_t* thread_state)
@ @
▲ Show 20 Lines • Show All 165 Lines • ▼ Show 20 LinesDEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
l.sw 104(r3), r26 l.sw 104(r3), r26
l.sw 108(r3), r27 l.sw 108(r3), r27
l.sw 112(r3), r28 l.sw 112(r3), r28
l.sw 116(r3), r29 l.sw 116(r3), r29
l.sw 120(r3), r30 l.sw 120(r3), r30
l.sw 124(r3), r31 l.sw 124(r3), r31
#endif #endif
#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE