Skip to content

Commit 0e2af19

Browse files
josesimoesjosesimoes
committed
Update nf-interpreter sub-module
***NO_CI***
1 parent 2054739 commit 0e2af19

File tree

8 files changed

+94
-82
lines changed

8 files changed

+94
-82
lines changed

‎native/nf-interpreter/azure-pipelines-nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
variables:
295295
DOTNET_NOLOGO: true
296296
# creates a counter and assigns it to the revision variable
297-
REVISION: $[counter('STM32_1_12_3_versioncounter', 0)]
297+
REVISION: $[counter('STM32_1_12_4_versioncounter', 0)]
298298
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
299299
TargetPlatform: "stm32"
300300

@@ -581,7 +581,7 @@ jobs:
581581
variables:
582582
DOTNET_NOLOGO: true
583583
# creates a counter and assigns it to the revision variable
584-
REVISION: $[counter('ESP32_1_12_3_versioncounter', 0)]
584+
REVISION: $[counter('ESP32_1_12_4_versioncounter', 0)]
585585
IDF_PATH: "D:/a/1/s/esp-idf"
586586
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
587587
TargetPlatform: "esp32"
@@ -664,7 +664,7 @@ jobs:
664664
variables:
665665
DOTNET_NOLOGO: true
666666
# creates a counter and assigns it to the revision variable
667-
REVISION: $[counter('TI_1_12_3_versioncounter', 0)]
667+
REVISION: $[counter('TI_1_12_4_versioncounter', 0)]
668668
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
669669
TargetPlatform: "ti_simplelink"
670670

@@ -715,7 +715,7 @@ jobs:
715715

716716
variables:
717717
# creates a counter and assigns it to the revision variable
718-
REVISION: $[counter('AZURERTOS_1_12_3_versioncounter', 0)]
718+
REVISION: $[counter('AZURERTOS_1_12_4_versioncounter', 0)]
719719
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
720720
TargetPlatform: "efm32"
721721

‎native/nf-interpreter/azure-pipelines.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ jobs:
413413
variables:
414414
DOTNET_NOLOGO: true
415415
# creates a counter and assigns it to the revision variable
416-
REVISION: $[counter('STM32_1_12_3_versioncounter', 0)]
416+
REVISION: $[counter('STM32_1_12_4_versioncounter', 0)]
417417
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
418418
TargetPlatform: "stm32"
419419

@@ -527,7 +527,7 @@ jobs:
527527
variables:
528528
DOTNET_NOLOGO: true
529529
# creates a counter and assigns it to the revision variable
530-
REVISION: $[counter('ESP32_1_12_3_versioncounter', 0)]
530+
REVISION: $[counter('ESP32_1_12_4_versioncounter', 0)]
531531
IDF_PATH: "D:/a/1/s/esp-idf"
532532
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
533533
TargetPlatform: "esp32"
@@ -615,7 +615,7 @@ jobs:
615615
variables:
616616
DOTNET_NOLOGO: true
617617
# creates a counter and assigns it to the revision variable
618-
REVISION: $[counter('NXP_1_12_3_versioncounter', 0)]
618+
REVISION: $[counter('NXP_1_12_4_versioncounter', 0)]
619619
GIT_LFS_SKIP_SMUDGE: 1
620620
TargetPlatform: "freertos"
621621

@@ -693,7 +693,7 @@ jobs:
693693
variables:
694694
DOTNET_NOLOGO: true
695695
# creates a counter and assigns it to the revision variable
696-
REVISION: $[counter('TI_1_12_3_versioncounter', 0)]
696+
REVISION: $[counter('TI_1_12_4_versioncounter', 0)]
697697
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
698698
TargetPlatform: "ti_simplelink"
699699

@@ -764,7 +764,7 @@ jobs:
764764

765765
variables:
766766
# creates a counter and assigns it to the revision variable
767-
REVISION: $[counter('AZURERTOS_1_12_3_versioncounter', 0)]
767+
REVISION: $[counter('AZURERTOS_1_12_4_versioncounter', 0)]
768768
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
769769
TargetPlatform: "efm32"
770770

@@ -815,7 +815,7 @@ jobs:
815815
value: true
816816
# creates a counter and assigns it to the revision variable
817817
- name: REVISION
818-
value: $[counter('WIN32_1_12_3_versioncounter', 0)]
818+
value: $[counter('WIN32_1_12_4_versioncounter', 0)]
819819
- name: LITTLEFS_PATH
820820
value: "D:/a/1/s/littlefs"
821821

‎native/nf-interpreter/src/CLR/CorLib/corlib_native.cpp‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
505505
NULL,
506506
NULL,
507507
NULL,
508-
NULL,
509-
NULL,
510508
Library_corlib_native_System_Reflection_Assembly::get_FullName___STRING,
511509
Library_corlib_native_System_Reflection_Assembly::GetType___SystemType__STRING,
512510
NULL,
@@ -576,11 +574,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
576574
NULL,
577575
NULL,
578576
NULL,
579-
NULL,
580-
NULL,
581-
NULL,
582-
NULL,
583-
NULL,
584577
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
585578
NULL,
586579
NULL,
@@ -688,10 +681,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
688681
NULL,
689682
NULL,
690683
NULL,
691-
NULL,
692-
NULL,
693-
NULL,
694-
NULL,
695684
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
696685
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
697686
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -805,6 +794,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
805794
NULL,
806795
NULL,
807796
NULL,
797+
NULL,
798+
NULL,
799+
NULL,
800+
NULL,
808801
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
809802
NULL,
810803
NULL,
@@ -1262,8 +1255,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
12621255
Library_corlib_native_System_Diagnostics_Debugger::get_IsAttached___STATIC__BOOLEAN,
12631256
Library_corlib_native_System_Diagnostics_Debugger::Break___STATIC__VOID,
12641257
NULL,
1265-
NULL,
1266-
NULL,
12671258
Library_corlib_native_System_Enum::HasFlag___BOOLEAN__SystemEnum,
12681259
NULL,
12691260
NULL,
@@ -1316,11 +1307,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
13161307
NULL,
13171308
NULL,
13181309
NULL,
1319-
NULL,
1320-
NULL,
1321-
NULL,
1322-
NULL,
1323-
NULL,
13241310
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
13251311
NULL,
13261312
NULL,
@@ -1380,10 +1366,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
13801366
NULL,
13811367
NULL,
13821368
NULL,
1383-
NULL,
1384-
NULL,
1385-
NULL,
1386-
NULL,
13871369
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
13881370
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
13891371
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -1484,6 +1466,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
14841466
NULL,
14851467
NULL,
14861468
NULL,
1469+
NULL,
1470+
NULL,
1471+
NULL,
1472+
NULL,
14871473
Library_corlib_native_System_ValueType::Equals___BOOLEAN__OBJECT,
14881474
NULL,
14891475
NULL,
@@ -1511,18 +1497,18 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
15111497

15121498
#if (NANOCLR_REFLECTION == TRUE)
15131499

1514-
0xE76AC236,
1500+
0x9F295833,
15151501

15161502
#elif (NANOCLR_REFLECTION == FALSE)
15171503

1518-
0xA0E4A156,
1504+
0xFDC67F52,
15191505

15201506
#else
15211507
#error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options."
15221508
#endif
15231509

15241510
method_lookup,
1525-
{ 100, 5, 0, 22 }
1511+
{ 100, 5, 0, 23 }
15261512
};
15271513

15281514
// clang-format on

‎native/nf-interpreter/src/CLR/CorLib/corlib_native.h‎

Lines changed: 32 additions & 39 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);
@@ -404,7 +415,6 @@ struct Library_corlib_native_System_BitConverter
404415

405416
struct Library_corlib_native_System_Byte
406417
{
407-
408418
static const int FIELD__m_value = 1;
409419

410420
//--//
@@ -427,16 +437,8 @@ struct Library_corlib_native_System_Collections_ArrayList
427437
//--//
428438
};
429439

430-
struct Library_corlib_native_System_ComponentModel_EditorBrowsableState
431-
{
432-
433-
static const int FIELD__value__ = 1;
434-
435-
//--//
436-
};
437440
struct Library_corlib_native_System_Double
438441
{
439-
440442
static const int FIELD__m_value = 1;
441443

442444
NANOCLR_NATIVE_DECLARE(CompareTo___STATIC__I4__R8__R8);
@@ -450,9 +452,9 @@ struct Library_corlib_native_System_Double
450452

451453
struct Library_corlib_native_System_TimeSpan
452454
{
453-
static const int FIELD_STATIC__Zero = 3;
454-
static const int FIELD_STATIC__MaxValue = 4;
455-
static const int FIELD_STATIC__MinValue = 5;
455+
static const int FIELD_STATIC__Zero = 7;
456+
static const int FIELD_STATIC__MaxValue = 8;
457+
static const int FIELD_STATIC__MinValue = 9;
456458

457459
static const int FIELD___ticks = 1;
458460

@@ -467,6 +469,7 @@ struct Library_corlib_native_System_TimeSpan
467469

468470
//--//
469471

472+
static CLR_INT64 *NewObject(CLR_RT_StackFrame &stack);
470473
static CLR_INT64 *GetValuePtr(CLR_RT_StackFrame &stack);
471474
static CLR_INT64 *GetValuePtr(CLR_RT_HeapBlock &ref);
472475

@@ -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

@@ -495,6 +498,7 @@ struct Library_corlib_native_System_DateTime
495498

496499
//--//
497500

501+
static CLR_INT64 *NewObject(CLR_RT_StackFrame &stack);
498502
static CLR_INT64 *GetValuePtr(CLR_RT_StackFrame &stack);
499503
static CLR_INT64 *GetValuePtr(CLR_RT_HeapBlock &ref);
500504

@@ -550,13 +554,6 @@ struct Library_corlib_native_System_Diagnostics_Debugger
550554
//--//
551555
};
552556

553-
struct Library_corlib_native_System_Diagnostics_DebuggerBrowsableAttribute
554-
{
555-
static const int FIELD___state = 1;
556-
557-
//--//
558-
};
559-
560557
struct Library_corlib_native_System_UInt16
561558
{
562559
static const int FIELD__m_value = 1;
@@ -591,7 +588,7 @@ struct Library_corlib_native_System_Enum
591588

592589
struct Library_corlib_native_System_EventArgs
593590
{
594-
static const int FIELD_STATIC__Empty = 9;
591+
static const int FIELD_STATIC__Empty = 13;
595592

596593
//--//
597594
};
@@ -628,19 +625,9 @@ struct Library_corlib_native_System_Int16
628625

629626
struct Library_corlib_native_System_Guid
630627
{
631-
static const int FIELD_STATIC__Empty = 10;
628+
static const int FIELD_STATIC__Empty = 14;
632629

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

645632
NANOCLR_NATIVE_DECLARE(GenerateNewGuid___STATIC__SZARRAY_U1);
646633

@@ -808,9 +795,16 @@ struct Library_corlib_native_System_Reflection_RuntimeMethodInfo
808795
//--//
809796
};
810797

811-
struct Library_corlib_native_System_Runtime_CompilerServices_AccessedThroughPropertyAttribute
798+
struct Library_corlib_native_System_Runtime_CompilerServices_NullableAttribute
812799
{
813-
static const int FIELD___propertyName = 1;
800+
static const int FIELD__NullableFlags = 1;
801+
802+
//--//
803+
};
804+
805+
struct Library_corlib_native_System_Runtime_CompilerServices_NullableContextAttribute
806+
{
807+
static const int FIELD__Flag = 1;
814808

815809
//--//
816810
};
@@ -870,7 +864,6 @@ struct Library_corlib_native_System_RuntimeType
870864

871865
struct Library_corlib_native_System_SByte
872866
{
873-
874867
static const int FIELD__m_value = 1;
875868

876869
//--//
@@ -979,7 +972,7 @@ struct Library_corlib_native_System_Threading_Thread
979972

980973
struct Library_corlib_native_System_Threading_Timeout
981974
{
982-
static const int FIELD_STATIC__InfiniteTimeSpan = 11;
975+
static const int FIELD_STATIC__InfiniteTimeSpan = 15;
983976

984977
//--//
985978
};

0 commit comments

Comments
 (0)