Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into networkfusion/ci-improvements

Author: josesimoes

.gitignore

@@ -13,6 +13,7 @@
 
 # ignore any content inside the Interop assemblies folder
 InteropAssemblies/*
+!InteropAssemblies/CLR_IncludedAPI.h.in
 !InteropAssemblies/CLR_RT_InteropAssembliesTable.cpp.in
 !InteropAssemblies/README.md
 

.typo-ci.yml

@@ -118,6 +118,9 @@ macro(PerformSettingsForApiEntry apiNamespace)
     # list this option
     list(APPEND apiListing "${apiNamespace}")
 
+    # append to list of defines for Interop Assemblies include file
+    set(CLR_RT_NativeAssemblyPreprocessorDefines "${CLR_RT_NativeAssemblyPreprocessorDefines}\n#define API_${apiNamespaceWithoutDots}")
+
     # append to list of declaration for Interop Assemblies table
     list(APPEND CLR_RT_NativeAssemblyDataList "extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_${apiNamespaceWithoutDots};")
 
@@ -470,10 +473,14 @@ string(REPLACE ";" "\n    " CLR_RT_NativeAssemblyDataTableEntries "${CLR_RT_Nati
 list(LENGTH CLR_RT_NativeAssemblyDataTableEntriesList CLR_RT_NativeAssembliesCount)
 
 
+# configure header file with Interop Assemblies defines and...
+configure_file("${CMAKE_SOURCE_DIR}/InteropAssemblies/CLR_IncludedAPI.h.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/CLR_IncludedAPI.h" @ONLY)
+
 # configure code file with Interop Assemblies table and...
 configure_file("${CMAKE_SOURCE_DIR}/InteropAssemblies/CLR_RT_InteropAssembliesTable.cpp.in"
                 "${CMAKE_CURRENT_BINARY_DIR}/CLR_RT_InteropAssembliesTable.cpp" @ONLY)
-# ... now add Interop Assemblies table to ChibiOS nanoCLR sources list
+# ... now add Interop Assemblies table to nanoCLR sources list
 list(APPEND NF_NativeAssemblies_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/CLR_RT_InteropAssembliesTable.cpp")
 
 # create a .csv file with native assembly versions in the output directory

CMake/Modules/FindNF_NativeAssemblies.cmake

@@ -0,0 +1,15 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+// This file was automatically generated by a tool.                         //
+// Any changes you make here will be overwritten when it's generated again. //
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CLR_INCLUDEDAPI_H_
+#define _CLR_INCLUDEDAPI_H_
+@CLR_RT_NativeAssemblyPreprocessorDefines@
+
+#endif // _CLR_INCLUDEDAPI_H_

InteropAssemblies/CLR_IncludedAPI.h.in

@@ -1,6 +1,7 @@
 
-This folder contains the configuration file for the Assemblies Table collection.
+This folder contains a template for a header with preprocessor defines and
+for the configuration file for the Assemblies Table collection.
 
-It's a placeholder for the Interop assemblies source files.
-The source files for each Interop assembly should be placed in it's own folder.
+The latter is a placeholder for the Interop assemblies source files.
+The source files for each Interop assembly should be placed in its own folder.
 Anything inside this folder is ignored by an exception pattern in .gitignore file.

InteropAssemblies/README.md

@@ -13,16 +13,12 @@ trigger:
       - .clang-format
       - .github_changelog_generator
       - .gitignore
-      - .typo-ci.yml
       - build.ps1
       - CHANGELOG.md
-      - CMakeSettings.json
-      - CMakeSettings.SAMPLE.json
       - LICENSE.md
       - nf.props
       - nfcore.vssettings
-      - README.md
-      - README.zh-cn.md
+      - README*.md
       - RunCmd.bat
       - startocd.bat
       - .github/*

azure-pipelines.yml

@@ -3,32 +3,31 @@
 // Portions Copyright (c) Microsoft Corporation.  All rights reserved.
 // See LICENSE file in the project root for full license information.
 //
-#include "CorLib.h"
-
-//
-//  Generate a new GUID
-//
-//  Based on the version 4 GUID (random)
-//  http://guid.one/guid/make
 
+#include "CorLib.h"
 
-HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1( CLR_RT_StackFrame& stack )
+HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1(CLR_RT_StackFrame &stack)
 {
     NANOCLR_HEADER();
 
-    CLR_RT_Random       rand;
-    CLR_UINT8*          buf;
-    CLR_RT_HeapBlock&   top = stack.PushValueAndClear();
- 
+    CLR_RT_Random rand;
+    CLR_UINT8 *buf;
+    CLR_RT_HeapBlock &top = stack.PushValueAndClear();
+
     // Create a array of 16 bytes on top of stack to return
-    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance( top, 16, g_CLR_RT_WellKnownTypes.m_UInt8 ));
+    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, 16, g_CLR_RT_WellKnownTypes.m_UInt8));
     buf = top.DereferenceArray()->GetFirstElement();
 
     rand.Initialize();
-    rand.NextBytes(buf, 16);           // fill with random numbers
 
-    buf[7] =  (buf[7] & 0x0f) | 0x40;  // Set verion
-    buf[9] =  (buf[7] & 0x3f) | 0x80;  // Set variant
-    
+    // Generate 16 random bytes for the GUID
+    rand.NextBytes(buf, 16);
+
+    // Set the version (version 4, bits 12-15 of time_hi_and_version)
+    buf[7] = (buf[7] & 0x0F) | 0x40;
+
+    // Set the variant (the two most significant bits of clock_seq_hi_and_reserved must be 10)
+    buf[8] = (buf[8] & 0x3F) | 0x80;
+
     NANOCLR_NOCLEANUP();
 }

install-scripts/install-cmake.ps1

@@ -1,4 +1,4 @@
-//
+//
 // 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.
@@ -998,12 +998,12 @@ bool CLR_DBG_Debugger::Monitor_WriteMemory(WP_Message *msg)
 {
     NATIVE_PROFILE_CLR_DEBUGGER();
 
-    CLR_DBG_Commands_Monitor_WriteMemory *cmd = (CLR_DBG_Commands_Monitor_WriteMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_WriteMemory_Reply cmdReply;
+    auto *cmd = (CLR_DBG_Commands_Monitor_WriteMemory *)msg->m_payload;
+    CLR_DBG_Commands_Monitor_WriteMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
-    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &cmdReply);
+    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &errorCode);
 
-    WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, true, false, &errorCode, sizeof(errorCode));
 
     return true;
 }
@@ -1012,14 +1012,13 @@ bool CLR_DBG_Debugger::Monitor_CheckMemory(WP_Message *msg)
 {
     NATIVE_PROFILE_CLR_DEBUGGER();
 
-    CLR_DBG_Commands_Monitor_CheckMemory *cmd = (CLR_DBG_Commands_Monitor_CheckMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_CheckMemory_Reply cmdReply;
-    uint32_t errorCode;
+    auto *cmd = (CLR_DBG_Commands_Monitor_CheckMemory *)msg->m_payload;
+    CLR_DBG_Commands_Monitor_CheckMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
     g_CLR_DBG_Debugger
-        ->AccessMemory(cmd->address, cmd->length, (unsigned char *)&cmdReply, AccessMemory_Check, &errorCode);
+        ->AccessMemory(cmd->address, cmd->length, (unsigned char *)&errorCode, AccessMemory_Check, &errorCode);
 
-    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
 
     return true;
 }
@@ -1028,12 +1027,12 @@ bool CLR_DBG_Debugger::Monitor_EraseMemory(WP_Message *msg)
 {
     NATIVE_PROFILE_CLR_DEBUGGER();
 
-    CLR_DBG_Commands_Monitor_EraseMemory *cmd = (CLR_DBG_Commands_Monitor_EraseMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_EraseMemory_Reply cmdReply;
+    auto *cmd = (CLR_DBG_Commands_Monitor_EraseMemory *)msg->m_payload;
+    CLR_DBG_Commands_Monitor_EraseMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
-    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, NULL, AccessMemory_Erase, &cmdReply);
+    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, NULL, AccessMemory_Erase, &errorCode);
 
-    WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, true, false, &errorCode, sizeof(errorCode));
 
     return true;
 }