More fixes

MichalStrehovsky · MichalStrehovsky · commit b3b9a2503917 · 2025-08-25T15:19:39.000+02:00
diff --git a/.github/workflows/bflat-cicd.yml b/.github/workflows/bflat-cicd.yml
@@ -41,6 +41,9 @@ jobs:
           - os: windows
             arch: arm64
             vm: windows-latest
+          - os: windows
+            arch: x86
+            vm: windows-latest
     runs-on: ${{ matrix.vm }}
     name: Build and test ${{ matrix.os }} ${{ matrix.arch }}
     container: ${{ matrix.container }}
@@ -202,6 +205,16 @@ jobs:
           asset_name: bflat-refs.zip
           asset_content_type: application/zip
 
+      - name: Upload native compiler (windows-x86)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: native-compiler-windows-x86/bflat-compiler-native-windows-x86.zip
+          asset_name: bflat-compiler-native-windows-x86.zip
+          asset_content_type: application/zip
+
       - name: Upload native compiler (windows-x64)
         uses: actions/upload-release-asset@v1
         env:
@@ -222,6 +235,16 @@ jobs:
           asset_name: bflat-compiler-native-linux-glibc-x64.zip
           asset_content_type: application/zip
 
+      - name: Upload libs (windows-x86)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: libs-windows-x86/bflat-libs-windows-x86.zip
+          asset_name: bflat-libs-windows-x86.zip
+          asset_content_type: application/zip
+
       - name: Upload libs (windows-x64)
         uses: actions/upload-release-asset@v1
         env:
diff --git a/src/coreclr/nativeaot/Shcrt/CMakeLists.txt b/src/coreclr/nativeaot/Shcrt/CMakeLists.txt
@@ -6,6 +6,13 @@ set(SOURCES
     nocrt.cpp
 )
 
-add_library(shcrt STATIC ${SOURCES})
+set(ASM_SOURCES
+    ${ARCH_SOURCES_DIR}/chkstk.asm
+)
+
+convert_to_absolute_path(ASM_SOURCES ${ASM_SOURCES})
+preprocess_files(ASM_SOURCES ${ASM_SOURCES})
+
+add_library(shcrt STATIC ${SOURCES} ${ASM_SOURCES})
 
 install_static_library(shcrt aotsdk nativeaot)
diff --git a/src/coreclr/nativeaot/Shcrt/amd64/chkstk.asm b/src/coreclr/nativeaot/Shcrt/amd64/chkstk.asm
@@ -0,0 +1,28 @@
+.code
+
+__chkstk proc
+
+sub         rsp,10h
+mov         qword ptr [rsp],r10
+mov         qword ptr [rsp+8],r11
+xor         r11,r11
+lea         r10,[rsp+18h]
+sub         r10,rax
+cmovb       r10,r11
+mov         r11,qword ptr gs:[0000000000000010h]
+cmp         r10,r11
+jae         cs20
+and         r10w,0F000h
+cs10:
+lea         r11,[r11-1000h]
+mov         byte ptr [r11],0
+cmp         r10,r11
+jne         cs10
+cs20:
+mov         r10,qword ptr [rsp]
+mov         r11,qword ptr [rsp+8]
+add         rsp,10h
+ret
+
+__chkstk endp
+end
diff --git a/src/coreclr/nativeaot/Shcrt/arm64/chkstk.asm b/src/coreclr/nativeaot/Shcrt/arm64/chkstk.asm
@@ -0,0 +1,24 @@
+#include <ksarm64.h>
+
+TEXTAREA
+
+    LEAF_ENTRY chkstk, _TEXT
+
+    ldr         xip1,[xpr,#0x10]
+    subs        xip0,sp,x15,lsl #4
+    csello      xip0,xzr,xip0
+    cmp         xip0,xip1
+    blo         LOC0
+    ret
+LOC0
+    and         xip0,xip0,#-0x1000
+LOC1
+    sub         xip1,xip1,#1,lsl #0xC
+    ldr         xzr,[xip1]
+    cmp         xip1,xip0
+    bne         LOC1
+    ret
+
+    LEAF_END chkstk
+
+END
diff --git a/src/coreclr/nativeaot/Shcrt/i386/chkstk.asm b/src/coreclr/nativeaot/Shcrt/i386/chkstk.asm
@@ -0,0 +1,30 @@
+.386
+.model flat
+.code
+
+__chkstk proc
+
+push        ecx
+lea         ecx,[esp+4]
+sub         ecx,eax
+sbb         eax,eax
+not         eax
+and         ecx,eax
+mov         eax,esp
+and         eax,0FFFFF000h
+cs10:
+cmp         ecx,eax
+jb          cs20
+mov         eax,ecx
+pop         ecx
+xchg        eax,esp
+mov         eax,dword ptr [eax]
+mov         dword ptr [esp],eax
+ret
+cs20:
+sub         eax,1000h
+test        dword ptr [eax],eax
+jmp         cs10
+
+__chkstk endp
+end
diff --git a/src/coreclr/nativeaot/Shcrt/nocrt.cpp b/src/coreclr/nativeaot/Shcrt/nocrt.cpp
@@ -11,23 +11,23 @@ namespace std {
 const std::nothrow_t nothrow = std::nothrow_t(); // define nothrow
 }
 
-void* operator new[](size_t const size, std::nothrow_t const& x) noexcept
+void* __CRTDECL operator new[](size_t const size, std::nothrow_t const& x) noexcept
 {
     return malloc(size);
 }
 
-void* operator new(size_t const size, std::nothrow_t const& x) noexcept
+void* __CRTDECL operator new(size_t const size, std::nothrow_t const& x) noexcept
 {
     return malloc(size);
 }
 
-void operator delete[](void* const block) noexcept
+void __CRTDECL operator delete[](void* const block) noexcept
 {
     free(block);
 }
 
 
-void operator delete(void* const block, size_t const) noexcept
+void __CRTDECL operator delete(void* const block, size_t const) noexcept
 {
     free(block);
 }
@@ -401,7 +401,7 @@ __cdecl atexit(_PVFV Func)
 }
 
 #pragma function(memset)
-extern "C" void  *memset(void *Dest, int Value, size_t Size)
+extern "C" void* __cdecl memset(void *Dest, int Value, size_t Size)
 {
     unsigned char Val = *(unsigned char*)&Value;
     unsigned char *At = (unsigned char*)Dest;
@@ -414,7 +414,7 @@ extern "C" void  *memset(void *Dest, int Value, size_t Size)
 }
 
 #pragma function(memcpy)
-extern "C" void *memcpy(void *Dest, const void *Source, size_t Size)
+extern "C" void* __cdecl memcpy(void *Dest, const void *Source, size_t Size)
 {
     char *D = (char*)Dest;
     const char *S = (char*)Source;
@@ -427,7 +427,7 @@ extern "C" void *memcpy(void *Dest, const void *Source, size_t Size)
 }
 
 #pragma function(memcmp)
-extern "C" int memcmp(const void *A, const void *B, size_t Count)
+extern "C" int __cdecl memcmp(const void *A, const void *B, size_t Count)
 {
     register const unsigned char *s1 = (const unsigned char*)A;
     register const unsigned char *s2 = (const unsigned char*)B;
@@ -444,7 +444,7 @@ extern "C" int memcmp(const void *A, const void *B, size_t Count)
 }
 
 #pragma function(memmove)
-extern "C" void* memmove(void *dest, void const *src, size_t len)
+extern "C" void* __cdecl memmove(void *dest, void const *src, size_t len)
 {
     size_t i;
     char *char_src = (char*)src;
diff --git a/src/coreclr/nativeaot/zerolib.native/CMakeLists.txt b/src/coreclr/nativeaot/zerolib.native/CMakeLists.txt
@@ -15,7 +15,7 @@ function(install_bootstrapper_object targetName destination)
   endif()
 endfunction()
 
-if (CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_X86)
+if (CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_I386)
   set(SOURCES ${ARCH_SOURCES_DIR}/stubs.${ASM_SUFFIX})
 
   convert_to_absolute_path(SOURCES ${SOURCES})
diff --git a/src/coreclr/nativeaot/zerolib.native/i386/stubs.asm b/src/coreclr/nativeaot/zerolib.native/i386/stubs.asm
@@ -0,0 +1,61 @@
+.586
+.xmm
+.model  flat
+
+ALTERNATE_ENTRY macro Name
+
+Name label proc
+PUBLIC Name
+endm
+
+.code
+
+PUBLIC RhpByRefAssignRef
+RhpByRefAssignRef PROC
+  movs    dword ptr es:[edi],dword ptr [esi]  
+  ret
+RhpByRefAssignRef ENDP
+
+PUBLIC RhpCheckedAssignRefEAX
+ALTERNATE_ENTRY RhpAssignRefEAX
+RhpCheckedAssignRefEAX PROC
+  mov     DWORD PTR [edx], eax
+  ret
+RhpCheckedAssignRefEAX ENDP
+
+PUBLIC RhpCheckedAssignRefEBX
+ALTERNATE_ENTRY RhpAssignRefEBX
+RhpCheckedAssignRefEBX PROC
+  mov     DWORD PTR [edx], ebx
+  ret
+RhpCheckedAssignRefEBX ENDP
+
+PUBLIC RhpCheckedAssignRefECX
+ALTERNATE_ENTRY RhpAssignRefECX
+RhpCheckedAssignRefECX PROC
+  mov     DWORD PTR [edx], ecx
+  ret
+RhpCheckedAssignRefECX ENDP
+
+PUBLIC RhpCheckedAssignRefESI
+ALTERNATE_ENTRY RhpAssignRefESI
+RhpCheckedAssignRefESI PROC
+  mov     DWORD PTR [edx], esi
+  ret
+RhpCheckedAssignRefESI ENDP
+
+PUBLIC RhpCheckedAssignRefEDI
+ALTERNATE_ENTRY RhpAssignRefEDI
+RhpCheckedAssignRefEDI PROC
+  mov     DWORD PTR [edx], edi
+  ret
+RhpCheckedAssignRefEDI ENDP
+
+PUBLIC RhpCheckedAssignRefEBP
+ALTERNATE_ENTRY RhpAssignRefEBP
+RhpCheckedAssignRefEBP PROC
+  mov     DWORD PTR [edx], ebp
+  ret
+RhpCheckedAssignRefEBP ENDP
+
+end
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs
@@ -24,6 +24,7 @@ public static class SettingsTunnel
         public static bool EmitGSCookies = true;
         public static bool EmitGCInfo = true;
         public static bool EmitEHInfo = true;
+        public static bool ZerolibLike;
     }
 
     public abstract class Compilation : ICompilation
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs
@@ -138,6 +138,8 @@ private void CompileSingleMethod(ScannedMethodNode methodCodeNodeNeedingCode)
 
         ILScanResults IILScanner.Scan()
         {
+            if (!SettingsTunnel.ZerolibLike)
+            {
             _dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.BulkWriteBarrier), "Not tracked by scanner");
             _dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.MemCpy), "Not tracked by scanner");
             _dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.MemSet), "Not tracked by scanner");
@@ -151,6 +153,7 @@ ILScanResults IILScanner.Scan()
             _dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.CheckInstanceClass), "Not tracked by scanner");
             _dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.IsInstanceOfException), "Not tracked by scanner");
             _dependencyGraph.AddRoot(_nodeFactory.MethodEntrypoint(_nodeFactory.TypeSystemContext.GetHelperEntryPoint("ThrowHelpers", "ThrowFeatureBodyRemoved")), "Substitution for methods removed based on scanning");
+            }
 
             _dependencyGraph.ComputeMarkedNodes();
 
@@ -292,7 +295,7 @@ public BodyAndFieldSubstitutions GetBodyAndFieldSubstitutions()
                 }
             }
 
-            if (!hasIDynamicInterfaceCastableType)
+            if (!hasIDynamicInterfaceCastableType && !SettingsTunnel.ZerolibLike)
             {
                 // We can't easily trim out some of the IDynamicInterfaceCastable infrastructure because
                 // the callers do type checks based on flags on the MethodTable instead of an actual type cast.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
@@ -1351,7 +1351,7 @@ private void ImportBinaryOperation(ILOpcode opcode)
 
         private void ImportConvert(WellKnownType wellKnownType, bool checkOverflow, bool unsigned)
         {
-            if (checkOverflow)
+            if (checkOverflow && !SettingsTunnel.ZerolibLike)
             {
                 _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Dbl2IntOvf), "_dbl2intovf");
                 _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Dbl2UIntOvf), "_dbl2uintovf");
diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -24,6 +24,7 @@ if (STATIC_LIBS_ONLY)
     foreach(VENDORED_LIB IN LISTS BROTLI_LIBRARIES ITEMS zlib)
         if (TARGET ${VENDORED_LIB})
             set_target_properties(${VENDORED_LIB} PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF)
+            set_target_properties(${VENDORED_LIB} PROPERTIES CLR_CONTROL_FLOW_GUARD OFF)
         endif()
     endforeach()
 endif()
diff --git a/src/native/minipal/CMakeLists.txt b/src/native/minipal/CMakeLists.txt
@@ -28,6 +28,7 @@ endif()
 # a variety of toolchain versions, not only the exact one we built with.
 add_library(aotminipal STATIC ${SOURCES})
 set_target_properties(aotminipal PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF)
+set_target_properties(aotminipal PROPERTIES CLR_CONTROL_FLOW_GUARD OFF)
 
 if (WIN32)
     target_link_libraries(aotminipal PUBLIC bcrypt)

Original file line number	Diff line number	Diff line change
`@@ -11,23 +11,23 @@ namespace std {`
`11`	`11`	`const std::nothrow_t nothrow = std::nothrow_t(); // define nothrow`
`12`	`12`	`}`
`13`	`13`
`14`		`-void* operator new[](size_t const size, std::nothrow_t const& x) noexcept`
	`14`	`+void* __CRTDECL operator new[](size_t const size, std::nothrow_t const& x) noexcept`
`15`	`15`	`{`
`16`	`16`	`return malloc(size);`
`17`	`17`	`}`
`18`	`18`
`19`		`-void* operator new(size_t const size, std::nothrow_t const& x) noexcept`
	`19`	`+void* __CRTDECL operator new(size_t const size, std::nothrow_t const& x) noexcept`
`20`	`20`	`{`
`21`	`21`	`return malloc(size);`
`22`	`22`	`}`
`23`	`23`
`24`		`-void operator delete[](void* const block) noexcept`
	`24`	`+void __CRTDECL operator delete[](void* const block) noexcept`
`25`	`25`	`{`
`26`	`26`	`free(block);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`
`30`		`-void operator delete(void* const block, size_t const) noexcept`
	`30`	`+void __CRTDECL operator delete(void* const block, size_t const) noexcept`
`31`	`31`	`{`
`32`	`32`	`free(block);`
`33`	`33`	`}`
`@@ -401,7 +401,7 @@ __cdecl atexit(_PVFV Func)`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`#pragma function(memset)`
`404`		`-extern "C" void memset(void Dest, int Value, size_t Size)`
	`404`	`+extern "C" void* __cdecl memset(void *Dest, int Value, size_t Size)`
`405`	`405`	`{`
`406`	`406`	`unsigned char Val = (unsigned char)&Value;`
`407`	`407`	`unsigned char At = (unsigned char)Dest;`
`@@ -414,7 +414,7 @@ extern "C" void memset(void Dest, int Value, size_t Size)`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`#pragma function(memcpy)`
`417`		`-extern "C" void memcpy(void Dest, const void *Source, size_t Size)`
	`417`	`+extern "C" void* __cdecl memcpy(void Dest, const void Source, size_t Size)`
`418`	`418`	`{`
`419`	`419`	`char D = (char)Dest;`
`420`	`420`	`const char S = (char)Source;`
`@@ -427,7 +427,7 @@ extern "C" void memcpy(void Dest, const void *Source, size_t Size)`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`#pragma function(memcmp)`
`430`		`-extern "C" int memcmp(const void A, const void B, size_t Count)`
	`430`	`+extern "C" int __cdecl memcmp(const void A, const void B, size_t Count)`
`431`	`431`	`{`
`432`	`432`	`register const unsigned char s1 = (const unsigned char)A;`
`433`	`433`	`register const unsigned char s2 = (const unsigned char)B;`
`@@ -444,7 +444,7 @@ extern "C" int memcmp(const void A, const void B, size_t Count)`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`#pragma function(memmove)`
`447`		`-extern "C" void* memmove(void dest, void const src, size_t len)`
	`447`	`+extern "C" void* __cdecl memmove(void dest, void const src, size_t len)`
`448`	`448`	`{`
`449`	`449`	`size_t i;`
`450`	`450`	`char char_src = (char)src;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public static class SettingsTunnel`
`24`	`24`	`public static bool EmitGSCookies = true;`
`25`	`25`	`public static bool EmitGCInfo = true;`
`26`	`26`	`public static bool EmitEHInfo = true;`
	`27`	`+ public static bool ZerolibLike;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public abstract class Compilation : ICompilation`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,8 @@ private void CompileSingleMethod(ScannedMethodNode methodCodeNodeNeedingCode)`
`138`	`138`
`139`	`139`	`ILScanResults IILScanner.Scan()`
`140`	`140`	`{`
	`141`	`+ if (!SettingsTunnel.ZerolibLike)`
	`142`	`+ {`
`141`	`143`	`_dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.BulkWriteBarrier), "Not tracked by scanner");`
`142`	`144`	`_dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.MemCpy), "Not tracked by scanner");`
`143`	`145`	`_dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.MemSet), "Not tracked by scanner");`
`@@ -151,6 +153,7 @@ ILScanResults IILScanner.Scan()`
`151`	`153`	`_dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.CheckInstanceClass), "Not tracked by scanner");`
`152`	`154`	`_dependencyGraph.AddRoot(GetHelperEntrypoint(ReadyToRunHelper.IsInstanceOfException), "Not tracked by scanner");`
`153`	`155`	`_dependencyGraph.AddRoot(_nodeFactory.MethodEntrypoint(_nodeFactory.TypeSystemContext.GetHelperEntryPoint("ThrowHelpers", "ThrowFeatureBodyRemoved")), "Substitution for methods removed based on scanning");`
	`156`	`+ }`
`154`	`157`
`155`	`158`	`_dependencyGraph.ComputeMarkedNodes();`
`156`	`159`
`@@ -292,7 +295,7 @@ public BodyAndFieldSubstitutions GetBodyAndFieldSubstitutions()`
`292`	`295`	`}`
`293`	`296`	`}`
`294`	`297`
`295`		`- if (!hasIDynamicInterfaceCastableType)`
	`298`	`+ if (!hasIDynamicInterfaceCastableType && !SettingsTunnel.ZerolibLike)`
`296`	`299`	`{`
`297`	`300`	`// We can't easily trim out some of the IDynamicInterfaceCastable infrastructure because`
`298`	`301`	`// the callers do type checks based on flags on the MethodTable instead of an actual type cast.`