Browse Source

RISC-V: Move certain arrays to riscv-opc.c

This is a part of small tidying (declare tables in riscv-opc.c).

include/ChangeLog:

	* opcode/riscv.h (riscv_rm, riscv_pred_succ): Move declarations to
	opcodes/riscv-opc.c.  New non-static definitions.

opcodes/ChangeLog:

	* riscv-opc.c (riscv_rm, riscv_pred_succ): Move from
	include/opcode/riscv.h.  Add description.
users/aburgess/try-mips-disasm-styling
Tsukasa OI 4 years ago
parent
commit
3d9d92c22f
  1. 13
      include/opcode/riscv.h
  2. 13
      opcodes/riscv-opc.c

13
include/opcode/riscv.h

@ -46,17 +46,6 @@ static inline unsigned int riscv_insn_length (insn_t insn)
return 2;
}
static const char * const riscv_rm[8] =
{
"rne", "rtz", "rdn", "rup", "rmm", 0, 0, "dyn"
};
static const char * const riscv_pred_succ[16] =
{
0, "w", "r", "rw", "o", "ow", "or", "orw",
"i", "iw", "ir", "irw", "io", "iow", "ior", "iorw"
};
#define RVC_JUMP_BITS 11
#define RVC_JUMP_REACH ((1ULL << RVC_JUMP_BITS) * RISCV_JUMP_ALIGN)
@ -555,6 +544,8 @@ extern const char * const riscv_gpr_names_numeric[NGPR];
extern const char * const riscv_gpr_names_abi[NGPR];
extern const char * const riscv_fpr_names_numeric[NFPR];
extern const char * const riscv_fpr_names_abi[NFPR];
extern const char * const riscv_rm[8];
extern const char * const riscv_pred_succ[16];
extern const char * const riscv_vecr_names_numeric[NVECR];
extern const char * const riscv_vecm_names_numeric[NVECM];
extern const char * const riscv_vsew[8];

13
opcodes/riscv-opc.c

@ -58,6 +58,19 @@ const char * const riscv_fpr_names_abi[NFPR] =
"fs8", "fs9", "fs10", "fs11", "ft8", "ft9", "ft10", "ft11"
};
/* Rounding modes. */
const char * const riscv_rm[8] =
{
"rne", "rtz", "rdn", "rup", "rmm", 0, 0, "dyn"
};
/* FENCE: predecessor/successor sets. */
const char * const riscv_pred_succ[16] =
{
0, "w", "r", "rw", "o", "ow", "or", "orw",
"i", "iw", "ir", "irw", "io", "iow", "ior", "iorw"
};
/* RVV registers. */
const char * const riscv_vecr_names_numeric[NVECR] =
{

Loading…
Cancel
Save