Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2019-06] [android] remove text relocations in AOT/arm32 #16660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lewing merged 2 commits into from
Sep 4, 2019
Merged

[2019-06] [android] remove text relocations in AOT/arm32 #16660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13157bf
Revert "[aot] partial revert of #14043 (#14135)"
lewurm Aug 23, 2019
2f95594
Revert "[aot] change method table generation so that it works for lar…
lewurm Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,21 +1595,6 @@ arch_emit_direct_call (MonoAotCompile *acfg, const char *target, gboolean extern
g_assert_not_reached ();
#endif
}

static void
arch_emit_label_address (MonoAotCompile *acfg, const char *target, gboolean external_call, gboolean thumb, MonoJumpInfo *ji, int *call_size)
{
#if defined(TARGET_ARM) && defined(TARGET_ANDROID)
/* binutils ld does not support branch islands on arm32 */
if (!thumb) {
emit_unset_mode (acfg);
fprintf (acfg->fp, "ldr pc,=%s\n", target);
fprintf (acfg->fp, ".ltorg\n");
*call_size = 8;
} else
#endif
arch_emit_direct_call (acfg, target, external_call, thumb, ji, call_size);
}
#endif

/*
Expand Down Expand Up @@ -9958,9 +9943,9 @@ emit_code (MonoAotCompile *acfg)
int call_size;

if (!ignore_cfg (acfg->cfgs [i])) {
arch_emit_label_address (acfg, acfg->cfgs [i]->asm_symbol, FALSE, acfg->thumb_mixed && acfg->cfgs [i]->compile_llvm, NULL, &call_size);
arch_emit_direct_call (acfg, acfg->cfgs [i]->asm_symbol, FALSE, acfg->thumb_mixed && acfg->cfgs [i]->compile_llvm, NULL, &call_size);
} else {
arch_emit_label_address (acfg, symbol, FALSE, FALSE, NULL, &call_size);
arch_emit_direct_call (acfg, symbol, FALSE, FALSE, NULL, &call_size);
}
#endif
}
Expand Down
7 changes: 0 additions & 7 deletions mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,20 +1939,13 @@ get_call_table_entry (void *table, int index)
guint32 ins;
gint32 offset;

ins_addr = (guint32 *)table + (index * 2);
if ((guint32) *ins_addr == (guint32 ) 0xe51ff004) { // ldr pc, =<label>
return *((char **) (ins_addr + 1));
}

ins_addr = (guint32*)table + index;
ins = *ins_addr;
if ((ins >> ARMCOND_SHIFT) == ARMCOND_NV) {
/* blx */
offset = (((int)(((ins & 0xffffff) << 1) | ((ins >> 24) & 0x1))) << 7) >> 7;
return (char*)ins_addr + (offset * 2) + 8 + 1;
} else {
g_assert ((ins >> ARMCOND_SHIFT) == ARMCOND_AL);
/* bl */
offset = (((int)ins & 0xffffff) << 8) >> 8;
return (char*)ins_addr + (offset * 4) + 8;
}
Expand Down