From fa7ebdf5dd450dd9cf72c76034941f48e832173e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 25 Oct 2018 17:51:37 +0100 Subject: [PATCH] Move System.Math to it's own class lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rework System.Math to System.MathInternal to keep abs, max and min (int args only) - Update mscorlib assembly declarations - Add System.Math assembly declarations - Update CMakes accordingly - Update cmake.varianats with new build option - Update STM32 build definitions enabling system.math for all targets, except STM32F091 - Update ESP32 build definitions enabling system.math Signed-off-by: José Simões --- CMake/Modules/FindNF_CoreCLR.cmake | 2 +- CMake/Modules/FindSystem.Math.cmake | 38 +++ CMake/Modules/NF_NativeAssemblies.cmake | 7 + appveyor.yml | 2 +- cmake-variants.TEMPLATE.json | 1 + get-stm32-targets-to-build.ps1 | 12 +- src/CLR/CorLib/corlib_native.cpp | 58 +--- src/CLR/CorLib/corlib_native.h | 52 +--- .../corlib_native_System_MathInternal.cpp | 103 +++++++ src/CLR/System.Math/nf_native_system_math.cpp | 70 +++++ src/CLR/System.Math/nf_native_system_math.h | 70 +++++ .../nf_native_system_math_System_Math.cpp} | 290 ++++++------------ 12 files changed, 405 insertions(+), 300 deletions(-) create mode 100644 CMake/Modules/FindSystem.Math.cmake create mode 100644 src/CLR/CorLib/corlib_native_System_MathInternal.cpp create mode 100644 src/CLR/System.Math/nf_native_system_math.cpp create mode 100644 src/CLR/System.Math/nf_native_system_math.h rename src/CLR/{CorLib/corlib_native_System_Math.cpp => System.Math/nf_native_system_math_System_Math.cpp} (69%) diff --git a/CMake/Modules/FindNF_CoreCLR.cmake b/CMake/Modules/FindNF_CoreCLR.cmake index b3e8a875a2..796b15248b 100644 --- a/CMake/Modules/FindNF_CoreCLR.cmake +++ b/CMake/Modules/FindNF_CoreCLR.cmake @@ -93,7 +93,7 @@ set(NF_CoreCLR_SRCS corlib_native_System_Globalization_DateTimeFormat.cpp corlib_native_System_Guid.cpp corlib_native_System_MarshalByRefObject.cpp - corlib_native_System_Math.cpp + corlib_native_System_MathInternal.cpp corlib_native_System_MulticastDelegate.cpp corlib_native_System_Number.cpp corlib_native_System_Object.cpp diff --git a/CMake/Modules/FindSystem.Math.cmake b/CMake/Modules/FindSystem.Math.cmake new file mode 100644 index 0000000000..e211bf2bc6 --- /dev/null +++ b/CMake/Modules/FindSystem.Math.cmake @@ -0,0 +1,38 @@ +# +# Copyright (c) 2018 The nanoFramework project contributors +# See LICENSE file in the project root for full license information. +# + + +# native code directory +set(BASE_PATH_FOR_THIS_MODULE "${PROJECT_SOURCE_DIR}/src/CLR/System.Math") + + +# set include directories +list(APPEND System.Math_INCLUDE_DIRS "${BASE_PATH_FOR_THIS_MODULE}") + + +# source files +set(System.Math_SRCS + + nf_native_system_math.cpp + nf_native_system_math_System_Math.cpp + +) + +foreach(SRC_FILE ${System.Math_SRCS}) + set(System.Math_SRC_FILE SRC_FILE-NOTFOUND) + find_file(System.Math_SRC_FILE ${SRC_FILE} + PATHS + "${BASE_PATH_FOR_THIS_MODULE}" + + CMAKE_FIND_ROOT_PATH_BOTH + ) + # message("${SRC_FILE} >> ${System.Math_SRC_FILE}") # debug helper + list(APPEND System.Math_SOURCES ${System.Math_SRC_FILE}) +endforeach() + + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(System.Math DEFAULT_MSG System.Math_INCLUDE_DIRS System.Math_SOURCES) diff --git a/CMake/Modules/NF_NativeAssemblies.cmake b/CMake/Modules/NF_NativeAssemblies.cmake index 385b803e21..31a1cc95ff 100644 --- a/CMake/Modules/NF_NativeAssemblies.cmake +++ b/CMake/Modules/NF_NativeAssemblies.cmake @@ -11,6 +11,7 @@ option(API_nanoFramework.Networking.Sntp "option for nanoFramework.Networking.Sntp") option(API_nanoFramework.Runtime.Events "option for nanoFramework.Runtime.Events API") +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") option(API_Windows.Devices.Gpio "option for Windows.Devices.Gpio API") @@ -101,6 +102,12 @@ macro(ParseNativeAssemblies) endif() + # System.Math + if(API_System.Math) + ##### API name here (doted name) + PerformSettingsForApiEntry("System.Math") + endif() + # System.Net if(API_System.Net) ##### API name here (doted name) diff --git a/appveyor.yml b/appveyor.yml index 4497e4ce8a..4531512407 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,7 +50,7 @@ environment: matrix: - BOARD_NAME: 'STM32' - BOARD_NAME: 'ESP32_DEVKITC' - BUILD_OPTIONS: '-DTARGET_SERIES=ESP32 -DRTOS=FREERTOS -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=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 -DNF_SECURITY_OPENSSL=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON' + BUILD_OPTIONS: '-DTARGET_SERIES=ESP32 -DRTOS=FREERTOS -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=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 -DNF_SECURITY_OPENSSL=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON' - BOARD_NAME: 'NANOCLR_WINDOWS' - BOARD_NAME: 'NOT_A_BOARD_CHANGELOG' diff --git a/cmake-variants.TEMPLATE.json b/cmake-variants.TEMPLATE.json index 263c5bed16..9fbecc1a0f 100644 --- a/cmake-variants.TEMPLATE.json +++ b/cmake-variants.TEMPLATE.json @@ -64,6 +64,7 @@ "NF_SECURITY_OPENSSL" : "OFF-default-ON-to-add-network-security-from-OpenSSL", "NF_SECURITY_MBEDTLS" : "OFF-default-ON-to-add-network-security-from-mbedTLS", "MBEDTLS_SOURCE" : "", + "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", "API_Windows.Devices.Gpio" : "OFF-default-ON-to-add-this-API", diff --git a/get-stm32-targets-to-build.ps1 b/get-stm32-targets-to-build.ps1 index b08fa6712a..5c745cad2b 100644 --- a/get-stm32-targets-to-build.ps1 +++ b/get-stm32-targets-to-build.ps1 @@ -1,11 +1,11 @@ #build matrx with target names and build options -$BuildMatrix = ("MBN_QUAIL", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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", 'True'), -("ST_STM32F4_DISCOVERY", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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", 'False'), -("ST_STM32F429I_DISCOVERY", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DUSE_RNG=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=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", 'False'), +$BuildMatrix = ("MBN_QUAIL", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=ON -DUSE_RNG=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", 'True'), +("ST_STM32F4_DISCOVERY", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=ON -DUSE_RNG=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", 'False'), +("ST_STM32F429I_DISCOVERY", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DUSE_RNG=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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", 'False'), ("ST_NUCLEO64_F091RC", "-DTARGET_SERIES=STM32F0xx -DRTOS=CHIBIOS -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=OFF -DNF_PLATFORM_NO_CLR_TRACE=ON -DNF_CLR_NO_IL_INLINE=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", 'False'), -("ST_NUCLEO144_F746ZG", "-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=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.Net=ON -DNF_SECURITY_MBEDTLS=ON", 'False'), -("ST_STM32F769I_DISCOVERY", "-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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.Net=ON -DNF_SECURITY_MBEDTLS=ON", 'False'), -("NETDUINO3_WIFI", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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", 'True') +("ST_NUCLEO144_F746ZG", "-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DUSE_RNG=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.Net=ON -DNF_SECURITY_MBEDTLS=ON", 'False'), +("ST_STM32F769I_DISCOVERY", "-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=ON -DUSE_RNG=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.Net=ON -DNF_SECURITY_MBEDTLS=ON", 'False'), +("NETDUINO3_WIFI", "-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DUSE_RNG=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", 'True') # get commit message diff --git a/src/CLR/CorLib/corlib_native.cpp b/src/CLR/CorLib/corlib_native.cpp index b557c229da..437f9b6e8d 100644 --- a/src/CLR/CorLib/corlib_native.cpp +++ b/src/CLR/CorLib/corlib_native.cpp @@ -464,57 +464,9 @@ static const CLR_RT_MethodHandler method_lookup[] = NULL, NULL, NULL, - Library_corlib_native_System_Math::Abs___STATIC__I4__I4, - Library_corlib_native_System_Math::Max___STATIC__I4__I4__I4, - Library_corlib_native_System_Math::Min___STATIC__I4__I4__I4, - Library_corlib_native_System_Math::Abs___STATIC__R8__R8, - Library_corlib_native_System_Math::Abs___STATIC__R4__R4, - Library_corlib_native_System_Math::Acos___STATIC__R8__R8, - Library_corlib_native_System_Math::Acos___STATIC__R4__R4, - Library_corlib_native_System_Math::Asin___STATIC__R8__R8, - Library_corlib_native_System_Math::Asin___STATIC__R4__R4, - Library_corlib_native_System_Math::Atan___STATIC__R8__R8, - Library_corlib_native_System_Math::Atan___STATIC__R4__R4, - Library_corlib_native_System_Math::Atan2___STATIC__R8__R8__R8, - Library_corlib_native_System_Math::Atan2___STATIC__R4__R4__R4, - Library_corlib_native_System_Math::Ceiling___STATIC__R8__R8, - Library_corlib_native_System_Math::Ceiling___STATIC__R4__R4, - Library_corlib_native_System_Math::Cos___STATIC__R8__R8, - Library_corlib_native_System_Math::Cos___STATIC__R4__R4, - Library_corlib_native_System_Math::Cosh___STATIC__R8__R8, - Library_corlib_native_System_Math::Cosh___STATIC__R4__R4, - Library_corlib_native_System_Math::IEEERemainder___STATIC__R8__R8__R8, - Library_corlib_native_System_Math::IEEERemainder___STATIC__R4__R4__R4, - Library_corlib_native_System_Math::Exp___STATIC__R8__R8, - Library_corlib_native_System_Math::Exp___STATIC__R4__R4, - Library_corlib_native_System_Math::Floor___STATIC__R8__R8, - Library_corlib_native_System_Math::Floor___STATIC__R4__R4, - Library_corlib_native_System_Math::Log___STATIC__R8__R8, - Library_corlib_native_System_Math::Log___STATIC__R4__R4, - Library_corlib_native_System_Math::Log10___STATIC__R8__R8, - Library_corlib_native_System_Math::Log10___STATIC__R4__R4, - Library_corlib_native_System_Math::Max___STATIC__R8__R8__R8, - Library_corlib_native_System_Math::Max___STATIC__R4__R4__R4, - Library_corlib_native_System_Math::Min___STATIC__R8__R8__R8, - Library_corlib_native_System_Math::Min___STATIC__R4__R4__R4, - Library_corlib_native_System_Math::Pow___STATIC__R8__R8__R8, - Library_corlib_native_System_Math::Pow___STATIC__R4__R4__R4, - Library_corlib_native_System_Math::Round___STATIC__R8__R8, - Library_corlib_native_System_Math::Round___STATIC__R4__R4, - Library_corlib_native_System_Math::Sign___STATIC__I4__R8, - Library_corlib_native_System_Math::Sign___STATIC__I4__R4, - Library_corlib_native_System_Math::Sin___STATIC__R8__R8, - Library_corlib_native_System_Math::Sin___STATIC__R4__R4, - Library_corlib_native_System_Math::Sinh___STATIC__R8__R8, - Library_corlib_native_System_Math::Sinh___STATIC__R4__R4, - Library_corlib_native_System_Math::Sqrt___STATIC__R8__R8, - Library_corlib_native_System_Math::Sqrt___STATIC__R4__R4, - Library_corlib_native_System_Math::Tan___STATIC__R8__R8, - Library_corlib_native_System_Math::Tan___STATIC__R4__R4, - Library_corlib_native_System_Math::Tanh___STATIC__R8__R8, - Library_corlib_native_System_Math::Tanh___STATIC__R4__R4, - Library_corlib_native_System_Math::Truncate___STATIC__R8__R8, - Library_corlib_native_System_Math::Truncate___STATIC__R4__R4, + Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4, + Library_corlib_native_System_MathInternal::Min___STATIC__I4__I4__I4, + Library_corlib_native_System_MathInternal::Max___STATIC__I4__I4__I4, NULL, NULL, NULL, @@ -945,7 +897,7 @@ static const CLR_RT_MethodHandler method_lookup[] = const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib = { "mscorlib", - 0x8899664E, + 0xEF6F3396, method_lookup, - { 1, 0, 4, 0 } + { 1, 0, 5, 0 } }; diff --git a/src/CLR/CorLib/corlib_native.h b/src/CLR/CorLib/corlib_native.h index e0d2772e3e..f76ed48b97 100644 --- a/src/CLR/CorLib/corlib_native.h +++ b/src/CLR/CorLib/corlib_native.h @@ -500,59 +500,11 @@ struct Library_corlib_native_System_Int64 }; -struct Library_corlib_native_System_Math +struct Library_corlib_native_System_MathInternal { NANOCLR_NATIVE_DECLARE(Abs___STATIC__I4__I4); - NANOCLR_NATIVE_DECLARE(Max___STATIC__I4__I4__I4); NANOCLR_NATIVE_DECLARE(Min___STATIC__I4__I4__I4); - NANOCLR_NATIVE_DECLARE(Abs___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Abs___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Acos___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Acos___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Asin___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Asin___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Atan___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Atan___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Atan2___STATIC__R8__R8__R8); - NANOCLR_NATIVE_DECLARE(Atan2___STATIC__R4__R4__R4); - NANOCLR_NATIVE_DECLARE(Ceiling___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Ceiling___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Cos___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Cos___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Cosh___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Cosh___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(IEEERemainder___STATIC__R8__R8__R8); - NANOCLR_NATIVE_DECLARE(IEEERemainder___STATIC__R4__R4__R4); - NANOCLR_NATIVE_DECLARE(Exp___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Exp___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Floor___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Floor___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Log___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Log___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Log10___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Log10___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Max___STATIC__R8__R8__R8); - NANOCLR_NATIVE_DECLARE(Max___STATIC__R4__R4__R4); - NANOCLR_NATIVE_DECLARE(Min___STATIC__R8__R8__R8); - NANOCLR_NATIVE_DECLARE(Min___STATIC__R4__R4__R4); - NANOCLR_NATIVE_DECLARE(Pow___STATIC__R8__R8__R8); - NANOCLR_NATIVE_DECLARE(Pow___STATIC__R4__R4__R4); - NANOCLR_NATIVE_DECLARE(Round___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Round___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Sign___STATIC__I4__R8); - NANOCLR_NATIVE_DECLARE(Sign___STATIC__I4__R4); - NANOCLR_NATIVE_DECLARE(Sin___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Sin___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Sinh___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Sinh___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Sqrt___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Sqrt___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Tan___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Tan___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Tanh___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Tanh___STATIC__R4__R4); - NANOCLR_NATIVE_DECLARE(Truncate___STATIC__R8__R8); - NANOCLR_NATIVE_DECLARE(Truncate___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Max___STATIC__I4__I4__I4); //--// diff --git a/src/CLR/CorLib/corlib_native_System_MathInternal.cpp b/src/CLR/CorLib/corlib_native_System_MathInternal.cpp new file mode 100644 index 0000000000..b54de2552f --- /dev/null +++ b/src/CLR/CorLib/corlib_native_System_MathInternal.cpp @@ -0,0 +1,103 @@ +// +// Copyright (c) 2017 The nanoFramework project contributors +// Portions Copyright (c) Microsoft Corporation. All rights reserved. +// See LICENSE file in the project root for full license information. +// +#include "CorLib.h" + +#if !defined(NANOCLR_EMULATED_FLOATINGPOINT) + #include "nanoPAL_NativeDouble.h" + + HRESULT Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4( CLR_RT_StackFrame& stack ) + { + #if (DP_FLOATINGPOINT == TRUE) + stack.NotImplementedStub(); + #else + + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + float d = stack.Arg0().NumericByRefConst().s4; + float res = fabs( d ); + + stack.SetResult_I4( res ); + + NANOCLR_NOCLEANUP_NOLABEL(); + + #endif + } + + HRESULT Library_corlib_native_System_MathInternal::Max___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) + { + #if (DP_FLOATINGPOINT == TRUE) + return stack.NotImplementedStub(); + #else + + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + float x = stack.Arg0().NumericByRefConst().s4; + float y = stack.Arg1().NumericByRefConst().s4; + float res = x >= y ? x : y; + + stack.SetResult_I4( res ); + + NANOCLR_NOCLEANUP_NOLABEL(); + + #endif + } + + HRESULT Library_corlib_native_System_MathInternal::Min___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) + { + #if (DP_FLOATINGPOINT == TRUE) + return stack.NotImplementedStub(); + #else + + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + float x = stack.Arg0().NumericByRefConst().s4; + float y = stack.Arg1().NumericByRefConst().s4; + float res = x <= y ? x : y; + + stack.SetResult_I4( res ); + + NANOCLR_NOCLEANUP_NOLABEL(); + + #endif + } + +#else + + /// No floating point + HRESULT Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4( CLR_RT_StackFrame& stack ) + { + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); + + NANOCLR_NOCLEANUP(); + } + + HRESULT Library_corlib_native_System_MathInternal::Max___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) + { + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); + + NANOCLR_NOCLEANUP(); + } + + HRESULT Library_corlib_native_System_MathInternal::Min___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) + { + NATIVE_PROFILE_CLR_CORE(); + NANOCLR_HEADER(); + + NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); + + NANOCLR_NOCLEANUP(); + } + +#endif // NANOCLR_EMULATED_FLOATINGPOINT diff --git a/src/CLR/System.Math/nf_native_system_math.cpp b/src/CLR/System.Math/nf_native_system_math.cpp new file mode 100644 index 0000000000..681c60991b --- /dev/null +++ b/src/CLR/System.Math/nf_native_system_math.cpp @@ -0,0 +1,70 @@ +// +// Copyright (c) 2018 The nanoFramework project contributors +// See LICENSE file in the project root for full license information. +// + +#include "nf_native_system_math.h" + + +static const CLR_RT_MethodHandler method_lookup[] = +{ + NULL, + NULL, + NULL, + Library_nf_native_system_math_System_Math::Abs___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Abs___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Acos___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Acos___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Asin___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Asin___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Atan___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Atan___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Atan2___STATIC__R8__R8__R8, + Library_nf_native_system_math_System_Math::Atan2___STATIC__R4__R4__R4, + Library_nf_native_system_math_System_Math::Ceiling___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Ceiling___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Cos___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Cos___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Cosh___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Cosh___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R8__R8__R8, + Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R4__R4__R4, + Library_nf_native_system_math_System_Math::Exp___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Exp___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Floor___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Floor___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Log___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Log___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Log10___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Log10___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Max___STATIC__R8__R8__R8, + Library_nf_native_system_math_System_Math::Max___STATIC__R4__R4__R4, + Library_nf_native_system_math_System_Math::Min___STATIC__R8__R8__R8, + Library_nf_native_system_math_System_Math::Min___STATIC__R4__R4__R4, + Library_nf_native_system_math_System_Math::Pow___STATIC__R8__R8__R8, + Library_nf_native_system_math_System_Math::Pow___STATIC__R4__R4__R4, + Library_nf_native_system_math_System_Math::Round___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Round___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R8, + Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R4, + Library_nf_native_system_math_System_Math::Sin___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Sin___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Sinh___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Sinh___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Sqrt___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Sqrt___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Tan___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Tan___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Tanh___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Tanh___STATIC__R4__R4, + Library_nf_native_system_math_System_Math::Truncate___STATIC__R8__R8, + Library_nf_native_system_math_System_Math::Truncate___STATIC__R4__R4, +}; + +const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Math = +{ + "System.Math", + 0xC5A2A195, + method_lookup, + { 1, 0, 0, 0 } +}; diff --git a/src/CLR/System.Math/nf_native_system_math.h b/src/CLR/System.Math/nf_native_system_math.h new file mode 100644 index 0000000000..9d91affad7 --- /dev/null +++ b/src/CLR/System.Math/nf_native_system_math.h @@ -0,0 +1,70 @@ +// +// Copyright (c) 2018 The nanoFramework project contributors +// See LICENSE file in the project root for full license information. +// + +#ifndef _NF_NATIVE_SYSTEM_MATH_H_ +#define _NF_NATIVE_SYSTEM_MATH_H_ + +#include +#include +// #include + +struct Library_nf_native_system_math_System_Math +{ + NANOCLR_NATIVE_DECLARE(Abs___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Abs___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Acos___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Acos___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Asin___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Asin___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Atan___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Atan___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Atan2___STATIC__R8__R8__R8); + NANOCLR_NATIVE_DECLARE(Atan2___STATIC__R4__R4__R4); + NANOCLR_NATIVE_DECLARE(Ceiling___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Ceiling___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Cos___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Cos___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Cosh___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Cosh___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(IEEERemainder___STATIC__R8__R8__R8); + NANOCLR_NATIVE_DECLARE(IEEERemainder___STATIC__R4__R4__R4); + NANOCLR_NATIVE_DECLARE(Exp___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Exp___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Floor___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Floor___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Log___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Log___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Log10___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Log10___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Max___STATIC__R8__R8__R8); + NANOCLR_NATIVE_DECLARE(Max___STATIC__R4__R4__R4); + NANOCLR_NATIVE_DECLARE(Min___STATIC__R8__R8__R8); + NANOCLR_NATIVE_DECLARE(Min___STATIC__R4__R4__R4); + NANOCLR_NATIVE_DECLARE(Pow___STATIC__R8__R8__R8); + NANOCLR_NATIVE_DECLARE(Pow___STATIC__R4__R4__R4); + NANOCLR_NATIVE_DECLARE(Round___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Round___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Sign___STATIC__I4__R8); + NANOCLR_NATIVE_DECLARE(Sign___STATIC__I4__R4); + NANOCLR_NATIVE_DECLARE(Sin___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Sin___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Sinh___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Sinh___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Sqrt___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Sqrt___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Tan___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Tan___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Tanh___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Tanh___STATIC__R4__R4); + NANOCLR_NATIVE_DECLARE(Truncate___STATIC__R8__R8); + NANOCLR_NATIVE_DECLARE(Truncate___STATIC__R4__R4); + + //--// + +}; + +extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Math; + +#endif //_NF_NATIVE_SYSTEM_MATH_H_ diff --git a/src/CLR/CorLib/corlib_native_System_Math.cpp b/src/CLR/System.Math/nf_native_system_math_System_Math.cpp similarity index 69% rename from src/CLR/CorLib/corlib_native_System_Math.cpp rename to src/CLR/System.Math/nf_native_system_math_System_Math.cpp index 4092381afa..c66a554d31 100644 --- a/src/CLR/CorLib/corlib_native_System_Math.cpp +++ b/src/CLR/System.Math/nf_native_system_math_System_Math.cpp @@ -1,53 +1,15 @@ // -// Copyright (c) 2017 The nanoFramework project contributors -// Portions Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) 2018 The nanoFramework project contributors // See LICENSE file in the project root for full license information. // -#include "CorLib.h" -#if !defined(NANOCLR_EMULATED_FLOATINGPOINT) - #include "nanoPAL_NativeDouble.h" - - HRESULT Library_corlib_native_System_Math::Abs___STATIC__I4__I4( CLR_RT_StackFrame& stack ) - { - #if (DP_FLOATINGPOINT == TRUE) - stack.NotImplementedStub(); - #else - - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - float d = stack.Arg0().NumericByRefConst().s4; - float res = fabs( d ); +#include "nf_native_system_math.h" - stack.SetResult_I4( res ); - - NANOCLR_NOCLEANUP_NOLABEL(); - - #endif - } - HRESULT Library_corlib_native_System_Math::Max___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) - { - #if (DP_FLOATINGPOINT == TRUE) - return stack.NotImplementedStub(); - #else - - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - float x = stack.Arg0().NumericByRefConst().s4; - float y = stack.Arg1().NumericByRefConst().s4; - float res = x >= y ? x : y; - - stack.SetResult_I4( res ); - - NANOCLR_NOCLEANUP_NOLABEL(); - - #endif - } +#if !defined(NANOCLR_EMULATED_FLOATINGPOINT) + #include "nanoPAL_NativeDouble.h" - HRESULT Library_corlib_native_System_Math::Max___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Max___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -67,7 +29,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Max___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Max___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -87,27 +49,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Min___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) - { - #if (DP_FLOATINGPOINT == TRUE) - return stack.NotImplementedStub(); - #else - - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - float x = stack.Arg0().NumericByRefConst().s4; - float y = stack.Arg1().NumericByRefConst().s4; - float res = x <= y ? x : y; - - stack.SetResult_I4( res ); - - NANOCLR_NOCLEANUP_NOLABEL(); - - #endif - } - - HRESULT Library_corlib_native_System_Math::Min___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Min___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -127,7 +69,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Min___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Min___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -147,7 +89,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Abs___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Abs___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -166,7 +108,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Abs___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Abs___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -185,7 +127,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Acos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Acos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -204,7 +146,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Acos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Acos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -223,7 +165,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Asin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Asin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -242,7 +184,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Asin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Asin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -261,7 +203,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Atan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -280,7 +222,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Atan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -299,7 +241,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Atan2___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan2___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -319,7 +261,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Atan2___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan2___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -339,7 +281,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Ceiling___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Ceiling___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -359,7 +301,7 @@ } - HRESULT Library_corlib_native_System_Math::Ceiling___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Ceiling___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -379,7 +321,7 @@ } - HRESULT Library_corlib_native_System_Math::Cos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -398,7 +340,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Cos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -417,7 +359,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Cosh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cosh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -436,7 +378,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Cosh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cosh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -455,7 +397,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::IEEERemainder___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -475,7 +417,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::IEEERemainder___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -495,7 +437,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Exp___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Exp___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -514,7 +456,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Exp___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Exp___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -533,7 +475,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Floor___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Floor___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -552,7 +494,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Floor___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Floor___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -571,7 +513,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Log___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -590,7 +532,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Log___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -609,7 +551,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Log10___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log10___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -628,7 +570,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Log10___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log10___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -647,7 +589,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Pow___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Pow___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) NATIVE_PROFILE_CLR_CORE(); @@ -666,7 +608,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Pow___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Pow___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -687,7 +629,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Round___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Round___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -717,7 +659,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Round___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Round___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -746,7 +688,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sign___STATIC__I4__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) NATIVE_PROFILE_CLR_CORE(); @@ -766,7 +708,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sign___STATIC__I4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -788,7 +730,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -807,7 +749,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -826,7 +768,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sinh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sinh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -845,7 +787,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sinh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sinh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -864,7 +806,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sqrt___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sqrt___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -883,7 +825,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Sqrt___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sqrt___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -902,7 +844,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Tan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -921,7 +863,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Tan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -940,7 +882,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Tanh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tanh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) @@ -959,7 +901,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Tanh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tanh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -978,7 +920,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Truncate___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Truncate___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) NATIVE_PROFILE_CLR_CORE(); @@ -997,7 +939,7 @@ #endif } - HRESULT Library_corlib_native_System_Math::Truncate___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Truncate___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { #if (DP_FLOATINGPOINT == TRUE) return stack.NotImplementedStub(); @@ -1020,38 +962,8 @@ #else - /// No floating point - HRESULT Library_corlib_native_System_Math::Abs___STATIC__I4__I4( CLR_RT_StackFrame& stack ) - { - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); - - NANOCLR_NOCLEANUP(); - } - - HRESULT Library_corlib_native_System_Math::Max___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) - { - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); - - NANOCLR_NOCLEANUP(); - } - - HRESULT Library_corlib_native_System_Math::Max___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) - { - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub()); - - NANOCLR_NOCLEANUP(); - } - - HRESULT Library_corlib_native_System_Math::Max___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + /// No floating point + HRESULT Library_nf_native_system_math_System_Math::Max___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1061,7 +973,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Min___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Max___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1071,7 +983,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Min___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Min___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1081,7 +993,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Min___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Min___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1091,7 +1003,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Abs___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Abs___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1101,7 +1013,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Abs___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Abs___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1111,7 +1023,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Acos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Acos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1121,7 +1033,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Acos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Acos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1131,7 +1043,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Asin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Asin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1141,7 +1053,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Asin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Asin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1151,7 +1063,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Atan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1161,7 +1073,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Atan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1171,7 +1083,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Atan2___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan2___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1181,7 +1093,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Atan2___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Atan2___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1191,7 +1103,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Ceiling___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Ceiling___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1205,7 +1117,7 @@ NANOCLR_NOCLEANUP_NOLABEL(); } - HRESULT Library_corlib_native_System_Math::Ceiling___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Ceiling___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1215,7 +1127,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Cos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cos___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1225,7 +1137,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Cos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cos___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1235,7 +1147,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Cosh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cosh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1245,7 +1157,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Cosh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Cosh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1255,7 +1167,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::IEEERemainder___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1265,7 +1177,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::IEEERemainder___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::IEEERemainder___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1275,7 +1187,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Exp___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Exp___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1285,7 +1197,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Exp___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Exp___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1295,7 +1207,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Floor___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Floor___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1307,7 +1219,7 @@ NANOCLR_NOCLEANUP_NOLABEL(); } - HRESULT Library_corlib_native_System_Math::Floor___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Floor___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1317,7 +1229,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Log___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1327,7 +1239,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Log___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1337,7 +1249,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Log10___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log10___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1347,7 +1259,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Log10___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Log10___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1357,7 +1269,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Pow___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Pow___STATIC__R8__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1367,7 +1279,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Pow___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Pow___STATIC__R4__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1377,7 +1289,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Round___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Round___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1394,7 +1306,7 @@ NANOCLR_NOCLEANUP_NOLABEL(); } - HRESULT Library_corlib_native_System_Math::Round___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Round___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1404,7 +1316,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sign___STATIC__I4__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1414,7 +1326,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sign___STATIC__I4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sign___STATIC__I4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1424,7 +1336,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sin___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1434,7 +1346,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sin___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1444,7 +1356,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sinh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sinh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1454,7 +1366,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sinh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sinh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1464,7 +1376,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sqrt___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sqrt___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1474,7 +1386,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Sqrt___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Sqrt___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1484,7 +1396,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Tan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tan___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1494,7 +1406,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Tan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tan___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1504,7 +1416,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Tanh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tanh___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1514,7 +1426,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Tanh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Tanh___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1524,7 +1436,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Truncate___STATIC__R8__R8( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Truncate___STATIC__R8__R8( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); @@ -1534,7 +1446,7 @@ NANOCLR_NOCLEANUP(); } - HRESULT Library_corlib_native_System_Math::Truncate___STATIC__R4__R4( CLR_RT_StackFrame& stack ) + HRESULT Library_nf_native_system_math_System_Math::Truncate___STATIC__R4__R4( CLR_RT_StackFrame& stack ) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER();