diff options
author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-05-15 23:31:38 +0200 |
---|---|---|
committer | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-05-16 00:14:30 +0200 |
commit | d4e587ea8a236b03e1831b95c163ac6537c96d9d (patch) | |
tree | 0875909649307c2602ec1ff05f7a743113b67b04 | |
parent | 30cc6354b29160a79ba40747af621e03c7389a8f (diff) |
arm64: insn: Add offset getter/setter for adr.
This adds support for getting and setting the offset
of an `adr` instruction.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
-rw-r--r-- | arch/arm64/include/asm/insn.h | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/insn.c | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index f62c56b1793f..a0c1d3baddaa 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -451,6 +451,8 @@ bool aarch64_insn_hotpatch_safe(u32 old_insn, u32 new_insn); int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); +s32 aarch64_insn_adr_get_offset(u32 insn); +u32 aarch64_insn_adr_set_offset(u32 insn, s32 offset); s32 aarch64_insn_adrp_get_offset(u32 insn); u32 aarch64_insn_adrp_set_offset(u32 insn, s32 offset); diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index 816d03c4c913..67cc3f14ecb4 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -1355,6 +1355,19 @@ u32 aarch64_set_branch_offset(u32 insn, s32 offset) BUG(); } +s32 aarch64_insn_adr_get_offset(u32 insn) +{ + BUG_ON(!aarch64_insn_is_adr(insn)); + return aarch64_insn_decode_immediate(AARCH64_INSN_IMM_ADR, insn); +} + +u32 aarch64_insn_adr_set_offset(u32 insn, s32 offset) +{ + BUG_ON(!aarch64_insn_is_adr(insn)); + return aarch64_insn_encode_immediate(AARCH64_INSN_IMM_ADR, insn, + offset); +} + s32 aarch64_insn_adrp_get_offset(u32 insn) { BUG_ON(!aarch64_insn_is_adrp(insn)); |