set thumb mode after building xdata

Author: MikeHolman

lib/Backend/Encoder.cpp

@@ -323,8 +323,6 @@ Encoder::Encode()
         m_func->GetThreadContextInfo()->GetProcessHandle());
 #elif _M_ARM
     m_func->m_unwindInfo.EmitUnwindInfo(m_func->GetJITOutput(), alloc);
-    m_func->GetJITOutput()->SetCodeAddress(m_func->GetJITOutput()->GetCodeAddress() | 0x1); // Set thumb mode
-
     if (m_func->IsOOPJIT())
     {
         size_t allocSize = XDataAllocator::GetAllocSize(alloc->allocation->xdata.pdataCount, alloc->allocation->xdata.xdataSize);
@@ -337,6 +335,8 @@ Encoder::Encode()
         XDataAllocator::Register(&alloc->allocation->xdata, m_func->GetJITOutput()->GetCodeAddress(), m_func->GetJITOutput()->GetCodeSize());
         m_func->GetInProcJITEntryPointInfo()->SetXDataInfo(&alloc->allocation->xdata);
     }
+
+    m_func->GetJITOutput()->SetCodeAddress(m_func->GetJITOutput()->GetCodeAddress() | 0x1); // Set thumb mode
 #endif
     const bool isSimpleJit = m_func->IsSimpleJit();
 

lib/Backend/NativeCodeGenerator.cpp

@@ -1068,7 +1068,7 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
 #endif
 
 
-#if defined(_M_ARM32_OR_ARM64)
+#if defined(_M_ARM)
     // for in-proc jit we do registration in encoder
     if (JITManager::GetJITManager()->IsOOPJITEnabled())
     {
@@ -1083,7 +1083,8 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
         {
             xdataInfo->address = nullptr;
         }
-        XDataAllocator::Register(xdataInfo, jitWriteData.codeAddress, jitWriteData.codeSize);
+        // unmask thumb mode from code address
+        XDataAllocator::Register(xdataInfo, jitWriteData.codeAddress & ~0x1, jitWriteData.codeSize);
         epInfo->SetXDataInfo(xdataInfo);
     }
 #endif