Managed side of blob generation is done

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/GenerateAssemblyBlobDSO.cs

@@ -43,11 +43,11 @@ public override bool RunTask ()
 			Log.LogDebugMessage ("Assembly compression DISABLED");
 		}
 
-		Generate ();
+		GenerateBlob ();
 		return !Log.HasLoggedErrors;
 	}
 
-	void Generate ()
+	void GenerateBlob ()
 	{
 		var assemblies = new Dictionary<AndroidTargetArch, List<BlobAssemblyInfo>> ();
 		var abis = new HashSet<string> (StringComparer.Ordinal);
@@ -64,6 +64,11 @@ void Generate ()
 			var info = new BlobAssemblyInfo (assembly);
 			archAssemblies.Add (info);
 
+			string configFilePath = $"{assembly.ItemSpec}.config";
+			if (File.Exists (configFilePath)) {
+				info.Config = File.ReadAllText (configFilePath);
+			}
+
 			string inputAssembly;
 			if (!ShouldSkipCompression (assembly)) {
 				// TODO: compress
@@ -81,14 +86,14 @@ void Generate ()
 
 		foreach (ITaskItem blobDSO in AssemblyBlobDSOs) {
 			AndroidTargetArch arch = MonoAndroidHelper.AbiToTargetArch (GetRequiredMetadata (blobDSO, DSOMetadata.Abi));
-			Generate (arch, blobDSO, assemblies[arch]);
+			GenerateBlob (arch, blobDSO, assemblies[arch]);
 		}
 
 		var generator = new AssemblyBlobDSOGenerator (assemblies);
 		LLVMIR.LlvmIrModule module = generator.Construct ();
 
 		foreach (string abi in abis) {
-			string outputAsmFilePath = Path.Combine (SourcesOutputDirectory, $"{PrepareAbiItems.AssemblyDSOBase}.{abi}.ll");
+			string outputAsmFilePath = Path.Combine (SourcesOutputDirectory, MonoAndroidHelper.MakeNativeAssemblyFileName (PrepareAbiItems.AssemblyDSOBase, abi));
 
                         using var sw = MemoryStreamPool.Shared.CreateStreamWriter ();
                         AndroidTargetArch targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
@@ -112,7 +117,7 @@ ulong GetFileSize (string path)
 		return (ulong)fi.Length;
 	}
 
-	void Generate (AndroidTargetArch arch, ITaskItem blobDSO, List<BlobAssemblyInfo> assemblies)
+	void GenerateBlob (AndroidTargetArch arch, ITaskItem blobDSO, List<BlobAssemblyInfo> assemblies)
 	{
 		string stubPath = GetRequiredMetadata (blobDSO, DSOMetadata.BlobStubPath);
 		var stubInfo = new FileInfo (stubPath);

src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs

@@ -105,9 +105,9 @@ void SetAssemblyAbiMetadata (string abi, string assetType, ITaskItem assembly, I
 				return;
 			}
 
-			assembly.SetMetadata ("Abi", abi);
+			assembly.SetMetadata (DSOMetadata.Abi, abi);
 			if (symbol != null) {
-				symbol.SetMetadata ("Abi", abi);
+				symbol.SetMetadata (DSOMetadata.Abi, abi);
 			}
 		}
 

src/Xamarin.Android.Build.Tasks/Utilities/AssemblyBlobDSOGenerator.Classes.cs

@@ -1,33 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
 using Microsoft.Build.Framework;
+using Xamarin.Android.Tasks.LLVMIR;
+using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks;
 
 partial class AssemblyBlobDSOGenerator
 {
-	public sealed class BlobAssemblyInfo
-	{
-		public bool IsCompressed  { get; set; }
-		public ulong OffsetInBlob { get; set; }
-		public ulong SizeInBlob   { get; set; }
-		public ulong Size         { get; set; }
-		public ITaskItem Item     { get; }
+	// Native structures and constants
 
-		public BlobAssemblyInfo (ITaskItem item)
-		{
-			Item = item;
-		}
-	}
+	// Must be identical to the like-named constants in src/monodroid/jni/xamarin-app.hh
+	const uint AssemblyEntry_IsCompressed = 1 << 0;
+	const uint AssemblyEntry_HasConfig    = 1 << 1;
 
 	class AssemblyIndexEntryBase<T>
 	{
+		[NativeAssembler (Ignore = true)]
+		public string Name;
+
+		[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
 		public T     name_hash;
 		public uint  input_data_offset;
 		public uint  input_data_size;
 		public uint  output_data_offset;
 		public uint  output_data_size;
 		public uint  info_index;
-		public bool  is_compressed;
-	};
+		public uint  flags;
+	}
 
 	sealed class AssemblyIndexEntry32 : AssemblyIndexEntryBase<uint>
         {}
@@ -40,5 +42,52 @@ struct AssembliesConfig
 		public uint assembly_blob_size;
 		public uint assembly_name_length;
 		public uint assembly_count;
-	};
+	}
+
+		// Generator support
+	public sealed class BlobAssemblyInfo
+	{
+		public bool IsCompressed  { get; set; }
+		public ulong OffsetInBlob { get; set; }
+		public ulong SizeInBlob   { get; set; }
+		public ulong Size         { get; set; }
+		public ulong Offset       { get; set; }
+		public string? Config     { get; set; }
+		public ITaskItem Item     { get; }
+		public string Name        { get; }
+		public byte[] NameBytes   { get; }
+
+		public BlobAssemblyInfo (ITaskItem item)
+		{
+			Item = item;
+			Name = Path.GetFileName (item.ItemSpec);
+			NameBytes = LlvmIrComposer.StringToBytes (Name);
+		}
+	}
+
+	sealed class ArchState
+	{
+		public ulong BlobSize = 0;
+		public ulong DataSize = 0;
+		public ulong AssemblyNameLength = 0;
+		public ulong AssemblyCount = 0;
+
+		public readonly bool Is64Bit;
+		public readonly List<StructureInstance<AssemblyIndexEntry32>> Index32 = new List<StructureInstance<AssemblyIndexEntry32>> ();
+		public readonly List<StructureInstance<AssemblyIndexEntry64>> Index64 = new List<StructureInstance<AssemblyIndexEntry64>> ();
+		public readonly List<byte[]> AssemblyNames = new List<byte[]> ();
+		public readonly List<BlobAssemblyInfo> Assemblies;
+
+		public ArchState (List<BlobAssemblyInfo> assemblies, AndroidTargetArch arch)
+		{
+			Assemblies = assemblies;
+			Is64Bit = arch switch {
+				AndroidTargetArch.Arm => false,
+				AndroidTargetArch.X86 => false,
+				AndroidTargetArch.Arm64 => true,
+				AndroidTargetArch.X86_64 => true,
+				_ => throw new NotSupportedException ($"Architecture '{arch}' is not supported")
+			};
+		}
+	}
 }