projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8aaf80d
)
[arm] Fix the handler block trampoline, it didn't actually call the helper function.
author
Zoltan Varga
<vargaz@gmail.com>
Thu, 6 Jul 2017 18:30:13 +0000
(14:30 -0400)
committer
Zoltan Varga
<vargaz@gmail.com>
Thu, 6 Jul 2017 18:30:13 +0000
(14:30 -0400)
mono/mini/tramp-arm.c
patch
|
blob
|
history
diff --git
a/mono/mini/tramp-arm.c
b/mono/mini/tramp-arm.c
index 13c09ac33a72ca821bbd6085e2568cf7596171d3..701ab31e66bb5bcb4766efc053a9319eea3c81de 100644
(file)
--- a/
mono/mini/tramp-arm.c
+++ b/
mono/mini/tramp-arm.c
@@
-724,6
+724,7
@@
mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot)
*(gpointer*)code = mono_arm_handler_block_trampoline_helper;
code += 4;
}
+ code = emit_bx (code, ARMREG_R0);
/* Set it as the return address so the trampoline will return to it */
ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_R0);