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

powerpc/ppc-opcode: Define and use PPC_RAW_TRAP() and PPC_RAW_TW() 



Add and use PPC_RAW_TRAP() instead of opencoding.

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/52c7e522e56a38e3ff0363906919445920005a8f.1657205708.git.christophe.leroy@csgroup.eu
parent 7b48377e

arch/powerpc/include/asm/ppc-opcode.h

+2 −0
Original line number Diff line number Diff line
@@ -581,6 +581,8 @@ 


#define PPC_RAW_BRANCH(offset)		(0x48000000 | PPC_LI(offset))

#define PPC_RAW_BL(offset)		(0x48000001 | PPC_LI(offset))

#define PPC_RAW_TW(t0, a, b)		(0x7f000008 | ___PPC_RS(t0) | ___PPC_RA(a) | ___PPC_RB(b))

#define PPC_RAW_TRAP()			PPC_RAW_TW(31, 0, 0)



/* Deal with instructions that older assemblers aren't aware of */

#define	PPC_BCCTR_FLUSH		stringify_in_c(.long PPC_INST_BCCTR_FLUSH)

arch/powerpc/include/asm/probes.h

+2 −1
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
 */

#include <linux/types.h>

#include <asm/disassemble.h>

#include <asm/ppc-opcode.h>



#define BREAKPOINT_INSTRUCTION	0x7fe00008	/* trap */

#define BREAKPOINT_INSTRUCTION	PPC_RAW_TRAP()	/* trap */



/* Trap definitions per ISA */

#define IS_TW(instr)		(((instr) & 0xfc0007fe) == 0x7c000008)

arch/powerpc/xmon/xmon.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct bpt { 
static struct bpt bpts[NBPTS];

static struct bpt dabr[HBP_NUM_MAX];

static struct bpt *iabr;

static unsigned bpinstr = 0x7fe00008;	/* trap */

static unsigned int bpinstr = PPC_RAW_TRAP();



#define BP_NUM(bp)	((bp) - bpts + 1)