diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-07-07 13:25:20 -0400 |
---|---|---|
committer | Tixy <tixy@medhuaa1.miniserver.com> | 2011-07-13 13:32:51 -0400 |
commit | 0239269db6ba1ea908006fe309ade12991dd4e21 (patch) | |
tree | 1d067b5f75d97206cfe6267df974e069c94381bb | |
parent | 465f1ea595a5040d8b9563e75e0b571a0bacb733 (diff) |
ARM: kprobes: Decode ARM preload (immediate) instructions
These were missing from the previous implementation.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r-- | arch/arm/kernel/kprobes-arm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c index 70e540b7c53b..8a58c99f658d 100644 --- a/arch/arm/kernel/kprobes-arm.c +++ b/arch/arm/kernel/kprobes-arm.c | |||
@@ -1139,6 +1139,12 @@ static const union decode_item arm_1111_table[] = { | |||
1139 | /* PLD (immediate) 1111 0101 x101 xxxx xxxx xxxx xxxx xxxx */ | 1139 | /* PLD (immediate) 1111 0101 x101 xxxx xxxx xxxx xxxx xxxx */ |
1140 | DECODE_SIMULATE (0xfe300000, 0xf4100000, kprobe_simulate_nop), | 1140 | DECODE_SIMULATE (0xfe300000, 0xf4100000, kprobe_simulate_nop), |
1141 | 1141 | ||
1142 | /* memory hint 1111 0110 x001 xxxx xxxx xxxx xxx0 xxxx */ | ||
1143 | /* PLDI (register) 1111 0110 x101 xxxx xxxx xxxx xxx0 xxxx */ | ||
1144 | /* PLDW (register) 1111 0111 x001 xxxx xxxx xxxx xxx0 xxxx */ | ||
1145 | /* PLD (register) 1111 0111 x101 xxxx xxxx xxxx xxx0 xxxx */ | ||
1146 | DECODE_SIMULATE (0xfe300010, 0xf6100000, kprobe_simulate_nop), | ||
1147 | |||
1142 | /* BLX (immediate) 1111 101x xxxx xxxx xxxx xxxx xxxx xxxx */ | 1148 | /* BLX (immediate) 1111 101x xxxx xxxx xxxx xxxx xxxx xxxx */ |
1143 | DECODE_SIMULATE (0xfe000000, 0xfa000000, simulate_blx1), | 1149 | DECODE_SIMULATE (0xfe000000, 0xfa000000, simulate_blx1), |
1144 | 1150 | ||