* update mono-ios tag:mono-6.12.0.148

Author: loongly

DemoProject/Assets/Editor.meta

@@ -7,6 +7,7 @@
 -r:../Managed/netstandard.dll
 -r:../Managed/UnityEngine.CoreModule.dll
 -define:WRAPPER_SIDE
+-define:IOS
 /Users/long/Documents/Project/PureScript/ScriptEngine/Adapter/glue/Binder.define.cs
 /Users/long/Documents/Project/PureScript/ScriptEngine/Adapter/glue/Binder.funcdeser.cs
 /Users/long/Documents/Project/PureScript/ScriptEngine/Adapter/Tools/CustomBinder.cs

DemoProject/Assets/Plugins/PureScript/ScriptEngine/ios.meta

@@ -65,6 +65,8 @@ typedef enum {
 	MONO_AOT_MODE_INTERP_LLVMONLY,
 	/* Use only llvm compiled code, fall back to the interpeter */
 	MONO_AOT_MODE_LLVMONLY_INTERP,
+	/* Same as --interp */
+	MONO_AOT_MODE_INTERP_ONLY,
 	/* Sentinel value used internally by the runtime. We use a large number to avoid clashing with some internal values. */
 	MONO_AOT_MODE_LAST = 1000,
 } MonoAotMode;
@@ -112,7 +114,6 @@ mono_aot_register_module (void **aot_info);
 MONO_API MONO_RT_EXTERNAL_ONLY
 MonoDomain* mono_jit_thread_attach (MonoDomain *domain);
 
-
 MONO_END_DECLS
 
 #endif

DemoProject/Assets/Plugins/PureScript/iOS.meta

@@ -0,0 +1,39 @@
+/**
+ * \file
+ * 
+ * Private unstable APIs.
+ *
+ * WARNING: The declarations and behavior of functions in this header are NOT STABLE and can be modified or removed at
+ * any time.
+ *
+ */
+
+
+#ifndef __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__
+#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__
+
+#include <mono/utils/mono-publib.h>
+#include <mono/metadata/image.h>
+
+/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
+/*
+ * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
+ * passed to the free function.
+ */
+typedef unsigned char* (*MonoLoadAotDataFunc)          (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
+/* Not yet used */
+typedef void  (*MonoFreeAotDataFunc)          (MonoAssembly *assembly, int size, void* user_data, void *handle);
+MONO_API MONO_RT_EXTERNAL_ONLY void
+mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);
+
+MONO_API int
+monovm_initialize (int propertyCount, const char **propertyKeys, const char **propertyValues);
+
+//#ifdef HOST_WASM
+typedef void* (*MonoWasmGetNativeToInterpTramp) (MonoMethod *method, void *extra_arg);
+
+MONO_API void
+mono_wasm_install_get_native_to_interp_tramp (MonoWasmGetNativeToInterpTramp cb);
+//#endif
+
+#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

DemoProject/Assets/StreamingAssets.meta

@@ -106,6 +106,9 @@ mono_domain_foreach        (MonoDomainFunc func, void* user_data);
 MONO_API MONO_RT_EXTERNAL_ONLY MonoAssembly *
 mono_domain_assembly_open  (MonoDomain *domain, const char *name);
 
+MONO_API void
+mono_domain_ensure_entry_assembly (MonoDomain *domain, MonoAssembly *assembly);
+
 MONO_API mono_bool
 mono_domain_finalize       (MonoDomain *domain, uint32_t timeout);
 

ScriptEngine/Tools/Adapter.wrapper.dll.txt

@@ -19,7 +19,8 @@ MONO_API MONO_RT_EXTERNAL_ONLY
 MonoAssembly *mono_assembly_open_full (const char *filename,
 				       	MonoImageOpenStatus *status,
 					mono_bool refonly);
-MONO_API MonoAssembly* mono_assembly_load       (MonoAssemblyName *aname, 
+MONO_API MONO_RT_EXTERNAL_ONLY
+MonoAssembly* mono_assembly_load       (MonoAssemblyName *aname, 
                                        	const char       *basedir, 
 				     	MonoImageOpenStatus *status);
 MONO_API MONO_RT_EXTERNAL_ONLY

ScriptEngine/Tools/lib/iOS/mscorlib.dll

@@ -81,8 +81,8 @@ typedef enum {
 	MONO_TABLE_TYPESPEC,
 	MONO_TABLE_IMPLMAP,
 	MONO_TABLE_FIELDRVA,
-	MONO_TABLE_UNUSED6,
-	MONO_TABLE_UNUSED7,
+	MONO_TABLE_ENCLOG,
+	MONO_TABLE_ENCMAP,
 	MONO_TABLE_ASSEMBLY, /* 0x20 */
 	MONO_TABLE_ASSEMBLYPROCESSOR,
 	MONO_TABLE_ASSEMBLYOS,

ScriptEngine/Tools/lib/iOS/mscorlib.pdb

@@ -18,6 +18,13 @@ typedef struct _MonoClassField MonoClassField;
 typedef struct _MonoProperty MonoProperty;
 typedef struct _MonoEvent MonoEvent;
 
+typedef enum {
+	MONO_TYPE_NAME_FORMAT_IL,
+	MONO_TYPE_NAME_FORMAT_REFLECTION,
+	MONO_TYPE_NAME_FORMAT_FULL_NAME,
+	MONO_TYPE_NAME_FORMAT_ASSEMBLY_QUALIFIED
+} MonoTypeNameFormat;
+
 MONO_API MONO_RT_EXTERNAL_ONLY
 MonoClass *
 mono_class_get             (MonoImage *image, uint32_t type_token);
@@ -130,6 +137,9 @@ MONO_API MONO_RT_EXTERNAL_ONLY
 void*
 mono_ldtoken               (MonoImage *image, uint32_t token, MonoClass **retclass, MonoGenericContext *context);
 
+MONO_API char *
+mono_type_get_name_full (MonoType *type, MonoTypeNameFormat format);
+
 MONO_API char*         
 mono_type_get_name         (MonoType *type);
 

ScriptEngine/Tools/mono/aarch64-darwin-mono-sgen

@@ -106,8 +106,7 @@ mono_get_exception_argument_null       (const char *arg);
 MONO_API MonoException *
 mono_get_exception_argument            (const char *arg, const char *msg);
 
-MONO_API MONO_RT_EXTERNAL_ONLY
-MonoException *
+MONO_API MonoException *
 mono_get_exception_argument_out_of_range (const char *arg);
 
 MONO_API MONO_RT_EXTERNAL_ONLY

ScriptEngine/lib/include/mono/cil/opcode.def

@@ -92,6 +92,8 @@ MONO_API void          mono_image_add_to_name_cache (MonoImage *image,
 			const char *nspace, const char *name, uint32_t idx);
 MONO_API mono_bool     mono_image_has_authenticode_entry (MonoImage *image);
 
+mono_bool mono_has_pdb_checksum (char *raw_data, uint32_t raw_data_len);
+
 MONO_END_DECLS
 
 #endif

ScriptEngine/lib/include/mono/jit/jit.h

@@ -37,7 +37,11 @@ typedef enum {
 	MONO_CALL_STDCALL,
 	MONO_CALL_THISCALL,
 	MONO_CALL_FASTCALL,
-	MONO_CALL_VARARG
+	MONO_CALL_VARARG = 0x05,
+	/* unused, */
+	/* unused, */
+	/* unused, */
+	MONO_CALL_UNMANAGED_MD = 0x09, /* default unmanaged calling convention, with additional attributed encoded in modopts */
 } MonoCallConvention;
 
 /* ECMA lamespec: the old spec had more info... */
@@ -171,7 +175,9 @@ typedef enum {
 	MONO_MARSHAL_CONV_SB_UTF8STR,
 	MONO_MARSHAL_CONV_UTF8STR_STR,
 	MONO_MARSHAL_CONV_UTF8STR_SB,
-	MONO_MARSHAL_CONV_FIXED_BUFFER
+	MONO_MARSHAL_CONV_FIXED_BUFFER,
+	MONO_MARSHAL_CONV_ANSIBSTR_STR,
+	MONO_MARSHAL_CONV_TBSTR_STR
 } MonoMarshalConv;
 
 #define MONO_MARSHAL_CONV_INVALID ((MonoMarshalConv)-1)
@@ -199,13 +205,15 @@ typedef struct {
 
 MONO_API void         mono_metadata_init (void);
 
+void mono_metadata_decode_row_raw (const MonoTableInfo *t, int idx, uint32_t *res, int res_size);
+
 MONO_API void         mono_metadata_decode_row (const MonoTableInfo   *t,
 				       int                    idx,
 				       uint32_t               *res,
 				       int                    res_size);
 
-MONO_API uint32_t      mono_metadata_decode_row_col (const MonoTableInfo *t, 
-					   int            idx, 
+MONO_API uint32_t      mono_metadata_decode_row_col (const MonoTableInfo *t,
+					   int            idx,
 					   unsigned int          col);
 
 /*
@@ -224,7 +232,7 @@ MONO_API int mono_metadata_compute_size (MonoImage   *meta,
  */
 MONO_API const char    *mono_metadata_locate        (MonoImage *meta, int table, int idx);
 MONO_API const char    *mono_metadata_locate_token  (MonoImage *meta, uint32_t token);
-					   
+
 MONO_API const char    *mono_metadata_string_heap   (MonoImage *meta, uint32_t table_index);
 MONO_API const char    *mono_metadata_blob_heap     (MonoImage *meta, uint32_t table_index);
 MONO_API const char    *mono_metadata_user_string   (MonoImage *meta, uint32_t table_index);
@@ -252,7 +260,7 @@ MONO_API void mono_metadata_free_marshal_spec (MonoMarshalSpec *spec);
 
 MONO_API uint32_t     mono_metadata_implmap_from_method     (MonoImage *meta, uint32_t method_idx);
 
-MONO_API void        mono_metadata_field_info (MonoImage *meta, 
+MONO_API void        mono_metadata_field_info (MonoImage *meta,
 				      uint32_t       table_index,
 				      uint32_t      *offset,
 				      uint32_t      *rva,
@@ -367,10 +375,10 @@ MONO_API mono_bool mono_type_is_pointer   (MonoType *type);
 MONO_API mono_bool mono_type_is_reference (MonoType *type);
 MONO_API mono_bool mono_type_is_generic_parameter (MonoType *type);
 
-MONO_API MonoType*
+MONO_API MONO_RT_EXTERNAL_ONLY MonoType*
 mono_signature_get_return_type (MonoMethodSignature *sig);
 
-MONO_API MonoType*
+MONO_API MONO_RT_EXTERNAL_ONLY MonoType*
 mono_signature_get_params      (MonoMethodSignature *sig, void **iter);
 
 MONO_API uint32_t
@@ -421,9 +429,9 @@ MONO_API MONO_RT_EXTERNAL_ONLY
 MonoType      *mono_type_create_from_typespec  (MonoImage        *image,
 					        uint32_t           type_spec);
 MONO_API void           mono_metadata_free_type         (MonoType        *type);
-MONO_API int            mono_type_size                  (MonoType        *type, 
+MONO_API int            mono_type_size                  (MonoType        *type,
 						int             *alignment);
-MONO_API int            mono_type_stack_size            (MonoType        *type, 
+MONO_API int            mono_type_stack_size            (MonoType        *type,
 						int             *alignment);
 
 MONO_API mono_bool       mono_type_generic_inst_is_valuetype      (MonoType *type);
@@ -437,7 +445,7 @@ MONO_API MonoMethodSignature  *mono_metadata_signature_alloc (MonoImage *image,
 MONO_API MonoMethodSignature  *mono_metadata_signature_dup (MonoMethodSignature *sig);
 
 MONO_API MONO_RT_EXTERNAL_ONLY
-MonoMethodSignature  *mono_metadata_parse_signature (MonoImage *image, 
+MonoMethodSignature  *mono_metadata_parse_signature (MonoImage *image,
 						     uint32_t    token);
 
 MONO_API MONO_RT_EXTERNAL_ONLY
@@ -447,7 +455,7 @@ MonoMethodSignature  *mono_metadata_parse_method_signature (MonoImage
                                                             const char           **rptr);
 MONO_API void                  mono_metadata_free_method_signature  (MonoMethodSignature   *method);
 
-MONO_API mono_bool          mono_metadata_signature_equal (MonoMethodSignature *sig1, 
+MONO_API mono_bool          mono_metadata_signature_equal (MonoMethodSignature *sig1,
 						 MonoMethodSignature *sig2);
 
 MONO_API unsigned int             mono_signature_hash (MonoMethodSignature *sig);
@@ -456,7 +464,7 @@ MONO_API MONO_RT_EXTERNAL_ONLY
 MonoMethodHeader *mono_metadata_parse_mh (MonoImage *m, const char *ptr);
 MONO_API void              mono_metadata_free_mh  (MonoMethodHeader *mh);
 
-/* MonoMethodHeader acccessors */
+/* MonoMethodHeader accessors */
 MONO_API const unsigned char*
 mono_method_header_get_code (MonoMethodHeader *header, uint32_t* code_size, uint32_t* max_stack);
 
@@ -469,8 +477,8 @@ mono_method_header_get_num_clauses (MonoMethodHeader *header);
 MONO_API int
 mono_method_header_get_clauses (MonoMethodHeader *header, MonoMethod *method, void **iter, MonoExceptionClause *clause);
 
-MONO_API uint32_t 
-mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, 
+MONO_API uint32_t
+mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec,
 			mono_bool as_field, mono_bool unicode, MonoMarshalConv *conv);
 
 /*
@@ -507,7 +515,7 @@ MONO_API void    mono_metadata_decode_table_row (MonoImage *image, int table,
 				       int                    res_size);
 
 MONO_API uint32_t      mono_metadata_decode_table_row_col (MonoImage *image, int table,
-					   int            idx, 
+					   int            idx,
 					   unsigned int          col);
 
 MONO_END_DECLS

ScriptEngine/lib/include/mono/jit/mono-private-unstable.h

@@ -194,7 +194,6 @@ mono_debug_lookup_locals (MonoMethod *method);
 MonoDebugMethodAsyncInfo*
 mono_debug_lookup_method_async_debug_info (MonoMethod *method);
 
-// The intent here is really MONO_LLVM_INTERNAL but that is not necessarily available.
 MONO_API
 MonoDebugSourceLocation *
 mono_debug_method_lookup_location (MonoDebugMethodInfo *minfo, int il_offset);

ScriptEngine/lib/include/mono/metadata/appdomain.h

@@ -123,6 +123,15 @@ MONO_API int    mono_gc_invoke_finalizers (void);
 /* heap walking is only valid in the pre-stop-world event callback */
 MONO_API int    mono_gc_walk_heap        (int flags, MonoGCReferences callback, void *data);
 
+MONO_API MONO_RT_EXTERNAL_ONLY void
+mono_gc_init_finalizer_thread (void);
+
+/*
+ * Only supported under SGen. These two with Sgen will take and release the LOCK_GC
+ */
+void mono_gc_stop_world (void);
+void mono_gc_restart_world (void);
+
 MONO_END_DECLS
 
 #endif /* __METADATA_MONO_GC_H__ */

ScriptEngine/lib/include/mono/metadata/assembly.h

@@ -0,0 +1,41 @@
+/**
+ * \file
+ * 
+ * Private unstable APIs.
+ *
+ * WARNING: The declarations and behavior of functions in this header are NOT STABLE and can be modified or removed at
+ * any time.
+ *
+ */
+
+
+#ifndef __MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__
+#define __MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__
+
+#include <mono/utils/mono-publib.h>
+
+typedef MonoGCHandle MonoAssemblyLoadContextGCHandle;
+
+MONO_API MONO_RT_EXTERNAL_ONLY MonoAssembly *
+mono_assembly_load_full_alc (MonoAssemblyLoadContextGCHandle alc_gchandle, MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status);
+
+MONO_API MONO_RT_EXTERNAL_ONLY MonoImage *
+mono_image_open_from_data_alc (MonoAssemblyLoadContextGCHandle alc_gchandle, char *data, uint32_t data_len, mono_bool need_copy, MonoImageOpenStatus *status, const char *name);
+
+typedef MonoAssembly * (*MonoAssemblyPreLoadFuncV3) (MonoAssemblyLoadContextGCHandle alc_gchandle, MonoAssemblyName *aname, char **assemblies_path, void *user_data, MonoError *error);
+
+MONO_API MONO_RT_EXTERNAL_ONLY void
+mono_install_assembly_preload_hook_v3 (MonoAssemblyPreLoadFuncV3 func, void *user_data, mono_bool append);
+
+MONO_API MONO_RT_EXTERNAL_ONLY MonoAssemblyLoadContextGCHandle
+mono_alc_get_default_gchandle (void);
+
+typedef struct _MonoBundledSatelliteAssembly MonoBundledSatelliteAssembly;
+
+MONO_API void
+mono_register_bundled_satellite_assemblies (const MonoBundledSatelliteAssembly **assemblies);
+
+MONO_API MonoBundledSatelliteAssembly *
+mono_create_new_bundled_satellite_assembly (const char *name, const char *culture, const unsigned char *data, unsigned int size);
+
+#endif /*__MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__*/

ScriptEngine/lib/include/mono/metadata/blob.h

@@ -372,6 +372,11 @@ MONO_API MONO_RT_EXTERNAL_ONLY uint32_t     mono_gchandle_new_weakref (MonoObjec
 MONO_API MONO_RT_EXTERNAL_ONLY MonoObject*  mono_gchandle_get_target  (uint32_t gchandle);
 MONO_API MONO_RT_EXTERNAL_ONLY void         mono_gchandle_free        (uint32_t gchandle);
 
+MONO_API MONO_RT_EXTERNAL_ONLY MonoGCHandle mono_gchandle_new_v2         (MonoObject *obj, mono_bool pinned);
+MONO_API MONO_RT_EXTERNAL_ONLY MonoGCHandle mono_gchandle_new_weakref_v2 (MonoObject *obj, mono_bool track_resurrection);
+MONO_API MONO_RT_EXTERNAL_ONLY MonoObject*  mono_gchandle_get_target_v2  (MonoGCHandle gchandle);
+MONO_API MONO_RT_EXTERNAL_ONLY void         mono_gchandle_free_v2        (MonoGCHandle gchandle);
+
 /* Reference queue support
  *
  * A reference queue is used to get notifications of when objects are collected.

ScriptEngine/lib/include/mono/metadata/class.h

@@ -67,7 +67,9 @@ typedef struct {
 	unsigned short opval;
 } MonoOpcode;
 
+MONO_BEGIN_DECLS
 MONO_API_DATA const MonoOpcode mono_opcodes [];
+MONO_END_DECLS
 
 MONO_API const char*
 mono_opcode_name (int opcode);