dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the latest MIPS asm.cpu variants from Capstone

This commit is contained in:
pancake 2014-11-09 17:18:33 +01:00
parent 1a9a9ebab4
commit 61ef0707eb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/asm/p/asm_mips_cs.c
View File

@ -11,12 +11,17 @@ static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
cs_insn* insn;
int mode, n, ret = -1;
mode = a->big_endian? CS_MODE_BIG_ENDIAN: CS_MODE_LITTLE_ENDIAN;
if (a->cpu) {
if (!strcmp (a->cpu, "n64")) {
mode |= CS_MODE_64;
} else
if (!strcmp (a->cpu, "micro")) {
if (a->cpu && *a->cpu) {
if (!strcmp (a->cpu, "gp64")) {
mode |= CS_MODE_MIPSGP64;
} else if (!strcmp (a->cpu, "micro")) {
mode |= CS_MODE_MICRO;
} else if (!strcmp (a->cpu, "r6")) {
mode |= CS_MODE_MIPS32R6;
} else if (!strcmp (a->cpu, "v3")) {
mode |= CS_MODE_MIPS3;
} else {
eprintf ("Invalid CPU selected: gp64, micro, r6, v3\n");
}
}
mode |= (a->bits==64)? CS_MODE_64: CS_MODE_32;
@ -61,7 +66,7 @@ RAsmPlugin r_asm_plugin_mips_cs = {
.desc = "Capstone MIPS disassembler",
.license = "BSD",
.arch = "mips",
.cpus = "n64,micro",
.cpus = "gp64,micro,r6,v3",
.bits = 16|32|64,
.init = NULL,
.fini = NULL,

2
shlr/Makefile
View File

@ -8,7 +8,7 @@ CS_TAR=
CS_URL=https://github.com/aquynh/capstone.git
CS_UPD=20141108
CS_BRA=next
CS_TIP=0157ba1ebe8c2217ee76b7f605532b1c2afc7ce8
CS_TIP=248519efeaa330bafc8df55033f680d1d4b23541
.PHONY: capstone-sync capstone-build all clean mrproper libgdbr