Commit 31acc599 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/code-patching: Move instr_is_branch_{i/b}form() in code-patching.h 



To enable moving selftests in their own C file in following patch,
move instr_is_branch_iform() and instr_is_branch_bform()
to code-patching.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/fca0f3b191211b3681020885a611bf73eef20563.1638446239.git.christophe.leroy@csgroup.eu
parent 29562a9d

arch/powerpc/include/asm/code-patching.h

+15 −0
Original line number Diff line number Diff line
@@ -58,6 +58,21 @@ static inline int modify_instruction_site(s32 *site, unsigned int clr, unsigned 
	return modify_instruction((unsigned int *)patch_site_addr(site), clr, set);

}



static inline unsigned int branch_opcode(ppc_inst_t instr)

{

	return ppc_inst_primary_opcode(instr) & 0x3F;

}



static inline int instr_is_branch_iform(ppc_inst_t instr)

{

	return branch_opcode(instr) == 18;

}



static inline int instr_is_branch_bform(ppc_inst_t instr)

{

	return branch_opcode(instr) == 16;

}



int instr_is_relative_branch(ppc_inst_t instr);

int instr_is_relative_link_branch(ppc_inst_t instr);

unsigned long branch_target(const u32 *instr);

arch/powerpc/lib/code-patching.c

+0 −15
Original line number Diff line number Diff line
@@ -285,21 +285,6 @@ int create_cond_branch(ppc_inst_t *instr, const u32 *addr, 
	return 0;

}



static unsigned int branch_opcode(ppc_inst_t instr)

{

	return ppc_inst_primary_opcode(instr) & 0x3F;

}



static int instr_is_branch_iform(ppc_inst_t instr)

{

	return branch_opcode(instr) == 18;

}



static int instr_is_branch_bform(ppc_inst_t instr)

{

	return branch_opcode(instr) == 16;

}



int instr_is_relative_branch(ppc_inst_t instr)

{

	if (ppc_inst_val(instr) & BRANCH_ABSOLUTE)