Revert "Initial part of a large refactoring using RBinName, unified attributes ##bin"

This reverts commit 1a173e9d29.

libr/bin/bfile.c

@@ -1053,7 +1053,7 @@ R_API RList *r_bin_file_set_hashes(RBin *bin, RList/*<RBinFileHash*/ *new_hashes
 	return prev_hashes;
 }
 
-R_API RBinClass *r_bin_class_new(const char *name, const char *super, ut64 attr) {
+R_API RBinClass *r_bin_class_new(const char *name, const char *super, int visibility) {
 	r_return_val_if_fail (name, NULL);
 	RBinClass *c = R_NEW0 (RBinClass);
 	if (c) {
@@ -1065,7 +1065,7 @@ R_API RBinClass *r_bin_class_new(const char *name, const char *super, ut64 attr)
 		// TODO: use vectors!
 		c->methods = r_list_newf (r_bin_symbol_free);
 		c->fields = r_list_newf (r_bin_field_free);
-		c->attr = attr;
+		c->visibility = visibility;
 	}
 	return c;
 }
@@ -1081,7 +1081,7 @@ R_API void r_bin_class_free(RBinClass *k) {
 	}
 }
 
-R_API RBinClass *r_bin_file_add_class(RBinFile *bf, const char *name, const char *super, ut64 attr) {
+R_API RBinClass *r_bin_file_add_class(RBinFile *bf, const char *name, const char *super, int view) {
 	r_return_val_if_fail (name && bf && bf->bo, NULL);
 	RBinClass *c = __getClass (bf, name);
 	if (c) {
@@ -1092,7 +1092,7 @@ R_API RBinClass *r_bin_file_add_class(RBinFile *bf, const char *name, const char
 		}
 		return c;
 	}
-	c = r_bin_class_new (name, super, attr);
+	c = r_bin_class_new (name, super, view);
 	if (c) {
 		// XXX. no need for a list, the ht is iterable too
 		c->index = r_list_length (bf->bo->classes);

libr/bin/bin.c

@@ -1384,12 +1384,12 @@ R_API RBinField *r_bin_field_new(ut64 paddr, ut64 vaddr, int size, const char *n
 	RBinField *ptr = R_NEW0 (RBinField);
 	if (ptr) {
 		ptr->name = strdup (name);
-		ptr->comment = R_STR_ISNOTEMPTY (comment)? strdup (comment): NULL;
-		ptr->format = R_STR_ISNOTEMPTY (format)? strdup (format): NULL;
+		ptr->comment = (comment && *comment)? strdup (comment): NULL;
+		ptr->format = (format && *format)? strdup (format): NULL;
 		ptr->format_named = format_named;
 		ptr->paddr = paddr;
 		ptr->size = size;
-	//	ptr->attr = default attributes for fields?
+	//	ptr->visibility = any default visibility?
 		ptr->vaddr = vaddr;
 	}
 	return ptr;
@@ -1406,6 +1406,59 @@ R_API void r_bin_field_free(void *_field) {
 	}
 }
 
+// method name too long
+// RBin.methFlagToString(RBin.Method.CLASS)
+R_API const char *r_bin_get_meth_flag_string(ut64 flag, bool compact) {
+	switch (flag) {
+	case R_BIN_METH_CLASS:
+		return compact ? "c" : "class";
+	case R_BIN_METH_STATIC:
+		return compact ? "s" : "static";
+	case R_BIN_METH_PUBLIC:
+		return compact ? "p" : "public";
+	case R_BIN_METH_PRIVATE:
+		return compact ? "P" : "private";
+	case R_BIN_METH_PROTECTED:
+		return compact ? "r" : "protected";
+	case R_BIN_METH_INTERNAL:
+		return compact ? "i" : "internal";
+	case R_BIN_METH_OPEN:
+		return compact ? "o" : "open";
+	case R_BIN_METH_FILEPRIVATE:
+		return compact ? "e" : "fileprivate";
+	case R_BIN_METH_FINAL:
+		return compact ? "f" : "final";
+	case R_BIN_METH_VIRTUAL:
+		return compact ? "v" : "virtual";
+	case R_BIN_METH_CONST:
+		return compact ? "k" : "const";
+	case R_BIN_METH_MUTATING:
+		return compact ? "m" : "mutating";
+	case R_BIN_METH_ABSTRACT:
+		return compact ? "a" : "abstract";
+	case R_BIN_METH_SYNCHRONIZED:
+		return compact ? "y" : "synchronized";
+	case R_BIN_METH_NATIVE:
+		return compact ? "n" : "native";
+	case R_BIN_METH_BRIDGE:
+		return compact ? "b" : "bridge";
+	case R_BIN_METH_VARARGS:
+		return compact ? "g" : "varargs";
+	case R_BIN_METH_SYNTHETIC:
+		return compact ? "h" : "synthetic";
+	case R_BIN_METH_STRICT:
+		return compact ? "t" : "strict";
+	case R_BIN_METH_MIRANDA:
+		return compact ? "A" : "miranda";
+	case R_BIN_METH_CONSTRUCTOR:
+		return compact ? "C" : "constructor";
+	case R_BIN_METH_DECLARED_SYNCHRONIZED:
+		return compact ? "Y" : "declared_synchronized";
+	default:
+		return NULL;
+	}
+}
+
 R_IPI RBinSection *r_bin_section_new(const char *name) {
 	RBinSection *s = R_NEW0 (RBinSection);
 	if (s) {
@@ -1532,116 +1585,9 @@ R_API void r_bin_name_free(RBinName *bn) {
 	}
 }
 
-static const char *attr_bit_name(ut64 n, bool compact) {
-	switch (n) {
-	case R_BIN_ATTR_HIDDEN:
-		return compact? "": "hidden";
-	case R_BIN_ATTR_FRIENDLY:
-		return compact? "": "friendly";
-	case R_BIN_ATTR_SEALED:
-		return compact? "": "sealed";
-	case R_BIN_ATTR_GLOBAL:
-		return compact? "": "global";
-	case R_BIN_ATTR_UNSAFE:
-		return compact? "": "unsafe";
-	case R_BIN_ATTR_EXTERN:
-		return compact? "": "extern";
-	case R_BIN_ATTR_READONLY:
-		return compact? "": "readonly";
-	case R_BIN_ATTR_INTERFACE:
-		return compact? "": "interface";
-	case R_BIN_ATTR_SYMBOLIC:
-		return compact? "": "symbolic";
-	case R_BIN_ATTR_VERIFIED:
-		return compact? "": "verified";
-	case R_BIN_ATTR_GETTER:
-		return compact? "": "getter";
-	case R_BIN_ATTR_SETTER:
-		return compact? "": "setter";
-	case R_BIN_ATTR_OPTIMIZED:
-		return compact? "": "optimized";
-#if 0
-	case R_BIN_ATTR_ANNOTATED:
-		return compact? "": "anno";
-#endif
-	case R_BIN_ATTR_ASYNC:
-		return compact? "": "async";
-	case R_BIN_ATTR_VOLATILE:
-		return compact? "": "volatile";
-	case R_BIN_ATTR_TRANSIENT:
-		return compact? "": "transient";
-	case R_BIN_ATTR_ENUM:
-		return compact? "": "enum";
-	case R_BIN_ATTR_RACIST:
-		return compact? "": "racist";
-	case R_BIN_ATTR_SUPER:
-		return compact ? "S": "super";
-	case R_BIN_ATTR_ANNOTATION:
-		return compact ? "A": "annotation";
-	case R_BIN_ATTR_WEAK:
-		return compact ? "w": "weak";
-	case R_BIN_ATTR_CLASS:
-		return compact ? "c" : "class";
-	case R_BIN_ATTR_STATIC:
-		return compact ? "s" : "static";
-	case R_BIN_ATTR_PUBLIC:
-		return compact ? "p" : "public";
-	case R_BIN_ATTR_PRIVATE:
-		return compact ? "P" : "private";
-	case R_BIN_ATTR_PROTECTED:
-		return compact ? "r" : "protected";
-	case R_BIN_ATTR_INTERNAL:
-		return compact ? "i" : "internal";
-	case R_BIN_ATTR_OPEN:
-		return compact ? "o" : "open";
-	case R_BIN_ATTR_FILEPRIVATE:
-		return compact ? "e" : "fileprivate";
-	case R_BIN_ATTR_FINAL:
-		return compact ? "f" : "final";
-	case R_BIN_ATTR_VIRTUAL:
-		return compact ? "v" : "virtual";
-	case R_BIN_ATTR_CONST:
-		return compact ? "k" : "const";
-	case R_BIN_ATTR_MUTATING:
-		return compact ? "m" : "mutating";
-	case R_BIN_ATTR_ABSTRACT:
-		return compact ? "a" : "abstract";
-	case R_BIN_ATTR_SYNCHRONIZED:
-		return compact ? "Y" : "synchronized";
-	case R_BIN_ATTR_NATIVE:
-		return compact ? "n" : "native";
-	case R_BIN_ATTR_BRIDGE:
-		return compact ? "b" : "bridge";
-	case R_BIN_ATTR_VARARGS:
-		return compact ? "g" : "varargs";
-	case R_BIN_ATTR_SYNTHETIC:
-		return compact ? "h" : "synthetic";
-	case R_BIN_ATTR_STRICT:
-		return compact ? "t" : "strict";
-	case R_BIN_ATTR_MIRANDA:
-		return compact ? "A" : "miranda";
-	case R_BIN_ATTR_CONSTRUCTOR:
-		return compact ? "C" : "constructor";
-	case R_BIN_ATTR_DECLARED_SYNCHRONIZED:
-		return compact ? "y" : "declared_synchronized";
-	default:
-		return NULL;
-	}
-}
-
-R_API char *r_bin_attr_tostring(ut64 attr, bool singlechar) {
-	int i;
-	RStrBuf *sb = r_strbuf_new ("");
-	for (i = 0; i < 64; i++) {
-		const ut64 bit = (1ULL << i);
-		if (attr & bit) {
-			if (!singlechar && !r_strbuf_is_empty (sb)) {
-				r_strbuf_append (sb, " ");
-			}
-			r_strbuf_append (sb, attr_bit_name (bit, singlechar));
-		}
-	}
-	return r_strbuf_drain (sb);
+// TODO : not implemented yet
+R_API char *r_bin_attr_tostring(ut64 attr) {
+	return NULL;
 }
 
 // TODO : not implemented yet

libr/bin/format/mach0/mach0.c

@@ -2940,7 +2940,7 @@ static void _enrich_symbol(RBinFile *bf, struct MACH0_(obj_t) *bin, HtPP *symcac
 	}
 
 	sym->forwarder = "NONE";
-	sym->bind = sym->type && r_str_startswith (sym->type, "LOCAL")? R_BIN_BIND_LOCAL_STR: R_BIN_BIND_GLOBAL_STR;
+	sym->bind = sym->type && !strncmp (sym->type, "LOCAL", 5)? R_BIN_BIND_LOCAL_STR: R_BIN_BIND_GLOBAL_STR;
 	sym->type = R_BIN_TYPE_FUNC_STR;
 
 	if (bin->hdr.cputype == CPU_TYPE_ARM && wordsize < 64) {

libr/bin/format/objc/mach0_classes.c

@@ -771,8 +771,7 @@ static void get_method_list(mach0_ut p, RBinFile *bf, char *class_name, RBinClas
 		}
 		method->type = is_static? R_BIN_TYPE_FUNC_STR: R_BIN_TYPE_METH_STR;
 		if (is_static) {
-			// it's a clas method, aka does not require an instance
-			method->attr |= R_BIN_ATTR_CLASS;
+			method->method_flags |= R_BIN_METH_CLASS;
 		}
 		if (is_thumb (bf)) {
 			if (method->vaddr & 1) {

libr/bin/mangling/objc.c

@@ -5,6 +5,7 @@
 
 R_API char *r_bin_demangle_objc(RBinFile *bf, const char *sym) {
 	r_return_val_if_fail ((!bf || (bf && bf->bo && bf->bo->classes)) && sym, NULL);
+	char *ret = NULL;
 	char *clas = NULL;
 	char *name = NULL;
 	char *args = NULL;
@@ -15,19 +16,19 @@ R_API char *r_bin_demangle_objc(RBinFile *bf, const char *sym) {
 		bf = NULL;
 	}
 	/* classes */
-	if (r_str_startswith (sym, "_OBJC_Class_")) {
+	if (!strncmp (sym, "_OBJC_Class_", 12)) {
 		const char *className = sym + 12;
-		char *ret = r_str_newf ("class %s", className);
+		ret = r_str_newf ("class %s", className);
 		if (bf) {
-			r_bin_file_add_class (bf, className, NULL, R_BIN_ATTR_PUBLIC);
+			r_bin_file_add_class (bf, className, NULL, R_BIN_CLASS_PUBLIC);
 		}
 		return ret;
 	}
-	if (r_str_startswith (sym, "_OBJC_CLASS_$_")) {
+	if (!strncmp (sym, "_OBJC_CLASS_$_", 14)) {
 		const char *className = sym + 14;
-		char *ret = r_str_newf ("class %s", className);
+		ret = r_str_newf ("class %s", className);
 		if (bf) {
-			r_bin_file_add_class (bf, className, NULL, R_BIN_ATTR_PUBLIC);
+			r_bin_file_add_class (bf, className, NULL, R_BIN_CLASS_PUBLIC);
 		}
 		return ret;
 	}
@@ -107,7 +108,6 @@ R_API char *r_bin_demangle_objc(RBinFile *bf, const char *sym) {
 			type = "static";
 		}
 	}
-	char *ret = NULL;
 	if (type) {
 		if (!strcmp (type, "field")) {
 			ret = r_str_newf ("field int %s::%s", clas, name);

libr/bin/p/bin_dex.c

@@ -9,52 +9,52 @@
 
 extern struct r_bin_dbginfo_t r_bin_dbginfo_dex;
 
-static ut64 get_method_attr(ut64 MA) {
+static ut64 get_method_flags(ut64 MA) {
 	ut64 flags = 0;
 	if (MA & R_DEX_METH_PUBLIC) {
-		flags |= R_BIN_ATTR_PUBLIC;
+		flags |= R_BIN_METH_PUBLIC;
 	}
 	if (MA & R_DEX_METH_PRIVATE) {
-		flags |= R_BIN_ATTR_PRIVATE;
+		flags |= R_BIN_METH_PRIVATE;
 	}
 	if (MA & R_DEX_METH_PROTECTED) {
-		flags |= R_BIN_ATTR_PROTECTED;
+		flags |= R_BIN_METH_PROTECTED;
 	}
 	if (MA & R_DEX_METH_STATIC) {
-		flags |= R_BIN_ATTR_STATIC;
+		flags |= R_BIN_METH_STATIC;
 	}
 	if (MA & R_DEX_METH_FINAL) {
-		flags |= R_BIN_ATTR_FINAL;
+		flags |= R_BIN_METH_FINAL;
 	}
 	if (MA & R_DEX_METH_SYNCHRONIZED) {
-		flags |= R_BIN_ATTR_SYNCHRONIZED;
+		flags |= R_BIN_METH_SYNCHRONIZED;
 	}
 	if (MA & R_DEX_METH_BRIDGE) {
-		flags |= R_BIN_ATTR_BRIDGE;
+		flags |= R_BIN_METH_BRIDGE;
 	}
 	if (MA & R_DEX_METH_VARARGS) {
-		flags |= R_BIN_ATTR_VARARGS;
+		flags |= R_BIN_METH_VARARGS;
 	}
 	if (MA & R_DEX_METH_NATIVE) {
-		flags |= R_BIN_ATTR_NATIVE;
+		flags |= R_BIN_METH_NATIVE;
 	}
 	if (MA & R_DEX_METH_ABSTRACT) {
-		flags |= R_BIN_ATTR_ABSTRACT;
+		flags |= R_BIN_METH_ABSTRACT;
 	}
 	if (MA & R_DEX_METH_STRICT) {
-		flags |= R_BIN_ATTR_STRICT;
+		flags |= R_BIN_METH_STRICT;
 	}
 	if (MA & R_DEX_METH_SYNTHETIC) {
-		flags |= R_BIN_ATTR_SYNTHETIC;
+		flags |= R_BIN_METH_SYNTHETIC;
 	}
 	if (MA & R_DEX_METH_MIRANDA) {
-		flags |= R_BIN_ATTR_MIRANDA;
+		flags |= R_BIN_METH_MIRANDA;
 	}
 	if (MA & R_DEX_METH_CONSTRUCTOR) {
-		flags |= R_BIN_ATTR_CONSTRUCTOR;
+		flags |= R_BIN_METH_CONSTRUCTOR;
 	}
 	if (MA & R_DEX_METH_DECLARED_SYNCHRONIZED) {
-		flags |= R_BIN_ATTR_SYNCHRONIZED;
+		flags |= R_BIN_METH_DECLARED_SYNCHRONIZED;
 	}
 	return flags;
 }
@@ -1091,7 +1091,7 @@ static void parse_dex_class_fields(RBinFile *bf, RBinDexClass *c, RBinClass *cls
 		if (field) {
 			field->vaddr = field->paddr = sym->paddr;
 			field->name = strdup (sym->name);
-			field->attr = get_method_attr (accessFlags);
+			field->flags = get_method_flags (accessFlags);
 			r_list_append (cls->fields, field);
 		}
 		lastIndex = fieldIndex;
@@ -1354,7 +1354,7 @@ static void parse_dex_class_method(RBinFile *bf, RBinDexClass *c, RBinClass *cls
 			dex->code_from = R_MIN (dex->code_from, sym->paddr);
 			sym->lang = R_BIN_LANG_JAVA;
 			sym->bind = ((MA & 1) == 1) ? R_BIN_BIND_GLOBAL_STR : R_BIN_BIND_LOCAL_STR;
-			sym->attr = get_method_attr (MA);
+			sym->method_flags = get_method_flags (MA);
 			sym->ordinal = (*sym_count)++;
 			if (MC > 0) {
 				if (bufsz < MC || bufsz < MC + 16) {

libr/bin/p/bin_java.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2023 - pancake, nibble, dso */
+/* radare - LGPL - Copyright 2009-2023 - pancake, nibble, Adam Pridgen <dso@rice.edu || adam.pridgen@thecoverofnight.com> */
 
 #define R_LOG_ORIGIN "bin.java"
 

libr/core/cbin.c

@@ -5,8 +5,8 @@
 
 #define is_in_range(at, from, sz) ((at) >= (from) && (at) < ((from) + (sz)))
 
-#define VA_FALSE 0
-#define VA_TRUE 1
+#define VA_FALSE    0
+#define VA_TRUE     1
 #define VA_NOREBASE 2
 
 #define LOAD_BSS_MALLOC 0
@@ -20,12 +20,15 @@
 #define IS_MODE_NORMAL(mode) (!(mode))
 #define IS_MODE_CLASSDUMP(mode) ((mode) & R_MODE_CLASSDUMP)
 
+// dup from cmd_info
+#define PAIR_WIDTH "9"
+
 static R_TH_LOCAL int old_bits = -1;
 static R_TH_LOCAL char *old_arch = NULL;
 
 static void pair(const char *key, const char *val) {
 	if (R_STR_ISNOTEMPTY (val)) {
-		r_cons_printf ("%-9s%s\n", key, val);
+		r_cons_printf ("%-"PAIR_WIDTH"s%s\n", key, val);
 	}
 }
 
@@ -714,13 +717,15 @@ R_API void r_core_anal_type_init(RCore *core) {
 }
 
 R_API void r_core_anal_cc_init(RCore *core) {
-	r_return_if_fail (core);
 	char *anal_arch = strdup (r_config_get (core->config, "anal.arch"));
 	const int bits = core->anal->config->bits;
 	if (!anal_arch) {
 		return;
 	}
-	r_str_after (anal_arch, '.');
+	char *dot = strchr (anal_arch, '.');
+	if (dot) {
+		*dot = 0;
+	}
 	if (old_bits != -1) {
 		if (old_bits == bits) {
 			if (!strcmp (old_arch, anal_arch)) {
@@ -3723,6 +3728,7 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 	RBinSymbol *sym;
 	RBinClass *c;
 	RBinField *f;
+	char *name;
 	RList *cs = r_bin_get_classes (r->bin);
 	if (!cs) {
 		if (IS_MODE_JSON (mode)) {
@@ -3745,10 +3751,10 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 	}
 	const bool bin_filter = r_config_get_b (r->config, "bin.filter");
 	r_list_foreach (cs, iter, c) {
-		if (!c || R_STR_ISEMPTY (c->name)) {
+		if (!c || !c->name || !c->name[0]) {
 			continue;
 		}
-		char *name = strdup (c->name);
+		name = strdup (c->name);
 		r_name_filter (name, -1);
 		ut64 at_min = UT64_MAX;
 		ut64 at_max = 0LL;
@@ -3772,11 +3778,8 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 			r_strf_var (classname, 256, "class.%s", name);
 			r_flag_set (r->flags, classname, c->addr, 1);
 			r_list_foreach (c->methods, iter2, sym) {
-				// char *mflags = r_core_bin_attr_tostring (sym->attr, mode);
-				char *mflags = r_bin_attr_tostring (sym->attr, false);
-				r_str_replace_char (mflags, ' ', '.');
-				// XXX probably access flags should not be part of the flag name
-				r_strf_var (method, 256, "method%s%s.%s.%s", R_STR_ISEMPTY (mflags)? "":".", mflags, c->name, sym->name);
+				char *mflags = r_core_bin_method_flags_str (sym->method_flags, mode);
+				r_strf_var (method, 256, "method%s.%s.%s", mflags, c->name, sym->name);
 				R_FREE (mflags);
 				r_name_filter (method, -1);
 				r_flag_set (r->flags, method, sym->vaddr, 1);
@@ -3848,17 +3851,13 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 				}
 			}
 			r_list_foreach (c->methods, iter2, sym) {
-				char *mflags = r_bin_attr_tostring (sym->attr, false);
-				r_str_replace_char (mflags, ' ', '.');
+				char *mflags = r_core_bin_method_flags_str (sym->method_flags, mode);
 				char *n = c->name; //  r_name_filter_shell (c->name);
-				char *sn = sym->name; //r_name_filter_shell (sym->name); // symbol contains classname
-				const char *predot = R_STR_ISNOTEMPTY (mflags)? ".": "";
-				// char *cmd = r_str_newf ("\"f method%s.%s.%s = 0x%"PFMT64x"\"\n", mflags, n, sn, sym->vaddr);
-				char *cmd = r_str_newf ("\"f method.%s%s%s.%s = 0x%"PFMT64x"\"\n", n, predot, mflags, sn, sym->vaddr);
+				char *sn = sym->name; //r_name_filter_shell (sym->name);
+				char *cmd = r_str_newf ("\"f method%s.%s.%s = 0x%"PFMT64x"\"\n", mflags, n, sn, sym->vaddr);
 				// free (n);
 				// free (sn);
 				if (cmd) {
-					// use namefilter thing to create the right flag
 					r_str_replace_char (cmd, ' ', '_');
 					if (strlen (cmd) > 2) {
 						cmd[2] = ' ';
@@ -3919,18 +3918,7 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 				pj_ka (pj, "super");
 				RBinName *bn;
 				r_list_foreach (c->super, iter, bn) {
-#if 0
-					pj_o (pj);
-					if (bn->name) {
-						pj_ks (pj, "name", bn->name);
-					}
-					if (bn->oname) {
-						pj_ks (pj, "oname", bn->oname);
-					}
-					pj_end (pj);
-#else
 					pj_s (pj, r_bin_name_tostring (bn));
-#endif
 				}
 				pj_end (pj);
 			}
@@ -3952,8 +3940,8 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 						}
 						free (s);
 					}
-					if (sym->attr) {
-						char *mflags = r_core_bin_attr_tostring (sym->attr, mode);
+					if (sym->method_flags) {
+						char *mflags = r_core_bin_method_flags_str (sym->method_flags, mode);
 						pj_k (pj, "flags");
 						pj_j (pj, mflags);
 						free (mflags);
@@ -3972,9 +3960,9 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 					if (R_STR_ISNOTEMPTY (f->type)) {
 						pj_ks (pj, "type", f->type);
 					}
-					if (f->attr) {
-						char *mflags = r_core_bin_attr_tostring (f->attr, mode);
-						pj_k (pj, "attr");
+					if (f->flags) {
+						char *mflags = r_core_bin_method_flags_str (f->flags, mode);
+						pj_k (pj, "flags");
 						pj_j (pj, mflags);
 						free (mflags);
 					}
@@ -4004,7 +3992,7 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 				free (csv);
 			}
 			r_list_foreach (c->methods, iter2, sym) {
-				char *mflags = r_core_bin_attr_tostring (sym->attr, mode);
+				char *mflags = r_core_bin_method_flags_str (sym->method_flags, mode);
 				const char *ls = r_bin_lang_tostring (sym->lang);
 				r_cons_printf ("0x%08"PFMT64x" %s %8s %3d %s %s\n",
 					sym->vaddr, ls? ls: "?", "method", m, mflags, sym->dname? sym->dname: sym->name);
@@ -4014,12 +4002,11 @@ static bool bin_classes(RCore *r, PJ *pj, int mode) {
 			m = 0;
 			const char *ls = r_bin_lang_tostring (c->lang);
 			r_list_foreach (c->fields, iter3, f) {
-				char *mflags = r_core_bin_attr_tostring (f->attr, mode);
+				char *mflags = r_core_bin_method_flags_str (f->flags, mode);
 				const char *ks = r_bin_field_kindstr (f);
 				r_cons_printf ("0x%08"PFMT64x" %s %8s %3d %s %s\n",
 					f->vaddr, ls, ks, m, mflags, f->name);
 				m++;
-				free (mflags);
 			}
 		}
 		free (name);
@@ -4623,7 +4610,6 @@ static bool bin_header(RCore *r, int mode) {
 }
 
 R_API bool r_core_bin_info(RCore *core, int action, PJ *pj, int mode, int va, RCoreBinFilter *filter, const char *chksum) {
-	r_return_val_if_fail (core, false);
 	const char *name = (filter && filter->name)? filter->name : NULL;
 	bool ret = true;
 	ut64 at = UT64_MAX, loadaddr = r_bin_get_laddr (core->bin);
@@ -4896,7 +4882,6 @@ static bool r_core_bin_file_print(RCore *core, RBinFile *bf, PJ *pj, int mode) {
 }
 
 R_API bool r_core_bin_list(RCore *core, int mode) {
-	r_return_val_if_fail (core, false);
 	// list all binfiles and there objects and there archs
 	RListIter *iter;
 	RBinFile *binfile = NULL;
@@ -4924,52 +4909,69 @@ R_API bool r_core_bin_list(RCore *core, int mode) {
 	return true;
 }
 
-R_API char *r_core_bin_attr_tostring(ut64 flags, int mode) {
-	RStrBuf *buf = r_strbuf_new (""); // rename to 'sb'
+R_API char *r_core_bin_method_flags_str(ut64 flags, int mode) {
+	int i;
+
+	RStrBuf *buf = r_strbuf_new ("");
 	if (IS_MODE_SET (mode) || IS_MODE_RAD (mode)) {
-		if (flags) {
-			char *flag_string = r_bin_attr_tostring (flags, true);
-			if (flag_string) {
-				r_strbuf_append (buf, flag_string);
+		if (!flags) {
+			goto out;
+		}
+		for (i = 0; i < 64; i++) {
+			ut64 flag = flags & (1ULL << i);
+			if (flag) {
+				const char *flag_string = r_bin_get_meth_flag_string (flag, false);
+				if (flag_string) {
+					r_strbuf_appendf (buf, ".%s", flag_string);
+				}
 			}
-			free (flag_string);
 		}
 	} else if (IS_MODE_JSON (mode)) {
-		if (flags) {
-			PJ *pj = pj_new ();
-			pj_a (pj);
-			char *flag_string = r_bin_attr_tostring (flags, false);
-			if (flag_string) {
-				pj_s (pj, flag_string);
-			} else {
-				// r_strf_var (numstr, 32, "0x%08"PFMT64x, flag);
-				pj_n (pj, flags);
-			}
-			pj_end (pj);
-			r_strbuf_append (buf, pj_string (pj));
-			pj_free (pj);
-			free (flag_string);
-		} else {
+		if (!flags) {
 			r_strbuf_append (buf, "[]");
+			goto out;
 		}
+		PJ *pj = pj_new ();
+		pj_a (pj);
+		for (i = 0; i < 64; i++) {
+			ut64 flag = flags & (1ULL << i);
+			if (flag) {
+				const char *flag_string = r_bin_get_meth_flag_string (flag, false);
+				if (flag_string) {
+					pj_s (pj, flag_string);
+				} else {
+					r_strf_var (numstr, 32, "0x%08"PFMT64x, flag);
+					pj_s (pj, numstr);
+				}
+			}
+		}
+		pj_end (pj);
+		r_strbuf_append (buf, pj_string (pj));
+		pj_free (pj);
 	} else {
-		int len = 4;
-		if (flags) {
-			// const char *flag_string = r_bin_get_meth_flag_string (flag, true);
-			char *flag_string = r_bin_attr_tostring (flags, true);
-			if (flag_string) {
-				r_strbuf_append (buf, flag_string);
-			}
-			len -= strlen (flag_string);
-			if (len < 1) {
-				len = 1;
-			}
-			free (flag_string);
+		int pad_len = 4; //TODO: move to a config variable
+		int len = 0;
+		if (!flags) {
+			goto padding;
 		}
-		for ( ; len > 0; len--) {
+		for (i = 0; i < 64; i++) {
+			ut64 flag = flags & (1ULL << i);
+			if (flag) {
+				const char *flag_string = r_bin_get_meth_flag_string (flag, true);
+				if (flag_string) {
+					r_strbuf_append (buf, flag_string);
+				} else {
+					r_strbuf_append (buf, "?");
+				}
+				len++;
+			}
+		}
+padding:
+		for ( ; len < pad_len; len++) {
 			r_strbuf_append (buf, " ");
 		}
 	}
+out:
 	return r_strbuf_drain (buf);
 }
 

libr/core/cmd_info.inc.c

@@ -112,11 +112,9 @@ static void classdump_keys(RCore *core, RBinObject *bo) {
 					iova? f->vaddr: f->paddr);
 		}
 		r_list_foreach (k->methods, iter2, m) {
-			char *attr = r_bin_attr_tostring (m->attr, true);
 			r_cons_printf ("klass.%s.method.%s.%s=0x%"PFMT64x"\n",
-					k->name, r_str_get (attr), m->name,
+					k->name, r_str_get (m->visibility_str), m->name,
 					iova? m->vaddr: m->paddr);
-			free (attr);
 		}
 	}
 }
@@ -1569,9 +1567,8 @@ static int cmd_info(void *data, const char *input) {
 								r_list_foreach (cls->methods, iter2, sym) {
 									pj_o (pj);
 									pj_ks (pj, "name", sym->name);
-									if (sym->attr) {
-										// TODO: must be an array of strings
-										char *flags = r_core_bin_attr_tostring (sym->attr, false);
+									if (sym->method_flags) {
+										char *flags = r_core_bin_method_flags_str (sym->method_flags, R_MODE_JSON);
 										pj_k (pj, "flags");
 										pj_j (pj, flags);
 										free (flags);
@@ -1585,11 +1582,11 @@ static int cmd_info(void *data, const char *input) {
 							default:
 								r_cons_printf ("class %s\n", cls->name);
 								r_list_foreach (cls->methods, iter2, sym) {
-									char *flags = r_core_bin_attr_tostring (sym->attr, true);
-									r_cons_printf ("0x%08"PFMT64x " method %s %-4s %s\n",
+									char *flags = r_core_bin_method_flags_str (sym->method_flags, 0);
+									r_cons_printf ("0x%08"PFMT64x " method %s %s %s\n",
 											iova? sym->vaddr: sym->paddr,
 											cls->name, flags, sym->name);
-									free (flags);
+									R_FREE (flags);
 								}
 								break;
 							}

libr/core/vmenus.c

@@ -1291,6 +1291,7 @@ static void *show_class(RCore *core, int mode, int *idx, RBinClass *_c, const ch
 		r_cons_printf ("[hjkl_/cfM]> methods of %s\n\n", _c->name);
 		r_list_foreach (_c->methods, iter, m) {
 			const char *name = m->dname? m->dname: m->name;
+			char *mflags;
 			if (grep) {
 				if (!r_str_casestr (name, grep)) {
 					i++;
@@ -1306,7 +1307,8 @@ static void *show_class(RCore *core, int mode, int *idx, RBinClass *_c, const ch
 				}
 			}
 
-			char *mflags = r_core_bin_attr_tostring (m->attr, false);
+			mflags = r_core_bin_method_flags_str (m->method_flags, 0);
+
 			if (show_color) {
 				if (r_str_startswith (name, _c->name)) {
 					name += strlen (_c->name);

libr/include/r_bin.h

@@ -71,7 +71,34 @@ R_LIB_VERSION_HEADER (r_bin);
 #define R_BIN_REQ_TRYCATCH 0x100000000
 #define R_BIN_REQ_SECTIONS_MAPPING 0x200000000
 
-// TODO integrate with R_BIN_ATTR
+// R2_590 - deprecate
+#define R_BIN_CLASS_PUBLIC 0x0000000000000004L
+
+/* RBinSymbol->method_flags : */
+// XXX unify with RBinAttribute instead! R2_590
+#define R_BIN_METH_CLASS 0x0000000000000001L
+#define R_BIN_METH_STATIC 0x0000000000000002L
+#define R_BIN_METH_PUBLIC 0x0000000000000004L
+#define R_BIN_METH_PRIVATE 0x0000000000000008L
+#define R_BIN_METH_PROTECTED 0x0000000000000010L
+#define R_BIN_METH_INTERNAL 0x0000000000000020L
+#define R_BIN_METH_OPEN 0x0000000000000040L
+#define R_BIN_METH_FILEPRIVATE 0x0000000000000080L
+#define R_BIN_METH_FINAL 0x0000000000000100L
+#define R_BIN_METH_VIRTUAL 0x0000000000000200L
+#define R_BIN_METH_CONST 0x0000000000000400L
+#define R_BIN_METH_MUTATING 0x0000000000000800L
+#define R_BIN_METH_ABSTRACT 0x0000000000001000L
+#define R_BIN_METH_SYNCHRONIZED 0x0000000000002000L
+#define R_BIN_METH_NATIVE 0x0000000000004000L
+#define R_BIN_METH_BRIDGE 0x0000000000008000L
+#define R_BIN_METH_VARARGS 0x0000000000010000L
+#define R_BIN_METH_SYNTHETIC 0x0000000000020000L
+#define R_BIN_METH_STRICT 0x0000000000040000L
+#define R_BIN_METH_MIRANDA 0x0000000000080000L
+#define R_BIN_METH_CONSTRUCTOR 0x0000000000100000L
+#define R_BIN_METH_DECLARED_SYNCHRONIZED 0x0000000000200000L
+
 #define R_BIN_BIND_LOCAL_STR "LOCAL"
 #define R_BIN_BIND_GLOBAL_STR "GLOBAL"
 #define R_BIN_BIND_WEAK_STR "WEAK"
@@ -107,6 +134,8 @@ typedef enum {
 	R_BIN_SYM_LAST
 } RBinSym;
 
+// name mangling types
+// TODO: Rename to R_BIN_LANG_
 typedef enum {
 	R_BIN_LANG_NONE = 0,
 	R_BIN_LANG_JAVA = 1,
@@ -125,7 +154,7 @@ typedef enum {
 	R_BIN_LANG_JNI = 1U<<13,
 	R_BIN_LANG_BLOCKS = 1U<<31,
 	R_BIN_LANG_ANY = -1,
-} RBinLanguage;
+} RBinNameMangling;
 
 typedef enum {
 	R_STRING_TYPE_DETECT = '?',
@@ -137,55 +166,46 @@ typedef enum {
 } RStringType;
 
 // used for symbols, classes, methods... generic for elf, dex, pe, swift, ...
-// unifies symbol flags, visibility, bind, type into a single generic field
-// 64bit enums are problematic for old msvc and tcc, maybe just use defines here
-// typedef enum { } RBinAttribute;
-typedef uint64_t RBinAttribute;
-#define R_BIN_ATTR_NONE (0)
-#define R_BIN_ATTR_PUBLIC (1ULL << 0)
-#define R_BIN_ATTR_OPEN (1ULL << 1)
-#define R_BIN_ATTR_FILEPRIVATE (1ULL << 2)
-#define R_BIN_ATTR_PRIVATE (1ULL << 3)
-#define R_BIN_ATTR_HIDDEN (1ULL << 4)
-#define R_BIN_ATTR_INTERNAL (1ULL << 5) // same as fileprivate?
-#define R_BIN_ATTR_FRIENDLY (1ULL << 6)
-#define R_BIN_ATTR_PROTECTED (1ULL << 7)
-#define R_BIN_ATTR_SEALED (1ULL << 8)
-#define R_BIN_ATTR_GLOBAL (1ULL << 9)
-#define R_BIN_ATTR_WEAK (1ULL << 10)
-#define R_BIN_ATTR_UNSAFE (1ULL << 11)
-#define R_BIN_ATTR_CLASS (1ULL << 12) // class method (not instance method)
-#define R_BIN_ATTR_EXTERN (1ULL << 13)
-#define R_BIN_ATTR_READONLY (1ULL << 14)
-#define R_BIN_ATTR_STATIC (1ULL << 15) // same as class attribute?
-#define R_BIN_ATTR_CONST (1ULL << 16)
-#define R_BIN_ATTR_VIRTUAL (1ULL << 17)
-#define R_BIN_ATTR_MUTATING (1ULL << 18)
-#define R_BIN_ATTR_FINAL (1ULL << 19)
-#define R_BIN_ATTR_ABSTRACT (1ULL << 20)
-#define R_BIN_ATTR_INTERFACE (1ULL << 21)
-#define R_BIN_ATTR_SYNTHETIC (1ULL << 22) // synthesized methods
-#define R_BIN_ATTR_SYMBOLIC (1ULL << 23)
-#define R_BIN_ATTR_VERIFIED (1ULL << 24)
-#define R_BIN_ATTR_MIRANDA (1ULL << 25)
-#define R_BIN_ATTR_CONSTRUCTOR (1ULL << 26)
-#define R_BIN_ATTR_GETTER (1ULL << 27) // accessor
-#define R_BIN_ATTR_SETTER (1ULL << 28) // accessor
-#define R_BIN_ATTR_OPTIMIZED (1ULL << 29)
-//#define R_BIN_ATTR_ANNOTATED (1ULL << 30)
-#define R_BIN_ATTR_BRIDGE (1ULL << 31)
-#define R_BIN_ATTR_STRICT (1ULL << 32)
-#define R_BIN_ATTR_ASYNC (1ULL << 33)
-#define R_BIN_ATTR_SYNCHRONIZED (1ULL << 34)
-#define R_BIN_ATTR_DECLARED_SYNCHRONIZED (1ULL << 35)
-#define R_BIN_ATTR_VOLATILE (1ULL << 36)
-#define R_BIN_ATTR_TRANSIENT (1ULL << 37)
-#define R_BIN_ATTR_ENUM (1ULL << 38)
-#define R_BIN_ATTR_NATIVE (1ULL << 39)
-#define R_BIN_ATTR_RACIST (1ULL << 40)
-#define R_BIN_ATTR_VARARGS (1ULL << 41)
-#define R_BIN_ATTR_SUPER (1ULL << 42)
-#define R_BIN_ATTR_ANNOTATION (1ULL << 43)
+typedef enum {
+	// R2_590 rename to R_BIN_VISIBILITY // R_BIN_SCOPE_(PRIVATE|PUBLIC|..) ?
+	// see binclass.visibility_str
+	R_BIN_ATTR_PRIVATE,
+	R_BIN_ATTR_FILEPRIVATE,
+	R_BIN_ATTR_PUBLIC,
+	R_BIN_ATTR_HIDDEN,
+	R_BIN_ATTR_INTERNAL, // same as fileprivate?
+	R_BIN_ATTR_FRIENDLY,
+	R_BIN_ATTR_PROTECTED,
+	R_BIN_ATTR_SEALED,
+	R_BIN_ATTR_UNSAFE,
+	R_BIN_ATTR_ASYNC,
+	R_BIN_ATTR_EXTERN,
+	R_BIN_ATTR_READONLY,
+	R_BIN_ATTR_STATIC,
+	R_BIN_ATTR_CONST,
+	R_BIN_ATTR_VIRTUAL,
+	R_BIN_ATTR_MUTATING,
+	R_BIN_ATTR_FINAL,
+	R_BIN_ATTR_ABSTRACT,
+	R_BIN_ATTR_INTERFACE,
+	R_BIN_ATTR_SYNTHETIC, // synthesized methods
+	R_BIN_ATTR_SYMBOLIC,
+	R_BIN_ATTR_VERIFIED,
+	R_BIN_ATTR_MIRANDA,
+	R_BIN_ATTR_CONSTRUCTOR,
+	R_BIN_ATTR_ACCESSOR, // getter / setter
+	// R_BIN_ATTR_GETTER, // getter / setter
+	// R_BIN_ATTR_SETTER, // getter / setter
+	R_BIN_ATTR_OPTIMIZED,
+	R_BIN_ATTR_ANNOTATED,
+	R_BIN_ATTR_BRIDGE,
+	R_BIN_ATTR_STRICT,
+	R_BIN_ATTR_SYNCHRONIZED,
+	R_BIN_ATTR_VOLATILE,
+	R_BIN_ATTR_TRANSIENT,
+	R_BIN_ATTR_ENUM,
+	R_BIN_ATTR_NATIVE,
+} RBinAttribute;
 
 typedef enum {
 	R_BIN_RELOC_1 = 1,
@@ -209,10 +229,10 @@ typedef struct r_bin_addr_t {
 } RBinAddr;
 
 typedef struct r_bin_name_t {
+	// char *name; // user-defined custom name TODO
 	char *name; // demangled name
 	char *oname; // original (mangled) name
 	char *fname; // flag name
-	// char *uname; // user-defined custom name TODO
 } RBinName;
 
 typedef struct r_bin_hash_t {
@@ -282,18 +302,21 @@ typedef struct r_bin_symbol_t {
 	RBinName *cname; // R2_590
 	/* const-unique-strings */
 	const char *forwarder;
-	const char *bind; // tied to attr already
-	const char *type; // typed to attr already
+	const char *bind;
+	const char *type;
   	const char *rtype;
 	bool is_imported;
 	/* only used by java */
+	const char *visibility_str;
 	ut64 vaddr;
 	ut64 paddr;
 	ut32 size;
 	ut32 ordinal;
+	ut32 visibility;
 	int lang;
 	int bits;
-	RBinAttribute attr; // previously known as method_flags + visibility
+	/* see R_BIN_METH_* constants */
+	ut64 method_flags;
 	int dup_count;
 } RBinSymbol;
 
@@ -322,6 +345,7 @@ typedef struct r_bin_import_t {
 	char *classname;
 	char *descriptor;
 	ut32 ordinal;
+	ut32 visibility;
 	// used by elf, so we just expose them here, so we can remove the internal representation dupe
 	bool in_shdr;
 	bool is_sht_null;
@@ -593,15 +617,15 @@ typedef struct r_bin_class_t {
 	char *name; // must be deprecated and use bname only
 	RBinName *bname; // R2_590
 	RList *super; // list of RBinName
-	char *visibility_str; // XXX R2_590 - only used by dex+java should be ut32 or bitfield.. should be usable for swift too
+	char *visibility_str; // XXX only used by dex+java should be ut32 or bitfield.. should be usable for swift too
 	int index; // should be unsigned?
 	ut64 addr;
 	char *ns; // namespace // maybe RBinName?
 	RList *methods; // <RBinSymbol>
 	RList *fields; // <RBinField>
 	// RList *interfaces; // <char *>
-	RBinAttribute attr;
-	ut64 lang;
+	int visibility;
+	int lang;
 } RBinClass;
 
 #define RBinSectionName r_offsetof(RBinSection, name)
@@ -656,7 +680,7 @@ typedef struct r_bin_field_t {
 	ut64 paddr;
 	int size;
 	int offset;
-	// ut32 visibility; // R2_590 - deprecate we have attr!
+	ut32 visibility;
 #if 0
 	RBinName *type;
 	RBinName *name;
@@ -669,8 +693,7 @@ typedef struct r_bin_field_t {
 	char *comment;
 	char *format;
 	bool format_named; // whether format is the name of a format or a raw pf format string
-	// ut64 flags; // rename to attr and use R_BIN_ATTR_
-	RBinAttribute attr;
+	ut64 flags; // rename to attr and use R_BIN_ATTR_
 } RBinField;
 
 R_API const char *r_bin_field_kindstr(RBinField *f);
@@ -750,7 +773,7 @@ R_API bool r_bin_open_io(RBin *bin, RBinFileOptions *opt);
 R_API bool r_bin_open_buf(RBin *bin, RBuffer *buf, RBinFileOptions *opt);
 R_API bool r_bin_reload(RBin *bin, ut32 bf_id, ut64 baseaddr);
 
-R_API RBinClass *r_bin_class_new(const char *name, const char *super, ut64 attr);
+R_API RBinClass *r_bin_class_new(const char *name, const char *super, int view);
 R_API void r_bin_class_free(RBinClass *);
 // uhm should be tied used because we dont want bincur to change because of open
 R_API RBinFile *r_bin_file_open(RBin *bin, const char *file, RBinFileOptions *opt);
@@ -826,7 +849,7 @@ R_API RVecRBinSymbol *r_bin_file_get_symbols_vec(RBinFile *bf);
 //
 R_API ut64 r_bin_file_get_vaddr(RBinFile *bf, ut64 paddr, ut64 vaddr);
 // RBinFile.add
-R_API RBinClass *r_bin_file_add_class(RBinFile *binfile, const char *name, const char *super, ut64 attr);
+R_API RBinClass *r_bin_file_add_class(RBinFile *binfile, const char *name, const char *super, int view);
 R_API RBinSymbol *r_bin_file_add_method(RBinFile *bf, const char *classname, const char *name, int nargs);
 R_API RBinField *r_bin_file_add_field(RBinFile *binfile, const char *classname, const char *name);
 // RBinFile.find
@@ -893,7 +916,7 @@ R_API char *r_bin_name_tostring2(RBinName *bn, int type);
 R_API void r_bin_name_demangled(RBinName *bn, const char *dname);
 R_API void r_bin_name_free(RBinName *bn);
 
-R_API char *r_bin_attr_tostring(ut64 attr, bool singlechar);
+R_API char *r_bin_attr_tostring(ut64 attr);
 R_API ut64 r_bin_attr_fromstring(const char *s);
 
 /* filter.c */

libr/include/r_core.h

@@ -824,7 +824,7 @@ typedef struct r_core_bin_filter_t {
 R_API bool r_core_bin_info(RCore *core, int action, PJ *pj, int mode, int va, RCoreBinFilter *filter, const char *chksum);
 R_API bool r_core_bin_set_arch_bits(RCore *r, const char *name, const char *arch, ut16 bits);
 R_API bool r_core_bin_update_arch_bits(RCore *r);
-R_API char *r_core_bin_attr_tostring(ut64 flags, int mode);
+R_API char *r_core_bin_method_flags_str(ut64 flags, int mode);
 R_API bool r_core_pdb_info(RCore *core, const char *file, PJ *pj, int mode);
 
 /* rtr */

shlr/java/class.h

@@ -1,4 +1,6 @@
-/* radare - Apache 2.0 - Copyright 2007-2023 - pancake, dso */
+/* radare - Apache 2.0 - Copyright 2007-2017 - pancake
+   class.h rewrite: Adam Pridgen <dso@rice.edu || adam.pridgen@thecoverofnight.com>
+ */
 
 #ifndef _INCLUDE_JAVA_CLASS_H_
 #define _INCLUDE_JAVA_CLASS_H_
@@ -36,7 +38,6 @@ static inline ut32 UINT(const ut8 *x, const int y) {
 
 #define R_BIN_JAVA_USHORT(x,y) ((ut16)(((0xff&x[y+1])|((x[y]&0xff)<<8)) & 0xffff))
 
-// TODO: use r_read APIs instead!
 #define R_BIN_JAVA_UINT(x,y) ((ut32)((((ut32)(x[y]&0xff))<<24)|(((ut32)(x[y+1]&0xff))<<16)|((ut32)((x[y+2]&0xff))<<8)|(x[y+3]&0xff)))
 #define R_BIN_JAVA_FLOAT(x,y) ((float)R_BIN_JAVA_UINT(x,y))
 
@@ -44,10 +45,12 @@ static inline ut32 UINT(const ut8 *x, const int y) {
 //#define R_BIN_JAVA_DOUBLE(x,y) ((double)RBIN_JAVA_LONG(x,y))
 //#define R_BIN_JAVA_SWAPUSHORT(x) ((ut16)((x<<8)|((x>>8)&0x00FF)))
 
+
+
 #define R_BIN_JAVA_DOUBLE(x,y) rbin_java_raw_to_double(x, y)
 
 typedef enum {
-	R_BIN_JAVA_METHOD_ACC_PUBLIC = 0x0001,
+	R_BIN_JAVA_METHOD_ACC_PUBLIC= 0x0001,
 	R_BIN_JAVA_METHOD_ACC_PRIVATE = 0x0002,
 	R_BIN_JAVA_METHOD_ACC_PROTECTED = 0x0004,
 	R_BIN_JAVA_METHOD_ACC_STATIC = 0x0008,
@@ -68,7 +71,7 @@ typedef enum {
 } R_BIN_JAVA_METHOD_ACCESS;
 
 typedef enum {
-	R_BIN_JAVA_FIELD_ACC_PUBLIC = 0x0001,
+	R_BIN_JAVA_FIELD_ACC_PUBLIC= 0x0001,
 	R_BIN_JAVA_FIELD_ACC_PRIVATE = 0x0002,
 	R_BIN_JAVA_FIELD_ACC_PROTECTED = 0x0004,
 	R_BIN_JAVA_FIELD_ACC_STATIC = 0x0008,
@@ -82,7 +85,7 @@ typedef enum {
 } R_BIN_JAVA_FIELD_ACCESS;
 
 typedef enum {
-	R_BIN_JAVA_CLASS_ACC_PUBLIC = 0x0001,
+	R_BIN_JAVA_CLASS_ACC_PUBLIC= 0x0001,
 	R_BIN_JAVA_CLASS_ACC_PRIVATE = 0x0002,
 	R_BIN_JAVA_CLASS_ACC_PROTECTED = 0x0004,
 	R_BIN_JAVA_CLASS_ACC_STATIC = 0x0008,
@@ -95,7 +98,7 @@ typedef enum {
 	R_BIN_JAVA_CLASS_ACC_NATIVE = 0x0100,
 	R_BIN_JAVA_CLASS_ACC_INTERFACE = 0x0200,
 	R_BIN_JAVA_CLASS_ACC_ABSTRACT = 0x0400,
-	R_BIN_JAVA_CLASS_ACC_STRICT = 0x0800,
+	R_BIN_JAVA_CLASS_ACC_STRICT= 0x0800,
 
 	R_BIN_JAVA_CLASS_ACC_SYNTHETIC = 0x1000,
 	R_BIN_JAVA_CLASS_ACC_ANNOTATION = 0x2000,
@@ -222,6 +225,7 @@ typedef struct  r_bin_java_methodref_info_t {
 	ut16 name_and_type_idx;
 } RBinJavaCPTypeMethodRef;
 
+
 typedef struct  r_bin_java_interfacemethodref_info_t {
 	ut16 class_idx;
 	ut16 name_and_type_idx;
@@ -262,6 +266,7 @@ typedef struct  r_bin_java_float_info_t {
 	} bytes;
 } RBinJavaCPTypeFloat;
 
+
 typedef struct  r_bin_java_long_info_t {
 	union {
 		ut8 raw[8];
@@ -283,6 +288,7 @@ typedef struct  r_bin_java_double_info_t {
 	} bytes;
 } RBinJavaCPTypeDouble;
 
+
 /* Meta-data Info */
 
 typedef struct  r_bin_java_name_and_type_info_t {
@@ -402,6 +408,8 @@ typedef struct r_bin_java_element_value_ary_t{
 	RList *values;
 } RBinJavaElementValueArray;
 
+
+
 typedef struct r_bin_java_annotation_t{
 	ut64 size;
 	ut16 type_idx;
@@ -451,6 +459,8 @@ typedef struct r_bin_java_element_value_pair_t{
 	RBinJavaElementValue *value;
 } RBinJavaElementValuePair;
 
+
+
 typedef struct r_bin_java_annotations_attr_t {
 	ut64 size;
 	ut16 num_annotations;
@@ -479,6 +489,7 @@ typedef struct r_bin_java_stack_map_table_attr_t { // attribute StackMap
 	RList* stack_map_frame_entries;
 } RBinJavaStackMapTableAttr;
 
+
 typedef struct r_bin_java_signature_attr_t {
 	ut16 signature_idx;
 	char *signature;
@@ -611,6 +622,7 @@ typedef struct r_bin_java_attr_localvariable_t{
 	ut64 size;
 } RBinJavaLocalVariableAttribute;
 
+
 typedef struct r_bin_java_attr_localvariable_table_t {
 	ut16 table_length;
 	RList* local_variable_table; // RBinJavaLocalVariable
@@ -885,6 +897,8 @@ R_API char* r_bin_java_get_desc_from_cp_item_list(RList *cp_list, ut64 idx);
 R_API char* r_bin_java_get_item_name_from_cp_item_list(RList *cp_list, RBinJavaCPTypeObj *obj, int depth);
 R_API char* r_bin_java_get_item_desc_from_cp_item_list(RList *cp_list, RBinJavaCPTypeObj *obj, int depth);
 
+
+
 R_API char* r_bin_java_get_name_from_bin_cp_list(RBinJavaObj *bin, ut64 idx);
 R_API char* r_bin_java_get_utf8_from_bin_cp_list(RBinJavaObj *bin, ut64 idx);
 R_API ut32 r_bin_java_get_utf8_len_from_bin_cp_list(RBinJavaObj *bin, ut64 idx);
@@ -964,11 +978,9 @@ R_API ut16 U(r_bin_java_calculate_class_access_value)(const char * access_flags_
 R_API RList * U(retrieve_all_method_access_string_and_value)(void);
 R_API RList * U(retrieve_all_field_access_string_and_value)(void);
 R_API RList * U(retrieve_all_class_access_string_and_value)(void);
-#if 0
 R_API char * retrieve_method_access_string(ut16 flags);
 R_API char * retrieve_field_access_string(ut16 flags);
 R_API char * retrieve_class_method_access_string(ut16 flags);
-#endif
 
 R_API char * U(r_bin_java_resolve)(RBinJavaObj *obj, int idx, ut8 space_bn_name_type);
 R_API char * r_bin_java_resolve_with_space(RBinJavaObj *obj, int idx);
@@ -1043,7 +1055,7 @@ R_API void r_bin_java_get_method_json_definitions(RBinJavaObj *bin, PJ *pj);
 R_API void r_bin_java_get_import_json_definitions(RBinJavaObj *bin, PJ *pj);
 R_API void r_bin_java_get_interface_json_definitions(RBinJavaObj *bin, PJ *pj);
 
-R_API void r_bin_java_get_fm_type_definition_json(RBinJavaObj *bin, RBinJavaField *fm_type, PJ *pj, bool is_method);
+R_API void r_bin_java_get_fm_type_definition_json(RBinJavaObj *bin, RBinJavaField *fm_type, PJ *pj, int is_method);
 R_API void r_bin_java_get_field_json_definition(RBinJavaObj *bin, RBinJavaField *fm_type, PJ *pj);
 R_API void r_bin_java_get_method_json_definition(RBinJavaObj *bin, RBinJavaField *fm_type, PJ *pj);
 R_API void r_bin_java_get_class_info_json(RBinJavaObj *bin, PJ *pj);
@@ -1051,9 +1063,4 @@ R_API void r_bin_java_get_class_info_json(RBinJavaObj *bin, PJ *pj);
 R_API char *r_bin_java_get_bin_obj_json(RBinJavaObj *bin);
 R_API ut64 r_bin_java_calc_class_size(ut8* bytes, ut64 size);
 R_API int r_bin_java_valid_class(const ut8 * buf, ut64 buf_sz);
-
-R_API char *retrieve_class_method_access_string(ut16 flags);
-R_API char *retrieve_method_access_string(ut16 flags);
-R_API char *retrieve_field_access_string(ut16 flags);
-R_API char *retrieve_class_method_access_string(ut16 flags);
 #endif

test/db/cmd/cmd_tc

@@ -62,7 +62,7 @@ fs classes
 "f method.Employee.setFirstName: = 0x100001cb0"
 "f method.Employee.shortWord = 0x100001cf0"
 "f method.Employee.wideWord = 0x100001d10"
-"f method.Employee.class.sayHello = 0x100001be0"
+"f method.class.Employee.sayHello = 0x100001be0"
 "f field.Employee.var.isa = 0x00000000"
 "f field.Employee.var._shortWord = 0x100003328"
 "f field.Employee.var._username = 0x100003330"
@@ -312,7 +312,7 @@ fs classes
 "f method.Employee.shortWord = 0x100007b24"
 "f method.Employee.wideWord = 0x100007b44"
 "f method.Employee..cxx_destruct = 0x100007b60"
-"f method.Employee.class.sayHello = 0x100007958"
+"f method.class.Employee.sayHello = 0x100007958"
 "f field.Employee.var.isa = 0x00000000"
 "f field.Employee.var._shortWord = 0x10000c228"
 "f field.Employee.var._username = 0x10000c22c"
@@ -564,7 +564,7 @@ fs classes
 "f method.Employee.shortWord = 0x100007b88"
 "f method.Employee.wideWord = 0x100007ba8"
 "f method.Employee..cxx_destruct = 0x100007bc4"
-"f method.Employee.class.sayHello = 0x1000079a8"
+"f method.class.Employee.sayHello = 0x1000079a8"
 "f field.Employee.var.isa = 0x00000000"
 "f field.Employee.var._shortWord = 0x10000c1d8"
 "f field.Employee.var._username = 0x10000c1dc"

test/db/formats/dex

@@ -78,7 +78,7 @@ CMDS=ic
 EXPECT=<<EOF
 0x00000174 [0x000001a4 - 0x0000021e]    122 java class 0 LHello :: Ljava/lang/Object;
 0x000001a4 java   method   0 pC   LHello.method.<init>(Ljava/lang/String;)V
-0x000001c0 java   method   1 ps   LHello.method.main([Ljava/lang/String;)V
+0x000001c0 java   method   1 sp   LHello.method.main([Ljava/lang/String;)V
 0x000001e8 java   method   2 p    LHello.method.say()V
 0x00000124 java      var   0 P    LHello.ifield_who:Ljava/lang/String
 EOF
@@ -90,7 +90,7 @@ CMDS=ic LHello
 EXPECT=<<EOF
 class LHello
 0x000001a4 method LHello pC   LHello.method.<init>(Ljava/lang/String;)V
-0x000001c0 method LHello ps   LHello.method.main([Ljava/lang/String;)V
+0x000001c0 method LHello sp   LHello.method.main([Ljava/lang/String;)V
 0x000001e8 method LHello p    LHello.method.say()V
 EOF
 RUN
@@ -110,7 +110,7 @@ icj~{[0].methods[1].flags[0]}
 icj~{[0].methods[1].flags[1]}
 EOF
 EXPECT=<<EOF
-public static
+static
 public
 EOF
 RUN
@@ -119,7 +119,7 @@ NAME=DEX Hello.dex method flags (r2 commands) (ic*)
 FILE=bins/dex/Hello.dex
 CMDS=ic*~main
 EXPECT=<<EOF
-"f method.LHello.public.static.LHello.method.main([Ljava/lang/String;)V = 0x1c0"
+"f method.static.public.LHello.LHello.method.main([Ljava/lang/String;)V = 0x1c0"
 EOF
 RUN
 
@@ -177,7 +177,7 @@ EXPECT=<<EOF
 0x00000238 1 method.public.constructor.LHello.LHello.method._init___V
 0x0000025c 1 entry0
 0x0000025c 34 sym.LHello.method.main__Ljava_lang_String__V
-0x0000025c 1 method.public.static.LHello.LHello.method.main__Ljava_lang_String__V
+0x0000025c 1 method.static.public.LHello.LHello.method.main__Ljava_lang_String__V
 0x00000290 84 sym.LHello.method.foo_I_V
 0x00000290 1 method.public.LHello.LHello.method.foo_I_V
 0x000002f4 20 sym.LWorld.method._init___V
@@ -520,7 +520,7 @@ EXPECT=<<EOF
 0x00007890 [0x0000c6c0 - 0x0000cd2e]   1646 java class 0 Lcom/ice/tar/FastTarStream :: Ljava/lang/Object;
 0x0000c6c0 java   method   0 pC   Lcom/ice/tar/FastTarStream.method.<init>(Ljava/io/InputStream;)V
 0x0000c6dc java   method   1 pC   Lcom/ice/tar/FastTarStream.method.<init>(Ljava/io/InputStream;I)V
-0x0000c720 java   method   2 ps   Lcom/ice/tar/FastTarStream.method.main([Ljava/lang/String;)V
+0x0000c720 java   method   2 sp   Lcom/ice/tar/FastTarStream.method.main([Ljava/lang/String;)V
 0x0000ca5c java   method   3 p    Lcom/ice/tar/FastTarStream.method.getNextEntry()Lcom/ice/tar/TarEntry;
 0x0000cd28 java   method   4 p    Lcom/ice/tar/FastTarStream.method.setDebug(Z)V
 0x00003f20 java      var   0 P    Lcom/ice/tar/FastTarStream.ifield_currEntry:Lcom/ice/tar/TarEntry
@@ -599,8 +599,8 @@ EXPECT=<<EOF
 0x0000e0e4 java   method  18 p    Lcom/ice/tar/TarBuffer.method.skipRecord()V
 0x0000e188 java   method  19 p    Lcom/ice/tar/TarBuffer.method.writeRecord([B)V
 0x0000e2a0 java   method  20 p    Lcom/ice/tar/TarBuffer.method.writeRecord([BI)V
-0x00003fd0 java      var   0 psf  Lcom/ice/tar/TarBuffer.sfield_DEFAULT_BLKSIZE:I
-0x00003fd8 java      var   1 psf  Lcom/ice/tar/TarBuffer.sfield_DEFAULT_RCDSIZE:I
+0x00003fd0 java      var   0 spf  Lcom/ice/tar/TarBuffer.sfield_DEFAULT_BLKSIZE:I
+0x00003fd8 java      var   1 spf  Lcom/ice/tar/TarBuffer.sfield_DEFAULT_RCDSIZE:I
 0x00003fe0 java      var   2 P    Lcom/ice/tar/TarBuffer.ifield_blockBuffer:[B
 0x00003fe8 java      var   3 P    Lcom/ice/tar/TarBuffer.ifield_blockSize:I
 0x00003ff0 java      var   4 P    Lcom/ice/tar/TarBuffer.ifield_currBlkIdx:I
@@ -668,41 +668,41 @@ EXPECT=<<EOF
 0x00004060 java      var   2 P    Lcom/ice/tar/TarEntryEnumerator.ifield_tis:Lcom/ice/tar/TarInputStream
 0x00007950 [0x0000f3a4 - 0x0000f90e]   1386 java class 6 Lcom/ice/tar/TarHeader :: Ljava/lang/Object;
 0x0000f3a4 java   method   0 pC   Lcom/ice/tar/TarHeader.method.<init>()V
-0x0000f43c java   method   1 ps   Lcom/ice/tar/TarHeader.method.getCheckSumOctalBytes(J[BII)I
-0x0000f478 java   method   2 ps   Lcom/ice/tar/TarHeader.method.getFileNameBytes(Ljava/lang/String;[B)I
-0x0000f558 java   method   3 ps   Lcom/ice/tar/TarHeader.method.getLongOctalBytes(J[BII)I
-0x0000f588 java   method   4 ps   Lcom/ice/tar/TarHeader.method.getNameBytes(Ljava/lang/StringBuffer;[BII)I
-0x0000f5dc java   method   5 ps   Lcom/ice/tar/TarHeader.method.getOctalBytes(J[BII)I
-0x0000f680 java   method   6 ps   Lcom/ice/tar/TarHeader.method.parseFileName([B)Ljava/lang/StringBuffer;
-0x0000f700 java   method   7 ps   Lcom/ice/tar/TarHeader.method.parseName([BII)Ljava/lang/StringBuffer;
-0x0000f740 java   method   8 ps   Lcom/ice/tar/TarHeader.method.parseOctal([BII)J
+0x0000f43c java   method   1 sp   Lcom/ice/tar/TarHeader.method.getCheckSumOctalBytes(J[BII)I
+0x0000f478 java   method   2 sp   Lcom/ice/tar/TarHeader.method.getFileNameBytes(Ljava/lang/String;[B)I
+0x0000f558 java   method   3 sp   Lcom/ice/tar/TarHeader.method.getLongOctalBytes(J[BII)I
+0x0000f588 java   method   4 sp   Lcom/ice/tar/TarHeader.method.getNameBytes(Ljava/lang/StringBuffer;[BII)I
+0x0000f5dc java   method   5 sp   Lcom/ice/tar/TarHeader.method.getOctalBytes(J[BII)I
+0x0000f680 java   method   6 sp   Lcom/ice/tar/TarHeader.method.parseFileName([B)Ljava/lang/StringBuffer;
+0x0000f700 java   method   7 sp   Lcom/ice/tar/TarHeader.method.parseName([BII)Ljava/lang/StringBuffer;
+0x0000f740 java   method   8 sp   Lcom/ice/tar/TarHeader.method.parseOctal([BII)J
 0x0000f7ac java   method   9 p    Lcom/ice/tar/TarHeader.method.clone()Ljava/lang/Object;
 0x0000f900 java   method  10 p    Lcom/ice/tar/TarHeader.method.getName()Ljava/lang/String;
-0x00004088 java      var   0 psf  Lcom/ice/tar/TarHeader.sfield_CHKSUMLEN:I
-0x00004090 java      var   1 psf  Lcom/ice/tar/TarHeader.sfield_DEVLEN:I
-0x00004098 java      var   2 psf  Lcom/ice/tar/TarHeader.sfield_GIDLEN:I
-0x000040a0 java      var   3 psf  Lcom/ice/tar/TarHeader.sfield_GNAMELEN:I
-0x000040a8 java      var   4 psf  Lcom/ice/tar/TarHeader.sfield_GNU_TMAGIC:Ljava/lang/String
-0x000040b0 java      var   5 psf  Lcom/ice/tar/TarHeader.sfield_LF_BLK:B
-0x000040b8 java      var   6 psf  Lcom/ice/tar/TarHeader.sfield_LF_CHR:B
-0x000040c0 java      var   7 psf  Lcom/ice/tar/TarHeader.sfield_LF_CONTIG:B
-0x000040c8 java      var   8 psf  Lcom/ice/tar/TarHeader.sfield_LF_DIR:B
-0x000040d0 java      var   9 psf  Lcom/ice/tar/TarHeader.sfield_LF_FIFO:B
-0x000040d8 java      var  10 psf  Lcom/ice/tar/TarHeader.sfield_LF_LINK:B
-0x000040e0 java      var  11 psf  Lcom/ice/tar/TarHeader.sfield_LF_NORMAL:B
-0x000040e8 java      var  12 psf  Lcom/ice/tar/TarHeader.sfield_LF_OLDNORM:B
-0x000040f0 java      var  13 psf  Lcom/ice/tar/TarHeader.sfield_LF_SYMLINK:B
-0x000040f8 java      var  14 psf  Lcom/ice/tar/TarHeader.sfield_MAGICLEN:I
-0x00004100 java      var  15 psf  Lcom/ice/tar/TarHeader.sfield_MODELEN:I
-0x00004108 java      var  16 psf  Lcom/ice/tar/TarHeader.sfield_MODTIMELEN:I
-0x00004110 java      var  17 psf  Lcom/ice/tar/TarHeader.sfield_NAMELEN:I
-0x00004118 java      var  18 psf  Lcom/ice/tar/TarHeader.sfield_NAMEOFFSET:I
-0x00004120 java      var  19 psf  Lcom/ice/tar/TarHeader.sfield_PREFIXLEN:I
-0x00004128 java      var  20 psf  Lcom/ice/tar/TarHeader.sfield_PREFIXOFFSET:I
-0x00004130 java      var  21 psf  Lcom/ice/tar/TarHeader.sfield_SIZELEN:I
-0x00004138 java      var  22 psf  Lcom/ice/tar/TarHeader.sfield_TMAGIC:Ljava/lang/String
-0x00004140 java      var  23 psf  Lcom/ice/tar/TarHeader.sfield_UIDLEN:I
-0x00004148 java      var  24 psf  Lcom/ice/tar/TarHeader.sfield_UNAMELEN:I
+0x00004088 java      var   0 spf  Lcom/ice/tar/TarHeader.sfield_CHKSUMLEN:I
+0x00004090 java      var   1 spf  Lcom/ice/tar/TarHeader.sfield_DEVLEN:I
+0x00004098 java      var   2 spf  Lcom/ice/tar/TarHeader.sfield_GIDLEN:I
+0x000040a0 java      var   3 spf  Lcom/ice/tar/TarHeader.sfield_GNAMELEN:I
+0x000040a8 java      var   4 spf  Lcom/ice/tar/TarHeader.sfield_GNU_TMAGIC:Ljava/lang/String
+0x000040b0 java      var   5 spf  Lcom/ice/tar/TarHeader.sfield_LF_BLK:B
+0x000040b8 java      var   6 spf  Lcom/ice/tar/TarHeader.sfield_LF_CHR:B
+0x000040c0 java      var   7 spf  Lcom/ice/tar/TarHeader.sfield_LF_CONTIG:B
+0x000040c8 java      var   8 spf  Lcom/ice/tar/TarHeader.sfield_LF_DIR:B
+0x000040d0 java      var   9 spf  Lcom/ice/tar/TarHeader.sfield_LF_FIFO:B
+0x000040d8 java      var  10 spf  Lcom/ice/tar/TarHeader.sfield_LF_LINK:B
+0x000040e0 java      var  11 spf  Lcom/ice/tar/TarHeader.sfield_LF_NORMAL:B
+0x000040e8 java      var  12 spf  Lcom/ice/tar/TarHeader.sfield_LF_OLDNORM:B
+0x000040f0 java      var  13 spf  Lcom/ice/tar/TarHeader.sfield_LF_SYMLINK:B
+0x000040f8 java      var  14 spf  Lcom/ice/tar/TarHeader.sfield_MAGICLEN:I
+0x00004100 java      var  15 spf  Lcom/ice/tar/TarHeader.sfield_MODELEN:I
+0x00004108 java      var  16 spf  Lcom/ice/tar/TarHeader.sfield_MODTIMELEN:I
+0x00004110 java      var  17 spf  Lcom/ice/tar/TarHeader.sfield_NAMELEN:I
+0x00004118 java      var  18 spf  Lcom/ice/tar/TarHeader.sfield_NAMEOFFSET:I
+0x00004120 java      var  19 spf  Lcom/ice/tar/TarHeader.sfield_PREFIXLEN:I
+0x00004128 java      var  20 spf  Lcom/ice/tar/TarHeader.sfield_PREFIXOFFSET:I
+0x00004130 java      var  21 spf  Lcom/ice/tar/TarHeader.sfield_SIZELEN:I
+0x00004138 java      var  22 spf  Lcom/ice/tar/TarHeader.sfield_TMAGIC:Ljava/lang/String
+0x00004140 java      var  23 spf  Lcom/ice/tar/TarHeader.sfield_UIDLEN:I
+0x00004148 java      var  24 spf  Lcom/ice/tar/TarHeader.sfield_UNAMELEN:I
 0x00004150 java      var  25 p    Lcom/ice/tar/TarHeader.ifield_checkSum:I
 0x00004158 java      var  26 p    Lcom/ice/tar/TarHeader.ifield_devMajor:I
 0x00004160 java      var  27 p    Lcom/ice/tar/TarHeader.ifield_devMinor:I
@@ -782,10 +782,10 @@ EXPECT=<<EOF
 0x00010480 java   method   2 p    Lcom/ice/tar/TarTransFileTyper.method.isAsciiFile(Ljava/lang/String;)Z
 0x00007a10 [0x00010494 - 0x0001049c]      8 java class 12 Lcom/stericson/RootTools/BuildConfig :: Ljava/lang/Object;
 0x00010494 java   method   0 pC   Lcom/stericson/RootTools/BuildConfig.method.<init>()V
-0x000042c8 java      var   0 psf  Lcom/stericson/RootTools/BuildConfig.sfield_DEBUG:Z
+0x000042c8 java      var   0 spf  Lcom/stericson/RootTools/BuildConfig.sfield_DEBUG:Z
 0x00007a30 [0x0000a41b - 0x000107c0]  25509 java class 13 Lcom/stericson/RootTools/Command :: Ljava/lang/Object;
-0x000104ac java   method   0 pCg  Lcom/stericson/RootTools/Command.method.<init>(II[Ljava/lang/String;)V
-0x000104e4 java   method   1 pCg  Lcom/stericson/RootTools/Command.method.<init>(I[Ljava/lang/String;)V
+0x000104ac java   method   0 pgC  Lcom/stericson/RootTools/Command.method.<init>(II[Ljava/lang/String;)V
+0x000104e4 java   method   1 pgC  Lcom/stericson/RootTools/Command.method.<init>(I[Ljava/lang/String;)V
 0x00010518 java   method   2 p    Lcom/stericson/RootTools/Command.method.commandFinished(I)V
 0x0001055c java   method   3 p    Lcom/stericson/RootTools/Command.method.exitCode()I
 0x00010590 java   method   4 p    Lcom/stericson/RootTools/Command.method.exitCode(I)I
@@ -833,34 +833,34 @@ EXPECT=<<EOF
 0x00011410 java   method   0 pC   Lcom/stericson/RootTools/Installer.method.<init>(Landroid/content/Context;)V
 0x00011440 java   method   1 r    Lcom/stericson/RootTools/Installer.method.installBinary(ILjava/lang/String;Ljava/lang/String;)Z
 0x00011814 java   method   2 r    Lcom/stericson/RootTools/Installer.method.isBinaryInstalled(Ljava/lang/String;)Z
-0x00004340 java      var   0 Psf  Lcom/stericson/RootTools/Installer.sfield_BOGUS_FILE_NAME:Ljava/lang/String
-0x00004348 java      var   1 Psf  Lcom/stericson/RootTools/Installer.sfield_LOG_TAG:Ljava/lang/String
+0x00004340 java      var   0 sPf  Lcom/stericson/RootTools/Installer.sfield_BOGUS_FILE_NAME:Ljava/lang/String
+0x00004348 java      var   1 sPf  Lcom/stericson/RootTools/Installer.sfield_LOG_TAG:Ljava/lang/String
 0x00004350 java      var   2 P    Lcom/stericson/RootTools/Installer.ifield_context:Landroid/content/Context
 0x00004358 java      var   3 P    Lcom/stericson/RootTools/Installer.ifield_filesPath:Ljava/lang/String
 0x00007ad0 [0x00011874 - 0x0001399c]   8488 java class 18 Lcom/stericson/RootTools/InternalMethods :: Ljava/lang/Object;
 0x00011874 java   method   0 C    Lcom/stericson/RootTools/InternalMethods.method.<init>()V
 0x0001188c java   method   1 s    Lcom/stericson/RootTools/InternalMethods.method.checkUtil(Ljava/lang/String;)Z
-0x000119c8 java   method   2 ps   Lcom/stericson/RootTools/InternalMethods.method.copyFile(Ljava/lang/String;Ljava/lang/String;ZZ)Z
-0x00011cf0 java   method   3 ps   Lcom/stericson/RootTools/InternalMethods.method.exists(Ljava/lang/String;)Z
+0x000119c8 java   method   2 sp   Lcom/stericson/RootTools/InternalMethods.method.copyFile(Ljava/lang/String;Ljava/lang/String;ZZ)Z
+0x00011cf0 java   method   3 sp   Lcom/stericson/RootTools/InternalMethods.method.exists(Ljava/lang/String;)Z
 0x00011e5c java   method   4 s    Lcom/stericson/RootTools/InternalMethods.method.findBinary(Ljava/lang/String;)Z
-0x00012188 java   method   5 ps   Lcom/stericson/RootTools/InternalMethods.method.fixUtil(Ljava/lang/String;Ljava/lang/String;)V
+0x00012188 java   method   5 sp   Lcom/stericson/RootTools/InternalMethods.method.fixUtil(Ljava/lang/String;Ljava/lang/String;)V
 0x00012324 java   method   6 s    Lcom/stericson/RootTools/InternalMethods.method.fixUtils([Ljava/lang/String;)Z
 0x000123b0 java   method   7 s    Lcom/stericson/RootTools/InternalMethods.method.getBusyBoxApplets(Ljava/lang/String;)Ljava/util/List;
 0x0001245c java   method   8 s    Lcom/stericson/RootTools/InternalMethods.method.getBusyBoxVersion(Ljava/lang/String;)Ljava/lang/String;
 0x00012540 java   method   9 s    Lcom/stericson/RootTools/InternalMethods.method.getFilePermissionsSymlinks(Ljava/lang/String;)Lcom/stericson/RootTools/Permissions;
 0x00012690 java   method  10 s    Lcom/stericson/RootTools/InternalMethods.method.getInode(Ljava/lang/String;)Ljava/lang/String;
 0x0001270c java   method  11 s    Lcom/stericson/RootTools/InternalMethods.method.getMountedAs(Ljava/lang/String;)Ljava/lang/String;
-0x000127c4 java   method  12 rs   Lcom/stericson/RootTools/InternalMethods.method.getMounts()Ljava/util/ArrayList;
+0x000127c4 java   method  12 sr   Lcom/stericson/RootTools/InternalMethods.method.getMounts()Ljava/util/ArrayList;
 0x00012874 java   method  13 s    Lcom/stericson/RootTools/InternalMethods.method.getPath()Ljava/util/Set;
 0x000128bc java   method  14 s    Lcom/stericson/RootTools/InternalMethods.method.getSpace(Ljava/lang/String;)J
 0x00012a3c java   method  15 s    Lcom/stericson/RootTools/InternalMethods.method.getSymlink(Ljava/lang/String;)Ljava/lang/String;
 0x00012bf0 java   method  16 s    Lcom/stericson/RootTools/InternalMethods.method.getSymlinks(Ljava/lang/String;)Ljava/util/ArrayList;
 0x00012ca0 java   method  17 s    Lcom/stericson/RootTools/InternalMethods.method.getWorkingToolbox()Ljava/lang/String;
-0x00012ce4 java   method  18 ps   Lcom/stericson/RootTools/InternalMethods.method.hasEnoughSpaceOnSdCard(J)Z
-0x00012d58 java   method  19 ps   Lcom/stericson/RootTools/InternalMethods.method.hasUtil(Ljava/lang/String;Ljava/lang/String;)Z
+0x00012ce4 java   method  18 sp   Lcom/stericson/RootTools/InternalMethods.method.hasEnoughSpaceOnSdCard(J)Z
+0x00012d58 java   method  19 sp   Lcom/stericson/RootTools/InternalMethods.method.hasUtil(Ljava/lang/String;Ljava/lang/String;)Z
 0x00012ec0 java   method  20 s    Lcom/stericson/RootTools/InternalMethods.method.installBinary(Landroid/content/Context;ILjava/lang/String;Ljava/lang/String;)Z
 0x00012f08 java   method  21 s    Lcom/stericson/RootTools/InternalMethods.method.isAccessGiven()Z
-0x00012fa4 java   method  22 ps   Lcom/stericson/RootTools/InternalMethods.method.isAppletAvailable(Ljava/lang/String;Ljava/lang/String;)Z
+0x00012fa4 java   method  22 sp   Lcom/stericson/RootTools/InternalMethods.method.isAppletAvailable(Ljava/lang/String;Ljava/lang/String;)Z
 0x00013014 java   method  23 s    Lcom/stericson/RootTools/InternalMethods.method.isNativeToolsReady(ILandroid/content/Context;)Z
 0x00013094 java   method  24 s    Lcom/stericson/RootTools/InternalMethods.method.isProcessRunning(Ljava/lang/String;)Z
 0x0001312c java   method  25 s    Lcom/stericson/RootTools/InternalMethods.method.killProcess(Ljava/lang/String;)Z
@@ -877,29 +877,29 @@ EXPECT=<<EOF
 0x00007af0 [0x000139e0 - 0x00013a5c]    124 java class 19 Lcom/stericson/RootTools/InternalVariables :: Ljava/lang/Object;
 0x000139e0 java   method   0 sC   Lcom/stericson/RootTools/InternalVariables.method.<clinit>()V
 0x00013a54 java   method   1 C    Lcom/stericson/RootTools/InternalVariables.method.<init>()V
-0x000043a0 java      var   0 rs   Lcom/stericson/RootTools/InternalVariables.sfield_BBA:I
-0x000043a8 java      var   1 rs   Lcom/stericson/RootTools/InternalVariables.sfield_BBV:I
-0x000043b0 java      var   2 rs   Lcom/stericson/RootTools/InternalVariables.sfield_FPS:I
-0x000043b8 java      var   3 rs   Lcom/stericson/RootTools/InternalVariables.sfield_GI:I
-0x000043c0 java      var   4 rs   Lcom/stericson/RootTools/InternalVariables.sfield_GS:I
-0x000043c8 java      var   5 rs   Lcom/stericson/RootTools/InternalVariables.sfield_GSYM:I
-0x000043d0 java      var   6 rs   Lcom/stericson/RootTools/InternalVariables.sfield_IAG:I
-0x000043d8 java      var   7 rsf  Lcom/stericson/RootTools/InternalVariables.sfield_PS_REGEX:Ljava/lang/String
-0x000043e0 java      var   8 rs   Lcom/stericson/RootTools/InternalVariables.sfield_TAG:Ljava/lang/String
-0x000043e8 java      var   9 rs   Lcom/stericson/RootTools/InternalVariables.sfield_accessGiven:Z
-0x000043f0 java      var  10 rs   Lcom/stericson/RootTools/InternalVariables.sfield_busyboxVersion:Ljava/lang/String
-0x000043f8 java      var  11 rs   Lcom/stericson/RootTools/InternalVariables.sfield_found:Z
-0x00004400 java      var  12 rs   Lcom/stericson/RootTools/InternalVariables.sfield_getSpaceFor:Ljava/lang/String
-0x00004408 java      var  13 rs   Lcom/stericson/RootTools/InternalVariables.sfield_inode:Ljava/lang/String
-0x00004410 java      var  14 rs   Lcom/stericson/RootTools/InternalVariables.sfield_mounts:Ljava/util/ArrayList
-0x00004418 java      var  15 rs   Lcom/stericson/RootTools/InternalVariables.sfield_nativeToolsReady:Z
-0x00004420 java      var  16 rs   Lcom/stericson/RootTools/InternalVariables.sfield_path:Ljava/util/Set
-0x00004428 java      var  17 rs   Lcom/stericson/RootTools/InternalVariables.sfield_permissions:Lcom/stericson/RootTools/Permissions
-0x00004430 java      var  18 rs   Lcom/stericson/RootTools/InternalVariables.sfield_psPattern:Ljava/util/regex/Pattern
-0x00004438 java      var  19 rs   Lcom/stericson/RootTools/InternalVariables.sfield_results:Ljava/util/List
-0x00004440 java      var  20 rs   Lcom/stericson/RootTools/InternalVariables.sfield_space:[Ljava/lang/String
-0x00004448 java      var  21 rs   Lcom/stericson/RootTools/InternalVariables.sfield_symlinks:Ljava/util/ArrayList
-0x00004450 java      var  22 rs   Lcom/stericson/RootTools/InternalVariables.sfield_timeout:I
+0x000043a0 java      var   0 sr   Lcom/stericson/RootTools/InternalVariables.sfield_BBA:I
+0x000043a8 java      var   1 sr   Lcom/stericson/RootTools/InternalVariables.sfield_BBV:I
+0x000043b0 java      var   2 sr   Lcom/stericson/RootTools/InternalVariables.sfield_FPS:I
+0x000043b8 java      var   3 sr   Lcom/stericson/RootTools/InternalVariables.sfield_GI:I
+0x000043c0 java      var   4 sr   Lcom/stericson/RootTools/InternalVariables.sfield_GS:I
+0x000043c8 java      var   5 sr   Lcom/stericson/RootTools/InternalVariables.sfield_GSYM:I
+0x000043d0 java      var   6 sr   Lcom/stericson/RootTools/InternalVariables.sfield_IAG:I
+0x000043d8 java      var   7 srf  Lcom/stericson/RootTools/InternalVariables.sfield_PS_REGEX:Ljava/lang/String
+0x000043e0 java      var   8 sr   Lcom/stericson/RootTools/InternalVariables.sfield_TAG:Ljava/lang/String
+0x000043e8 java      var   9 sr   Lcom/stericson/RootTools/InternalVariables.sfield_accessGiven:Z
+0x000043f0 java      var  10 sr   Lcom/stericson/RootTools/InternalVariables.sfield_busyboxVersion:Ljava/lang/String
+0x000043f8 java      var  11 sr   Lcom/stericson/RootTools/InternalVariables.sfield_found:Z
+0x00004400 java      var  12 sr   Lcom/stericson/RootTools/InternalVariables.sfield_getSpaceFor:Ljava/lang/String
+0x00004408 java      var  13 sr   Lcom/stericson/RootTools/InternalVariables.sfield_inode:Ljava/lang/String
+0x00004410 java      var  14 sr   Lcom/stericson/RootTools/InternalVariables.sfield_mounts:Ljava/util/ArrayList
+0x00004418 java      var  15 sr   Lcom/stericson/RootTools/InternalVariables.sfield_nativeToolsReady:Z
+0x00004420 java      var  16 sr   Lcom/stericson/RootTools/InternalVariables.sfield_path:Ljava/util/Set
+0x00004428 java      var  17 sr   Lcom/stericson/RootTools/InternalVariables.sfield_permissions:Lcom/stericson/RootTools/Permissions
+0x00004430 java      var  18 sr   Lcom/stericson/RootTools/InternalVariables.sfield_psPattern:Ljava/util/regex/Pattern
+0x00004438 java      var  19 sr   Lcom/stericson/RootTools/InternalVariables.sfield_results:Ljava/util/List
+0x00004440 java      var  20 sr   Lcom/stericson/RootTools/InternalVariables.sfield_space:[Ljava/lang/String
+0x00004448 java      var  21 sr   Lcom/stericson/RootTools/InternalVariables.sfield_symlinks:Ljava/util/ArrayList
+0x00004450 java      var  22 sr   Lcom/stericson/RootTools/InternalVariables.sfield_timeout:I
 0x00007b10 [0x00013a6c - 0x00013b50]    228 java class 20 Lcom/stericson/RootTools/Mount :: Ljava/lang/Object;
 0x00013a6c java   method   0 C    Lcom/stericson/RootTools/Mount.method.<init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
 0x00013ab4 java   method   1 p    Lcom/stericson/RootTools/Mount.method.getDevice()Ljava/io/File;
@@ -938,73 +938,73 @@ EXPECT=<<EOF
 0x00007b70 [0x00014170 - 0x0001481a]   1706 java class 23 Lcom/stericson/RootTools/RootTools :: Ljava/lang/Object;
 0x00014170 java   method   0 sC   Lcom/stericson/RootTools/RootTools.method.<clinit>()V
 0x000141a8 java   method   1 pC   Lcom/stericson/RootTools/RootTools.method.<init>()V
-0x000141c0 java   method   2 ps   Lcom/stericson/RootTools/RootTools.method.checkUtil(Ljava/lang/String;)Z
-0x000141dc java   method   3 ps   Lcom/stericson/RootTools/RootTools.method.closeAllShells()V
-0x000141f4 java   method   4 ps   Lcom/stericson/RootTools/RootTools.method.closeCustomShell()V
-0x0001420c java   method   5 ps   Lcom/stericson/RootTools/RootTools.method.closeShell(Z)V
-0x00014230 java   method   6 ps   Lcom/stericson/RootTools/RootTools.method.copyFile(Ljava/lang/String;Ljava/lang/String;ZZ)Z
-0x0001424c java   method   7 ps   Lcom/stericson/RootTools/RootTools.method.exists(Ljava/lang/String;)Z
-0x00014268 java   method   8 ps   Lcom/stericson/RootTools/RootTools.method.findBinary(Ljava/lang/String;)Z
-0x00014284 java   method   9 ps   Lcom/stericson/RootTools/RootTools.method.fixUtil(Ljava/lang/String;Ljava/lang/String;)V
-0x0001429c java   method  10 ps   Lcom/stericson/RootTools/RootTools.method.fixUtils([Ljava/lang/String;)Z
-0x000142b8 java   method  11 ps   Lcom/stericson/RootTools/RootTools.method.getBusyBoxApplets()Ljava/util/List;
-0x000142d8 java   method  12 ps   Lcom/stericson/RootTools/RootTools.method.getBusyBoxApplets(Ljava/lang/String;)Ljava/util/List;
-0x000142f4 java   method  13 ps   Lcom/stericson/RootTools/RootTools.method.getBusyBoxVersion()Ljava/lang/String;
-0x00014314 java   method  14 ps   Lcom/stericson/RootTools/RootTools.method.getBusyBoxVersion(Ljava/lang/String;)Ljava/lang/String;
-0x00014330 java   method  15 ps   Lcom/stericson/RootTools/RootTools.method.getCustomShell(Ljava/lang/String;)Lcom/stericson/RootTools/Shell;
-0x0001434c java   method  16 ps   Lcom/stericson/RootTools/RootTools.method.getFilePermissionsSymlinks(Ljava/lang/String;)Lcom/stericson/RootTools/Permissions;
-0x00014368 java   method  17 ps   Lcom/stericson/RootTools/RootTools.method.getInode(Ljava/lang/String;)Ljava/lang/String;
-0x00014384 java   method  18 ps   Lcom/stericson/RootTools/RootTools.method.getMountedAs(Ljava/lang/String;)Ljava/lang/String;
-0x000143a0 java   method  19 ps   Lcom/stericson/RootTools/RootTools.method.getMounts()Ljava/util/ArrayList;
-0x000143bc java   method  20 ps   Lcom/stericson/RootTools/RootTools.method.getPath()Ljava/util/Set;
-0x000143d8 java   method  21 ps   Lcom/stericson/RootTools/RootTools.method.getShell(Z)Lcom/stericson/RootTools/Shell;
-0x00014400 java   method  22 ps   Lcom/stericson/RootTools/RootTools.method.getSpace(Ljava/lang/String;)J
-0x0001441c java   method  23 ps   Lcom/stericson/RootTools/RootTools.method.getSymlink(Ljava/lang/String;)Ljava/lang/String;
-0x00014438 java   method  24 ps   Lcom/stericson/RootTools/RootTools.method.getSymlinks(Ljava/lang/String;)Ljava/util/ArrayList;
-0x00014454 java   method  25 ps   Lcom/stericson/RootTools/RootTools.method.getWorkingToolbox()Ljava/lang/String;
-0x00014470 java   method  26 ps   Lcom/stericson/RootTools/RootTools.method.hasEnoughSpaceOnSdCard(J)Z
-0x0001448c java   method  27 ps   Lcom/stericson/RootTools/RootTools.method.hasUtil(Ljava/lang/String;Ljava/lang/String;)Z
-0x000144a8 java   method  28 ps   Lcom/stericson/RootTools/RootTools.method.installBinary(Landroid/content/Context;ILjava/lang/String;)Z
-0x000144c8 java   method  29 ps   Lcom/stericson/RootTools/RootTools.method.installBinary(Landroid/content/Context;ILjava/lang/String;Ljava/lang/String;)Z
-0x000144e4 java   method  30 ps   Lcom/stericson/RootTools/RootTools.method.isAccessGiven()Z
-0x00014500 java   method  31 ps   Lcom/stericson/RootTools/RootTools.method.isAppletAvailable(Ljava/lang/String;)Z
-0x00014520 java   method  32 ps   Lcom/stericson/RootTools/RootTools.method.isAppletAvailable(Ljava/lang/String;Ljava/lang/String;)Z
-0x0001453c java   method  33 ps   Lcom/stericson/RootTools/RootTools.method.isBusyboxAvailable()Z
-0x0001455c java   method  34 ps   Lcom/stericson/RootTools/RootTools.method.isNativeToolsReady(ILandroid/content/Context;)Z
-0x00014578 java   method  35 ps   Lcom/stericson/RootTools/RootTools.method.isProcessRunning(Ljava/lang/String;)Z
-0x00014594 java   method  36 ps   Lcom/stericson/RootTools/RootTools.method.isRootAvailable()Z
-0x000145b4 java   method  37 ps   Lcom/stericson/RootTools/RootTools.method.killProcess(Ljava/lang/String;)Z
-0x000145d0 java   method  38 ps   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;)V
-0x000145ec java   method  39 ps   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;ILjava/lang/Exception;)V
-0x00014608 java   method  40 ps   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;Ljava/lang/String;)V
-0x00014624 java   method  41 ps   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;Ljava/lang/String;ILjava/lang/Exception;)V
-0x0001468c java   method  42 ps   Lcom/stericson/RootTools/RootTools.method.offerBusyBox(Landroid/app/Activity;I)Landroid/content/Intent;
-0x000146a8 java   method  43 ps   Lcom/stericson/RootTools/RootTools.method.offerBusyBox(Landroid/app/Activity;)V
-0x000146c0 java   method  44 ps   Lcom/stericson/RootTools/RootTools.method.offerSuperUser(Landroid/app/Activity;I)Landroid/content/Intent;
-0x000146dc java   method  45 ps   Lcom/stericson/RootTools/RootTools.method.offerSuperUser(Landroid/app/Activity;)V
-0x000146f4 java   method  46 ps   Lcom/stericson/RootTools/RootTools.method.remount(Ljava/lang/String;Ljava/lang/String;)Z
-0x00014718 java   method  47 ps   Lcom/stericson/RootTools/RootTools.method.restartAndroid()V
-0x00014740 java   method  48 ps   Lcom/stericson/RootTools/RootTools.method.runBinary(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
-0x00014764 java   method  49 ps   Lcom/stericson/RootTools/RootTools.method.runShellCommand(Lcom/stericson/RootTools/Shell;Lcom/stericson/RootTools/Command;)V
-0x0001477c java   method  50 ps   Lcom/stericson/RootTools/RootTools.method.sendShell(Ljava/lang/String;I)Ljava/util/List;
-0x00014798 java   method  51 ps   Lcom/stericson/RootTools/RootTools.method.sendShell(Ljava/lang/String;Lcom/stericson/RootTools/RootTools$Result;I)Ljava/util/List;
-0x000147c0 java   method  52 ps   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;II)Ljava/util/List;
-0x000147dc java   method  53 ps   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;ILcom/stericson/RootTools/RootTools$Result;I)Ljava/util/List;
-0x000147fc java   method  54 ps   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;ILcom/stericson/RootTools/RootTools$Result;ZI)Ljava/util/List;
-0x000044c0 java      var   0 ps   Lcom/stericson/RootTools/RootTools.sfield_customShell:Ljava/lang/String
-0x000044c8 java      var   1 ps   Lcom/stericson/RootTools/RootTools.sfield_debugMode:Z
-0x000044d0 java      var   2 ps   Lcom/stericson/RootTools/RootTools.sfield_lastExitCode:I
-0x000044d8 java      var   3 ps   Lcom/stericson/RootTools/RootTools.sfield_lastFoundBinaryPaths:Ljava/util/List
-0x000044e0 java      var   4 ps   Lcom/stericson/RootTools/RootTools.sfield_shellDelay:I
-0x000044e8 java      var   5 ps   Lcom/stericson/RootTools/RootTools.sfield_useRoot:Z
-0x000044f0 java      var   6 ps   Lcom/stericson/RootTools/RootTools.sfield_utilPath:Ljava/lang/String
+0x000141c0 java   method   2 sp   Lcom/stericson/RootTools/RootTools.method.checkUtil(Ljava/lang/String;)Z
+0x000141dc java   method   3 sp   Lcom/stericson/RootTools/RootTools.method.closeAllShells()V
+0x000141f4 java   method   4 sp   Lcom/stericson/RootTools/RootTools.method.closeCustomShell()V
+0x0001420c java   method   5 sp   Lcom/stericson/RootTools/RootTools.method.closeShell(Z)V
+0x00014230 java   method   6 sp   Lcom/stericson/RootTools/RootTools.method.copyFile(Ljava/lang/String;Ljava/lang/String;ZZ)Z
+0x0001424c java   method   7 sp   Lcom/stericson/RootTools/RootTools.method.exists(Ljava/lang/String;)Z
+0x00014268 java   method   8 sp   Lcom/stericson/RootTools/RootTools.method.findBinary(Ljava/lang/String;)Z
+0x00014284 java   method   9 sp   Lcom/stericson/RootTools/RootTools.method.fixUtil(Ljava/lang/String;Ljava/lang/String;)V
+0x0001429c java   method  10 sp   Lcom/stericson/RootTools/RootTools.method.fixUtils([Ljava/lang/String;)Z
+0x000142b8 java   method  11 sp   Lcom/stericson/RootTools/RootTools.method.getBusyBoxApplets()Ljava/util/List;
+0x000142d8 java   method  12 sp   Lcom/stericson/RootTools/RootTools.method.getBusyBoxApplets(Ljava/lang/String;)Ljava/util/List;
+0x000142f4 java   method  13 sp   Lcom/stericson/RootTools/RootTools.method.getBusyBoxVersion()Ljava/lang/String;
+0x00014314 java   method  14 sp   Lcom/stericson/RootTools/RootTools.method.getBusyBoxVersion(Ljava/lang/String;)Ljava/lang/String;
+0x00014330 java   method  15 sp   Lcom/stericson/RootTools/RootTools.method.getCustomShell(Ljava/lang/String;)Lcom/stericson/RootTools/Shell;
+0x0001434c java   method  16 sp   Lcom/stericson/RootTools/RootTools.method.getFilePermissionsSymlinks(Ljava/lang/String;)Lcom/stericson/RootTools/Permissions;
+0x00014368 java   method  17 sp   Lcom/stericson/RootTools/RootTools.method.getInode(Ljava/lang/String;)Ljava/lang/String;
+0x00014384 java   method  18 sp   Lcom/stericson/RootTools/RootTools.method.getMountedAs(Ljava/lang/String;)Ljava/lang/String;
+0x000143a0 java   method  19 sp   Lcom/stericson/RootTools/RootTools.method.getMounts()Ljava/util/ArrayList;
+0x000143bc java   method  20 sp   Lcom/stericson/RootTools/RootTools.method.getPath()Ljava/util/Set;
+0x000143d8 java   method  21 sp   Lcom/stericson/RootTools/RootTools.method.getShell(Z)Lcom/stericson/RootTools/Shell;
+0x00014400 java   method  22 sp   Lcom/stericson/RootTools/RootTools.method.getSpace(Ljava/lang/String;)J
+0x0001441c java   method  23 sp   Lcom/stericson/RootTools/RootTools.method.getSymlink(Ljava/lang/String;)Ljava/lang/String;
+0x00014438 java   method  24 sp   Lcom/stericson/RootTools/RootTools.method.getSymlinks(Ljava/lang/String;)Ljava/util/ArrayList;
+0x00014454 java   method  25 sp   Lcom/stericson/RootTools/RootTools.method.getWorkingToolbox()Ljava/lang/String;
+0x00014470 java   method  26 sp   Lcom/stericson/RootTools/RootTools.method.hasEnoughSpaceOnSdCard(J)Z
+0x0001448c java   method  27 sp   Lcom/stericson/RootTools/RootTools.method.hasUtil(Ljava/lang/String;Ljava/lang/String;)Z
+0x000144a8 java   method  28 sp   Lcom/stericson/RootTools/RootTools.method.installBinary(Landroid/content/Context;ILjava/lang/String;)Z
+0x000144c8 java   method  29 sp   Lcom/stericson/RootTools/RootTools.method.installBinary(Landroid/content/Context;ILjava/lang/String;Ljava/lang/String;)Z
+0x000144e4 java   method  30 sp   Lcom/stericson/RootTools/RootTools.method.isAccessGiven()Z
+0x00014500 java   method  31 sp   Lcom/stericson/RootTools/RootTools.method.isAppletAvailable(Ljava/lang/String;)Z
+0x00014520 java   method  32 sp   Lcom/stericson/RootTools/RootTools.method.isAppletAvailable(Ljava/lang/String;Ljava/lang/String;)Z
+0x0001453c java   method  33 sp   Lcom/stericson/RootTools/RootTools.method.isBusyboxAvailable()Z
+0x0001455c java   method  34 sp   Lcom/stericson/RootTools/RootTools.method.isNativeToolsReady(ILandroid/content/Context;)Z
+0x00014578 java   method  35 sp   Lcom/stericson/RootTools/RootTools.method.isProcessRunning(Ljava/lang/String;)Z
+0x00014594 java   method  36 sp   Lcom/stericson/RootTools/RootTools.method.isRootAvailable()Z
+0x000145b4 java   method  37 sp   Lcom/stericson/RootTools/RootTools.method.killProcess(Ljava/lang/String;)Z
+0x000145d0 java   method  38 sp   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;)V
+0x000145ec java   method  39 sp   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;ILjava/lang/Exception;)V
+0x00014608 java   method  40 sp   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;Ljava/lang/String;)V
+0x00014624 java   method  41 sp   Lcom/stericson/RootTools/RootTools.method.log(Ljava/lang/String;Ljava/lang/String;ILjava/lang/Exception;)V
+0x0001468c java   method  42 sp   Lcom/stericson/RootTools/RootTools.method.offerBusyBox(Landroid/app/Activity;I)Landroid/content/Intent;
+0x000146a8 java   method  43 sp   Lcom/stericson/RootTools/RootTools.method.offerBusyBox(Landroid/app/Activity;)V
+0x000146c0 java   method  44 sp   Lcom/stericson/RootTools/RootTools.method.offerSuperUser(Landroid/app/Activity;I)Landroid/content/Intent;
+0x000146dc java   method  45 sp   Lcom/stericson/RootTools/RootTools.method.offerSuperUser(Landroid/app/Activity;)V
+0x000146f4 java   method  46 sp   Lcom/stericson/RootTools/RootTools.method.remount(Ljava/lang/String;Ljava/lang/String;)Z
+0x00014718 java   method  47 sp   Lcom/stericson/RootTools/RootTools.method.restartAndroid()V
+0x00014740 java   method  48 sp   Lcom/stericson/RootTools/RootTools.method.runBinary(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
+0x00014764 java   method  49 sp   Lcom/stericson/RootTools/RootTools.method.runShellCommand(Lcom/stericson/RootTools/Shell;Lcom/stericson/RootTools/Command;)V
+0x0001477c java   method  50 sp   Lcom/stericson/RootTools/RootTools.method.sendShell(Ljava/lang/String;I)Ljava/util/List;
+0x00014798 java   method  51 sp   Lcom/stericson/RootTools/RootTools.method.sendShell(Ljava/lang/String;Lcom/stericson/RootTools/RootTools$Result;I)Ljava/util/List;
+0x000147c0 java   method  52 sp   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;II)Ljava/util/List;
+0x000147dc java   method  53 sp   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;ILcom/stericson/RootTools/RootTools$Result;I)Ljava/util/List;
+0x000147fc java   method  54 sp   Lcom/stericson/RootTools/RootTools.method.sendShell([Ljava/lang/String;ILcom/stericson/RootTools/RootTools$Result;ZI)Ljava/util/List;
+0x000044c0 java      var   0 sp   Lcom/stericson/RootTools/RootTools.sfield_customShell:Ljava/lang/String
+0x000044c8 java      var   1 sp   Lcom/stericson/RootTools/RootTools.sfield_debugMode:Z
+0x000044d0 java      var   2 sp   Lcom/stericson/RootTools/RootTools.sfield_lastExitCode:I
+0x000044d8 java      var   3 sp   Lcom/stericson/RootTools/RootTools.sfield_lastFoundBinaryPaths:Ljava/util/List
+0x000044e0 java      var   4 sp   Lcom/stericson/RootTools/RootTools.sfield_shellDelay:I
+0x000044e8 java      var   5 sp   Lcom/stericson/RootTools/RootTools.sfield_useRoot:Z
+0x000044f0 java      var   6 sp   Lcom/stericson/RootTools/RootTools.sfield_utilPath:Ljava/lang/String
 0x00007b90 [0x0001482c - 0x00014834]      8 java class 24 Lcom/stericson/RootTools/RootToolsException :: Ljava/lang/Exception;
 0x0001482c java   method   0 pC   Lcom/stericson/RootTools/RootToolsException.method.<init>(Ljava/lang/Throwable;)V
-0x000044f8 java      var   0 Psf  Lcom/stericson/RootTools/RootToolsException.sfield_serialVersionUID:J
+0x000044f8 java      var   0 sPf  Lcom/stericson/RootTools/RootToolsException.sfield_serialVersionUID:J
 0x00007bb0 [0x00014844 - 0x0001491e]    218 java class 25 Lcom/stericson/RootTools/Runner :: Ljava/lang/Thread;
 0x00014844 java   method   0 pC   Lcom/stericson/RootTools/Runner.method.<init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 0x00014868 java   method   1 p    Lcom/stericson/RootTools/Runner.method.run()V
-0x00004500 java      var   0 Psf  Lcom/stericson/RootTools/Runner.sfield_LOG_TAG:Ljava/lang/String
+0x00004500 java      var   0 sPf  Lcom/stericson/RootTools/Runner.sfield_LOG_TAG:Ljava/lang/String
 0x00004508 java      var   1      Lcom/stericson/RootTools/Runner.ifield_binaryName:Ljava/lang/String
 0x00004510 java      var   2      Lcom/stericson/RootTools/Runner.ifield_context:Landroid/content/Context
 0x00004518 java      var   3      Lcom/stericson/RootTools/Runner.ifield_parameter:Ljava/lang/String
@@ -1023,12 +1023,12 @@ EXPECT=<<EOF
 0x00015478 java   method   0 PC   Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.method.<init>(Lcom/stericson/RootTools/SanityCheckRootTools;)V
 0x00015494 java   method   1 hC   Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.method.<init>(Lcom/stericson/RootTools/SanityCheckRootTools;Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler;)V
 0x000154ac java   method   2 p    Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.method.handleMessage(Landroid/os/Message;)V
-0x00004548 java      var   0 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION:Ljava/lang/String
-0x00004550 java      var   1 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_DISPLAY:I
-0x00004558 java      var   2 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_HIDE:I
-0x00004560 java      var   3 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_PDISPLAY:I
-0x00004568 java      var   4 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_SHOW:I
-0x00004570 java      var   5 psf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_TEXT:Ljava/lang/String
+0x00004548 java      var   0 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION:Ljava/lang/String
+0x00004550 java      var   1 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_DISPLAY:I
+0x00004558 java      var   2 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_HIDE:I
+0x00004560 java      var   3 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_PDISPLAY:I
+0x00004568 java      var   4 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_ACTION_SHOW:I
+0x00004570 java      var   5 spf  Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.sfield_TEXT:Ljava/lang/String
 0x00004578 java      var   6 fh   Lcom/stericson/RootTools/SanityCheckRootTools$TestHandler.ifield_this$0:Lcom/stericson/RootTools/SanityCheckRootTools
 0x00007c30 [0x00015570 - 0x00015740]    464 java class 29 Lcom/stericson/RootTools/SanityCheckRootTools :: Landroid/app/Activity;
 0x00015570 java   method   0 pC   Lcom/stericson/RootTools/SanityCheckRootTools.method.<init>()V
@@ -1062,31 +1062,31 @@ EXPECT=<<EOF
 0x00015ae4 java   method   3 sh   Lcom/stericson/RootTools/Shell.method.access$1(Lcom/stericson/RootTools/Shell;)V
 0x00015afc java   method   4 sh   Lcom/stericson/RootTools/Shell.method.access$2()Ljava/lang/String;
 0x00015b14 java   method   5 sh   Lcom/stericson/RootTools/Shell.method.access$3(Ljava/lang/String;)V
-0x00015b2c java   method   6 ps   Lcom/stericson/RootTools/Shell.method.closeAll()V
-0x00015b50 java   method   7 ps   Lcom/stericson/RootTools/Shell.method.closeCustomShell()V
-0x00015b78 java   method   8 ps   Lcom/stericson/RootTools/Shell.method.closeRootShell()V
-0x00015ba0 java   method   9 ps   Lcom/stericson/RootTools/Shell.method.closeShell()V
-0x00015bc8 java   method  10 ps   Lcom/stericson/RootTools/Shell.method.getOpenShell()Lcom/stericson/RootTools/Shell;
-0x00015bfc java   method  11 ps   Lcom/stericson/RootTools/Shell.method.isAnyShellOpen()Z
-0x00015c2c java   method  12 ps   Lcom/stericson/RootTools/Shell.method.isCustomShellOpen()Z
-0x00015c4c java   method  13 ps   Lcom/stericson/RootTools/Shell.method.isRootShellOpen()Z
-0x00015c6c java   method  14 ps   Lcom/stericson/RootTools/Shell.method.isShellOpen()Z
+0x00015b2c java   method   6 sp   Lcom/stericson/RootTools/Shell.method.closeAll()V
+0x00015b50 java   method   7 sp   Lcom/stericson/RootTools/Shell.method.closeCustomShell()V
+0x00015b78 java   method   8 sp   Lcom/stericson/RootTools/Shell.method.closeRootShell()V
+0x00015ba0 java   method   9 sp   Lcom/stericson/RootTools/Shell.method.closeShell()V
+0x00015bc8 java   method  10 sp   Lcom/stericson/RootTools/Shell.method.getOpenShell()Lcom/stericson/RootTools/Shell;
+0x00015bfc java   method  11 sp   Lcom/stericson/RootTools/Shell.method.isAnyShellOpen()Z
+0x00015c2c java   method  12 sp   Lcom/stericson/RootTools/Shell.method.isCustomShellOpen()Z
+0x00015c4c java   method  13 sp   Lcom/stericson/RootTools/Shell.method.isRootShellOpen()Z
+0x00015c6c java   method  14 sp   Lcom/stericson/RootTools/Shell.method.isShellOpen()Z
 0x00015c8c java   method  15 P    Lcom/stericson/RootTools/Shell.method.readOutput()V
-0x00015dc4 java   method  16 ps   Lcom/stericson/RootTools/Shell.method.runCommand(Lcom/stericson/RootTools/Command;)V
-0x00015de4 java   method  17 ps   Lcom/stericson/RootTools/Shell.method.runRootCommand(Lcom/stericson/RootTools/Command;)V
-0x00015e04 java   method  18 ps   Lcom/stericson/RootTools/Shell.method.startCustomShell(Ljava/lang/String;)Lcom/stericson/RootTools/Shell;
-0x00015e48 java   method  19 ps   Lcom/stericson/RootTools/Shell.method.startRootShell()Lcom/stericson/RootTools/Shell;
-0x00015ec8 java   method  20 ps   Lcom/stericson/RootTools/Shell.method.startShell()Lcom/stericson/RootTools/Shell;
+0x00015dc4 java   method  16 sp   Lcom/stericson/RootTools/Shell.method.runCommand(Lcom/stericson/RootTools/Command;)V
+0x00015de4 java   method  17 sp   Lcom/stericson/RootTools/Shell.method.runRootCommand(Lcom/stericson/RootTools/Command;)V
+0x00015e04 java   method  18 sp   Lcom/stericson/RootTools/Shell.method.startCustomShell(Ljava/lang/String;)Lcom/stericson/RootTools/Shell;
+0x00015e48 java   method  19 sp   Lcom/stericson/RootTools/Shell.method.startRootShell()Lcom/stericson/RootTools/Shell;
+0x00015ec8 java   method  20 sp   Lcom/stericson/RootTools/Shell.method.startShell()Lcom/stericson/RootTools/Shell;
 0x00015f10 java   method  21 P    Lcom/stericson/RootTools/Shell.method.writeCommands()V
 0x00016040 java   method  22 p    Lcom/stericson/RootTools/Shell.method.add(Lcom/stericson/RootTools/Command;)Lcom/stericson/RootTools/Command;
 0x00016098 java   method  23 p    Lcom/stericson/RootTools/Shell.method.close()V
 0x000160fc java   method  24 p    Lcom/stericson/RootTools/Shell.method.countCommands()I
 0x0001611c java   method  25 p    Lcom/stericson/RootTools/Shell.method.waitFor()V
-0x000045d8 java      var   0 Ps   Lcom/stericson/RootTools/Shell.sfield_customShell:Lcom/stericson/RootTools/Shell
-0x000045e0 java      var   1 Ps   Lcom/stericson/RootTools/Shell.sfield_error:Ljava/lang/String
-0x00004610 java      var   2 Ps   Lcom/stericson/RootTools/Shell.sfield_rootShell:Lcom/stericson/RootTools/Shell
-0x00004618 java      var   3 Ps   Lcom/stericson/RootTools/Shell.sfield_shell:Lcom/stericson/RootTools/Shell
-0x00004620 java      var   4 Psf  Lcom/stericson/RootTools/Shell.sfield_token:Ljava/lang/String
+0x000045d8 java      var   0 sP   Lcom/stericson/RootTools/Shell.sfield_customShell:Lcom/stericson/RootTools/Shell
+0x000045e0 java      var   1 sP   Lcom/stericson/RootTools/Shell.sfield_error:Ljava/lang/String
+0x00004610 java      var   2 sP   Lcom/stericson/RootTools/Shell.sfield_rootShell:Lcom/stericson/RootTools/Shell
+0x00004618 java      var   3 sP   Lcom/stericson/RootTools/Shell.sfield_shell:Lcom/stericson/RootTools/Shell
+0x00004620 java      var   4 sPf  Lcom/stericson/RootTools/Shell.sfield_token:Ljava/lang/String
 0x000045c8 java      var   5 P    Lcom/stericson/RootTools/Shell.ifield_close:Z
 0x000045d0 java      var   6 Pf   Lcom/stericson/RootTools/Shell.ifield_commands:Ljava/util/List
 0x000045e8 java      var   7 Pf   Lcom/stericson/RootTools/Shell.ifield_in:Ljava/io/DataInputStream
@@ -1106,7 +1106,7 @@ EXPECT=<<EOF
 0x00016240 java   method   2 p    Lcom/sun/activation/registries/LineTokenizer.method.hasMoreTokens()Z
 0x0001627c java   method   3 p    Lcom/sun/activation/registries/LineTokenizer.method.nextToken()Ljava/lang/String;
 0x0001642c java   method   4 p    Lcom/sun/activation/registries/LineTokenizer.method.pushToken(Ljava/lang/String;)V
-0x00004648 java      var   0 Psf  Lcom/sun/activation/registries/LineTokenizer.sfield_singles:Ljava/lang/String
+0x00004648 java      var   0 sPf  Lcom/sun/activation/registries/LineTokenizer.sfield_singles:Ljava/lang/String
 0x00004638 java      var   1 P    Lcom/sun/activation/registries/LineTokenizer.ifield_currentPosition:I
 0x00004640 java      var   2 P    Lcom/sun/activation/registries/LineTokenizer.ifield_maxPosition:I
 0x00004650 java      var   3 P    Lcom/sun/activation/registries/LineTokenizer.ifield_stack:Ljava/util/Vector
@@ -1126,28 +1126,28 @@ EXPECT=<<EOF
 0x00016620 java   method   4 P    Lcom/sun/activation/registries/MailcapFile.method.createMailcapHash(Ljava/io/Reader;)Ljava/util/Hashtable;
 0x00016644 java   method   5 P    Lcom/sun/activation/registries/MailcapFile.method.mergeResults(Ljava/util/Hashtable;Ljava/util/Hashtable;)Ljava/util/Hashtable;
 0x000166e4 java   method   6 P    Lcom/sun/activation/registries/MailcapFile.method.parse(Ljava/io/Reader;Ljava/util/Hashtable;)V
-0x0001680c java   method   7 rs   Lcom/sun/activation/registries/MailcapFile.method.parseLine(Ljava/lang/String;Ljava/util/Hashtable;)V
-0x00016b9c java   method   8 rs   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IIIILjava/lang/String;)V
-0x00016d00 java   method   9 rs   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IIILjava/lang/String;)V
-0x00016d9c java   method  10 rs   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IILjava/lang/String;)V
+0x0001680c java   method   7 sr   Lcom/sun/activation/registries/MailcapFile.method.parseLine(Ljava/lang/String;Ljava/util/Hashtable;)V
+0x00016b9c java   method   8 sr   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IIIILjava/lang/String;)V
+0x00016d00 java   method   9 sr   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IIILjava/lang/String;)V
+0x00016d9c java   method  10 sr   Lcom/sun/activation/registries/MailcapFile.method.reportParseError(IILjava/lang/String;)V
 0x00016e1c java   method  11 p    Lcom/sun/activation/registries/MailcapFile.method.appendToMailcap(Ljava/lang/String;)V
 0x00016e88 java   method  12 p    Lcom/sun/activation/registries/MailcapFile.method.getMailcapEntry(Ljava/lang/String;)Lcom/sun/activation/registries/MailcapEntry;
 0x00016e9c java   method  13 p    Lcom/sun/activation/registries/MailcapFile.method.getMailcapList(Ljava/lang/String;)Ljava/util/Hashtable;
-0x00004670 java      var   0 Ps   Lcom/sun/activation/registries/MailcapFile.sfield_debug:Z
+0x00004670 java      var   0 sP   Lcom/sun/activation/registries/MailcapFile.sfield_debug:Z
 0x00004678 java      var   1 P    Lcom/sun/activation/registries/MailcapFile.ifield_type_hash:Ljava/util/Hashtable
 0x00007d50 [0x00016f24 - 0x00016f44]     32 java class 38 Lcom/sun/activation/registries/MailcapParseException :: Ljava/lang/Exception;
 0x00016f24 java   method   0 pC   Lcom/sun/activation/registries/MailcapParseException.method.<init>()V
 0x00016f3c java   method   1 pC   Lcom/sun/activation/registries/MailcapParseException.method.<init>(Ljava/lang/String;)V
 0x00007d70 [0x00016f54 - 0x0001774a]   2038 java class 39 Lcom/sun/activation/registries/MailcapTokenizer :: Ljava/lang/Object;
 0x00016f54 java   method   0 pC   Lcom/sun/activation/registries/MailcapTokenizer.method.<init>(Ljava/lang/String;)V
-0x00016f9c java   method   1 Ps   Lcom/sun/activation/registries/MailcapTokenizer.method.fixEscapeSequences(Ljava/lang/String;)Ljava/lang/String;
-0x00017018 java   method   2 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.isAutoquoteSpecialChar(C)Z
-0x0001704c java   method   3 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.isControlChar(C)Z
-0x00017068 java   method   4 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.isSpecialChar(C)Z
-0x00017104 java   method   5 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.isStringTokenChar(C)Z
-0x00017140 java   method   6 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.isWhiteSpaceChar(C)Z
-0x0001715c java   method   7 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.main([Ljava/lang/String;)V
-0x00017420 java   method   8 ps   Lcom/sun/activation/registries/MailcapTokenizer.method.nameForToken(I)Ljava/lang/String;
+0x00016f9c java   method   1 sP   Lcom/sun/activation/registries/MailcapTokenizer.method.fixEscapeSequences(Ljava/lang/String;)Ljava/lang/String;
+0x00017018 java   method   2 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.isAutoquoteSpecialChar(C)Z
+0x0001704c java   method   3 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.isControlChar(C)Z
+0x00017068 java   method   4 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.isSpecialChar(C)Z
+0x00017104 java   method   5 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.isStringTokenChar(C)Z
+0x00017140 java   method   6 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.isWhiteSpaceChar(C)Z
+0x0001715c java   method   7 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.main([Ljava/lang/String;)V
+0x00017420 java   method   8 sp   Lcom/sun/activation/registries/MailcapTokenizer.method.nameForToken(I)Ljava/lang/String;
 0x000174a4 java   method   9 P    Lcom/sun/activation/registries/MailcapTokenizer.method.processAutoquoteToken()V
 0x00017518 java   method  10 P    Lcom/sun/activation/registries/MailcapTokenizer.method.processStringToken()V
 0x00017580 java   method  11 p    Lcom/sun/activation/registries/MailcapTokenizer.method.getCurrentToken()I
@@ -1155,13 +1155,13 @@ EXPECT=<<EOF
 0x000175b0 java   method  13 p    Lcom/sun/activation/registries/MailcapTokenizer.method.nextToken()I
 0x0001772c java   method  14 p    Lcom/sun/activation/registries/MailcapTokenizer.method.setAutoquoteChar(C)V
 0x00017744 java   method  15 p    Lcom/sun/activation/registries/MailcapTokenizer.method.setIsAutoquoting(Z)V
-0x00004680 java      var   0 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_EOI_TOKEN:I
-0x00004688 java      var   1 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_EQUALS_TOKEN:I
-0x00004690 java      var   2 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_SEMICOLON_TOKEN:I
-0x00004698 java      var   3 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_SLASH_TOKEN:I
-0x000046a0 java      var   4 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_START_TOKEN:I
-0x000046a8 java      var   5 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_STRING_TOKEN:I
-0x000046b0 java      var   6 psf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_UNKNOWN_TOKEN:I
+0x00004680 java      var   0 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_EOI_TOKEN:I
+0x00004688 java      var   1 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_EQUALS_TOKEN:I
+0x00004690 java      var   2 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_SEMICOLON_TOKEN:I
+0x00004698 java      var   3 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_SLASH_TOKEN:I
+0x000046a0 java      var   4 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_START_TOKEN:I
+0x000046a8 java      var   5 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_STRING_TOKEN:I
+0x000046b0 java      var   6 spf  Lcom/sun/activation/registries/MailcapTokenizer.sfield_UNKNOWN_TOKEN:I
 0x000046b8 java      var   7 P    Lcom/sun/activation/registries/MailcapTokenizer.ifield_autoquoteChar:C
 0x000046c0 java      var   8 P    Lcom/sun/activation/registries/MailcapTokenizer.ifield_currentToken:I
 0x000046c8 java      var   9 P    Lcom/sun/activation/registries/MailcapTokenizer.ifield_currentTokenValue:Ljava/lang/String
@@ -1180,13 +1180,13 @@ EXPECT=<<EOF
 0x000177f8 java   method   0 pC   Lcom/sun/activation/registries/MimeTypeFile.method.<init>()V
 0x00017820 java   method   1 pC   Lcom/sun/activation/registries/MimeTypeFile.method.<init>(Ljava/io/InputStream;)V
 0x00017864 java   method   2 pC   Lcom/sun/activation/registries/MimeTypeFile.method.<init>(Ljava/lang/String;)V
-0x000178f4 java   method   3 ps   Lcom/sun/activation/registries/MimeTypeFile.method.main([Ljava/lang/String;)V
+0x000178f4 java   method   3 sp   Lcom/sun/activation/registries/MimeTypeFile.method.main([Ljava/lang/String;)V
 0x00017970 java   method   4 P    Lcom/sun/activation/registries/MimeTypeFile.method.parse(Ljava/io/BufferedReader;)V
 0x00017a08 java   method   5 P    Lcom/sun/activation/registries/MimeTypeFile.method.parseEntry(Ljava/lang/String;)V
 0x00017bf4 java   method   6 p    Lcom/sun/activation/registries/MimeTypeFile.method.appendToRegistry(Ljava/lang/String;)V
 0x00017c34 java   method   7 p    Lcom/sun/activation/registries/MimeTypeFile.method.getMIMETypeString(Ljava/lang/String;)Ljava/lang/String;
 0x00017c60 java   method   8 p    Lcom/sun/activation/registries/MimeTypeFile.method.getMimeTypeEntry(Ljava/lang/String;)Lcom/sun/activation/registries/MimeTypeEntry;
-0x00004700 java      var   0 Ps   Lcom/sun/activation/registries/MimeTypeFile.sfield_DEBUG:Z
+0x00004700 java      var   0 sP   Lcom/sun/activation/registries/MimeTypeFile.sfield_DEBUG:Z
 0x00004708 java      var   1 P    Lcom/sun/activation/registries/MimeTypeFile.ifield_fname:Ljava/lang/String
 0x00004710 java      var   2 P    Lcom/sun/activation/registries/MimeTypeFile.ifield_type_hash:Ljava/util/Hashtable
 0x00007dd0 [0x00017c84 - 0x00017d22]    158 java class 42 Lcom/sun/activation/viewers/ImageViewerCanvas :: Ljava/awt/Canvas;
@@ -1223,14 +1223,14 @@ EXPECT=<<EOF
 0x00018008 java   method   0 sC   Ljavax/activation/CommandMap.method.<clinit>()V
 0x00018020 java   method   1 pC   Ljavax/activation/CommandMap.method.<init>()V
 0x00018038 java   method   2 s    Ljavax/activation/CommandMap.method.class$(Ljava/lang/String;)Ljava/lang/Class;
-0x00018078 java   method   3 ps   Ljavax/activation/CommandMap.method.getDefaultCommandMap()Ljavax/activation/CommandMap;
-0x000180a4 java   method   4 ps   Ljavax/activation/CommandMap.method.setDefaultCommandMap(Ljavax/activation/CommandMap;)V
+0x00018078 java   method   3 sp   Ljavax/activation/CommandMap.method.getDefaultCommandMap()Ljavax/activation/CommandMap;
+0x000180a4 java   method   4 sp   Ljavax/activation/CommandMap.method.setDefaultCommandMap(Ljavax/activation/CommandMap;)V
 0x0000abab java   method   5 pa   Ljavax/activation/CommandMap.method.createDataContentHandler(Ljava/lang/String;)Ljavax/activation/DataContentHandler;
 0x0000abb0 java   method   6 pa   Ljavax/activation/CommandMap.method.getAllCommands(Ljava/lang/String;)[Ljavax/activation/CommandInfo;
 0x0000abb4 java   method   7 pa   Ljavax/activation/CommandMap.method.getCommand(Ljava/lang/String;Ljava/lang/String;)Ljavax/activation/CommandInfo;
 0x0000abb8 java   method   8 pa   Ljavax/activation/CommandMap.method.getPreferredCommands(Ljava/lang/String;)[Ljavax/activation/CommandInfo;
 0x00004858 java      var   0 s    Ljavax/activation/CommandMap.sfield_class$javax$activation$CommandMap:Ljava/lang/Class
-0x00004860 java      var   1 Ps   Ljavax/activation/CommandMap.sfield_defaultCommandMap:Ljavax/activation/CommandMap
+0x00004860 java      var   1 sP   Ljavax/activation/CommandMap.sfield_defaultCommandMap:Ljavax/activation/CommandMap
 0x00007e50 [0x0000abc0 - 0x0000abc0]      0 java class 46 Ljavax/activation/CommandObject :: Ljava/lang/Object;
 0x0000abc0 java   method   0 pa   Ljavax/activation/CommandObject.method.setCommandContext(Ljava/lang/String;Ljavax/activation/DataHandler;)V
 0x00007e70 [0x0000abc9 - 0x0000abd6]     13 java class 47 Ljavax/activation/DataContentHandler :: Ljava/lang/Object;
@@ -1257,7 +1257,7 @@ EXPECT=<<EOF
 0x000182ec java   method   7 PY   Ljavax/activation/DataHandler.method.getBaseType()Ljava/lang/String;
 0x00018364 java   method   8 PY   Ljavax/activation/DataHandler.method.getCommandMap()Ljavax/activation/CommandMap;
 0x000183ac java   method   9 PY   Ljavax/activation/DataHandler.method.getDataContentHandler()Ljavax/activation/DataContentHandler;
-0x000184a4 java   method  10 psY  Ljavax/activation/DataHandler.method.setDataContentHandlerFactory(Ljavax/activation/DataContentHandlerFactory;)V
+0x000184a4 java   method  10 spY  Ljavax/activation/DataHandler.method.setDataContentHandlerFactory(Ljavax/activation/DataContentHandlerFactory;)V
 0x00018560 java   method  11 p    Ljavax/activation/DataHandler.method.getAllCommands()[Ljavax/activation/CommandInfo;
 0x0001858c java   method  12 p    Ljavax/activation/DataHandler.method.getBean(Ljavax/activation/CommandInfo;)Ljava/lang/Object;
 0x000185d0 java   method  13 p    Ljavax/activation/DataHandler.method.getCommand(Ljava/lang/String;)Ljavax/activation/CommandInfo;
@@ -1274,8 +1274,8 @@ EXPECT=<<EOF
 0x000188c0 java   method  24 pY   Ljavax/activation/DataHandler.method.setCommandMap(Ljavax/activation/CommandMap;)V
 0x00018908 java   method  25 p    Ljavax/activation/DataHandler.method.writeTo(Ljava/io/OutputStream;)V
 0x00004880 java      var   0 s    Ljavax/activation/DataHandler.sfield_class$javax$activation$DataHandler:Ljava/lang/Class
-0x000048a0 java      var   1 Psf  Ljavax/activation/DataHandler.sfield_emptyFlavors:[Ljava/awt/datatransfer/DataFlavor
-0x000048a8 java      var   2 Ps   Ljavax/activation/DataHandler.sfield_factory:Ljavax/activation/DataContentHandlerFactory
+0x000048a0 java      var   1 sPf  Ljavax/activation/DataHandler.sfield_emptyFlavors:[Ljava/awt/datatransfer/DataFlavor
+0x000048a8 java      var   2 sP   Ljavax/activation/DataHandler.sfield_factory:Ljavax/activation/DataContentHandlerFactory
 0x00004888 java      var   3 P    Ljavax/activation/DataHandler.ifield_currentCommandMap:Ljavax/activation/CommandMap
 0x00004890 java      var   4 P    Ljavax/activation/DataHandler.ifield_dataContentHandler:Ljavax/activation/DataContentHandler
 0x00004898 java      var   5 P    Ljavax/activation/DataHandler.ifield_dataSource:Ljavax/activation/DataSource
@@ -1295,17 +1295,17 @@ EXPECT=<<EOF
 0x0001896c java   method   0 sC   Ljavax/activation/FileTypeMap.method.<clinit>()V
 0x00018984 java   method   1 pC   Ljavax/activation/FileTypeMap.method.<init>()V
 0x0001899c java   method   2 s    Ljavax/activation/FileTypeMap.method.class$(Ljava/lang/String;)Ljava/lang/Class;
-0x000189dc java   method   3 ps   Ljavax/activation/FileTypeMap.method.getDefaultFileTypeMap()Ljavax/activation/FileTypeMap;
-0x00018a08 java   method   4 ps   Ljavax/activation/FileTypeMap.method.setDefaultFileTypeMap(Ljavax/activation/FileTypeMap;)V
+0x000189dc java   method   3 sp   Ljavax/activation/FileTypeMap.method.getDefaultFileTypeMap()Ljavax/activation/FileTypeMap;
+0x00018a08 java   method   4 sp   Ljavax/activation/FileTypeMap.method.setDefaultFileTypeMap(Ljavax/activation/FileTypeMap;)V
 0x0000acf0 java   method   5 pa   Ljavax/activation/FileTypeMap.method.getContentType(Ljava/io/File;)Ljava/lang/String;
 0x0000acf5 java   method   6 pa   Ljavax/activation/FileTypeMap.method.getContentType(Ljava/lang/String;)Ljava/lang/String;
 0x00004918 java      var   0 s    Ljavax/activation/FileTypeMap.sfield_class$javax$activation$FileTypeMap:Ljava/lang/Class
-0x00004920 java      var   1 Ps   Ljavax/activation/FileTypeMap.sfield_defaultMap:Ljavax/activation/FileTypeMap
+0x00004920 java      var   1 sP   Ljavax/activation/FileTypeMap.sfield_defaultMap:Ljavax/activation/FileTypeMap
 0x00007f30 [0x00018a80 - 0x00018fca]   1354 java class 53 Ljavax/activation/MimeType :: Ljava/lang/Object;
 0x00018a80 java   method   0 pC   Ljavax/activation/MimeType.method.<init>()V
 0x00018ab8 java   method   1 pC   Ljavax/activation/MimeType.method.<init>(Ljava/lang/String;)V
 0x00018ad8 java   method   2 pC   Ljavax/activation/MimeType.method.<init>(Ljava/lang/String;Ljava/lang/String;)V
-0x00018b50 java   method   3 Ps   Ljavax/activation/MimeType.method.isTokenChar(C)Z
+0x00018b50 java   method   3 sP   Ljavax/activation/MimeType.method.isTokenChar(C)Z
 0x00018b88 java   method   4 P    Ljavax/activation/MimeType.method.isValidToken(Ljava/lang/String;)Z
 0x00018bcc java   method   5 P    Ljavax/activation/MimeType.method.parse(Ljava/lang/String;)V
 0x00018d24 java   method   6 p    Ljavax/activation/MimeType.method.getBaseType()Ljava/lang/String;
@@ -1322,17 +1322,17 @@ EXPECT=<<EOF
 0x00018f2c java   method  17 p    Ljavax/activation/MimeType.method.setSubType(Ljava/lang/String;)V
 0x00018f6c java   method  18 p    Ljavax/activation/MimeType.method.toString()Ljava/lang/String;
 0x00018fb4 java   method  19 p    Ljavax/activation/MimeType.method.writeExternal(Ljava/io/ObjectOutput;)V
-0x00004970 java      var   0 Psf  Ljavax/activation/MimeType.sfield_TSPECIALS:Ljava/lang/String
+0x00004970 java      var   0 sPf  Ljavax/activation/MimeType.sfield_TSPECIALS:Ljava/lang/String
 0x00004978 java      var   1 P    Ljavax/activation/MimeType.ifield_parameters:Ljavax/activation/MimeTypeParameterList
 0x00004980 java      var   2 P    Ljavax/activation/MimeType.ifield_primaryType:Ljava/lang/String
 0x00004988 java      var   3 P    Ljavax/activation/MimeType.ifield_subType:Ljava/lang/String
 0x00007f50 [0x00018fdc - 0x00019528]   1356 java class 54 Ljavax/activation/MimeTypeParameterList :: Ljava/lang/Object;
 0x00018fdc java   method   0 pC   Ljavax/activation/MimeTypeParameterList.method.<init>()V
 0x00019004 java   method   1 pC   Ljavax/activation/MimeTypeParameterList.method.<init>(Ljava/lang/String;)V
-0x00019030 java   method   2 Ps   Ljavax/activation/MimeTypeParameterList.method.isTokenChar(C)Z
-0x00019068 java   method   3 Ps   Ljavax/activation/MimeTypeParameterList.method.quote(Ljava/lang/String;)Ljava/lang/String;
-0x00019110 java   method   4 Ps   Ljavax/activation/MimeTypeParameterList.method.skipWhiteSpace(Ljava/lang/String;I)I
-0x00019148 java   method   5 Ps   Ljavax/activation/MimeTypeParameterList.method.unquote(Ljava/lang/String;)Ljava/lang/String;
+0x00019030 java   method   2 sP   Ljavax/activation/MimeTypeParameterList.method.isTokenChar(C)Z
+0x00019068 java   method   3 sP   Ljavax/activation/MimeTypeParameterList.method.quote(Ljava/lang/String;)Ljava/lang/String;
+0x00019110 java   method   4 sP   Ljavax/activation/MimeTypeParameterList.method.skipWhiteSpace(Ljava/lang/String;I)I
+0x00019148 java   method   5 sP   Ljavax/activation/MimeTypeParameterList.method.unquote(Ljava/lang/String;)Ljava/lang/String;
 0x000191b8 java   method   6 p    Ljavax/activation/MimeTypeParameterList.method.get(Ljava/lang/String;)Ljava/lang/String;
 0x000191ec java   method   7 p    Ljavax/activation/MimeTypeParameterList.method.getNames()Ljava/util/Enumeration;
 0x0001920c java   method   8 p    Ljavax/activation/MimeTypeParameterList.method.isEmpty()Z
@@ -1341,7 +1341,7 @@ EXPECT=<<EOF
 0x00019454 java   method  11 p    Ljavax/activation/MimeTypeParameterList.method.set(Ljava/lang/String;Ljava/lang/String;)V
 0x00019480 java   method  12 p    Ljavax/activation/MimeTypeParameterList.method.size()I
 0x000194a0 java   method  13 p    Ljavax/activation/MimeTypeParameterList.method.toString()Ljava/lang/String;
-0x00004990 java      var   0 Psf  Ljavax/activation/MimeTypeParameterList.sfield_TSPECIALS:Ljava/lang/String
+0x00004990 java      var   0 sPf  Ljavax/activation/MimeTypeParameterList.sfield_TSPECIALS:Ljava/lang/String
 0x00004998 java      var   1 P    Ljavax/activation/MimeTypeParameterList.ifield_parameters:Ljava/util/Hashtable
 0x00007f70 [0x00019538 - 0x00019558]     32 java class 55 Ljavax/activation/MimeTypeParseException :: Ljava/lang/Exception;
 0x00019538 java   method   0 pC   Ljavax/activation/MimeTypeParseException.method.<init>()V
@@ -1369,7 +1369,7 @@ EXPECT=<<EOF
 0x000198a4 java   method   1 p    Lorg/radare/radare2installer/BootReceiver.method.onReceive(Landroid/content/Context;Landroid/content/Intent;)V
 0x00007ff0 [0x00019944 - 0x0001994c]      8 java class 59 Lorg/radare/radare2installer/BuildConfig :: Ljava/lang/Object;
 0x00019944 java   method   0 pC   Lorg/radare/radare2installer/BuildConfig.method.<init>()V
-0x00004a48 java      var   0 psf  Lorg/radare/radare2installer/BuildConfig.sfield_DEBUG:Z
+0x00004a48 java      var   0 spf  Lorg/radare/radare2installer/BuildConfig.sfield_DEBUG:Z
 0x00008010 [0x0001995c - 0x00019a56]    250 java class 60 Lorg/radare/radare2installer/ConsoleActivity$1 :: Ljava/lang/Object;
 0x0001995c java   method   0 C    Lorg/radare/radare2installer/ConsoleActivity$1.method.<init>(Lorg/radare/radare2installer/ConsoleActivity;)V
 0x00019978 java   method   1 p    Lorg/radare/radare2installer/ConsoleActivity$1.method.onClick(Landroid/view/View;)V
@@ -1394,7 +1394,7 @@ EXPECT=<<EOF
 0x00019c3c java   method   7 p    Lorg/radare/radare2installer/ConsoleActivity.method.onCreate(Landroid/os/Bundle;)V
 0x00019e50 java   method   8 p    Lorg/radare/radare2installer/ConsoleActivity.method.onDestroy()V
 0x00019e74 java   method   9 p    Lorg/radare/radare2installer/ConsoleActivity.method.onKeyDown(ILandroid/view/KeyEvent;)Z
-0x00004a98 java      var   0 Psf  Lorg/radare/radare2installer/ConsoleActivity.sfield_TAG:Ljava/lang/String
+0x00004a98 java      var   0 sPf  Lorg/radare/radare2installer/ConsoleActivity.sfield_TAG:Ljava/lang/String
 0x00004a70 java      var   1 P    Lorg/radare/radare2installer/ConsoleActivity.ifield_INPUT:Landroid/widget/EditText
 0x00004a78 java      var   2 P    Lorg/radare/radare2installer/ConsoleActivity.ifield_OUTPUT:Landroid/widget/TextView
 0x00004a80 java      var   3 P    Lorg/radare/radare2installer/ConsoleActivity.ifield_QUIT:Landroid/widget/Button
@@ -1431,7 +1431,7 @@ EXPECT=<<EOF
 0x00004b00 java      var   5 P    Lorg/radare/radare2installer/LaunchActivity.ifield_radiogroup:Landroid/widget/RadioGroup
 0x000080f0 [0x0001a520 - 0x0001a7b6]    662 java class 67 Lorg/radare/radare2installer/LauncherActivity :: Landroid/app/Activity;
 0x0001a520 java   method   0 pC   Lorg/radare/radare2installer/LauncherActivity.method.<init>()V
-0x0001a538 java   method   1 Ps   Lorg/radare/radare2installer/LauncherActivity.method.filterSingleQuote(Ljava/lang/String;)Ljava/lang/String;
+0x0001a538 java   method   1 sP   Lorg/radare/radare2installer/LauncherActivity.method.filterSingleQuote(Ljava/lang/String;)Ljava/lang/String;
 0x0001a574 java   method   2 P    Lorg/radare/radare2installer/LauncherActivity.method.findTerminalApp()Ljava/lang/String;
 0x0001a5cc java   method   3 p    Lorg/radare/radare2installer/LauncherActivity.method.onCreate(Landroid/os/Bundle;)V
 0x0001a7a8 java   method   4 r    Lorg/radare/radare2installer/LauncherActivity.method.onPause()V
@@ -1494,7 +1494,7 @@ EXPECT=<<EOF
 0x0001c858 java   method  13 P    Lorg/radare/radare2installer/MainActivity.method.download(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
 0x0001cb4c java   method  14 P    Lorg/radare/radare2installer/MainActivity.method.output(Ljava/lang/String;)V
 0x0001cb74 java   method  15 P    Lorg/radare/radare2installer/MainActivity.method.resetButtons()V
-0x0001cb9c java   method  16 ps   Lorg/radare/radare2installer/MainActivity.method.unTarGz(Ljava/lang/String;Ljava/lang/String;)V
+0x0001cb9c java   method  16 sp   Lorg/radare/radare2installer/MainActivity.method.unTarGz(Ljava/lang/String;Ljava/lang/String;)V
 0x0001cc7c java   method  17 p    Lorg/radare/radare2installer/MainActivity.method.onCreate(Landroid/os/Bundle;)V
 0x0001ce38 java   method  18 p    Lorg/radare/radare2installer/MainActivity.method.onCreateOptionsMenu(Landroid/view/Menu;)Z
 0x0001ce6c java   method  19 p    Lorg/radare/radare2installer/MainActivity.method.onOptionsItemSelected(Landroid/view/MenuItem;)Z
@@ -1519,65 +1519,65 @@ EXPECT=<<EOF
 0x0001d078 java   method   3 p    Lorg/radare/radare2installer/PubKeyManager.method.checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;)V
 0x0001d260 java   method   4 p    Lorg/radare/radare2installer/PubKeyManager.method.getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
 0x00004be0 java      var   0 sfh  Lorg/radare/radare2installer/PubKeyManager.sfield_$assertionsDisabled:Z
-0x00004be8 java      var   1 Ps   Lorg/radare/radare2installer/PubKeyManager.sfield_PUB_KEY:Ljava/lang/String
+0x00004be8 java      var   1 sP   Lorg/radare/radare2installer/PubKeyManager.sfield_PUB_KEY:Ljava/lang/String
 0x00008270 [0x0001d274 - 0x0001d27c]      8 java class 79 Lorg/radare/radare2installer/R$array :: Ljava/lang/Object;
 0x0001d274 java   method   0 pC   Lorg/radare/radare2installer/R$array.method.<init>()V
-0x00004bf0 java      var   0 psf  Lorg/radare/radare2installer/R$array.sfield_updateInterval:I
-0x00004bf8 java      var   1 psf  Lorg/radare/radare2installer/R$array.sfield_updateIntervalValues:I
+0x00004bf0 java      var   0 spf  Lorg/radare/radare2installer/R$array.sfield_updateInterval:I
+0x00004bf8 java      var   1 spf  Lorg/radare/radare2installer/R$array.sfield_updateIntervalValues:I
 0x00008290 [0x0001d28c - 0x0001d294]      8 java class 80 Lorg/radare/radare2installer/R$attr :: Ljava/lang/Object;
 0x0001d28c java   method   0 pC   Lorg/radare/radare2installer/R$attr.method.<init>()V
 0x000082b0 [0x0001d2a4 - 0x0001d2ac]      8 java class 81 Lorg/radare/radare2installer/R$drawable :: Ljava/lang/Object;
 0x0001d2a4 java   method   0 pC   Lorg/radare/radare2installer/R$drawable.method.<init>()V
-0x00004c00 java      var   0 psf  Lorg/radare/radare2installer/R$drawable.sfield_icon:I
-0x00004c08 java      var   1 psf  Lorg/radare/radare2installer/R$drawable.sfield_icon2:I
+0x00004c00 java      var   0 spf  Lorg/radare/radare2installer/R$drawable.sfield_icon:I
+0x00004c08 java      var   1 spf  Lorg/radare/radare2installer/R$drawable.sfield_icon2:I
 0x000082d0 [0x0001d2bc - 0x0001d2c4]      8 java class 82 Lorg/radare/radare2installer/R$id :: Ljava/lang/Object;
 0x0001d2bc java   method   0 pC   Lorg/radare/radare2installer/R$id.method.<init>()V
-0x00004c10 java      var   0 psf  Lorg/radare/radare2installer/R$id.sfield_button_debug:I
-0x00004c18 java      var   1 psf  Lorg/radare/radare2installer/R$id.sfield_button_open:I
-0x00004c20 java      var   2 psf  Lorg/radare/radare2installer/R$id.sfield_checkGithub:I
-0x00004c28 java      var   3 psf  Lorg/radare/radare2installer/R$id.sfield_checkbox:I
-0x00004c30 java      var   4 psf  Lorg/radare/radare2installer/R$id.sfield_checkhg:I
-0x00004c38 java      var   5 psf  Lorg/radare/radare2installer/R$id.sfield_checklocal:I
-0x00004c40 java      var   6 psf  Lorg/radare/radare2installer/R$id.sfield_consoleInput:I
-0x00004c48 java      var   7 psf  Lorg/radare/radare2installer/R$id.sfield_consoleOutput:I
-0x00004c50 java      var   8 psf  Lorg/radare/radare2installer/R$id.sfield_dialog_ret:I
-0x00004c58 java      var   9 psf  Lorg/radare/radare2installer/R$id.sfield_file_to_open:I
-0x00004c60 java      var  10 psf  Lorg/radare/radare2installer/R$id.sfield_help_text:I
-0x00004c68 java      var  11 psf  Lorg/radare/radare2installer/R$id.sfield_image:I
-0x00004c70 java      var  12 psf  Lorg/radare/radare2installer/R$id.sfield_intro_text:I
-0x00004c78 java      var  13 psf  Lorg/radare/radare2installer/R$id.sfield_localRunButton:I
-0x00004c80 java      var  14 psf  Lorg/radare/radare2installer/R$id.sfield_outputView:I
-0x00004c88 java      var  15 psf  Lorg/radare/radare2installer/R$id.sfield_quitButton:I
-0x00004c90 java      var  16 psf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_browser:I
-0x00004c98 java      var  17 psf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_console:I
-0x00004ca0 java      var  18 psf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_terminal:I
-0x00004ca8 java      var  19 psf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_web:I
-0x00004cb0 java      var  20 psf  Lorg/radare/radare2installer/R$id.sfield_radiogroup1:I
-0x00004cb8 java      var  21 psf  Lorg/radare/radare2installer/R$id.sfield_remoteRunButton:I
-0x00004cc0 java      var  22 psf  Lorg/radare/radare2installer/R$id.sfield_runButton:I
-0x00004cc8 java      var  23 psf  Lorg/radare/radare2installer/R$id.sfield_scrollOutput:I
-0x00004cd0 java      var  24 psf  Lorg/radare/radare2installer/R$id.sfield_text:I
-0x00004cd8 java      var  25 psf  Lorg/radare/radare2installer/R$id.sfield_toast_layout_root:I
-0x00004ce0 java      var  26 psf  Lorg/radare/radare2installer/R$id.sfield_webview:I
-0x00004ce8 java      var  27 psf  Lorg/radare/radare2installer/R$id.sfield_widget48:I
+0x00004c10 java      var   0 spf  Lorg/radare/radare2installer/R$id.sfield_button_debug:I
+0x00004c18 java      var   1 spf  Lorg/radare/radare2installer/R$id.sfield_button_open:I
+0x00004c20 java      var   2 spf  Lorg/radare/radare2installer/R$id.sfield_checkGithub:I
+0x00004c28 java      var   3 spf  Lorg/radare/radare2installer/R$id.sfield_checkbox:I
+0x00004c30 java      var   4 spf  Lorg/radare/radare2installer/R$id.sfield_checkhg:I
+0x00004c38 java      var   5 spf  Lorg/radare/radare2installer/R$id.sfield_checklocal:I
+0x00004c40 java      var   6 spf  Lorg/radare/radare2installer/R$id.sfield_consoleInput:I
+0x00004c48 java      var   7 spf  Lorg/radare/radare2installer/R$id.sfield_consoleOutput:I
+0x00004c50 java      var   8 spf  Lorg/radare/radare2installer/R$id.sfield_dialog_ret:I
+0x00004c58 java      var   9 spf  Lorg/radare/radare2installer/R$id.sfield_file_to_open:I
+0x00004c60 java      var  10 spf  Lorg/radare/radare2installer/R$id.sfield_help_text:I
+0x00004c68 java      var  11 spf  Lorg/radare/radare2installer/R$id.sfield_image:I
+0x00004c70 java      var  12 spf  Lorg/radare/radare2installer/R$id.sfield_intro_text:I
+0x00004c78 java      var  13 spf  Lorg/radare/radare2installer/R$id.sfield_localRunButton:I
+0x00004c80 java      var  14 spf  Lorg/radare/radare2installer/R$id.sfield_outputView:I
+0x00004c88 java      var  15 spf  Lorg/radare/radare2installer/R$id.sfield_quitButton:I
+0x00004c90 java      var  16 spf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_browser:I
+0x00004c98 java      var  17 spf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_console:I
+0x00004ca0 java      var  18 spf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_terminal:I
+0x00004ca8 java      var  19 spf  Lorg/radare/radare2installer/R$id.sfield_radiobutton_web:I
+0x00004cb0 java      var  20 spf  Lorg/radare/radare2installer/R$id.sfield_radiogroup1:I
+0x00004cb8 java      var  21 spf  Lorg/radare/radare2installer/R$id.sfield_remoteRunButton:I
+0x00004cc0 java      var  22 spf  Lorg/radare/radare2installer/R$id.sfield_runButton:I
+0x00004cc8 java      var  23 spf  Lorg/radare/radare2installer/R$id.sfield_scrollOutput:I
+0x00004cd0 java      var  24 spf  Lorg/radare/radare2installer/R$id.sfield_text:I
+0x00004cd8 java      var  25 spf  Lorg/radare/radare2installer/R$id.sfield_toast_layout_root:I
+0x00004ce0 java      var  26 spf  Lorg/radare/radare2installer/R$id.sfield_webview:I
+0x00004ce8 java      var  27 spf  Lorg/radare/radare2installer/R$id.sfield_widget48:I
 0x000082f0 [0x0001d2d4 - 0x0001d2dc]      8 java class 83 Lorg/radare/radare2installer/R$layout :: Ljava/lang/Object;
 0x0001d2d4 java   method   0 pC   Lorg/radare/radare2installer/R$layout.method.<init>()V
-0x00004cf0 java      var   0 psf  Lorg/radare/radare2installer/R$layout.sfield_console:I
-0x00004cf8 java      var   1 psf  Lorg/radare/radare2installer/R$layout.sfield_dialog:I
-0x00004d00 java      var   2 psf  Lorg/radare/radare2installer/R$layout.sfield_launch:I
-0x00004d08 java      var   3 psf  Lorg/radare/radare2installer/R$layout.sfield_main:I
-0x00004d10 java      var   4 psf  Lorg/radare/radare2installer/R$layout.sfield_toast_layout:I
-0x00004d18 java      var   5 psf  Lorg/radare/radare2installer/R$layout.sfield_webactivity:I
+0x00004cf0 java      var   0 spf  Lorg/radare/radare2installer/R$layout.sfield_console:I
+0x00004cf8 java      var   1 spf  Lorg/radare/radare2installer/R$layout.sfield_dialog:I
+0x00004d00 java      var   2 spf  Lorg/radare/radare2installer/R$layout.sfield_launch:I
+0x00004d08 java      var   3 spf  Lorg/radare/radare2installer/R$layout.sfield_main:I
+0x00004d10 java      var   4 spf  Lorg/radare/radare2installer/R$layout.sfield_toast_layout:I
+0x00004d18 java      var   5 spf  Lorg/radare/radare2installer/R$layout.sfield_webactivity:I
 0x00008310 [0x0001d2ec - 0x0001d2f4]      8 java class 84 Lorg/radare/radare2installer/R$string :: Ljava/lang/Object;
 0x0001d2ec java   method   0 pC   Lorg/radare/radare2installer/R$string.method.<init>()V
-0x00004d20 java      var   0 psf  Lorg/radare/radare2installer/R$string.sfield_app_name:I
-0x00004d28 java      var   1 psf  Lorg/radare/radare2installer/R$string.sfield_service_name:I
+0x00004d20 java      var   0 spf  Lorg/radare/radare2installer/R$string.sfield_app_name:I
+0x00004d28 java      var   1 spf  Lorg/radare/radare2installer/R$string.sfield_service_name:I
 0x00008330 [0x0001d304 - 0x0001d30c]      8 java class 85 Lorg/radare/radare2installer/R$style :: Ljava/lang/Object;
 0x0001d304 java   method   0 pC   Lorg/radare/radare2installer/R$style.method.<init>()V
-0x00004d30 java      var   0 psf  Lorg/radare/radare2installer/R$style.sfield_AppTheme:I
+0x00004d30 java      var   0 spf  Lorg/radare/radare2installer/R$style.sfield_AppTheme:I
 0x00008350 [0x0001d31c - 0x0001d324]      8 java class 86 Lorg/radare/radare2installer/R$xml :: Ljava/lang/Object;
 0x0001d31c java   method   0 pC   Lorg/radare/radare2installer/R$xml.method.<init>()V
-0x00004d38 java      var   0 psf  Lorg/radare/radare2installer/R$xml.sfield_preferences:I
+0x00004d38 java      var   0 spf  Lorg/radare/radare2installer/R$xml.sfield_preferences:I
 0x00008370 [0x0001d334 - 0x0001d33c]      8 java class 87 Lorg/radare/radare2installer/R :: Ljava/lang/Object;
 0x0001d334 java   method   0 pC   Lorg/radare/radare2installer/R.method.<init>()V
 0x00008390 [0x0001d34c - 0x0001d376]     42 java class 88 Lorg/radare/radare2installer/SettingsActivity :: Landroid/preference/PreferenceActivity;
@@ -1587,9 +1587,9 @@ EXPECT=<<EOF
 0x000083d0 [0x0001d388 - 0x0001d588]    512 java class 90 Lorg/radare/radare2installer/UpdateCheckerService$PollTask :: Landroid/os/AsyncTask;
 0x0001d388 java   method   0 PC   Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.<init>(Lorg/radare/radare2installer/UpdateCheckerService;)V
 0x0001d3a4 java   method   1 hC   Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.<init>(Lorg/radare/radare2installer/UpdateCheckerService;Lorg/radare/radare2installer/UpdateCheckerService$1;)V
-0x0001d3bc java   method   2 rhb  Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.doInBackground([Ljava/lang/Object;)Ljava/lang/Object;
+0x0001d3bc java   method   2 rbh  Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.doInBackground([Ljava/lang/Object;)Ljava/lang/Object;
 0x0001d3dc java   method   3 rg   Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.doInBackground([Ljava/lang/Void;)Ljava/lang/Void;
-0x0001d4d0 java   method   4 rhb  Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.onPostExecute(Ljava/lang/Object;)V
+0x0001d4d0 java   method   4 rbh  Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.onPostExecute(Ljava/lang/Object;)V
 0x0001d4ec java   method   5 r    Lorg/radare/radare2installer/UpdateCheckerService$PollTask.method.onPostExecute(Ljava/lang/Void;)V
 0x00004d40 java      var   0 fh   Lorg/radare/radare2installer/UpdateCheckerService$PollTask.ifield_this$0:Lorg/radare/radare2installer/UpdateCheckerService
 0x000083f0 [0x0001d598 - 0x0001d6ee]    342 java class 91 Lorg/radare/radare2installer/UpdateCheckerService :: Landroid/app/Service;
@@ -1626,7 +1626,7 @@ EXPECT=<<EOF
 0x0001ddbc java   method  16 p    Lorg/radare/radare2installer/Utils.method.killradare()V
 0x0001ddf0 java   method  17 p    Lorg/radare/radare2installer/Utils.method.myToast(Ljava/lang/String;I)V
 0x0001de88 java   method  18 p    Lorg/radare/radare2installer/Utils.method.sleep(I)V
-0x00004d70 java      var   0 ps   Lorg/radare/radare2installer/Utils.sfield_PKGNAME:Ljava/lang/String
+0x00004d70 java      var   0 sp   Lorg/radare/radare2installer/Utils.sfield_PKGNAME:Ljava/lang/String
 0x00004d78 java      var   1 P    Lorg/radare/radare2installer/Utils.ifield_mContext:Landroid/content/Context
 0x00008430 [0x00008430 - 0x00008430]      0 java class 93 Lorg/radare/radare2installer/WebActivity$1 :: Ljava/lang/Object;
 0x00008450 [0x0001dec0 - 0x0001df9a]    218 java class 94 Lorg/radare/radare2installer/WebActivity$RadareWebViewClient :: Landroid/webkit/WebViewClient;
@@ -1642,7 +1642,7 @@ EXPECT=<<EOF
 0x0001e06c java   method   3 p    Lorg/radare/radare2installer/WebActivity.method.onCreate(Landroid/os/Bundle;)V
 0x0001e574 java   method   4 p    Lorg/radare/radare2installer/WebActivity.method.onDestroy()V
 0x0001e5a4 java   method   5 p    Lorg/radare/radare2installer/WebActivity.method.onKeyDown(ILandroid/view/KeyEvent;)Z
-0x00004d88 java      var   0 Psf  Lorg/radare/radare2installer/WebActivity.sfield_TAG:Ljava/lang/String
+0x00004d88 java      var   0 sPf  Lorg/radare/radare2installer/WebActivity.sfield_TAG:Ljava/lang/String
 0x00004d90 java      var   1 P    Lorg/radare/radare2installer/WebActivity.ifield_mUtils:Lorg/radare/radare2installer/Utils
 0x00004d98 java      var   2      Lorg/radare/radare2installer/WebActivity.ifield_webview:Landroid/webkit/WebView
 0x00008490 [0x0001e608 - 0x0001e83c]    564 java class 96 Lcom/ice/tar/TarGzOutputStream :: Lcom/ice/tar/TarOutputStream;
@@ -1669,7 +1669,7 @@ EXPECT=<<EOF
 0x000041c0 java      var   0 fh   Lcom/ice/tar/TarInputStream$EntryAdapter.ifield_this$0:Lcom/ice/tar/TarInputStream
 0x000084d0 [0x0001e8bc - 0x0001f498]   3036 java class 98 Lcom/ice/tar/tar :: Ljava/lang/Object;
 0x0001e8bc java   method   0 pC   Lcom/ice/tar/tar.method.<init>()V
-0x0001e930 java   method   1 ps   Lcom/ice/tar/tar.method.main([Ljava/lang/String;)V
+0x0001e930 java   method   1 sp   Lcom/ice/tar/tar.method.main([Ljava/lang/String;)V
 0x0001e954 java   method   2 P    Lcom/ice/tar/tar.method.processArguments([Ljava/lang/String;)I
 0x0001eecc java   method   3 P    Lcom/ice/tar/tar.method.usage()V
 0x0001f0c8 java   method   4 P    Lcom/ice/tar/tar.method.version()V
@@ -1691,39 +1691,39 @@ EXPECT=<<EOF
 0x000042b8 java      var  13 P    Lcom/ice/tar/tar.ifield_verbose:Z
 0x000042c0 java      var  14 P    Lcom/ice/tar/tar.ifield_writingArchive:Z
 0x000084f0 [0x0001f4a8 - 0x0001f542]    154 java class 99 Lcom/stericson/RootTools/CommandCapture :: Lcom/stericson/RootTools/Command;
-0x0001f4a8 java   method   0 pCg  Lcom/stericson/RootTools/CommandCapture.method.<init>(I[Ljava/lang/String;)V
+0x0001f4a8 java   method   0 pgC  Lcom/stericson/RootTools/CommandCapture.method.<init>(I[Ljava/lang/String;)V
 0x0001f4d0 java   method   1 p    Lcom/stericson/RootTools/CommandCapture.method.output(ILjava/lang/String;)V
 0x0001f534 java   method   2 p    Lcom/stericson/RootTools/CommandCapture.method.toString()Ljava/lang/String;
 0x000042f8 java      var   0 P    Lcom/stericson/RootTools/CommandCapture.ifield_sb:Ljava/lang/StringBuilder
 0x00008510 [0x0001f554 - 0x0001f582]     46 java class 100 Lcom/stericson/RootTools/InternalMethods$1 :: Lcom/stericson/RootTools/Command;
-0x0001f554 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$1.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
+0x0001f554 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$1.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
 0x0001f570 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$1.method.output(ILjava/lang/String;)V
 0x00004370 java      var   0 Pfh  Lcom/stericson/RootTools/InternalMethods$1.ifield_val$result:Ljava/util/List
 0x00008530 [0x0001f594 - 0x0001f5f4]     96 java class 101 Lcom/stericson/RootTools/InternalMethods$2 :: Lcom/stericson/RootTools/Command;
-0x0001f594 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$2.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
+0x0001f594 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$2.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
 0x0001f5b0 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$2.method.output(ILjava/lang/String;)V
 0x00004378 java      var   0 Pfh  Lcom/stericson/RootTools/InternalMethods$2.ifield_val$results:Ljava/util/List
 0x00008550 [0x0001f604 - 0x0001f64c]     72 java class 102 Lcom/stericson/RootTools/InternalMethods$3 :: Lcom/stericson/RootTools/Command;
-0x0001f604 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$3.method.<init>(I[Ljava/lang/String;)V
+0x0001f604 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$3.method.<init>(I[Ljava/lang/String;)V
 0x0001f61c java   method   1 p    Lcom/stericson/RootTools/InternalMethods$3.method.output(ILjava/lang/String;)V
 0x00008570 [0x0001f65c - 0x0001f6e6]    138 java class 103 Lcom/stericson/RootTools/InternalMethods$4 :: Lcom/stericson/RootTools/Command;
-0x0001f65c java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$4.method.<init>(I[Ljava/lang/String;)V
+0x0001f65c java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$4.method.<init>(I[Ljava/lang/String;)V
 0x0001f674 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$4.method.output(ILjava/lang/String;)V
 0x00008590 [0x0001f6f8 - 0x0001f79a]    162 java class 104 Lcom/stericson/RootTools/InternalMethods$5 :: Lcom/stericson/RootTools/Command;
-0x0001f6f8 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$5.method.<init>(I[Ljava/lang/String;)V
+0x0001f6f8 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$5.method.<init>(I[Ljava/lang/String;)V
 0x0001f710 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$5.method.output(ILjava/lang/String;)V
 0x000085b0 [0x0001f7ac - 0x0001f892]    230 java class 105 Lcom/stericson/RootTools/InternalMethods$6 :: Lcom/stericson/RootTools/Command;
-0x0001f7ac java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$6.method.<init>(I[Ljava/lang/String;)V
+0x0001f7ac java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$6.method.<init>(I[Ljava/lang/String;)V
 0x0001f7c4 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$6.method.output(ILjava/lang/String;)V
 0x000085d0 [0x0001f8c0 - 0x0001f92a]    106 java class 106 Lcom/stericson/RootTools/InternalMethods$7 :: Lcom/stericson/RootTools/Command;
-0x0001f8c0 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$7.method.<init>(I[Ljava/lang/String;)V
+0x0001f8c0 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$7.method.<init>(I[Ljava/lang/String;)V
 0x0001f8d8 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$7.method.output(ILjava/lang/String;)V
 0x000085f0 [0x0001f93c - 0x0001f984]     72 java class 107 Lcom/stericson/RootTools/InternalMethods$8 :: Lcom/stericson/RootTools/Command;
-0x0001f93c java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$8.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
+0x0001f93c java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$8.method.<init>(I[Ljava/lang/String;Ljava/util/List;)V
 0x0001f958 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$8.method.output(ILjava/lang/String;)V
 0x00004388 java      var   0 Pfh  Lcom/stericson/RootTools/InternalMethods$8.ifield_val$results:Ljava/util/List
 0x00008610 [0x0001f994 - 0x0001fa14]    128 java class 108 Lcom/stericson/RootTools/InternalMethods$9 :: Lcom/stericson/RootTools/Command;
-0x0001f994 java   method   0 Cg   Lcom/stericson/RootTools/InternalMethods$9.method.<init>(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+0x0001f994 java   method   0 gC   Lcom/stericson/RootTools/InternalMethods$9.method.<init>(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 0x0001f9b4 java   method   1 p    Lcom/stericson/RootTools/InternalMethods$9.method.output(ILjava/lang/String;)V
 0x00004390 java      var   0 Pfh  Lcom/stericson/RootTools/InternalMethods$9.ifield_val$box:Ljava/lang/String
 0x00004398 java      var   1 Pfh  Lcom/stericson/RootTools/InternalMethods$9.ifield_val$util:Ljava/lang/String
@@ -1736,11 +1736,11 @@ EXPECT=<<EOF
 0x0000b4c8 java   method   5 pa   Lcom/stericson/RootTools/RootTools$Result.method.onFailure(Ljava/lang/Exception;)V
 0x0000b4cc java   method   6 pa   Lcom/stericson/RootTools/RootTools$Result.method.process(Ljava/lang/String;)V
 0x0000b4d0 java   method   7 pa   Lcom/stericson/RootTools/RootTools$Result.method.processError(Ljava/lang/String;)V
-0x0001fa94 java   method   8 phb  Lcom/stericson/RootTools/RootTools$Result.method.setData(Ljava/io/Serializable;)Lcom/stericson/RootTools/IResult;
+0x0001fa94 java   method   8 pbh  Lcom/stericson/RootTools/RootTools$Result.method.setData(Ljava/io/Serializable;)Lcom/stericson/RootTools/IResult;
 0x0001fab0 java   method   9 p    Lcom/stericson/RootTools/RootTools$Result.method.setData(Ljava/io/Serializable;)Lcom/stericson/RootTools/RootTools$Result;
-0x0001fac8 java   method  10 phb  Lcom/stericson/RootTools/RootTools$Result.method.setError(I)Lcom/stericson/RootTools/IResult;
+0x0001fac8 java   method  10 pbh  Lcom/stericson/RootTools/RootTools$Result.method.setError(I)Lcom/stericson/RootTools/IResult;
 0x0001fae4 java   method  11 p    Lcom/stericson/RootTools/RootTools$Result.method.setError(I)Lcom/stericson/RootTools/RootTools$Result;
-0x0001fafc java   method  12 phb  Lcom/stericson/RootTools/RootTools$Result.method.setProcess(Ljava/lang/Process;)Lcom/stericson/RootTools/IResult;
+0x0001fafc java   method  12 pbh  Lcom/stericson/RootTools/RootTools$Result.method.setProcess(Ljava/lang/Process;)Lcom/stericson/RootTools/IResult;
 0x0001fb18 java   method  13 p    Lcom/stericson/RootTools/RootTools$Result.method.setProcess(Ljava/lang/Process;)Lcom/stericson/RootTools/RootTools$Result;
 0x000044a8 java      var   0 P    Lcom/stericson/RootTools/RootTools$Result.ifield_data:Ljava/io/Serializable
 0x000044b0 java      var   1 P    Lcom/stericson/RootTools/RootTools$Result.ifield_error:I
@@ -1827,14 +1827,14 @@ EXPECT=<<EOF
 0x00020a64 java   method  11 pY   Ljavax/activation/MailcapCommandMap.method.getAllCommands(Ljava/lang/String;)[Ljavax/activation/CommandInfo;
 0x00020ae8 java   method  12 pY   Ljavax/activation/MailcapCommandMap.method.getCommand(Ljava/lang/String;Ljava/lang/String;)Ljavax/activation/CommandInfo;
 0x00020b80 java   method  13 pY   Ljavax/activation/MailcapCommandMap.method.getPreferredCommands(Ljava/lang/String;)[Ljavax/activation/CommandInfo;
-0x00004930 java      var   0 Psf  Ljavax/activation/MailcapCommandMap.sfield_DEF:I
-0x00004938 java      var   1 Psf  Ljavax/activation/MailcapCommandMap.sfield_HOME:I
-0x00004940 java      var   2 Psf  Ljavax/activation/MailcapCommandMap.sfield_JAR:I
-0x00004948 java      var   3 Psf  Ljavax/activation/MailcapCommandMap.sfield_PROG:I
-0x00004950 java      var   4 Psf  Ljavax/activation/MailcapCommandMap.sfield_SYS:I
+0x00004930 java      var   0 sPf  Ljavax/activation/MailcapCommandMap.sfield_DEF:I
+0x00004938 java      var   1 sPf  Ljavax/activation/MailcapCommandMap.sfield_HOME:I
+0x00004940 java      var   2 sPf  Ljavax/activation/MailcapCommandMap.sfield_JAR:I
+0x00004948 java      var   3 sPf  Ljavax/activation/MailcapCommandMap.sfield_PROG:I
+0x00004950 java      var   4 sPf  Ljavax/activation/MailcapCommandMap.sfield_SYS:I
 0x00004958 java      var   5 s    Ljavax/activation/MailcapCommandMap.sfield_class$javax$activation$MailcapCommandMap:Ljava/lang/Class
-0x00004960 java      var   6 Ps   Ljavax/activation/MailcapCommandMap.sfield_debug:Z
-0x00004968 java      var   7 Ps   Ljavax/activation/MailcapCommandMap.sfield_defDB:Lcom/sun/activation/registries/MailcapFile
+0x00004960 java      var   6 sP   Ljavax/activation/MailcapCommandMap.sfield_debug:Z
+0x00004968 java      var   7 sP   Ljavax/activation/MailcapCommandMap.sfield_defDB:Lcom/sun/activation/registries/MailcapFile
 0x00004928 java      var   8 P    Ljavax/activation/MailcapCommandMap.ifield_DB:[Lcom/sun/activation/registries/MailcapFile
 0x00008730 [0x00020c04 - 0x00020f7a]    886 java class 117 Ljavax/activation/MimetypesFileTypeMap :: Ljavax/activation/FileTypeMap;
 0x00020c04 java   method   0 sC   Ljavax/activation/MimetypesFileTypeMap.method.<clinit>()V
@@ -1846,14 +1846,14 @@ EXPECT=<<EOF
 0x00020e80 java   method   6 pY   Ljavax/activation/MimetypesFileTypeMap.method.addMimeTypes(Ljava/lang/String;)V
 0x00020edc java   method   7 p    Ljavax/activation/MimetypesFileTypeMap.method.getContentType(Ljava/io/File;)Ljava/lang/String;
 0x00020f00 java   method   8 pY   Ljavax/activation/MimetypesFileTypeMap.method.getContentType(Ljava/lang/String;)Ljava/lang/String;
-0x000049a8 java      var   0 Psf  Ljavax/activation/MimetypesFileTypeMap.sfield_DEF:I
-0x000049b0 java      var   1 Psf  Ljavax/activation/MimetypesFileTypeMap.sfield_HOME:I
-0x000049b8 java      var   2 Psf  Ljavax/activation/MimetypesFileTypeMap.sfield_JAR:I
-0x000049c0 java      var   3 Psf  Ljavax/activation/MimetypesFileTypeMap.sfield_PROG:I
-0x000049c8 java      var   4 Psf  Ljavax/activation/MimetypesFileTypeMap.sfield_SYS:I
+0x000049a8 java      var   0 sPf  Ljavax/activation/MimetypesFileTypeMap.sfield_DEF:I
+0x000049b0 java      var   1 sPf  Ljavax/activation/MimetypesFileTypeMap.sfield_HOME:I
+0x000049b8 java      var   2 sPf  Ljavax/activation/MimetypesFileTypeMap.sfield_JAR:I
+0x000049c0 java      var   3 sPf  Ljavax/activation/MimetypesFileTypeMap.sfield_PROG:I
+0x000049c8 java      var   4 sPf  Ljavax/activation/MimetypesFileTypeMap.sfield_SYS:I
 0x000049d0 java      var   5 s    Ljavax/activation/MimetypesFileTypeMap.sfield_class$javax$activation$MimetypesFileTypeMap:Ljava/lang/Class
-0x000049d8 java      var   6 Ps   Ljavax/activation/MimetypesFileTypeMap.sfield_defDB:Lcom/sun/activation/registries/MimeTypeFile
-0x000049e0 java      var   7 Ps   Ljavax/activation/MimetypesFileTypeMap.sfield_defaultType:Ljava/lang/String
+0x000049d8 java      var   6 sP   Ljavax/activation/MimetypesFileTypeMap.sfield_defDB:Lcom/sun/activation/registries/MimeTypeFile
+0x000049e0 java      var   7 sP   Ljavax/activation/MimetypesFileTypeMap.sfield_defaultType:Ljava/lang/String
 0x000049a0 java      var   8 P    Ljavax/activation/MimetypesFileTypeMap.ifield_DB:[Lcom/sun/activation/registries/MimeTypeFile
 0x00008750 [0x00020fa0 - 0x000210f2]    338 java class 118 Ljavax/activation/ObjectDataContentHandler :: Ljava/lang/Object;
 0x00020fa0 java   method   0 pC   Ljavax/activation/ObjectDataContentHandler.method.<init>(Ljavax/activation/DataContentHandler;Ljava/lang/Object;Ljava/lang/String;)V
@@ -1876,7 +1876,7 @@ EXPECT=<<EOF
 0x00004a08 java      var   0 P    Ljavax/activation/URLDataSource.ifield_url:Ljava/net/URL
 0x00004a10 java      var   1 P    Ljavax/activation/URLDataSource.ifield_url_conn:Ljava/net/URLConnection
 0x00008790 [0x00021210 - 0x00021262]     82 java class 120 Lorg/radare/radare2installer/Utils$1 :: Lcom/stericson/RootTools/Command;
-0x00021210 java   method   0 Cg   Lorg/radare/radare2installer/Utils$1.method.<init>(Lorg/radare/radare2installer/Utils;I[Ljava/lang/String;Ljava/lang/StringBuffer;)V
+0x00021210 java   method   0 gC   Lorg/radare/radare2installer/Utils$1.method.<init>(Lorg/radare/radare2installer/Utils;I[Ljava/lang/String;Ljava/lang/StringBuffer;)V
 0x00021230 java   method   1 p    Lorg/radare/radare2installer/Utils$1.method.output(ILjava/lang/String;)V
 0x00004d60 java      var   0 fh   Lorg/radare/radare2installer/Utils$1.ifield_this$0:Lorg/radare/radare2installer/Utils
 0x00004d68 java      var   1 fh   Lorg/radare/radare2installer/Utils$1.ifield_val$radare_output:Ljava/lang/StringBuffer

test/db/formats/dwarf

@@ -721,26 +721,26 @@ colu: 12
 addr: 0x00001149
 EOF
 EXPECT_ERR=<<EOF
-DEBUG: [cbin.c:3263] (section .dynstr) Css 141 @ 0x480
-DEBUG: [cbin.c:3263] (section .rela.dyn) Cd 8[24] @ 0x550
-DEBUG: [cbin.c:3263] (section .rela.plt) Cd 8[3] @ 0x610
-DEBUG: [cbin.c:3263] (section .init_array) Cd 8[1] @ 0x3db8
-DEBUG: [cbin.c:3263] (section .fini_array) Cd 8[1] @ 0x3dc0
-DEBUG: [cbin.c:3263] (section .dynamic) Cd 8[62] @ 0x3dc8
-DEBUG: [cbin.c:3263] (section .got) Cd 8[9] @ 0x3fb8
-DEBUG: [cbin.c:3263] (section .dynstr) Css 141 @ 0x480
-DEBUG: [cbin.c:3263] (section .rela.dyn) Cd 8[24] @ 0x550
-DEBUG: [cbin.c:3263] (section .rela.plt) Cd 8[3] @ 0x610
-DEBUG: [cbin.c:3263] (section .init_array) Cd 8[1] @ 0x3db8
-DEBUG: [cbin.c:3263] (section .fini_array) Cd 8[1] @ 0x3dc0
-DEBUG: [cbin.c:3263] (section .dynamic) Cd 8[62] @ 0x3dc8
-DEBUG: [cbin.c:3263] (section .got) Cd 8[9] @ 0x3fb8
-WARN: [cbin.c:1840] Relocs has not been applied. Please use `-e bin.relocs.apply=true` or `-e bin.cache=true` next time
-DEBUG: [cbin.c:2528] Cannot resolve symbol address __libc_start_main
-DEBUG: [cbin.c:2528] Cannot resolve symbol address _ITM_deregisterTMCloneTable
-DEBUG: [cbin.c:2528] Cannot resolve symbol address __gmon_start__
-DEBUG: [cbin.c:2528] Cannot resolve symbol address _ITM_registerTMCloneTable
-DEBUG: [cbin.c:2528] Cannot resolve symbol address __cxa_finalize
+DEBUG: [cbin.c:3268] (section .dynstr) Css 141 @ 0x480
+DEBUG: [cbin.c:3268] (section .rela.dyn) Cd 8[24] @ 0x550
+DEBUG: [cbin.c:3268] (section .rela.plt) Cd 8[3] @ 0x610
+DEBUG: [cbin.c:3268] (section .init_array) Cd 8[1] @ 0x3db8
+DEBUG: [cbin.c:3268] (section .fini_array) Cd 8[1] @ 0x3dc0
+DEBUG: [cbin.c:3268] (section .dynamic) Cd 8[62] @ 0x3dc8
+DEBUG: [cbin.c:3268] (section .got) Cd 8[9] @ 0x3fb8
+DEBUG: [cbin.c:3268] (section .dynstr) Css 141 @ 0x480
+DEBUG: [cbin.c:3268] (section .rela.dyn) Cd 8[24] @ 0x550
+DEBUG: [cbin.c:3268] (section .rela.plt) Cd 8[3] @ 0x610
+DEBUG: [cbin.c:3268] (section .init_array) Cd 8[1] @ 0x3db8
+DEBUG: [cbin.c:3268] (section .fini_array) Cd 8[1] @ 0x3dc0
+DEBUG: [cbin.c:3268] (section .dynamic) Cd 8[62] @ 0x3dc8
+DEBUG: [cbin.c:3268] (section .got) Cd 8[9] @ 0x3fb8
+WARN: [cbin.c:1845] Relocs has not been applied. Please use `-e bin.relocs.apply=true` or `-e bin.cache=true` next time
+DEBUG: [cbin.c:2533] Cannot resolve symbol address __libc_start_main
+DEBUG: [cbin.c:2533] Cannot resolve symbol address _ITM_deregisterTMCloneTable
+DEBUG: [cbin.c:2533] Cannot resolve symbol address __gmon_start__
+DEBUG: [cbin.c:2533] Cannot resolve symbol address _ITM_registerTMCloneTable
+DEBUG: [cbin.c:2533] Cannot resolve symbol address __cxa_finalize
 EOF
 RUN
 

test/db/formats/mach0/objc

@@ -45,7 +45,7 @@ NAME=objc method flags (ic*)
 FILE=bins/mach0/TestMethods
 CMDS=ic*~thisIsAClassMethod
 EXPECT=<<EOF
-"f method.ViewController.class.thisIsAClassMethod = 0x1000067bc"
+"f method.class.ViewController.thisIsAClassMethod = 0x1000067bc"
 EOF
 RUN
 

test/db/perf/dex

@@ -53,9 +53,9 @@ EXPECT=<<EOF
 |           0x0001564c      6e108c030400   invoke-virtual {v4}, Ljava/lang/StringBuilder.toString()Ljava/lang/String; ; 0x38c
 |           0x00015652      0c04           move-result-object v4
 |           0x00015654      6e2027024800   invoke-virtual {v8, v4}, Lcom/stericson/RootTools/SanityCheckRootTools.print(Ljava/lang/CharSequence;)V ; 0x227 ; method.protected.Lcom_stericson_RootTools_SanityCheckRootTools.Lcom_stericson_RootTools_SanityCheckRootTools.method.print_Ljava_lang_CharSequence__V
-|           0x0001565a      710049020000   invoke-static {}, Lcom/stericson/RootTools/Shell.startRootShell()Lcom/stericson/RootTools/Shell; ; 0x249 ; method.public.static.Lcom_stericson_RootTools_Shell.Lcom_stericson_RootTools_Shell.method.startRootShell__Lcom_stericson_RootTools_Shell_
+|           0x0001565a      710049020000   invoke-static {}, Lcom/stericson/RootTools/Shell.startRootShell()Lcom/stericson/RootTools/Shell; ; 0x249 ; method.static.public.Lcom_stericson_RootTools_Shell.Lcom_stericson_RootTools_Shell.method.startRootShell__Lcom_stericson_RootTools_Shell_
 |           ; CODE XREFS from entry0 @ +0xc8(x), +0xdc(x)
-|      ..-> 0x00015660      7100ee010000   invoke-static {}, Lcom/stericson/RootTools/RootTools.isAccessGiven()Z ; 0x1ee ; method.public.static.Lcom_stericson_RootTools_RootTools.Lcom_stericson_RootTools_RootTools.method.isAccessGiven__Z
+|      ..-> 0x00015660      7100ee010000   invoke-static {}, Lcom/stericson/RootTools/RootTools.isAccessGiven()Z ; 0x1ee ; method.static.public.Lcom_stericson_RootTools_RootTools.Lcom_stericson_RootTools_RootTools.method.isAccessGiven__Z
 |      ::   0x00015666      0a04           move-result v4
 |     ,===< 0x00015668      39041e00       if-nez v4, 0x000156a4
 |     |::   0x0001566c      1a044201       const-string v4, str.ERROR:_No_root_access_to_this_device. ; 0x2c9dd ; "&ERROR: No root access to this device.\n"

test/db/tools/rabin2

@@ -906,7 +906,7 @@ EXPECT=<<EOF
 0x00000afb java   method   5      $createCallSiteArray_1
 0x00000b6a java   method   6      $createCallSiteArray
 0x00000b99 java   method   7      $getCallSiteArray
-0x00000000 java      var   0 ps   __$stMC
+0x00000000 java      var   0      __$stMC
 EOF
 RUN