summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/probes-thumb.h
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2015-01-09 05:19:49 +0300
committerJon Medhurst <tixy@linaro.org>2015-01-09 12:36:50 +0300
commitfca08f326ae0423f03b097ff54de432fe77b95d0 (patch)
tree40d680c04ec5ec613c0b8bb9ec9ff8b5821bc237 /arch/arm/kernel/probes-thumb.h
parentb1940cd21c0f4abdce101253e860feff547291b0 (diff)
downloadlinux-fca08f326ae0423f03b097ff54de432fe77b95d0.tar.xz
ARM: probes: move all probe code to dedicate directory
In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell King suggests to move all probe related code to arch/arm/probes. This patch does the work. Due to dependency on 'arch/arm/kernel/patch.h', this patch also moves patch.h to 'arch/arm/include/asm/patch.h', and related '#include' directives are also midified to '#include <asm/patch.h>'. Following is an overview of this patch: ./arch/arm/kernel/ ./arch/arm/probes/ |-- Makefile |-- Makefile |-- probes-arm.c ==> |-- decode-arm.c |-- probes-arm.h ==> |-- decode-arm.h |-- probes-thumb.c ==> |-- decode-thumb.c |-- probes-thumb.h ==> |-- decode-thumb.h |-- probes.c ==> |-- decode.c |-- probes.h ==> |-- decode.h | |-- kprobes | | |-- Makefile |-- kprobes-arm.c ==> | |-- actions-arm.c |-- kprobes-common.c ==> | |-- actions-common.c |-- kprobes-thumb.c ==> | |-- actions-thumb.c |-- kprobes.c ==> | |-- core.c |-- kprobes.h ==> | |-- core.h |-- kprobes-test-arm.c ==> | |-- test-arm.c |-- kprobes-test.c ==> | |-- test-core.c |-- kprobes-test.h ==> | |-- test-core.h |-- kprobes-test-thumb.c ==> | `-- test-thumb.c | `-- uprobes | |-- Makefile |-- uprobes-arm.c ==> |-- actions-arm.c |-- uprobes.c ==> |-- core.c |-- uprobes.h ==> `-- core.h | `-- patch.h ==> arch/arm/include/asm/patch.h Signed-off-by: Wang Nan <wangnan0@huawei.com> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/probes-thumb.h')
-rw-r--r--arch/arm/kernel/probes-thumb.h97
1 files changed, 0 insertions, 97 deletions
diff --git a/arch/arm/kernel/probes-thumb.h b/arch/arm/kernel/probes-thumb.h
deleted file mode 100644
index 7c6f6ebe514f..000000000000
--- a/arch/arm/kernel/probes-thumb.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * arch/arm/kernel/probes-thumb.h
- *
- * Copyright 2013 Linaro Ltd.
- * Written by: David A. Long
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#ifndef _ARM_KERNEL_PROBES_THUMB_H
-#define _ARM_KERNEL_PROBES_THUMB_H
-
-/*
- * True if current instruction is in an IT block.
- */
-#define in_it_block(cpsr) ((cpsr & 0x06000c00) != 0x00000000)
-
-/*
- * Return the condition code to check for the currently executing instruction.
- * This is in ITSTATE<7:4> which is in CPSR<15:12> but is only valid if
- * in_it_block returns true.
- */
-#define current_cond(cpsr) ((cpsr >> 12) & 0xf)
-
-enum probes_t32_action {
- PROBES_T32_EMULATE_NONE,
- PROBES_T32_SIMULATE_NOP,
- PROBES_T32_LDMSTM,
- PROBES_T32_LDRDSTRD,
- PROBES_T32_TABLE_BRANCH,
- PROBES_T32_TST,
- PROBES_T32_CMP,
- PROBES_T32_MOV,
- PROBES_T32_ADDSUB,
- PROBES_T32_LOGICAL,
- PROBES_T32_ADDWSUBW_PC,
- PROBES_T32_ADDWSUBW,
- PROBES_T32_MOVW,
- PROBES_T32_SAT,
- PROBES_T32_BITFIELD,
- PROBES_T32_SEV,
- PROBES_T32_WFE,
- PROBES_T32_MRS,
- PROBES_T32_BRANCH_COND,
- PROBES_T32_BRANCH,
- PROBES_T32_PLDI,
- PROBES_T32_LDR_LIT,
- PROBES_T32_LDRSTR,
- PROBES_T32_SIGN_EXTEND,
- PROBES_T32_MEDIA,
- PROBES_T32_REVERSE,
- PROBES_T32_MUL_ADD,
- PROBES_T32_MUL_ADD2,
- PROBES_T32_MUL_ADD_LONG,
- NUM_PROBES_T32_ACTIONS
-};
-
-enum probes_t16_action {
- PROBES_T16_ADD_SP,
- PROBES_T16_CBZ,
- PROBES_T16_SIGN_EXTEND,
- PROBES_T16_PUSH,
- PROBES_T16_POP,
- PROBES_T16_SEV,
- PROBES_T16_WFE,
- PROBES_T16_IT,
- PROBES_T16_CMP,
- PROBES_T16_ADDSUB,
- PROBES_T16_LOGICAL,
- PROBES_T16_BLX,
- PROBES_T16_HIREGOPS,
- PROBES_T16_LDR_LIT,
- PROBES_T16_LDRHSTRH,
- PROBES_T16_LDRSTR,
- PROBES_T16_ADR,
- PROBES_T16_LDMSTM,
- PROBES_T16_BRANCH_COND,
- PROBES_T16_BRANCH,
- NUM_PROBES_T16_ACTIONS
-};
-
-extern const union decode_item probes_decode_thumb32_table[];
-extern const union decode_item probes_decode_thumb16_table[];
-
-enum probes_insn __kprobes
-thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions);
-enum probes_insn __kprobes
-thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions);
-
-#endif