Cleanup

Author: grendello

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

@@ -21,7 +21,7 @@ void AssemblyStore::set_assembly_data_and_size (uint8_t* source_assembly_data, u
 }
 
 [[gnu::always_inline]]
-auto AssemblyStore::get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData const& e, std::string_view const& name, bool force_rw) noexcept -> std::tuple<uint8_t*, uint32_t>
+auto AssemblyStore::get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData const& e, std::string_view const& name) noexcept -> std::tuple<uint8_t*, uint32_t>
 {
 	uint8_t *assembly_data = nullptr;
 	uint32_t assembly_data_size = 0;
@@ -231,8 +231,7 @@ auto AssemblyStore::open_assembly (std::string_view const& name, int64_t &size)
 		);
 	}
 
-	constexpr hash_t mscorlib_hash = 0x579a06fed6eec900;
-	auto [assembly_data, assembly_data_size] = get_assembly_data (assembly_runtime_info, name, name_hash == mscorlib_hash);
+	auto [assembly_data, assembly_data_size] = get_assembly_data (assembly_runtime_info, name);
 	size = assembly_data_size;
 	return assembly_data;
 }

src/native/clr/host/host-jni.cc

@@ -49,11 +49,13 @@ Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass klass, jstring lang,
 }
 
 JNIEXPORT void
-JNICALL Java_mono_android_Runtime_propagateUncaughtException (JNIEnv *env, [[maybe_unused]] jclass klass, jobject javaThread, jthrowable javaException)
+JNICALL Java_mono_android_Runtime_propagateUncaughtException ([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass klass, [[maybe_unused]] jobject javaThread, [[maybe_unused]] jthrowable javaException)
 {
+	// TODO: implement or remove
 }
 
 JNIEXPORT void
 JNICALL Java_mono_android_Runtime_notifyTimeZoneChanged ([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass klass)
 {
+	// TODO: implement or remove
 }

src/native/clr/host/internal-pinvokes.cc

@@ -15,6 +15,7 @@ int _monodroid_gref_get () noexcept
 
 void _monodroid_gref_log (const char *message) noexcept
 {
+	OSBridge::_monodroid_gref_log (message);
 }
 
 int _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable) noexcept
@@ -24,6 +25,7 @@ int _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle,
 
 void _monodroid_gref_log_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable) noexcept
 {
+	OSBridge::_monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
 }
 
 const char* clr_typemap_managed_to_java (const char *typeName, const uint8_t *mvid) noexcept

src/native/clr/include/host/assembly-store.hh

@@ -25,7 +25,7 @@ namespace xamarin::android {
 		static void set_assembly_data_and_size (uint8_t* source_assembly_data, uint32_t source_assembly_data_size, uint8_t*& dest_assembly_data, uint32_t& dest_assembly_data_size) noexcept;
 
 		// Returns a tuple of <assembly_data_pointer, data_size>
-		static auto get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData const& e, std::string_view const& name, bool force_rw = false) noexcept -> std::tuple<uint8_t*, uint32_t>;
+		static auto get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData const& e, std::string_view const& name) noexcept -> std::tuple<uint8_t*, uint32_t>;
 		static auto find_assembly_store_entry (hash_t hash, const AssemblyStoreIndexEntry *entries, size_t entry_count) noexcept -> const AssemblyStoreIndexEntry*;
 
 	private: