Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

OSX unwind workaround #2166

Merged
merged 11 commits into from
Nov 26, 2016
Merged

OSX unwind workaround #2166

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f8d1421
RegDisplay saves FP
Nov 8, 2016
6185860
Clean up
Nov 8, 2016
710bd0f
Fix for Windows build
Nov 8, 2016
f83fcf2
Merge branch 'master' into osx-unwind-workaround
Nov 9, 2016
16f9662
Undo changes in this PR
Nov 9, 2016
0a07b56
impl PAL_LIMITED_CONTEXT in REG
Nov 9, 2016
b2c1a2d
Impl. pointer assignments in UnwindCursorToRegDisplay
Nov 9, 2016
a2fb7c0
Rollback changes
Nov 9, 2016
d5366a8
Add UNWIND_WORKAROUND define to CMakeLists.txt
Nov 9, 2016
b510d30
ifdef around GET_CONTEXT_POINTER
Nov 9, 2016
bdeb6b7
Revert to simpler ifdef for workaround
Nov 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Native/Runtime/unix/UnixContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,12 @@ static void GetContextPointer(unw_cursor_t *cursor, unw_context_t *unwContext, i
// Update REGDISPLAY from the unw_cursor_t and unw_context_t
void UnwindCursorToRegDisplay(unw_cursor_t *cursor, unw_context_t *unwContext, REGDISPLAY *regDisplay)
{
#define GET_CONTEXT_POINTER(unwReg, rdReg) GetContextPointer(cursor, unwContext, unwReg, &regDisplay->p##rdReg);
GET_CONTEXT_POINTERS
#undef GET_CONTEXT_POINTER
//TODO: Workaround for unwind on OSX: See https://github.com/dotnet/corert/pull/2166
#if !defined(__APPLE__)
#define GET_CONTEXT_POINTER(unwReg, rdReg) GetContextPointer(cursor, unwContext, unwReg, &regDisplay->p##rdReg);
GET_CONTEXT_POINTERS
#undef GET_CONTEXT_POINTER
#endif

unw_get_reg(cursor, UNW_REG_IP, (unw_word_t *) &regDisplay->IP);
unw_get_reg(cursor, UNW_REG_SP, (unw_word_t *) &regDisplay->SP);
Expand Down