summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-03-22 19:56:39 -0700
committerJan Kotas <jkotas@microsoft.com>2016-03-22 19:56:39 -0700
commit8291822e7dbad5ff4ee4bf8e0ba563b74a1ba397 (patch)
treeab06934624cfd900705106ea12436445fa252774
parent65bf6b22d49283e60d36164e99d3b6679c1a9f54 (diff)
parent3c03a0f65c23565a1799c138470d952a039c142e (diff)
downloadcoreclr-8291822e7dbad5ff4ee4bf8e0ba563b74a1ba397.tar.gz
coreclr-8291822e7dbad5ff4ee4bf8e0ba563b74a1ba397.tar.bz2
coreclr-8291822e7dbad5ff4ee4bf8e0ba563b74a1ba397.zip
Merge pull request #3873 from janvorli/x86-release-exception-unwind
Fix x86 exception stack unwinding issue
-rw-r--r--src/vm/i386/gmsx86.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/vm/i386/gmsx86.cpp b/src/vm/i386/gmsx86.cpp
index f0ba3ca214..97557c80c7 100644
--- a/src/vm/i386/gmsx86.cpp
+++ b/src/vm/i386/gmsx86.cpp
@@ -114,6 +114,11 @@ static bool shouldEnterCall(PTR_BYTE ip) {
// just work.
for (int i = 0; i < 48; i++) {
switch(*ip) {
+ case 0xF2: // repne
+ case 0xF3: // repe
+ ip++;
+ break;
+
case 0x68: // push 0xXXXXXXXX
ip += 5;