portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix static builds

Browse source
This commit is contained in:
pancake 2015-11-01 00:20:58 +01:00
parent f52d25e6f9
commit f4e6c8a7df
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libr/asm/arch/riscv/riscv-opc.c
View file

@ -25,7 +25,7 @@
/* Register names used by gas and objdump. */
const char * const riscv_gpr_names_numeric[32] =
static const char * const riscv_gpr_names_numeric[32] =
{
"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7",
"x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15",
@ -33,14 +33,14 @@ const char * const riscv_gpr_names_numeric[32] =
"x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31"
};
const char * const riscv_gpr_names_abi[32] = {
static const char * const riscv_gpr_names_abi[32] = {
"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2",
"s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5",
"a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7",
"s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6"
};
const char * const riscv_fpr_names_numeric[32] =
static const char * const riscv_fpr_names_numeric[32] =
{
"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
@ -48,7 +48,7 @@ const char * const riscv_fpr_names_numeric[32] =
"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31"
};
const char * const riscv_fpr_names_abi[32] = {
static const char * const riscv_fpr_names_abi[32] = {
"ft0", "ft1", "ft2", "ft3", "ft4", "ft5", "ft6", "ft7",
"fs0", "fs1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",
"fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",
@ -119,7 +119,7 @@ static int match_c_lui(const struct riscv_opcode *op, insn_t insn)
return match_rd_nonzero (op, insn) && (((insn & MASK_RD) >> OP_SH_RD) != 2);
}
const struct riscv_opcode riscv_builtin_opcodes[] =
static const struct riscv_opcode riscv_builtin_opcodes[] =
{
/* name, isa, operands, match, mask, match_func, pinfo */
{"unimp", "C", "", 0, 0xffffU, match_opcode, 0 },
@ -648,11 +648,11 @@ const struct riscv_opcode riscv_builtin_opcodes[] =
#define RISCV_NUM_OPCODES \
((sizeof riscv_builtin_opcodes) / (sizeof (riscv_builtin_opcodes[0])))
const int bfd_riscv_num_builtin_opcodes = RISCV_NUM_OPCODES;
//const int bfd_riscv_num_builtin_opcodes = RISCV_NUM_OPCODES;
/* Removed const from the following to allow for dynamic extensions to the
built-in instruction set. */
struct riscv_opcode *riscv_opcodes =
static struct riscv_opcode *riscv_opcodes =
(struct riscv_opcode *) riscv_builtin_opcodes;
int bfd_riscv_num_opcodes = RISCV_NUM_OPCODES;
static int bfd_riscv_num_opcodes = RISCV_NUM_OPCODES;
#undef RISCV_NUM_OPCODES

2
libr/asm/arch/riscv/riscv.h
View file

@ -338,6 +338,7 @@ enum
};
#if 0
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];
@ -347,6 +348,7 @@ extern const struct riscv_opcode riscv_builtin_opcodes[];
extern const int bfd_riscv_num_builtin_opcodes;
extern struct riscv_opcode *riscv_opcodes;
extern int bfd_riscv_num_opcodes;
#endif
#define NUMOPCODES bfd_riscv_num_opcodes
#endif /* _RISCV_H_ */

5
libr/asm/asm.c
View file

@ -738,9 +738,8 @@ R_API int r_asm_get_offset(RAsm *a, int type, int idx) { // link to rbin
}
R_API char *r_asm_describe(RAsm *a, const char* str) {
if (a->pair)
return sdb_get (a->pair, str, 0);
return NULL;
if (!a->pair) return NULL;
return sdb_get (a->pair, str, 0);
}
R_API RList* r_asm_get_plugins(RAsm *a) {

1
libr/asm/p/asm_riscv.c
View file

@ -4,6 +4,7 @@
#include <r_util.h>
#include <r_asm.h>
#include <r_lib.h>
#include "../arch/riscv/riscv-opc.c"
#include "../arch/riscv/riscv.c"
static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {

5
libr/asm/p/riscv.mk
View file

@ -1,6 +1,7 @@
OBJ_RISCV=asm_riscv.o
OBJ_RISCV+=../arch/riscv/riscv.o
OBJ_RISCV+=../arch/riscv/riscv-opc.o
#implicitly included
#OBJ_RISCV+=../arch/riscv/riscv.o
#OBJ_RISCV+=../arch/riscv/riscv-opc.o
STATIC_OBJ+=${OBJ_RISCV}
TARGET_RISCV=asm_riscv.${EXT_SO}