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>

diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c
index 70e540b7c53b7328fea67a5fae7f011c32122b54..8a58c99f658dcedd9addcd387f50b6659cd24e24 100644 (file)
--- 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[] = {
        /* PLD (immediate)      1111 0101 x101 xxxx xxxx xxxx xxxx xxxx */
        DECODE_SIMULATE (0xfe300000, 0xf4100000, kprobe_simulate_nop),
 
+       /* memory hint          1111 0110 x001 xxxx xxxx xxxx xxx0 xxxx */
+       /* PLDI (register)      1111 0110 x101 xxxx xxxx xxxx xxx0 xxxx */
+       /* PLDW (register)      1111 0111 x001 xxxx xxxx xxxx xxx0 xxxx */
+       /* PLD (register)       1111 0111 x101 xxxx xxxx xxxx xxx0 xxxx */
+       DECODE_SIMULATE (0xfe300010, 0xf6100000, kprobe_simulate_nop),
+
        /* BLX (immediate)      1111 101x xxxx xxxx xxxx xxxx xxxx xxxx */
        DECODE_SIMULATE (0xfe000000, 0xfa000000, simulate_blx1),