Handle fcn in r_parse, unify filter() and add locdiff utility

libr/anal/fcn.c

@@ -254,7 +254,8 @@ R_API RAnalFunction *r_anal_fcn_find(RAnal *anal, ut64 addr, int type) {
 #if USE_NEW_FCN_STORE
 	// TODO: type is ignored here? wtf.. we need more work on fcnstore
 	//if (root) return r_listrange_find_root (anal->fcnstore, addr);
-	return r_listrange_find_in_range (anal->fcnstore, addr);
+	RAnalFunction *f = r_listrange_find_in_range (anal->fcnstore, addr);
+	return (f->addr == addr)? f: NULL;
 #else
 	RAnalFunction *fcn, *ret = NULL;
 	RListIter *iter;

libr/cons/Makefile

@@ -1,8 +1,8 @@
 include ../config.mk
 
 NAME=r_cons
-OBJS=cons.o pipe.o output.o grep.o input.o hud.o rgb.o
+OBJS=cons.o pipe.o output.o grep.o
-OBJS+=line.o
+OBJS+=line.o hud.o rgb.o input.o
 DEPS=r_util
 
 include ../rules.mk

libr/core/core.c

@@ -513,6 +513,7 @@ R_API int r_core_init(RCore *core) {
 	r_anal_set_user_ptr (core->anal, core);
 	core->anal->meta->printf = (void *) r_cons_printf;
 	core->parser = r_parse_new ();
+	core->parser->anal = core->anal;
 	r_parse_set_user_ptr (core->parser, core);
 	core->bin = r_bin_new ();
 	r_bin_set_user_ptr (core->bin, core);

libr/core/disasm.c

@@ -660,8 +660,10 @@ toro:
 			free (opstr);
 			opstr = strdup (str);
 			core->parser->flagspace = ofs; // ???
-		} else 
+		} else {
-		if (!opstr) opstr = strdup (asmop.buf_asm);
+			if (!opstr)
+				opstr = strdup (asmop.buf_asm);
+		}
 		if (pseudo) {
 			r_parse_parse (core->parser, opstr?
 				opstr:asmop.buf_asm, str);

libr/include/r_parse.h

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2012 - pancake, nibble */
+/* radare - LGPL - Copyright 2009-2013 - pancake, nibble */
 
 #ifndef _INCLUDE_R_PARSE_H_
 #define _INCLUDE_R_PARSE_H_
@@ -16,6 +16,7 @@ typedef struct r_parse_t {
 	int flagspace;
 	int notin_flagspace;
 	struct r_parse_plugin_t *cur;
+	RAnal *anal; // weak anal ref
 	RList *parsers;
 } RParse;
 

libr/parse/p/parse_att2intel.c

@@ -170,32 +170,6 @@ static int assemble(RParse *p, char *data, char *str) {
 	return R_TRUE;
 }
 
-static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
-	RListIter *iter;
-	RFlagItem *flag;
-	char *ptr, *ptr2;
-	ut64 off;
-	ptr = data;
-	while ((ptr = strstr (ptr, "0x"))) {
-		for (ptr2 = ptr; *ptr2 && !isseparator (*ptr2); ptr2++);
-		off = r_num_math (NULL, ptr);
-		if (!off) {
-			ptr = ptr2;
-			continue;
-		}
-		r_list_foreach (f->flags, iter, flag) {
-			if (flag->offset == off && strchr (flag->name, '.')) {
-				*ptr = 0;
-				snprintf (str, len, "%s%s%s", data, flag->name, ptr2!=ptr? ptr2: "");
-				return R_TRUE;
-			}
-		}
-		ptr = ptr2;
-	}
-	strncpy (str, data, len);
-	return R_FALSE;
-}
-
 static int varsub(RParse *p, RAnalFunction *f, char *data, char *str, int len) {
 	char *ptr, *ptr2;
 	int i;
@@ -218,7 +192,6 @@ struct r_parse_plugin_t r_parse_plugin_att2intel = {
 	.fini = NULL,
 	.parse = &parse,
 	.assemble = &assemble,
-	.filter = &filter,
 	.varsub = &varsub,
 };
 

libr/parse/p/parse_dalvik_pseudo.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2012 - pancake */
+/* radare - LGPL - Copyright 2012-2013 - pancake */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -274,32 +274,6 @@ static int assemble(RParse *p, char *data, char *str) {
 	return R_TRUE;
 }
 
-static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
-	RListIter *iter;
-	RFlagItem *flag;
-	char *ptr, *ptr2;
-	ut64 off;
-	ptr = data;
-	while ((ptr = strstr (ptr, "0x"))) {
-		for (ptr2 = ptr; *ptr2 && !isseparator (*ptr2); ptr2++);
-		off = r_num_math (NULL, ptr);
-		if (!off) {
-			ptr = ptr2;
-			continue;
-		}
-		r_list_foreach (f->flags, iter, flag) {
-			if (flag->offset == off && strchr (flag->name, '.')) {
-				*ptr = 0;
-				snprintf (str, len, "%s%s%s", data, flag->name, ptr2!=ptr? ptr2: "");
-				return R_TRUE;
-			}
-		}
-		ptr = ptr2;
-	}
-	strncpy (str, data, len);
-	return R_FALSE;
-}
-
 static int varsub(RParse *p, RAnalFunction *f, char *data, char *str, int len) {
 	char *ptr, *ptr2;
 	int i;
@@ -322,7 +296,6 @@ struct r_parse_plugin_t r_parse_plugin_dalvik_pseudo = {
 	.fini = NULL,
 	.parse = parse,
 	.assemble = &assemble,
-	.filter = &filter,
 	.varsub = &varsub,
 };
 

libr/parse/p/parse_mips_pseudo.c

@@ -205,32 +205,6 @@ static int assemble(RParse *p, char *data, char *str) {
 	return R_TRUE;
 }
 
-static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
-	RListIter *iter;
-	RFlagItem *flag;
-	char *ptr, *ptr2;
-	ut64 off;
-	ptr = data;
-	while ((ptr = strstr (ptr, "0x"))) {
-		for (ptr2 = ptr; *ptr2 && !isseparator (*ptr2); ptr2++);
-		off = r_num_math (NULL, ptr);
-		if (!off) {
-			ptr = ptr2;
-			continue;
-		}
-		r_list_foreach (f->flags, iter, flag) {
-			if (flag->offset == off && strchr (flag->name, '.')) {
-				*ptr = 0;
-				snprintf (str, len, "%s%s%s", data, flag->name, ptr2!=ptr? ptr2: "");
-				return R_TRUE;
-			}
-		}
-		ptr = ptr2;
-	}
-	strncpy (str, data, len);
-	return R_FALSE;
-}
-
 static int varsub(RParse *p, RAnalFunction *f, char *data, char *str, int len) {
 	char *ptr, *ptr2;
 	int i;
@@ -253,7 +227,6 @@ struct r_parse_plugin_t r_parse_plugin_mips_pseudo = {
 	.fini = NULL,
 	.parse = parse,
 	.assemble = &assemble,
-	.filter = &filter,
 	.varsub = &varsub,
 };
 

libr/parse/p/parse_x86_pseudo.c

@@ -156,48 +156,6 @@ static inline int issegoff (const char *w) {
 	return 1;
 }
 
-#define isx86separator(x) ( \
-	(x)==' '||(x)=='\t'||(x)=='\n'|| (x)=='\r'||(x)==' '|| \
-	(x)==','||(x)==';'||(x)=='['||(x)==']'|| \
-	(x)=='('||(x)==')'||(x)=='{'||(x)=='}')
-
-static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
-	char *ptr = data, *ptr2;
-	//RListIter *iter;
-	RFlagItem *flag;
-	ut64 off;
-
-	ptr2 = NULL;
-	while ((ptr = strstr (ptr, "0x"))) {
-		for (ptr2 = ptr; *ptr2 && !isx86separator (*ptr2); ptr2++);
-		off = r_num_math (NULL, ptr);
-		if (!off) {
-			ptr = ptr2;
-			continue;
-		}
-		flag = r_flag_get_i (f, off);
-		if (flag && strchr (flag->name, '.')) {
-		// XXX. tooslow but correct
-		//r_list_foreach (f->flags, iter, flag) { if (flag->offset == off && strchr (flag->name, '.')) {
-				if (p->notin_flagspace != -1) {
-					if (p->flagspace == flag->space)
-						continue;
-				} else
-				if (p->flagspace != -1 && \
-					(p->flagspace != flag->space)) {
-					continue;
-				}
-				*ptr = 0;
-				snprintf (str, len, "%s%s%s", data, flag->name,
-					ptr2!=ptr? ptr2: "");
-				return R_TRUE;
-			}
-		//}
-		ptr = ptr2;
-	}
-	strncpy (str, data, len);
-	return R_FALSE;
-}
 
 static int varsub(RParse *p, RAnalFunction *f, char *data, char *str, int len) {
 	int i;
@@ -222,7 +180,7 @@ struct r_parse_plugin_t r_parse_plugin_x86_pseudo = {
 	.fini = NULL,
 	.parse = parse,
 	.assemble = &assemble,
-	.filter = &filter,
+	.filter = NULL,
 	.varsub = &varsub,
 };
 

libr/parse/parse.c

@@ -85,7 +85,63 @@ R_API int r_parse_parse(RParse *p, const char *data, char *str) {
 	return R_FALSE;
 }
 
+#define isx86separator(x) ( \
+	(x)==' '||(x)=='\t'||(x)=='\n'|| (x)=='\r'||(x)==' '|| \
+	(x)==','||(x)==';'||(x)=='['||(x)==']'|| \
+	(x)=='('||(x)==')'||(x)=='{'||(x)=='}')
+
+static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
+	char *ptr = data, *ptr2;
+	RAnalFunction *fcn;
+	RFlagItem *flag;
+	ut64 off;
+	int x86 = (p&&p->cur&&p->cur->name)?
+		(strstr (p->cur->name, "x86")? 1: 0): 0;
+
+	ptr2 = NULL;
+	while ((ptr = strstr (ptr, "0x"))) {
+		if (x86) for (ptr2 = ptr; *ptr2 && !isx86separator (*ptr2); ptr2++);
+		else for (ptr2 = ptr; *ptr2 && !isseparator (*ptr2); ptr2++);
+		off = r_num_math (NULL, ptr);
+		if (!off) {
+			ptr = ptr2;
+			continue;
+		}
+		fcn = r_anal_fcn_find (p->anal, off, 0);
+		if (fcn) {
+			if (fcn->addr == off) {
+				*ptr = 0;
+				snprintf (str, len, "%s%s%s", data, fcn->name,
+						(ptr!=ptr2)? ptr2: "");
+				return R_TRUE;
+			}
+		}
+		if (f) {
+			flag = r_flag_get_i (f, off);
+			if (flag && strchr (flag->name, '.')) {
+				if (p->notin_flagspace != -1) {
+					if (p->flagspace == flag->space)
+						continue;
+				} else
+				if (p->flagspace != -1 && \
+						(p->flagspace != flag->space)) {
+					ptr = ptr2;
+					continue;
+				}
+				*ptr = 0;
+				snprintf (str, len, "%s%s%s", data, flag->name,
+					(ptr!=ptr2)? ptr2: "");
+				return R_TRUE;
+			}
+		}
+		ptr = ptr2;
+	}
+	strncpy (str, data, len);
+	return R_FALSE;
+}
+
 R_API int r_parse_filter(RParse *p, RFlag *f, char *data, char *str, int len) {
+	filter (p, f, data, str, len);
 	if (p->cur && p->cur->filter)
 		return p->cur->filter (p, f, data, str, len);
 	return R_FALSE;
@@ -115,4 +171,3 @@ R_API int r_parse_list(RParse *p) {
 	}
 	return R_FALSE;
 }
-

sys/locdiff

@@ -0,0 +1,6 @@
+#!/bin/sh
+#A=`hg diff $@ | grep -v '+++' | grep ^+ |wc -l`
+#B=`hg diff $@ | grep -v -- '---' | grep ^- |wc -l`
+A=`git diff $@ | grep -v '+++' | grep ^+ |wc -l`
+B=`git diff $@ | grep -v -- '---' | grep ^- |wc -l`
+echo $((A-B))