From 5e578cebcd171a9af8d032ed01515ea0930a1ce5 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Sun, 3 Jul 2011 13:55:47 +0100 Subject: [PATCH] --- yaml --- r: 258353 b: refs/heads/master c: f39ca8b488a6c1e8db47746e1cdb841a6999edd7 h: refs/heads/master i: 258351: f248da70ef7a22076d31fac1693bdb1698463ec2 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/kprobes-thumb.c | 28 ++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 250ece175d68..7a97498f16ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a188ccb5eceb58101fcc11b3ec2d860ccbf92a3 +refs/heads/master: f39ca8b488a6c1e8db47746e1cdb841a6999edd7 diff --git a/trunk/arch/arm/kernel/kprobes-thumb.c b/trunk/arch/arm/kernel/kprobes-thumb.c index 554578bc5f09..27f83a32a038 100644 --- a/trunk/arch/arm/kernel/kprobes-thumb.c +++ b/trunk/arch/arm/kernel/kprobes-thumb.c @@ -37,6 +37,32 @@ static inline unsigned long __kprobes thumb_probe_pc(struct kprobe *p) return (unsigned long)p->addr - 1 + 4; } +static const union decode_item t32_table_1111_0xxx___1[] = { + /* Branches and miscellaneous control */ + + /* YIELD 1111 0011 1010 xxxx 10x0 x000 0000 0001 */ + DECODE_OR (0xfff0d7ff, 0xf3a08001), + /* SEV 1111 0011 1010 xxxx 10x0 x000 0000 0100 */ + DECODE_EMULATE (0xfff0d7ff, 0xf3a08004, kprobe_emulate_none), + /* NOP 1111 0011 1010 xxxx 10x0 x000 0000 0000 */ + /* WFE 1111 0011 1010 xxxx 10x0 x000 0000 0010 */ + /* WFI 1111 0011 1010 xxxx 10x0 x000 0000 0011 */ + DECODE_SIMULATE (0xfff0d7fc, 0xf3a08000, kprobe_simulate_nop), + + DECODE_END +}; + +const union decode_item kprobe_decode_thumb32_table[] = { + + /* + * Branches and miscellaneous control + * 1111 0xxx xxxx xxxx 1xxx xxxx xxxx xxxx + */ + DECODE_TABLE (0xf8008000, 0xf0008000, t32_table_1111_0xxx___1), + + DECODE_END +}; + static void __kprobes t16_simulate_bxblx(struct kprobe *p, struct pt_regs *regs) { @@ -551,5 +577,5 @@ thumb32_kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi) { asi->insn_singlestep = thumb32_singlestep; asi->insn_check_cc = thumb_check_cc; - return INSN_REJECTED; + return kprobe_decode_insn(insn, asi, kprobe_decode_thumb32_table, true); }