Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c8df330 authored by Jon Medhurst's avatar Jon Medhurst Committed by Tixy
Browse files

ARM: kprobes: Move find_str_pc_offset into kprobes-common.c 



Move str_pc_offset into kprobes-common.c as it will be needed by common
code later.

Signed-off-by: default avatarJon Medhurst <tixy@yxit.co.uk>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 1b59d874

arch/arm/kernel/kprobes-arm.c

+0 −28
Original line number Diff line number Diff line
@@ -91,29 +91,6 @@ union reg_pair { 
#endif

};



/*

 * For STR and STM instructions, an ARM core may choose to use either

 * a +8 or a +12 displacement from the current instruction's address.

 * Whichever value is chosen for a given core, it must be the same for

 * both instructions and may not change.  This function measures it.

 */



static int str_pc_offset;



static void __init find_str_pc_offset(void)

{

	int addr, scratch, ret;



	__asm__ (

		"sub	%[ret], pc, #4		\n\t"

		"str	pc, %[addr]		\n\t"

		"ldr	%[scr], %[addr]		\n\t"

		"sub	%[ret], %[scr], %[ret]	\n\t"

		: [ret] "=r" (ret), [scr] "=r" (scratch), [addr] "+m" (addr));



	str_pc_offset = ret;

}



/*

 * The insnslot_?arg_r[w]flags() functions below are to keep the

 * msr -> *fn -> mrs instruction sequences indivisible so that
@@ -1569,8 +1546,3 @@ arm_kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi) 


	return space_cccc_11xx(insn, asi);

}
 


void __init arm_kprobe_decode_init(void)

{

	find_str_pc_offset();

}

arch/arm/kernel/kprobes-common.c

+33 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
 *

 * Copyright (C) 2011 Jon Medhurst <tixy@yxit.co.uk>.

 *

 * Some contents moved here from arch/arm/include/asm/kprobes-arm.c which is

 * Copyright (C) 2006, 2007 Motorola Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.
@@ -14,6 +17,36 @@ 
#include "kprobes.h"





/*

 * For STR and STM instructions, an ARM core may choose to use either

 * a +8 or a +12 displacement from the current instruction's address.

 * Whichever value is chosen for a given core, it must be the same for

 * both instructions and may not change.  This function measures it.

 */



int str_pc_offset;



void __init find_str_pc_offset(void)

{

	int addr, scratch, ret;



	__asm__ (

		"sub	%[ret], pc, #4		\n\t"

		"str	pc, %[addr]		\n\t"

		"ldr	%[scr], %[addr]		\n\t"

		"sub	%[ret], %[scr], %[ret]	\n\t"

		: [ret] "=r" (ret), [scr] "=r" (scratch), [addr] "+m" (addr));



	str_pc_offset = ret;

}





void __init arm_kprobe_decode_init(void)

{

	find_str_pc_offset();

}





static unsigned long __kprobes __check_eq(unsigned long cpsr)

{

	return cpsr & PSR_Z_BIT;

arch/arm/kernel/kprobes.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ void __init arm_kprobe_decode_init(void); 


extern kprobe_check_cc * const kprobe_condition_checks[16];



extern int str_pc_offset;



/*

 * Test if load/store instructions writeback the address register.

 * if P (bit 24) == 0 or W (bit 21) == 1