Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-25 22:29:48 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

* Add -t flag to radiff2 to select code diffing match threshold

Browse Source
This commit is contained in:
pancake 2011-10-20 02:14:35 +02:00
parent 4e3b9f304c
commit 2ef1abb974
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
binr/radiff2/radiff2.c
View File

@ -57,15 +57,16 @@ static int show_help(int line) {
printf ("Usage: radiff2 [-cCdrspOv] [-g sym] [file] [file]\n");
if (!line) printf (
// " -l diff lines of text\n"
" -c count of changes\n"
" -C graphdiff code\n"
" -O code diffing with opcode bytes only\n"
" -d use delta diffing\n"
" -g [sym] graph diff of given symbol\n"
" -r output in radare commands\n"
" -s compute text distance\n"
" -p use physical addressing (io.va=0)\n"
" -v show version information\n");
" -c count of changes\n"
" -C graphdiff code\n"
" -O code diffing with opcode bytes only\n"
" -t [0-100] set threshold for code diff (default is 70%%)\n"
" -d use delta diffing\n"
" -g [sym] graph diff of given symbol\n"
" -r output in radare commands\n"
" -s compute text distance\n"
" -p use physical addressing (io.va=0)\n"
" -v show version information\n");
return 1;
}
@ -102,9 +103,10 @@ int main(int argc, char **argv) {
int o, sza, szb, rad = 0, delta = 0;
int showcount = 0, mode = MODE_DIFF;
int diffops = 0;
int threshold = -1;
double sim;
while ((o = getopt (argc, argv, "Cpg:Orhcdsvx")) != -1) {
while ((o = getopt (argc, argv, "Cpg:Orhcdsvxt:")) != -1) {
switch (o) {
case 'p':
useva = R_FALSE;
@ -125,6 +127,9 @@ int main(int argc, char **argv) {
case 'O':
diffops = 1;
break;
case 't':
threshold = atoi (optarg);
break;
case 'd':
delta = 1;
break;
@ -165,8 +170,8 @@ int main(int argc, char **argv) {
eprintf ("Cannot open '%s'\n", file2);
return 1;
}
r_anal_diff_setup (c->anal, diffops, -1, -1);
r_anal_diff_setup (c2->anal, diffops, -1, -1);
r_anal_diff_setup_i (c->anal, diffops, threshold, threshold);
r_anal_diff_setup_i (c2->anal, diffops, threshold, threshold);
r_core_gdiff (c, c2);
if (mode == MODE_GRAPH)
diff_graph (c, c2, addr);

2
libr/anal/diff.c
View File

@ -128,7 +128,7 @@ R_API int r_anal_diff_bb(RAnal *anal, RAnalFcn *fcn, RAnalFcn *fcn2) {
}
}
if (mbb != NULL && mbb2 != NULL) {
if (ot == 1)
if (ot == 1 || t > anal->diff_thfcn )
mbb->diff->type = mbb2->diff->type = R_ANAL_DIFF_TYPE_MATCH;
else mbb->diff->type = mbb2->diff->type = \
fcn->diff->type = fcn2->diff->type = R_ANAL_DIFF_TYPE_UNMATCH;