Skip to content

Commit ff9fec1

Browse files
josesimoesjosesimoes
committed
Merge branch 'update-gc-api' into generics-wip
2 parents 12be03b + b62eb84 commit ff9fec1

File tree

10 files changed

+88
-102
lines changed

10 files changed

+88
-102
lines changed

‎CMake/Modules/FindNF_CoreCLR.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ set(NF_CoreCLR_SRCS
130130
# Runtime.Native
131131
nf_rt_native.cpp
132132
nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
133-
nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
134133
nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp
135134
nf_rt_native_nanoFramework_Runtime_Native_Power.cpp
136135
nf_rt_native_nanoFramework_Runtime_Native_Rtc_stubs.cpp

‎src/CLR/CorLib/corlib_native.cpp‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,18 @@ static const CLR_RT_MethodHandler method_lookup[] =
549549
nullptr,
550550
nullptr,
551551
nullptr,
552-
Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN,
553552
nullptr,
554-
Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT,
553+
nullptr,
554+
nullptr,
555+
nullptr,
556+
Library_corlib_native_System_GC::EnableGCMessages___STATIC__VOID__BOOLEAN,
557+
nullptr,
555558
Library_corlib_native_System_GC::ReRegisterForFinalize___STATIC__VOID__OBJECT,
559+
nullptr,
560+
Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT,
561+
nullptr,
562+
Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN,
563+
Library_corlib_native_System_GC::Run___STATIC__U4__BOOLEAN,
556564
Library_corlib_native_System_Globalization_DateTimeFormat::FormatDigits___STATIC__STRING__I4__I4,
557565
nullptr,
558566
nullptr,
@@ -794,10 +802,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
794802
nullptr,
795803
nullptr,
796804
nullptr,
797-
nullptr,
798-
nullptr,
799-
nullptr,
800-
nullptr,
801805
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
802806
nullptr,
803807
nullptr,
@@ -1282,10 +1286,18 @@ static const CLR_RT_MethodHandler method_lookup[] =
12821286
nullptr,
12831287
nullptr,
12841288
nullptr,
1285-
Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN,
12861289
nullptr,
1287-
Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT,
1290+
nullptr,
1291+
nullptr,
1292+
nullptr,
1293+
Library_corlib_native_System_GC::EnableGCMessages___STATIC__VOID__BOOLEAN,
1294+
nullptr,
12881295
Library_corlib_native_System_GC::ReRegisterForFinalize___STATIC__VOID__OBJECT,
1296+
nullptr,
1297+
Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT,
1298+
nullptr,
1299+
Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN,
1300+
Library_corlib_native_System_GC::Run___STATIC__U4__BOOLEAN,
12891301
Library_corlib_native_System_Globalization_DateTimeFormat::FormatDigits___STATIC__STRING__I4__I4,
12901302
nullptr,
12911303
nullptr,
@@ -1466,10 +1478,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
14661478
nullptr,
14671479
nullptr,
14681480
nullptr,
1469-
nullptr,
1470-
nullptr,
1471-
nullptr,
1472-
nullptr,
14731481
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
14741482
nullptr,
14751483
nullptr,
@@ -1497,11 +1505,12 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
14971505

14981506
#if (NANOCLR_REFLECTION == TRUE)
14991507

1500-
0x9D7386C1,
1508+
0xB069B85F,
15011509

15021510
#elif (NANOCLR_REFLECTION == FALSE)
15031511

1504-
0x98F2AA82,
1512+
0x14A216A1,
1513+
,
15051514

15061515
#else
15071516
#error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options."

‎src/CLR/CorLib/corlib_native.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,11 @@ struct Library_corlib_native_System_EventArgs
595595

596596
struct Library_corlib_native_System_GC
597597
{
598-
NANOCLR_NATIVE_DECLARE(AnyPendingFinalizers___STATIC__BOOLEAN);
599-
NANOCLR_NATIVE_DECLARE(SuppressFinalize___STATIC__VOID__OBJECT);
598+
NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);
600599
NANOCLR_NATIVE_DECLARE(ReRegisterForFinalize___STATIC__VOID__OBJECT);
600+
NANOCLR_NATIVE_DECLARE(SuppressFinalize___STATIC__VOID__OBJECT);
601+
NANOCLR_NATIVE_DECLARE(AnyPendingFinalizers___STATIC__BOOLEAN);
602+
NANOCLR_NATIVE_DECLARE(Run___STATIC__U4__BOOLEAN);
601603

602604
//--//
603605
};

‎src/CLR/CorLib/corlib_native_System_GC.cpp‎

Lines changed: 57 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,97 @@
1-
//
1+
//
22
// Copyright (c) .NET Foundation and Contributors
33
// Portions Copyright (c) Microsoft Corporation. All rights reserved.
44
// See LICENSE file in the project root for full license information.
55
//
66
#include "CorLib.h"
77

8-
HRESULT Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN(CLR_RT_StackFrame &stack)
8+
HRESULT Library_corlib_native_System_GC::EnableGCMessages___STATIC__VOID__BOOLEAN(CLR_RT_StackFrame &stack)
99
{
1010
NATIVE_PROFILE_CLR_CORE();
11+
1112
NANOCLR_HEADER();
1213

13-
stack.SetResult_Boolean(
14-
g_CLR_RT_ExecutionEngine.m_finalizersPending.IsEmpty() == false ||
15-
(g_CLR_RT_ExecutionEngine.m_finalizerThread != nullptr &&
16-
!g_CLR_RT_ExecutionEngine.m_finalizerThread->CanThreadBeReused()));
14+
#if defined(NANOCLR_TRACE_MEMORY_STATS)
15+
s_CLR_RT_fTrace_MemoryStats = stack.Arg0().NumericByRefConst().u1 != 0 ? c_CLR_RT_Trace_Info : c_CLR_RT_Trace_None;
16+
#else
17+
(void)stack;
18+
#endif
1719

1820
NANOCLR_NOCLEANUP_NOLABEL();
1921
}
2022

21-
HRESULT Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT(CLR_RT_StackFrame &stack)
23+
HRESULT Library_corlib_native_System_GC::ReRegisterForFinalize___STATIC__VOID__OBJECT(CLR_RT_StackFrame &stack)
2224
{
2325
NATIVE_PROFILE_CLR_CORE();
2426
NANOCLR_HEADER();
2527

28+
CLR_RT_TypeDescriptor desc{};
2629
CLR_RT_HeapBlock *pObj = stack.Arg0().Dereference();
2730
FAULT_ON_NULL(pObj);
2831

2932
CLR_RT_HeapBlock_Finalizer::SuppressFinalize(pObj);
3033

34+
NANOCLR_CHECK_HRESULT(desc.InitializeFromObject(stack.Arg0()));
35+
36+
if (desc.m_handlerCls.HasFinalizer())
37+
{
38+
NANOCLR_CHECK_HRESULT(
39+
CLR_RT_HeapBlock_Finalizer::CreateInstance(stack.Arg0().Dereference(), desc.m_handlerCls));
40+
}
41+
3142
NANOCLR_NOCLEANUP();
3243
}
3344

34-
HRESULT Library_corlib_native_System_GC::ReRegisterForFinalize___STATIC__VOID__OBJECT(CLR_RT_StackFrame &stack)
45+
HRESULT Library_corlib_native_System_GC::SuppressFinalize___STATIC__VOID__OBJECT(CLR_RT_StackFrame &stack)
3546
{
3647
NATIVE_PROFILE_CLR_CORE();
3748
NANOCLR_HEADER();
3849

39-
CLR_RT_TypeDescriptor desc{};
4050
CLR_RT_HeapBlock *pObj = stack.Arg0().Dereference();
4151
FAULT_ON_NULL(pObj);
4252

4353
CLR_RT_HeapBlock_Finalizer::SuppressFinalize(pObj);
4454

45-
NANOCLR_CHECK_HRESULT(desc.InitializeFromObject(stack.Arg0()));
55+
NANOCLR_NOCLEANUP();
56+
}
4657

47-
if (desc.m_handlerCls.HasFinalizer())
58+
HRESULT Library_corlib_native_System_GC::AnyPendingFinalizers___STATIC__BOOLEAN(CLR_RT_StackFrame &stack)
59+
{
60+
NATIVE_PROFILE_CLR_CORE();
61+
NANOCLR_HEADER();
62+
63+
stack.SetResult_Boolean(
64+
g_CLR_RT_ExecutionEngine.m_finalizersPending.IsEmpty() == false ||
65+
(g_CLR_RT_ExecutionEngine.m_finalizerThread != nullptr &&
66+
!g_CLR_RT_ExecutionEngine.m_finalizerThread->CanThreadBeReused()));
67+
68+
NANOCLR_NOCLEANUP_NOLABEL();
69+
}
70+
71+
HRESULT Library_corlib_native_System_GC::Run___STATIC__U4__BOOLEAN(CLR_RT_StackFrame &stack)
72+
{
73+
NATIVE_PROFILE_CLR_CORE();
74+
75+
NANOCLR_HEADER();
76+
77+
#if defined(NANOCLR_GC_VERBOSE)
78+
if (s_CLR_RT_fTrace_GC >= c_CLR_RT_Trace_Info)
4879
{
49-
NANOCLR_CHECK_HRESULT(
50-
CLR_RT_HeapBlock_Finalizer::CreateInstance(stack.Arg0().Dereference(), desc.m_handlerCls));
80+
CLR_Debug::Printf(" Memory: Debug.GC.\r\n");
5181
}
82+
#endif
5283

53-
NANOCLR_NOCLEANUP();
84+
stack.SetResult_I4(g_CLR_RT_ExecutionEngine.PerformGarbageCollection());
85+
86+
if (stack.Arg0().NumericByRefConst().u1)
87+
{
88+
//
89+
// Decrement the number of GC, otherwise the outer loop may request another compaction.
90+
//
91+
g_CLR_RT_GarbageCollector.m_numberOfGarbageCollections--;
92+
93+
g_CLR_RT_ExecutionEngine.PerformHeapCompaction();
94+
}
95+
96+
NANOCLR_NOCLEANUP_NOLABEL();
5497
}

‎src/CLR/Core/GarbageCollector.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ CLR_UINT32 CLR_RT_GarbageCollector::ExecuteGarbageCollection()
294294
g_CLR_PRF_Profiler.RecordGarbageCollectionEnd();
295295
#endif
296296

297-
return m_freeBytes;
297+
return m_totalBytes - m_freeBytes;
298298
}
299299

300300
//--//

‎src/nanoFramework.Runtime.Native/Runtime.Native.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<ItemGroup>
2222
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp" />
2323
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp" />
24-
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_GC.cpp" />
2524
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_Power.cpp" />
2625
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_Rtc_stubs.cpp" />
2726
<ClCompile Include="nf_rt_native_System_Environment.cpp" />

‎src/nanoFramework.Runtime.Native/Runtime.Native.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp">
2727
<Filter>Source Files</Filter>
2828
</ClCompile>
29-
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_GC.cpp">
30-
<Filter>Source Files</Filter>
31-
</ClCompile>
3229
<ClCompile Include="nf_rt_native_nanoFramework_Runtime_Native_Power.cpp">
3330
<Filter>Source Files</Filter>
3431
</ClCompile>

‎src/nanoFramework.Runtime.Native/nf_rt_native.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
1212
{
1313
nullptr,
1414
Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint::Install___STATIC__VOID__I4__I4,
15-
Library_nf_rt_native_nanoFramework_Runtime_Native_GC::Run___STATIC__U4__BOOLEAN,
16-
Library_nf_rt_native_nanoFramework_Runtime_Native_GC::EnableGCMessages___STATIC__VOID__BOOLEAN,
1715
nullptr,
1816
nullptr,
1917
nullptr,
@@ -42,9 +40,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
4240
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
4341
{
4442
"nanoFramework.Runtime.Native",
45-
0x0EAE898B,
43+
0xAD1ECE38,
4644
method_lookup,
47-
{ 100, 0, 10, 0 }
45+
{ 100, 0, 11, 0 }
4846
};
4947

5048
// clang-format on

‎src/nanoFramework.Runtime.Native/nf_rt_native.h‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//
1+
//
22
// Copyright (c) .NET Foundation and Contributors
33
// Portions Copyright (c) Microsoft Corporation. All rights reserved.
44
// See LICENSE file in the project root for full license information.
@@ -34,14 +34,6 @@ struct Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint
3434
//--//
3535
};
3636

37-
struct Library_nf_rt_native_nanoFramework_Runtime_Native_GC
38-
{
39-
NANOCLR_NATIVE_DECLARE(Run___STATIC__U4__BOOLEAN);
40-
NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);
41-
42-
//--//
43-
};
44-
4537
struct Library_nf_rt_native_nanoFramework_Runtime_Native_Power
4638
{
4739
static const int FIELD_STATIC__OnRebootEvent = 0;

‎src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_GC.cpp‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)