projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd1786a
)
[x86/Linux] Port 'ExceptionTracker::ProcessOSExceptionNotification' (dotnet/coreclr...
author
Jonghyun Park
<parjong@gmail.com>
Thu, 12 Jan 2017 15:43:54 +0000
(
00:43
+0900)
committer
Jan Vorlicek
<janvorli@microsoft.com>
Thu, 12 Jan 2017 15:43:54 +0000
(16:43 +0100)
Commit migrated from https://github.com/dotnet/coreclr/commit/
033b11d631f346a55c4d7c453bca1f49f77a44d5
src/coreclr/src/vm/exceptionhandling.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/vm/exceptionhandling.cpp
b/src/coreclr/src/vm/exceptionhandling.cpp
index
475bf3b
..
f8a3171
100644
(file)
--- a/
src/coreclr/src/vm/exceptionhandling.cpp
+++ b/
src/coreclr/src/vm/exceptionhandling.cpp
@@
-1614,7
+1614,7
@@
CLRUnwindStatus ExceptionTracker::ProcessOSExceptionNotification(
ExceptionTracker::InitializeCrawlFrame(&cfThisFrame, pThread, sf, ®disp, pDispatcherContext, ControlPc, &uMethodStartPC, this);
-#if
def _TARGET_AMD64_
+#if
defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
uCallerSP = EECodeManager::GetCallerSp(cfThisFrame.pRD);
#elif defined(_TARGET_ARM_) || defined(_TARGET_ARM64_)
// On ARM & ARM64, the EstablisherFrame is the value of SP at the time a function was called and before it's prolog