Commit 7b187dcd authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Michael Ellerman
Browse files

powerpc/bpf: Cleanup bpf_jit.h 



- PPC_EX32() is only used by ppc32 JIT. Move it to bpf_jit_comp32.c
- PPC_LI64() is only valid in ppc64. #ifdef it
- PPC_FUNC_ADDR() is not used anymore. Remove it.

Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/58f5b66b2f8546bbbee620f62103a8e97a63eb7c.1644834730.git.naveen.n.rao@linux.vnet.ibm.com
parent 794abc08

arch/powerpc/net/bpf_jit.h

+1 −9
Original line number Diff line number Diff line
@@ -59,10 +59,7 @@ 
				EMIT(PPC_RAW_ORI(d, d, IMM_L(i)));	      \

		} } while(0)



#ifdef CONFIG_PPC32

#define PPC_EX32(r, i)		EMIT(PPC_RAW_LI((r), (i) < 0 ? -1 : 0))

#endif



#ifdef CONFIG_PPC64

#define PPC_LI64(d, i)		do {					      \

		if ((long)(i) >= -2147483648 &&				      \

				(long)(i) < 2147483648)			      \
@@ -85,11 +82,6 @@ 
				EMIT(PPC_RAW_ORI(d, d, (uintptr_t)(i) &       \

							0xffff));             \

		} } while (0)



#ifdef CONFIG_PPC64

#define PPC_FUNC_ADDR(d,i) do { PPC_LI64(d, i); } while(0)

#else

#define PPC_FUNC_ADDR(d,i) do { PPC_LI32(d, i); } while(0)

#endif



/*

arch/powerpc/net/bpf_jit_comp32.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
/* BPF register usage */

#define TMP_REG	(MAX_BPF_JIT_REG + 0)



#define PPC_EX32(r, i)		EMIT(PPC_RAW_LI((r), (i) < 0 ? -1 : 0))



/* BPF to ppc register mappings */

const int b2p[MAX_BPF_JIT_REG + 1] = {

	/* function return value */