[Decimal] Fix basic decimal startup issues

diff --git a/mono/metadata/decimal-ms.c b/mono/metadata/decimal-ms.c
index 234e846836b9f9c991d49728403b7a0ef05de8de..30c039c289653d59f29f9afdb110852d112501f2 100644 (file)
--- a/mono/metadata/decimal-ms.c
+++ b/mono/metadata/decimal-ms.c
@@ -47,7 +47,7 @@ typedef enum {
 static const uint32_t ten_to_nine    = 1000000000U;
 static const uint32_t ten_to_ten_div_4 = 2500000000U;
 #define POWER10_MAX     9
-#define DECIMAL_NEG ((int8_t)0x80)
+#define DECIMAL_NEG ((uint8_t)0x80)
 #define DECMAX 28
 #define DECIMAL_SCALE(dec)       ((dec).u.u.scale)
 #define DECIMAL_SIGN(dec)        ((dec).u.u.sign)

diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
index 5bccb6777f52129355b508b19ed3f37a1b940000..917585006a8831ecf560326ed50de3af6740cacb 100644 (file)
--- a/mono/metadata/icall-def.h
+++ b/mono/metadata/icall-def.h
@@ -142,18 +142,19 @@ ICALL(DTIME_1, "GetSystemTimeAsFileTime", mono_100ns_datetime)
 
 #ifndef DISABLE_DECIMAL
 ICALL_TYPE(DECIMAL, "System.Decimal", DECIMAL_1)
-ICALL(DECIMAL_1, "FCallAddSub", mono_decimal_addsub)
-ICALL(DECIMAL_2, "FCallCompare", mono_decimal_compare)
-ICALL(DECIMAL_3, "FCallDivide", mono_decimal_divide)
-ICALL(DECIMAL_4, "FCallFloor", mono_decimal_floor)
-ICALL(DECIMAL_5, "FCallMultiply", mono_decimal_multiply)
-ICALL(DECIMAL_6, "FCallToInt32", mono_decimal_to_int32)
-ICALL(DECIMAL_7, "FCallTruncate", mono_decimal_truncate)
-ICALL(DECIMAL_8, "GetHashCode", mono_decimal_get_hash_code)
-ICALL(DECIMAL_9, "InitDouble", mono_decimal_init_double)
-ICALL(DECIMAL_10, "InitSingle", mono_decimal_init_single)
-ICALL(DECIMAL_11, "ToDouble", mono_decimal_to_double)
-ICALL(DECIMAL_12, "ToSingle", mono_decimal_to_float)
+ICALL(DECIMAL_1, ".ctor(double)", mono_decimal_init_double)
+ICALL(DECIMAL_2, ".ctor(single)", mono_decimal_init_single)
+ICALL(DECIMAL_3, "FCallAddSub(System.Decimal&,System.Decimal&,byte)", mono_decimal_addsub)
+ICALL(DECIMAL_4, "FCallCompare", mono_decimal_compare)
+ICALL(DECIMAL_5, "FCallDivide", mono_decimal_divide)
+ICALL(DECIMAL_6, "FCallFloor", mono_decimal_floor)
+ICALL(DECIMAL_7, "FCallMultiply", mono_decimal_multiply)
+ICALL(DECIMAL_8, "FCallRound", mono_decimal_round)
+ICALL(DECIMAL_9, "FCallToInt32", mono_decimal_to_int32)
+ICALL(DECIMAL_10, "FCallTruncate", mono_decimal_truncate)
+ICALL(DECIMAL_11, "GetHashCode", mono_decimal_get_hash_code)
+ICALL(DECIMAL_12, "ToDouble", mono_decimal_to_double)
+ICALL(DECIMAL_13, "ToSingle", mono_decimal_to_float)
 #endif
 
 ICALL_TYPE(DELEGATE, "System.Delegate", DELEGATE_1)