[WIP] Use icall instead of p/invoke

Author: grendello

src/Mono.Android/Android.Runtime/JNIEnv.cs

@@ -272,7 +272,7 @@ static void Initialize ()
 		}
 
 #if NETCOREAPP
-		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		extern static void monodroid_unhandled_exception (Exception javaException);
 #endif
 

src/monodroid/jni/monodroid-glue-internal.hh

@@ -174,11 +174,6 @@ namespace xamarin::android::internal
 		}
 
 #if defined (NET6)
-		void unhandled_exception (MonoObject *java_exception)
-		{
-			mono_unhandled_exception (java_exception);
-		}
-
 		void propagate_uncaught_exception (JNIEnv *env, jobject javaThread, jthrowable javaException);
 #else // def NET6
 		void propagate_uncaught_exception (MonoDomain *domain, JNIEnv *env, jobject javaThread, jthrowable javaException);
@@ -266,6 +261,8 @@ namespace xamarin::android::internal
 		}
 
 #if defined (NET6)
+		static void monodroid_unhandled_exception (MonoObject *java_exception);
+
 		MonoClass* get_android_runtime_class ();
 #else // def NET6
 		MonoClass* get_android_runtime_class (MonoDomain *domain);

src/monodroid/jni/monodroid-glue.cc

@@ -27,6 +27,7 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mono-config.h>
 #include <mono/metadata/mono-debug.h>
+#include <mono/metadata/object.h>
 #include <mono/utils/mono-dl-fallback.h>
 #include <mono/utils/mono-logger.h>
 
@@ -1009,6 +1010,9 @@ MonodroidRuntime::init_android_runtime (
 {
 	mono_add_internal_call ("Java.Interop.TypeManager::monodroid_typemap_java_to_managed", reinterpret_cast<const void*>(typemap_java_to_managed));
 	mono_add_internal_call ("Android.Runtime.JNIEnv::monodroid_typemap_managed_to_java", reinterpret_cast<const void*>(typemap_managed_to_java));
+#if defined (NET6)
+	mono_add_internal_call ("Android.Runtime.JNIEnv::monodroid_unhandled_exception", reinterpret_cast<const void*>(monodroid_unhandled_exception));
+#endif // def NET6
 
 	struct JnienvInitializeArgs init = {};
 	init.javaVm                 = osBridge.get_jvm ();
@@ -1826,6 +1830,14 @@ MonodroidRuntime::create_and_initialize_domain (JNIEnv* env, jclass runtimeClass
 	return domain;
 }
 
+#if defined (NET6)
+void
+MonodroidRuntime::monodroid_unhandled_exception (MonoObject *java_exception)
+{
+	mono_unhandled_exception (java_exception);
+}
+#endif // def NET6
+
 MonoReflectionType*
 MonodroidRuntime::typemap_java_to_managed (MonoString *java_type_name)
 {

src/monodroid/jni/pinvoke-override-api.cc

@@ -345,12 +345,6 @@ monodroid_get_dylib (void)
 	return nullptr;
 }
 
-static void
-monodroid_unhandled_exception (MonoObject *java_exception)
-{
-	monodroidRuntime.unhandled_exception (java_exception);
-}
-
 #define PINVOKE_SYMBOL(_sym_) { #_sym_, reinterpret_cast<void*>(&_sym_) }
 
 MonodroidRuntime::pinvoke_api_map MonodroidRuntime::xa_pinvoke_map = {
@@ -589,7 +583,6 @@ MonodroidRuntime::pinvoke_api_map MonodroidRuntime::xa_pinvoke_map = {
 	PINVOKE_SYMBOL (recv_uninterrupted),
 	PINVOKE_SYMBOL (send_uninterrupted),
 	PINVOKE_SYMBOL (set_world_accessable),
-	PINVOKE_SYMBOL (monodroid_unhandled_exception),
 };
 
 MonodroidRuntime::pinvoke_library_map MonodroidRuntime::other_pinvoke_map (MonodroidRuntime::LIBRARY_MAP_INITIAL_BUCKET_COUNT);