summaryrefslogtreecommitdiff
path: root/src/arch/arm/v7/opdefs
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2016-08-28 16:04:33 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2016-08-28 16:04:33 (GMT)
commitcb74c4467fc623fbca4aad3b07abda3ed1246590 (patch)
tree68fc259a136a0a6e148403907b5e8d564e28a662 /src/arch/arm/v7/opdefs
parent529595311bd518a3e7368263b9c3244159c85e41 (diff)
Handled branching instructions using registers.
Diffstat (limited to 'src/arch/arm/v7/opdefs')
-rw-r--r--src/arch/arm/v7/opdefs/Makefile.am1
-rw-r--r--src/arch/arm/v7/opdefs/bx_A8827.d4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index 133810b..7844578 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -41,6 +41,7 @@ FIXED_C_INCLUDES = \
\n\#include \"..\/helpers.h\" \
\n\#include \"..\/instruction.h\" \
\n\#include \"..\/fetch.h\" \
+ \n\#include \"..\/link.h\" \
\n\#include \"..\/post.h\" \
\n\#include \"..\/..\/instruction.h\" \
\n\#include \"..\/..\/link.h\" \
diff --git a/src/arch/arm/v7/opdefs/bx_A8827.d b/src/arch/arm/v7/opdefs/bx_A8827.d
index f278d85..f3681e7 100644
--- a/src/arch/arm/v7/opdefs/bx_A8827.d
+++ b/src/arch/arm/v7/opdefs/bx_A8827.d
@@ -40,6 +40,7 @@
@hooks {
fetch = help_fetching_with_instruction_bx_from_thumb
+ link = handle_armv7_conditional_branch_from_register
}
@@ -65,7 +66,8 @@
@hooks {
- fetch = help_fetching_with_instruction_bx_from_thumb
+ fetch = help_fetching_with_instruction_bx_from_arm
+ link = handle_armv7_conditional_branch_from_register
}