Update nf-interpreter sub-module

***NO_CI***

Author: josesimoes

native/nf-interpreter/CMake/Modules/FindNF_NativeAssemblies.cmake

@@ -29,7 +29,6 @@ option(API_System.Device.Pwm                            "option for System.Devic
 option(API_System.IO.Ports                              "option for System.IO.Ports API")
 option(API_System.Device.Spi                            "option for System.Device.Spi API")
 option(API_System.Runtime.Serialization                 "option for System.Runtime.Serialization API")
-option(API_Windows.Storage                              "option for Windows.Storage")
 option(API_nanoFramework.Graphics                       "option for nanoFramework.Graphics")
 option(API_nanoFramework.Device.Bluetooth               "option for nanoFramework.Device.Bluetooth")
 option(API_System.Device.UsbStream                      "option for System.Device.UsbStream API")
@@ -453,12 +452,6 @@ if(API_System.Device.UsbStream)
     PerformSettingsForApiEntry("System.Device.UsbStream")
 endif()
 
-# Windows.Storage
-if(API_Windows.Storage)
-    ##### API name here (doted name)
-    PerformSettingsForApiEntry("Windows.Storage")
-endif()
-
 # Interop assemblies
 ParseInteropAssemblies()
 

native/nf-interpreter/CMake/Modules/FindSystem.IO.FileSystem.cmake

@@ -8,6 +8,7 @@ set(BASE_PATH_FOR_THIS_MODULE ${BASE_PATH_FOR_CLASS_LIBRARIES_MODULES}/System.IO
 
 if(RTOS_FREERTOS_CHECK)
     set(PROJECT_COMMON_PATH ${PROJECT_SOURCE_DIR}/targets/FreeRTOS/NXP/_common)
+    set(FATFS_PLATFORM ${PROJECT_SOURCE_DIR}/targets/FreeRTOS/NXP/_FatFs)
 else()
     set(PROJECT_COMMON_PATH ${PROJECT_SOURCE_DIR}/targets/${RTOS}/_common)
 endif()
@@ -75,6 +76,7 @@ foreach(SRC_FILE ${System.IO.FileSystem_SRCS})
 
             # FatFs
             ${CMAKE_SOURCE_DIR}/targets/${RTOS}/_FatFs
+            ${FATFS_PLATFORM}
 
 	    CMAKE_FIND_ROOT_PATH_BOTH
     )

native/nf-interpreter/CMake/Modules/FindWindows.Storage.cmake

@@ -33,8 +33,6 @@ macro(nf_set_compile_options)
     # this series has FPU 
     target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
 
-    # temporarily force inclusion of Windows Storage headers
-    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DINCLUDE_WINDOWS_STORAGE)
 endmacro()
 
 

native/nf-interpreter/CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake

@@ -309,16 +309,11 @@ if(NF_FEATURE_HAS_SDCARD)
 
     # this feature currently is supported only on ChibiOS, iMX.RT FreeRTOS and ESP32 FreeRTOS
     if(NOT RTOS_CHIBIOS_CHECK AND NOT RTOS_FREERTOS_CHECK AND NOT RTOS_ESP32_CHECK)
-        message(FATAL_ERROR "Support for SD Card is only available for ChibiOS Cortex-M targets, iMX.RT FreeRTOS and ESP32 targets..")
+        message(FATAL_ERROR "Support for SD Card is only available for ChibiOS Cortex-M targets, iMX.RT FreeRTOS and ESP32 targets.")
     endif()
 
-    if(RTOS_FREERTOS_CHECK)
-        # ONLY FOR FREERTOS+NXP force inclusion of Windows.Storage API
-        set(API_Windows.Storage ON CACHE INTERNAL "Forcing Windows.Storage API option to ON")
-    else()
-        # all the others RTOSes: force inclusion of System.IO.FileSystem API
-        set(API_System.IO.FileSystem ON CACHE INTERNAL "Forcing System.IO.FileSystem API option to ON")
-    endif()
+    # all RTOSes: force inclusion of System.IO.FileSystem API
+    set(API_System.IO.FileSystem ON CACHE INTERNAL "Forcing System.IO.FileSystem API option to ON")
 
     message(STATUS "Support for SD Card is included")
 
@@ -668,7 +663,6 @@ if( API_nanoFramework.Device.OneWire OR
     API_System.Device.Gpio OR
     API_System.IO.Ports OR
     API_nanoFramework.Device.Can OR
-    API_Windows.Storage OR
     API_System.IO.FileSystem)
 
     # these APIs requires nanoFramework.Runtime.Events

native/nf-interpreter/CMakeLists.txt

@@ -96,6 +96,7 @@ jobs:
 
               if( ($commit.commit.author.name -eq "nfbot") -and ($commit.commit.message -like "*[version update]*") )
               {
+                Write-Host "##[command] **version update commit, skipping build**"
                 echo "##vso[task.setvariable variable=SKIP_BUILD;isOutput=true]true"  
               }
               else
@@ -106,6 +107,7 @@ jobs:
               # check if Unit Tests for mscorlib should be run
               if(($commit.commit.message -like "*[run mscorlib tests]*") -or ($commit.commit.message -match "Tested against nanoframework/CoreLibrary#(\d+)"))
               {
+                Write-Host "##[command] **mscorlib tests are to be runned**"
                 echo "##vso[task.setvariable variable=RUN_MSCORLIB_TESTS;isOutput=true]true"
               }
             }
@@ -1216,7 +1218,7 @@ jobs:
         and(
           succeeded('Build_nanoCLR_CLI'),
           ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
-          eq(variables['System.PullRequest.PullRequestId'], ''),
+          ne(variables['System.PullRequest.PullRequestId'], ''),
           or(
             eq(dependencies.Check_Build_Options.outputs['BuildOptions.RUN_MSCORLIB_TESTS'], true),
             eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
@@ -1272,6 +1274,14 @@ jobs:
 
       - template: azure-pipelines-templates/install-nuget.yml@templates
 
+      - task: Cache@2
+        displayName: Cache NuGet packages
+        condition: succeeded()
+        continueOnError: true
+        inputs:
+          key: 'nuget | **/packages.lock.json'
+          path: $(UserProfile)/.nuget/packages
+
       - task: NuGetCommand@2
         condition: succeeded()
         displayName: NuGet restore

native/nf-interpreter/azure-pipelines.yml

@@ -1,10 +1,10 @@
-//
+//
 // Copyright (c) .NET Foundation and Contributors
 // Portions Copyright (c) Microsoft Corporation.  All rights reserved.
 // See LICENSE file in the project root for full license information.
 //
+
 #include "Core.h"
-#include <nanoHAL.h>
 #include <nanoPAL_NativeDouble.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1102,8 +1102,21 @@ CLR_UINT32 CLR_RT_HeapBlock::GetHashCode(CLR_RT_HeapBlock *ptr, bool fRecurse, C
             break;
 
         case DATATYPE_R4:
-            crc = (CLR_INT32)ptr->NumericByRef().u8.LL;
+        {
+            // ensure that NaN and both zeros have the same hash code
+            int signBit = __signbitd(ptr->NumericByRef().r4);
+
+            if (__isnanf(ptr->NumericByRef().r4) || (signBit && ptr->NumericByRef().r4 == 0))
+            {
+                crc = (CLR_INT32)(ptr->NumericByRef().u8.LL & 0x7FFFFFFF);
+            }
+            else
+            {
+                crc = (CLR_INT32)ptr->NumericByRef().u8.LL;
+            }
+
             break;
+        }
 
         case DATATYPE_U8:
             crc = ((CLR_INT32)ptr->NumericByRef().u8.LL ^ (CLR_INT32)ptr->NumericByRef().u8.HH);
@@ -1114,8 +1127,20 @@ CLR_UINT32 CLR_RT_HeapBlock::GetHashCode(CLR_RT_HeapBlock *ptr, bool fRecurse, C
             break;
 
         case DATATYPE_R8:
-            crc = ((CLR_INT32)ptr->NumericByRef().r8.LL ^ (CLR_INT32)ptr->NumericByRef().r8.HH);
+        {
+            // ensure that NaN and both zeros have the same hash code
+            int signBit = __signbitd((double)ptr->NumericByRef().r8);
+
+            if (__isnand((double)ptr->NumericByRef().r8) || (signBit && (double)ptr->NumericByRef().r8 == 0))
+            {
+                crc = (CLR_INT32)(ptr->NumericByRef().r8.LL ^ ((CLR_INT32)ptr->NumericByRef().r8.HH & 0x7FFFFFFF));
+            }
+            else
+            {
+                crc = ((CLR_INT32)ptr->NumericByRef().r8.LL ^ (CLR_INT32)ptr->NumericByRef().r8.HH);
+            }
             break;
+        }
 
         case DATATYPE_CLASS:
         case DATATYPE_VALUETYPE:
@@ -1336,6 +1361,29 @@ bool CLR_RT_HeapBlock::ObjectsEqual(
             return Compare_Values(pArgLeft, pArgRight, false) == 0;
             break;
 
+        // edge cases, in .NET a NaN is equal to another NaN
+        // https://learn.microsoft.com/en-us/dotnet/fundamentals/runtime-libraries/system-double-equals?WT.mc_id=DT-MVP-5004179#nan
+        case DATATYPE_R4:
+            if (__isnanf(pArgLeft.NumericByRefConst().r4) && __isnanf(pArgRight.NumericByRefConst().r4))
+            {
+                return true;
+            }
+            else
+            {
+                return Compare_Values(pArgLeft, pArgRight, false) == 0;
+            }
+            break;
+        case DATATYPE_R8:
+            if (__isnand((double)pArgLeft.NumericByRefConst().r8) && __isnand((double)pArgRight.NumericByRefConst().r8))
+            {
+                return true;
+            }
+            else
+            {
+                return Compare_Values(pArgLeft, pArgRight, false) == 0;
+            }
+            break;
+
         case DATATYPE_BYREF:
             if (rightDataType == DATATYPE_OBJECT)
             {
@@ -1655,9 +1703,9 @@ CLR_INT32 CLR_RT_HeapBlock::Compare_Values(const CLR_RT_HeapBlock &left, const C
             case DATATYPE_R4:
 
                 // deal with special cases:
-                // return 0 if the numbers are unordered (either or both are NaN)
+                // return 1 if the numbers are unordered (either or both are NaN)
                 // this is post processed in interpreter so '1' will turn into '0'
-                if (__isnand(left.NumericByRefConst().r4) && __isnand(right.NumericByRefConst().r4))
+                if (__isnanf(left.NumericByRefConst().r4) || __isnanf(right.NumericByRefConst().r4))
                 {
                     return 1;
                 }
@@ -1688,7 +1736,7 @@ CLR_INT32 CLR_RT_HeapBlock::Compare_Values(const CLR_RT_HeapBlock &left, const C
             case DATATYPE_R8:
 
                 // deal with special cases:
-                // return 0 if the numbers are unordered (either or both are NaN)
+                // return 1 if the numbers are unordered (either or both are NaN)
                 // this is post processed in interpreter so '1' will turn into '0'
                 if (__isnand((double)left.NumericByRefConst().r8) || __isnand((double)right.NumericByRefConst().r8))
                 {
@@ -2471,19 +2519,24 @@ void CLR_RT_HeapBlock::Debug_CheckPointer() const
 void CLR_RT_HeapBlock::Debug_CheckPointer(void *ptr)
 {
     NATIVE_PROFILE_CLR_CORE();
-    switch ((size_t)ptr)
+
+    switch ((intptr_t)ptr)
     {
-        case 0xCFCFCFCF:
-        case 0xCBCBCBCB:
-        case 0xABABABAB:
-        case 0xADADADAD:
-        case 0xDFDFDFDF:
+        case SENTINEL_CLUSTER_INSERT:
+        case SENTINEL_CLEAR_BLOCK:
+        case SENTINEL_NODE_APPENDED:
+        case SENTINEL_NODE_EXTRACTED:
+        case SENTINEL_RECOVERED:
             NANOCLR_STOP();
             break;
     }
 }
 
-void CLR_RT_HeapBlock::Debug_ClearBlock(int data)
+#ifdef _WIN64
+void CLR_RT_HeapBlock::Debug_ClearBlock(CLR_UINT64 data)
+#else
+void CLR_RT_HeapBlock::Debug_ClearBlock(CLR_UINT32 data)
+#endif
 {
     NATIVE_PROFILE_CLR_CORE();
     CLR_UINT32 size = DataSize();
@@ -2492,19 +2545,25 @@ void CLR_RT_HeapBlock::Debug_ClearBlock(int data)
     {
         CLR_RT_HeapBlock_Raw *ptr = (CLR_RT_HeapBlock_Raw *)this;
         CLR_UINT32 raw1 = CLR_RT_HEAPBLOCK_RAW_ID(DATATYPE_OBJECT, 0, 1);
-        CLR_UINT32 raw2;
-
-        raw2 = data & 0xFF;
-        raw2 = raw2 | (raw2 << 8);
-        raw2 = raw2 | (raw2 << 16);
 
         while (--size)
         {
             ptr++;
 
             ptr->data[0] = raw1;
-            ptr->data[1] = raw2;
-            ptr->data[2] = raw2;
+
+#ifdef _WIN64
+            // need to cast this to CLR_UINT32 to avoid warning
+            // in the end these will be pointers so the size of the data type is irrelevant
+            ptr->data[1] = (CLR_UINT32)data;
+            ptr->data[2] = (CLR_UINT32)data;
+            ptr->data[3] = (CLR_UINT32)data;
+            ptr->data[4] = (CLR_UINT32)data;
+#else
+            ptr->data[1] = data;
+            ptr->data[2] = data;
+
+#endif
         }
     }
 }