X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fhelpers.c;h=af1235e317512555450b1e21e15e82fb1756237e;hb=b43d924d7569d58f8d97f6ba1f4ce22ad48a492b;hp=f3c4ae770062a7f62390f4366980654d85914583;hpb=a8b22e0e864c03b8cfd2f2cb5a8075b6611c5553;p=mono.git

diff --git a/mono/mini/helpers.c b/mono/mini/helpers.c
index f3c4ae77006..af1235e3175 100644
--- a/mono/mini/helpers.c
+++ b/mono/mini/helpers.c
@@ -7,41 +7,52 @@
 #include <ctype.h>
 #include <mono/metadata/opcodes.h>
 
-#ifndef PLATFORM_WIN32
+#ifndef HOST_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
 
@@ -51,6 +62,9 @@ opnames[] = {
 #define emit_debug_info  FALSE
 #endif
 
+#define ARCH_PREFIX ""
+//#define ARCH_PREFIX "powerpc64-linux-gnu-"
+
 const char*
 mono_inst_name (int op) {
 	if (op >= OP_LOAD && op <= OP_LAST)
@@ -100,7 +114,7 @@ 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
+#ifdef HOST_WIN32
 	const char *tmp = g_get_tmp_dir ();
 #endif
 	const char *objdump_args = g_getenv ("MONO_OBJDUMP_ARGS");
@@ -108,7 +122,7 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 	char *o_file;
 	char *cmd;
 
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
 	as_file = g_strdup_printf ("%s/test.s", tmp);    
 
 	if (!(ofd = fopen (as_file, "w")))
@@ -120,14 +134,16 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 #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");
@@ -142,7 +158,7 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 
 	cindex = 0;
 	for (i = 0; i < size; ++i) {
-		if (emit_debug_info) {
+		if (emit_debug_info && cfg != NULL) {
 			bb_num = GPOINTER_TO_INT (g_hash_table_lookup (offset_to_bb_hash, GINT_TO_POINTER (i)));
 			if (bb_num) {
 				fprintf (ofd, "\n.stabd 68,0,%d\n", bb_num - 1);
@@ -160,8 +176,13 @@ 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"
@@ -175,30 +196,52 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
 #if defined(sparc)
 #define AS_CMD "as -xarch=v9"
 #elif defined(__i386__) || defined(__x86_64__)
-#define AS_CMD "as -gstabs"
-#elif defined(__mips__)
+#  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
 
-#ifdef PLATFORM_WIN32
+#ifdef HOST_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);
+	cmd = g_strdup_printf (ARCH_PREFIX 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 (ARCH_PREFIX "strip -x %s", o_file);
+	system (cmd);
+	g_free (cmd);
+#endif
 	
-	cmd = g_strdup_printf (DIS_CMD " %s %s", objdump_args, o_file);
+	cmd = g_strdup_printf (ARCH_PREFIX DIS_CMD " %s %s", objdump_args, o_file);
 	system (cmd);
 	g_free (cmd);
 	
+#ifndef HOST_WIN32
+	unlink (o_file);
+	unlink (as_file);
+#endif
 	g_free (o_file);
 	g_free (as_file);
 #endif