maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Correctly export _Unwind_[GS]et(GR|IP) for EHABI. 

These need to have normal linkage instead of being static inline as
many libraries expect to be able to declare these and have the linker
find them rather than needing to include the header.

http://mentorembedded.github.io/cxx-abi/abi-eh.html

Also clean up some warnings while I'm here.

Reviewers: jroelofs, kledzik

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D5754

llvm-svn: 219629
This commit is contained in:
Dan Albert 2014-10-13 21:01:30 +00:00
parent 049d21caea
commit b44ad60835
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libcxxabi/include/unwind.h
View File

@ -206,37 +206,13 @@ extern _Unwind_VRS_Result
_Unwind_VRS_Pop(_Unwind_Context *context, _Unwind_VRS_RegClass regclass,
uint32_t discriminator,
_Unwind_VRS_DataRepresentation representation);
#endif
static inline uintptr_t _Unwind_GetGR(struct _Unwind_Context* context,
int index) {
uintptr_t value = 0;
_Unwind_VRS_Get(context, _UVRSC_CORE, (uint32_t)index, _UVRSD_UINT32, &value);
return value;
}
static inline void _Unwind_SetGR(struct _Unwind_Context* context, int index,
uintptr_t new_value) {
_Unwind_VRS_Set(context, _UVRSC_CORE, (uint32_t)index,
_UVRSD_UINT32, &new_value);
}
static inline uintptr_t _Unwind_GetIP(struct _Unwind_Context* context) {
// remove the thumb-bit before returning
return (_Unwind_GetGR(context, 15) & (~(uintptr_t)0x1));
}
static inline void _Unwind_SetIP(struct _Unwind_Context* context,
uintptr_t new_value) {
uintptr_t thumb_bit = _Unwind_GetGR(context, 15) & ((uintptr_t)0x1);
_Unwind_SetGR(context, 15, new_value | thumb_bit);
}
#else
extern uintptr_t _Unwind_GetGR(struct _Unwind_Context *context, int index);
extern void _Unwind_SetGR(struct _Unwind_Context *context, int index,
uintptr_t new_value);
extern uintptr_t _Unwind_GetIP(struct _Unwind_Context *context);
extern void _Unwind_SetIP(struct _Unwind_Context *, uintptr_t new_value);
#endif
extern uintptr_t _Unwind_GetRegionStart(struct _Unwind_Context *context);
extern uintptr_t

22
libcxxabi/src/Unwind/Unwind-EHABI.cpp
View File

@ -206,6 +206,28 @@ uint32_t RegisterRange(uint8_t start, uint8_t count_minus_one) {
} // end anonymous namespace
uintptr_t _Unwind_GetGR(struct _Unwind_Context* context, int index) {
uintptr_t value = 0;
_Unwind_VRS_Get(context, _UVRSC_CORE, (uint32_t)index, _UVRSD_UINT32, &value);
return value;
}
void _Unwind_SetGR(struct _Unwind_Context* context, int index, uintptr_t
new_value) {
_Unwind_VRS_Set(context, _UVRSC_CORE, (uint32_t)index,
_UVRSD_UINT32, &new_value);
}
uintptr_t _Unwind_GetIP(struct _Unwind_Context* context) {
// remove the thumb-bit before returning
return (_Unwind_GetGR(context, 15) & (~(uintptr_t)0x1));
}
void _Unwind_SetIP(struct _Unwind_Context* context, uintptr_t new_value) {
uintptr_t thumb_bit = _Unwind_GetGR(context, 15) & ((uintptr_t)0x1);
_Unwind_SetGR(context, 15, new_value | thumb_bit);
}
/**
* Decodes an EHT entry.
*

2
libcxxabi/src/Unwind/UnwindCursor.hpp
View File

@ -638,7 +638,7 @@ struct EHABISectionIterator {
}
EHABISectionIterator(A& addressSpace, const UnwindInfoSections& sects, size_t i)
: _addressSpace(&addressSpace), _sects(&sects), _i(i) {}
: _i(i), _addressSpace(&addressSpace), _sects(&sects) {}
_Self& operator++() { ++_i; return *this; }
_Self& operator+=(size_t a) { _i += a; return *this; }

2
libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c
View File

@ -130,7 +130,7 @@ _Unwind_Backtrace(_Unwind_Trace_Fn callback, void *ref) {
struct _Unwind_Context *context = (struct _Unwind_Context *)&cursor;
size_t off;
size_t len;
uint32_t* unwindInfo = (uint32_t *) frameInfo.unwind_info;
const uint32_t* unwindInfo = (uint32_t *) frameInfo.unwind_info;
unwindInfo = decode_eht_entry(unwindInfo, &off, &len);
if (unwindInfo == NULL) {
return _URC_FAILURE;