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

Rollback to capstone4 until all bugs get fixed

This commit is contained in:
radare 2019-04-12 16:13:35 +02:00 committed by GitHub
parent c52856626c
commit dba7a43f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/core/cbin.c
View File

@ -2386,7 +2386,6 @@ static int bin_sections(RCore *r, int mode, ut64 laddr, int va, ut64 at, const c
if (!list) {
return false;
}
SdbListIter *iter;
RBinSection *s;
r_list_foreach (sections, iter, s) {
char humansz[8];

4
libr/core/cmd_search.c
View File

@ -1888,13 +1888,11 @@ static void do_ref_search(RCore *core, ut64 addr,ut64 from, ut64 to, struct sear
static bool do_anal_search(RCore *core, struct search_parameters *param, const char *input) {
RSearch *search = core->search;
ut64 at;
ut8 *buf;
RAnalOp aop;
int type = 0;
int mode = 0;
int i, ret, bsize = R_MIN (64, core->blocksize);
int kwidx = core->search->n_kws;
int count = 0;
int i, ret, count = 0;
bool firstItem = true;
while (*input && *input != ' ') {

6
shlr/Makefile
View File

@ -13,7 +13,7 @@ else
CS_RELEASE=1
endif
CS_NEXT=1
CS_NEXT=0
CAPSTONE_CFLAGS?=-g
# CAPSTONE_MAKEFLAGS?=CAPSTONE_ARCHS="arm aarch64"
@ -38,8 +38,8 @@ ifeq ($(CS_NEXT),1)
CS_TIP=3a660df88c30685cccf6ff68b4d6d4337b5caf7e
CS_BRA=next
else
CS_TIP=472845db9c2666ab66b3f517dda21f2b026a06c1
CS_BRA=master
CS_TIP=7090f081b17a5293a2c185a06513fede18065d3c
CS_BRA=v4
endif
# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build
#CS_BRA=next

2
shlr/capstone.sh
View File

@ -3,7 +3,7 @@ CS_URL="$1" # url
CS_BRA="$2" # branch name
CS_TIP="$3" # tip commit
CS_REV="$4" # revert
CS_DEPTH_CLONE=10
CS_DEPTH_CLONE=512
git --help > /dev/null 2>&1
if [ $? != 0 ]; then

11
shlr/meson.build
View File

@ -16,8 +16,11 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
endif
# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile
CS_TIP = '3a660df88c30685cccf6ff68b4d6d4337b5caf7e'
CS_BRA = 'next'
#CS_TIP = '3a660df88c30685cccf6ff68b4d6d4337b5caf7e'
#CS_BRA = 'next'
#cs5#CS_TIP = '472845db9c2666ab66b3f517dda21f2b026a06c1'
CS_TIP = '7090f081b17a5293a2c185a06513fede18065d3c'
CS_BRA = 'v4'
capstone_git_user = 'aquynh'
@ -47,7 +50,7 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
patch_cmd_str = '-C @0@ apply -p1 @1@'.format(capstone_path, patch_path)
patch_cmd = run_command(git_exe, patch_cmd_str.split())
if patch_cmd.returncode() != 0
error('Cannot apply patch ' + file)
warning('Cannot apply patch ' + file)
endif
endforeach
endif
@ -90,7 +93,7 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
'arch/X86/X86Disassembler.c',
'arch/X86/X86DisassemblerDecoder.c',
'arch/X86/X86IntelInstPrinter.c',
'arch/X86/X86InstPrinterCommon.c',
# cs5-only 'arch/X86/X86InstPrinterCommon.c',
'arch/X86/X86Mapping.c',
'arch/X86/X86Module.c',
'arch/XCore/XCoreDisassembler.c',