kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-08 00:09:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev-platform

Browse source
This commit is contained in:
Daan Leijen 2023-03-15 20:42:59 -07:00
commit 61ae0d1d5e
9 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ide/vs2017/mimalloc-override.vcxproj
View file

@ -236,6 +236,7 @@
<ClCompile Include="..\..\src\bitmap.c" /> <ClCompile Include="..\..\src\bitmap.c" />
<ClCompile Include="..\..\src\heap.c" /> <ClCompile Include="..\..\src\heap.c" />
<ClCompile Include="..\..\src\init.c" /> <ClCompile Include="..\..\src\init.c" />
<ClCompile Include="..\..\src\prim\prim.c" />
<ClCompile Include="..\..\src\options.c" /> <ClCompile Include="..\..\src\options.c" />
<ClCompile Include="..\..\src\os.c" /> <ClCompile Include="..\..\src\os.c" />
<ClCompile Include="..\..\src\page-queue.c"> <ClCompile Include="..\..\src\page-queue.c">

3
ide/vs2017/mimalloc-override.vcxproj.filters
View file

@ -82,5 +82,8 @@
<ClCompile Include="..\..\src\segment-cache.c"> <ClCompile Include="..\..\src\segment-cache.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\prim\prim.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
ide/vs2017/mimalloc.vcxproj
View file

@ -233,6 +233,7 @@
<ClCompile Include="..\..\src\bitmap.c" /> <ClCompile Include="..\..\src\bitmap.c" />
<ClCompile Include="..\..\src\heap.c" /> <ClCompile Include="..\..\src\heap.c" />
<ClCompile Include="..\..\src\init.c" /> <ClCompile Include="..\..\src\init.c" />
<ClCompile Include="..\..\src\prim\prim.c" />
<ClCompile Include="..\..\src\options.c" /> <ClCompile Include="..\..\src\options.c" />
<ClCompile Include="..\..\src\page-queue.c"> <ClCompile Include="..\..\src\page-queue.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

3
ide/vs2017/mimalloc.vcxproj.filters
View file

@ -65,6 +65,9 @@
<ClCompile Include="..\..\src\segment-cache.c"> <ClCompile Include="..\..\src\segment-cache.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\prim\prim.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

1
ide/vs2019/mimalloc-override.vcxproj
View file

@ -236,6 +236,7 @@
<ClCompile Include="..\..\src\bitmap.c" /> <ClCompile Include="..\..\src\bitmap.c" />
<ClCompile Include="..\..\src\heap.c" /> <ClCompile Include="..\..\src\heap.c" />
<ClCompile Include="..\..\src\init.c" /> <ClCompile Include="..\..\src\init.c" />
<ClCompile Include="..\..\src\prim\prim.c" />
<ClCompile Include="..\..\src\options.c" /> <ClCompile Include="..\..\src\options.c" />
<ClCompile Include="..\..\src\os.c" /> <ClCompile Include="..\..\src\os.c" />
<ClCompile Include="..\..\src\page-queue.c"> <ClCompile Include="..\..\src\page-queue.c">

3
ide/vs2019/mimalloc-override.vcxproj.filters
View file

@ -49,6 +49,9 @@
<ClCompile Include="..\..\src\segment-cache.c"> <ClCompile Include="..\..\src\segment-cache.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\prim\prim.c" />
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

1
ide/vs2019/mimalloc.vcxproj
View file

@ -225,6 +225,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\heap.c" /> <ClCompile Include="..\..\src\heap.c" />
<ClCompile Include="..\..\src\init.c" /> <ClCompile Include="..\..\src\init.c" />
<ClCompile Include="..\..\src\prim\prim.c" />
<ClCompile Include="..\..\src\options.c" /> <ClCompile Include="..\..\src\options.c" />
<ClCompile Include="..\..\src\page-queue.c"> <ClCompile Include="..\..\src\page-queue.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

3
ide/vs2019/mimalloc.vcxproj.filters
View file

@ -52,6 +52,9 @@
<ClCompile Include="..\..\src\segment-cache.c"> <ClCompile Include="..\..\src\segment-cache.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\prim\prim.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

1
include/mimalloc-internal.h
View file

@ -792,6 +792,7 @@ static inline size_t mi_ctz(uintptr_t x) {
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#include <limits.h> // LONG_MAX #include <limits.h> // LONG_MAX
#include <intrin.h> // BitScanReverse64
#define MI_HAVE_FAST_BITSCAN #define MI_HAVE_FAST_BITSCAN
static inline size_t mi_clz(uintptr_t x) { static inline size_t mi_clz(uintptr_t x) {
if (x==0) return MI_INTPTR_BITS; if (x==0) return MI_INTPTR_BITS;