mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 11:21:39 -10:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c07cb682b7 | ||
|
|
7c084530b0 | ||
|
|
8b3e6c0526 | ||
|
|
7fbce79900 | ||
|
|
13e536a659 |
No files matched your search
+1
-1
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.1.0],
|
||||
AC_INIT(mono, [3.1.1],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README])
|
||||
|
||||
+21
-4
@@ -122,9 +122,14 @@ mono_string_from_byvalwstr (gunichar2 *data, int len);
|
||||
static void
|
||||
mono_byvalarray_to_array (MonoArray *arr, gpointer native_arr, MonoClass *eltype, guint32 elnum);
|
||||
|
||||
static void
|
||||
mono_byvalarray_to_byte_array (MonoArray *arr, gpointer native_arr, guint32 elnum);
|
||||
|
||||
static void
|
||||
mono_array_to_byvalarray (gpointer native_arr, MonoArray *arr, MonoClass *eltype, guint32 elnum);
|
||||
|
||||
static void
|
||||
mono_array_to_byte_byvalarray (gpointer native_arr, MonoArray *arr, guint32 elnum);
|
||||
|
||||
static MonoAsyncResult *
|
||||
mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params);
|
||||
@@ -239,7 +244,9 @@ mono_marshal_init (void)
|
||||
register_icall (mono_array_to_lparray, "mono_array_to_lparray", "ptr object", FALSE);
|
||||
register_icall (mono_free_lparray, "mono_free_lparray", "void object ptr", FALSE);
|
||||
register_icall (mono_byvalarray_to_array, "mono_byvalarray_to_array", "void object ptr ptr int32", FALSE);
|
||||
register_icall (mono_byvalarray_to_byte_array, "mono_byvalarray_to_byte_array", "void object ptr int32", FALSE);
|
||||
register_icall (mono_array_to_byvalarray, "mono_array_to_byvalarray", "void ptr object ptr int32", FALSE);
|
||||
register_icall (mono_array_to_byte_byvalarray, "mono_array_to_byte_byvalarray", "void ptr object int32", FALSE);
|
||||
register_icall (mono_delegate_to_ftnptr, "mono_delegate_to_ftnptr", "ptr object", FALSE);
|
||||
register_icall (mono_ftnptr_to_delegate, "mono_ftnptr_to_delegate", "object ptr ptr", FALSE);
|
||||
register_icall (mono_marshal_asany, "mono_marshal_asany", "ptr object int32 int32", FALSE);
|
||||
@@ -692,6 +699,12 @@ mono_byvalarray_to_array (MonoArray *arr, gpointer native_arr, MonoClass *elclas
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
static void
|
||||
mono_byvalarray_to_byte_array (MonoArray *arr, gpointer native_arr, guint32 elnum)
|
||||
{
|
||||
mono_byvalarray_to_array (arr, native_arr, mono_defaults.byte_class, elnum);
|
||||
}
|
||||
|
||||
static void
|
||||
mono_array_to_byvalarray (gpointer native_arr, MonoArray *arr, MonoClass *elclass, guint32 elnum)
|
||||
{
|
||||
@@ -715,6 +728,12 @@ mono_array_to_byvalarray (gpointer native_arr, MonoArray *arr, MonoClass *elclas
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
mono_array_to_byte_byvalarray (gpointer native_arr, MonoArray *arr, guint32 elnum)
|
||||
{
|
||||
mono_array_to_byvalarray (native_arr, arr, mono_defaults.byte_class, elnum);
|
||||
}
|
||||
|
||||
void
|
||||
mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text)
|
||||
{
|
||||
@@ -1346,9 +1365,8 @@ emit_ptr_to_object_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
|
||||
mono_mb_emit_ldloc (mb, 1);
|
||||
mono_mb_emit_byte (mb, CEE_LDIND_REF);
|
||||
mono_mb_emit_ldloc (mb, 0);
|
||||
mono_mb_emit_ptr (mb, mono_defaults.byte_class);
|
||||
mono_mb_emit_icon (mb, mspec->data.array_data.num_elem);
|
||||
mono_mb_emit_icall (mb, mono_byvalarray_to_array);
|
||||
mono_mb_emit_icall (mb, mono_byvalarray_to_byte_array);
|
||||
break;
|
||||
}
|
||||
case MONO_MARSHAL_CONV_STR_BYVALSTR:
|
||||
@@ -1721,9 +1739,8 @@ emit_object_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
|
||||
mono_mb_emit_ldloc (mb, 1);
|
||||
mono_mb_emit_ldloc (mb, 0);
|
||||
mono_mb_emit_byte (mb, CEE_LDIND_REF);
|
||||
mono_mb_emit_ptr (mb, mono_defaults.byte_class);
|
||||
mono_mb_emit_icon (mb, mspec->data.array_data.num_elem);
|
||||
mono_mb_emit_icall (mb, mono_array_to_byvalarray);
|
||||
mono_mb_emit_icall (mb, mono_array_to_byte_byvalarray);
|
||||
mono_mb_patch_short_branch (mb, pos);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ mono: mono-$(mono_bin_suffix)
|
||||
ln -sf $< $@
|
||||
|
||||
install-exec-hook:
|
||||
ln -sf $(DESTDIR)$(bindir)/mono-$(libmono_suffix) $(DESTDIR)$(bindir)/mono
|
||||
ln -sf $(DESTDIR)$(bindir)/mono-$(mono_bin_suffix) $(DESTDIR)$(bindir)/mono
|
||||
(cd $(DESTDIR)$(libdir); for i in libmono$(libmono_suffix)*; do ln -sf $$i `echo $$i | sed s/$(libmono_suffix)//` ; done)
|
||||
endif
|
||||
|
||||
|
||||
@@ -6938,7 +6938,7 @@ emit_code (MonoAotCompile *acfg)
|
||||
* This is PIE code, and the linker can update it if needed.
|
||||
*/
|
||||
sprintf (symbol, "method_addresses");
|
||||
emit_section_change (acfg, RODATA_SECT, 1);
|
||||
emit_section_change (acfg, ".text", 1);
|
||||
emit_alignment (acfg, 8);
|
||||
emit_label (acfg, symbol);
|
||||
emit_local_symbol (acfg, symbol, "method_addresses_end", TRUE);
|
||||
|
||||
@@ -2186,11 +2186,13 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
|
||||
}
|
||||
|
||||
code_start = amodule->code + amodule->code_offsets [table [(pos * 2)]];
|
||||
if (pos + 1 == fde_count)
|
||||
/* End of table */
|
||||
code_end = amodule->code_end;
|
||||
else
|
||||
if (pos + 1 == fde_count) {
|
||||
/* The +1 entry in the table contains the length of the last method */
|
||||
int len = table [(pos + 1) * 2];
|
||||
code_end = code_start + len;
|
||||
} else {
|
||||
code_end = amodule->code + amodule->code_offsets [table [(pos + 1) * 2]];
|
||||
}
|
||||
code_len = code_end - code_start;
|
||||
|
||||
g_assert (code >= code_start && code < code_end);
|
||||
|
||||
Reference in new issue
Block a user