Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-27 08:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix another capstone build breakage issue

Browse Source
This commit is contained in:
pancake 2015-03-22 16:49:29 +01:00
parent aa41e5f706
commit 2e32d05986
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libr/asm/p/asm_arm_cs.c
View File

@ -115,9 +115,6 @@ RAsmPlugin r_asm_plugin_arm_cs = {
"mulops,crc,dpvfp,v6m"
};
extern const char *ARM_group_name(csh handle, unsigned int id);
extern const char *AArch64_group_name(csh handle, unsigned int id);
static int check_features(RAsm *a, cs_insn *insn) {
const char *name;
int i;
@ -134,13 +131,7 @@ static int check_features(RAsm *a, cs_insn *insn) {
if (id == ARM_GRP_THUMB2)
continue;
if (id<128) continue;
if (a->bits == 64) {
// AARCH64
name = AArch64_group_name (cd, id);
} else {
// ARM
name = ARM_group_name (cd, id);
}
name = cs_group_name (cd, id);
if (!name) return 1;
if (!strstr (a->features, name)) {
//eprintf ("CANNOT FIND %s\n", name);

4
libr/asm/p/asm_x86_cs.c
View File

@ -107,8 +107,6 @@ RAsmPlugin r_asm_plugin_x86_cs = {
};
extern const char *X86_group_name(csh handle, unsigned int id);
static int check_features(RAsm *a, cs_insn *insn) {
const char *name;
int i;
@ -121,7 +119,7 @@ static int check_features(RAsm *a, cs_insn *insn) {
continue;
if (id == X86_GRP_MODE64)
continue;
name = X86_group_name (cd, id);
name = cs_group_name (cd, id);
if (!name) return 1;
if (name && !strstr (a->features, name)) {
return 0;

3
libr/core/visual.c
View File

@ -1428,10 +1428,9 @@ R_API void r_core_visual_title (RCore *core, int color) {
const char *BEGIN = core->cons->pal.prompt;
const char *filename;
char pos[512], foo[512], bar[512], pcs[32];
int scrcols, pc;
if (!oldpc) oldpc = core->offset;
/* automatic block size */
int hexcols = r_config_get_i (core->config, "hex.cols");
int pc, hexcols = r_config_get_i (core->config, "hex.cols");
if (autoblocksize)
switch (core->printidx) {
case 0: // x"