summaryrefslogtreecommitdiff
path: root/src/arch/arm/v7
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/v7')
-rw-r--r--src/arch/arm/v7/opdefs/Makefile.am2
-rw-r--r--src/arch/arm/v7/opdefs/b_A8818.d10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index b95b588..b897f1d 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -106,7 +106,7 @@ fmk.done: $(ARMV7_DEFS)
fix_includes_in_c_templates:
@for f in `find .gen/ -name '*tmpl.c'`; do \
if grep -q '##INCLUDES##' $$f; then \
- $(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/helpers.h"\n#include "..\/instruction.h"\n#include "..\/fetch.h"\n#include "..\/post.h"\n#include "..\/..\/instruction.h"\n#include "..\/..\/..\/link.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f; \
+ $(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/helpers.h"\n#include "..\/instruction.h"\n#include "..\/fetch.h"\n#include "..\/post.h"\n#include "..\/..\/instruction.h"\n#include "..\/..\/link.h"\n#include "..\/..\/..\/link.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f; \
fi; \
done
diff --git a/src/arch/arm/v7/opdefs/b_A8818.d b/src/arch/arm/v7/opdefs/b_A8818.d
index a275177..f06367b 100644
--- a/src/arch/arm/v7/opdefs/b_A8818.d
+++ b/src/arch/arm/v7/opdefs/b_A8818.d
@@ -39,7 +39,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -69,7 +69,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -99,7 +99,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -131,7 +131,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -161,7 +161,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_arm
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}