X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftrace.c;h=3c916a941b3ddf62af09f0ed8db444584e76c84e;hb=1575348f10b4d0908f4b3dd594f3202b32f82584;hp=98f89d63500b7fe89ea677a7bbe041a911dd4a00;hpb=82f74ede88abf1b6f50df72dad05d321bb6f0a6d;p=mono.git

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 98f89d63500..3c916a941b3 100644
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -1,5 +1,6 @@
-/*
- * trace.c: Tracing facilities for the Mono Runtime.
+/**
+ * \file
+ * Tracing facilities for the Mono Runtime.
  *
  * Author:
  *   Paolo Molaro (lupus@ximian.com)
@@ -25,32 +26,13 @@
 #include <mono/utils/mono-memory-model.h>
 #include "trace.h"
 
-#if defined (PLATFORM_ANDROID) || (defined (TARGET_IOS) && defined (TARGET_IOS))
+#if defined (HOST_ANDROID) || (defined (TARGET_IOS) && defined (TARGET_IOS))
 #  undef printf
 #  define printf(...) g_log("mono", G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
 #  undef fprintf
 #  define fprintf(__ignore, ...) g_log ("mono-gc", G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
 #endif
 
-#ifdef __GNUC__
-
-#define RETURN_ADDRESS_N(N) (__builtin_extract_return_addr (__builtin_return_address (N)))
-#define RETURN_ADDRESS() RETURN_ADDRESS_N(0)
-
-#elif defined(_MSC_VER)
-
-#include <intrin.h>
-#pragma intrinsic(_ReturnAddress)
-
-#define RETURN_ADDRESS() _ReturnAddress()
-#define RETURN_ADDRESS_N(N) NULL
-
-#else
-
-#error "Missing return address intrinsics implementation"
-
-#endif
-
 static MonoTraceSpec trace_spec;
 
 static volatile gint32 output_lock = 0;
@@ -101,17 +83,21 @@ mono_trace_eval (MonoMethod *method)
 		
 		switch (op->op){
 		case MONO_TRACEOP_ALL:
-			inc = 1; break;
+			inc = 1;
+			break;
 		case MONO_TRACEOP_PROGRAM:
 			if (trace_spec.assembly && (method->klass->image == mono_assembly_get_image (trace_spec.assembly)))
-				inc = 1; break;
+				inc = 1;
+			break;
 		case MONO_TRACEOP_WRAPPER:
 			if ((method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED) ||
 				(method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE))
-				inc = 1; break;
+				inc = 1;
+			break;
 		case MONO_TRACEOP_METHOD:
 			if (mono_method_desc_full_match ((MonoMethodDesc *) op->data, method))
-				inc = 1; break;
+				inc = 1;
+			break;
 		case MONO_TRACEOP_CLASS:
 			if (strcmp (method->klass->name_space, op->data) == 0)
 				if (strcmp (method->klass->name, op->data2) == 0)
@@ -119,18 +105,21 @@ mono_trace_eval (MonoMethod *method)
 			break;
 		case MONO_TRACEOP_ASSEMBLY:
 			if (strcmp (mono_image_get_name (method->klass->image), op->data) == 0)
-				inc = 1; break;
+				inc = 1;
+			break;
 		case MONO_TRACEOP_NAMESPACE:
 			if (strcmp (method->klass->name_space, op->data) == 0)
 				inc = 1;
+			break;
 		case MONO_TRACEOP_EXCEPTION:
 			break;
 		}
-		if (op->exclude){
+		if (op->exclude) {
 			if (inc)
 				include = 0;
-		} else if (inc)
+		} else if (inc) {
 			include = 1;
+		}
 	}
 	return include;
 }
@@ -159,9 +148,10 @@ static void get_string (void)
 	}
 	if (value != NULL)
 		g_free (value);
-	value = (char *)g_malloc (input - start + 1);
-	strncpy (value, start, input-start);
-	value [input-start] = 0;
+	size_t len = input - start;
+	value = (char *)g_malloc (len + 1);
+	memcpy (value, start, len);
+	value [len] = 0;
 }
 
 enum Token {
@@ -426,7 +416,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
 	g_free (fname);
 
 	if (!ebp) {
-		printf (") ip: %p\n", RETURN_ADDRESS_N (1));
+		printf (") ip: %p\n", MONO_RETURN_ADDRESS_N (1));
 		goto unlock;
 	}
 
@@ -436,7 +426,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
 
 	if (method->is_inflated) {
 		/* FIXME: Might be better to pass the ji itself */
-		MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
+		MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)MONO_RETURN_ADDRESS (), NULL);
 		if (ji) {
 			gsctx = mono_jit_info_get_generic_sharing_context (ji);
 			if (gsctx && gsctx->is_gsharedvt) {
@@ -600,7 +590,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
 
 	if (method->is_inflated) {
 		/* FIXME: Might be better to pass the ji itself */
-		MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
+		MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)MONO_RETURN_ADDRESS (), NULL);
 		if (ji) {
 			gsctx = mono_jit_info_get_generic_sharing_context (ji);
 			if (gsctx && gsctx->is_gsharedvt) {
@@ -708,7 +698,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
 		printf ("(unknown return type %x)", mono_method_signature (method)->ret->type);
 	}
 
-	//printf (" ip: %p\n", RETURN_ADDRESS_N (1));
+	//printf (" ip: %p\n", MONO_RETURN_ADDRESS_N (1));
 	printf ("\n");
 	fflush (stdout);