Update Runtime.Native (#3028)

Author: josesimoes

src/CLR/Core/Execution.cpp

@@ -294,19 +294,25 @@ HRESULT CLR_RT_ExecutionEngine::StartHardware()
     NANOCLR_NOCLEANUP();
 }
 
-void CLR_RT_ExecutionEngine::Reboot(bool fHard)
+void CLR_RT_ExecutionEngine::Reboot(uint16_t rebootOptions)
 {
     NATIVE_PROFILE_CLR_CORE();
 
-    if (fHard)
+    if (CLR_DBG_Commands::Monitor_Reboot::c_EnterNanoBooter ==
+        (rebootOptions & CLR_DBG_Commands::Monitor_Reboot::c_EnterNanoBooter))
     {
-        ::CPU_Reset();
+        RequestToLaunchNanoBooter(0);
     }
-    else
+    else if (
+        CLR_DBG_Commands::Monitor_Reboot::c_EnterProprietaryBooter ==
+        (rebootOptions & CLR_DBG_Commands::Monitor_Reboot::c_EnterProprietaryBooter))
     {
-        CLR_EE_REBOOT_CLR;
-        CLR_EE_DBG_SET(RebootPending);
+        RequestToLaunchProprietaryBootloader();
     }
+
+    // apply reboot options and set reboot pending flag
+    g_CLR_RT_ExecutionEngine.m_iReboot_Options = rebootOptions;
+    CLR_EE_DBG_SET(RebootPending);
 }
 
 CLR_INT64 CLR_RT_ExecutionEngine::GetUptime()

src/CLR/Include/nanoCLR_Debugging.h

@@ -52,6 +52,7 @@ struct CLR_DBG_Commands
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // !!! KEEP IN SYNC WITH nanoFramework.Tools.Debugger.WireProtocol.RebootOptions (in managed code) !!! //
+    // !!! KEEP IN SYNC WITH nanoFramework.Runtime.Native.WireProtocol.RebootOption  (in managed code) !!! //
     // CONSTANTS VALUES NEED TO BE 'FLAG' TYPE                                                             //
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     struct Monitor_Reboot

src/CLR/Include/nanoCLR_Runtime.h

@@ -3688,7 +3688,7 @@ struct CLR_RT_ExecutionEngine
 
     HRESULT StartHardware();
 
-    static void Reboot(bool fHard);
+    static void Reboot(uint16_t rebootOptions);
 
     void JoinAllThreadsAndExecuteFinalizer();
 

src/nanoFramework.Runtime.Native/nf_rt_native.cpp

@@ -19,7 +19,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    Library_nf_rt_native_nanoFramework_Runtime_Native_Power::NativeReboot___STATIC__VOID,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_Power::NativeReboot___STATIC__VOID__nanoFrameworkRuntimeNativeRebootOption,
     NULL,
     NULL,
     NULL,
@@ -42,9 +42,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
 {
     "nanoFramework.Runtime.Native",
-    0x109F6F22,
+    0x0EAE898B,
     method_lookup,
-    { 100, 0, 9, 0 }
+    { 100, 0, 10, 0 }
 };
 
 // clang-format on

src/nanoFramework.Runtime.Native/nf_rt_native.h

@@ -10,6 +10,14 @@
 #include <nanoCLR_Interop.h>
 #include <nanoCLR_Runtime.h>
 
+typedef enum __nfpack RebootOption
+{
+    RebootOption_NormalReboot = 0,
+    RebootOption_EnterNanoBooter = 1,
+    RebootOption_ClrOnly = 2,
+    RebootOption_EnterProprietaryBooter = 8,
+} RebootOption;
+
 typedef enum __nfpack SystemInfo_FloatingPoint
 {
     SystemInfo_FloatingPoint_None = 0,
@@ -38,7 +46,7 @@ struct Library_nf_rt_native_nanoFramework_Runtime_Native_Power
 {
     static const int FIELD_STATIC__OnRebootEvent = 0;
 
-    NANOCLR_NATIVE_DECLARE(NativeReboot___STATIC__VOID);
+    NANOCLR_NATIVE_DECLARE(NativeReboot___STATIC__VOID__nanoFrameworkRuntimeNativeRebootOption);
 
     //--//
 };

src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_Power.cpp

@@ -3,16 +3,17 @@
 // See LICENSE file in the project root for full license information.
 //
 
-
 #include "nf_rt_native.h"
+#include <nanoCLR_Debugging.h>
 
-HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Power::NativeReboot___STATIC__VOID( CLR_RT_StackFrame& stack )
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Power::
+    NativeReboot___STATIC__VOID__nanoFrameworkRuntimeNativeRebootOption(CLR_RT_StackFrame &stack)
 {
-    (void)stack;
-
     NANOCLR_HEADER();
-    {
-        g_CLR_RT_ExecutionEngine.Reboot(true);
-    }
+
+    RebootOption rebootOption = (RebootOption)stack.Arg0().NumericByRef().u4;
+
+    g_CLR_RT_ExecutionEngine.Reboot(rebootOption);
+
     NANOCLR_NOCLEANUP_NOLABEL();
 }