Skip to contentSkip to conversation

ARM: kprobes: run t32_simulate_ldr_literal() without insn slot

PATCH New Rabin Vincent 2 participants 2 messages Jun 11, 2012 – Jun 12, 2012 Arm (32-bit)

lore
Share & tools
lore

Rabin Vincent

author
#0 lore raw

PATCH 1/1 ARM: kprobes: run t32_simulate_ldr_literal() without insn slot

t32_simulate_ldr_literal() can be run without an instruction slot, so it should be using DECODE_SIMULATEX instead of DECODE_EMULATEX.

Signed-off-by Rabin Vincent <[email protected]>
---
 arch/arm/kernel/kprobes-thumb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/kprobes-thumb.c +1 -1
index 8f96ec7..6123daf 100644
@@ -660,7 +660,7 @@ static const union decode_item t32_table_1111_100x[] = {
 	/* LDRSB (literal)	1111 1001 x001 1111 xxxx xxxx xxxx xxxx */
 	/* LDRH (literal)	1111 1000 x011 1111 xxxx xxxx xxxx xxxx */
 	/* LDRSH (literal)	1111 1001 x011 1111 xxxx xxxx xxxx xxxx */
-	DECODE_EMULATEX	(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
+	DECODE_SIMULATEX(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
 						 REGS(PC, NOSPPCX, 0, 0, 0)),
 
 	/* STRB (immediate)	1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: kprobes: run t32_simulate_ldr_literal() without insn slot

Quoted 4 lines · Rabin Vincent

t32_simulate_ldr_literal() can be run without an instruction slot, so it should be using DECODE_SIMULATEX instead of DECODE_EMULATEX.

Signed-off-by Rabin Vincent <[email protected]>
Acked-by Jon Medhurst <[email protected]>
Quoted 17 lines
---
 arch/arm/kernel/kprobes-thumb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/kprobes-thumb.c +1 -1
index 8f96ec7..6123daf 100644
@@ -660,7 +660,7 @@ static const union decode_item t32_table_1111_100x[] = {
 	/* LDRSB (literal)	1111 1001 x001 1111 xxxx xxxx xxxx xxxx */
 	/* LDRH (literal)	1111 1000 x011 1111 xxxx xxxx xxxx xxxx */
 	/* LDRSH (literal)	1111 1001 x011 1111 xxxx xxxx xxxx xxxx */
-	DECODE_EMULATEX	(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
+	DECODE_SIMULATEX(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
 						 REGS(PC, NOSPPCX, 0, 0, 0)),
 
 	/* STRB (immediate)	1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */