* HttpRuntime.cs: Avoid ANE on Windows when HttpRuntime is used

[mono.git] / mono / mini / image-writer.c

diff --git a/mono/mini/image-writer.c b/mono/mini/image-writer.c
index 785002bcf197204c4f15123535535f3ed0d2fbfe..63c49fb5afc716fa66d4a989c9f27ecf7727ab29 100644 (file)
--- a/mono/mini/image-writer.c
+++ b/mono/mini/image-writer.c
@@ -324,7 +324,7 @@ bin_writer_emit_pointer_unaligned (MonoImageWriter *acfg, const char *target)
        acfg->relocations = reloc;
        if (strcmp (reloc->section->name, ".data") == 0) {
                acfg->num_relocs++;
-               g_print ("reloc: %s at %d\n", target, acfg->cur_section->cur_offset);
+               //g_print ("reloc: %s at %d\n", target, acfg->cur_section->cur_offset);
        }
        acfg->cur_section->cur_offset += sizeof (gpointer);
 }
@@ -517,8 +517,10 @@ append_subsection (MonoImageWriter *acfg, ElfSectHeader *sheaders, BinSection *s
        int offset = sect->cur_offset;
        /*offset += (sheaders [sect->shidx].sh_addralign - 1);
        offset &= ~(sheaders [sect->shidx].sh_addralign - 1);*/
+       offset += (8 - 1);
+       offset &= ~(8 - 1);
        bin_writer_emit_ensure_buffer (sect, offset);
-       g_print ("section %s aligned to %d from %d\n", sect->name, offset, sect->cur_offset);
+       //g_print ("section %s aligned to %d from %d\n", sect->name, offset, sect->cur_offset);
        sect->cur_offset = offset;
 
        bin_writer_emit_ensure_buffer (sect, add->cur_offset);
@@ -526,7 +528,7 @@ append_subsection (MonoImageWriter *acfg, ElfSectHeader *sheaders, BinSection *s
        add->parent = sect;
        sect->cur_offset += add->cur_offset;
        add->cur_offset = offset; /* it becomes the offset in the parent section */
-       g_print ("subsection %d of %s added at offset %d (align: %d)\n", add->subsection, sect->name, add->cur_offset, (int)sheaders [sect->shidx].sh_addralign);
+       //g_print ("subsection %d of %s added at offset %d (align: %d)\n", add->subsection, sect->name, add->cur_offset, (int)sheaders [sect->shidx].sh_addralign);
        add->data = NULL;
        add->data_len = 0;
 }
@@ -871,13 +873,18 @@ do_reloc (MonoImageWriter *acfg, BinReloc *reloc, guint8 *data, gssize addr)
         * needed by the code we generate.
         */
        switch (reloc->reloc_type) {
-       case R_ARM_CALL: {
+       case R_ARM_CALL:
+       case R_ARM_JUMP24: {
                guint32 *code = (guint32*)(gpointer)data;
                guint32 ins = *code;
                int diff = addr;
 
-               /* bl */
-               g_assert (data [3] == 0xeb);
+               if (reloc->reloc_type == R_ARM_CALL)
+                       /* bl */
+                       g_assert (data [3] == 0xeb);
+               else
+                       /* b */
+                       g_assert (data [3] == 0xea);
                if (diff >= 0 && diff <= 33554431) {
                        diff >>= 2;
                        ins = (ins & 0xff000000) | diff;
@@ -896,8 +903,11 @@ do_reloc (MonoImageWriter *acfg, BinReloc *reloc, guint8 *data, gssize addr)
                guint8 *code = data;
                guint32 val = addr;
 
-               g_assert (val <= 0xffff);
-               ARM_ADD_REG_IMM (code, ARMREG_IP, ARMREG_PC, 0, 0);
+               g_assert (val <= 0xffffff);
+               if (val & 0xff0000)
+                       ARM_ADD_REG_IMM (code, ARMREG_IP, ARMREG_PC, (val & 0xFF0000) >> 16, 16);
+               else
+                       ARM_ADD_REG_IMM (code, ARMREG_IP, ARMREG_PC, 0, 0);
                ARM_ADD_REG_IMM (code, ARMREG_IP, ARMREG_IP, (val & 0xFF00) >> 8, 24);
                ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, val & 0xFF);
                break;
@@ -999,12 +1009,13 @@ bin_writer_emit_writeout (MonoImageWriter *acfg)
        num_sections = collect_sections (acfg, secth, all_sections, 16);
        hash = build_hash (acfg, num_sections, &dyn_str_table);
        num_symtab = hash [1]; /* FIXME */
+#if 0
        g_print ("num_sections: %d\n", num_sections);
        g_print ("dynsym: %d, dynstr size: %d\n", hash [1], (int)dyn_str_table.data->len);
        for (i = 0; i < num_sections; ++i) {
                g_print ("section %s, size: %d, %x\n", all_sections [i]->name, all_sections [i]->cur_offset, all_sections [i]->cur_offset);
        }
-
+#endif
        /* Associate the bin sections with the ELF sections */
        memset (sections, 0, sizeof (sections));
        for (i = 0; i < num_sections; ++i) {
@@ -1019,8 +1030,6 @@ bin_writer_emit_writeout (MonoImageWriter *acfg)
                }
 
                sections [all_sections [i]->shidx] = sect;
-               sections [all_sections [i]->shidx]->cur_offset += (8 - 1);
-               sections [all_sections [i]->shidx]->cur_offset &= ~(8 - 1);
        }
 
        /* at this point we know where in the file the first segment sections go */