chakra-core
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎CMakeLists.txt
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎lib/Backend/EhFrame.cpp
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/Backend/EhFrame.cpp
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/Backend/Encoder.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎lib/Backend/Encoder.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎lib/Backend/PDataManager.cpp
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions b/‎lib/Backend/PDataManager.cpp
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions
diff --git a/‎lib/Backend/amd64/LinearScanMdA.S
Copy file name to clipboard
+2-9Lines changed: 2 additions & 9 deletions b/‎lib/Backend/amd64/LinearScanMdA.S
Copy file name to clipboard
+2-9Lines changed: 2 additions & 9 deletions
diff --git a/‎lib/Backend/amd64/Thunks.S
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/Backend/amd64/Thunks.S
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/Common/Memory/amd64/XDataAllocator.cpp
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions b/‎lib/Common/Memory/amd64/XDataAllocator.cpp
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎lib/Common/Memory/amd64/XDataAllocator.h
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions b/‎lib/Common/Memory/amd64/XDataAllocator.h
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎lib/Common/PlatformAgnostic/AssemblyCommon.h
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎lib/Common/PlatformAgnostic/AssemblyCommon.h
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎lib/Runtime/ByteCode/AsmJsByteCodeWriter.cpp
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎lib/Runtime/ByteCode/AsmJsByteCodeWriter.cpp
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
@@ -294,8 +294,7 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
    add_definitions(-DFEATURE_PAL)
 endif(CLR_CMAKE_PLATFORM_XPLAT)
 
-if(NO_JIT_SH
-   OR CLR_CMAKE_PLATFORM_DARWIN)  # TODO: JIT for OSX
+if(NO_JIT_SH)
     unset(NO_JIT_SH CACHE)      # don't cache
     unset(BuildJIT CACHE)       # also clear it just in case
     add_definitions(-DDISABLE_JIT=1)
 
@@ -51,7 +51,7 @@ ubyte GetDwarfRegNum(ubyte regNum)
     return DWARF_RegNum[regNum];
 }
 
-// Enocde into ULEB128 (Unsigned Little Endian Base 128)
+// Encode into ULEB128 (Unsigned Little Endian Base 128)
 BYTE* EmitLEB128(BYTE* pc, unsigned value)
 {
     do
 
@@ -868,7 +868,7 @@ void Encoder::ValidateCRCOnFinalBuffer(_In_reads_bytes_(finalCodeSize) BYTE * fi
 
                     currentEndAddress = finalBufferRelocTuplePtr;
                     crcSizeToCompute = currentEndAddress - currentStartAddress;
-                    
+
                     Assert(currentEndAddress >= currentStartAddress);
 
                     finalBufferCRC = CalculateCRC(finalBufferCRC, crcSizeToCompute, currentStartAddress);
@@ -910,7 +910,7 @@ void Encoder::EnsureRelocEntryIntegrity(size_t newBufferStartAddress, size_t cod
 {
     size_t targetBrAddress = 0;
     size_t newBufferEndAddress = newBufferStartAddress + codeSize;
-    
+
     //Handle Dictionary addresses here - The target address will be in the dictionary.
     if (relocAddress < oldBufferAddress || relocAddress >= (oldBufferAddress + codeSize))
     {
@@ -939,6 +939,7 @@ void Encoder::EnsureRelocEntryIntegrity(size_t newBufferStartAddress, size_t cod
 
 uint Encoder::CalculateCRC(uint bufferCRC, size_t data)
 {
+#if defined(_WIN32) || defined(__SSE4_2__)
 #if defined(_M_IX86)
     if (AutoSystemInfo::Data.SSE4_2Available())
     {
@@ -950,6 +951,7 @@ uint Encoder::CalculateCRC(uint bufferCRC, size_t data)
         //CRC32 always returns a 32-bit result
         return (uint)_mm_crc32_u64(bufferCRC, data);
     }
+#endif
 #endif
 
     return CalculateCRC32(bufferCRC, data);
@@ -1153,7 +1155,7 @@ Encoder::ShortenBranchesAndLabelAlign(BYTE **codeStart, ptrdiff_t *codeSize, uin
     // Next, we re-write the code to shorten the BRs and adjust relocList offsets to point to new buffer.
     // We also write NOPs for aligned loops.
     BYTE* tmpBuffer = AnewArray(m_tempAlloc, BYTE, newCodeSize);
-    
+
     uint srcBufferCrc = *pShortenedBufferCRC;   //This has the intial Random CRC seed to start with.
 
     // start copying to new buffer
@@ -1257,7 +1259,7 @@ Encoder::ShortenBranchesAndLabelAlign(BYTE **codeStart, ptrdiff_t *codeSize, uin
             AssertMsg((((uint32)(label->GetPC() - buffStart)) & 0xf) == 0, "Misaligned Label");
 
             to = reloc.getLabelOrigPC() - 1;
-            
+
             CopyPartialBufferAndCalculateCRC(&dst_p, dst_size, from, to, pShortenedBufferCRC);
             srcBufferCrc = CalculateCRC(srcBufferCrc, to - from + 1, from);
 
@@ -1280,7 +1282,7 @@ Encoder::ShortenBranchesAndLabelAlign(BYTE **codeStart, ptrdiff_t *codeSize, uin
         }
     }
     // copy last chunk
-    //Exclude jumpTable content from CRC calculation. 
+    //Exclude jumpTable content from CRC calculation.
     //Though jumpTable is not part of the encoded bytes, codeSize has jumpTableSize included in it.
     CopyPartialBufferAndCalculateCRC(&dst_p, dst_size, from, buffStart + *codeSize - 1, pShortenedBufferCRC, jumpTableSize);
     srcBufferCrc = CalculateCRC(srcBufferCrc, buffStart + *codeSize - from - jumpTableSize, from);
 
@@ -55,19 +55,22 @@ void PDataManager::UnregisterPdata(RUNTIME_FUNCTION* pdata)
 }
 
 #else  // !_WIN32
+
 // ----------------------------------------------------------------------------
 //  !_WIN32 x64 unwind uses .eh_frame
 // ----------------------------------------------------------------------------
 
-void PDataManager::RegisterPdata(RUNTIME_FUNCTION* pdataStart, _In_ const ULONG_PTR functionStart, _In_ const ULONG_PTR functionEnd, _Out_ PVOID* pdataTable, ULONG entryCount, ULONG maxEntryCount)
+void PDataManager::RegisterPdata(RUNTIME_FUNCTION* pdataStart,
+    _In_ const ULONG_PTR functionStart, _In_ const ULONG_PTR functionEnd,
+    _Out_ PVOID* pdataTable, ULONG entryCount, ULONG maxEntryCount)
 {
-    __register_frame(pdataStart);
+    __REGISTER_FRAME(pdataStart);
     *pdataTable = pdataStart;
 }
 
 void PDataManager::UnregisterPdata(RUNTIME_FUNCTION* pdata)
 {
-    __deregister_frame(pdata);
+    __DEREGISTER_FRAME(pdata);
 }
 
 #endif  // !_WIN32
 
@@ -7,13 +7,6 @@
 #include "unixasmmacros.inc"
 
 
-// BailOutRecord::BailOut(BailOutRecord const * bailOutRecord)
-// .extern _ZN13BailOutRecord7BailOutEPKS_
-
-// BranchBailOutRecord::BailOut(BranchBailOutRecord const * bailOutRecord, BOOL cond)
-// .extern _ZN19BranchBailOutRecord7BailOutEPKS_i
-
-
 //------------------------------------------------------------------------------
 // LinearScanMD::SaveAllRegisters(BailOutRecord *const bailOutRecord)
 
@@ -106,7 +99,7 @@ NESTED_ENTRY _ZN12LinearScanMD26SaveAllRegistersAndBailOutEP13BailOutRecord, _TE
     add rsp, 28h        // deallocate stack space
     .cfi_adjust_cfa_offset -0x28
 
-    jmp _ZN13BailOutRecord7BailOutEPKS_
+    jmp C_FUNC(_ZN13BailOutRecord7BailOutEPKS_)
 
 NESTED_END _ZN12LinearScanMD26SaveAllRegistersAndBailOutEP13BailOutRecord, _TEXT
 
@@ -132,6 +125,6 @@ NESTED_ENTRY _ZN12LinearScanMD32SaveAllRegistersAndBranchBailOutEP19BranchBailOu
     add rsp, 28h        // deallocate stack space
     .cfi_adjust_cfa_offset -0x28
 
-    jmp _ZN19BranchBailOutRecord7BailOutEPKS_i
+    jmp C_FUNC(_ZN19BranchBailOutRecord7BailOutEPKS_i)
 
 NESTED_END _ZN12LinearScanMD32SaveAllRegistersAndBranchBailOutEP19BranchBailOutRecordi, _TEXT
@@ -72,7 +72,7 @@ NESTED_ENTRY _ZN19NativeCodeGenerator22CheckAsmJsCodeGenThunkEPN2Js16RecyclableO
         movaps xmmword ptr [rsp + 20h], xmm2
         movaps xmmword ptr [rsp + 30h], xmm3
 
-        call _ZN19NativeCodeGenerator17CheckAsmJsCodeGenEPN2Js14ScriptFunctionE
+        call C_FUNC(_ZN19NativeCodeGenerator17CheckAsmJsCodeGenEPN2Js14ScriptFunctionE)
 
         // restore potential floating point arguments from stack
         movaps xmm0, xmmword ptr [rsp + 00h]
 
@@ -12,6 +12,10 @@ CompileAssert(false)
 #include "XDataAllocator.h"
 #include "Core/DelayLoadLibrary.h"
 
+#ifndef _WIN32
+#include "PlatformAgnostic/AssemblyCommon.h" // __REGISTER_FRAME / __DEREGISTER_FRAME
+#endif
+
 XDataAllocator::XDataAllocator(BYTE* address, uint size, HANDLE processHandle) :
     freeList(nullptr),
     start(address),
@@ -155,7 +159,7 @@ void XDataAllocator::Register(XDataAllocation * xdataInfo, ULONG_PTR functionSta
 
 #else  // !_WIN32
     Assert(ReadHead(xdataInfo->address));  // should be non-empty .eh_frame
-    __register_frame(xdataInfo->address);
+    __REGISTER_FRAME(xdataInfo->address);
 #endif
 }
 
@@ -176,6 +180,6 @@ void XDataAllocator::Unregister(XDataAllocation * xdataInfo)
 
 #else  // !_WIN32
     Assert(ReadHead(xdataInfo->address));  // should be non-empty .eh_frame
-    __deregister_frame(xdataInfo->address);
+    __DEREGISTER_FRAME(xdataInfo->address);
 #endif
 }
@@ -7,11 +7,6 @@ CompileAssert(false)
 #endif
 #pragma once
 
-#ifndef _WIN32
-extern "C" void __register_frame(const void* ehframe);
-extern "C" void __deregister_frame(const void* ehframe);
-#endif
-
 namespace Memory
 {
 #ifdef _WIN32
 
@@ -0,0 +1,29 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+#pragma once
+
+#ifndef _WIN32
+
+extern "C" void __register_frame(const void* ehframe);
+extern "C" void __deregister_frame(const void* ehframe);
+
+#if defined(_AMD64_) && !defined(DISABLE_JIT)
+#if defined(__APPLE__) // no multi fde support
+#ifndef __IOS__
+typedef void(*mac_fde_reg_op)(const void*addr);
+void mac_fde_wrapper(const char *dataStart, mac_fde_reg_op reg_op);
+#define __REGISTER_FRAME(addr) mac_fde_wrapper((const char*)addr, __register_frame)
+#define __DEREGISTER_FRAME(addr) mac_fde_wrapper((const char*)addr, __deregister_frame)
+#else // __IOS__ // no JIT
+#define __REGISTER_FRAME(addr)
+#define __DEREGISTER_FRAME(addr)
+#endif // !__IOS__
+#else // multi FDE support
+#define __REGISTER_FRAME(addr) __register_frame(addr)
+#define __DEREGISTER_FRAME(addr) __deregister_frame(addr)
+#endif // __APPLE__
+#endif // _AMD64_ && !DISABLE_JIT
+
+#endif // !_WIN32
@@ -436,7 +436,7 @@ namespace Js
     {
         MULTISIZE_LAYOUT_WRITE(AsmReg7, op, R0, R1, R2, R3, R4, R5, R6);
     }
-    
+
     void AsmJsByteCodeWriter::AsmReg9(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8)
     {
         MULTISIZE_LAYOUT_WRITE(AsmReg9, op, R0, R1, R2, R3, R4, R5, R6, R7, R8);
@@ -445,7 +445,7 @@ namespace Js
     {
         MULTISIZE_LAYOUT_WRITE(AsmReg10, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9);
     }
-    
+
     void AsmJsByteCodeWriter::AsmReg11(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8, RegSlot R9, RegSlot R10)
     {
         MULTISIZE_LAYOUT_WRITE(AsmReg11, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10);
@@ -456,7 +456,7 @@ namespace Js
     {
         MULTISIZE_LAYOUT_WRITE(AsmReg17, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16);
     }
-    
+
     void AsmJsByteCodeWriter::AsmReg18(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8,
         RegSlot R9, RegSlot R10, RegSlot R11, RegSlot R12, RegSlot R13, RegSlot R14, RegSlot R15, RegSlot R16, RegSlot R17)
     {
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ubyte GetDwarfRegNum(ubyte regNum)`
`51`	`51`	`return DWARF_RegNum[regNum];`
`52`	`52`	`}`
`53`	`53`
`54`		`-// Enocde into ULEB128 (Unsigned Little Endian Base 128)`
	`54`	`+// Encode into ULEB128 (Unsigned Little Endian Base 128)`
`55`	`55`	`BYTE* EmitLEB128(BYTE* pc, unsigned value)`
`56`	`56`	`{`
`57`	`57`	`do`
Original file line number	Diff line number	Diff line change
`@@ -55,19 +55,22 @@ void PDataManager::UnregisterPdata(RUNTIME_FUNCTION* pdata)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`#else // !_WIN32`
	`58`	`+`
`58`	`59`	`// ----------------------------------------------------------------------------`
`59`	`60`	`// !_WIN32 x64 unwind uses .eh_frame`
`60`	`61`	`// ----------------------------------------------------------------------------`
`61`	`62`
`62`		`-void PDataManager::RegisterPdata(RUNTIME_FUNCTION* pdataStart, _In_ const ULONG_PTR functionStart, _In_ const ULONG_PTR functionEnd, _Out_ PVOID* pdataTable, ULONG entryCount, ULONG maxEntryCount)`
	`63`	`+void PDataManager::RegisterPdata(RUNTIME_FUNCTION* pdataStart,`
	`64`	`+ _In_ const ULONG_PTR functionStart, _In_ const ULONG_PTR functionEnd,`
	`65`	`+ _Out_ PVOID* pdataTable, ULONG entryCount, ULONG maxEntryCount)`
`63`	`66`	`{`
`64`		`- __register_frame(pdataStart);`
	`67`	`+ __REGISTER_FRAME(pdataStart);`
`65`	`68`	`*pdataTable = pdataStart;`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`void PDataManager::UnregisterPdata(RUNTIME_FUNCTION* pdata)`
`69`	`72`	`{`
`70`		`- __deregister_frame(pdata);`
	`73`	`+ __DEREGISTER_FRAME(pdata);`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`#endif // !_WIN32`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ namespace Js`
`436`	`436`	`{`
`437`	`437`	`MULTISIZE_LAYOUT_WRITE(AsmReg7, op, R0, R1, R2, R3, R4, R5, R6);`
`438`	`438`	`}`
`439`		`-`
	`439`	`+`
`440`	`440`	`void AsmJsByteCodeWriter::AsmReg9(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8)`
`441`	`441`	`{`
`442`	`442`	`MULTISIZE_LAYOUT_WRITE(AsmReg9, op, R0, R1, R2, R3, R4, R5, R6, R7, R8);`
`@@ -445,7 +445,7 @@ namespace Js`
`445`	`445`	`{`
`446`	`446`	`MULTISIZE_LAYOUT_WRITE(AsmReg10, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9);`
`447`	`447`	`}`
`448`		`-`
	`448`	`+`
`449`	`449`	`void AsmJsByteCodeWriter::AsmReg11(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8, RegSlot R9, RegSlot R10)`
`450`	`450`	`{`
`451`	`451`	`MULTISIZE_LAYOUT_WRITE(AsmReg11, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10);`
`@@ -456,7 +456,7 @@ namespace Js`
`456`	`456`	`{`
`457`	`457`	`MULTISIZE_LAYOUT_WRITE(AsmReg17, op, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16);`
`458`	`458`	`}`
`459`		`-`
	`459`	`+`
`460`	`460`	`void AsmJsByteCodeWriter::AsmReg18(OpCodeAsmJs op, RegSlot R0, RegSlot R1, RegSlot R2, RegSlot R3, RegSlot R4, RegSlot R5, RegSlot R6, RegSlot R7, RegSlot R8,`
`461`	`461`	`RegSlot R9, RegSlot R10, RegSlot R11, RegSlot R12, RegSlot R13, RegSlot R14, RegSlot R15, RegSlot R16, RegSlot R17)`
`462`	`462`	`{`