projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02ffe59
)
[arm] Make mono_arch_get_call_target () work on direct branches too, previously it...
author
Zoltan Varga
<vargaz@gmail.com>
Wed, 31 Aug 2016 22:41:12 +0000
(
00:41
+0200)
committer
Zoltan Varga
<vargaz@gmail.com>
Wed, 31 Aug 2016 22:41:12 +0000
(
00:41
+0200)
mono/mini/tramp-arm.c
patch
|
blob
|
history
diff --git
a/mono/mini/tramp-arm.c
b/mono/mini/tramp-arm.c
index 02b1f12c08f2b5b74e669ece1bbd6e4ab7c43992..747163b176dc74678a91987d3b1046224ec8fd61 100644
(file)
--- a/
mono/mini/tramp-arm.c
+++ b/
mono/mini/tramp-arm.c
@@
-876,13
+876,8
@@
mono_arch_get_call_target (guint8 *code)
{
guint32 ins = ((guint32*)(gpointer)code) [-1];
-#if MONOTOUCH
/* Should be a 'bl' or a 'b' */
if (((ins >> 25) & 0x7) == 0x5) {
-#else
- /* Should be a 'bl' */
- if ((((ins >> 25) & 0x7) == 0x5) && (((ins >> 24) & 0x1) == 0x1)) {
-#endif
gint32 disp = ((((gint32)ins) & 0xffffff) << 8) >> 8;
guint8 *target = code - 4 + 8 + (disp * 4);