mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	MIPS: uasm: Remove needless ISA abstraction
We always either target MIPS32/MIPS64 or microMIPS, and always include
one & only one of uasm-mips.c or uasm-micromips.c. Therefore the
abstraction of the ISA in asm/uasm.h declaring functions for either ISA
is redundant & needless. Remove it to simplify the code.
This is largely the result of the following:
  :%s/ISAOPC(\(.\{-}\))/uasm_i##\1/
  :%s/ISAFUNC(\(.\{-}\))/\1/
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Paul Burton <paul.burton@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/15844/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
			
			
This commit is contained in:
		
							parent
							
								
									828d1e4e98
								
							
						
					
					
						commit
						33679a5037
					
				
					 2 changed files with 106 additions and 137 deletions
				
			
		| 
						 | 
					@ -21,77 +21,46 @@
 | 
				
			||||||
#define UASM_EXPORT_SYMBOL(sym)
 | 
					#define UASM_EXPORT_SYMBOL(sym)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define _UASM_ISA_CLASSIC	0
 | 
					 | 
				
			||||||
#define _UASM_ISA_MICROMIPS	1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifndef UASM_ISA
 | 
					 | 
				
			||||||
#ifdef CONFIG_CPU_MICROMIPS
 | 
					 | 
				
			||||||
#define UASM_ISA	_UASM_ISA_MICROMIPS
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define UASM_ISA	_UASM_ISA_CLASSIC
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if (UASM_ISA == _UASM_ISA_CLASSIC)
 | 
					 | 
				
			||||||
#ifdef CONFIG_CPU_MICROMIPS
 | 
					 | 
				
			||||||
#define ISAOPC(op)	CL_uasm_i##op
 | 
					 | 
				
			||||||
#define ISAFUNC(x)	CL_##x
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define ISAOPC(op)	uasm_i##op
 | 
					 | 
				
			||||||
#define ISAFUNC(x)	x
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#elif (UASM_ISA == _UASM_ISA_MICROMIPS)
 | 
					 | 
				
			||||||
#ifdef CONFIG_CPU_MICROMIPS
 | 
					 | 
				
			||||||
#define ISAOPC(op)	uasm_i##op
 | 
					 | 
				
			||||||
#define ISAFUNC(x)	x
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define ISAOPC(op)	MM_uasm_i##op
 | 
					 | 
				
			||||||
#define ISAFUNC(x)	MM_##x
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#error Unsupported micro-assembler ISA!!!
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define Ip_u1u2u3(op)							\
 | 
					#define Ip_u1u2u3(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u2u1u3(op)							\
 | 
					#define Ip_u2u1u3(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u3u2u1(op)							\
 | 
					#define Ip_u3u2u1(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u3u1u2(op)							\
 | 
					#define Ip_u3u1u2(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u1u2s3(op)							\
 | 
					#define Ip_u1u2s3(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, signed int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, signed int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u2s3u1(op)							\
 | 
					#define Ip_u2s3u1(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, signed int b, unsigned int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, signed int b, unsigned int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_s3s1s2(op)							\
 | 
					#define Ip_s3s1s2(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, int a, int b, int c)
 | 
					void uasm_i##op(u32 **buf, int a, int b, int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u2u1s3(op)							\
 | 
					#define Ip_u2u1s3(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, signed int c)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, signed int c)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u2u1msbu3(op)						\
 | 
					#define Ip_u2u1msbu3(op)						\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, unsigned int c, \
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c, \
 | 
				
			||||||
	   unsigned int d)
 | 
						   unsigned int d)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u1u2(op)							\
 | 
					#define Ip_u1u2(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u2u1(op)							\
 | 
					#define Ip_u2u1(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, unsigned int b)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u1s2(op)							\
 | 
					#define Ip_u1s2(op)							\
 | 
				
			||||||
void ISAOPC(op)(u32 **buf, unsigned int a, signed int b)
 | 
					void uasm_i##op(u32 **buf, unsigned int a, signed int b)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_u1(op) void ISAOPC(op)(u32 **buf, unsigned int a)
 | 
					#define Ip_u1(op) void uasm_i##op(u32 **buf, unsigned int a)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define Ip_0(op) void ISAOPC(op)(u32 **buf)
 | 
					#define Ip_0(op) void uasm_i##op(u32 **buf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Ip_u2u1s3(_addiu);
 | 
					Ip_u2u1s3(_addiu);
 | 
				
			||||||
Ip_u3u1u2(_addu);
 | 
					Ip_u3u1u2(_addu);
 | 
				
			||||||
| 
						 | 
					@ -191,20 +160,20 @@ struct uasm_label {
 | 
				
			||||||
	int lab;
 | 
						int lab;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_build_label)(struct uasm_label **lab, u32 *addr,
 | 
					void uasm_build_label(struct uasm_label **lab, u32 *addr,
 | 
				
			||||||
			int lid);
 | 
								int lid);
 | 
				
			||||||
#ifdef CONFIG_64BIT
 | 
					#ifdef CONFIG_64BIT
 | 
				
			||||||
int ISAFUNC(uasm_in_compat_space_p)(long addr);
 | 
					int uasm_in_compat_space_p(long addr);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
int ISAFUNC(uasm_rel_hi)(long val);
 | 
					int uasm_rel_hi(long val);
 | 
				
			||||||
int ISAFUNC(uasm_rel_lo)(long val);
 | 
					int uasm_rel_lo(long val);
 | 
				
			||||||
void ISAFUNC(UASM_i_LA_mostly)(u32 **buf, unsigned int rs, long addr);
 | 
					void UASM_i_LA_mostly(u32 **buf, unsigned int rs, long addr);
 | 
				
			||||||
void ISAFUNC(UASM_i_LA)(u32 **buf, unsigned int rs, long addr);
 | 
					void UASM_i_LA(u32 **buf, unsigned int rs, long addr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define UASM_L_LA(lb)							\
 | 
					#define UASM_L_LA(lb)							\
 | 
				
			||||||
static inline void ISAFUNC(uasm_l##lb)(struct uasm_label **lab, u32 *addr) \
 | 
					static inline void uasm_l##lb(struct uasm_label **lab, u32 *addr)	\
 | 
				
			||||||
{									\
 | 
					{									\
 | 
				
			||||||
	ISAFUNC(uasm_build_label)(lab, addr, label##lb);		\
 | 
						uasm_build_label(lab, addr, label##lb);				\
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* convenience macros for instructions */
 | 
					/* convenience macros for instructions */
 | 
				
			||||||
| 
						 | 
					@ -256,27 +225,27 @@ static inline void uasm_i_drotr_safe(u32 **p, unsigned int a1,
 | 
				
			||||||
				     unsigned int a2, unsigned int a3)
 | 
									     unsigned int a2, unsigned int a3)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (a3 < 32)
 | 
						if (a3 < 32)
 | 
				
			||||||
		ISAOPC(_drotr)(p, a1, a2, a3);
 | 
							uasm_i_drotr(p, a1, a2, a3);
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		ISAOPC(_drotr32)(p, a1, a2, a3 - 32);
 | 
							uasm_i_drotr32(p, a1, a2, a3 - 32);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static inline void uasm_i_dsll_safe(u32 **p, unsigned int a1,
 | 
					static inline void uasm_i_dsll_safe(u32 **p, unsigned int a1,
 | 
				
			||||||
				    unsigned int a2, unsigned int a3)
 | 
									    unsigned int a2, unsigned int a3)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (a3 < 32)
 | 
						if (a3 < 32)
 | 
				
			||||||
		ISAOPC(_dsll)(p, a1, a2, a3);
 | 
							uasm_i_dsll(p, a1, a2, a3);
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		ISAOPC(_dsll32)(p, a1, a2, a3 - 32);
 | 
							uasm_i_dsll32(p, a1, a2, a3 - 32);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static inline void uasm_i_dsrl_safe(u32 **p, unsigned int a1,
 | 
					static inline void uasm_i_dsrl_safe(u32 **p, unsigned int a1,
 | 
				
			||||||
				    unsigned int a2, unsigned int a3)
 | 
									    unsigned int a2, unsigned int a3)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (a3 < 32)
 | 
						if (a3 < 32)
 | 
				
			||||||
		ISAOPC(_dsrl)(p, a1, a2, a3);
 | 
							uasm_i_dsrl(p, a1, a2, a3);
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		ISAOPC(_dsrl32)(p, a1, a2, a3 - 32);
 | 
							uasm_i_dsrl32(p, a1, a2, a3 - 32);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Handle relocations. */
 | 
					/* Handle relocations. */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -350,7 +350,7 @@ I_u2u1u3(_lddir)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef CONFIG_CPU_CAVIUM_OCTEON
 | 
					#ifdef CONFIG_CPU_CAVIUM_OCTEON
 | 
				
			||||||
#include <asm/octeon/octeon.h>
 | 
					#include <asm/octeon/octeon.h>
 | 
				
			||||||
void ISAFUNC(uasm_i_pref)(u32 **buf, unsigned int a, signed int b,
 | 
					void uasm_i_pref(u32 **buf, unsigned int a, signed int b,
 | 
				
			||||||
			    unsigned int c)
 | 
								    unsigned int c)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR && a <= 24 && a != 5)
 | 
						if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR && a <= 24 && a != 5)
 | 
				
			||||||
| 
						 | 
					@ -362,26 +362,26 @@ void ISAFUNC(uasm_i_pref)(u32 **buf, unsigned int a, signed int b,
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		build_insn(buf, insn_pref, c, a, b);
 | 
							build_insn(buf, insn_pref, c, a, b);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_i_pref));
 | 
					UASM_EXPORT_SYMBOL(uasm_i_pref);
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
I_u2s3u1(_pref)
 | 
					I_u2s3u1(_pref)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Handle labels. */
 | 
					/* Handle labels. */
 | 
				
			||||||
void ISAFUNC(uasm_build_label)(struct uasm_label **lab, u32 *addr, int lid)
 | 
					void uasm_build_label(struct uasm_label **lab, u32 *addr, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	(*lab)->addr = addr;
 | 
						(*lab)->addr = addr;
 | 
				
			||||||
	(*lab)->lab = lid;
 | 
						(*lab)->lab = lid;
 | 
				
			||||||
	(*lab)++;
 | 
						(*lab)++;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_build_label));
 | 
					UASM_EXPORT_SYMBOL(uasm_build_label);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ISAFUNC(uasm_in_compat_space_p)(long addr)
 | 
					int uasm_in_compat_space_p(long addr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	/* Is this address in 32bit compat space? */
 | 
						/* Is this address in 32bit compat space? */
 | 
				
			||||||
	return addr == (int)addr;
 | 
						return addr == (int)addr;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_in_compat_space_p));
 | 
					UASM_EXPORT_SYMBOL(uasm_in_compat_space_p);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int uasm_rel_highest(long val)
 | 
					static int uasm_rel_highest(long val)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					@ -401,64 +401,64 @@ static int uasm_rel_higher(long val)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ISAFUNC(uasm_rel_hi)(long val)
 | 
					int uasm_rel_hi(long val)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return ((((val + 0x8000L) >> 16) & 0xffff) ^ 0x8000) - 0x8000;
 | 
						return ((((val + 0x8000L) >> 16) & 0xffff) ^ 0x8000) - 0x8000;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_rel_hi));
 | 
					UASM_EXPORT_SYMBOL(uasm_rel_hi);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ISAFUNC(uasm_rel_lo)(long val)
 | 
					int uasm_rel_lo(long val)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return ((val & 0xffff) ^ 0x8000) - 0x8000;
 | 
						return ((val & 0xffff) ^ 0x8000) - 0x8000;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_rel_lo));
 | 
					UASM_EXPORT_SYMBOL(uasm_rel_lo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(UASM_i_LA_mostly)(u32 **buf, unsigned int rs, long addr)
 | 
					void UASM_i_LA_mostly(u32 **buf, unsigned int rs, long addr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (!ISAFUNC(uasm_in_compat_space_p)(addr)) {
 | 
						if (!uasm_in_compat_space_p(addr)) {
 | 
				
			||||||
		ISAFUNC(uasm_i_lui)(buf, rs, uasm_rel_highest(addr));
 | 
							uasm_i_lui(buf, rs, uasm_rel_highest(addr));
 | 
				
			||||||
		if (uasm_rel_higher(addr))
 | 
							if (uasm_rel_higher(addr))
 | 
				
			||||||
			ISAFUNC(uasm_i_daddiu)(buf, rs, rs, uasm_rel_higher(addr));
 | 
								uasm_i_daddiu(buf, rs, rs, uasm_rel_higher(addr));
 | 
				
			||||||
		if (ISAFUNC(uasm_rel_hi(addr))) {
 | 
							if (uasm_rel_hi(addr)) {
 | 
				
			||||||
			ISAFUNC(uasm_i_dsll)(buf, rs, rs, 16);
 | 
								uasm_i_dsll(buf, rs, rs, 16);
 | 
				
			||||||
			ISAFUNC(uasm_i_daddiu)(buf, rs, rs,
 | 
								uasm_i_daddiu(buf, rs, rs,
 | 
				
			||||||
					ISAFUNC(uasm_rel_hi)(addr));
 | 
										uasm_rel_hi(addr));
 | 
				
			||||||
			ISAFUNC(uasm_i_dsll)(buf, rs, rs, 16);
 | 
								uasm_i_dsll(buf, rs, rs, 16);
 | 
				
			||||||
		} else
 | 
							} else
 | 
				
			||||||
			ISAFUNC(uasm_i_dsll32)(buf, rs, rs, 0);
 | 
								uasm_i_dsll32(buf, rs, rs, 0);
 | 
				
			||||||
	} else
 | 
						} else
 | 
				
			||||||
		ISAFUNC(uasm_i_lui)(buf, rs, ISAFUNC(uasm_rel_hi(addr)));
 | 
							uasm_i_lui(buf, rs, uasm_rel_hi(addr));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(UASM_i_LA_mostly));
 | 
					UASM_EXPORT_SYMBOL(UASM_i_LA_mostly);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(UASM_i_LA)(u32 **buf, unsigned int rs, long addr)
 | 
					void UASM_i_LA(u32 **buf, unsigned int rs, long addr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	ISAFUNC(UASM_i_LA_mostly)(buf, rs, addr);
 | 
						UASM_i_LA_mostly(buf, rs, addr);
 | 
				
			||||||
	if (ISAFUNC(uasm_rel_lo(addr))) {
 | 
						if (uasm_rel_lo(addr)) {
 | 
				
			||||||
		if (!ISAFUNC(uasm_in_compat_space_p)(addr))
 | 
							if (!uasm_in_compat_space_p(addr))
 | 
				
			||||||
			ISAFUNC(uasm_i_daddiu)(buf, rs, rs,
 | 
								uasm_i_daddiu(buf, rs, rs,
 | 
				
			||||||
					ISAFUNC(uasm_rel_lo(addr)));
 | 
										uasm_rel_lo(addr));
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			ISAFUNC(uasm_i_addiu)(buf, rs, rs,
 | 
								uasm_i_addiu(buf, rs, rs,
 | 
				
			||||||
					ISAFUNC(uasm_rel_lo(addr)));
 | 
										uasm_rel_lo(addr));
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(UASM_i_LA));
 | 
					UASM_EXPORT_SYMBOL(UASM_i_LA);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Handle relocations. */
 | 
					/* Handle relocations. */
 | 
				
			||||||
void ISAFUNC(uasm_r_mips_pc16)(struct uasm_reloc **rel, u32 *addr, int lid)
 | 
					void uasm_r_mips_pc16(struct uasm_reloc **rel, u32 *addr, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	(*rel)->addr = addr;
 | 
						(*rel)->addr = addr;
 | 
				
			||||||
	(*rel)->type = R_MIPS_PC16;
 | 
						(*rel)->type = R_MIPS_PC16;
 | 
				
			||||||
	(*rel)->lab = lid;
 | 
						(*rel)->lab = lid;
 | 
				
			||||||
	(*rel)++;
 | 
						(*rel)++;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_r_mips_pc16));
 | 
					UASM_EXPORT_SYMBOL(uasm_r_mips_pc16);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static inline void __resolve_relocs(struct uasm_reloc *rel,
 | 
					static inline void __resolve_relocs(struct uasm_reloc *rel,
 | 
				
			||||||
				    struct uasm_label *lab);
 | 
									    struct uasm_label *lab);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_resolve_relocs)(struct uasm_reloc *rel,
 | 
					void uasm_resolve_relocs(struct uasm_reloc *rel,
 | 
				
			||||||
				  struct uasm_label *lab)
 | 
									  struct uasm_label *lab)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct uasm_label *l;
 | 
						struct uasm_label *l;
 | 
				
			||||||
| 
						 | 
					@ -468,39 +468,39 @@ void ISAFUNC(uasm_resolve_relocs)(struct uasm_reloc *rel,
 | 
				
			||||||
			if (rel->lab == l->lab)
 | 
								if (rel->lab == l->lab)
 | 
				
			||||||
				__resolve_relocs(rel, l);
 | 
									__resolve_relocs(rel, l);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_resolve_relocs));
 | 
					UASM_EXPORT_SYMBOL(uasm_resolve_relocs);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_move_relocs)(struct uasm_reloc *rel, u32 *first, u32 *end,
 | 
					void uasm_move_relocs(struct uasm_reloc *rel, u32 *first, u32 *end,
 | 
				
			||||||
			       long off)
 | 
								       long off)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	for (; rel->lab != UASM_LABEL_INVALID; rel++)
 | 
						for (; rel->lab != UASM_LABEL_INVALID; rel++)
 | 
				
			||||||
		if (rel->addr >= first && rel->addr < end)
 | 
							if (rel->addr >= first && rel->addr < end)
 | 
				
			||||||
			rel->addr += off;
 | 
								rel->addr += off;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_move_relocs));
 | 
					UASM_EXPORT_SYMBOL(uasm_move_relocs);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_move_labels)(struct uasm_label *lab, u32 *first, u32 *end,
 | 
					void uasm_move_labels(struct uasm_label *lab, u32 *first, u32 *end,
 | 
				
			||||||
			       long off)
 | 
								       long off)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	for (; lab->lab != UASM_LABEL_INVALID; lab++)
 | 
						for (; lab->lab != UASM_LABEL_INVALID; lab++)
 | 
				
			||||||
		if (lab->addr >= first && lab->addr < end)
 | 
							if (lab->addr >= first && lab->addr < end)
 | 
				
			||||||
			lab->addr += off;
 | 
								lab->addr += off;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_move_labels));
 | 
					UASM_EXPORT_SYMBOL(uasm_move_labels);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_copy_handler)(struct uasm_reloc *rel, struct uasm_label *lab,
 | 
					void uasm_copy_handler(struct uasm_reloc *rel, struct uasm_label *lab,
 | 
				
			||||||
				u32 *first, u32 *end, u32 *target)
 | 
									u32 *first, u32 *end, u32 *target)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	long off = (long)(target - first);
 | 
						long off = (long)(target - first);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	memcpy(target, first, (end - first) * sizeof(u32));
 | 
						memcpy(target, first, (end - first) * sizeof(u32));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ISAFUNC(uasm_move_relocs(rel, first, end, off));
 | 
						uasm_move_relocs(rel, first, end, off);
 | 
				
			||||||
	ISAFUNC(uasm_move_labels(lab, first, end, off));
 | 
						uasm_move_labels(lab, first, end, off);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_copy_handler));
 | 
					UASM_EXPORT_SYMBOL(uasm_copy_handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ISAFUNC(uasm_insn_has_bdelay)(struct uasm_reloc *rel, u32 *addr)
 | 
					int uasm_insn_has_bdelay(struct uasm_reloc *rel, u32 *addr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	for (; rel->lab != UASM_LABEL_INVALID; rel++) {
 | 
						for (; rel->lab != UASM_LABEL_INVALID; rel++) {
 | 
				
			||||||
		if (rel->addr == addr
 | 
							if (rel->addr == addr
 | 
				
			||||||
| 
						 | 
					@ -511,92 +511,92 @@ int ISAFUNC(uasm_insn_has_bdelay)(struct uasm_reloc *rel, u32 *addr)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_insn_has_bdelay));
 | 
					UASM_EXPORT_SYMBOL(uasm_insn_has_bdelay);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Convenience functions for labeled branches. */
 | 
					/* Convenience functions for labeled branches. */
 | 
				
			||||||
void ISAFUNC(uasm_il_bltz)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bltz(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			   int lid)
 | 
								   int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bltz)(p, reg, 0);
 | 
						uasm_i_bltz(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bltz));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bltz);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_b)(u32 **p, struct uasm_reloc **r, int lid)
 | 
					void uasm_il_b(u32 **p, struct uasm_reloc **r, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_b)(p, 0);
 | 
						uasm_i_b(p, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_b));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_b);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_beq)(u32 **p, struct uasm_reloc **r, unsigned int r1,
 | 
					void uasm_il_beq(u32 **p, struct uasm_reloc **r, unsigned int r1,
 | 
				
			||||||
			  unsigned int r2, int lid)
 | 
								  unsigned int r2, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_beq)(p, r1, r2, 0);
 | 
						uasm_i_beq(p, r1, r2, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_beq));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_beq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_beqz)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_beqz(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			   int lid)
 | 
								   int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_beqz)(p, reg, 0);
 | 
						uasm_i_beqz(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_beqz));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_beqz);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_beqzl)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_beqzl(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			    int lid)
 | 
								    int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_beqzl)(p, reg, 0);
 | 
						uasm_i_beqzl(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_beqzl));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_beqzl);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bne)(u32 **p, struct uasm_reloc **r, unsigned int reg1,
 | 
					void uasm_il_bne(u32 **p, struct uasm_reloc **r, unsigned int reg1,
 | 
				
			||||||
			  unsigned int reg2, int lid)
 | 
								  unsigned int reg2, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bne)(p, reg1, reg2, 0);
 | 
						uasm_i_bne(p, reg1, reg2, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bne));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bne);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bnez)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bnez(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			   int lid)
 | 
								   int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bnez)(p, reg, 0);
 | 
						uasm_i_bnez(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bnez));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bnez);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bgezl)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bgezl(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			    int lid)
 | 
								    int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bgezl)(p, reg, 0);
 | 
						uasm_i_bgezl(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bgezl));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bgezl);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bgez)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bgez(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			   int lid)
 | 
								   int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bgez)(p, reg, 0);
 | 
						uasm_i_bgez(p, reg, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bgez));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bgez);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bbit0)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bbit0(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			    unsigned int bit, int lid)
 | 
								    unsigned int bit, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bbit0)(p, reg, bit, 0);
 | 
						uasm_i_bbit0(p, reg, bit, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bbit0));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bbit0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ISAFUNC(uasm_il_bbit1)(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
					void uasm_il_bbit1(u32 **p, struct uasm_reloc **r, unsigned int reg,
 | 
				
			||||||
			    unsigned int bit, int lid)
 | 
								    unsigned int bit, int lid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uasm_r_mips_pc16(r, *p, lid);
 | 
						uasm_r_mips_pc16(r, *p, lid);
 | 
				
			||||||
	ISAFUNC(uasm_i_bbit1)(p, reg, bit, 0);
 | 
						uasm_i_bbit1(p, reg, bit, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
UASM_EXPORT_SYMBOL(ISAFUNC(uasm_il_bbit1));
 | 
					UASM_EXPORT_SYMBOL(uasm_il_bbit1);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue