mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.61

Browse Source 
Former-commit-id: 8969ac411e933f8c8203fa18878df70bb80cfba4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-19 15:52:01 +00:00
parent 5005e1465f
commit 270395db27
25 changed files with 928 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mono/metadata/debug-mono-ppdb.c
View File

@@ -435,6 +435,9 @@ mono_ppdb_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrAr
if (sfiles)
g_ptr_array_add (sfiles, docinfo);
if (source_file)
*source_file = g_strdup (docinfo->source_file);
iloffset = 0;
start_line = 0;
start_col = 0;
@@ -492,8 +495,6 @@ mono_ppdb_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrAr
memcpy (*seq_points, sps->data, sps->len * sizeof (MonoSymSeqPoint));
}
if (source_file)
*source_file = g_strdup (((MonoDebugSourceInfo*)g_ptr_array_index (sfiles, 0))->source_file);
if (source_files) {
*source_files = g_new (int, sps->len);
for (i = 0; i < sps->len; ++i)

2
mono/mini/Makefile.am
View File

@@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 5.0.0.48/851b6c7\"" > version.h
echo "#define FULL_VERSION \"Stable 5.0.0.61/4242008\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

2
mono/mini/Makefile.am.in
View File

@@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 5.0.0.48/851b6c7\"" > version.h
echo "#define FULL_VERSION \"Stable 5.0.0.61/4242008\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@@ -1 +1 @@
6cfc9c6b9b9f5d22de9a650e7d5527a33b533cca
434fe4e634a1bfba7eb1b7d400bb980490f1e895

2
mono/mini/debugger-agent.c.REMOVED.git-id
View File

@@ -1 +1 @@
c61a76885b8fb2ba68708558b39487a7d53e1f9c
c3ec223220f37f6e77b2a9b2e9b02a82c06da77c

6
mono/mini/mini-arm-gsharedvt.c
View File

@@ -217,8 +217,8 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
else
src_slot = map_stack_slot (ainfo->offset / 4);
g_assert (ndst < 256);
g_assert (src_slot < 16);
src [0] = (ndst << 4) | src_slot;
g_assert (src_slot < 256);
src [0] = (ndst << 8) | src_slot;
if (ainfo2->storage == RegTypeGeneral && ainfo2->size != 0 && ainfo2->size != 4) {
/* Have to load less than 4 bytes */
@@ -256,7 +256,7 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
ndst = get_arg_slots (ainfo2, &dst);
}
if (nsrc)
src [0] |= (arg_marshal << 16);
src [0] |= (arg_marshal << 24);
nslots = MIN (nsrc, ndst);
for (i = 0; i < nslots; ++i)

14
mono/mini/tramp-arm-gsharedvt.c
View File

@@ -53,7 +53,7 @@ mono_arm_start_gsharedvt_call (GSharedVtCallInfo *info, gpointer *caller, gpoint
for (i = 0; i < info->map_count; ++i) {
int src = info->map [i * 2];
int dst = info->map [(i * 2) + 1];
int arg_marshal = (src >> 16) & 0xff;
int arg_marshal = (src >> 24) & 0xff;
switch (arg_marshal) {
case GSHAREDVT_ARG_NONE:
@@ -66,8 +66,8 @@ mono_arm_start_gsharedvt_call (GSharedVtCallInfo *info, gpointer *caller, gpoint
break;
case GSHAREDVT_ARG_BYREF_TO_BYVAL: {
/* gsharedvt argument passed by value */
int nslots = (src >> 4) & 0xff;
int src_slot = src & 0xf;
int nslots = (src >> 8) & 0xff;
int src_slot = src & 0xff;
int j;
gpointer *addr = caller [src_slot];
@@ -76,28 +76,28 @@ mono_arm_start_gsharedvt_call (GSharedVtCallInfo *info, gpointer *caller, gpoint
break;
}
case GSHAREDVT_ARG_BYREF_TO_BYVAL_I1: {
int src_slot = src & 0xf;
int src_slot = src & 0xff;
gpointer *addr = caller [src_slot];
callee [dst] = GINT_TO_POINTER ((int)*(gint8*)addr);
break;
}
case GSHAREDVT_ARG_BYREF_TO_BYVAL_I2: {
int src_slot = src & 0xf;
int src_slot = src & 0xff;
gpointer *addr = caller [src_slot];
callee [dst] = GINT_TO_POINTER ((int)*(gint16*)addr);
break;
}
case GSHAREDVT_ARG_BYREF_TO_BYVAL_U1: {
int src_slot = src & 0xf;
int src_slot = src & 0xff;
gpointer *addr = caller [src_slot];
callee [dst] = GUINT_TO_POINTER ((guint)*(guint8*)addr);
break;
}
case GSHAREDVT_ARG_BYREF_TO_BYVAL_U2: {
int src_slot = src & 0xf;
int src_slot = src & 0xff;
gpointer *addr = caller [src_slot];
callee [dst] = GUINT_TO_POINTER ((guint)*(guint16*)addr);

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 5.0.0.48/851b6c7"
#define FULL_VERSION "Stable 5.0.0.61/4242008"