T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch Darwin to use PC-redirection for calling the Unwind function.

Browse Source
This commit is contained in:
Dan Gohman
2018-11-29 14:35:59 -08:00
parent 872f7a10f4
commit a6b54330c0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/execute/signalhandlers/SignalHandlers.cpp
View File

@@ -400,12 +400,17 @@ HandleTrap(CONTEXT* context)
RecordTrap(pc, codeSegment); RecordTrap(pc, codeSegment);
#if defined(__APPLE__)
// Reroute the PC to run the Unwind function on the main stack after the
// handler exits. This doesn't yet work for stack overflow traps, because
// in that case the main thread doesn't have any space left to run.
SetContextPC(context, reinterpret_cast<const uint8_t*>(&Unwind));
#else
// For now, just call Unwind directly, rather than redirecting the PC there, // For now, just call Unwind directly, rather than redirecting the PC there,
// so that it runs on the alternate signal handler stack. To run on the main // so that it runs on the alternate signal handler stack. To run on the main
// stack, reroute the context PC like this: // stack, reroute the context PC like this:
// SetContextPC(context, reinterpret_cast<const uint8_t*>(&Unwind));
Unwind(); Unwind();
#endif
return true; return true;
} }