Merge branch 'synchronize-runtime-init-android' of github.com:matouskozak/runtime into synchronize-runtime-init-android

Author: matouskozak

MemMove_1

@@ -6,6 +6,8 @@
 using System.IO;
 using Internal.Cryptography;
 using Microsoft.Win32.SafeHandles;
+using System.Runtime.CompilerServices;
+
 
 namespace System.Security.Cryptography
 {
@@ -202,6 +204,8 @@ protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm)
             protected override bool TryHashData(ReadOnlySpan<byte> data, Span<byte> destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) =>
                 CryptographicOperations.TryHashData(hashAlgorithm, data, destination, out bytesWritten);
 
+
+            [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
             public override byte[] CreateSignature(byte[] rgbHash)
             {
                 ArgumentNullException.ThrowIfNull(rgbHash);
@@ -211,6 +215,16 @@ public override byte[] CreateSignature(byte[] rgbHash)
                 int signatureFieldSize = Interop.AndroidCrypto.DsaSignatureFieldSize(key) * BitsPerByte;
                 Span<byte> signDestination = stackalloc byte[SignatureStackBufSize];
 
+                // Console.Write("Key: ");
+                // System.Console.WriteLine(key);
+                // Console.Write("rgbHash: ");
+                // for (int i = 0; i < rgbHash.Length; i++)
+                // {
+                //     System.Console.Write($"{rgbHash[i]:X2}");
+                // }
+                // System.Console.WriteLine();
+                // Console.Write("signatureSize: ");
+                // System.Console.WriteLine(signatureSize);
                 ReadOnlySpan<byte> derSignature = SignHash(rgbHash, signDestination, signatureSize, key);
                 return AsymmetricAlgorithmHelpers.ConvertDerToIeee1363(derSignature, signatureFieldSize);
             }
@@ -286,6 +300,7 @@ protected override bool TryCreateSignatureCore(
                 }
             }
 
+            [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
             private static ReadOnlySpan<byte> SignHash(
                 ReadOnlySpan<byte> hash,
                 Span<byte> destination,
@@ -298,10 +313,30 @@ private static ReadOnlySpan<byte> SignHash(
                     destination = new byte[signatureLength];
                 }
 
+                // Console.Write("Key: ");
+                // System.Console.WriteLine(key);
+                // System.Console.Write("Hash: ");
+                // for (int i = 0; i < hash.Length; i++)
+                // {
+                //     System.Console.Write($"{hash[i]:X2}");
+                // }
+                // System.Console.WriteLine();
+                // System.Console.Write("Destination: ");
+                // for (int i = 0; i < destination.Length; i++)
+                // {
+                //     System.Console.Write($"{destination[i]:X2}");
+                // }
+                // System.Console.WriteLine();
+                // Console.WriteLine("Before DSASign interop call");
                 if (!Interop.AndroidCrypto.DsaSign(key, hash, destination, out int actualLength))
                 {
+                //     Console.WriteLine("DSASign interop failed");
+                //     Console.WriteLine("HelloWorld");
+                //     Console.Write("actualLength: ");
+                //     System.Console.WriteLine(actualLength);
                     throw new CryptographicException();
                 }
+                // Console.WriteLine("After DSASign interop call");
 
                 Debug.Assert(
                     actualLength <= signatureLength,

MemMove_2

@@ -86,6 +86,7 @@ public void SetException(Exception error)
         /// <param name="token">Opaque value that was provided to the <see cref="ValueTask"/>'s constructor.</param>
         public ValueTaskSourceStatus GetStatus(short token)
         {
+            Console.WriteLine("TODO: GetStatus");
             ValidateToken(token);
             return
                 _continuation == null || !_completed ? ValueTaskSourceStatus.Pending :
@@ -101,6 +102,7 @@ public TResult GetResult(short token)
             ValidateToken(token);
             if (!_completed)
             {
+                Internal.Console.Write("GetResults")
                 throw new InvalidOperationException();
             }
 
@@ -163,6 +165,7 @@ public void OnCompleted(Action<object?> continuation, object? state, short token
                 // Operation already completed, so we need to queue the supplied callback.
                 if (!ReferenceEquals(oldContinuation, ManualResetValueTaskSourceCoreShared.s_sentinel))
                 {
+                    Internal.Console.Write("oldContinuation");
                     throw new InvalidOperationException();
                 }
 
@@ -191,6 +194,9 @@ public void OnCompleted(Action<object?> continuation, object? state, short token
         /// <param name="token">The token supplied by <see cref="ValueTask"/>.</param>
         private void ValidateToken(short token)
         {
+            Internal.Console.Write("ValidateToken");
+            Internal.Console.Write(token);
+            Internal.Console.Write(_version);
             if (token != _version)
             {
                 throw new InvalidOperationException();
@@ -202,6 +208,7 @@ private void SignalCompletion()
         {
             if (_completed)
             {
+                Internal.Console.Write("_completed");
                 throw new InvalidOperationException();
             }
             _completed = true;
@@ -265,6 +272,7 @@ internal static class ManualResetValueTaskSourceCoreShared // separated out of g
         private static void CompletionSentinel(object? _) // named method to aid debugging
         {
             Debug.Fail("The sentinel delegate should never be invoked.");
+            Internal.Console.Write("completionsentinel");
             throw new InvalidOperationException();
         }
     }

logcat.txt

@@ -300,7 +300,8 @@ public void AsymmetricDSASignature()
 
             DSA key = TestHelpers.GetWorkingDSA();
             signedXml.SigningKey = key;
-
+            // Console.Write("Generated key: ");
+            // Console.WriteLine(key.ToXmlString(true));
             // Add a KeyInfo.
             KeyInfo keyInfo = new KeyInfo();
             keyInfo.AddClause(new DSAKeyValue(key));

src/libraries/Common/src/System/Security/Cryptography/DSAAndroid.cs

@@ -18,6 +18,8 @@ public virtual byte[] CreateSignature(HashAlgorithm hash)
 
             SetHashAlgorithm(hash.ToAlgorithmName()!);
             Debug.Assert(hash.Hash != null);
+            // Console.Write("hash.Hash: ");
+            // Console.WriteLine(hash.Hash);
             return CreateSignature(hash.Hash);
         }
 

src/libraries/Microsoft.Bcl.AsyncInterfaces/src/System/Threading/Tasks/Sources/ManualResetValueTaskSourceCore.cs

@@ -1,5 +1,5 @@
-BUILD_CONFIG=Release
-TARGET_ARCH?=x64
+BUILD_CONFIG=Debug
+TARGET_ARCH?=arm64
 DOTNET := ../../../../dotnet.sh
 USE_LLVM=true
 AOT=false