2008-11-05 Zoltan Varga <vargaz@gmail.com>

	* aot-compiler.c (emit_plt): Make the arm code work with the binary writer.

svn path=/trunk/mono/; revision=118043

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 6da74ef926bf03016480263b557e6428b63d3725..799fddb201a2c32abf6ba82cc3e75fed388f4499 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2008-11-05  Zoltan Varga  <vargaz@gmail.com>
 
+       * aot-compiler.c (emit_plt): Make the arm code work with the binary writer.
+
        * aot-compiler.c aot-runtime.c mini-trampolines.c tramp-amd64.c: Implement
        most of the full-aot support for monitor enter/exit trampolines.
 

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 0b02330a86980f2131e7b963b9259126b0dbd8dd..400d78071e6dac243a6798aa97277da758697bc9 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -124,7 +124,7 @@ typedef struct MonoAotStats {
        int jit_time, gen_time, link_time;
 } MonoAotStats;
 
-#if defined(__x86_64__) && defined(HAVE_ELF_H)
+#if defined(__x86_64__)
 //#define USE_ELF_WRITER 1
 #define USE_ELF_RELA 1
 #endif
@@ -3148,13 +3148,10 @@ emit_plt (MonoAotCompile *acfg)
 #endif
        emit_label (acfg, symbol);
 
-#if defined(USE_BIN_WRITER) && defined(__arm__)
-       /* FIXME: */
-       g_assert_not_reached ();
-#endif
-
        for (i = 0; i < acfg->plt_offset; ++i) {
                char label [128];
+               guint8 buf [256];
+               guint8 *code;
 
                sprintf (label, ".Lp_%d", i);
                emit_label (acfg, label);
@@ -3195,18 +3192,14 @@ emit_plt (MonoAotCompile *acfg)
                 * - optimize SWITCH AOT implementation
                 * - implement IMT support
                 */
-               emit_unset_mode (acfg);
-               fprintf (acfg->fp, "\tldr ip, [pc, #4]\n");
-               fprintf (acfg->fp, "\tadd ip, pc, ip\n");
-               fprintf (acfg->fp, "\tldr pc, [ip, #0]\n");
+               code = buf;
+               ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 4);
+               ARM_ADD_REG_REG (code, ARMREG_IP, ARMREG_PC, ARMREG_IP);
+               ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, 0);
+               emit_bytes (acfg, buf, code - buf);
                emit_symbol_diff (acfg, "plt_jump_table", ".", (i * sizeof (gpointer)));
                /* Used by mono_aot_get_plt_info_offset */
-    #if defined(__MACH__)
-               fprintf (acfg->fp, "\n\t.long %d\n", plt_info_offsets [i]);
-    #else
-               fprintf (acfg->fp, "\n\t.word %d\n", plt_info_offsets [i]);
-    #endif
-
+               emit_int32 (acfg, plt_info_offsets [i]);
 #else
                g_assert_not_reached ();
 #endif