Skip to content

Commit 1d18fa1

Browse files
josesimoesjosesimoes
committed
Fix declarations
1 parent f48da5a commit 1d18fa1

File tree

2 files changed

+66
-73
lines changed

2 files changed

+66
-73
lines changed

‎src/CLR/CorLib/corlib_native.cpp‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
221221
nullptr,
222222
nullptr,
223223
nullptr,
224+
nullptr,
225+
nullptr,
226+
nullptr,
227+
nullptr,
228+
nullptr,
229+
nullptr,
230+
nullptr,
224231
Library_corlib_native_System_Array::System_Collections_IList_get_Item___OBJECT__I4,
225232
Library_corlib_native_System_Array::System_Collections_IList_set_Item___VOID__I4__OBJECT,
226233
nullptr,
@@ -435,8 +442,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
435442
nullptr,
436443
Library_corlib_native_System_DateTime::DaysInMonth___STATIC__I4__I4__I4,
437444
nullptr,
438-
Library_corlib_native_System_DateTime::get_UtcNow___STATIC__SystemDateTime,
439-
Library_corlib_native_System_DateTime::get_Today___STATIC__SystemDateTime,
440445
nullptr,
441446
nullptr,
442447
nullptr,
@@ -450,9 +455,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
450455
nullptr,
451456
nullptr,
452457
nullptr,
458+
nullptr,
459+
Library_corlib_native_System_DateTime::GetUtcNowAsTicks___STATIC__I8,
460+
Library_corlib_native_System_DateTime::GetTodayAsTicks___STATIC__I8,
461+
nullptr,
453462
Library_corlib_native_System_Convert::NativeToInt64___STATIC__I8__STRING__BOOLEAN__I8__I8__I4__BOOLEAN__BYREF_BOOLEAN,
454463
Library_corlib_native_System_Convert::NativeToDouble___STATIC__R8__STRING__BOOLEAN__BYREF_BOOLEAN,
455-
Library_corlib_native_System_Convert::NativeToDateTime___STATIC__SystemDateTime__STRING__BOOLEAN__BYREF_BOOLEAN,
464+
Library_corlib_native_System_Convert::NativeToDateTime___STATIC__VOID__STRING__BOOLEAN__BYREF_BOOLEAN__BYREF_SystemDateTime,
456465
nullptr,
457466
nullptr,
458467
nullptr,
@@ -496,8 +505,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
496505
nullptr,
497506
nullptr,
498507
nullptr,
499-
nullptr,
500-
nullptr,
501508
Library_corlib_native_System_Reflection_Assembly::get_FullName___STRING,
502509
Library_corlib_native_System_Reflection_Assembly::GetType___SystemType__STRING,
503510
nullptr,
@@ -567,11 +574,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
567574
nullptr,
568575
nullptr,
569576
nullptr,
570-
nullptr,
571-
nullptr,
572-
nullptr,
573-
nullptr,
574-
nullptr,
575577
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
576578
nullptr,
577579
nullptr,
@@ -678,6 +680,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
678680
nullptr,
679681
nullptr,
680682
nullptr,
683+
nullptr,
681684
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
682685
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
683686
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -791,6 +794,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
791794
nullptr,
792795
nullptr,
793796
nullptr,
797+
nullptr,
798+
nullptr,
799+
nullptr,
800+
nullptr,
794801
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
795802
nullptr,
796803
nullptr,
@@ -973,6 +980,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
973980
nullptr,
974981
nullptr,
975982
nullptr,
983+
nullptr,
984+
nullptr,
985+
nullptr,
986+
nullptr,
987+
nullptr,
988+
nullptr,
989+
nullptr,
976990
Library_corlib_native_System_Array::System_Collections_IList_get_Item___OBJECT__I4,
977991
Library_corlib_native_System_Array::System_Collections_IList_set_Item___VOID__I4__OBJECT,
978992
nullptr,
@@ -1184,8 +1198,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
11841198
nullptr,
11851199
Library_corlib_native_System_DateTime::DaysInMonth___STATIC__I4__I4__I4,
11861200
nullptr,
1187-
Library_corlib_native_System_DateTime::get_UtcNow___STATIC__SystemDateTime,
1188-
Library_corlib_native_System_DateTime::get_Today___STATIC__SystemDateTime,
11891201
nullptr,
11901202
nullptr,
11911203
nullptr,
@@ -1199,9 +1211,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
11991211
nullptr,
12001212
nullptr,
12011213
nullptr,
1214+
nullptr,
1215+
Library_corlib_native_System_DateTime::GetUtcNowAsTicks___STATIC__I8,
1216+
Library_corlib_native_System_DateTime::GetTodayAsTicks___STATIC__I8,
1217+
nullptr,
12021218
Library_corlib_native_System_Convert::NativeToInt64___STATIC__I8__STRING__BOOLEAN__I8__I8__I4__BOOLEAN__BYREF_BOOLEAN,
12031219
Library_corlib_native_System_Convert::NativeToDouble___STATIC__R8__STRING__BOOLEAN__BYREF_BOOLEAN,
1204-
Library_corlib_native_System_Convert::NativeToDateTime___STATIC__SystemDateTime__STRING__BOOLEAN__BYREF_BOOLEAN,
1220+
Library_corlib_native_System_Convert::NativeToDateTime___STATIC__VOID__STRING__BOOLEAN__BYREF_BOOLEAN__BYREF_SystemDateTime,
12051221
nullptr,
12061222
nullptr,
12071223
nullptr,
@@ -1239,8 +1255,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
12391255
Library_corlib_native_System_Diagnostics_Debugger::get_IsAttached___STATIC__BOOLEAN,
12401256
Library_corlib_native_System_Diagnostics_Debugger::Break___STATIC__VOID,
12411257
nullptr,
1242-
nullptr,
1243-
nullptr,
12441258
Library_corlib_native_System_Enum::HasFlag___BOOLEAN__SystemEnum,
12451259
nullptr,
12461260
nullptr,
@@ -1293,13 +1307,12 @@ static const CLR_RT_MethodHandler method_lookup[] =
12931307
nullptr,
12941308
nullptr,
12951309
nullptr,
1310+
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
12961311
nullptr,
12971312
nullptr,
12981313
nullptr,
12991314
nullptr,
13001315
nullptr,
1301-
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
1302-
nullptr,
13031316
nullptr,
13041317
nullptr,
13051318
nullptr,
@@ -1315,15 +1328,11 @@ static const CLR_RT_MethodHandler method_lookup[] =
13151328
nullptr,
13161329
nullptr,
13171330
nullptr,
1331+
Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4,
13181332
nullptr,
13191333
nullptr,
13201334
nullptr,
13211335
nullptr,
1322-
Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4,
1323-
NULL,
1324-
NULL,
1325-
NULL,
1326-
NULL,
13271336
Library_corlib_native_System_MulticastDelegate::op_Equality___STATIC__BOOLEAN__SystemMulticastDelegate__SystemMulticastDelegate,
13281337
Library_corlib_native_System_MulticastDelegate::op_Inequality___STATIC__BOOLEAN__SystemMulticastDelegate__SystemMulticastDelegate,
13291338
nullptr,
@@ -1356,6 +1365,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
13561365
nullptr,
13571366
nullptr,
13581367
nullptr,
1368+
nullptr,
13591369
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
13601370
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
13611371
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -1456,6 +1466,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
14561466
nullptr,
14571467
nullptr,
14581468
nullptr,
1469+
nullptr,
1470+
nullptr,
1471+
nullptr,
1472+
nullptr,
14591473
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
14601474
nullptr,
14611475
nullptr,
@@ -1483,11 +1497,11 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
14831497

14841498
#if (NANOCLR_REFLECTION == TRUE)
14851499

1486-
0x544772A9,
1500+
0x9D7386C1,
14871501

14881502
#elif (NANOCLR_REFLECTION == FALSE)
14891503

1490-
0xE3A4B52F,
1504+
0x98F2AA82,
14911505

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

‎src/CLR/CorLib/corlib_native.h‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,22 @@ struct Library_corlib_native_System_Exception
322322

323323
struct Library_corlib_native_System_ArgumentException
324324
{
325+
static const int FIELD_STATIC__Arg_ArgumentException = 3;
326+
static const int FIELD_STATIC__Arg_ParamName_Name = 4;
327+
static const int FIELD_STATIC__Argument_EmptyString = 5;
328+
325329
static const int FIELD___paramName = 5;
326330

327331
//--//
328332
};
329333

334+
struct Library_corlib_native_System_ArgumentNullException
335+
{
336+
static const int FIELD_STATIC__ArgumentNull_Generic = 6;
337+
338+
//--//
339+
};
340+
330341
struct Library_corlib_native_System_Array
331342
{
332343
NANOCLR_NATIVE_DECLARE(System_Collections_IList_get_Item___OBJECT__I4);
@@ -427,16 +438,8 @@ struct Library_corlib_native_System_Collections_ArrayList
427438
//--//
428439
};
429440

430-
struct Library_corlib_native_System_ComponentModel_EditorBrowsableState
431-
{
432-
433-
static const int FIELD__value__ = 1;
434-
435-
//--//
436-
};
437441
struct Library_corlib_native_System_Double
438442
{
439-
440443
static const int FIELD__m_value = 1;
441444

442445
NANOCLR_NATIVE_DECLARE(CompareTo___STATIC__I4__R8__R8);
@@ -450,9 +453,9 @@ struct Library_corlib_native_System_Double
450453

451454
struct Library_corlib_native_System_TimeSpan
452455
{
453-
static const int FIELD_STATIC__Zero = 3;
454-
static const int FIELD_STATIC__MaxValue = 4;
455-
static const int FIELD_STATIC__MinValue = 5;
456+
static const int FIELD_STATIC__Zero = 7;
457+
static const int FIELD_STATIC__MaxValue = 8;
458+
static const int FIELD_STATIC__MinValue = 9;
456459

457460
static const int FIELD___ticks = 1;
458461

@@ -481,9 +484,9 @@ struct Library_corlib_native_System_TimeSpan
481484

482485
struct Library_corlib_native_System_DateTime
483486
{
484-
static const int FIELD_STATIC__MinValue = 6;
485-
static const int FIELD_STATIC__MaxValue = 7;
486-
static const int FIELD_STATIC__UnixEpoch = 8;
487+
static const int FIELD_STATIC__MinValue = 10;
488+
static const int FIELD_STATIC__MaxValue = 11;
489+
static const int FIELD_STATIC__UnixEpoch = 12;
487490

488491
static const int FIELD___ticks = 1;
489492

@@ -551,13 +554,6 @@ struct Library_corlib_native_System_Diagnostics_Debugger
551554
//--//
552555
};
553556

554-
struct Library_corlib_native_System_Diagnostics_DebuggerBrowsableAttribute
555-
{
556-
static const int FIELD___state = 1;
557-
558-
//--//
559-
};
560-
561557
struct Library_corlib_native_System_UInt16
562558
{
563559
static const int FIELD__m_value = 1;
@@ -592,7 +588,7 @@ struct Library_corlib_native_System_Enum
592588

593589
struct Library_corlib_native_System_EventArgs
594590
{
595-
static const int FIELD_STATIC__Empty = 9;
591+
static const int FIELD_STATIC__Empty = 13;
596592

597593
//--//
598594
};
@@ -613,13 +609,6 @@ struct Library_corlib_native_System_Globalization_DateTimeFormat
613609
//--//
614610
};
615611

616-
struct Library_corlib_native_System_UInt32
617-
{
618-
static const int FIELD__m_value = 1;
619-
620-
//--//
621-
};
622-
623612
struct Library_corlib_native_System_Int16
624613
{
625614
static const int FIELD__m_value = 1;
@@ -629,19 +618,9 @@ struct Library_corlib_native_System_Int16
629618

630619
struct Library_corlib_native_System_Guid
631620
{
632-
static const int FIELD_STATIC__Empty = 10;
621+
static const int FIELD_STATIC__Empty = 14;
633622

634-
static const int FIELD___a = 1;
635-
static const int FIELD___b = 2;
636-
static const int FIELD___c = 3;
637-
static const int FIELD___d = 4;
638-
static const int FIELD___e = 5;
639-
static const int FIELD___f = 6;
640-
static const int FIELD___g = 7;
641-
static const int FIELD___h = 8;
642-
static const int FIELD___i = 9;
643-
static const int FIELD___j = 10;
644-
static const int FIELD___k = 11;
623+
static const int FIELD___data = 1;
645624

646625
NANOCLR_NATIVE_DECLARE(GenerateNewGuid___STATIC__SZARRAY_U1);
647626

@@ -809,13 +788,6 @@ struct Library_corlib_native_System_Reflection_RuntimeMethodInfo
809788
//--//
810789
};
811790

812-
struct Library_corlib_native_System_Runtime_CompilerServices_AccessedThroughPropertyAttribute
813-
{
814-
static const int FIELD___propertyName = 1;
815-
816-
//--//
817-
};
818-
819791
struct Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers
820792
{
821793
NANOCLR_NATIVE_DECLARE(InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle);
@@ -980,7 +952,7 @@ struct Library_corlib_native_System_Threading_Thread
980952

981953
struct Library_corlib_native_System_Threading_Timeout
982954
{
983-
static const int FIELD_STATIC__InfiniteTimeSpan = 11;
955+
static const int FIELD_STATIC__InfiniteTimeSpan = 15;
984956

985957
//--//
986958
};
@@ -1022,6 +994,13 @@ struct Library_corlib_native_System_Threading_WaitHandle
1022994
bool fWaitAll);
1023995
};
1024996

997+
struct Library_corlib_native_System_UInt32
998+
{
999+
static const int FIELD__m_value = 1;
1000+
1001+
//--//
1002+
};
1003+
10251004
struct Library_corlib_native_System_UInt64
10261005
{
10271006
static const int FIELD__m_value = 1;

0 commit comments

Comments
 (0)