Merge pull request #4000 from rahku/issue2963

Fix issue 2963
dotnet · Apr 5, 2016 · caa979f · caa979f
2 parents 3ec0813 + 9259831
commit caa979f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/zap/zapcode.cpp b/src/zap/zapcode.cpp
@@ -1939,6 +1939,18 @@ DWORD ZapLazyHelperThunk::SaveWorker(ZapWriter * pZapWriter)
     if (pImage != NULL)
         pImage->WriteReloc(buffer, (int)(p - buffer), m_pTarget, 0, IMAGE_REL_BASED_THUMB_BRANCH24);
     p += 4;
+#elif defined(_TARGET_ARM64_)
+    // ldr x1, [PC+8]
+    *(DWORD *)(p) =0x58000041;
+    p += 4;
+    // b JIT_StrCns
+    *(DWORD *)(p) = 0x14000000;
+    if (pImage != NULL)
+        pImage->WriteReloc(buffer, (int)(p - buffer), m_pTarget, 0, IMAGE_REL_ARM64_BRANCH26);
+    p += 4;
+    if (pImage != NULL)
+        pImage->WriteReloc(buffer, (int)(p - buffer), m_pArg, 0, IMAGE_REL_BASED_PTR);
+    p += 8;
 #else
     PORTABILITY_ASSERT("ZapLazyHelperThunk::Save");
 #endif

diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp
@@ -2607,6 +2607,8 @@ WORD ZapInfo::getRelocTypeHint(void * target)
     if (m_zapper->m_pOpt->m_fNGenLastRetry)
         return (WORD)-1;
     return IMAGE_REL_BASED_THUMB_BRANCH24;
+#elif defined(_TARGET_ARM64_)
+    return IMAGE_REL_ARM64_BRANCH26;
 #else
     // No hints
     return (WORD)-1;

diff --git a/src/zap/zaprelocs.cpp b/src/zap/zaprelocs.cpp
@@ -107,6 +107,20 @@ void ZapBaseRelocs::WriteReloc(PVOID pSrc, int offset, ZapNode * pTarget, int ta
         // IMAGE_REL_BASED_THUMB_BRANCH24 does not need base reloc entry
         return;
 #endif
+#if defined(_TARGET_ARM64_)
+    case IMAGE_REL_ARM64_BRANCH26:
+        {
+            TADDR pSite = (TADDR)m_pImage->GetBaseAddress() + rva;
+
+            INT64 relOffset = (INT64)(pActualTarget - (pSite + sizeof(INT64)));
+            if (!FitsInRel28(relOffset))
+            {
+                ThrowHR(COR_E_OVERFLOW);
+            }
+            PutArm64Rel28((UINT32 *)pLocation,(INT32)relOffset);
+        }
+        return;
+#endif
 
     default:
         _ASSERTE(!"Unknown relocation type");