diff options
| author | Fadi Hanna <fadim@microsoft.com> | 2017-07-11 00:25:04 +0300 |
|---|---|---|
| committer | Fadi Hanna <fadim@microsoft.com> | 2017-07-11 00:25:04 +0300 |
| commit | 03a813063523c0dad64c583c13ccd9fc84b122fe (patch) | |
| tree | db27fab1660ff62059d5b07e23cee985068f5970 /src/Native/Runtime/MiscHelpers.cpp | |
| parent | 7b6ea7f3e303990f88b09650162931dd239e3af5 (diff) | |
Fixing the unboxing stub decoding logic on ARM to support stub instructions generated by the ZapImage::ConvertToLargeUnboxingStub function in the binder
[tfs-changeset: 1665237]
Diffstat (limited to 'src/Native/Runtime/MiscHelpers.cpp')
| -rw-r--r-- | src/Native/Runtime/MiscHelpers.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Native/Runtime/MiscHelpers.cpp b/src/Native/Runtime/MiscHelpers.cpp index 27a74f19a..8bb976de4 100644 --- a/src/Native/Runtime/MiscHelpers.cpp +++ b/src/Native/Runtime/MiscHelpers.cpp @@ -522,13 +522,23 @@ COOP_PINVOKE_HELPER(UInt8 *, RhGetCodeTarget, (UInt8 * pCodeOrg)) unboxingStub = true; pCode += 1; } - // is this movw r12,#imm16; movt r12,#imm16; ldr pc,[r12]? + // is this movw r12,#imm16; movt r12,#imm16; ldr pc,[r12] + // or movw r12,#imm16; movt r12,#imm16; bx r12 if ((pCode[0] & 0xfbf0) == 0xf240 && (pCode[1] & 0x0f00) == 0x0c00 && (pCode[2] & 0xfbf0) == 0xf2c0 && (pCode[3] & 0x0f00) == 0x0c00 - && pCode[4] == 0xf8dc && pCode[5] == 0xf000) + && ((pCode[4] == 0xf8dc && pCode[5] == 0xf000) || pCode[4] == 0x4760)) { - UInt8 **pIatCell = (UInt8 **)GetThumb2Mov32(pCode); - return *pIatCell; + if (pCode[4] == 0xf8dc && pCode[5] == 0xf000) + { + // ldr pc,[r12] + UInt8 **pIatCell = (UInt8 **)GetThumb2Mov32(pCode); + return *pIatCell; + } + else if (pCode[4] == 0x4760) + { + // bx r12 + return (UInt8 *)GetThumb2Mov32(pCode); + } } // is this an unboxing stub followed by a relative jump? else if (unboxingStub && (pCode[0] & 0xf800) == 0xf000 && (pCode[1] & 0xd000) == 0x9000) |