Add some logs and update structure layout

Author: grendello

src/native/clr/host/assembly-store.cc

@@ -26,6 +26,7 @@ auto AssemblyStore::get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData co
 	uint32_t assembly_data_size = 0;
 
 #if defined (HAVE_LZ4) && defined (RELEASE)
+	log_debug (LOG_ASSEMBLY, "Decompressing assembly '{}' from the assembly store", name);
 	auto header = reinterpret_cast<const CompressedAssemblyHeader*>(e.image_data);
 	if (header->magic == COMPRESSED_DATA_MAGIC) {
 		if (compressed_assemblies.descriptors == nullptr) [[unlikely]] {
@@ -110,6 +111,7 @@ auto AssemblyStore::get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData co
 	} else
 #endif // def HAVE_LZ4 && def RELEASE
 	{
+		log_debug (LOG_ASSEMBLY, "Assembly '{}' is not compressed in the assembly store", name);
 		set_assembly_data_and_size (e.image_data, e.descriptor->data_size, assembly_data, assembly_data_size);
 	}
 

src/native/clr/host/host.cc

@@ -31,7 +31,7 @@ size_t Host::clr_get_runtime_property (const char *key, char *value_buffer, size
 bool Host::clr_external_assembly_probe (const char *path, void **data_start, int64_t *size) noexcept
 {
 	// TODO: `path` might be a full path, make sure it isn't
-	log_debug (LOG_DEFAULT, "clr_bundle_probe (\"{}\"...)", path);
+	log_debug (LOG_DEFAULT, "clr_external_assembly_probe (\"{}\"...)", path);
 	if (data_start == nullptr || size == nullptr) {
 		return false; // TODO: abort instead?
 	}

src/native/clr/include/host/host.hh

@@ -57,9 +57,9 @@ namespace xamarin::android {
 			.size = sizeof(host_runtime_contract),
 			.context = nullptr,
 			.get_runtime_property = clr_get_runtime_property,
-			.external_assembly_probe = clr_external_assembly_probe,
 			.bundle_probe = nullptr,
 			.pinvoke_override = clr_pinvoke_override,
+			.external_assembly_probe = clr_external_assembly_probe,
 		};
 
 		// Enough to fit 0xffffffffffffffff + terminating NUL