Skip to content

Commit

Permalink
Extract System.Text to a separate class lib (#1507)
Browse files Browse the repository at this point in the history
  • Loading branch information
@josesimoes
josesimoes authored Nov 14, 2019
1 parent 73389fa commit b433507
Show file tree
Hide file tree
Showing 17 changed files with 226 additions and 216 deletions.
2 changes: 0 additions & 2 deletions CMake/Modules/FindNF_CoreCLR.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ set(NF_CoreCLR_SRCS
corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp
corlib_native_System_Runtime_Remoting_RemotingServices.cpp
corlib_native_System_String.cpp
corlib_native_System_Text_UTF8Decoder.cpp
corlib_native_System_Text_UTF8Encoding.cpp
corlib_native_System_Threading_AutoResetEvent.cpp
corlib_native_System_Threading_Interlocked.cpp
corlib_native_System_Threading_ManualResetEvent.cpp
Expand Down
37 changes: 37 additions & 0 deletions CMake/Modules/FindnanoFramework.System.Text.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#
# Copyright (c) 2019 The nanoFramework project contributors
# See LICENSE file in the project root for full license information.
#


# set include directories
list(APPEND nanoFramework.System.Text_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/HAL/Include")
list(APPEND nanoFramework.System.Text_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.System.Text")

# source files
set(nanoFramework.System.Text_SRCS

# source files of the assembly
nf_system_text_System_Text_UTF8Decoder.cpp
nf_system_text_System_Text_UTF8Encoding.cpp
nf_system_text.cpp
)

foreach(SRC_FILE ${nanoFramework.System.Text_SRCS})
set(nanoFramework.System.Text_SRC_FILE SRC_FILE-NOTFOUND)
find_file(nanoFramework.System.Text_SRC_FILE ${SRC_FILE}
PATHS

# path for source files of this module
${PROJECT_SOURCE_DIR}/src/nanoFramework.System.Text

CMAKE_FIND_ROOT_PATH_BOTH
)
# message("${SRC_FILE} >> ${nanoFramework.System.Text_SRC_FILE}") # debug helper
list(APPEND nanoFramework.System.Text_SOURCES ${nanoFramework.System.Text_SRC_FILE})
endforeach()


include(FindPackageHandleStandardArgs)

FIND_PACKAGE_HANDLE_STANDARD_ARGS(nanoFramework.System.Text DEFAULT_MSG nanoFramework.System.Text_INCLUDE_DIRS nanoFramework.System.Text_SOURCES)
7 changes: 7 additions & 0 deletions CMake/Modules/NF_NativeAssemblies.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ option(API_nanoFramework.Networking.Sntp "option for nanoFramework.Networ
option(API_nanoFramework.Runtime.Events "option for nanoFramework.Runtime.Events API")
option(API_nanoFramework.ResourceManager "option for nanoFramework.ResourceManager")
option(API_nanoFramework.System.Collections "option for nanoFramework.System.Collections")
option(API_nanoFramework.System.Text "option for nanoFramework.System.Text")
option(API_System.Math "option for System.Math")
option(API_System.Net "option for System.Net")
option(API_Windows.Devices.Adc "option for Windows.Devices.Adc API")
Expand Down Expand Up @@ -118,6 +119,12 @@ macro(ParseNativeAssemblies)
PerformSettingsForApiEntry("nanoFramework.System.Collections")
endif()

# nanoFramework.System.Text
if(API_nanoFramework.System.Text)
##### API name here (doted name)
PerformSettingsForApiEntry("nanoFramework.System.Text")
endif()

# nanoFramework.Runtime.Events
if(API_nanoFramework.Runtime.Events)
##### API name here (doted name)
Expand Down
14 changes: 14 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,20 @@ endif()

#################################################################

#############################################
# handles inclusion of System.Text API
#############################################

if(API_nanoFramework.System.Text)
set(TARGET_SYSTEM_TEXT TRUE CACHE INTERNAL "enable support for System.Text API")
message(STATUS "Support for System.Text API enabled")
else()
set(TARGET_SYSTEM_TEXT FALSE CACHE INTERNAL "DISABLE support for System.Text API")
message(STATUS "Support for System.Text API **IS NOT** enabled")
endif()

#################################################################

#################################################################
# manage HAL/PAL required for API namespaces
#################################################################
Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,17 @@ jobs:
matrix:
MBN_QUAIL:
BoardName: MBN_QUAIL
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON
GccArm_Version:
NeedsDFU: true
NETDUINO3_WIFI:
BoardName: NETDUINO3_WIFI
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=OFF -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=OFF -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON
GccArm_Version:
NeedsDFU: true
ST_STM32F429I_DISCOVERY:
BoardName: ST_STM32F429I_DISCOVERY
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON
GccArm_Version:
NeedsDFU: false
ST_NUCLEO64_F091RC:
Expand All @@ -182,7 +182,7 @@ jobs:
NeedsDFU: false
ST_STM32F769I_DISCOVERY:
BoardName: ST_STM32F769I_DISCOVERY
BuildOptions: -DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=ON -DAPI_System.Net=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=ON -DAPI_System.Net=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON
GccArm_Version:
NeedsDFU: false

Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
matrix:
ESP32_WROOM_32:
BoardName: ESP32_WROOM_32
BuildOptions: -DTARGET_SERIES=ESP32 -DRTOS=FREERTOS_ESP32 -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_Windows.Devices.Wifi=ON -DAPI_Windows.Storage=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=ESP32 -DRTOS=FREERTOS_ESP32 -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_Windows.Devices.Wifi=ON -DAPI_Windows.Storage=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON

variables:
ESP32_TOOLCHAIN_PATH: $(Agent.TempDirectory)\ESP32_Tools
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
matrix:
TI_CC3220SF_LAUNCHXL:
BoardName: TI_CC3220SF_LAUNCHXL
BuildOptions: -DTARGET_SERIES=CC32xx -DRTOS=TI_SIMPLELINK -DSUPPORT_ANY_BASE_CONVERSION=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_WATCHDOG=OFF -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=OFF -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_nanoFramework.System.Collections=ON
BuildOptions: -DTARGET_SERIES=CC32xx -DRTOS=TI_SIMPLELINK -DSUPPORT_ANY_BASE_CONVERSION=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_WATCHDOG=OFF -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=OFF -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_nanoFramework.System.Collections=ON -DAPI_nanoFramework.System.Text=ON
GccArm_Version:

variables:
Expand Down
1 change: 1 addition & 0 deletions cmake-variants.TEMPLATE-ESP32.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"NF_SECURITY_MBEDTLS": "ON",
"API_nanoFramework.ResourceManager" : "ON",
"API_nanoFramework.System.Collections" : "ON",
"API_nanoFramework.System.Text" : "ON",
"API_Windows.Devices.Wifi": "ON",
"API_Windows.Devices.Adc": "ON",
"API_System.Devices.Dac" : "OFF",
Expand Down
1 change: 1 addition & 0 deletions cmake-variants.TEMPLATE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"API_nanoFramework.Devices.OneWire" : "OFF-default-ON-to-add-this-API",
"API_nanoFramework.ResourceManager" : "OFF-default-ON-to-add-this-API",
"API_nanoFramework.System.Collections" : "OFF-default-ON-to-add-this-API",
"API_nanoFramework.System.Text" : "OFF-default-ON-to-add-this-API",
"API_System.Math" : "OFF-default-ON-to-add-this-API",
"API_System.Net" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.Adc" : "OFF-default-ON-to-add-this-API",
Expand Down
2 changes: 0 additions & 2 deletions src/CLR/CorLib/CorLib-vs2019.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
<ClCompile Include="corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp" />
<ClCompile Include="corlib_native_System_Runtime_Remoting_RemotingServices.cpp" />
<ClCompile Include="corlib_native_System_String.cpp" />
<ClCompile Include="corlib_native_System_Text_UTF8Decoder.cpp" />
<ClCompile Include="corlib_native_System_Text_UTF8Encoding.cpp" />
<ClCompile Include="corlib_native_System_Threading_AutoResetEvent.cpp" />
<ClCompile Include="corlib_native_System_Threading_Interlocked.cpp" />
<ClCompile Include="corlib_native_System_Threading_ManualResetEvent.cpp" />
Expand Down
6 changes: 0 additions & 6 deletions src/CLR/CorLib/CorLib-vs2019.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@
<ClCompile Include="corlib_native_System_RuntimeType.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Text_UTF8Decoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Text_UTF8Encoding.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Threading_WaitHandle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
2 changes: 0 additions & 2 deletions src/CLR/CorLib/CorLib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
<ClCompile Include="corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp" />
<ClCompile Include="corlib_native_System_Runtime_Remoting_RemotingServices.cpp" />
<ClCompile Include="corlib_native_System_String.cpp" />
<ClCompile Include="corlib_native_System_Text_UTF8Decoder.cpp" />
<ClCompile Include="corlib_native_System_Text_UTF8Encoding.cpp" />
<ClCompile Include="corlib_native_System_Threading_AutoResetEvent.cpp" />
<ClCompile Include="corlib_native_System_Threading_Interlocked.cpp" />
<ClCompile Include="corlib_native_System_Threading_ManualResetEvent.cpp" />
Expand Down
6 changes: 0 additions & 6 deletions src/CLR/CorLib/CorLib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@
<ClCompile Include="corlib_native_System_RuntimeType.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Text_UTF8Decoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Text_UTF8Encoding.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Threading_WaitHandle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
156 changes: 5 additions & 151 deletions src/CLR/CorLib/corlib_native.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
Library_corlib_native_System_String::CompareTo___I4__OBJECT,
NULL,
Library_corlib_native_System_String::get_Chars___CHAR__I4,
NULL,
Library_corlib_native_System_String::ToCharArray___SZARRAY_CHAR,
Library_corlib_native_System_String::ToCharArray___SZARRAY_CHAR__I4__I4,
Library_corlib_native_System_String::get_Length___I4,
Expand Down Expand Up @@ -613,80 +614,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Text_UTF8Decoder::Convert___VOID__SZARRAY_U1__I4__I4__SZARRAY_CHAR__I4__I4__BOOLEAN__BYREF_I4__BYREF_I4__BYREF_BOOLEAN,
NULL,
Library_corlib_native_System_Text_UTF8Encoding::GetBytes___SZARRAY_U1__STRING,
Library_corlib_native_System_Text_UTF8Encoding::GetBytes___I4__STRING__I4__I4__SZARRAY_U1__I4,
Library_corlib_native_System_Text_UTF8Encoding::GetChars___SZARRAY_CHAR__SZARRAY_U1,
Library_corlib_native_System_Text_UTF8Encoding::GetChars___SZARRAY_CHAR__SZARRAY_U1__I4__I4,
NULL,
NULL,
Library_corlib_native_System_Threading_WaitHandle::WaitOne___BOOLEAN__I4__BOOLEAN,
NULL,
NULL,
Expand Down Expand Up @@ -1243,6 +1170,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
Library_corlib_native_System_String::CompareTo___I4__OBJECT,
NULL,
Library_corlib_native_System_String::get_Chars___CHAR__I4,
NULL,
Library_corlib_native_System_String::ToCharArray___SZARRAY_CHAR,
Library_corlib_native_System_String::ToCharArray___SZARRAY_CHAR__I4__I4,
Library_corlib_native_System_String::get_Length___I4,
Expand Down Expand Up @@ -1296,80 +1224,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Text_UTF8Decoder::Convert___VOID__SZARRAY_U1__I4__I4__SZARRAY_CHAR__I4__I4__BOOLEAN__BYREF_I4__BYREF_I4__BYREF_BOOLEAN,
NULL,
Library_corlib_native_System_Text_UTF8Encoding::GetBytes___SZARRAY_U1__STRING,
Library_corlib_native_System_Text_UTF8Encoding::GetBytes___I4__STRING__I4__I4__SZARRAY_U1__I4,
Library_corlib_native_System_Text_UTF8Encoding::GetChars___SZARRAY_CHAR__SZARRAY_U1,
Library_corlib_native_System_Text_UTF8Encoding::GetChars___SZARRAY_CHAR__SZARRAY_U1__I4__I4,
NULL,
NULL,
Library_corlib_native_System_Threading_WaitHandle::WaitOne___BOOLEAN__I4__BOOLEAN,
NULL,
NULL,
Expand Down Expand Up @@ -1502,16 +1356,16 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =

#if (NANOCLR_REFLECTION == TRUE)

0xDCB6AEBA,
0x3E5F09B0,

#elif (NANOCLR_REFLECTION == FALSE)

0x7E26EC5E,
0x529780F5,

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

method_lookup,
{ 100, 4, 5, 0 }
{ 100, 4, 6, 0 }
};
Loading

0 comments on commit b433507

Please sign in to comment.