projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
745a6be
)
Revert "[arm] Fix the handler block trampoline, it didn't actually call the helper...
author
Zoltan Varga
<vargaz@gmail.com>
Thu, 6 Jul 2017 18:45:35 +0000
(14:45 -0400)
committer
Zoltan Varga
<vargaz@gmail.com>
Thu, 6 Jul 2017 18:45:35 +0000
(14:45 -0400)
This reverts commit
745a6bec4a1fab5a5f56e00fc8efda84341b0634
.
Revert this as it wasn't tested properly.
mono/mini/tramp-arm.c
patch
|
blob
|
history
diff --git
a/mono/mini/tramp-arm.c
b/mono/mini/tramp-arm.c
index 701ab31e66bb5bcb4766efc053a9319eea3c81de..13c09ac33a72ca821bbd6085e2568cf7596171d3 100644
(file)
--- a/
mono/mini/tramp-arm.c
+++ b/
mono/mini/tramp-arm.c
@@
-724,7
+724,6
@@
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);