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

powerpc/inst: Refactor PPC32 and PPC64 versions 



ppc_inst() ppc_inst_prefixed() ppc_inst_swab() can easily be made common
to both PPC32 and PPC64.

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/d54c63dcac6d190e1cc0d2fe3259d6e621928cdf.1621516826.git.christophe.leroy@csgroup.eu
parent 69d4d6e5

arch/powerpc/include/asm/inst.h

+13 −36
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ static inline int ppc_inst_primary_opcode(struct ppc_inst x) 
	return ppc_inst_val(x) >> 26;

}



#ifdef CONFIG_PPC64

#define ppc_inst(x) ((struct ppc_inst){ .val = (x) })



#ifdef CONFIG_PPC64

#define ppc_inst_prefix(x, y) ((struct ppc_inst){ .val = (x), .suffix = (y) })



static inline u32 ppc_inst_suffix(struct ppc_inst x)
@@ -70,57 +70,34 @@ static inline u32 ppc_inst_suffix(struct ppc_inst x) 
	return x.suffix;

}



static inline bool ppc_inst_prefixed(struct ppc_inst x)

{

	return ppc_inst_primary_opcode(x) == OP_PREFIX;

}

#else

#define ppc_inst_prefix(x, y) ppc_inst(x)



static inline struct ppc_inst ppc_inst_swab(struct ppc_inst x)

static inline u32 ppc_inst_suffix(struct ppc_inst x)

{

	return ppc_inst_prefix(swab32(ppc_inst_val(x)), swab32(ppc_inst_suffix(x)));

	return 0;

}



#endif /* CONFIG_PPC64 */



static inline struct ppc_inst ppc_inst_read(const u32 *ptr)

{

	u32 val, suffix;



	val = *ptr;

	if ((val >> 26) == OP_PREFIX) {

		suffix = *(ptr + 1);

		return ppc_inst_prefix(val, suffix);

	} else {

		return ppc_inst(val);

	}

	if (IS_ENABLED(CONFIG_PPC64) && (*ptr >> 26) == OP_PREFIX)

		return ppc_inst_prefix(*ptr, *(ptr + 1));

	else

		return ppc_inst(*ptr);

}



#else



#define ppc_inst(x) ((struct ppc_inst){ .val = x })



#define ppc_inst_prefix(x, y) ppc_inst(x)



static inline bool ppc_inst_prefixed(struct ppc_inst x)

{

	return false;

}



static inline u32 ppc_inst_suffix(struct ppc_inst x)

{

	return 0;

	return IS_ENABLED(CONFIG_PPC64) && ppc_inst_primary_opcode(x) == OP_PREFIX;

}



static inline struct ppc_inst ppc_inst_swab(struct ppc_inst x)

{

	return ppc_inst(swab32(ppc_inst_val(x)));

}



static inline struct ppc_inst ppc_inst_read(const u32 *ptr)

{

	return ppc_inst(*ptr);

	return ppc_inst_prefix(swab32(ppc_inst_val(x)), swab32(ppc_inst_suffix(x)));

}



#endif /* CONFIG_PPC64 */



static inline bool ppc_inst_equal(struct ppc_inst x, struct ppc_inst y)

{

	if (ppc_inst_val(x) != ppc_inst_val(y))