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.

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 and implementation #1381

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/CLR/Runtime.Native/nf_rt_native.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Model___STATIC__U1,
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_SKU___STATIC__U2,
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_TargetName___STATIC__STRING,
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING,
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Platform___STATIC__STRING,
NULL,
Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::GetNativeFloatingPointSupport___STATIC__U1,
NULL,
Expand Down Expand Up @@ -48,7 +48,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
{
"nanoFramework.Runtime.Native",
0x783D119F,
0x1639FF83,
method_lookup,
{ 1, 0, 5, 0 }
};
2 changes: 1 addition & 1 deletion src/CLR/Runtime.Native/nf_rt_native.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo
NANOCLR_NATIVE_DECLARE(get_Model___STATIC__U1);
NANOCLR_NATIVE_DECLARE(get_SKU___STATIC__U2);
NANOCLR_NATIVE_DECLARE(get_TargetName___STATIC__STRING);
NANOCLR_NATIVE_DECLARE(get_PlatformName___STATIC__STRING);
NANOCLR_NATIVE_DECLARE(get_Platform___STATIC__STRING);
NANOCLR_NATIVE_DECLARE(GetNativeFloatingPointSupport___STATIC__U1);

//--//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,23 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Target

Target_GetReleaseInfo( releaseInfo );

NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.InfoString ));
NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.TargetName ));

NANOCLR_NOCLEANUP();
}

HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING( CLR_RT_StackFrame& stack )
HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Platform___STATIC__STRING( CLR_RT_StackFrame& stack )
{
NATIVE_PROFILE_CLR_CORE();

NANOCLR_HEADER();

NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub());

NFReleaseInfo releaseInfo;

Target_GetReleaseInfo( releaseInfo );

NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.PlatformName ));

NANOCLR_NOCLEANUP();
}
Expand Down