Moving GetExponent/Mantissa and make BigInteger used fixed-sized buffer

dotnet · Sep 19, 2018 · 9f259bc · 9f259bc
1 parent c27ad27
commit 9f259bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Double.cs b/src/System.Private.CoreLib/shared/System/Double.cs
@@ -44,22 +44,6 @@ namespace System
         // We use this explicit definition to avoid the confusion between 0.0 and -0.0.
         internal const double NegativeZero = -0.0;
 
-        [NonVersionable]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static int GetExponent(double d)
-        {
-            var bits = BitConverter.DoubleToInt64Bits(d);
-            return (int)((bits >> 52) & 0x7FF);
-        }
-
-        [NonVersionable]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static long GetMantissa(double d)
-        {
-            var bits = BitConverter.DoubleToInt64Bits(d);
-            return (bits & 0xFFFFFFFFFFFFF);
-        }
-
         /// <summary>Determines whether the specified value is finite (zero, subnormal, or normal).</summary>
         [NonVersionable]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/src/System.Private.CoreLib/shared/System/Number.BigInteger.cs b/src/System.Private.CoreLib/shared/System/Number.BigInteger.cs
@@ -721,9 +721,11 @@ public void ShiftLeft(uint shift)
                 }
             }
 
-            [StructLayout(LayoutKind.Sequential, Size = (MaxBlockCount * sizeof(uint)))]
+            [StructLayout(LayoutKind.Sequential, Pack = 1)]
             private struct BlocksBuffer
             {
+                private fixed uint _blocks[MaxBlockCount];
+
                 public ref uint this[int index]
                 {
                     get

diff --git a/src/System.Private.CoreLib/shared/System/Number.Formatting.cs b/src/System.Private.CoreLib/shared/System/Number.Formatting.cs
@@ -2310,8 +2310,8 @@ private static unsafe void DoubleToNumber(double value, int precision, ref Numbe
 
         private static long ExtractFractionAndBiasedExponent(double value, out int exponent)
         {
-            long fraction = double.GetMantissa(value);
-            exponent = double.GetExponent(value);
+            long fraction = GetMantissa(value);
+            exponent = GetExponent(value);
 
             if (exponent != 0)
             {
@@ -2338,5 +2338,19 @@ private static long ExtractFractionAndBiasedExponent(double value, out int expon
 
             return fraction;
         }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static int GetExponent(double d)
+        {
+            var bits = BitConverter.DoubleToInt64Bits(d);
+            return (int)((bits >> 52) & 0x7FF);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static long GetMantissa(double d)
+        {
+            var bits = BitConverter.DoubleToInt64Bits(d);
+            return (bits & 0xFFFFFFFFFFFFF);
+        }
     }
 }