X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fhelpers.c;h=1b17098ec5db040dc6fb631693b1ee8c3839a773;hb=9ab38c6192912cc1efb8178d8cd5fe00d7c90a78;hp=aebaacd6b302f979fc9f9c9936c04ab292662706;hpb=82fb2eb8939e358c31e1b846a66f9043b46bdc90;p=mono.git

diff --git a/mono/mini/helpers.c b/mono/mini/helpers.c
index aebaacd6b30..1b17098ec5d 100644
--- a/mono/mini/helpers.c
+++ b/mono/mini/helpers.c
@@ -7,41 +7,56 @@
 #include <ctype.h>
 #include <mono/metadata/opcodes.h>
 
+#ifndef PLATFORM_WIN32
+#include <unistd.h>
+#endif
+
 #ifdef MINI_OP
 #undef MINI_OP
 #endif
+#ifdef MINI_OP3
+#undef MINI_OP3
+#endif
 
 #ifdef HAVE_ARRAY_ELEM_INIT
 #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
 #define MSGSTRFIELD1(line) str##line
 static const struct msgstr_t {
-#define MINI_OP(a,b) char MSGSTRFIELD(__LINE__) [sizeof (b)];
+#define MINI_OP(a,b,dest,src1,src2) char MSGSTRFIELD(__LINE__) [sizeof (b)];
+#define MINI_OP3(a,b,dest,src1,src2,src3) char MSGSTRFIELD(__LINE__) [sizeof (b)];
 #include "mini-ops.h"
 #undef MINI_OP
+#undef MINI_OP3
 } opstr = {
-#define MINI_OP(a,b) b,
+#define MINI_OP(a,b,dest,src1,src2) b,
+#define MINI_OP3(a,b,dest,src1,src2,src3) b,
 #include "mini-ops.h"
 #undef MINI_OP
+#undef MINI_OP3
 };
 static const gint16 opidx [] = {
-#define MINI_OP(a,b) [a - OP_LOAD] = offsetof (struct msgstr_t, MSGSTRFIELD(__LINE__)),
+#define MINI_OP(a,b,dest,src1,src2) [a - OP_LOAD] = offsetof (struct msgstr_t, MSGSTRFIELD(__LINE__)),
+#define MINI_OP3(a,b,dest,src1,src2,src3) [a - OP_LOAD] = offsetof (struct msgstr_t, MSGSTRFIELD(__LINE__)),
 #include "mini-ops.h"
 #undef MINI_OP
+#undef MINI_OP3
 };
 
 #else
 
-#define MINI_OP(a,b) b,
+#define MINI_OP(a,b,dest,src1,src2) b,
+#define MINI_OP3(a,b,dest,src1,src2,src3) b,
 /* keep in sync with the enum in mini.h */
 static const char* const
 opnames[] = {
 #include "mini-ops.h"
 };
 #undef MINI_OP
+#undef MINI_OP3
 
 #endif
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
 #define emit_debug_info  TRUE
 #else
 #define emit_debug_info  FALSE
@@ -96,26 +111,36 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 	GHashTable *offset_to_bb_hash = NULL;
 	int i, cindex, bb_num;
 	FILE *ofd;
+#ifdef PLATFORM_WIN32
 	const char *tmp = g_get_tmp_dir ();
+#endif
 	const char *objdump_args = g_getenv ("MONO_OBJDUMP_ARGS");
 	char *as_file;
 	char *o_file;
 	char *cmd;
-	
+
+#ifdef PLATFORM_WIN32
 	as_file = g_strdup_printf ("%s/test.s", tmp);    
 
 	if (!(ofd = fopen (as_file, "w")))
 		g_assert_not_reached ();
+#else	
+	i = g_file_open_tmp (NULL, &as_file, NULL);
+	ofd = fdopen (i, "w");
+	g_assert (ofd);
+#endif
 
 	for (i = 0; id [i]; ++i) {
-		if (!isalnum (id [i]))
+		if (i == 0 && isdigit (id [i]))
+			fprintf (ofd, "_");
+		else if (!isalnum (id [i]))
 			fprintf (ofd, "_");
 		else
 			fprintf (ofd, "%c", id [i]);
 	}
 	fprintf (ofd, ":\n");
 
-	if (emit_debug_info) {
+	if (emit_debug_info && cfg != NULL) {
 		MonoBasicBlock *bb;
 
 		fprintf (ofd, ".stabs	\"\",100,0,0,.Ltext0\n");
@@ -148,12 +173,17 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 	}
 	fprintf (ofd, "\n");
 	fclose (ofd);
+
 #ifdef __APPLE__
+#ifdef __ppc64__
+#define DIS_CMD "otool64 -v -t"
+#else
 #define DIS_CMD "otool -v -t"
+#endif
 #else
 #if defined(sparc) && !defined(__GNUC__)
 #define DIS_CMD "dis"
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 #define DIS_CMD "objdump -l -d"
 #else
 #define DIS_CMD "objdump -d"
@@ -162,23 +192,53 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 
 #if defined(sparc)
 #define AS_CMD "as -xarch=v9"
-#elif defined(__i386__)
-#define AS_CMD "as -gstabs"
+#elif defined(__i386__) || defined(__x86_64__)
+#  if defined(__APPLE__)
+#    define AS_CMD "as"
+#  else
+#    define AS_CMD "as -gstabs"
+#endif
+#elif defined(__mips__) && (_MIPS_SIM == _ABIO32)
+#define AS_CMD "as -mips32"
+#elif defined(__ppc64__)
+#define AS_CMD "as -arch ppc64"
+#elif defined(__powerpc64__)
+#define AS_CMD "as -mppc64"
 #else
 #define AS_CMD "as"
 #endif
 
-	o_file = g_strdup_printf ("%s/test.o", tmp);    
+#ifdef PLATFORM_WIN32
+	o_file = g_strdup_printf ("%s/test.o", tmp);
+#else	
+	i = g_file_open_tmp (NULL, &o_file, NULL);
+	close (i);
+#endif
+
 	cmd = g_strdup_printf (AS_CMD " %s -o %s", as_file, o_file);
 	system (cmd); 
 	g_free (cmd);
 	if (!objdump_args)
 		objdump_args = "";
+
+#ifdef __arm__
+	/* 
+	 * The arm assembler inserts ELF directives instructing objdump to display 
+	 * everything as data.
+	 */
+	cmd = g_strdup_printf ("strip -x %s", o_file);
+	system (cmd);
+	g_free (cmd);
+#endif
 	
 	cmd = g_strdup_printf (DIS_CMD " %s %s", objdump_args, o_file);
 	system (cmd);
 	g_free (cmd);
 	
+#ifndef PLATFORM_WIN32
+	unlink (o_file);
+	unlink (as_file);
+#endif
 	g_free (o_file);
 	g_free (as_file);
 #endif