#include <mono/utils/mono-time.h>
#include "trace.h"
+#if defined (PLATFORM_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;
gboolean
MonoJitArgumentInfo *arg_info;
MonoMethodSignature *sig;
char *fname;
+ MonoGenericSharingContext *gsctx = NULL;
if (!trace_spec.enabled)
return;
g_free (fname);
if (!ebp) {
- printf (") ip: %p\n", __builtin_return_address (1));
+ printf (") ip: %p\n", RETURN_ADDRESS_N (1));
return;
}
arg_info = alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
- mono_arch_get_argument_info (NULL, sig, sig->param_count, arg_info);
+ if (method->is_inflated) {
+ /* FIXME: Might be better to pass the ji itself */
+ MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+ if (ji) {
+ gsctx = mono_jit_info_get_generic_sharing_context (ji);
+ if (gsctx && (gsctx->var_is_vt || gsctx->mvar_is_vt)) {
+ /* Needs a ctx to get precise method */
+ printf (") <gsharedvt>\n");
+ return;
+ }
+ }
+ }
+
+ mono_arch_get_argument_info (gsctx, sig, sig->param_count, arg_info);
if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret)) {
g_assert (!mono_method_signature (method)->ret->byref);
MonoType *type;
char *fname;
va_list ap;
+ MonoGenericSharingContext *gsctx;
if (!trace_spec.enabled)
return;
printf ("LEAVE: %s", fname);
g_free (fname);
+ if (method->is_inflated) {
+ /* FIXME: Might be better to pass the ji itself */
+ MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+ if (ji) {
+ gsctx = mono_jit_info_get_generic_sharing_context (ji);
+ if (gsctx && (gsctx->var_is_vt || gsctx->mvar_is_vt)) {
+ /* Needs a ctx to get precise method */
+ printf (") <gsharedvt>\n");
+ return;
+ }
+ }
+ }
+
type = mono_method_signature (method)->ret;
handle_enum:
case MONO_TYPE_R4:
case MONO_TYPE_R8: {
double f = va_arg (ap, double);
- printf ("FP=%f\n", f);
+ printf ("FP=%f", f);
break;
}
case MONO_TYPE_VALUETYPE:
printf ("(unknown return type %x)", mono_method_signature (method)->ret->type);
}
- //printf (" ip: %p\n", __builtin_return_address (1));
+ //printf (" ip: %p\n", RETURN_ADDRESS_N (1));
printf ("\n");
fflush (stdout);
}