fix arm xdata for oopjit

Author: MikeHolman

lib/Backend/Encoder.cpp

@@ -324,8 +324,20 @@ Encoder::Encode()
 #elif _M_ARM
     m_func->m_unwindInfo.EmitUnwindInfo(m_func->GetJITOutput(), alloc);
     m_func->GetJITOutput()->SetCodeAddress(m_func->GetJITOutput()->GetCodeAddress() | 0x1); // Set thumb mode
-#endif
 
+    if (m_func->IsOOPJIT())
+    {
+        size_t allocSize = XDataAllocator::GetAllocSize(alloc->allocation->xdata.pdataCount, alloc->allocation->xdata.xdataSize);
+        BYTE * xprocXdata = NativeCodeDataNewArrayNoFixup(m_func->GetNativeCodeDataAllocator(), BYTE, allocSize);
+        memcpy_s(xprocXdata, allocSize, alloc->allocation->xdata.address, allocSize);
+        m_func->GetJITOutput()->RecordXData(xprocXdata);
+    }
+    else
+    {
+        XDataAllocator::Register(&alloc->allocation->xdata, m_func->GetJITOutput()->GetCodeAddress(), m_func->GetJITOutput()->GetCodeSize());
+        m_func->GetInProcJITEntryPointInfo()->SetXDataInfo(&alloc->allocation->xdata);
+    }
+#endif
     const bool isSimpleJit = m_func->IsSimpleJit();
 
     if (this->m_inlineeFrameMap->Count() > 0 &&

lib/Backend/JITOutput.cpp

@@ -161,14 +161,19 @@ size_t
 JITOutput::RecordUnwindInfo(size_t offset, BYTE *unwindInfo, size_t size, BYTE * xdataAddr, HANDLE processHandle)
 {
     BYTE *xdataFinal = xdataAddr + offset;
-    m_outputData->xdataAddr = (intptr_t)xdataAddr;
 
     Assert(xdataFinal);
     Assert(((DWORD)xdataFinal & 0x3) == 0); // 4 byte aligned
-    ChakraMemCopy(xdataFinal, size, unwindInfo, size, processHandle);
+    memcpy_s(xdataFinal, size, unwindInfo, size);
 
     return (size_t)xdataFinal;
 }
+
+void
+JITOutput::RecordXData(BYTE * xdata)
+{
+    m_outputData->xdataOffset = NativeCodeData::GetDataTotalOffset(xdata);
+}
 #endif
 
 void

lib/Backend/JITOutput.h

@@ -18,7 +18,9 @@ class JITOutput
     void SetArgUsedForBranch(uint8 param);
     void SetFrameHeight(uint val);
     void RecordThrowMap(Js::ThrowMapEntry * throwMap, uint mapCount);
-
+#ifdef _M_ARM
+    void RecordXData(BYTE * xdata);
+#endif
     uint16 GetArgUsedForBranch() const;
     intptr_t GetCodeAddress() const;
     size_t GetCodeSize() const;

lib/Backend/NativeCodeGenerator.cpp

@@ -1056,16 +1056,34 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
         workItem->GetEntryPoint()->GetJitTransferData()->SetIsReady();
     }
 
-#if defined(_M_X64) || defined(_M_ARM32_OR_ARM64)
+#if defined(_M_X64)
     XDataAllocation * xdataInfo = HeapNewZ(XDataAllocation);
     xdataInfo->address = (byte*)jitWriteData.xdataAddr;
-#if defined(_M_ARM32_OR_ARM64)
-    xdataInfo->pdataCount = jitWriteData.pdataCount;
-    xdataInfo->xdataSize = jitWriteData.xdataSize;
-#endif
     XDataAllocator::Register(xdataInfo, jitWriteData.codeAddress, jitWriteData.codeSize);
     epInfo->SetXDataInfo(xdataInfo);
 #endif
+
+
+#if defined(_M_ARM32_OR_ARM64)
+    // for in-proc jit we do registration in encoder
+    if (JITManager::GetJITManager()->IsOOPJITEnabled())
+    {
+        XDataAllocation * xdataInfo = HeapNewZ(XDataAllocation);
+        xdataInfo->pdataCount = jitWriteData.pdataCount;
+        xdataInfo->xdataSize = jitWriteData.xdataSize;
+        if (jitWriteData.buffer)
+        {
+            xdataInfo->address = jitWriteData.buffer->data + jitWriteData.xdataOffset;
+        }
+        else
+        {
+            xdataInfo->address = nullptr;
+        }
+        XDataAllocator::Register(xdataInfo, jitWriteData.codeAddress, jitWriteData.codeSize);
+        epInfo->SetXDataInfo(xdataInfo);
+    }
+#endif
+
     scriptContext->GetThreadContext()->SetValidCallTargetForCFG((PVOID)jitWriteData.codeAddress);
     workItem->SetCodeAddress((size_t)jitWriteData.codeAddress);
 

lib/Backend/arm/UnwindInfoManager.cpp

@@ -540,10 +540,8 @@ DWORD UnwindInfoManager::EmitXdataStackAlloc(BYTE xData[], DWORD byte, DWORD sta
 void UnwindInfoManager::RecordPdataEntry(DWORD beginAddress, DWORD unwindData)
 {
     RUNTIME_FUNCTION *function = this->alloc->allocation->xdata.GetPdataArray() + this->pdataIndex;
-    RUNTIME_FUNCTION localFunc;
-    localFunc.BeginAddress = beginAddress;
-    localFunc.UnwindData = unwindData;
-    ChakraMemCopy(function, sizeof(RUNTIME_FUNCTION), &localFunc, sizeof(RUNTIME_FUNCTION), this->processHandle);
+    function->BeginAddress = beginAddress;
+    function->UnwindData = unwindData;
 }
 
 DWORD UnwindInfoManager::EmitXdataHomeParams(BYTE xData[], DWORD byte)

lib/Common/Memory/PageAllocator.cpp

@@ -125,15 +125,15 @@ SegmentBase<T>::Initialize(DWORD allocFlags, bool excludeGuardPages)
 
     if (!allocator->CreateSecondaryAllocator(this, committed, &this->secondaryAllocator))
     {
-        GetAllocator()->GetVirtualAllocator()->Free(originalAddress, GetPageCount() * AutoSystemInfo::PageSize, MEM_RELEASE);
+        GetAllocator()->GetVirtualAllocator()->Free(originalAddress, GetPageCount() * AutoSystemInfo::PageSize, MEM_RELEASE, this->allocator->processHandle);
         this->allocator->ReportFailure(GetPageCount() * AutoSystemInfo::PageSize);
         this->address = nullptr;
         return false;
     }
 #if defined(_M_X64_OR_ARM64) && defined(RECYCLER_WRITE_BARRIER_BYTE)
     else if (!RecyclerWriteBarrierManager::OnSegmentAlloc(this->address, this->segmentPageCount))
     {
-        GetAllocator()->GetVirtualAllocator()->Free(originalAddress, GetPageCount() * AutoSystemInfo::PageSize, MEM_RELEASE);
+        GetAllocator()->GetVirtualAllocator()->Free(originalAddress, GetPageCount() * AutoSystemInfo::PageSize, MEM_RELEASE, this->allocator->processHandle);
         this->allocator->ReportFailure(GetPageCount() * AutoSystemInfo::PageSize);
         this->address = nullptr;
         return false;

lib/Common/Memory/arm/XDataAllocator.h

@@ -58,7 +58,7 @@ class XDataAllocator sealed : public SecondaryAllocator
     bool Alloc(ULONG_PTR functionStart, DWORD functionSize, ushort pdataCount, ushort xdataSize, SecondaryAllocation* allocation);
     void Release(const SecondaryAllocation& address);
     bool CanAllocate();
-    DWORD GetAllocSize(ushort pdataCount, ushort xdataSize)
+    static DWORD GetAllocSize(ushort pdataCount, ushort xdataSize)
     {
         return sizeof(RUNTIME_FUNCTION) * pdataCount + xdataSize;
     }

lib/JITIDL/JITTypes.h

@@ -783,8 +783,12 @@ typedef struct JITOutputIDL
     unsigned int propertyGuardCount;
     unsigned int ctorCachesCount;
 
-    CHAKRA_PTR codeAddress;
+#if defined(_M_X64)
     CHAKRA_PTR xdataAddr;
+#elif defined(_M_ARM) || defined(_M_ARM64)
+    unsigned int xdataOffset;
+#endif
+    CHAKRA_PTR codeAddress;
     TypeGuardTransferEntryIDL* typeGuardEntries;
 
     IDL_DEF([size_is(ctorCachesCount)]) CtorCacheTransferEntryIDL ** ctorCacheEntries;

lib/Runtime/Base/FunctionBody.cpp

@@ -8701,13 +8701,23 @@ namespace Js
                 this->constructorCaches->Clear();
             }
 
-#if defined(_M_X64) || defined(_M_ARM32_OR_ARM64)
+#if defined(_M_X64)
             if (this->xdataInfo != nullptr)
             {
                 XDataAllocator::Unregister(this->xdataInfo);
                 HeapDelete(this->xdataInfo);
                 this->xdataInfo = nullptr;
             }
+#elif defined(_M_ARM32_OR_ARM64)
+            if (this->xdataInfo != nullptr)
+            {
+                XDataAllocator::Unregister(this->xdataInfo);
+                if (JITManager::GetJITManager()->IsOOPJITEnabled())
+                {
+                    HeapDelete(this->xdataInfo);
+                }
+                this->xdataInfo = nullptr;
+            }
 #endif
 #endif