Merge pull request #724 from Unity-Technologies/unity-master-staging

MonoBleedingEdge Fixes for Trunk
Debugger fixes and a few functions that were missed in migration to master.

Author: joncham

README.md

@@ -1,3 +1,53 @@
+Unity
+============================
+This is Unity Technologies fork of the open source mono project.
+
+### Versions
+Each Unity release contains two versions of Mono. One older version (Mono) is embedded into the Editor and Players. Another newer version (MonoBleedingEdge) is used to run tools and tests.
+
+In newer Unity versions (2017.1+) this MonoBleedingEdge version can be used in the Editor and Players via enabling an Experimental player setting.
+
+### Branch Naming Convention
+Branches for released Unity versions are of the form unity-\<version\>\[-mbe\][-staging\]. The '-staging' suffix is used as a branch for PRs to target with potential changes. The '-mbe' suffix indicates the branch is for the MonoBleedingEdge version of Mono mentioned above.
+
+### Branches
+
+#### Trunk
+* [unity-staging (PR to this branch for Mono)](https://github.com/Unity-Technologies/mono/tree/unity-staging)
+* [unity-trunk](https://github.com/Unity-Technologies/mono/tree/unity-trunk)
+* [unity-master-staging (PR to this branch for MonoBleedingEdge)](https://github.com/Unity-Technologies/mono/tree/unity-master-staging)
+* [unity-master](https://github.com/Unity-Technologies/mono/tree/unity-master)
+
+#### 2017.3
+* [unity-2017.3-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.3-staging)
+* [unity-2017.3](https://github.com/Unity-Technologies/mono/tree/unity-2017.3)
+* [unity-2017.3-mbe-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.3-mbe-staging)
+* [unity-2017.3-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.3-mbe)
+
+#### 2017.2
+* [unity-2017.2-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.2-staging)
+* [unity-2017.2](https://github.com/Unity-Technologies/mono/tree/unity-2017.2)
+* [unity-2017.2-mbe-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.2-mbe-staging)
+* [unity-2017.2-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.2-mbe)
+
+#### 2017.1
+* [unity-2017.1-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.1-staging)
+* [unity-2017.1](https://github.com/Unity-Technologies/mono/tree/unity-2017.1)
+* [unity-2017.1-mbe-staging](https://github.com/Unity-Technologies/mono/tree/unity-2017.1-mbe-staging)
+* [unity-2017.1-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.1-mbe)
+
+#### 5.6
+* [unity-5.6-staging](https://github.com/Unity-Technologies/mono/tree/unity-5.6-staging)
+* [unity-5.6](https://github.com/Unity-Technologies/mono/tree/unity-5.6)
+* [unity-5.6-mbe-staging](https://github.com/Unity-Technologies/mono/tree/unity-5.6-mbe-staging)
+* [unity-5.6-mbe](https://github.com/Unity-Technologies/mono/tree/unity-5.6-mbe)
+
+
+
+
+Mono
+============================
+
 Mono is a software platform designed to allow developers to easily
 create cross platform applications.  It is an open source
 implementation of Microsoft's .NET Framework based on the ECMA

mono/metadata/loader.c

@@ -1263,6 +1263,22 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
 		}
 	}
 
+	if (mono_get_find_plugin_callback ())
+	{
+		const char* unity_new_scope = mono_get_find_plugin_callback () (new_scope);
+		if (unity_new_scope == NULL)
+		{
+			if (exc_class)
+			{
+				*exc_class = "DllNotFoundException";
+				*exc_arg = new_scope;
+			}
+			return NULL;
+		}
+
+		new_scope = unity_new_scope;
+	}
+
 	/*
 	 * Try loading the module using a variety of names
 	 */

mono/metadata/unity-utils.c

@@ -142,6 +142,26 @@ mono_unity_g_free(void *ptr)
 	g_free (ptr);
 }
 
+
+MONO_API MonoClass*
+mono_custom_attrs_get_attrs (MonoCustomAttrInfo *ainfo, gpointer *iter)
+{
+	int index = -1;
+	if (!iter)
+		return NULL;
+	if (!*iter)
+	{
+		*iter = 1;
+		return ainfo->attrs[0].ctor->klass;
+	}
+
+	index = GPOINTER_TO_INT (*iter);
+	if (index >= ainfo->num_attrs)
+		return NULL;
+	*iter = GINT_TO_POINTER (index + 1);
+	return ainfo->attrs[index].ctor->klass;
+}
+
 MONO_API gboolean
 mono_class_is_inflated (MonoClass *klass)
 {

mono/metadata/unity-utils.h

@@ -163,7 +163,8 @@ MONO_API MonoClass* mono_unity_class_get(MonoImage* image, guint32 type_token);
 MONO_API gpointer mono_unity_alloc(gsize size);
 MONO_API void mono_unity_g_free (void *ptr);
 
-// hack, FIXME jon
+MONO_API MonoClass* mono_custom_attrs_get_attrs (MonoCustomAttrInfo *ainfo, gpointer *iter);
+
 typedef size_t (*RemapPathFunction)(const char* path, char* buffer, size_t buffer_len);
 MONO_API void mono_unity_register_path_remapper (RemapPathFunction func);
 gboolean 

mono/mini/Makefile.am.in

@@ -561,8 +561,8 @@ common_sources = \
 	type-checking.c \
 	lldb.h			\
 	lldb.c	\
-	pmip_my_callstack.h	\
-	pmip_my_callstack.c \
+	mixed_callstack_plugin.h	\
+	mixed_callstack_plugin.c	\
 	memory-access.c	\
 	mini-profiler.c 
 

mono/mini/debugger-agent.c

@@ -4924,6 +4924,8 @@ clear_breakpoints_for_domain (MonoDomain *domain)
 			if (inst->domain == domain) {
 #ifndef IL2CPP_MONO_DEBUGGER
 				remove_breakpoint (inst);
+#else
+				inst->seq_point->isActive = FALSE;
 #endif
 
 				g_free (inst);
@@ -11048,7 +11050,7 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 		void *var;
 #endif
 
-		t = &frame->actual_method->klass->byval_arg;
+		t = VM_CLASS_GET_TYPE(VM_METHOD_GET_DECLARING_TYPE(frame->actual_method));
 		/* Checked by the sender */
 		g_assert (MONO_TYPE_ISSTRUCT (t));
 
@@ -11071,7 +11073,7 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 		}
 #else
 		GetVariable (tls, frame, kMethodVariableKindC_This, 0, &t, &var);
-		il2cpp_set_var (val_buf, var, t);
+		il2cpp_set_var(val_buf, var, VM_CLASS_GET_THIS_ARG(VM_METHOD_GET_DECLARING_TYPE(frame->actual_method)));
 #endif
 		break;
 	}
@@ -11884,7 +11886,7 @@ unity_process_breakpoint_inner(DebuggerTlsData *tls, gboolean from_signal, Il2Cp
 
 		for (j = 0; j < bp->children->len; ++j) {
 			inst = (BreakpointInstance *)g_ptr_array_index(bp->children, j);
-			if (inst->il_offset == bp->il_offset) {
+			if (inst->il_offset == sequencePoint->ilOffset) {
 				if (bp->req->event_kind == EVENT_KIND_STEP) {
 					for (int j = 0; j < bp->children->len; ++j)
 					{

mono/mini/mini-runtime.c

@@ -84,6 +84,7 @@
 #include "mini-llvm.h"
 #include "debugger-agent.h"
 #include "lldb.h"
+#include "mixed_callstack_plugin.h"
 
 #ifdef MONO_ARCH_LLVM_SUPPORTED
 #ifdef ENABLE_LLVM
@@ -498,6 +499,7 @@ mono_tramp_info_register_internal (MonoTrampInfo *info, MonoDomain *domain, gboo
 
 	mono_save_trampoline_xdebug_info (info);
 	mono_lldb_save_trampoline_info (info);
+	mixed_callstack_plugin_save_trampoline_info (info);
 
 #ifdef MONO_ARCH_HAVE_UNWIND_TABLE
 	if (!aot)
@@ -3907,6 +3909,9 @@ mini_init (const char *filename, const char *runtime_version)
 		mono_lldb_init ("");
 		mono_dont_free_domains = TRUE;
 	}
+	if (g_hasenv ("UNITY_MIXED_CALLSTACK")) {
+		mixed_callstack_plugin_init ("");
+	}
 
 #ifdef XDEBUG_ENABLED
 	char *mono_xdebug = g_getenv ("MONO_XDEBUG");

mono/mini/mini-trampolines.c

@@ -21,6 +21,7 @@
 
 #include "mini.h"
 #include "lldb.h"
+#include "mixed_callstack_plugin.h"
 
 #ifndef DISABLE_INTERPRETER
 #include "interp/interp.h"
@@ -1384,6 +1385,7 @@ mono_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_type, M
 	else
 		code = mono_arch_create_specific_trampoline (arg1, tramp_type, domain, &len);
 	mono_lldb_save_specific_trampoline_info (arg1, tramp_type, domain, code, len);
+	mixed_callstack_plugin_save_specific_trampoline_info (arg1, tramp_type, domain, code, len);
 	if (code_len)
 		*code_len = len;
 	return code;

mono/mini/mini.c

@@ -78,6 +78,7 @@
 #include "llvm-runtime.h"
 #include "mini-llvm.h"
 #include "lldb.h"
+#include "mixed_callstack_plugin.h"
 
 MonoCallSpec *mono_jit_trace_calls;
 MonoMethodDesc *mono_inject_async_exc_method;
@@ -3859,6 +3860,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
 	if (!cfg->compile_aot) {
 		mono_save_xdebug_info (cfg);
 		mono_lldb_save_method_info (cfg);
+		mixed_callstack_plugin_save_method_info (cfg);
 	}
 
 	if (cfg->verbose_level >= 2) {