diff --git a/src/CLR/CorLib/corlib_native.cpp b/src/CLR/CorLib/corlib_native.cpp index e9f461fce1..1e18615d5c 100644 --- a/src/CLR/CorLib/corlib_native.cpp +++ b/src/CLR/CorLib/corlib_native.cpp @@ -597,8 +597,8 @@ static const CLR_RT_MethodHandler method_lookup[] = NULL, NULL, 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, NULL, Library_corlib_native_System_MulticastDelegate::op_Equality___STATIC__BOOLEAN__SystemMulticastDelegate__SystemMulticastDelegate, @@ -1320,8 +1320,8 @@ static const CLR_RT_MethodHandler method_lookup[] = NULL, NULL, 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, NULL, Library_corlib_native_System_MulticastDelegate::op_Equality___STATIC__BOOLEAN__SystemMulticastDelegate__SystemMulticastDelegate, @@ -1483,18 +1483,18 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib = #if (NANOCLR_REFLECTION == TRUE) - 0xCCE8376E, + 0x445C7AF9, #elif (NANOCLR_REFLECTION == FALSE) - 0xF60D1B13, + 0xE3A4B52F, #else #error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options." #endif method_lookup, - { 100, 5, 0, 18 } + { 100, 5, 0, 19 } }; // clang-format on diff --git a/src/CLR/CorLib/corlib_native.h b/src/CLR/CorLib/corlib_native.h index 917209ab81..2fcac4321c 100644 --- a/src/CLR/CorLib/corlib_native.h +++ b/src/CLR/CorLib/corlib_native.h @@ -653,8 +653,6 @@ struct Library_corlib_native_System_Guid struct Library_corlib_native_System_MathInternal { NANOCLR_NATIVE_DECLARE(Abs___STATIC__I4__I4); - NANOCLR_NATIVE_DECLARE(Min___STATIC__I4__I4__I4); - 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 index 4c2eedd850..1e7f87c8df 100644 --- a/src/CLR/CorLib/corlib_native_System_MathInternal.cpp +++ b/src/CLR/CorLib/corlib_native_System_MathInternal.cpp @@ -5,44 +5,15 @@ // #include "CorLib.h" -HRESULT Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4( CLR_RT_StackFrame& stack ) +HRESULT Library_corlib_native_System_MathInternal::Abs___STATIC__I4__I4(CLR_RT_StackFrame &stack) { NATIVE_PROFILE_CLR_CORE(); NANOCLR_HEADER(); CLR_INT32 d = stack.Arg0().NumericByRefConst().s4; - CLR_INT32 res = abs( d ); + CLR_INT32 res = abs(d); - stack.SetResult_I4( res ); + stack.SetResult_I4(res); NANOCLR_NOCLEANUP_NOLABEL(); } - -HRESULT Library_corlib_native_System_MathInternal::Max___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) -{ - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - CLR_INT32 x = stack.Arg0().NumericByRefConst().s4; - CLR_INT32 y = stack.Arg1().NumericByRefConst().s4; - CLR_INT32 res = x >= y ? x : y; - - stack.SetResult_I4( res ); - - NANOCLR_NOCLEANUP_NOLABEL(); -} - -HRESULT Library_corlib_native_System_MathInternal::Min___STATIC__I4__I4__I4( CLR_RT_StackFrame& stack ) -{ - NATIVE_PROFILE_CLR_CORE(); - NANOCLR_HEADER(); - - CLR_INT32 x = stack.Arg0().NumericByRefConst().s4; - CLR_INT32 y = stack.Arg1().NumericByRefConst().s4; - CLR_INT32 res = x <= y ? x : y; - - stack.SetResult_I4( res ); - - NANOCLR_NOCLEANUP_NOLABEL(); -} -