Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Runtime.Native assembly #1651

Merged
merged 1 commit into from
Jun 1, 2020
Merged

Update Runtime.Native assembly #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/Modules/FindNF_CoreCLR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ set(NF_CoreCLR_SRCS
# Runtime.Native
nf_rt_native.cpp
nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp
nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp
nf_rt_native_nanoFramework_Runtime_Native_Power.cpp
nf_rt_native_nanoFramework_Runtime_Native_Rtc_stubs.cpp
Expand Down
8 changes: 4 additions & 4 deletions src/nanoFramework.Runtime.Native/nf_rt_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
static const CLR_RT_MethodHandler method_lookup[] =
{
NULL,
Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4__BOOLEAN,
Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::EnableGCMessages___STATIC__VOID__BOOLEAN,
Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint::Install___STATIC__VOID__I4__I4,
Library_nf_rt_native_nanoFramework_Runtime_Native_GC::Run___STATIC__U4__BOOLEAN,
Library_nf_rt_native_nanoFramework_Runtime_Native_GC::EnableGCMessages___STATIC__VOID__BOOLEAN,
NULL,
NULL,
NULL,
Expand Down Expand Up @@ -40,7 +40,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
{
"nanoFramework.Runtime.Native",
0xE79F9BC2,
0x2307A8F3,
method_lookup,
{ 100, 0, 7, 0 }
{ 100, 0, 8, 0 }
};
12 changes: 6 additions & 6 deletions src/nanoFramework.Runtime.Native/nf_rt_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ enum FloatingPoint
FloatingPoint_DoublePrecisionHardware = 4,
};

struct Library_nf_rt_native_nanoFramework_Runtime_Native_Debug
struct Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint
{
NANOCLR_NATIVE_DECLARE(GC___STATIC__U4__BOOLEAN);
NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);
NANOCLR_NATIVE_DECLARE(Install___STATIC__VOID__I4__I4);

//--//

};

struct Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint
struct Library_nf_rt_native_nanoFramework_Runtime_Native_GC
{
NANOCLR_NATIVE_DECLARE(Install___STATIC__VOID__I4__I4);
NANOCLR_NATIVE_DECLARE(Run___STATIC__U4__BOOLEAN);
NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);

//--//

};

struct Library_nf_rt_native_nanoFramework_Runtime_Native_Power
{
static const int FIELD_STATIC__OnRebootEvent = 0;
Expand Down
4 changes: 2 additions & 2 deletions ...ve_nanoFramework_Runtime_Native_Debug.cpp → ...ative_nanoFramework_Runtime_Native_GC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@



HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4__BOOLEAN( CLR_RT_StackFrame& stack )
HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_GC::Run___STATIC__U4__BOOLEAN( CLR_RT_StackFrame& stack )
{
NATIVE_PROFILE_CLR_CORE();

Expand Down Expand Up @@ -37,7 +37,7 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4
NANOCLR_NOCLEANUP_NOLABEL();
}

HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::EnableGCMessages___STATIC__VOID__BOOLEAN( CLR_RT_StackFrame& stack )
HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_GC::EnableGCMessages___STATIC__VOID__BOOLEAN( CLR_RT_StackFrame& stack )
{
NATIVE_PROFILE_CLR_CORE();

Expand Down