forked from Mirrors/opensbi
		
	lib: Move instruction encoding macros to riscv_encoding.h
This patch moves all instruction encoding macros to riscv_encoding.h. Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
		@@ -420,4 +420,121 @@
 | 
			
		||||
#define CAUSE_LOAD_PAGE_FAULT		0xd
 | 
			
		||||
#define CAUSE_STORE_PAGE_FAULT		0xf
 | 
			
		||||
 | 
			
		||||
#define INSN_MATCH_LB			0x3
 | 
			
		||||
#define INSN_MASK_LB			0x707f
 | 
			
		||||
#define INSN_MATCH_LH			0x1003
 | 
			
		||||
#define INSN_MASK_LH			0x707f
 | 
			
		||||
#define INSN_MATCH_LW			0x2003
 | 
			
		||||
#define INSN_MASK_LW			0x707f
 | 
			
		||||
#define INSN_MATCH_LD			0x3003
 | 
			
		||||
#define INSN_MASK_LD			0x707f
 | 
			
		||||
#define INSN_MATCH_LBU			0x4003
 | 
			
		||||
#define INSN_MASK_LBU			0x707f
 | 
			
		||||
#define INSN_MATCH_LHU			0x5003
 | 
			
		||||
#define INSN_MASK_LHU			0x707f
 | 
			
		||||
#define INSN_MATCH_LWU			0x6003
 | 
			
		||||
#define INSN_MASK_LWU			0x707f
 | 
			
		||||
#define INSN_MATCH_SB			0x23
 | 
			
		||||
#define INSN_MASK_SB			0x707f
 | 
			
		||||
#define INSN_MATCH_SH			0x1023
 | 
			
		||||
#define INSN_MASK_SH			0x707f
 | 
			
		||||
#define INSN_MATCH_SW			0x2023
 | 
			
		||||
#define INSN_MASK_SW			0x707f
 | 
			
		||||
#define INSN_MATCH_SD			0x3023
 | 
			
		||||
#define INSN_MASK_SD			0x707f
 | 
			
		||||
 | 
			
		||||
#define INSN_MATCH_C_LD			0x6000
 | 
			
		||||
#define INSN_MASK_C_LD			0xe003
 | 
			
		||||
#define INSN_MATCH_C_SD			0xe000
 | 
			
		||||
#define INSN_MASK_C_SD			0xe003
 | 
			
		||||
#define INSN_MATCH_C_LW			0x4000
 | 
			
		||||
#define INSN_MASK_C_LW			0xe003
 | 
			
		||||
#define INSN_MATCH_C_SW			0xc000
 | 
			
		||||
#define INSN_MASK_C_SW			0xe003
 | 
			
		||||
#define INSN_MATCH_C_LDSP		0x6002
 | 
			
		||||
#define INSN_MASK_C_LDSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_SDSP		0xe002
 | 
			
		||||
#define INSN_MASK_C_SDSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_LWSP		0x4002
 | 
			
		||||
#define INSN_MASK_C_LWSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_SWSP		0xc002
 | 
			
		||||
#define INSN_MASK_C_SWSP		0xe003
 | 
			
		||||
 | 
			
		||||
#define INSN_MATCH_C_FLD		0x2000
 | 
			
		||||
#define INSN_MASK_C_FLD			0xe003
 | 
			
		||||
#define INSN_MATCH_C_FLW		0x6000
 | 
			
		||||
#define INSN_MASK_C_FLW			0xe003
 | 
			
		||||
#define INSN_MATCH_C_FSD		0xa000
 | 
			
		||||
#define INSN_MASK_C_FSD			0xe003
 | 
			
		||||
#define INSN_MATCH_C_FSW		0xe000
 | 
			
		||||
#define INSN_MASK_C_FSW			0xe003
 | 
			
		||||
#define INSN_MATCH_C_FLDSP		0x2002
 | 
			
		||||
#define INSN_MASK_C_FLDSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_FSDSP		0xa002
 | 
			
		||||
#define INSN_MASK_C_FSDSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_FLWSP		0x6002
 | 
			
		||||
#define INSN_MASK_C_FLWSP		0xe003
 | 
			
		||||
#define INSN_MATCH_C_FSWSP		0xe002
 | 
			
		||||
#define INSN_MASK_C_FSWSP		0xe003
 | 
			
		||||
 | 
			
		||||
#define INSN_LEN(insn)			((((insn) & 0x3) < 0x3) ? 2 : 4)
 | 
			
		||||
 | 
			
		||||
#if __riscv_xlen == 64
 | 
			
		||||
#define LOG_REGBYTES			3
 | 
			
		||||
#else
 | 
			
		||||
#define LOG_REGBYTES			2
 | 
			
		||||
#endif
 | 
			
		||||
#define REGBYTES			(1 << LOG_REGBYTES)
 | 
			
		||||
 | 
			
		||||
#define SH_RD				7
 | 
			
		||||
#define SH_RS1				15
 | 
			
		||||
#define SH_RS2				20
 | 
			
		||||
#define SH_RS2C				2
 | 
			
		||||
 | 
			
		||||
#define RV_X(x, s, n)			(((x) >> (s)) & ((1 << (n)) - 1))
 | 
			
		||||
#define RVC_LW_IMM(x)			((RV_X(x, 6, 1) << 2) | \
 | 
			
		||||
					 (RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
					 (RV_X(x, 5, 1) << 6))
 | 
			
		||||
#define RVC_LD_IMM(x)			((RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
					 (RV_X(x, 5, 2) << 6))
 | 
			
		||||
#define RVC_LWSP_IMM(x)			((RV_X(x, 4, 3) << 2) | \
 | 
			
		||||
					 (RV_X(x, 12, 1) << 5) | \
 | 
			
		||||
					 (RV_X(x, 2, 2) << 6))
 | 
			
		||||
#define RVC_LDSP_IMM(x)			((RV_X(x, 5, 2) << 3) | \
 | 
			
		||||
					 (RV_X(x, 12, 1) << 5) | \
 | 
			
		||||
					 (RV_X(x, 2, 3) << 6))
 | 
			
		||||
#define RVC_SWSP_IMM(x)			((RV_X(x, 9, 4) << 2) | \
 | 
			
		||||
					 (RV_X(x, 7, 2) << 6))
 | 
			
		||||
#define RVC_SDSP_IMM(x)			((RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
					 (RV_X(x, 7, 3) << 6))
 | 
			
		||||
#define RVC_RS1S(insn)			(8 + RV_X(insn, SH_RD, 3))
 | 
			
		||||
#define RVC_RS2S(insn)			(8 + RV_X(insn, SH_RS2C, 3))
 | 
			
		||||
#define RVC_RS2(insn)			RV_X(insn, SH_RS2C, 5)
 | 
			
		||||
 | 
			
		||||
#define SHIFT_RIGHT(x, y)		\
 | 
			
		||||
	((y) < 0 ? ((x) << -(y)) : ((x) >> (y)))
 | 
			
		||||
 | 
			
		||||
#define REG_MASK			\
 | 
			
		||||
	((1 << (5 + LOG_REGBYTES)) - (1 << LOG_REGBYTES))
 | 
			
		||||
 | 
			
		||||
#define REG_OFFSET(insn, pos)		\
 | 
			
		||||
	(SHIFT_RIGHT((insn), (pos) - LOG_REGBYTES) & REG_MASK)
 | 
			
		||||
 | 
			
		||||
#define REG_PTR(insn, pos, regs)	\
 | 
			
		||||
	(ulong *)((ulong)(regs) + REG_OFFSET(insn, pos))
 | 
			
		||||
 | 
			
		||||
#define GET_RM(insn)			(((insn) >> 12) & 7)
 | 
			
		||||
 | 
			
		||||
#define GET_RS1(insn, regs)		(*REG_PTR(insn, SH_RS1, regs))
 | 
			
		||||
#define GET_RS2(insn, regs)		(*REG_PTR(insn, SH_RS2, regs))
 | 
			
		||||
#define GET_RS1S(insn, regs)		(*REG_PTR(RVC_RS1S(insn), 0, regs))
 | 
			
		||||
#define GET_RS2S(insn, regs)		(*REG_PTR(RVC_RS2S(insn), 0, regs))
 | 
			
		||||
#define GET_RS2C(insn, regs)		(*REG_PTR(insn, SH_RS2C, regs))
 | 
			
		||||
#define GET_SP(regs)			(*REG_PTR(2, 0, regs))
 | 
			
		||||
#define SET_RD(insn, regs, val)		(*REG_PTR(insn, SH_RD, regs) = (val))
 | 
			
		||||
#define IMM_I(insn)			((s32)(insn) >> 20)
 | 
			
		||||
#define IMM_S(insn)			(((s32)(insn) >> 25 << 5) | \
 | 
			
		||||
					 (s32)(((insn) >> 7) & 0x1f))
 | 
			
		||||
#define MASK_FUNCT3			0x7000
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -26,19 +26,4 @@
 | 
			
		||||
#define STR(x) XSTR(x)
 | 
			
		||||
#define XSTR(x) #x
 | 
			
		||||
 | 
			
		||||
#if __riscv_xlen == 64
 | 
			
		||||
#define SLL32    sllw
 | 
			
		||||
#define STORE    sd
 | 
			
		||||
#define LOAD     ld
 | 
			
		||||
#define LWU      lwu
 | 
			
		||||
#define LOG_REGBYTES 3
 | 
			
		||||
#else
 | 
			
		||||
#define SLL32    sll
 | 
			
		||||
#define STORE    sw
 | 
			
		||||
#define LOAD     lw
 | 
			
		||||
#define LWU      lw
 | 
			
		||||
#define LOG_REGBYTES 2
 | 
			
		||||
#endif
 | 
			
		||||
#define REGBYTES (1 << LOG_REGBYTES)
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -16,56 +16,6 @@
 | 
			
		||||
#include <sbi/sbi_trap.h>
 | 
			
		||||
#include <sbi/sbi_unpriv.h>
 | 
			
		||||
 | 
			
		||||
#define SH_RD			7
 | 
			
		||||
#define SH_RS1			15
 | 
			
		||||
#define SH_RS2			20
 | 
			
		||||
#define SH_RS2C			2
 | 
			
		||||
 | 
			
		||||
#define RV_X(x, s, n)		(((x) >> (s)) & ((1 << (n)) - 1))
 | 
			
		||||
#define RVC_LW_IMM(x)		((RV_X(x, 6, 1) << 2) | \
 | 
			
		||||
				 (RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
				 (RV_X(x, 5, 1) << 6))
 | 
			
		||||
#define RVC_LD_IMM(x)		((RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
				 (RV_X(x, 5, 2) << 6))
 | 
			
		||||
#define RVC_LWSP_IMM(x)		((RV_X(x, 4, 3) << 2) | \
 | 
			
		||||
				 (RV_X(x, 12, 1) << 5) | \
 | 
			
		||||
				 (RV_X(x, 2, 2) << 6))
 | 
			
		||||
#define RVC_LDSP_IMM(x)		((RV_X(x, 5, 2) << 3) | \
 | 
			
		||||
				 (RV_X(x, 12, 1) << 5) | \
 | 
			
		||||
				 (RV_X(x, 2, 3) << 6))
 | 
			
		||||
#define RVC_SWSP_IMM(x)		((RV_X(x, 9, 4) << 2) | \
 | 
			
		||||
				 (RV_X(x, 7, 2) << 6))
 | 
			
		||||
#define RVC_SDSP_IMM(x)		((RV_X(x, 10, 3) << 3) | \
 | 
			
		||||
				 (RV_X(x, 7, 3) << 6))
 | 
			
		||||
#define RVC_RS1S(insn)		(8 + RV_X(insn, SH_RD, 3))
 | 
			
		||||
#define RVC_RS2S(insn)		(8 + RV_X(insn, SH_RS2C, 3))
 | 
			
		||||
#define RVC_RS2(insn)		RV_X(insn, SH_RS2C, 5)
 | 
			
		||||
 | 
			
		||||
#define SHIFT_RIGHT(x, y)	((y) < 0 ? ((x) << -(y)) : ((x) >> (y)))
 | 
			
		||||
 | 
			
		||||
#define REG_MASK		\
 | 
			
		||||
((1 << (5 + LOG_REGBYTES)) - (1 << LOG_REGBYTES))
 | 
			
		||||
 | 
			
		||||
#define REG_OFFSET(insn, pos)	\
 | 
			
		||||
(SHIFT_RIGHT((insn), (pos) - LOG_REGBYTES) & REG_MASK)
 | 
			
		||||
 | 
			
		||||
#define REG_PTR(insn, pos, regs)\
 | 
			
		||||
(ulong *)((ulong)(regs) + REG_OFFSET(insn, pos))
 | 
			
		||||
 | 
			
		||||
#define GET_RM(insn)		(((insn) >> 12) & 7)
 | 
			
		||||
 | 
			
		||||
#define GET_RS1(insn, regs)	(*REG_PTR(insn, SH_RS1, regs))
 | 
			
		||||
#define GET_RS2(insn, regs)	(*REG_PTR(insn, SH_RS2, regs))
 | 
			
		||||
#define GET_RS1S(insn, regs)	(*REG_PTR(RVC_RS1S(insn), 0, regs))
 | 
			
		||||
#define GET_RS2S(insn, regs)	(*REG_PTR(RVC_RS2S(insn), 0, regs))
 | 
			
		||||
#define GET_RS2C(insn, regs)	(*REG_PTR(insn, SH_RS2C, regs))
 | 
			
		||||
#define GET_SP(regs)		(*REG_PTR(2, 0, regs))
 | 
			
		||||
#define SET_RD(insn, regs, val)	(*REG_PTR(insn, SH_RD, regs) = (val))
 | 
			
		||||
#define IMM_I(insn)		((s32)(insn) >> 20)
 | 
			
		||||
#define IMM_S(insn)		(((s32)(insn) >> 25 << 5) | \
 | 
			
		||||
				 (s32)(((insn) >> 7) & 0x1f))
 | 
			
		||||
#define MASK_FUNCT3		0x7000
 | 
			
		||||
 | 
			
		||||
typedef int (*illegal_insn_func)(ulong insn,
 | 
			
		||||
				 u32 hartid, ulong mcause,
 | 
			
		||||
				 struct sbi_trap_regs *regs,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user