UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: kprobes-test: use <asm/opcodes.h> for instruction accesses 

Ensure we read instructions in the correct endian-ness by using
the <asm/opcodes.h> helper to transform them as necessary.

Acked-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[taras.kondratiuk@linaro.org: fix next_instruction() function]
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
This commit is contained in:
Ben Dooks 2013-11-08 18:29:26 +00:00 committed by Taras Kondratiuk
parent 888be25402
commit 4712e17aa4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/kernel/kprobes-test.c
View File

@ -1333,7 +1333,8 @@ static void test_case_failed(const char *message)
static unsigned long next_instruction(unsigned long pc) static unsigned long next_instruction(unsigned long pc)
{ {
#ifdef CONFIG_THUMB2_KERNEL #ifdef CONFIG_THUMB2_KERNEL
if ((pc & 1) && !is_wide_instruction(*(u16 *)(pc - 1))) if ((pc & 1) &&
!is_wide_instruction(__mem_to_opcode_thumb16(*(u16 *)(pc - 1))))
return pc + 2; return pc + 2;
else else
#endif #endif
@ -1378,13 +1379,13 @@ static uintptr_t __used kprobes_test_case_start(const char *title, void *stack)
if (test_case_is_thumb) { if (test_case_is_thumb) {
u16 *p = (u16 *)(test_code & ~1); u16 *p = (u16 *)(test_code & ~1);
current_instruction = p[0]; current_instruction = __mem_to_opcode_thumb16(p[0]);
if (is_wide_instruction(current_instruction)) { if (is_wide_instruction(current_instruction)) {
current_instruction <<= 16; u16 instr2 = __mem_to_opcode_thumb16(p[1]);
current_instruction |= p[1]; current_instruction = __opcode_thumb32_compose(current_instruction, instr2);
} }
} else { } else {
current_instruction = *(u32 *)test_code; current_instruction = __mem_to_opcode_arm(*(u32 *)test_code);
} }
if (current_title[0] == '.') if (current_title[0] == '.')