diff --git a/binr/r2agent/r2agent.c b/binr/r2agent/r2agent.c
index d66fe55c60..8f14f699a9 100644
--- a/binr/r2agent/r2agent.c
+++ b/binr/r2agent/r2agent.c
@@ -102,7 +102,9 @@ int main(int argc, char **argv) {
 		const char *result = page_index;
 
 		rs = r_socket_http_accept (s, 0, timeout);
-		if (!rs) continue;
+		if (!rs) {
+			continue;
+		}
 		if (!strcmp (rs->method, "GET")) {
 			if (!strncmp (rs->path, "/proc/kill/", 11)) {
 				// TODO: show page here?
diff --git a/binr/rabin2/rabin2.c b/binr/rabin2/rabin2.c
index d4327d9509..a2687afc1c 100644
--- a/binr/rabin2/rabin2.c
+++ b/binr/rabin2/rabin2.c
@@ -879,7 +879,9 @@ int main(int argc, char **argv) {
 			*p2++ = 0;
 			data = malloc (strlen (p2)+1);
 			datalen = r_hex_str2bin (p2, data);
-			if (datalen < 0) datalen = -datalen;
+			if (datalen < 0) {
+				datalen = -datalen;
+			}
 		} else {
 			data = NULL;
 			datalen = 0;
diff --git a/binr/radare2/radare2.c b/binr/radare2/radare2.c
index fe367cb5c4..50f92e0914 100644
--- a/binr/radare2/radare2.c
+++ b/binr/radare2/radare2.c
@@ -1427,12 +1427,16 @@ int main(int argc, char **argv, char **envp) {
 					r.num->value = 0;
 					break;
 				}
-				if (lock) r_th_lock_enter (lock);
+				if (lock) {
+					r_th_lock_enter (lock);
+				}
 				/* -1 means invalid command, -2 means quit prompt loop */
 				if ((ret = r_core_prompt_exec (&r)) == -2) {
 					break;
 				}
-				if (lock) r_th_lock_leave (lock);
+				if (lock) {
+					r_th_lock_leave (lock);
+				}
 				if (rabin_th && !r_th_wait_async (rabin_th)) {
 					// eprintf ("rabin thread end \n");
 					r_th_kill_free (rabin_th);
diff --git a/binr/rafind2/rafind2.c b/binr/rafind2/rafind2.c
index 1bac12ec94..535eb7da7d 100644
--- a/binr/rafind2/rafind2.c
+++ b/binr/rafind2/rafind2.c
@@ -83,7 +83,9 @@ static int hit(RSearchKeyword *kw, void *user, ut64 addr) {
 
 static int show_help(char *argv0, int line) {
 	printf ("Usage: %s [-mXnzZhqv] [-a align] [-b sz] [-f/t from/to] [-[e|s|S] str] [-x hex] file|dir ..\n", argv0);
-	if (line) return 0;
+	if (line) {
+		return 0;
+	}
 	printf (
 	" -a [align] only accept aligned hits\n"
 	" -b [size]  set block size\n"
@@ -136,7 +138,9 @@ static int rafind_open_file(char *file) {
 
 	r_cons_new ();
 	rs = r_search_new (mode);
-	if (!rs) return 1;
+	if (!rs) {
+		return 1;
+	}
 	buf = calloc (1, bsize);
 	if (!buf) {
 		eprintf ("Cannot allocate %"PFMT64d" bytes\n", bsize);
diff --git a/binr/ragg2/ragg2.c b/binr/ragg2/ragg2.c
index 94909becb1..c104e3dbc4 100644
--- a/binr/ragg2/ragg2.c
+++ b/binr/ragg2/ragg2.c
@@ -15,38 +15,39 @@ static int usage(int v) {
 	printf ("Usage: ragg2 [-FOLsrxhvz] [-a arch] [-b bits] [-k os] [-o file] [-I path]\n"
 		"             [-i sc] [-e enc] [-B hex] [-c k=v] [-C file] [-p pad] [-q off]\n"
 		"             [-q off] [-dDw off:hex] file|f.asm|-\n");
-	if (v) printf (
-	" -a [arch]       select architecture (x86, mips, arm)\n"
-	" -b [bits]       register size (32, 64, ..)\n"
-	" -B [hexpairs]   append some hexpair bytes\n"
-	" -c [k=v]        set configuration options\n"
-	" -C [file]       append contents of file\n"
-	" -d [off:dword]  patch dword (4 bytes) at given offset\n"
-	" -D [off:qword]  patch qword (8 bytes) at given offset\n"
-	" -e [encoder]    use specific encoder. see -L\n"
-	" -f [format]     output format (raw, c, pe, elf, mach0, python, javascript)\n"
-	" -F              output native format (osx=mach0, linux=elf, ..)\n"
-	" -h              show this help\n"
-	" -i [shellcode]  include shellcode plugin, uses options. see -L\n"
-	" -I [path]       add include path\n"
-	" -k [os]         operating system's kernel (linux,bsd,osx,w32)\n"
-	" -L              list all plugins (shellcodes and encoders)\n"
-	" -n [dword]      append 32bit number (4 bytes)\n"
-	" -N [dword]      append 64bit number (8 bytes)\n"
-	" -o [file]       output file\n"
-	" -O              use default output file (filename without extension or a.out)\n"
-	" -p [padding]    add padding after compilation (padding=n10s32)\n"
-	"                 ntas : begin nop, trap, 'a', sequence\n"
-	"                 NTAS : same as above, but at the end\n"
-	" -P [size]       prepend debruijn pattern\n"
-	" -q [fragment]   debruijn pattern offset\n"
-	" -r              show raw bytes instead of hexpairs\n"
-	" -s              show assembler\n"
-	" -v              show version\n"
-	" -w [off:hex]    patch hexpairs at given offset\n"
-	" -x              execute\n"
-	" -z              output in C string syntax\n"
-	);
+	if (v) {
+		printf (
+			" -a [arch]       select architecture (x86, mips, arm)\n"
+			" -b [bits]       register size (32, 64, ..)\n"
+			" -B [hexpairs]   append some hexpair bytes\n"
+			" -c [k=v]        set configuration options\n"
+			" -C [file]       append contents of file\n"
+			" -d [off:dword]  patch dword (4 bytes) at given offset\n"
+			" -D [off:qword]  patch qword (8 bytes) at given offset\n"
+			" -e [encoder]    use specific encoder. see -L\n"
+			" -f [format]     output format (raw, c, pe, elf, mach0, python, javascript)\n"
+			" -F              output native format (osx=mach0, linux=elf, ..)\n"
+			" -h              show this help\n"
+			" -i [shellcode]  include shellcode plugin, uses options. see -L\n"
+			" -I [path]       add include path\n"
+			" -k [os]         operating system's kernel (linux,bsd,osx,w32)\n"
+			" -L              list all plugins (shellcodes and encoders)\n"
+			" -n [dword]      append 32bit number (4 bytes)\n"
+			" -N [dword]      append 64bit number (8 bytes)\n"
+			" -o [file]       output file\n"
+			" -O              use default output file (filename without extension or a.out)\n"
+			" -p [padding]    add padding after compilation (padding=n10s32)\n"
+			"                 ntas : begin nop, trap, 'a', sequence\n"
+			"                 NTAS : same as above, but at the end\n"
+			" -P [size]       prepend debruijn pattern\n"
+			" -q [fragment]   debruijn pattern offset\n"
+			" -r              show raw bytes instead of hexpairs\n"
+			" -s              show assembler\n"
+			" -v              show version\n"
+			" -w [off:hex]    patch hexpairs at given offset\n"
+			" -x              execute\n"
+			" -z              output in C string syntax\n");
+	}
 	return 1;
 }
 
diff --git a/binr/rasm2/rasm2.c b/binr/rasm2/rasm2.c
index 38670c8a21..2e6bb5782d 100644
--- a/binr/rasm2/rasm2.c
+++ b/binr/rasm2/rasm2.c
@@ -84,8 +84,9 @@ static void rasm2_list(RAsm *la, const char *arch) {
 			if (h->cpus && !strcmp (arch, h->name)) {
 				char *c = strdup (h->cpus);
 				int n = r_str_split (c, ',');
-				for (i = 0; i < n; i++)
+				for (i = 0; i < n; i++) {
 					printf ("%s\n", r_str_word_get0 (c, i));
+				}
 				free (c);
 				break;
 			}
@@ -94,15 +95,29 @@ static void rasm2_list(RAsm *la, const char *arch) {
 			if (h->bits == 27) {
 				strcat (bits, "27");
 			} else {
-				if (h->bits & 8) strcat (bits, "8 ");
-				if (h->bits & 16) strcat (bits, "16 ");
-				if (h->bits & 32) strcat (bits, "32 ");
-				if (h->bits & 64) strcat (bits, "64 ");
+				if (h->bits & 8) {
+					strcat (bits, "8 ");
+				}
+				if (h->bits & 16) {
+					strcat (bits, "16 ");
+				}
+				if (h->bits & 32) {
+					strcat (bits, "32 ");
+				}
+				if (h->bits & 64) {
+					strcat (bits, "64 ");
+				}
 			}
 			feat = "__";
-			if (h->assemble && h->disassemble) feat = "ad";
-			if (h->assemble && !h->disassemble) feat = "a_";
-			if (!h->assemble && h->disassemble) feat = "_d";
+			if (h->assemble && h->disassemble) {
+				feat = "ad";
+			}
+			if (h->assemble && !h->disassemble) {
+				feat = "a_";
+			}
+			if (!h->assemble && h->disassemble) {
+				feat = "_d";
+			}
 			feat2 = has_esil (anal, h->name);
 			if (quiet) {
 				printf ("%s\n", h->name);
@@ -157,12 +172,15 @@ static int showanal(RAnal *lanal, RAnalOp *op, ut64 offset, ut8 *buf, int len, b
 			printf ("{\"opcode\": \"0x%08" PFMT64x "\",", offset);
 			printf ("\"bytes\": \"%s\",", bytes);
 			printf ("\"type\": \"%s\",", optype);
-			if (op->jump != -1LL)
+			if (op->jump != -1LL) {
 				printf ("{\"jump\": \"0x%08" PFMT64x ",", op->jump);
-			if (op->fail != -1LL)
+			}
+			if (op->fail != -1LL) {
 				printf ("{\"fail\": \"0x%08" PFMT64x ",", op->fail);
-			if (op->val != -1LL)
+			}
+			if (op->val != -1LL) {
 				printf ("{\"value\": \"0x%08" PFMT64x ",", op->val);
+			}
 			printf ("\"stackop\": \"%s\",", stackop);
 			printf ("\"esil\": \"%s\",", r_strbuf_get (&op->esil));
 			printf ("\"stackptr\": \"0x%08" PFMT64x "\"", op->stackptr);
@@ -171,14 +189,17 @@ static int showanal(RAnal *lanal, RAnalOp *op, ut64 offset, ut8 *buf, int len, b
 			printf ("offset:   0x%08" PFMT64x "\n", offset);
 			printf ("bytes:    %s\n", bytes);
 			printf ("type:     %s\n", optype);
-			if (op->jump != -1LL)
+			if (op->jump != -1LL) {
 				printf ("jump:     0x%08" PFMT64x "\n", op->jump);
-			if (op->fail != -1LL)
+			}
+			if (op->fail != -1LL) {
 				printf ("fail:     0x%08" PFMT64x "\n", op->fail);
+			}
 			//if (op->ref != -1LL)
 			//      printf ("ref:      0x%08"PFMT64x"\n", op->ref);
-			if (op->val != -1LL)
+			if (op->val != -1LL) {
 				printf ("value:    0x%08" PFMT64x "\n", op->val);
+			}
 			printf ("stackop:  %s\n", stackop);
 			printf ("esil:     %s\n", r_strbuf_get (&op->esil));
 			printf ("stackptr: %" PFMT64d "\n", op->stackptr);
@@ -332,7 +353,9 @@ static void print_buf(char *str) {
 			printf ("\\x%c%c", *str, str[1]);
 		}
 		printf ("\"\n");
-	} else printf ("%s\n", str);
+	} else {
+		printf ("%s\n", str);
+	}
 }
 
 static bool print_label(void *user, const char *k, void *v) {
@@ -443,8 +466,9 @@ int main (int argc, char *argv[]) {
 				&__lib_anal_cb, &__lib_anal_dt, NULL);
 
 		path = r_sys_getenv (R_LIB_ENV);
-		if (path && *path)
+		if (path && *path) {
 			r_lib_opendir (l, path);
+		}
 
 		if (1) {
 			char *homeplugindir = r_str_home (R2_HOME_PLUGINS);
@@ -544,7 +568,9 @@ int main (int argc, char *argv[]) {
 			break;
 		case 'O':
 			fd = open (optarg, O_TRUNC | O_RDWR | O_CREAT, 0644);
-			if (fd != -1) dup2 (fd, 1);
+			if (fd != -1) {
+				dup2 (fd, 1);
+			}
 			break;
 		case 'p':
 			use_spp = true;
@@ -595,8 +621,9 @@ int main (int argc, char *argv[]) {
 			goto beach;
 		}
 		r_anal_use (anal, arch);
-		if (!strcmp (arch, "bf"))
+		if (!strcmp (arch, "bf")) {
 			ascii = 1;
+		}
 	} else if (env_arch) {
 		if (!r_asm_use (a, env_arch)) {
 			eprintf ("rasm2: Unknown asm plugin '%s'\n", env_arch);
@@ -680,8 +707,9 @@ int main (int argc, char *argv[]) {
 			content = r_file_slurp (file, &length);
 
 			if (content) {
-				if (len && len > 0 && len < length)
+				if (len && len > 0 && len < length) {
 					length = len;
+				}
 				content[length] = '\0';
 				if (skip && length > skip) {
 					if (bin) {
@@ -710,7 +738,9 @@ int main (int argc, char *argv[]) {
 			int length;
 			do {
 				length = read (0, buf, sizeof (buf) - 1);
-				if (length < 1) break;
+				if (length < 1) {
+					break;
+				}
 				if (len > 0 && len < length) {
 					length = len;
 				}
@@ -726,8 +756,9 @@ int main (int argc, char *argv[]) {
 				}
 				if (!bin || !dis) {
 					int buflen = strlen ((const char *)buf);
-					if (buf[buflen] == '\n')
+					if (buf[buflen] == '\n') {
 						buf[buflen - 1] = '\0';
+					}
 				}
 				if (dis) {
 					ret = rasm_disasm ((char *)buf, offset, length, a->bits, ascii, bin, dis - 1);
diff --git a/libr/anal/anal_ex.c b/libr/anal/anal_ex.c
index 6b89398eb4..ba1a7af1cc 100644
--- a/libr/anal/anal_ex.c
+++ b/libr/anal/anal_ex.c
@@ -331,19 +331,25 @@ R_API ut64 r_anal_ex_map_anal_ex_to_anal_bb_type (ut64 ranal2_op_type) {
 		R_ANAL_OP_TYPE_COND : 0;
 	ut64 code_op_val = ranal2_op_type & (R_ANAL_EX_CODE_OP | 0x1FF);
 
-	if (conditional)
+	if (conditional) {
 		bb_type |= R_ANAL_BB_TYPE_COND;
-	if (ranal2_op_type & R_ANAL_EX_LOAD_OP)
+	}
+	if (ranal2_op_type & R_ANAL_EX_LOAD_OP) {
 		bb_type |= R_ANAL_BB_TYPE_LD;
-	if (ranal2_op_type & R_ANAL_EX_BIN_OP)
+	}
+	if (ranal2_op_type & R_ANAL_EX_BIN_OP) {
 		bb_type |= R_ANAL_BB_TYPE_BINOP;
-	if (ranal2_op_type & R_ANAL_EX_LOAD_OP)
+	}
+	if (ranal2_op_type & R_ANAL_EX_LOAD_OP) {
 		bb_type |= R_ANAL_BB_TYPE_LD;
-	if (ranal2_op_type & R_ANAL_EX_STORE_OP)
+	}
+	if (ranal2_op_type & R_ANAL_EX_STORE_OP) {
 		bb_type |= R_ANAL_BB_TYPE_ST;
+	}
 	/* mark bb with a comparison */
-	if (ranal2_op_type & R_ANAL_EX_BINOP_CMP)
+	if (ranal2_op_type & R_ANAL_EX_BINOP_CMP) {
 		bb_type |= R_ANAL_BB_TYPE_CMP;
+	}
 
 	/* change in control flow here */
 	if (code_op_val & R_ANAL_EX_CODEOP_JMP) {
@@ -362,11 +368,13 @@ R_API ut64 r_anal_ex_map_anal_ex_to_anal_bb_type (ut64 ranal2_op_type) {
 		bb_type |= R_ANAL_BB_TYPE_TAIL;
 	}
 
-	if ( ranal2_op_type  & R_ANAL_EX_UNK_OP && code_op_val & R_ANAL_EX_CODEOP_JMP)
+	if (ranal2_op_type & R_ANAL_EX_UNK_OP && code_op_val & R_ANAL_EX_CODEOP_JMP) {
 		bb_type |= R_ANAL_BB_TYPE_FOOT;
+	}
 
-	if ( conditional && code_op_val & R_ANAL_EX_CODEOP_JMP)
+	if (conditional && code_op_val & R_ANAL_EX_CODEOP_JMP) {
 		bb_type |= R_ANAL_BB_TYPE_BODY;
+	}
 
 	return bb_type;
 }
@@ -414,9 +422,15 @@ ut64 extract_load_store_op(ut64 ranal2_op_type) {
 
 
 ut64 extract_unknown_op(ut64 ranal2_op_type) {
-	if ( (ranal2_op_type & R_ANAL_EX_CODEOP_JMP) == R_ANAL_EX_CODEOP_JMP )  return R_ANAL_OP_TYPE_UJMP;
-	if ( (ranal2_op_type & R_ANAL_EX_CODEOP_CALL) == R_ANAL_EX_CODEOP_CALL) return R_ANAL_OP_TYPE_UCALL;
-	if ( (ranal2_op_type & R_ANAL_EX_LDST_OP_PUSH) == R_ANAL_EX_LDST_OP_PUSH) return R_ANAL_OP_TYPE_UPUSH;
+	if ((ranal2_op_type & R_ANAL_EX_CODEOP_JMP) == R_ANAL_EX_CODEOP_JMP) {
+		return R_ANAL_OP_TYPE_UJMP;
+	}
+	if ((ranal2_op_type & R_ANAL_EX_CODEOP_CALL) == R_ANAL_EX_CODEOP_CALL) {
+		return R_ANAL_OP_TYPE_UCALL;
+	}
+	if ((ranal2_op_type & R_ANAL_EX_LDST_OP_PUSH) == R_ANAL_EX_LDST_OP_PUSH) {
+		return R_ANAL_OP_TYPE_UPUSH;
+	}
 	return R_ANAL_OP_TYPE_UNK;
 }
 
diff --git a/libr/anal/cond.c b/libr/anal/cond.c
index 214f175920..06c9fd4083 100644
--- a/libr/anal/cond.c
+++ b/libr/anal/cond.c
@@ -29,14 +29,18 @@ R_API RAnalCond *r_anal_cond_new() {
 }
 
 R_API void r_anal_cond_fini (RAnalCond *c) {
-	if (!c) return;
+	if (!c) {
+		return;
+	}
 	r_anal_value_free (c->arg[0]);
 	r_anal_value_free (c->arg[1]);
 	c->arg[0] = c->arg[1] = NULL;
 }
 
 R_API void r_anal_cond_free (RAnalCond *c) {
-	if (!c) return;
+	if (!c) {
+		return;
+	}
 	r_anal_cond_fini (c);
 	free (c);
 }
@@ -44,7 +48,9 @@ R_API void r_anal_cond_free (RAnalCond *c) {
 // XXX?
 R_API RAnalCond *r_anal_cond_clone(RAnalCond *cond) {
 	RAnalCond *c = R_NEW (RAnalCond);
-	if (!c) return NULL;
+	if (!c) {
+		return NULL;
+	}
 	memcpy (c, cond, sizeof (RAnalCond));
 	return c;
 }
@@ -53,10 +59,11 @@ static inline const char *condstring(RAnalCond *cond) {
 	const char *condstr_single[] = { "!", "", "0<", "0<=", "0>", "0>=" };
 	const char *condstr[] = { "==", "!=", ">=", ">", "<=", "<" };
 	if (cond) {
-		if (cond->arg[1])
+		if (cond->arg[1]) {
 			return condstr[cond->type % 6];
-		else
+		} else {
 			return condstr_single[cond->type % 6];
+		}
 	}
 	return "";
 }
@@ -91,21 +98,24 @@ R_API int r_anal_cond_eval(RAnal *anal, RAnalCond *cond) {
 R_API char *r_anal_cond_to_string(RAnalCond *cond) {
 	char *val0, *val1, *out = NULL;
 	const char *cnd;
-	if (!cond)
+	if (!cond) {
 		return NULL;
+	}
 	cnd = condstring (cond);
 	val0 = r_anal_value_to_string (cond->arg[0]);
 	val1 = r_anal_value_to_string (cond->arg[1]);
 	if (val0) {
 		if (R_ANAL_COND_SINGLE (cond)) {
 			int val0len = strlen (val0) + 10;
-			if ((out = malloc (val0len)))
+			if ((out = malloc (val0len))) {
 				snprintf (out, val0len, "%s%s", cnd, val0);
+			}
 		} else {
 			if (val1) {
 				int val0len = strlen (val0) + strlen (val1) + 10;
-				if ((out = malloc (val0len)))
+				if ((out = malloc (val0len))) {
 					snprintf (out, val0len, "%s %s %s", val0, cnd, val1);
+				}
 			}
 		}
 	}
@@ -116,8 +126,9 @@ R_API char *r_anal_cond_to_string(RAnalCond *cond) {
 
 R_API RAnalCond *r_anal_cond_new_from_op(RAnalOp *op) {
 	RAnalCond *cond;
-	if (!(cond = r_anal_cond_new ()))
+	if (!(cond = r_anal_cond_new ())) {
 		return NULL;
+	}
 	//v->reg[0] = op->src[0];
 	//v->reg[1] = op->src[1];
 	cond->arg[0] = op->src[0];
diff --git a/libr/anal/cycles.c b/libr/anal/cycles.c
index 2e7e8eef97..1dbe08e3f4 100644
--- a/libr/anal/cycles.c
+++ b/libr/anal/cycles.c
@@ -16,7 +16,9 @@ R_API RAnalCycleFrame *r_anal_cycle_frame_new() {
 }
 
 R_API void r_anal_cycle_frame_free(RAnalCycleFrame *cf) {
-	if (!cf) return;
+	if (!cf) {
+		return;
+	}
 	r_list_free (cf->hooks);
 	free (cf);
 }
diff --git a/libr/anal/data.c b/libr/anal/data.c
index 803967a2f0..5af551ac06 100644
--- a/libr/anal/data.c
+++ b/libr/anal/data.c
@@ -5,7 +5,9 @@
 #define MINLEN 1
 static int is_string(const ut8 *buf, int size, int *len) {
 	int i;
-	if (size < 1) return 0;
+	if (size < 1) {
+		return 0;
+	}
 	if (size > 3 && buf[0] && !buf[1] && buf[2] && !buf[3]) {
 		*len = 1; // XXX: TODO: Measure wide string length
 		return 2; // is wide
@@ -42,8 +44,12 @@ static int is_null(const ut8 *buf, int size) {
 }
 
 static int is_invalid(const ut8 *buf, int size) {
-	if (size < 1) return 1;
-	if (size > 8) size = 8;
+	if (size < 1) {
+		return 1;
+	}
+	if (size > 8) {
+		size = 8;
+	}
 	return (!memcmp (buf, "\xff\xff\xff\xff\xff\xff\xff\xff", size))? 1: 0;
 }
 
@@ -52,10 +58,13 @@ static ut64 is_pointer(RAnal *anal, const ut8 *buf, int size) {
 	ut64 n;
 	ut8 buf2[32];
 	RIOBind *iob = &anal->iob;
-	if (size > sizeof (buf2))
+	if (size > sizeof (buf2)) {
 		size = sizeof (buf2);
+	}
 	n = r_mem_get_num (buf, size);
-	if (!n) return 1; // null pointer
+	if (!n) {
+		return 1; // null pointer
+	}
 #if USE_IS_VALID_OFFSET
 	int r = iob->is_valid_offset (iob->io, n, 0);
 	return r? n: 0LL;
@@ -94,7 +103,9 @@ R_API char *r_anal_data_to_string(RAnalData *d, RConsPrintablePalette *pal) {
 	ut32 n32;
 	char *line;
 
-	if (!d) return NULL;
+	if (!d) {
+		return NULL;
+	}
 
 	line = malloc (mallocsz);
 	if (!line) {
@@ -203,7 +214,9 @@ R_API char *r_anal_data_to_string(RAnalData *d, RConsPrintablePalette *pal) {
 
 R_API RAnalData *r_anal_data_new_string(ut64 addr, const char *p, int len, int type) {
 	RAnalData *ad = R_NEW0 (RAnalData);
-	if (!ad) return NULL;
+	if (!ad) {
+		return NULL;
+	}
 	ad->str = NULL;
 	ad->addr = addr;
 	ad->type = type;
@@ -330,7 +343,9 @@ R_API RAnalData *r_anal_data(RAnal *anal, ut64 addr, const ut8 *buf, int size, i
 	}
 	if (size >= word) {
 		n = is_number (buf, word);
-		if (n) return r_anal_data_new (addr, R_ANAL_DATA_TYPE_NUMBER, n, buf, word);
+		if (n) {
+			return r_anal_data_new (addr, R_ANAL_DATA_TYPE_NUMBER, n, buf, word);
+		}
 	}
 	return r_anal_data_new (addr, R_ANAL_DATA_TYPE_UNKNOWN, dst, buf, R_MIN (word, size));
 }
@@ -344,8 +359,9 @@ R_API const char *r_anal_data_kind(RAnal *a, ut64 addr, const ut8 *buf, int len)
 	RAnalData *data;
 	int word = a->bits / 8;
 	for (i = j = 0; i < len; j++) {
-		if (str && !buf[i])
+		if (str && !buf[i]) {
 			str++;
+		}
 		data = r_anal_data (a, addr + i, buf + i, len - i, 0);
 		if (!data) {
 			i += word;
@@ -357,7 +373,9 @@ R_API const char *r_anal_data_kind(RAnal *a, ut64 addr, const ut8 *buf, int len)
 			i += word;
 			break;
 		case R_ANAL_DATA_TYPE_NUMBER:
-			if (data->ptr > 1000) num++;
+			if (data->ptr > 1000) {
+				num++;
+			}
 			i += word;
 			break;
 		case R_ANAL_DATA_TYPE_UNKNOWN:
@@ -367,7 +385,9 @@ R_API const char *r_anal_data_kind(RAnal *a, ut64 addr, const ut8 *buf, int len)
 		case R_ANAL_DATA_TYPE_STRING:
 			if (data->len > 0) {
 				i += data->len;
-			} else i += word;
+			} else {
+				i += word;
+			}
 			str++;
 			break;
 		default:
@@ -375,10 +395,20 @@ R_API const char *r_anal_data_kind(RAnal *a, ut64 addr, const ut8 *buf, int len)
 		}
 		r_anal_data_free (data);
 	}
-	if (j < 1) return "unknown";
-	if ((inv * 100 / j) > 60) return "invalid";
-	if ((unk * 100 / j) > 60) return "code";
-	if ((num * 100 / j) > 60) return "code";
-	if ((str * 100 / j) > 40) return "text";
+	if (j < 1) {
+		return "unknown";
+	}
+	if ((inv * 100 / j) > 60) {
+		return "invalid";
+	}
+	if ((unk * 100 / j) > 60) {
+		return "code";
+	}
+	if ((num * 100 / j) > 60) {
+		return "code";
+	}
+	if ((str * 100 / j) > 40) {
+		return "text";
+	}
 	return "data";
 }
diff --git a/libr/anal/diff.c b/libr/anal/diff.c
index b40060b904..eea90e2da0 100644
--- a/libr/anal/diff.c
+++ b/libr/anal/diff.c
@@ -98,8 +98,9 @@ R_API int r_anal_diff_fingerprint_fcn(RAnal *anal, RAnalFunction *fcn) {
 	r_list_foreach (fcn->bbs, iter, bb) {
 		len += bb->size;
 		fcn->fingerprint = realloc (fcn->fingerprint, len + 1);
-		if (!fcn->fingerprint)
+		if (!fcn->fingerprint) {
 			return 0;
+		}
 		memcpy (fcn->fingerprint+len-bb->size, bb->fingerprint, bb->size);
 	}
 	return len;
diff --git a/libr/anal/esil.c b/libr/anal/esil.c
index ed6fab016c..c8c0904d68 100644
--- a/libr/anal/esil.c
+++ b/libr/anal/esil.c
@@ -30,7 +30,9 @@ static inline ut64 genmask(int bits) {
 	ut64 m = UT64_MAX;
 	if (bits < 64) {
 		m = (ut64)(((ut64)(2) << bits) - 1);
-		if (!m) m = UT64_MAX;
+		if (!m) {
+			m = UT64_MAX;
+		}
 	}
 	return m;
 }
@@ -169,12 +171,14 @@ R_API int r_anal_esil_fire_interrupt(RAnalEsil *esil, int interrupt) {
 	if (esil->anal) {
 		RAnalPlugin *ap = esil->anal->cur;
 		if (ap && ap->esil_intr) {
-			if (ap->esil_intr (esil, interrupt))
+			if (ap->esil_intr (esil, interrupt)) {
 				return true;
+			}
 		}
 	}
-	if (!esil->interrupts)
+	if (!esil->interrupts) {
 		return false;
+	}
 	i = sdb_itoa ((ut64)interrupt, t, 16);
 	if (!sdb_num_exists (esil->interrupts, i)) {
 		//eprintf ("0x%08"PFMT64x" Invalid interrupt/syscall 0x%08x\n", esil->address, interrupt);
@@ -409,8 +413,12 @@ R_API int r_anal_esil_mem_write(RAnalEsil *esil, ut64 addr, const ut8 *buf, int
 static int internal_esil_reg_read(RAnalEsil *esil, const char *regname, ut64 *num, int *size) {
 	RRegItem *reg = r_reg_get (esil->anal->reg, regname, -1);
 	if (reg) {
-		if (size) *size = reg->size;
-		if (num) *num = r_reg_get_value (esil->anal->reg, reg);
+		if (size) {
+			*size = reg->size;
+		}
+		if (num) {
+			*num = r_reg_get_value (esil->anal->reg, reg);
+		}
 		return true;
 	}
 	return false;
@@ -530,8 +538,9 @@ R_API int r_anal_esil_get_parm_type(RAnalEsil *esil, const char *str) {
 	}
 	return R_ANAL_ESIL_PARM_NUM;
 not_a_number:
-	if (r_reg_get (esil->anal->reg, str, -1))
+	if (r_reg_get (esil->anal->reg, str, -1)) {
 		return R_ANAL_ESIL_PARM_REG;
+	}
 	return R_ANAL_ESIL_PARM_INVALID;
 }
 
@@ -657,11 +666,15 @@ R_API int r_anal_esil_get_parm_size(RAnalEsil *esil, const char *str, ut64 *num,
 	switch (parm_type) {
 	case R_ANAL_ESIL_PARM_INTERNAL:
 		// *num = esil_internal_read (esil, str, num);
-		if (size) *size = esil->anal->bits;
+		if (size) {
+			*size = esil->anal->bits;
+		}
 		return esil_internal_read (esil, str, num);
 	case R_ANAL_ESIL_PARM_NUM:
 		*num = r_num_get (NULL, str);
-		if (size) *size = esil->anal->bits;
+		if (size) {
+			*size = esil->anal->bits;
+		}
 		return true;
 	case R_ANAL_ESIL_PARM_REG:
 		if (!r_anal_esil_reg_read (esil, str, num, size)) {
@@ -716,7 +729,9 @@ R_API int r_anal_esil_reg_read(RAnalEsil *esil, const char *regname, ut64 *num,
 		}
 		return esil_internal_read (esil, regname, num);
 	}
-	if (!num) num = &localnum;
+	if (!num) {
+		num = &localnum;
+	}
 	*num = 0LL;
 	if (size) {
 		*size = esil->anal->bits;
@@ -1404,8 +1419,9 @@ static int esil_break(RAnalEsil *esil) {
 
 static int esil_clear(RAnalEsil *esil) {
 	char *r;
-	while ((r = r_anal_esil_pop (esil)))
+	while ((r = r_anal_esil_pop (esil))) {
 		free (r);
+	}
 	return 1;
 }
 
@@ -2022,7 +2038,9 @@ static int esil_mem_oreq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);		//push the new dst-value
 			r_anal_esil_push (esil, dst);		//push the dst-addr
 			ret &= (!!esil_poke_n (esil, bits));	//write
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
 	if (!ret) {
 		ERR ("esil_mem_oreq_n: invalid parameters");
@@ -2066,7 +2084,9 @@ static int esil_mem_xoreq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
 	if (!ret) {
 		ERR ("esil_mem_xoreq_n: invalid parameters");
@@ -2110,7 +2130,9 @@ static int esil_mem_andeq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
 	if (!ret) {
 		ERR ("esil_mem_andeq_n: invalid parameters");
@@ -2154,10 +2176,13 @@ static int esil_mem_addeq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_addeq_n: invalid parameters");
+	}
 	free (dst);
 	free (src0);
 	free (src1);
@@ -2197,10 +2222,13 @@ static int esil_mem_subeq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_subeq_n: invalid parameters");
+	}
 	free (dst);
 	free (src0);
 	free (src1);
@@ -2298,11 +2326,14 @@ static int esil_mem_diveq_n(RAnalEsil *esil, int bits) {
 				r_anal_esil_pushnum (esil, d);
 				r_anal_esil_push (esil, dst);
 				ret &= (!!esil_poke_n (esil, bits));
-			} else ret = 0;
+			} else {
+				ret = 0;
+			}
 		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_diveq_n: invalid parameters");
+	}
 	free (dst);
 	free (src0);
 	free (src1);
@@ -2342,10 +2373,13 @@ static int esil_mem_muleq_n(RAnalEsil *esil, int bits, ut64 bitmask) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_muleq_n: invalid parameters");
+	}
 	free (dst);
 	free (src0);
 	free (src1);
@@ -2391,10 +2425,13 @@ static int esil_mem_inceq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, s);
 			r_anal_esil_push (esil, off);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_inceq_n: invalid parameters");
+	}
 	free (src);
 	free (off);
 	return ret;
@@ -2432,10 +2469,13 @@ static int esil_mem_deceq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, s);
 			r_anal_esil_push (esil, off);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_deceq_n: invalid parameters");
+	}
 	free (src);
 	free (off);
 	return ret;
@@ -2528,10 +2568,13 @@ static int esil_mem_lsreq_n(RAnalEsil *esil, int bits) {
 			r_anal_esil_pushnum (esil, d);
 			r_anal_esil_push (esil, dst);
 			ret &= (!!esil_poke_n (esil, bits));
-		} else ret = 0;
+		} else {
+			ret = 0;
+		}
 	}
-	if (!ret)
+	if (!ret) {
 		ERR ("esil_mem_lsreq_n: invalid parameters");
+	}
 	free (dst);
 	free (src0);
 	free (src1);
@@ -2558,10 +2601,12 @@ static int esil_mem_lsreq(RAnalEsil *esil) {
 static int esil_num(RAnalEsil *esil) {
 	char *dup_me;
 	ut64 dup;
-	if (!esil)
+	if (!esil) {
 		return false;
-	if (!(dup_me = r_anal_esil_pop (esil)))
+	}
+	if (!(dup_me = r_anal_esil_pop (esil))) {
 		return false;
+	}
 	if (!r_anal_esil_get_parm (esil, dup_me, &dup)) {
 		free (dup_me);
 		return false;
@@ -2807,7 +2852,9 @@ static int runword(RAnalEsil *esil, const char *word) {
 			r_anal_esil_parse (esil, esil->Reil->if_buf);
 			return 1;
 		}
-		if (iscommand (esil, word, &op)) esil->Reil->cmd_count++;
+		if (iscommand (esil, word, &op)) {
+			esil->Reil->cmd_count++;
+		}
 		return 1;
 	}
 
@@ -2852,8 +2899,9 @@ static const char *gotoWord(const char *str, int n) {
 	const char *ostr = str;
 	int count = 0;
 	while (*str) {
-		if (count == n)
+		if (count == n) {
 			return ostr;
+		}
 		str++;
 		if (*str == ',') {
 			ostr = str + 1;
@@ -3018,7 +3066,9 @@ R_API int r_anal_esil_condition(RAnalEsil *esil, const char *str) {
 	if (!esil) {
 		return false;
 	}
-	while (*str == ' ') str++; // use proper string chop?
+	while (*str == ' ') {
+		str++; // use proper string chop?
+	}
 	(void) r_anal_esil_parse (esil, str);
 	popped = r_anal_esil_pop (esil);
 	if (popped) {
@@ -3171,7 +3221,9 @@ static void r_anal_esil_setup_ops(RAnalEsil *esil) {
 
 /* register callbacks using this anal module. */
 R_API int r_anal_esil_setup(RAnalEsil *esil, RAnal *anal, int romem, int stats, int nonull) {
-	if (!esil) return false;
+	if (!esil) {
+		return false;
+	}
 	//esil->debug = 0;
 	esil->anal = anal;
 	esil->parse_goto_count = anal->esil_goto_limit;
diff --git a/libr/anal/esil2reil.c b/libr/anal/esil2reil.c
index 83128f5e55..6efa58eca3 100644
--- a/libr/anal/esil2reil.c
+++ b/libr/anal/esil2reil.c
@@ -66,7 +66,9 @@ RAnalReilArg *reil_pop_arg(RAnalEsil *esil) {
 			continue;
 		}
 		// Strip all spaces
-		if (buf[i] == ' ') continue;
+		if (buf[i] == ' ') {
+			continue;
+		}
 		tmp_buf[j] = buf[i];
 		j++;
 	}
@@ -99,7 +101,9 @@ void get_next_temp_reg(RAnalEsil *esil, char *buf) {
 }
 
 void reil_make_arg(RAnalEsil *esil, RAnalReilArg *arg, char *name) {
-	if (!arg) return;
+	if (!arg) {
+		return;
+	}
 	RAnalReilArgType type;
 	type = reil_get_arg_type(esil, name);
 	arg->size = 0;
@@ -110,7 +114,9 @@ void reil_make_arg(RAnalEsil *esil, RAnalReilArg *arg, char *name) {
 
 // Free ins and all its arguments
 void reil_free_inst(RAnalReilInst *ins) {
-	if (!ins) return;
+	if (!ins) {
+		return;
+	}
 	if (ins->arg[0]) R_FREE(ins->arg[0]);
 	if (ins->arg[1]) R_FREE(ins->arg[1]);
 	if (ins->arg[2]) R_FREE(ins->arg[2]);
@@ -166,18 +172,22 @@ void reil_cast_size(RAnalEsil *esil, RAnalReilArg *src, RAnalReilArg *dst) {
 	snprintf (tmp_buf, REGBUFSZ-1, "0:%d", dst->size);
 	r_anal_esil_push (esil, tmp_buf);
 	ins = R_NEW0 (RAnalReilInst);
-	if (!ins) return;
+	if (!ins) {
+		return;
+	}
 	ins->opcode = REIL_OR;
 	ins->arg[0] = src;
 	ins->arg[1] = reil_pop_arg (esil);
 	ins->arg[2] = R_NEW0(RAnalReilArg);
 	get_next_temp_reg (esil, tmp_buf);
 	reil_make_arg (esil, ins->arg[2], tmp_buf);
-	if (ins->arg[2])
+	if (ins->arg[2]) {
 		ins->arg[2]->size = dst->size;
+	}
 	reil_print_inst (esil, ins);
-	if (ins->arg[2])
+	if (ins->arg[2]) {
 		reil_push_arg (esil, ins->arg[2]);
+	}
 	reil_free_inst (ins);
 }
 
@@ -189,7 +199,9 @@ static int reil_eq(RAnalEsil *esil) {
 	RAnalReilArg *dst, *src;
 
 	dst = reil_pop_arg (esil);
-	if (!dst) return false;
+	if (!dst) {
+		return false;
+	}
 	src = reil_pop_arg (esil);
 	if (!src) {
 		R_FREE (dst);
@@ -205,7 +217,9 @@ static int reil_eq(RAnalEsil *esil) {
 	} else if (src_type == ARG_REG) {
 		// No direct register to register transfer.
 		ins = R_NEW0 (RAnalReilInst);
-		if (!ins) return false;
+		if (!ins) {
+			return false;
+		}
 		ins->opcode = REIL_STR;
 		ins->arg[0] = src;
 		ins->arg[1] = R_NEW0 (RAnalReilArg);
@@ -307,7 +321,9 @@ static int reil_binop(RAnalEsil *esil, RAnalReilOpcode opcode) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg(esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg(esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -336,11 +352,13 @@ static int reil_binop(RAnalEsil *esil, RAnalReilOpcode opcode) {
 	reil_make_arg(esil, ins->arg[2], tmp_buf);
 	// Choose the larger of the two sizes as the size of dst
 	dst_size = ins->arg[0]->size;
-	if (dst_size < ins->arg[1]->size)
+	if (dst_size < ins->arg[1]->size) {
 		dst_size = ins->arg[1]->size;
+	}
 	// REIL_LT has a dst_size of 1.
-	if (opcode == REIL_LT)
+	if (opcode == REIL_LT) {
 		dst_size = 1;
+	}
 	ins->arg[2]->size = dst_size;
 	reil_print_inst(esil, ins);
 	reil_push_arg(esil, ins->arg[2]);
@@ -352,7 +370,9 @@ static int reil_binop(RAnalEsil *esil, RAnalReilOpcode opcode) {
 static int reil_bineqop(RAnalEsil *esil, RAnalReilOpcode opcode) {
 	int ret = 1;
 	RAnalReilArg *op = reil_pop_arg(esil);
-	if (!op) return false;
+	if (!op) {
+		return false;
+	}
 
 	reil_push_arg(esil, op);
 	ret &= reil_binop(esil, opcode);
@@ -388,7 +408,9 @@ static int reil_cmp(RAnalEsil *esil) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg (esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg (esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -432,7 +454,9 @@ static int reil_smaller_equal(RAnalEsil *esil) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg(esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg(esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -474,7 +498,9 @@ static int reil_larger_equal(RAnalEsil *esil) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg(esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg(esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -516,7 +542,9 @@ static int reil_deceq(RAnalEsil *esil) {
 
 static int reil_inc(RAnalEsil *esil) {
 	RAnalReilArg *op = reil_pop_arg(esil);
-	if (!op) return false;
+	if (!op) {
+		return false;
+	}
 
 	r_anal_esil_pushnum(esil, 1);
 	reil_push_arg(esil, op);
@@ -565,8 +593,9 @@ static int reil_neg(RAnalEsil *esil) {
 	}
 	get_next_temp_reg (esil, tmp_buf);
 	reil_make_arg(esil, ins->arg[2], tmp_buf);
-	if (ins->arg[0]->size < ins->arg[1]->size)
+	if (ins->arg[0]->size < ins->arg[1]->size) {
 		ins->arg[1]->size = ins->arg[0]->size;
+	}
 
 	ins->arg[2]->size = 1;
 	reil_print_inst (esil, ins);
@@ -577,7 +606,9 @@ static int reil_neg(RAnalEsil *esil) {
 
 static int reil_negeq(RAnalEsil *esil) {
 	RAnalReilArg *op = reil_pop_arg(esil);
-	if (!op) return false;
+	if (!op) {
+		return false;
+	}
 	reil_push_arg (esil, op);
 	reil_neg (esil);
 	reil_push_arg (esil, op);
@@ -590,7 +621,9 @@ static int reil_not(RAnalEsil *esil) {
 	char tmp_buf[REGBUFSZ];
 	RAnalReilInst *ins;
 	RAnalReilArg *op = reil_pop_arg (esil);
-	if (!op) return false;
+	if (!op) {
+		return false;
+	}
 
 	ins = R_NEW0 (RAnalReilInst);
 	if (!ins) {
@@ -624,7 +657,9 @@ static int reil_if(RAnalEsil *esil) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg (esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg (esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -657,7 +692,9 @@ static int reil_peek(RAnalEsil *esil) {
 	RAnalReilInst *ins;
 	char tmp_buf[REGBUFSZ];
 	RAnalReilArg *op1 = reil_pop_arg(esil);
-	if (!op1) return false;
+	if (!op1) {
+		return false;
+	}
 
 	ins = R_NEW0 (RAnalReilInst);
 	if (!ins) {
@@ -690,7 +727,9 @@ static int reil_peek(RAnalEsil *esil) {
 static int reil_peekn(RAnalEsil *esil, ut8 n) {
 	RAnalReilArg *op2;
 	RAnalReilArg *op1 = reil_pop_arg (esil);
-	if (!op1) return false;
+	if (!op1) {
+		return false;
+	}
 
 	reil_push_arg (esil, op1);
 	reil_peek (esil);
@@ -702,7 +741,9 @@ static int reil_peekn(RAnalEsil *esil, ut8 n) {
 
 	R_FREE (op1);
 	op1 = reil_pop_arg (esil);
-	if (!op1) return false;
+	if (!op1) {
+		return false;
+	}
 
 	op2 = R_NEW0 (RAnalReilArg);
 	if (!op2) {
@@ -731,7 +772,9 @@ static int reil_poken(RAnalEsil *esil, ut8 n) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg (esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg (esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -784,7 +827,9 @@ static int reil_poken(RAnalEsil *esil, ut8 n) {
 	}
 
 	ins = R_NEW0 (RAnalReilInst);
-	if (!ins) return false;
+	if (!ins) {
+		return false;
+	}
 	ins->opcode = REIL_STM;
 	ins->arg[2] = reil_pop_arg (esil);
 	ins->arg[0] = reil_pop_arg (esil);
@@ -814,7 +859,9 @@ static int reil_mem_bineq_n(RAnalEsil *esil, RAnalReilOpcode opcode, ut8 size) {
 	RAnalReilArg *op2, *op1;
 
 	op2 = reil_pop_arg (esil);
-	if (!op2) return false;
+	if (!op2) {
+		return false;
+	}
 	op1 = reil_pop_arg (esil);
 	if (!op1) {
 		R_FREE (op2);
@@ -872,7 +919,9 @@ static int reil_mem_muleq8(RAnalEsil *esil) { return reil_mem_bineq_n(esil, REIL
 static int reil_mem_inceq_n(RAnalEsil *esil, ut8 size) {
 	int ret = 1;
 	RAnalReilArg *op1 = reil_pop_arg(esil);
-	if (!op1) return false;
+	if (!op1) {
+		return false;
+	}
 
 	r_anal_esil_pushnum(esil, 1);
 	reil_push_arg(esil, op1);
@@ -893,7 +942,9 @@ static int reil_mem_inceq8(RAnalEsil *esil) { return reil_mem_inceq_n(esil, 8);
 static int reil_mem_deceq_n(RAnalEsil *esil, ut8 size) {
 	int ret = 1;
 	RAnalReilArg *op1 = reil_pop_arg(esil);
-	if (!op1) return false;
+	if (!op1) {
+		return false;
+	}
 
 	r_anal_esil_pushnum(esil, 1);
 	reil_push_arg(esil, op1);
@@ -976,7 +1027,9 @@ void reil_generate_partity_flag(RAnalEsil *esil) {
 	r_anal_esil_pushnum(esil, 0xff);
 	reil_and(esil);
 	op = reil_pop_arg(esil);
-	if (!op) return;
+	if (!op) {
+		return;
+	}
 
 	r_anal_esil_pushnum(esil, 7);
 	reil_push_arg(esil, op);
@@ -1029,7 +1082,9 @@ void reil_generate_signature(RAnalEsil *esil) {
 	reil_and(esil);
 
 	op = reil_pop_arg(esil);
-	if (!op) return;
+	if (!op) {
+		return;
+	}
 
 	r_anal_esil_pushnum(esil, esil->Reil->lastsz - 1);
 	reil_push_arg(esil, op);
@@ -1039,8 +1094,9 @@ void reil_generate_signature(RAnalEsil *esil) {
 }
 
 void reil_generate_overflow_flag(RAnalEsil *esil) {
-	if (esil->Reil->lastsz < 2)
-		r_anal_esil_pushnum(esil, 0);
+	if (esil->Reil->lastsz < 2) {
+		r_anal_esil_pushnum (esil, 0);
+	}
 
 	reil_generate_borrow_flag(esil, esil->Reil->lastsz);
 	reil_generate_carry_flag(esil, esil->Reil->lastsz - 2);
diff --git a/libr/anal/esil_stats.c b/libr/anal/esil_stats.c
index 00e1662aa8..3b8bb34c95 100644
--- a/libr/anal/esil_stats.c
+++ b/libr/anal/esil_stats.c
@@ -48,9 +48,11 @@ R_API void r_anal_esil_mem_ro(RAnalEsil *esil, int mem_readonly) {
 
 R_API void r_anal_esil_stats(RAnalEsil *esil, int enable) {
 	if (enable) {
-		if (esil->stats) 
+		if (esil->stats) {
 			sdb_reset (esil->stats);
-		else esil->stats = sdb_new0();
+		} else {
+			esil->stats = sdb_new0 ();
+		}
 		// reset sdb->stats
 		esil->cb.hook_reg_read = hook_reg_read;
 		esil->cb.hook_mem_read = hook_mem_read;
diff --git a/libr/anal/labels.c b/libr/anal/labels.c
index 8c70695ff7..2e2e5e18f5 100644
--- a/libr/anal/labels.c
+++ b/libr/anal/labels.c
@@ -40,8 +40,9 @@ R_API int r_anal_fcn_label_set (RAnal *anal, RAnalFunction *fcn, const char *nam
 }
 
 R_API int r_anal_fcn_label_del (RAnal *anal, RAnalFunction *fcn, const char *name, ut64 addr) {
-	if (!anal || !fcn || !name)
+	if (!anal || !fcn || !name) {
 		return false;
+	}
 	sdb_array_remove (DB, LABELS, ADDRLABEL (addr, name), 0);
 	sdb_unset (DB, LABEL (name), 0);
 	sdb_unset (DB, ADDR (addr), 0);
@@ -61,8 +62,9 @@ R_API int r_anal_fcn_labels(RAnal *anal, RAnalFunction *fcn, int rad) {
 				char *name;
 			} loc;
 			token = strchr (cur, '/');
-			if (!token)
+			if (!token) {
 				break;
+			}
 			*token = ',';
 			sdb_fmt_tobin (cur, "qz", &loc);
 			switch (rad) {
diff --git a/libr/anal/meta.c b/libr/anal/meta.c
index be732ff0c8..defa731f27 100644
--- a/libr/anal/meta.c
+++ b/libr/anal/meta.c
@@ -226,7 +226,9 @@ R_API int r_meta_del(RAnal *a, int type, ut64 addr, ut64 size) {
 						"meta.%c.0x%"PFMT64x,
 						type, sdb_atoi (s));
 					sdb_unset (DB, key, 0);
-					if (!next) break;
+					if (!next) {
+						break;
+					}
 				}
 				free (dtr);
 			}
@@ -298,7 +300,9 @@ R_API void r_meta_item_free(void *_item) {
 
 R_API RAnalMetaItem *r_meta_item_new(int type) {
 	RAnalMetaItem *mi = R_NEW0 (RAnalMetaItem);
-	if (mi) mi->type = type;
+	if (mi) {
+		mi->type = type;
+	}
 	return mi;
 }
 
@@ -558,7 +562,9 @@ R_API void r_meta_print(RAnal *a, RAnalMetaItem *d, int rad, bool show_full) {
 				{
 				const char *type = r_meta_type_to_string (d->type);
 				char *s = sdb_encode ((const ut8*)pstr, -1);
-				if (!s) s = strdup (pstr);
+				if (!s) {
+					s = strdup (pstr);
+				}
 				if (rad) {
 					if (!strcmp (type, "CCu")) {
 						a->cb_printf ("%s base64:%s @ 0x%08"PFMT64x"\n",
@@ -668,8 +674,9 @@ R_API void r_meta_print(RAnal *a, RAnalMetaItem *d, int rad, bool show_full) {
 			}
 			break;
 		}
-		if (str)
+		if (str) {
 			free (str);
+		}
 	}
 }
 
@@ -764,8 +771,9 @@ static int meta_unset_cb(void *user, const char *k, const char *v) {
 	RAnalMetaUserItem *ui = user;
 	RAnal *a = ui->anal;
 	RAnalMetaItem it = {0};
-	if (!strstr(k, ".0x"))
+	if (!strstr (k, ".0x")) {
 		return 1;
+	}
 	meta_deserialize (&it, k, v);
 	if (it.space != -1) {
 		it.space = -1;
@@ -789,8 +797,9 @@ static int meta_count_cb(void *user, const char *k, const char *v) {
 	RAnalMetaUserItem *ui = user;
 	myMetaUser *mu = ui->user;
 	RAnalMetaItem it = {0};
-	if (!strstr(k, ".0x"))
+	if (!strstr (k, ".0x")) {
 		return 1;
+	}
 	meta_deserialize (&it, k, v);
 	if (mu) {
 		if (it.space == mu->ctx) {
diff --git a/libr/anal/op.c b/libr/anal/op.c
index c9500f322c..b8b94f738d 100644
--- a/libr/anal/op.c
+++ b/libr/anal/op.c
@@ -238,8 +238,10 @@ R_API int r_anal_op_execute(RAnal *anal, RAnalOp *op) {
 			if (div == 0) {
 				eprintf ("r_anal_op_execute: division by zero\n");
 				eprintf ("TODO: throw RAnalException\n");
-			} else r_anal_value_set_ut64 (anal, op->dst,
-				r_anal_value_to_ut64 (anal, op->src[0])/div);
+			} else {
+				r_anal_value_set_ut64 (anal, op->dst,
+					r_anal_value_to_ut64 (anal, op->src[0]) / div);
+			}
 			}
 			break;
 		case R_ANAL_OP_TYPE_MUL:
@@ -392,9 +394,15 @@ R_API char *r_anal_op_to_string(RAnal *anal, RAnalOp *op) {
 	char *r0 = r_anal_value_to_string (op->dst);
 	char *a0 = r_anal_value_to_string (op->src[0]);
 	char *a1 = r_anal_value_to_string (op->src[1]);
-	if (!r0) r0 = strdup ("?");
-	if (!a0) a0 = strdup ("?");
-	if (!a1) a1 = strdup ("?");
+	if (!r0) {
+		r0 = strdup ("?");
+	}
+	if (!a0) {
+		a0 = strdup ("?");
+	}
+	if (!a1) {
+		a1 = strdup ("?");
+	}
 
 	switch (op->type) {
 	case R_ANAL_OP_TYPE_MOV:
@@ -443,12 +451,18 @@ R_API char *r_anal_op_to_string(RAnal *anal, RAnalOp *op) {
 		f = r_anal_get_fcn_in (anal, op->jump, R_ANAL_FCN_TYPE_NULL);
 		if ((bb = r_anal_bb_from_offset (anal, op->addr))) {
 			cstr = r_anal_cond_to_string (bb->cond);
-			if (f) snprintf (ret, sizeof (ret), "if (%s) %s()", cstr, f->name);
-			else snprintf (ret, sizeof (ret), "if (%s) 0x%"PFMT64x"()", cstr, op->jump);
+			if (f) {
+				snprintf (ret, sizeof (ret), "if (%s) %s()", cstr, f->name);
+			} else {
+				snprintf (ret, sizeof (ret), "if (%s) 0x%" PFMT64x "()", cstr, op->jump);
+			}
 			free (cstr);
 		} else {
-			if (f) snprintf (ret, sizeof (ret), "if (unk) %s()", f->name);
-			else snprintf (ret, sizeof (ret), "if (unk) 0x%"PFMT64x"()", op->jump);
+			if (f) {
+				snprintf (ret, sizeof (ret), "if (unk) %s()", f->name);
+			} else {
+				snprintf (ret, sizeof (ret), "if (unk) 0x%" PFMT64x "()", op->jump);
+			}
 		}
 		break;
 	case R_ANAL_OP_TYPE_ADD:
@@ -475,22 +489,30 @@ R_API char *r_anal_op_to_string(RAnal *anal, RAnalOp *op) {
 	case R_ANAL_OP_TYPE_DIV:
 		if (!a1 || !strcmp (a0, a1)) {
 			snprintf (ret, sizeof (ret), "%s /= %s", r0, a0);
-		} else snprintf (ret, sizeof (ret), "%s = %s / %s", r0, a0, a1);
+		} else {
+			snprintf (ret, sizeof (ret), "%s = %s / %s", r0, a0, a1);
+		}
 		break;
 	case R_ANAL_OP_TYPE_AND:
 		if (!a1 || !strcmp (a0, a1)) {
 			snprintf (ret, sizeof (ret), "%s &= %s", r0, a0);
-		} else snprintf (ret, sizeof (ret), "%s = %s & %s", r0, a0, a1);
+		} else {
+			snprintf (ret, sizeof (ret), "%s = %s & %s", r0, a0, a1);
+		}
 		break;
 	case R_ANAL_OP_TYPE_OR:
 		if (!a1 || !strcmp (a0, a1)) {
 			snprintf (ret, sizeof (ret), "%s |= %s", r0, a0);
-		} else snprintf (ret, sizeof (ret), "%s = %s | %s", r0, a0, a1);
+		} else {
+			snprintf (ret, sizeof (ret), "%s = %s | %s", r0, a0, a1);
+		}
 		break;
 	case R_ANAL_OP_TYPE_XOR:
 		if (!a1 || !strcmp (a0, a1)) {
 			snprintf (ret, sizeof (ret), "%s ^= %s", r0, a0);
-		} else snprintf (ret, sizeof (ret), "%s = %s ^ %s", r0, a0, a1);
+		} else {
+			snprintf (ret, sizeof (ret), "%s = %s ^ %s", r0, a0, a1);
+		}
 		break;
 	case R_ANAL_OP_TYPE_LEA:
 		snprintf (ret, sizeof (ret), "%s -> %s", r0, a0);
@@ -587,15 +609,33 @@ R_API const char *r_anal_op_family_to_string(int n) {
 
 R_API int r_anal_op_family_from_string(const char *f) {
 	// TODO: use array of strings or so ..
-	if (!strcmp (f, "cpu")) return R_ANAL_OP_FAMILY_CPU;
-	if (!strcmp (f, "fpu")) return R_ANAL_OP_FAMILY_FPU;
-	if (!strcmp (f, "mmx")) return R_ANAL_OP_FAMILY_MMX;
-	if (!strcmp (f, "sse")) return R_ANAL_OP_FAMILY_SSE;
-	if (!strcmp (f, "priv")) return R_ANAL_OP_FAMILY_PRIV;
-	if (!strcmp (f, "virt")) return R_ANAL_OP_FAMILY_VIRT;
-	if (!strcmp (f, "crpt")) return R_ANAL_OP_FAMILY_CRYPTO;
-	if (!strcmp (f, "io")) return R_ANAL_OP_FAMILY_IO;
-	if (!strcmp (f, "thrd")) return R_ANAL_OP_FAMILY_THREAD;
+	if (!strcmp (f, "cpu")) {
+		return R_ANAL_OP_FAMILY_CPU;
+	}
+	if (!strcmp (f, "fpu")) {
+		return R_ANAL_OP_FAMILY_FPU;
+	}
+	if (!strcmp (f, "mmx")) {
+		return R_ANAL_OP_FAMILY_MMX;
+	}
+	if (!strcmp (f, "sse")) {
+		return R_ANAL_OP_FAMILY_SSE;
+	}
+	if (!strcmp (f, "priv")) {
+		return R_ANAL_OP_FAMILY_PRIV;
+	}
+	if (!strcmp (f, "virt")) {
+		return R_ANAL_OP_FAMILY_VIRT;
+	}
+	if (!strcmp (f, "crpt")) {
+		return R_ANAL_OP_FAMILY_CRYPTO;
+	}
+	if (!strcmp (f, "io")) {
+		return R_ANAL_OP_FAMILY_IO;
+	}
+	if (!strcmp (f, "thrd")) {
+		return R_ANAL_OP_FAMILY_THREAD;
+	}
 	return R_ANAL_OP_FAMILY_UNKNOWN;
 }
 
diff --git a/libr/anal/p/anal_6502.c b/libr/anal/p/anal_6502.c
index 0cb7fb0048..fb7a3d2381 100644
--- a/libr/anal/p/anal_6502.c
+++ b/libr/anal/p/anal_6502.c
@@ -28,10 +28,18 @@ enum {
 
 static void _6502_anal_update_flags(RAnalOp *op, int flags) {
 	/* FIXME: $b9 instead of $b8 to prevent the bug triggered by: A = 0 - 0xff - 1 */
-	if (flags & _6502_FLAGS_B) r_strbuf_append (&op->esil, ",$b9,C,=");
-	if (flags & _6502_FLAGS_C) r_strbuf_append (&op->esil, ",$c7,C,=");
-	if (flags & _6502_FLAGS_Z) r_strbuf_append (&op->esil, ",$z,Z,=");
-	if (flags & _6502_FLAGS_N) r_strbuf_append (&op->esil, ",$s,N,=");
+	if (flags & _6502_FLAGS_B) {
+		r_strbuf_append (&op->esil, ",$b9,C,=");
+	}
+	if (flags & _6502_FLAGS_C) {
+		r_strbuf_append (&op->esil, ",$c7,C,=");
+	}
+	if (flags & _6502_FLAGS_Z) {
+		r_strbuf_append (&op->esil, ",$z,Z,=");
+	}
+	if (flags & _6502_FLAGS_N) {
+		r_strbuf_append (&op->esil, ",$s,N,=");
+	}
 }
 
 /* ORA, AND, EOR, ADC, STA, LDA, CMP and SBC share this pattern */
@@ -235,7 +243,9 @@ static void _6502_anal_esil_mov(RAnalOp *op, ut8 data0) {
 	r_strbuf_setf (&op->esil, "%s,%s,=",src,dst);
 
 	// don't update NZ on txs
-	if (data0 != 0x9a) _6502_anal_update_flags (op, _6502_FLAGS_NZ);
+	if (data0 != 0x9a) {
+		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
+	}
 }
 
 static void _6502_anal_esil_push(RAnalOp *op, ut8 data0) {
@@ -253,7 +263,9 @@ static void _6502_anal_esil_pop(RAnalOp *op, ut8 data0) {
 	// stack is on page one: sp + 0x100
 	r_strbuf_setf (&op->esil, "sp,++=,sp,0x100,+,[1],%s,=", reg);
 
-	if (data0==0x68) _6502_anal_update_flags (op, _6502_FLAGS_NZ);
+	if (data0 == 0x68) {
+		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
+	}
 }
 
 static void _6502_anal_esil_flags(RAnalOp *op, ut8 data0) {
@@ -463,9 +475,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 		// FIXME: support BCD mode
 		op->type = R_ANAL_OP_TYPE_ADD;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0x69) // immediate mode
+		if (data[0] == 0x69) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,+=,C,NUM,$c7,C,=,a,+=,$c7,C,|=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,+=,C,NUM,$c7,C,=,a,+=,$c7,C,|=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,+=,C,NUM,$c7,C,=,a,+=,$c7,C,|=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		// fix Z
 		r_strbuf_append (&op->esil, ",a,a,=,$z,Z,=");
@@ -483,9 +497,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 		// FIXME: support BCD mode
 		op->type = R_ANAL_OP_TYPE_SUB;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0xe9) // immediate mode
+		if (data[0] == 0xe9) { // immediate mode
 			r_strbuf_setf (&op->esil, "C,!,%s,+,a,-=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "C,!,%s,[1],+,a,-=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "C,!,%s,[1],+,a,-=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_BNZ);
 		// fix Z and revert C
 		r_strbuf_append (&op->esil, ",a,a,=,$z,Z,=,C,!=");
@@ -501,9 +517,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0x11: // ora ($ff),y
 		op->type = R_ANAL_OP_TYPE_OR;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0x09) // immediate mode
+		if (data[0] == 0x09) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,|=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,|=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,|=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// AND
@@ -517,9 +535,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0x31: // and ($ff),y
 		op->type = R_ANAL_OP_TYPE_AND;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0x29) // immediate mode
+		if (data[0] == 0x29) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,&=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,&=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,&=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// EOR
@@ -533,9 +553,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0x51: // eor ($ff),y
 		op->type = R_ANAL_OP_TYPE_XOR;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0x49) // immediate mode
+		if (data[0] == 0x49) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,^=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,^=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,^=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// ASL
@@ -645,9 +667,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0xd1: // cmp ($ff),y
 		op->type = R_ANAL_OP_TYPE_CMP;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0xc9) // immediate mode
+		if (data[0] == 0xc9) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,==", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,==", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,==", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_BNZ);
 		// invert C, since C=1 when A-M >= 0
 		r_strbuf_append (&op->esil, ",C,!,C,=");
@@ -658,9 +682,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0xec: // cpx $ffff
 		op->type = R_ANAL_OP_TYPE_CMP;
 		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 0);
-		if (data[0] == 0xe0) // immediate mode
+		if (data[0] == 0xe0) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,x,==", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],x,==", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],x,==", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_BNZ);
 		// invert C, since C=1 when A-M >= 0
 		r_strbuf_append (&op->esil, ",C,!,C,=");
@@ -671,9 +697,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0xcc: // cpy $ffff
 		op->type = R_ANAL_OP_TYPE_CMP;
 		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 0);
-		if (data[0] == 0xc0) // immediate mode
+		if (data[0] == 0xc0) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,y,==", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],y,==", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],y,==", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_BNZ);
 		// invert C, since C=1 when A-M >= 0
 		r_strbuf_append (&op->esil, ",C,!,C,=");
@@ -770,9 +798,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0xb1: // lda ($ff),y
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
-		if (data[0] == 0xa9) // immediate mode
+		if (data[0] == 0xa9) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],a,=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],a,=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// LDX
@@ -798,9 +828,11 @@ static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 	case 0xbc: // ldy $ffff,x
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 'x');
-		if (data[0] == 0xa0) // immediate mode
+		if (data[0] == 0xa0) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,y,=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],y,=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],y,=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// STA
diff --git a/libr/anal/p/anal_arc.c b/libr/anal/p/anal_arc.c
index 45c569c55c..cde37ef1a6 100644
--- a/libr/anal/p/anal_arc.c
+++ b/libr/anal/p/anal_arc.c
@@ -1017,8 +1017,9 @@ static int arc_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len)
 	const ut8 *b = (ut8 *)data;
 	memset (op, '\0', sizeof (RAnalOp));
 
-	if (anal->bits == 16)
+	if (anal->bits == 16) {
 		return arcompact_op (anal, op, addr, data, len);
+	}
 
 	/* ARCtangent A4 */
 	op->size = 4;
diff --git a/libr/anal/p/anal_avr.c b/libr/anal/p/anal_avr.c
index 3312e19b20..3540fe8b32 100644
--- a/libr/anal/p/anal_avr.c
+++ b/libr/anal/p/anal_avr.c
@@ -199,8 +199,9 @@ static CPU_CONST *const_by_name(CPU_MODEL *cpu, int type, char *c) {
 			}
 		}
 	}
-	if (cpu->inherit_cpu_p)
+	if (cpu->inherit_cpu_p) {
 		return const_by_name (cpu->inherit_cpu_p, type, c);
+	}
 	eprintf ("ERROR: CONSTANT key[%s] NOT FOUND.\n", c);
 	return NULL;
 }
@@ -226,8 +227,9 @@ static CPU_CONST *const_by_value(CPU_MODEL *cpu, int type, ut32 v) {
 			}
 		}
 	}
-	if (cpu->inherit_cpu_p)
+	if (cpu->inherit_cpu_p) {
 		return const_by_value (cpu->inherit_cpu_p, type, v);
+	}
 	return NULL;
 }
 
@@ -365,10 +367,11 @@ static void __generic_sub_update_flags(RAnalOp *op, char t_d, ut64 v_d, char t_r
 		"|,vf,=,",
 		d, rk, d, rk);
 	ESIL_A ("0,RPICK,0x80,&,!,!,nf,=,");			// N
-	if (carry)
+	if (carry) {
 		ESIL_A ("0,RPICK,!,zf,&,zf,=,");		// Z
-	else
-		ESIL_A ("0,RPICK,!,zf,=,");			// Z
+	} else {
+		ESIL_A ("0,RPICK,!,zf,=,"); // Z
+	}
 	ESIL_A ("%s,0x80,&,!,"   "%s,0x80,&,!,!,"      "&,"	// C
 		"%s,0x80,&,!,!," "0,RPICK,0x80,&,!,!," "&,"
 		"%s,0x80,&,!,"   "0,RPICK,0x80,&,!,!," "&,"
@@ -2131,12 +2134,15 @@ RAMPX, RAMPY, RAMPZ, RAMPD and EIND:
 }
 
 static int archinfo(RAnal *anal, int q) {
-	if (q == R_ANAL_ARCHINFO_ALIGN)
+	if (q == R_ANAL_ARCHINFO_ALIGN) {
 		return 2;
-	if (q == R_ANAL_ARCHINFO_MAX_OP_SIZE)
+	}
+	if (q == R_ANAL_ARCHINFO_MAX_OP_SIZE) {
 		return 4;
-	if (q == R_ANAL_ARCHINFO_MIN_OP_SIZE)
+	}
+	if (q == R_ANAL_ARCHINFO_MIN_OP_SIZE) {
 		return 2;
+	}
 	return 2; // XXX
 }
 
diff --git a/libr/anal/p/anal_bf.c b/libr/anal/p/anal_bf.c
index 80847c0426..62e48eb0cb 100644
--- a/libr/anal/p/anal_bf.c
+++ b/libr/anal/p/anal_bf.c
@@ -9,8 +9,9 @@
 static int countChar (const ut8 *buf, int len, char ch) {
 	int i;
 	for (i = 0; i < len; i++) {
-		if (buf[i] != ch)
+		if (buf[i] != ch) {
 			break;
+		}
 	}
 	return i;
 }
@@ -45,8 +46,9 @@ static int bf_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 			int lev = 0, i = 1;
 			len--;
 			while (i < len && *p) {
-				if (*p == '[')
+				if (*p == '[') {
 					lev++;
+				}
 				if (*p == ']') {
 					lev--;
 					if (lev==-1) {
diff --git a/libr/anal/p/anal_ebc.c b/libr/anal/p/anal_ebc.c
index 0fde261474..a64019c7f3 100644
--- a/libr/anal/p/anal_ebc.c
+++ b/libr/anal/p/anal_ebc.c
@@ -24,8 +24,9 @@ static void ebc_anal_jmp8(RAnalOp *op, ut64 addr, const ut8 *buf) {
 static void ebc_anal_jmp(RAnalOp *op, ut64 addr, const ut8 *buf) {
 	op->fail = addr + 6;
 	op->jump = (ut64)*(int32_t*)(buf + 2);
-	if (TEST_BIT(buf[1], 4))
+	if (TEST_BIT (buf[1], 4)) {
 		op->jump += addr + 6;
+	}
 	if (buf[1] & 0x7) {
 		op->type = R_ANAL_OP_TYPE_UJMP;
 	} else {
@@ -61,8 +62,9 @@ static int ebc_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 	ebc_command_t cmd;
 	ut8 opcode = buf[0] & EBC_OPCODE_MASK;
 
-	if (!op)
+	if (!op) {
 		return 2;
+	}
 
 	memset(op, 0, sizeof (RAnalOp));
 	op->addr = addr;
@@ -71,8 +73,9 @@ static int ebc_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 
 	ret = op->size = ebc_decode_command(buf, &cmd);
 
-	if (ret < 0)
+	if (ret < 0) {
 		return ret;
+	}
 
 	switch (opcode) {
 	case EBC_JMP8:
diff --git a/libr/anal/p/anal_gb.c b/libr/anal/p/anal_gb.c
index f162dbc2fc..37a2a4bb90 100644
--- a/libr/anal/p/anal_gb.c
+++ b/libr/anal/p/anal_gb.c
@@ -28,9 +28,11 @@ static ut8 gb_op_calljump(RAnal *a, RAnalOp *op, const ut8 *data, ut64 addr)
 		r_meta_set_string (a, R_META_TYPE_COMMENT, addr, "--> unpredictable");
 		return false;
 	}
-	if (!GB_IS_VBANK_DST (data[1], data[2]))
+	if (!GB_IS_VBANK_DST (data[1], data[2])) {
 		op->jump = GB_SOFTCAST(data[1], data[2]);
-	else	op->jump = GB_IB_DST (data[1], data[2], addr);
+	} else {
+		op->jump = GB_IB_DST (data[1], data[2], addr);
+	}
 	return true;
 }
 
@@ -66,9 +68,11 @@ static inline void gb_anal_esil_ccall (RAnalOp *op, const ut8 data)
 		default:
 			cond = 'C';
 	}
-	if (op->cond == R_ANAL_COND_EQ)
+	if (op->cond == R_ANAL_COND_EQ) {
 		r_strbuf_setf (&op->esil, "%c,?{,2,sp,-=,pc,sp,=[2],%"PFMT64d",pc,=,}", cond, (op->jump & 0xffff));
-	else	r_strbuf_setf (&op->esil, "%c,!,?{,2,sp,-=,pc,sp,=[2],%"PFMT64d",pc,=,}", cond, (op->jump & 0xffff));
+	} else {
+		r_strbuf_setf (&op->esil, "%c,!,?{,2,sp,-=,pc,sp,=[2],%" PFMT64d ",pc,=,}", cond, (op->jump & 0xffff));
+	}
 }
 
 static inline void gb_anal_esil_ret (RAnalOp *op)
@@ -79,12 +83,16 @@ static inline void gb_anal_esil_ret (RAnalOp *op)
 static inline void gb_anal_esil_cret (RAnalOp *op, const ut8 data)
 {
 	char cond;
-	if ((data & 0xd0) == 0xd0)
+	if ((data & 0xd0) == 0xd0) {
 		cond = 'C';
-	else	cond = 'Z';
-	if (op->cond == R_ANAL_COND_EQ)
+	} else {
+		cond = 'Z';
+	}
+	if (op->cond == R_ANAL_COND_EQ) {
 		r_strbuf_setf (&op->esil, "%c,?{,sp,[2],pc,=,2,sp,+=,}", cond);
-	else	r_strbuf_setf (&op->esil, "%c,!,?{,sp,[2],pc,=,2,sp,+=,}", cond);
+	} else {
+		r_strbuf_setf (&op->esil, "%c,!,?{,sp,[2],pc,=,2,sp,+=,}", cond);
+	}
 }
 
 static inline void gb_anal_esil_cjmp (RAnalOp *op, const ut8 data)
@@ -100,9 +108,11 @@ static inline void gb_anal_esil_cjmp (RAnalOp *op, const ut8 data)
 		default:
 			cond = 'C';
 	}
-	if (op->cond == R_ANAL_COND_EQ)
+	if (op->cond == R_ANAL_COND_EQ) {
 		r_strbuf_setf (&op->esil, "%c,?{,0x%"PFMT64x",pc,=,}", cond, (op->jump & 0xffff));
-	else	r_strbuf_setf (&op->esil, "%c,!,?{,0x%"PFMT64x",pc,=,}", cond, (op->jump & 0xffff));
+	} else {
+		r_strbuf_setf (&op->esil, "%c,!,?{,0x%" PFMT64x ",pc,=,}", cond, (op->jump & 0xffff));
+	}
 }
 
 static inline void gb_anal_esil_jmp (RAnalOp *op)
@@ -126,20 +136,26 @@ static inline void gb_anal_id (RAnal *anal, RAnalOp *op, const ut8 data) {
 	if (data == 0x34 || data == 0x35) {
 		op->dst->memref = 1;
 		op->dst->reg = r_reg_get (anal->reg, "hl", R_REG_TYPE_GPR);
-		if (op->type == R_ANAL_OP_TYPE_ADD)
+		if (op->type == R_ANAL_OP_TYPE_ADD) {
 			r_strbuf_set (&op->esil, "1,hl,[1],+,hl,=[1],$c3,H,=,$z,Z,=,0,N,=");
-		else	r_strbuf_set (&op->esil, "1,hl,[1],-,hl,=[1],$b4,H,=,$z,Z,=,1,N,=");
+		} else {
+			r_strbuf_set (&op->esil, "1,hl,[1],-,hl,=[1],$b4,H,=,$z,Z,=,1,N,=");
+		}
 	} else {
 		if (!(data & (1<<2))) {
 			op->dst->reg = r_reg_get (anal->reg, regs_16[data>>4], R_REG_TYPE_GPR);
-			if (op->type == R_ANAL_OP_TYPE_ADD)
+			if (op->type == R_ANAL_OP_TYPE_ADD) {
 				r_strbuf_setf (&op->esil, "1,%s,+=", regs_16[data>>4]);
-			else	r_strbuf_setf (&op->esil, "1,%s,-=", regs_16[data>>4]);
+			} else {
+				r_strbuf_setf (&op->esil, "1,%s,-=", regs_16[data >> 4]);
+			}
 		} else {
 			op->dst->reg = r_reg_get (anal->reg, regs_8[data>>3], R_REG_TYPE_GPR);
-			if (op->type == R_ANAL_OP_TYPE_ADD)
+			if (op->type == R_ANAL_OP_TYPE_ADD) {
 				r_strbuf_setf (&op->esil, "1,%s,+=,$c3,H,=,$z,Z,=,0,N,=", regs_8[data>>3]);
-			else	r_strbuf_setf (&op->esil, "1,%s,-=,$b4,H,=,$z,Z,=,1,N,=", regs_8[data>>3]);
+			} else {
+				r_strbuf_setf (&op->esil, "1,%s,-=,$b4,H,=,$z,Z,=,1,N,=", regs_8[data >> 3]);
+			}
 		}
 	}
 }
@@ -157,9 +173,11 @@ static inline void gb_anal_add_sp (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->src[0] = r_anal_value_new ();
 	op->dst->reg = r_reg_get (reg, "sp", R_REG_TYPE_GPR);
 	op->src[0]->imm = (st8)data;
-	if (data < 128)
+	if (data < 128) {
 		r_strbuf_setf (&op->esil, "0x%02x,sp,+=", data);
-	else	r_strbuf_setf (&op->esil, "0x%02x,sp,-=", 0 - (st8)data);
+	} else {
+		r_strbuf_setf (&op->esil, "0x%02x,sp,-=", 0 - (st8)data);
+	}
 	r_strbuf_append (&op->esil, ",0,Z,=,0,N,=");
 }
 
@@ -194,9 +212,11 @@ static inline void gb_anal_mov_hl_sp (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->dst->reg = r_reg_get (reg, regs_16[2], R_REG_TYPE_GPR);
 	op->src[0]->reg = r_reg_get (reg, regs_16[3], R_REG_TYPE_GPR);
 	op->src[1]->imm = (st8)data;
-	if (data < 128)
+	if (data < 128) {
 		r_strbuf_setf (&op->esil, "0x%02x,sp,+,hl,=", data);
-	else	r_strbuf_setf (&op->esil, "0x%02x,sp,-,hl,=", 0 - (st8)data);
+	} else {
+		r_strbuf_setf (&op->esil, "0x%02x,sp,-,hl,=", 0 - (st8)data);
+	}
 	r_strbuf_append (&op->esil, ",0,Z,=,0,N,=");
 }
 
@@ -215,8 +235,9 @@ static inline void gb_anal_mov_ime (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->src[0]->absolute = true;
 	op->src[0]->imm = (data != 0xf3);
 	r_strbuf_setf (&op->esil, "%d,ime,=", (int)op->src[0]->imm);
-	if (data == 0xd9)
+	if (data == 0xd9) {
 		r_strbuf_append (&op->esil, ",");
+	}
 }
 
 static inline void gb_anal_mov_scf (RReg *reg, RAnalOp *op) {
@@ -247,8 +268,11 @@ static inline void gb_anal_cond (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->dst = r_anal_value_new ();
 	op->src[0] = r_anal_value_new ();
 	op->src[0]->imm = 1;
-	if (data & 0x8) op->cond = R_ANAL_COND_EQ;
-	else op->cond = R_ANAL_COND_NE;
+	if (data & 0x8) {
+		op->cond = R_ANAL_COND_EQ;
+	} else {
+		op->cond = R_ANAL_COND_NE;
+	}
 	switch (data) {
 	case 0x20:
 	case 0x28:
@@ -284,9 +308,11 @@ static inline void gb_anal_and_res (RAnal *anal, RAnalOp *op, const ut8 data) {
 	op->src[0]->imm = ((~(0x1 << ((data >> 3) & 7))) & 0xff);
 	op->dst->memref = ((data & 7) == 6);
 	op->dst->reg = r_reg_get (anal->reg, regs_x[data & 7], R_REG_TYPE_GPR);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "0x%02x,%s,[1],&,%s,=[1]", op->src[0]->imm, regs_x[data & 7], regs_x[data & 7]);
-	else	r_strbuf_setf (&op->esil, "0x%02x,%s,&=", op->src[0]->imm, regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "0x%02x,%s,&=", op->src[0]->imm, regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_and_bit (RReg *reg, RAnalOp *op, const ut8 data) {
@@ -295,9 +321,11 @@ static inline void gb_anal_and_bit (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->src[0]->imm = 1<<((data>>3) & 7);
 	op->dst->memref = ((data & 7) == 6);
 	op->dst->reg = r_reg_get (reg, regs_x[data & 7], R_REG_TYPE_GPR);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "%i,%s,[1],&,0,==,$z,Z,=,0,N,=,1,H,=", op->src[0]->imm, regs_x[data & 7]);
-	else	r_strbuf_setf (&op->esil, "%i,%s,&,0,==,$z,Z,=,0,N,=,1,H,=", op->src[0]->imm, regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "%i,%s,&,0,==,$z,Z,=,0,N,=,1,H,=", op->src[0]->imm, regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_or_set (RAnal *anal, RAnalOp *op, const ut8 data) {
@@ -306,9 +334,11 @@ static inline void gb_anal_or_set (RAnal *anal, RAnalOp *op, const ut8 data) {
 	op->src[0]->imm = (data>>3) & 7;
 	op->dst->memref = ((data & 7) == 6);
 	op->dst->reg = r_reg_get (anal->reg, regs_x[data & 7], R_REG_TYPE_GPR);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "0x%02x,%s,[1],|,%s,=[1]", op->src[0]->imm, regs_x[data & 7], regs_x[data & 7], op->src[0]->imm);
-	else	r_strbuf_setf (&op->esil, "0x%02x,%s,|=", op->src[0]->imm, regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "0x%02x,%s,|=", op->src[0]->imm, regs_x[data & 7]);
+	}
 }
 
 static void gb_anal_xoaasc (RReg *reg, RAnalOp *op, const ut8 *data) {
@@ -319,20 +349,26 @@ static void gb_anal_xoaasc (RReg *reg, RAnalOp *op, const ut8 *data) {
 	op->src[0]->memref = ((data[0] & 7) == 6);
 	switch (op->type) {
 		case R_ANAL_OP_TYPE_XOR:
-			if (op->src[0]->memref)
+			if (op->src[0]->memref) {
 				r_strbuf_setf (&op->esil, "%s,[1],a,^=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] & 7]);
-			else	r_strbuf_setf (&op->esil, "%s,a,^=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] & 7]);
-		break;
+			} else {
+				r_strbuf_setf (&op->esil, "%s,a,^=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] & 7]);
+			}
+			break;
 		case R_ANAL_OP_TYPE_OR:
-			if (op->src[0]->memref)
+			if (op->src[0]->memref) {
 				r_strbuf_setf (&op->esil, "%s,[1],a,|=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] &7]);
-			else	r_strbuf_setf (&op->esil, "%s,a,|=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] & 7]);
-		break;
+			} else {
+				r_strbuf_setf (&op->esil, "%s,a,|=,$z,Z,=,0,N,=,0,H,=,0,C,=", regs_x[data[0] & 7]);
+			}
+			break;
 		case R_ANAL_OP_TYPE_AND:
-			if (op->src[0]->memref)
+			if (op->src[0]->memref) {
 				r_strbuf_setf (&op->esil, "%s,[1],a,&=,$z,Z,=,0,N,=,1,H,=,0,C,=", regs_x[data[0] & 7]);
-			else	r_strbuf_setf (&op->esil, "%s,a,&=,$z,Z,=,0,N,=,1,H,=,0,C,=", regs_x[data[0] & 7]);
-		break;
+			} else {
+				r_strbuf_setf (&op->esil, "%s,a,&=,$z,Z,=,0,N,=,1,H,=,0,C,=", regs_x[data[0] & 7]);
+			}
+			break;
 		case R_ANAL_OP_TYPE_ADD:
 			if (op->src[0]->memref) {
 				if (data[0] > 0x87) {
@@ -372,10 +408,12 @@ static void gb_anal_xoaasc (RReg *reg, RAnalOp *op, const ut8 *data) {
 			}
 		break;
 		case R_ANAL_OP_TYPE_CMP:
-			if (op->src[0]->memref)
+			if (op->src[0]->memref) {
 				r_strbuf_setf (&op->esil, "%s,[1],a,==,$z,Z,=,$b4,H,=,$b8,C,=,1,N,=", regs_x[data[0] & 7]);
-			else	r_strbuf_setf (&op->esil, "%s,a,==,$z,Z,=,$b4,H,=,$b8,C,=,1,N,=", regs_x[data[0] & 7]);
-		break;
+			} else {
+				r_strbuf_setf (&op->esil, "%s,a,==,$z,Z,=,$b4,H,=,$b8,C,=,1,N,=", regs_x[data[0] & 7]);
+			}
+			break;
 	}
 }
 
@@ -402,16 +440,20 @@ static void gb_anal_xoaasc_imm (RReg *reg, RAnalOp *op, const ut8 *data)	//xor ,
 				op->src[1] = r_anal_value_new ();
 				op->src[1]->reg = r_reg_get (reg, "C", R_REG_TYPE_GPR);
 				r_strbuf_append (&op->esil, "a,+=,C,NUM,$c7,C,=,$c3,H,=,a,+=,$c7,C,|=,$c3,H,|=,a,a,=,$z,Z,=,0,N,=");
-			} else	r_strbuf_append (&op->esil, "a,+=,$c3,H,=,$c7,C,=,0,N,=,a,a,=,$z,Z,=");
-		break;
+			} else {
+				r_strbuf_append (&op->esil, "a,+=,$c3,H,=,$c7,C,=,0,N,=,a,a,=,$z,Z,=");
+			}
+			break;
 		case R_ANAL_OP_TYPE_SUB:
 			r_strbuf_setf (&op->esil, "0x%02x,", data[1]);
 			if (data[0] == 0xde) {					//sbc
 				op->src[1] = r_anal_value_new ();
 				op->src[1]->reg = r_reg_get (reg, "C", R_REG_TYPE_GPR);
 				r_strbuf_append (&op->esil, "a,-=,C,NUM,$b8,C,=,$b4,H,=,a,-=,$b8,C,|=,$b4,H,|=,a,a,=,$z,Z,=,1,N,=");
-			} else	r_strbuf_append (&op->esil, "a,-=,$b4,H,=,$b8,C,=,1,N,=,a,a,=,$z,Z,=");
-		break;
+			} else {
+				r_strbuf_append (&op->esil, "a,-=,$b4,H,=,$b8,C,=,1,N,=,a,a,=,$z,Z,=");
+			}
+			break;
 		case R_ANAL_OP_TYPE_CMP:
 			r_strbuf_setf (&op->esil, "%d,a,==,$z,Z,=,$b4,H,=,$b8,C,=,1,N,=", data[1]);
 		break;
@@ -481,10 +523,12 @@ static inline void gb_anal_store_hl (RReg *reg, RAnalOp *op, const ut8 *data) {
 		op->src[0]->reg = r_reg_get (reg, regs_8[data[0] & 0x07], R_REG_TYPE_GPR);
 		r_strbuf_setf (&op->esil, "%s,hl,=[1]", regs_8[data[0] & 0x07]);
 	}
-	if (data[0] == 0x32)
+	if (data[0] == 0x32) {
 		r_strbuf_set (&op->esil, "a,hl,=[1],1,hl,-=");
-	if (data[0] == 0x22)
+	}
+	if (data[0] == 0x22) {
 		r_strbuf_set (&op->esil, "a,hl,=[1],1,hl,+=");
+	}
 }
 
 static void gb_anal_store (RReg *reg, RAnalOp *op, const ut8 *data)
@@ -528,7 +572,9 @@ static inline void gb_anal_cb_swap (RReg *reg, RAnalOp* op, const ut8 data)
 	if ((data & 7) == 6) {
 		op->dst->memref = 1;
 		r_strbuf_setf (&op->esil, "4,%s,[1],>>,4,%s,[1],<<,|,%s,=[1],$z,Z,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	} else	r_strbuf_setf (&op->esil, "4,%s,>>,4,%s,<<,|,%s,=,$z,Z,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "4,%s,>>,4,%s,<<,|,%s,=,$z,Z,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_cb_rlc (RReg *reg, RAnalOp *op, const ut8 data)
@@ -540,7 +586,9 @@ static inline void gb_anal_cb_rlc (RReg *reg, RAnalOp *op, const ut8 data)
 	if ((data & 7) == 6) {
 		op->dst->memref = 1;
 		r_strbuf_setf (&op->esil, "7,%s,[1],>>,1,&,C,=,1,%s,[1],<<,C,|,%s,=[1],$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	} else	r_strbuf_setf (&op->esil, "1,%s,<<=,$c7,C,=,C,%s,|=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,<<=,$c7,C,=,C,%s,|=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_cb_rl (RReg *reg, RAnalOp *op, const ut8 data)
@@ -552,7 +600,9 @@ static inline void gb_anal_cb_rl (RReg *reg, RAnalOp *op, const ut8 data)
 	if ((data & 7) == 6) {
 		op->dst->memref = 1;
 		r_strbuf_setf (&op->esil, "1,%s,<<,C,|,%s,=[1],$c7,C,=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7]);
-	} else	r_strbuf_setf (&op->esil, "1,%s,<<,C,|,%s,=,$c7,C,=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,<<,C,|,%s,=,$c7,C,=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_cb_rrc (RReg *reg, RAnalOp *op, const ut8 data)
@@ -564,7 +614,9 @@ static inline void gb_anal_cb_rrc (RReg *reg, RAnalOp *op, const ut8 data)
 	if ((data &7) == 6) {
 		op->dst->memref = 1;
 		r_strbuf_setf (&op->esil, "1,%s,[1],&,C,=,1,%s,[1],>>,7,C,<<,|,%s,=[1],$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	} else	r_strbuf_setf (&op->esil, "1,%s,&,C,=,1,%s,>>,7,C,<<,|,%s,=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,&,C,=,1,%s,>>,7,C,<<,|,%s,=,$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_cb_rr (RReg *reg, RAnalOp *op, const ut8 data)
@@ -576,7 +628,9 @@ static inline void gb_anal_cb_rr (RReg *reg, RAnalOp *op, const ut8 data)
 	if ((data & 7) == 6) {
 		op->dst->memref = 1;
 		r_strbuf_setf (&op->esil, "1,%s,[1],&,H,=,1,%s,[1],>>,7,C,<<,|,%s,=[1],H,C,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	} else	r_strbuf_setf (&op->esil, "1,%s,&,H,=,1,%s,>>,7,C,<<,|,%s,=,H,C,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);	//HACK
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,&,H,=,1,%s,>>,7,C,<<,|,%s,=,H,C,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]); //HACK
+	}
 }
 
 static inline void gb_anal_cb_sla (RReg *reg, RAnalOp *op, const ut8 data)								//sra+sla+srl in one function, like xoaasc
@@ -586,9 +640,11 @@ static inline void gb_anal_cb_sla (RReg *reg, RAnalOp *op, const ut8 data)
 	op->src[0]->imm = 1;
 	op->dst->reg = r_reg_get (reg, regs_x[data & 7], R_REG_TYPE_GPR);
 	op->dst->memref = ((data & 7) == 6);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "1,%s,[1],<<,%s,=[1],$c7,C,=,%s,[1],%s,=[1],$z,Z,=,0,H,=,0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	else	r_strbuf_setf (&op->esil, "1,%s,<<=,$c7,C,=,%s,%s,=,$z,Z,=,0,H,=0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);	// %s,%s,= is a HACK for $z
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,<<=,$c7,C,=,%s,%s,=,$z,Z,=,0,H,=0,N,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]); // %s,%s,= is a HACK for $z
+	}
 }
 
 static inline void gb_anal_cb_sra (RReg *reg, RAnalOp *op, const ut8 data) {
@@ -597,9 +653,11 @@ static inline void gb_anal_cb_sra (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->src[0]->imm = 1;
 	op->dst->reg = r_reg_get (reg, regs_x[data & 7], R_REG_TYPE_GPR);
 	op->dst->memref = ((data & 7) == 6);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "1,%s,[1],&,C,=,0x80,%s,[1],&,1,%s,[1],>>,|,%s,=[1],$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);	//spaguesil
-	else	r_strbuf_setf (&op->esil, "1,%s,&,C,=,0x80,%s,&,1,%s,>>,|,%s,=,$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,&,C,=,0x80,%s,&,1,%s,>>,|,%s,=,$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static inline void gb_anal_cb_srl (RReg *reg, RAnalOp *op, const ut8 data) {
@@ -608,16 +666,19 @@ static inline void gb_anal_cb_srl (RReg *reg, RAnalOp *op, const ut8 data) {
 	op->src[0]->imm = 1;
 	op->dst->reg = r_reg_get (reg, regs_x[data & 7], R_REG_TYPE_GPR);
 	op->dst->memref = ((data & 7) == 6);
-	if (op->dst->memref)
+	if (op->dst->memref) {
 		r_strbuf_setf (&op->esil, "1,%s,[1],&,C,=,1,%s,[1],>>,%s,=[1],$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7], regs_x[data & 7]);
-	else	r_strbuf_setf (&op->esil, "1,%s,&,C,=,1,%s,>>=,$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7]);
+	} else {
+		r_strbuf_setf (&op->esil, "1,%s,&,C,=,1,%s,>>=,$z,Z,=,0,N,=,0,H,=", regs_x[data & 7], regs_x[data & 7]);
+	}
 }
 
 static int gb_custom_daa (RAnalEsil *esil) {
 	ut8 a, H, C, Z;
 	ut64 n;
-	if (!esil || !esil->anal || !esil->anal->reg)
+	if (!esil || !esil->anal || !esil->anal->reg) {
 		return false;
+	}
 	r_anal_esil_reg_read (esil, "H", &n, NULL);
 	H = (ut8)n;
 	r_anal_esil_reg_read (esil, "C", &n, NULL);
@@ -627,18 +688,22 @@ static int gb_custom_daa (RAnalEsil *esil) {
 	a = (ut8)n;
 	r_anal_esil_reg_read (esil, "N", &n, NULL);
 	if (n) {
-		if (C)
+		if (C) {
 			a = (a - 0x60) & 0xff;
-		else	r_anal_esil_reg_write (esil, "C", 0LL);
-		if (H)
+		} else {
+			r_anal_esil_reg_write (esil, "C", 0LL);
+		}
+		if (H) {
 			a = (a - 0x06) & 0xff;
+		}
 	} else {
 		if (C || (a > 0x99)) {
 			a = (a + 0x60) & 0xff;
 			r_anal_esil_reg_write (esil, "C", 1LL);
 		}
-		if (H || ((a & 0x0f) > 0x09))
-			a += 0x06;;
+		if (H || ((a & 0x0f) > 0x09)) {
+			a += 0x06;
+		};
 	}
 	esil->cur = a;
 	Z = (a == 0);
@@ -650,8 +715,9 @@ static int gb_custom_daa (RAnalEsil *esil) {
 
 static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len){
 	int ilen = gbOpLength (gb_op[data[0]].type);
-	if (ilen > len)
-		ilen=0;
+	if (ilen > len) {
+		ilen = 0;
+	}
 	memset (op, '\0', sizeof (RAnalOp));
 	op->addr = addr;
 	op->type = R_ANAL_OP_TYPE_UNK;
@@ -1152,13 +1218,16 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 			op->type = R_ANAL_OP_TYPE_CJMP;
 			op->eob = true;			//halt migth wait for interrupts
 			op->fail = addr + ilen;
-			if(len > 1)
+			if (len > 1) {
 				op->jump = addr + gbOpLength (gb_op[data[1]].type) + ilen;
+			}
 			break;
 		case 0xcd:
-			if ( gb_op_calljump (anal, op, data, addr))
+			if (gb_op_calljump (anal, op, data, addr)) {
 				op->type = R_ANAL_OP_TYPE_CALL;
-			else	op->type = R_ANAL_OP_TYPE_UCALL;
+			} else {
+				op->type = R_ANAL_OP_TYPE_UCALL;
+			}
 			op->fail = addr + ilen;
 			op->eob = true;
 			gb_anal_esil_call (op);
@@ -1169,9 +1238,11 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 		case 0xd4:
 		case 0xdc:
 			gb_anal_cond (anal->reg, op, data[0]);
-			if( gb_op_calljump (anal, op, data, addr))
+			if (gb_op_calljump (anal, op, data, addr)) {
 				op->type = R_ANAL_OP_TYPE_CCALL;
-			else	op->type = R_ANAL_OP_TYPE_UCCALL;
+			} else {
+				op->type = R_ANAL_OP_TYPE_UCCALL;
+			}
 			op->fail = addr + ilen;
 			op->eob = true;
 			gb_anal_esil_ccall (op, data[0]);
@@ -1267,58 +1338,74 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 			switch (data[1]>>3)
 			{
 				case 0:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ROL;
 					gb_anal_cb_rlc (anal->reg, op, data[1]);
 					break;
 				case 1:
-					if ((data[1] & 7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ROR;
 					gb_anal_cb_rrc (anal->reg, op, data[1]);
 					break;
 				case 2:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ROL;
 					gb_anal_cb_rl (anal->reg, op, data[1]);
 					break;
 				case 3:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ROR;
 					gb_anal_cb_rr (anal->reg, op, data[1]);
 					break;
 				case 4:
-					if ((data [1] & 7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_SAL;
 					gb_anal_cb_sla (anal->reg, op, data[1]);
 					break;
 				case 6:
-					if ((data[1] & 7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ROL;
 					gb_anal_cb_swap (anal->reg, op, data[1]);
 					break;
 				case 5:
-					if ((data [1] & 7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_SAR;
 					gb_anal_cb_sra (anal->reg, op, data[1]);
 					break;
 				case 7:
-					if ((data [1] & 7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_SHR;
 					gb_anal_cb_srl (anal->reg, op, data[1]);
 					break;
@@ -1330,9 +1417,11 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 				case 13:
 				case 14:
 				case 15:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 12;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					op->type = R_ANAL_OP_TYPE_ACMP;
 					gb_anal_and_bit (anal->reg, op, data[1]);
 					break;			//bit
@@ -1344,9 +1433,11 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 				case 21:
 				case 22:
 				case 23:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					gb_anal_and_res (anal, op, data[1]);
 					op->type = R_ANAL_OP_TYPE_AND;
 					break;			//res
@@ -1358,9 +1449,11 @@ static int gb_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len
 				case 29:
 				case 30:
 				case 31:
-					if ((data[1]&7) == 6)
+					if ((data[1] & 7) == 6) {
 						op->cycles = 16;
-					else	op->cycles = 8;
+					} else {
+						op->cycles = 8;
+					}
 					gb_anal_or_set (anal, op, data[1]);
 					op->type = R_ANAL_OP_TYPE_OR;
 					break;			//set
diff --git a/libr/anal/p/anal_h8300.c b/libr/anal/p/anal_h8300.c
index 34a7e26f52..e034401855 100644
--- a/libr/anal/p/anal_h8300.c
+++ b/libr/anal/p/anal_h8300.c
@@ -86,8 +86,9 @@ static void h8300_anal_jsr(RAnalOp *op, ut64 addr, const ut8 *buf) {
 static int analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf) {
 	int ret = -1;
 	ut8 opcode = buf[0];
-	if (!op)
+	if (!op) {
 		return 2;
+	}
 	r_strbuf_init (&op->esil);
 	r_strbuf_set (&op->esil, "");
 	switch (opcode >> 4) {
@@ -450,10 +451,11 @@ static int analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf) {
 				rsB(), rsB(), rdB(1));
 		return 0;
 	case H8300_BST_BIST: /*TODO*/
-		if(! (buf[1] & 0x80) ) //BST
+		if (!(buf[1] & 0x80)) { //BST
 			r_strbuf_appendf(&op->esil,"%d,C,<<,r%u%c,|=",rs(),rdB(1));
-		else //BIST
-			r_strbuf_appendf(&op->esil,"%d,C,!,<<,r%u%c,|=",rs(),rdB(1));
+		} else { //BIST
+			r_strbuf_appendf (&op->esil, "%d,C,!,<<,r%u%c,|=", rs (), rdB (1));
+		}
 		return 0;
 	case H8300_MOV_R82IND16: /*TODO*/ return 0;
 	case H8300_MOV_IND162R16: /*TODO*/ return 0;
@@ -482,42 +484,46 @@ static int analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf) {
 				rs(), rs(), rdB(1));
 		return 0;
 	case H8300_BOR_BIOR: /*TODO*/
-		if(! (buf[1] & 0x80) ) //BOR
+		if (!(buf[1] & 0x80)) { //BOR
 			//C|=(rd&(1<<imm))>>imm
 			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,C,|=",
 					rs(), rs(), rdB(1));
-		else //BIOR
+		} else { //BIOR
 			//C|=!(rd&(1<<imm))>>imm
-			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,|=",
-					rs(), rs(), rdB(1));
+			r_strbuf_appendf (&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,|=",
+				rs (), rs (), rdB (1));
+		}
 		return 0;
 	case H8300_BXOR_BIXOR: /*TODO*/
-		if(! (buf[1] & 0x80) ) //BXOR
+		if (!(buf[1] & 0x80)) { //BXOR
 			//C^=(rd&(1<<imm))>>imm
 			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,C,^=",
 					rs(), rs(), rdB(1));
-		else //BIXOR
-			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,^=",
-					rs(), rs(), rdB(1));
+		} else { //BIXOR
+			r_strbuf_appendf (&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,^=",
+				rs (), rs (), rdB (1));
+		}
 		return 0;
 	case H8300_BAND_BIAND:
 		/*TODO check functionality*/
 		//C&=(rd&(1<<imm))>>imm
-		if(! (buf[1] & 0x80) ) //BAND
+		if (!(buf[1] & 0x80)) { //BAND
 			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,C,&=",
 					rs(), rs(), rdB(1));
-		else //BIAND
-			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,&=",
-					rs(), rs(), rdB(1));
+		} else { //BIAND
+			r_strbuf_appendf (&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,&=",
+				rs (), rs (), rdB (1));
+		}
 		return 0;
 	case H8300_BILD_IMM2R8:
 		/*TODO*/
-		if(! (buf[1] & 0x80) ) //BLD
+		if (!(buf[1] & 0x80)) { //BLD
 			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,C,=",
 					rs(), rs(), rdB(1));
-		else //BILD
-			r_strbuf_appendf(&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,=",
-					rs(), rs(), rdB(1));
+		} else { //BILD
+			r_strbuf_appendf (&op->esil, "%d,%d,1,<<,r%u%c,&,>>,!,C,=",
+				rs (), rs (), rdB (1));
+		}
 		return 0;
 	case H8300_MOV_IMM162R16: /*TODO*/ return 0;
 	case H8300_EEPMOV: /*TODO*/ return 0;
@@ -539,8 +545,9 @@ static int h8300_op(RAnal *anal, RAnalOp *op, ut64 addr,
 	ut8 opcode = buf[0];
 	struct h8300_cmd cmd;
 
-	if (!op)
+	if (!op) {
 		return 2;
+	}
 
 	memset(op, 0, sizeof (RAnalOp));
 
@@ -549,8 +556,9 @@ static int h8300_op(RAnal *anal, RAnalOp *op, ut64 addr,
 	op->ptr = op->val = -1;
 	ret = op->size = h8300_decode_command(buf, &cmd);
 
-	if  (ret < 0)
+	if (ret < 0) {
 		return ret;
+	}
 	switch (opcode >> 4) {
 	case H8300_MOV_4BIT_2:
 	case H8300_MOV_4BIT_3:
diff --git a/libr/anal/p/anal_i4004.c b/libr/anal/p/anal_i4004.c
index f876bbf8f4..7e4392b165 100644
--- a/libr/anal/p/anal_i4004.c
+++ b/libr/anal/p/anal_i4004.c
@@ -91,8 +91,9 @@ static const char *i4004_f[16] = {
 static int i4004_get_ins_len (ut8 hex) {
 	ut8 high = (hex & 0xf0)>>4;
 	int ret = i4004_ins_len[high];
-	if (ret == 3)
+	if (ret == 3) {
 		ret = (hex & 1) ? 1 : 2;
+	}
 	return ret;
 }
 
@@ -100,13 +101,17 @@ static int i4004_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len
 	char basm[128];
 	const size_t basz = sizeof (basm)-1;
 	int rlen = i4004_get_ins_len (*buf);
-	if (!op) return 2;
+	if (!op) {
+		return 2;
+	}
 	r_strbuf_init (&op->esil);
 	ut8 high = (*buf & 0xf0)>>4;
 	ut8 low = (*buf & 0xf);
 	basm[0] = 0;
 
-	if (rlen > len)	return op->size = 0;
+	if (rlen > len) {
+		return op->size = 0;
+	}
 	switch (high) {
 	case 0:
 		if (low) {
@@ -121,9 +126,11 @@ static int i4004_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len
 		op->fail = addr + rlen;
 		break;
 	case 2:
-		if (rlen == 1)
+		if (rlen == 1) {
 			snprintf (basm, basz, "scr r%d", (low & 0xe));
-		else	snprintf (basm, basz, "fim r%d, 0x%02x", (low & 0xe), buf[1]);
+		} else {
+			snprintf (basm, basz, "fim r%d, 0x%02x", (low & 0xe), buf[1]);
+		}
 		break;
 	case 3: 
 		op->type = R_ANAL_OP_TYPE_MOV;
diff --git a/libr/anal/p/anal_java.c b/libr/anal/p/anal_java.c
index 6dcdb4860a..9b6065ca03 100644
--- a/libr/anal/p/anal_java.c
+++ b/libr/anal/p/anal_java.c
@@ -147,8 +147,9 @@ static int java_recursive_descent(RAnal *anal, RAnalState *state, ut64 addr) {
 	RAnalBlock *bb;
 	RAnalBlock *current_head;
 
-	if (!anal || !state || !state->current_bb || state->current_bb_head)
+	if (!anal || !state || !state->current_bb || state->current_bb_head) {
 		return 0;
+	}
 
 	bb = state->current_bb;
 	current_head = state->current_bb_head;
@@ -171,7 +172,9 @@ static int java_recursive_descent(RAnal *anal, RAnalState *state, ut64 addr) {
 	// if (bb->type2 & R_ANAL_EX_OBJ_OP)   handle_bb_obj_op (anal, state);
 	// if (bb->type2 & R_ANAL_EX_STACK_OP) handle_bb_stack_op (anal, state);
 	// if (bb->type2 & R_ANAL_EX_BIN_OP)   handle_bb_bin_op (anal, state);
-	if (bb->type2 & R_ANAL_EX_CODE_OP)  handle_bb_cf_recursive_descent (anal, state);
+	if (bb->type2 & R_ANAL_EX_CODE_OP) {
+		handle_bb_cf_recursive_descent (anal, state);
+	}
 	// if (bb->type2 & R_ANAL_EX_DATA_OP)  handle_bb_data_op (anal, state);
 	return 0;
 }
@@ -196,7 +199,9 @@ static int java_linear_sweep(RAnal *anal, RAnalState *state, ut64 addr) {
 	// if (bb->type2 & R_ANAL_EX_OBJ_OP)   handle_bb_obj_op (anal, state);
 	// if (bb->type2 & R_ANAL_EX_STACK_OP) handle_bb_stack_op (anal, state);
 	// if (bb->type2 & R_ANAL_EX_BIN_OP)   handle_bb_bin_op (anal, state);
-	if (bb->type2 & R_ANAL_EX_CODE_OP)  handle_bb_cf_linear_sweep (anal, state);
+	if (bb->type2 & R_ANAL_EX_CODE_OP) {
+		handle_bb_cf_linear_sweep (anal, state);
+	}
 	// if (bb->type2 & R_ANAL_EX_DATA_OP)  handle_bb_data_op (anal, state);
 	return 0;
 }
@@ -234,14 +239,17 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 				// visited some other time
 				if (!r_anal_state_search_bb (state, bb->jump)) {
 					jmp_list = r_anal_ex_perform_analysis ( anal, state, bb->jump );
-					if (jmp_list)
-						bb->jumpbb = (RAnalBlock *) r_list_get_n (jmp_list, 0);
-					if (bb->jumpbb)
+					if (jmp_list) {
+						bb->jumpbb = (RAnalBlock *)r_list_get_n (jmp_list, 0);
+					}
+					if (bb->jumpbb) {
 						bb->jump = bb->jumpbb->addr;
+					}
 				} else {
 					bb->jumpbb = r_anal_state_search_bb (state, bb->jump);
-					if (bb->jumpbb)
+					if (bb->jumpbb) {
 						bb->jump = bb->jumpbb->addr;
+					}
 				}
 
 				if (state->done == 1) {
@@ -259,8 +267,9 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 				// visited some other time
 				if (!r_anal_state_search_bb (state, bb->jump)) {
 					jmp_list = r_anal_ex_perform_analysis ( anal, state, bb->jump );
-					if (jmp_list)
-						bb->jumpbb = (RAnalBlock *) r_list_get_n (jmp_list, 0);
+					if (jmp_list) {
+						bb->jumpbb = (RAnalBlock *)r_list_get_n (jmp_list, 0);
+					}
 					if (bb->jumpbb) {
 						bb->jump = bb->jumpbb->addr;
 					}
@@ -277,8 +286,9 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 
 				if (!r_anal_state_search_bb (state, bb->fail)) {
 					jmp_list = r_anal_ex_perform_analysis ( anal, state, bb->fail );
-					if (jmp_list)
-						bb->failbb = (RAnalBlock *) r_list_get_n (jmp_list, 0);
+					if (jmp_list) {
+						bb->failbb = (RAnalBlock *)r_list_get_n (jmp_list, 0);
+					}
 					if (bb->failbb) {
 						bb->fail = bb->failbb->addr;
 					}
@@ -297,7 +307,9 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 				}
 
 				result = R_ANAL_RET_END;
-				if (encountered_stop) state->done = 1;
+				if (encountered_stop) {
+					state->done = 1;
+				}
 			}
 			break;
 
@@ -313,8 +325,9 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 					if (caseop) {
 						if (r_anal_state_addr_is_valid (state, caseop->jump) ) {
 							jmp_list = r_anal_ex_perform_analysis ( anal, state, caseop->jump );
-							if (jmp_list)
-								caseop->jumpbb = (RAnalBlock *) r_list_get_n (jmp_list, 0);
+							if (jmp_list) {
+								caseop->jumpbb = (RAnalBlock *)r_list_get_n (jmp_list, 0);
+							}
 							if (state->done == 1) {
 								IFDBG eprintf (" Looks like this jmp (bb @ 0x%04"PFMT64x") found a return.\n", addr);
 								state->done = 0;
@@ -324,7 +337,9 @@ static int handle_bb_cf_recursive_descent (RAnal *anal, RAnalState *state) {
 					}
 				}
 				r_list_free (jmp_list);
-				if (encountered_stop) state->done = 1;
+				if (encountered_stop) {
+					state->done = 1;
+				}
 			}
 
 			result = R_ANAL_RET_END;
@@ -587,7 +602,9 @@ static int java_analyze_fns_from_buffer( RAnal *anal, ut64 start, ut64 end, int
 		//analyze_all = 1;
 		buf_len = anal->iob.desc_size (anal->iob.io->desc);
 
-		if (buf_len == UT64_MAX) buf_len = 1024;
+		if (buf_len == UT64_MAX) {
+			buf_len = 1024;
+		}
 
 		end = start + buf_len;
 	}
@@ -614,7 +631,9 @@ static int java_analyze_fns_from_buffer( RAnal *anal, ut64 start, ut64 end, int
 		r_anal_fcn_tree_insert (&anal->fcn_tree, fcn);
 		r_list_append (anal->fcns, fcn);
 		offset += r_anal_fcn_size (fcn);
-		if (!analyze_all) break;
+		if (!analyze_all) {
+			break;
+		}
 	}
 	free (buffer);
 	return result;
@@ -867,7 +886,9 @@ static void java_update_anal_types (RAnal *anal, RBinJavaObj *bin_obj) {
 		if (the_list) {
 			r_list_foreach (the_list, iter, str) {
 				IFDBG eprintf ("Adding type: %s to known types.\n", str);
-				if (str) sdb_set (D, str, "type", 0);
+				if (str) {
+					sdb_set (D, str, "type", 0);
+				}
 			}
 		}
 		r_list_free (the_list);
diff --git a/libr/anal/p/anal_m68k_cs.c b/libr/anal/p/anal_m68k_cs.c
index fb0e8debd0..3199361947 100644
--- a/libr/anal/p/anal_m68k_cs.c
+++ b/libr/anal/p/anal_m68k_cs.c
@@ -145,22 +145,30 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 // XXX no arch->cpu ?!?! CS_MODE_MICRO, N64
 	op->delay = 0;
 	// replace this with the asm.features?
-	if (a->cpu && strstr (a->cpu, "68000"))
+	if (a->cpu && strstr (a->cpu, "68000")) {
 		mode |= CS_MODE_M68K_000;
-	if (a->cpu && strstr (a->cpu, "68010"))
+	}
+	if (a->cpu && strstr (a->cpu, "68010")) {
 		mode |= CS_MODE_M68K_010;
-	if (a->cpu && strstr (a->cpu, "68020"))
+	}
+	if (a->cpu && strstr (a->cpu, "68020")) {
 		mode |= CS_MODE_M68K_020;
-	if (a->cpu && strstr (a->cpu, "68030"))
+	}
+	if (a->cpu && strstr (a->cpu, "68030")) {
 		mode |= CS_MODE_M68K_030;
-	if (a->cpu && strstr (a->cpu, "68040"))
+	}
+	if (a->cpu && strstr (a->cpu, "68040")) {
 		mode |= CS_MODE_M68K_040;
-	if (a->cpu && strstr (a->cpu, "68060"))
+	}
+	if (a->cpu && strstr (a->cpu, "68060")) {
 		mode |= CS_MODE_M68K_060;
+	}
 	op->size = 4;
 	if (handle == 0) {
 		ret = cs_open (CS_ARCH_M68K, mode, &handle);
-		if (ret != CS_ERR_OK) goto fin;
+		if (ret != CS_ERR_OK) {
+			goto fin;
+		}
 		cs_option (handle, CS_OPT_DETAIL, CS_OPT_ON);
 	}
 	n = cs_disasm (handle, (ut8*)buf, len, addr, 1, &insn);
diff --git a/libr/anal/p/anal_mips_cs.c b/libr/anal/p/anal_mips_cs.c
index 7ef3b54af7..66ef3d6301 100644
--- a/libr/anal/p/anal_mips_cs.c
+++ b/libr/anal/p/anal_mips_cs.c
@@ -190,209 +190,208 @@ static int analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len
 		}
 	}
 
-	if (insn)
-	switch (insn->id) {
-	case MIPS_INS_NOP:
-		r_strbuf_setf (&op->esil, ",");
-		break;
-	case MIPS_INS_BREAK:
-		r_strbuf_setf (&op->esil, "%d,%d,TRAP", IMM (0), IMM (0));
-		break;
-	case MIPS_INS_SD:
-		r_strbuf_appendf (&op->esil, "%s,%s,=[8]",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_SW:
-	case MIPS_INS_SWL:
-	case MIPS_INS_SWR:
-		r_strbuf_appendf (&op->esil, "%s,%s,=[4]",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_SH:
-		r_strbuf_appendf (&op->esil, "%s,%s,=[2]",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_SWC1:
-	case MIPS_INS_SWC2:
-		r_strbuf_setf (&op->esil, "%s,$", ARG (1));
-		break;
-	case MIPS_INS_SB:
-		r_strbuf_appendf (&op->esil, "%s,%s,=[1]",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_CMP:
-	case MIPS_INS_CMPU:
-	case MIPS_INS_CMPGU:
-	case MIPS_INS_CMPGDU:
-	case MIPS_INS_CMPI:
-		r_strbuf_appendf (&op->esil, "%s,%s,==", ARG (1), ARG (0));
-		break;
-	case MIPS_INS_SHRAV:
-	case MIPS_INS_SHRAV_R:
-	case MIPS_INS_SHRA:
-	case MIPS_INS_SHRA_R:
-	case MIPS_INS_SRA:
-		r_strbuf_appendf (&op->esil, "%s,%s,>>,31,%s,>>,?{,32,%s,-,%s,1,<<,1,-,<<,}{,0,},|,%s,=,",
-			ARG (2), ARG (1), ARG (1), ARG (2), ARG (2), ARG (0));
-		break;
-	case MIPS_INS_SHRL:
-		// suffix 'S' forces conditional flag to be updated
-	case MIPS_INS_SRLV:
-	case MIPS_INS_SRL:
-		r_strbuf_appendf (&op->esil, "%s,%s,>>,%s,=", ARG (2), ARG (1), ARG (0));
-		break;
-	case MIPS_INS_SLLV:
-	case MIPS_INS_SLL:
-		r_strbuf_appendf (&op->esil, "%s,%s,<<,%s,=", ARG (2), ARG (1), ARG (0));
-		break;
-	case MIPS_INS_BAL:
-	case MIPS_INS_JAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_D ("%s"), ARG (0));
-		break;
-	case MIPS_INS_JALR:
-	case MIPS_INS_JALRS:
-		if (OPCOUNT () < 2) {
+	if (insn) {
+		switch (insn->id) {
+		case MIPS_INS_NOP:
+			r_strbuf_setf (&op->esil, ",");
+			break;
+		case MIPS_INS_BREAK:
+			r_strbuf_setf (&op->esil, "%d,%d,TRAP", IMM (0), IMM (0));
+			break;
+		case MIPS_INS_SD:
+			r_strbuf_appendf (&op->esil, "%s,%s,=[8]",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_SW:
+		case MIPS_INS_SWL:
+		case MIPS_INS_SWR:
+			r_strbuf_appendf (&op->esil, "%s,%s,=[4]",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_SH:
+			r_strbuf_appendf (&op->esil, "%s,%s,=[2]",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_SWC1:
+		case MIPS_INS_SWC2:
+			r_strbuf_setf (&op->esil, "%s,$", ARG (1));
+			break;
+		case MIPS_INS_SB:
+			r_strbuf_appendf (&op->esil, "%s,%s,=[1]",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_CMP:
+		case MIPS_INS_CMPU:
+		case MIPS_INS_CMPGU:
+		case MIPS_INS_CMPGDU:
+		case MIPS_INS_CMPI:
+			r_strbuf_appendf (&op->esil, "%s,%s,==", ARG (1), ARG (0));
+			break;
+		case MIPS_INS_SHRAV:
+		case MIPS_INS_SHRAV_R:
+		case MIPS_INS_SHRA:
+		case MIPS_INS_SHRA_R:
+		case MIPS_INS_SRA:
+			r_strbuf_appendf (&op->esil, "%s,%s,>>,31,%s,>>,?{,32,%s,-,%s,1,<<,1,-,<<,}{,0,},|,%s,=,",
+				ARG (2), ARG (1), ARG (1), ARG (2), ARG (2), ARG (0));
+			break;
+		case MIPS_INS_SHRL:
+			// suffix 'S' forces conditional flag to be updated
+		case MIPS_INS_SRLV:
+		case MIPS_INS_SRL:
+			r_strbuf_appendf (&op->esil, "%s,%s,>>,%s,=", ARG (2), ARG (1), ARG (0));
+			break;
+		case MIPS_INS_SLLV:
+		case MIPS_INS_SLL:
+			r_strbuf_appendf (&op->esil, "%s,%s,<<,%s,=", ARG (2), ARG (1), ARG (0));
+			break;
+		case MIPS_INS_BAL:
+		case MIPS_INS_JAL:
 			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_D ("%s"), ARG (0));
-		} else {
-			PROTECT_ZERO () {
-				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_DR ("%s","%s"), ARG (0), ARG (1));
+			break;
+		case MIPS_INS_JALR:
+		case MIPS_INS_JALRS:
+			if (OPCOUNT () < 2) {
+				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_D ("%s"), ARG (0));
+			} else {
+				PROTECT_ZERO () {
+					r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_DR ("%s", "%s"), ARG (0), ARG (1));
+				}
 			}
-		}
-		break;
-	case MIPS_INS_JALRC: // no delay
-		if (OPCOUNT () < 2) {
-			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_ND ("%s"), ARG (0));
-		} else {
-			PROTECT_ZERO () {
-				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_NDR ("%s","%s"), ARG (0), ARG (1));
+			break;
+		case MIPS_INS_JALRC: // no delay
+			if (OPCOUNT () < 2) {
+				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_ND ("%s"), ARG (0));
+			} else {
+				PROTECT_ZERO () {
+					r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_NDR ("%s", "%s"), ARG (0), ARG (1));
+				}
 			}
-		}
-		break;
-	case MIPS_INS_JRADDIUSP:
-		// increment stackpointer in X and jump to %ra
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%d,sp,+=,"ES_J ("ra"), ARG (0));
-		break;
-	case MIPS_INS_JR:
-	case MIPS_INS_JRC:
-	case MIPS_INS_J:
-	case MIPS_INS_B: // ???
-		// jump to address with conditional
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_J ("%s"), ARG (0));
-		break;
-	case MIPS_INS_BNE:  // bne $s, $t, offset
-	case MIPS_INS_BNEL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,!,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1), ARG (2));
-		break;
-	case MIPS_INS_BEQ:
-	case MIPS_INS_BEQL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1), ARG (2));
-		break;
-	case MIPS_INS_BZ:
-	case MIPS_INS_BEQZ:
-	case MIPS_INS_BEQZC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BNEZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,!,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BEQZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{,"ES_CALL_ND ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BLEZ:
-	case MIPS_INS_BLEZC:
-	case MIPS_INS_BLEZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,"ES_J ("%s")",BREAK,},",
-			ARG (0), ARG (1));
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BGEZ:
-	case MIPS_INS_BGEZC:
-	case MIPS_INS_BGEZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BGEZAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BGEZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_ND ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BGTZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG(0));
-		r_strbuf_appendf (&op->esil, "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_ND ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BLTZAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}", ARG(0), ARG(1));
-		break;
-	case MIPS_INS_BLTZ:
-	case MIPS_INS_BLTZC:
-	case MIPS_INS_BLTZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BGTZ:
-	case MIPS_INS_BGTZC:
-	case MIPS_INS_BGTZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG (0));
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J("%s")",}",
-			ARG (0), ARG (1));
-		break;
-	case MIPS_INS_BTEQZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,?{,"ES_J ("%s")",}", ARG (0));
-		break;
-	case MIPS_INS_BTNEZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,!,?{,"ES_J ("%s")",}", ARG (0));
-		break;
-	case MIPS_INS_MOV:
-	case MIPS_INS_MOVE:
-		PROTECT_ZERO () {
-			r_strbuf_appendf (&op->esil, "%s,%s,=", ARG (1), REG (0));
-		}
-		break;
-	case MIPS_INS_MOVZ:
-	case MIPS_INS_MOVF:
-		PROTECT_ZERO () {
-			r_strbuf_appendf (&op->esil, "0,%s,==,$z,?{,%s,%s,=,}",
-				ARG (2), ARG (1), REG (0));
-		}
-		break;
-	case MIPS_INS_MOVT:
-		PROTECT_ZERO () {
-			r_strbuf_appendf (&op->esil, "1,%s,==,$z,?{,%s,%s,=,}",
-				ARG (2), ARG (1), REG (0));
-		}
-		break;
-	case MIPS_INS_FSUB:
-	case MIPS_INS_SUB:
-	case MIPS_INS_SUBU:
-	case MIPS_INS_DSUB:
-	case MIPS_INS_DSUBU:
-		PROTECT_ZERO () {
-			r_strbuf_appendf(&op->esil, "%s,%s,-,%s,=",
-				ARG (2), ARG (1), ARG (0));
-		}
-		break;
-	case MIPS_INS_NEG:
-	case MIPS_INS_NEGU:
-		r_strbuf_appendf (&op->esil, "%s,0,-,%s,=,",
-			ARG (1), ARG (0));
-		break;
+			break;
+		case MIPS_INS_JRADDIUSP:
+			// increment stackpointer in X and jump to %ra
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%d,sp,+=," ES_J ("ra"), ARG (0));
+			break;
+		case MIPS_INS_JR:
+		case MIPS_INS_JRC:
+		case MIPS_INS_J:
+		case MIPS_INS_B: // ???
+			// jump to address with conditional
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_J ("%s"), ARG (0));
+			break;
+		case MIPS_INS_BNE: // bne $s, $t, offset
+		case MIPS_INS_BNEL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,!,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1), ARG (2));
+			break;
+		case MIPS_INS_BEQ:
+		case MIPS_INS_BEQL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1), ARG (2));
+			break;
+		case MIPS_INS_BZ:
+		case MIPS_INS_BEQZ:
+		case MIPS_INS_BEQZC:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BNEZ:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,!,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BEQZALC:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{," ES_CALL_ND ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BLEZ:
+		case MIPS_INS_BLEZC:
+		case MIPS_INS_BLEZL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{," ES_J ("%s") ",BREAK,},",
+				ARG (0), ARG (1));
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BGEZ:
+		case MIPS_INS_BGEZC:
+		case MIPS_INS_BGEZL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BGEZAL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_CALL_D ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BGEZALC:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_CALL_ND ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BGTZALC:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG (0));
+			r_strbuf_appendf (&op->esil, "0," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_CALL_ND ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BLTZAL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_CALL_D ("%s") ",}", ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BLTZ:
+		case MIPS_INS_BLTZC:
+		case MIPS_INS_BLTZL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BGTZ:
+		case MIPS_INS_BGTZC:
+		case MIPS_INS_BGTZL:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG (0));
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0," ES_IS_NEGATIVE ("%s") ",==,$z,?{," ES_J ("%s") ",}",
+				ARG (0), ARG (1));
+			break;
+		case MIPS_INS_BTEQZ:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,?{," ES_J ("%s") ",}", ARG (0));
+			break;
+		case MIPS_INS_BTNEZ:
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,!,?{," ES_J ("%s") ",}", ARG (0));
+			break;
+		case MIPS_INS_MOV:
+		case MIPS_INS_MOVE:
+			PROTECT_ZERO () {
+				r_strbuf_appendf (&op->esil, "%s,%s,=", ARG (1), REG (0));
+			}
+			break;
+		case MIPS_INS_MOVZ:
+		case MIPS_INS_MOVF:
+			PROTECT_ZERO () {
+				r_strbuf_appendf (&op->esil, "0,%s,==,$z,?{,%s,%s,=,}",
+					ARG (2), ARG (1), REG (0));
+			}
+			break;
+		case MIPS_INS_MOVT:
+			PROTECT_ZERO () {
+				r_strbuf_appendf (&op->esil, "1,%s,==,$z,?{,%s,%s,=,}",
+					ARG (2), ARG (1), REG (0));
+			}
+			break;
+		case MIPS_INS_FSUB:
+		case MIPS_INS_SUB:
+		case MIPS_INS_SUBU:
+		case MIPS_INS_DSUB:
+		case MIPS_INS_DSUBU:
+			PROTECT_ZERO () {
+				r_strbuf_appendf (&op->esil, "%s,%s,-,%s,=",
+					ARG (2), ARG (1), ARG (0));
+			}
+			break;
+		case MIPS_INS_NEG:
+		case MIPS_INS_NEGU:
+			r_strbuf_appendf (&op->esil, "%s,0,-,%s,=,",
+				ARG (1), ARG (0));
+			break;
 
-	/** signed -- sets overflow flag */
-	case MIPS_INS_ADD:
-		{
-		PROTECT_ZERO () {
-			r_strbuf_appendf(&op->esil, "%s,%s,+,%s,=",
-				ARG (1), ARG (2), ARG (0));
+		/** signed -- sets overflow flag */
+		case MIPS_INS_ADD: {
+			PROTECT_ZERO () {
+				r_strbuf_appendf (&op->esil, "%s,%s,+,%s,=",
+					ARG (1), ARG (2), ARG (0));
 #if 0
 			r_strbuf_appendf (&op->esil,
 				"0,32,%s,%s,+,>>,>,?{,1,TRAP,}{,%s,%s,+,%s,=,}",
@@ -584,6 +583,7 @@ static int analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len
 	default:
 		return -1;
 	}
+	}
 	return 0;
 }
 
@@ -701,17 +701,21 @@ static int analop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 // XXX no arch->cpu ?!?! CS_MODE_MICRO, N64
 	op->delay = 0;
 	op->type = R_ANAL_OP_TYPE_ILL;
-	if (len<4)
+	if (len < 4) {
 		return -1;
+	}
 	op->size = 4;
 	if (hndl == 0) {
 		ret = cs_open (CS_ARCH_MIPS, mode, &hndl);
-		if (ret != CS_ERR_OK) goto fin;
+		if (ret != CS_ERR_OK) {
+			goto fin;
+		}
 		cs_option (hndl, CS_OPT_DETAIL, CS_OPT_ON);
 	}
 	n = cs_disasm (hndl, (ut8*)buf, len, addr, 1, &insn);
-	if (n<1 || insn->size<1)
+	if (n < 1 || insn->size < 1) {
 		goto beach;
+	}
 	op->type = R_ANAL_OP_TYPE_NULL;
 	op->delay = 0;
 	op->jump = UT64_MAX;
@@ -997,8 +1001,9 @@ static int analop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 beach:
 	set_opdir (op);
 	if (anal->decode) {
-		if (analop_esil (anal, op, addr, buf, len, &hndl, insn) != 0)
+		if (analop_esil (anal, op, addr, buf, len, &hndl, insn) != 0) {
 			r_strbuf_fini (&op->esil);
+		}
 	}
 	if (anal->fillval) {
 		op_fillval (anal, op, &hndl, insn);
diff --git a/libr/anal/p/anal_mips_gnu.c b/libr/anal/p/anal_mips_gnu.c
index 957536b0b7..8b6a9697e4 100644
--- a/libr/anal/p/anal_mips_gnu.c
+++ b/libr/anal/p/anal_mips_gnu.c
@@ -15,7 +15,9 @@ static const char* mips_reg_decode(unsigned reg_num) {
 		"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
 		"t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra"
 	};
-	if (reg_num < 32) return REGISTERS[reg_num];
+	if (reg_num < 32) {
+		return REGISTERS[reg_num];
+	}
 	return NULL;
 }
 
@@ -24,8 +26,9 @@ static int mips_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len) {
 	// WIP char buf[10]; int reg; int family;
 	int optype, oplen = (anal->bits==16)?2:4;
 
-	if (!op)
+	if (!op) {
 		return oplen;
+	}
 
 	memset (op, 0, sizeof (RAnalOp));
 	op->type = R_ANAL_OP_TYPE_UNK;
@@ -242,8 +245,9 @@ static int mips_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len) {
 		int rs = ((b[0]&3)<<3)+(b[1]>>5);
 		int rt = b[1]&31;
 		int imm = (b[2]<<8)+b[3];
-		if (((optype >> 2) ^ 0x3) && (imm & 0x8000))
+		if (((optype >> 2) ^ 0x3) && (imm & 0x8000)) {
 			imm = 0 - (0x10000 - imm);
+		}
 		switch (optype) {
 		case 1: // if (rt) { /* bgez */ } else { /* bltz */ }
 		case 4: // beq
diff --git a/libr/anal/p/anal_nios2.c b/libr/anal/p/anal_nios2.c
index 4279500a91..4eacf48278 100644
--- a/libr/anal/p/anal_nios2.c
+++ b/libr/anal/p/anal_nios2.c
@@ -7,8 +7,9 @@
 #include <r_anal.h>
 
 static int nios2_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len) {
-	if (!op)
+	if (!op) {
 		return 1;
+	}
 	/* Ayeeee! What's inside op? Do we have an initialized RAnalOp? Are we going to have a leak here? :-( */
 	memset (op, 0, sizeof (RAnalOp)); /* We need to refactorize this. Something like r_anal_op_init would be more appropiate */
 	r_strbuf_init (&op->esil);
@@ -36,54 +37,54 @@ static int nios2_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len)
 		// blt, r19, r5, 0x8023480
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		// TODO: address
-	} else
-	switch (b[0]) {
-	case 0x3a:
-		if (b[1]>=0xa0 && b[1]<=0xaf && b[3]==0x3d) {
-			op->type = R_ANAL_OP_TYPE_TRAP;
-		} else
-		if ((b[1]>=0xe0&&b[1]<=0xe7) && b[2]==0x3e && !b[3]) {
-			// nextpc ra
-			op->type = R_ANAL_OP_TYPE_RET;
+	} else {
+		switch (b[0]) {
+		case 0x3a:
+			if (b[1] >= 0xa0 && b[1] <= 0xaf && b[3] == 0x3d) {
+				op->type = R_ANAL_OP_TYPE_TRAP;
+			} else if ((b[1] >= 0xe0 && b[1] <= 0xe7) && b[2] == 0x3e && !b[3]) {
+				// nextpc ra
+				op->type = R_ANAL_OP_TYPE_RET;
+			}
+			break;
+		case 0x01:
+			// jmpi
+			op->type = R_ANAL_OP_TYPE_JMP;
+			break;
+		case 0x00:
+		case 0x20:
+		case 0x40:
+		case 0x80:
+		case 0xc0:
+			//
+			op->type = R_ANAL_OP_TYPE_CALL;
+			break;
+		case 0x26:
+			// beq
+			break;
+		case 0x07:
+		case 0x47:
+		case 0x87:
+		case 0xc7:
+			// ldb
+			op->type = R_ANAL_OP_TYPE_LOAD;
+			break;
+		case 0x0d:
+		case 0x2d:
+		case 0x4d:
+		case 0x8d:
+		case 0xcd:
+			// sth && sthio
+			op->type = R_ANAL_OP_TYPE_LOAD;
+			break;
+		case 0x06:
+		case 0x46:
+		case 0x86:
+		case 0xc6:
+			// br
+			op->type = R_ANAL_OP_TYPE_CALL;
+			break;
 		}
-		break;
-	case 0x01:
-		// jmpi
-		op->type = R_ANAL_OP_TYPE_JMP;
-		break;
-	case 0x00:
-	case 0x20:
-	case 0x40:
-	case 0x80:
-	case 0xc0:
-		// 
-		op->type = R_ANAL_OP_TYPE_CALL;
-		break;
-	case 0x26:
-		// beq
-		break;
-	case 0x07:
-	case 0x47:
-	case 0x87:
-	case 0xc7:
-		// ldb
-		op->type = R_ANAL_OP_TYPE_LOAD;
-		break;
-	case 0x0d:
-	case 0x2d:
-	case 0x4d:
-	case 0x8d:
-	case 0xcd:
-		// sth && sthio
-		op->type = R_ANAL_OP_TYPE_LOAD;
-		break;
-	case 0x06:
-	case 0x46:
-	case 0x86:
-	case 0xc6:
-		// br
-		op->type = R_ANAL_OP_TYPE_CALL;
-		break;
 	}
 	return op->size;
 }
diff --git a/libr/anal/p/anal_pic.c b/libr/anal/p/anal_pic.c
index ff9c8058f0..0f1c13e475 100644
--- a/libr/anal/p/anal_pic.c
+++ b/libr/anal/p/anal_pic.c
@@ -738,10 +738,12 @@ static int anal_pic_pic18_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf
 	ut16 b = *(ut16 *)buf;
 	switch (b >> 9) {
 	case 0x76: //call
-		if (len < 4)
+		if (len < 4) {
 			goto beach;
-		if (*(ut32 *)buf >> 28 != 0xf)
+		}
+		if (*(ut32 *)buf >> 28 != 0xf) {
 			goto beach;
+		}
 		op->size = 4;
 		op->type = R_ANAL_OP_TYPE_CALL;
 		return op->size;
@@ -764,10 +766,12 @@ static int anal_pic_pic18_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf
 		r_strbuf_setf (&op->esil, ",");
 		return op->size;
 	case 0xc: //movff
-		if (len < 4)
+		if (len < 4) {
 			goto beach;
-		if (*(ut32 *)buf >> 28 != 0xf)
+		}
+		if (*(ut32 *)buf >> 28 != 0xf) {
 			goto beach;
+		}
 		op->size = 4;
 		op->type = R_ANAL_OP_TYPE_MOV;
 		return op->size;
@@ -808,10 +812,12 @@ static int anal_pic_pic18_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf
 		pic18_cond_branch (op, addr, buf, "c");
 		return op->size;
 	case 0xef: //goto
-		if (len < 4)
+		if (len < 4) {
 			goto beach;
-		if (*(ut32 *)buf >> 28 != 0xf)
+		}
+		if (*(ut32 *)buf >> 28 != 0xf) {
 			goto beach;
+		}
 		op->size = 4;
 		op->cycles = 2;
 		ut32 dword_instr = *(ut32 *)buf;
@@ -865,10 +871,12 @@ static int anal_pic_pic18_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf
 
 	switch (b >> 6) { //LFSR
 	case 0x3b8:       //lfsr
-		if (len < 4)
+		if (len < 4) {
 			goto beach;
-		if (*(ut32 *)buf >> 28 != 0xf)
+		}
+		if (*(ut32 *)buf >> 28 != 0xf) {
 			goto beach;
+		}
 		op->size = 4;
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		return op->size;
diff --git a/libr/anal/p/anal_ppc_cs.c b/libr/anal/p/anal_ppc_cs.c
index ae357fb332..79738969af 100644
--- a/libr/anal/p/anal_ppc_cs.c
+++ b/libr/anal/p/anal_ppc_cs.c
@@ -43,8 +43,12 @@ static const char* cmask64(const char *mb_c, const char *me_c) {
 	static char cmask[32];
 	ut64 mb = 0;
 	ut64 me = 0;
-	if (mb_c) mb = strtol (mb_c, NULL, 16);
-	if (me_c) me = strtol (me_c, NULL, 16);
+	if (mb_c) {
+		mb = strtol (mb_c, NULL, 16);
+	}
+	if (me_c) {
+		me = strtol (me_c, NULL, 16);
+	}
 	snprintf (cmask, sizeof (cmask), "0x%"PFMT64x"", mask64 (mb, me));
 	return cmask;
 }
@@ -53,8 +57,12 @@ static const char* cmask32(const char *mb_c, const char *me_c) {
 	static char cmask[32];
 	ut32 mb = 0;
 	ut32 me = 0;
-	if (mb_c) mb = strtol (mb_c, NULL, 16);
-	if (me_c) me = strtol (me_c, NULL, 16);
+	if (mb_c) {
+		mb = strtol (mb_c, NULL, 16);
+	}
+	if (me_c) {
+		me = strtol (me_c, NULL, 16);
+	}
 	snprintf (cmask, sizeof (cmask), "0x%"PFMT32x"", mask32 (mb, me));
 	return cmask;
 }
@@ -595,8 +603,11 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 		case PPC_INS_CMPWI:
 			op->type = R_ANAL_OP_TYPE_CMP;
 			op->sign = true;
-			if (ARG (2)[0] == '\0') esilprintf (op, "%s,%s,-,0xff,&,cr0,=", ARG (1), ARG (0));
-			else esilprintf (op, "%s,%s,-,0xff,&,%s,=", ARG (2), ARG (1), ARG (0));
+			if (ARG (2)[0] == '\0') {
+				esilprintf (op, "%s,%s,-,0xff,&,cr0,=", ARG (1), ARG (0));
+			} else {
+				esilprintf (op, "%s,%s,-,0xff,&,%s,=", ARG (2), ARG (1), ARG (0));
+			}
 			break;
 		case PPC_INS_MFLR:
 			op->type = R_ANAL_OP_TYPE_MOV;
@@ -630,13 +641,19 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 		case PPC_INS_EXTSB:
 			op->sign = true;
 			op->type = R_ANAL_OP_TYPE_MOV;
-			if (a->bits == 64) esilprintf (op, "%s,0x80,&,?{,0xFFFFFFFFFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
-			else esilprintf (op, "%s,0x80,&,?{,0xFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			if (a->bits == 64) {
+				esilprintf (op, "%s,0x80,&,?{,0xFFFFFFFFFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			} else {
+				esilprintf (op, "%s,0x80,&,?{,0xFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			}
 			break;
 		case PPC_INS_EXTSH:
 			op->sign = true;
-			if (a->bits == 64) esilprintf (op, "%s,0x8000,&,?{,0xFFFFFFFFFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
-			else esilprintf (op, "%s,0x8000,&,?{,0xFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			if (a->bits == 64) {
+				esilprintf (op, "%s,0x8000,&,?{,0xFFFFFFFFFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			} else {
+				esilprintf (op, "%s,0x8000,&,?{,0xFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
+			}
 			break;
 		case PPC_INS_EXTSW:
 			op->sign = true;
diff --git a/libr/anal/p/anal_ppc_gnu.c b/libr/anal/p/anal_ppc_gnu.c
index 52c2caac7d..0771c84012 100644
--- a/libr/anal/p/anal_ppc_gnu.c
+++ b/libr/anal/p/anal_ppc_gnu.c
@@ -34,7 +34,9 @@ static int ppc_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 			// bctr
 		} else {
 			op->jump = (aa)?(baddr):(addr+baddr);
-			if (lk) op->fail = addr+4;
+			if (lk) {
+				op->fail = addr + 4;
+			}
 		}
 		op->eob = 1;
 		break;
diff --git a/libr/anal/p/anal_riscv.c b/libr/anal/p/anal_riscv.c
index c138eb1662..370e912323 100644
--- a/libr/anal/p/anal_riscv.c
+++ b/libr/anal/p/anal_riscv.c
@@ -17,7 +17,9 @@ static bool _is_any(const char *str, ...) {
 	va_start (va, str);
 	while (true) {
 		cur = va_arg (va, char *);
-		if (!cur) break;
+		if (!cur) {
+			break;
+		}
 		if (!strcmp (str, cur)) {
 			va_end (va);
 			return true;
@@ -72,13 +74,18 @@ static int riscv_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
 		op->type = R_ANAL_OP_TYPE_ILL;
 		return -1;
 	}
-	if (!o || !o->name) return op->size;
+	if (!o || !o->name) {
+		return op->size;
+	}
 
 	for (; o < &riscv_opcodes[NUMOPCODES]; o++) {
 		// XXX ASAN segfault if ( !(o->match_func)(o, word) ) continue;
-		if ( no_alias && (o->pinfo & INSN_ALIAS) ) continue;
-		if ( isdigit ((int)(o->subset[0])) && atoi (o->subset) != xlen) continue;
-		else {
+		if (no_alias && (o->pinfo & INSN_ALIAS)) {
+			continue;
+		}
+		if (isdigit ((int)(o->subset[0])) && atoi (o->subset) != xlen) {
+			continue;
+		} else {
 			break;
 		}
 	}
diff --git a/libr/anal/p/anal_snes.c b/libr/anal/p/anal_snes.c
index 9d62141947..4efda6768b 100644
--- a/libr/anal/p/anal_snes.c
+++ b/libr/anal/p/anal_snes.c
@@ -13,8 +13,9 @@ static struct snes_asm_flags* snesflags = NULL;
 static int snes_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
 	memset (op, '\0', sizeof (RAnalOp));
 	op->size = snes_op_get_size(snesflags->M, snesflags->X, &snes_op[data[0]]);
-	if (op->size > len)
+	if (op->size > len) {
 		return op->size = 0;
+	}
 	op->nopcode = 1;
 	op->addr = addr;
 	op->type = R_ANAL_OP_TYPE_UNK;
@@ -219,19 +220,29 @@ static int snes_anop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int l
 		op->type = R_ANAL_OP_TYPE_RET;
 		break;
 	case 0xc2: // rep
-		if ( ((st8)data[1]) & 0x10 ) snesflags->X = 0;
-		if ( ((st8)data[1]) & 0x20 ) snesflags->M = 0;
+		if (((st8)data[1]) & 0x10) {
+			snesflags->X = 0;
+		}
+		if (((st8)data[1]) & 0x20) {
+			snesflags->M = 0;
+		}
 		break;
 	case 0xe2: // sep
-		if ( ((st8)data[1]) & 0x10 ) snesflags->X = 1;
-		if ( ((st8)data[1]) & 0x20 ) snesflags->M = 1;
+		if (((st8)data[1]) & 0x10) {
+			snesflags->X = 1;
+		}
+		if (((st8)data[1]) & 0x20) {
+			snesflags->M = 1;
+		}
 		break;
 	}
 	return op->size;
 }
 
 static int snes_anal_init (void* user) {
-	if (!snesflags) snesflags = malloc(sizeof( struct snes_asm_flags ));
+	if (!snesflags) {
+		snesflags = malloc (sizeof (struct snes_asm_flags));
+	}
 	memset(snesflags,0,sizeof (struct snes_asm_flags));
 	return 0;
 }
diff --git a/libr/anal/p/anal_sparc_cs.c b/libr/anal/p/anal_sparc_cs.c
index 558e9581ac..aa635c614c 100644
--- a/libr/anal/p/anal_sparc_cs.c
+++ b/libr/anal/p/anal_sparc_cs.c
@@ -105,8 +105,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	}
 
 	mode = CS_MODE_LITTLE_ENDIAN;
-	if (!strcmp (a->cpu, "v9"))
+	if (!strcmp (a->cpu, "v9")) {
 		mode |= CS_MODE_V9;
+	}
 	if (mode != omode) {
 		cs_close (&handle);
 		handle = 0;
@@ -211,17 +212,21 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 			switch (INSOP(0).type) {
 			case SPARC_OP_REG:
 				op->type = R_ANAL_OP_TYPE_CJMP;
-				if (INSCC != SPARC_CC_ICC_N) // never
-					op->jump = INSOP(1).imm;
-				if (INSCC != SPARC_CC_ICC_A) // always
-					op->fail = addr+4;
+				if (INSCC != SPARC_CC_ICC_N) { // never
+					op->jump = INSOP (1).imm;
+				}
+				if (INSCC != SPARC_CC_ICC_A) { // always
+					op->fail = addr + 4;
+				}
 				break;
 			case SPARC_OP_IMM:
 				op->type = R_ANAL_OP_TYPE_CJMP;
-				if (INSCC != SPARC_CC_ICC_N) // never
-					op->jump = INSOP(0).imm;
-				if (INSCC != SPARC_CC_ICC_A) // always
-					op->fail = addr+4;
+				if (INSCC != SPARC_CC_ICC_N) { // never
+					op->jump = INSOP (0).imm;
+				}
+				if (INSCC != SPARC_CC_ICC_A) { // always
+					op->fail = addr + 4;
+				}
 				break;
 			default:
 				// MEM?
diff --git a/libr/anal/p/anal_sparc_gnu.c b/libr/anal/p/anal_sparc_gnu.c
index 529d64c7a7..fc9fd1c96b 100644
--- a/libr/anal/p/anal_sparc_gnu.c
+++ b/libr/anal/p/anal_sparc_gnu.c
@@ -304,8 +304,9 @@ static void anal_call(RAnalOp *op, const ut32 insn, const ut64 addr) {
 
 static void anal_jmpl(RAnal const * const anal, RAnalOp *op, const ut32 insn, const ut64 addr) {
 	st64 disp = 0;
-	if (X_LDST_I(insn))
-		disp = get_immed_sgnext(insn, 12);
+	if (X_LDST_I (insn)) {
+		disp = get_immed_sgnext (insn, 12);
+	}
 
 	if (X_RD(insn) == GPR_O7) {
 		op->type = R_ANAL_OP_TYPE_UCALL;
diff --git a/libr/anal/p/anal_tms320.c b/libr/anal/p/anal_tms320.c
index 195cea1997..aaa15321b7 100644
--- a/libr/anal/p/anal_tms320.c
+++ b/libr/anal/p/anal_tms320.c
@@ -38,20 +38,23 @@ int tms320_c55x_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 
 	if (match(str, "B ")) {
 		op->type = R_ANAL_OP_TYPE_JMP;
-		if (match(str, "B AC"))
+		if (match (str, "B AC")) {
 			op->type = R_ANAL_OP_TYPE_UJMP;
+		}
 	} else if (match(str, "BCC ") || match(str, "BCCU ")) {
 		op->type = R_ANAL_OP_TYPE_CJMP;
 	} else if (match(str, "CALL ")) {
 		op->type = R_ANAL_OP_TYPE_CALL;
-		if (match(str, "CALL AC"))
+		if (match (str, "CALL AC")) {
 			op->type = R_ANAL_OP_TYPE_UCALL;
+		}
 	} else if (match(str, "CALLCC ")) {
 		op->type = R_ANAL_OP_TYPE_CCALL;
 	} else if (match(str, "RET")) {
 		op->type = R_ANAL_OP_TYPE_RET;
-		if (match(str, "RETCC"))
+		if (match (str, "RETCC")) {
 			op->type = R_ANAL_OP_TYPE_CRET;
+		}
 	} else if (match(str, "MOV ")) {
 		op->type = R_ANAL_OP_TYPE_MOV;
 	} else if (match(str, "PSHBOTH ")) {
diff --git a/libr/anal/p/anal_tms320_c55x_plus.c b/libr/anal/p/anal_tms320_c55x_plus.c
index db8732f502..6178d87086 100644
--- a/libr/anal/p/anal_tms320_c55x_plus.c
+++ b/libr/anal/p/anal_tms320_c55x_plus.c
@@ -12,12 +12,14 @@ int tms320_c55x_plus_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int
 	ut16 *ins = (ut16*)buf;
 	ut32 ins_len;
 
-	if (!buf || len <= 0)
+	if (!buf || len <= 0) {
 		return 0;
+	}
 
 	ins_len = get_ins_len(buf[0]);
-	if (ins_len == 0)
+	if (ins_len == 0) {
 		return 0;
+	}
 
 	memset (op, 0, sizeof (RAnalOp));
 	op->type = R_ANAL_OP_TYPE_UNK;
diff --git a/libr/anal/p/anal_v810.c b/libr/anal/p/anal_v810.c
index 32dfe44171..358c04da4e 100644
--- a/libr/anal/p/anal_v810.c
+++ b/libr/anal/p/anal_v810.c
@@ -17,17 +17,33 @@ enum {
 };
 
 static void update_flags(RAnalOp *op, int flags) {
-	if (flags & V810_FLAG_CY) r_strbuf_append(&op->esil, ",$c31,cy,=");
-	if (flags & V810_FLAG_OV) r_strbuf_append(&op->esil, ",$o,ov,=");
-	if (flags & V810_FLAG_S) r_strbuf_append(&op->esil, ",$s,s,=");
-	if (flags & V810_FLAG_Z) r_strbuf_append(&op->esil, ",$z,z,=");
+	if (flags & V810_FLAG_CY) {
+		r_strbuf_append (&op->esil, ",$c31,cy,=");
+	}
+	if (flags & V810_FLAG_OV) {
+		r_strbuf_append (&op->esil, ",$o,ov,=");
+	}
+	if (flags & V810_FLAG_S) {
+		r_strbuf_append (&op->esil, ",$s,s,=");
+	}
+	if (flags & V810_FLAG_Z) {
+		r_strbuf_append (&op->esil, ",$z,z,=");
+	}
 }
 
 static void clear_flags(RAnalOp *op, int flags) {
-	if (flags & V810_FLAG_CY) r_strbuf_append(&op->esil, ",0,cy,=");
-	if (flags & V810_FLAG_OV) r_strbuf_append(&op->esil, ",0,ov,=");
-	if (flags & V810_FLAG_S) r_strbuf_append(&op->esil, ",0,s,=");
-	if (flags & V810_FLAG_Z) r_strbuf_append(&op->esil, ",0,z,=");
+	if (flags & V810_FLAG_CY) {
+		r_strbuf_append (&op->esil, ",0,cy,=");
+	}
+	if (flags & V810_FLAG_OV) {
+		r_strbuf_append (&op->esil, ",0,ov,=");
+	}
+	if (flags & V810_FLAG_S) {
+		r_strbuf_append (&op->esil, ",0,s,=");
+	}
+	if (flags & V810_FLAG_Z) {
+		r_strbuf_append (&op->esil, ",0,z,=");
+	}
 }
 
 static int v810_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
@@ -58,8 +74,9 @@ static int v810_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 	op->ptr = op->val = -1;
 
 	opcode = OPCODE(word1);
-	if (opcode>>3 == 0x4)
+	if (opcode >> 3 == 0x4) {
 		opcode &= 0x20;
+	}
 
 	switch (opcode) {
 	case V810_MOV:
@@ -104,10 +121,11 @@ static int v810_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 		update_flags (op, V810_FLAG_OV | V810_FLAG_S | V810_FLAG_Z);
 		break;
 	case V810_JMP:
-		if (REG1(word1) == 31)
+		if (REG1 (word1) == 31) {
 			op->type = R_ANAL_OP_TYPE_RET;
-		else
+		} else {
 			op->type = R_ANAL_OP_TYPE_UJMP;
+		}
 		r_strbuf_appendf (&op->esil, "r%u,pc,=",
 						 REG1(word1));
 		break;
diff --git a/libr/anal/p/anal_v850.c b/libr/anal/p/anal_v850.c
index b21aaed661..0b9625b4b2 100644
--- a/libr/anal/p/anal_v850.c
+++ b/libr/anal/p/anal_v850.c
@@ -12,17 +12,33 @@
 #include <v850_disas.h>
 
 static void update_flags(RAnalOp *op, int flags) {
-	if (flags & V850_FLAG_CY) r_strbuf_append (&op->esil, ",$c31,cy,=");
-	if (flags & V850_FLAG_OV) r_strbuf_append (&op->esil, ",$o,ov,=");
-	if (flags & V850_FLAG_S) r_strbuf_append (&op->esil, ",$s,s,=");
-	if (flags & V850_FLAG_Z) r_strbuf_append (&op->esil, ",$z,z,=");
+	if (flags & V850_FLAG_CY) {
+		r_strbuf_append (&op->esil, ",$c31,cy,=");
+	}
+	if (flags & V850_FLAG_OV) {
+		r_strbuf_append (&op->esil, ",$o,ov,=");
+	}
+	if (flags & V850_FLAG_S) {
+		r_strbuf_append (&op->esil, ",$s,s,=");
+	}
+	if (flags & V850_FLAG_Z) {
+		r_strbuf_append (&op->esil, ",$z,z,=");
+	}
 }
 
 static void clear_flags(RAnalOp *op, int flags) {
-	if (flags & V850_FLAG_CY) r_strbuf_append (&op->esil, ",0,cy,=");
-	if (flags & V850_FLAG_OV) r_strbuf_append (&op->esil, ",0,ov,=");
-	if (flags & V850_FLAG_S) r_strbuf_append (&op->esil, ",0,s,=");
-	if (flags & V850_FLAG_Z) r_strbuf_append (&op->esil, ",0,z,=");
+	if (flags & V850_FLAG_CY) {
+		r_strbuf_append (&op->esil, ",0,cy,=");
+	}
+	if (flags & V850_FLAG_OV) {
+		r_strbuf_append (&op->esil, ",0,ov,=");
+	}
+	if (flags & V850_FLAG_S) {
+		r_strbuf_append (&op->esil, ",0,s,=");
+	}
+	if (flags & V850_FLAG_Z) {
+		r_strbuf_append (&op->esil, ",0,z,=");
+	}
 }
 
 static int v850_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
diff --git a/libr/anal/p/anal_vax.c b/libr/anal/p/anal_vax.c
index 89250562fd..701c32c003 100644
--- a/libr/anal/p/anal_vax.c
+++ b/libr/anal/p/anal_vax.c
@@ -13,7 +13,9 @@
 
 static int vax_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	op->size = 1;
-	if (len<1) return -1;
+	if (len < 1) {
+		return -1;
+	}
 	op->type = R_ANAL_OP_TYPE_UNK;
 	switch (buf[0]) {
 	case 0xd0:
diff --git a/libr/anal/p/anal_x86_cs.c b/libr/anal/p/anal_x86_cs.c
index ef55cc6d95..84c88ad886 100644
--- a/libr/anal/p/anal_x86_cs.c
+++ b/libr/anal/p/anal_x86_cs.c
@@ -2071,8 +2071,9 @@ static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh
 				}
 				break;
 			case X86_OP_IMM:
-				if (INSOP(1).imm > 10)
-					op->ptr = INSOP(1).imm;
+				if (INSOP (1).imm > 10) {
+					op->ptr = INSOP (1).imm;
+				}
 				break;
 			default:
 				break;
@@ -2746,8 +2747,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 //#if X86_GRP_PRIVILEGE>0
 	if (insn) {
 #if HAVE_CSGRP_PRIVILEGE
-		if (cs_insn_group (handle, insn, X86_GRP_PRIVILEGE))
+		if (cs_insn_group (handle, insn, X86_GRP_PRIVILEGE)) {
 			op->family = R_ANAL_OP_FAMILY_PRIV;
+		}
 #endif
 #if !USE_ITER_API
 		cs_free (insn, n);
diff --git a/libr/anal/p/anal_xap.c b/libr/anal/p/anal_xap.c
index 06ac564304..558f2ec9fa 100644
--- a/libr/anal/p/anal_xap.c
+++ b/libr/anal/p/anal_xap.c
@@ -129,8 +129,9 @@ static int xap_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 				// BSR
 				op->type = R_ANAL_OP_TYPE_CALL;
 				op->jump = label_off (&d);
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->fail = addr+2;
 				op->eob = true;
 				break;
@@ -150,16 +151,18 @@ static int xap_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 			case 0: // BRA
 				op->type = R_ANAL_OP_TYPE_JMP;
 				op->jump = label_off (&d)+4;
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->eob = true;
 				break;
 			case 1:
 				// BLT
 				op->type = R_ANAL_OP_TYPE_CJMP;
 				op->jump = label_off (&d);
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->fail = addr + 2;
 				op->eob = true;
 				break;
@@ -167,8 +170,9 @@ static int xap_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 				// BPL
 				op->type = R_ANAL_OP_TYPE_CJMP;
 				op->jump = label_off (&d);
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->fail = addr + 2;
 				op->eob = true;
 				break;
@@ -176,8 +180,9 @@ static int xap_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 				// BMI
 				op->type = R_ANAL_OP_TYPE_CJMP;
 				op->jump = label_off (&d);
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->fail = addr + 2;
 				op->eob = true;
 				break;
@@ -191,8 +196,9 @@ static int xap_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *bytes, int len
 			case 3: // BCS
 				op->type = R_ANAL_OP_TYPE_CJMP;
 				op->jump = label_off (&d);
-				if (op->jump&1)
-					op->jump+=3;
+				if (op->jump & 1) {
+					op->jump += 3;
+				}
 				op->fail = addr+2;
 				break;
 			}
diff --git a/libr/anal/p/anal_xcore_cs.c b/libr/anal/p/anal_xcore_cs.c
index 778f1c17e1..c3794f3722 100644
--- a/libr/anal/p/anal_xcore_cs.c
+++ b/libr/anal/p/anal_xcore_cs.c
@@ -56,8 +56,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	cs_insn *insn;
 	int mode, n, ret;
 	mode = CS_MODE_BIG_ENDIAN;
-	if (!strcmp (a->cpu, "v9"))
+	if (!strcmp (a->cpu, "v9")) {
 		mode |= CS_MODE_V9;
+	}
 	if (mode != omode) {
 		if (handle) {
 			cs_close (&handle);
diff --git a/libr/anal/p/anal_xtensa.c b/libr/anal/p/anal_xtensa.c
index ab4896e89c..fd258edebd 100644
--- a/libr/anal/p/anal_xtensa.c
+++ b/libr/anal/p/anal_xtensa.c
@@ -282,10 +282,11 @@ static void xtensa_imp_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf)
 		op->type = R_ANAL_OP_TYPE_NULL;
 		break;
 	case 0xe:
-		if (((buf[0] >> 4) & 0xf) <= 1)
+		if (((buf[0] >> 4) & 0xf) <= 1) {
 			op->type = R_ANAL_OP_TYPE_RET;
-		else
+		} else {
 			xtensa_unk_op (anal, op, addr, buf);
+		}
 		break;
 	default:
 		xtensa_unk_op (anal, op, addr, buf);
@@ -495,10 +496,11 @@ static void xtensa_lsci_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf)
 	ut8 r = buf[1] >> 4;
 	op->family = R_ANAL_OP_FAMILY_FPU;
 	if ((r & 3) == 0) {
-		if (r & 4)
+		if (r & 4) {
 			xtensa_store_op (anal, op, addr, buf);
-		else
+		} else {
 			xtensa_load_op (anal, op, addr, buf);
+		}
 	} else {
 		xtensa_unk_op (anal, op, addr, buf);
 	}
@@ -1904,14 +1906,16 @@ static void analop_esil (xtensa_isa isa, xtensa_opcode opcode, xtensa_format for
 }
 
 static int xtensa_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf_original, int len_original) {
-	if (!op)
+	if (!op) {
 		return 1;
+	}
 	memset (op, 0, sizeof (RAnalOp));
 	r_strbuf_init (&op->esil);
 
 	op->size = xtensa_length (buf_original);
-	if (op->size > len_original)
+	if (op->size > len_original) {
 		return 1;
+	}
 
 	xtensa_op0_fns[(buf_original[0] & 0xf)] (anal, op, addr, buf_original);
 
diff --git a/libr/anal/reflines.c b/libr/anal/reflines.c
index d1d1f97c21..0c17dab779 100644
--- a/libr/anal/reflines.c
+++ b/libr/anal/reflines.c
@@ -193,7 +193,9 @@ R_API RList *r_anal_reflines_get(RAnal *anal, ut64 addr, const ut8 *buf, ut64 le
 			if (min < 0) {
 				min = 0;
 			}
-			while (free_levels[++min] == 1);
+			while (free_levels[++min] == 1) {
+				;
+			}
 		} else {
 			free_levels[el->r->level - 1] = 0;
 			if (min > el->r->level - 1) {
@@ -321,8 +323,9 @@ R_API int r_anal_reflines_middle(RAnal *a, RList* /*<RAnalRefline>*/ list, ut64
 		RAnalRefline *ref;
 		RListIter *iter;
 		r_list_foreach (list, iter, ref) {
-			if ((ref->to > addr) && (ref->to < addr+len))
+			if ((ref->to > addr) && (ref->to < addr + len)) {
 				return true;
+			}
 		}
 	}
 	return false;
diff --git a/libr/anal/value.c b/libr/anal/value.c
index ee20b24a31..841d110d3f 100644
--- a/libr/anal/value.c
+++ b/libr/anal/value.c
@@ -13,7 +13,9 @@ R_API RAnalValue *r_anal_value_new_from_string(const char *str) {
 
 R_API RAnalValue *r_anal_value_copy(RAnalValue *ov) {
 	RAnalValue *v = R_NEW0 (RAnalValue);
-	if (!v) return NULL;
+	if (!v) {
+		return NULL;
+	}
 	memcpy (v, ov, sizeof (RAnalValue));
 	// reference to reg and regdelta should be kept
 	return v;
@@ -34,13 +36,16 @@ R_API void r_anal_value_free(RAnalValue *value) {
 // mul*value+regbase+regidx+delta
 R_API ut64 r_anal_value_to_ut64(RAnal *anal, RAnalValue *val) {
 	ut64 num;
-	if (!val)
+	if (!val) {
 		return 0LL;
+	}
 	num = val->base + (val->delta*(val->mul?val->mul:1));
-	if (val->reg)
+	if (val->reg) {
 		num += r_reg_get_value (anal->reg, val->reg);
-	if (val->regdelta)
+	}
+	if (val->regdelta) {
 		num += r_reg_get_value (anal->reg, val->regdelta);
+	}
 	switch (val->memref) {
 	case 1:
 	case 2:
@@ -60,10 +65,13 @@ R_API int r_anal_value_set_ut64(RAnal *anal, RAnalValue *val, ut64 num) {
 			ut64 addr = r_anal_value_to_ut64 (anal, val);
 			r_mem_set_num (data, val->memref, num);
 			anal->iob.write_at (anal->iob.io, addr, data, val->memref);
-		} else eprintf ("No IO binded to r_anal\n");
+		} else {
+			eprintf ("No IO binded to r_anal\n");
+		}
 	} else {
-		if (val->reg)
+		if (val->reg) {
 			r_reg_set_value (anal->reg, val->reg, num);
+		}
 	}
 	return false;							//is this necessary
 }
@@ -73,9 +81,11 @@ R_API char *r_anal_value_to_string (RAnalValue *value) {
 	if (value) {
 		out = r_str_new ("");
 		if (!value->base && !value->reg) {
-			if (value->imm != -1LL)
+			if (value->imm != -1LL) {
 				out = r_str_appendf (out, "0x%"PFMT64x, value->imm);
-			else out = r_str_append (out, "-1");
+			} else {
+				out = r_str_append (out, "-1");
+			}
 		} else {
 			if (value->memref) {
 				switch (value->memref) {
@@ -86,13 +96,26 @@ R_API char *r_anal_value_to_string (RAnalValue *value) {
 				}
 				out = r_str_append (out, "[");
 			}
-			if (value->mul) out = r_str_appendf (out, "%d*", value->mul);
-			if (value->reg) out = r_str_appendf (out, "%s", value->reg->name);
-			if (value->regdelta) out = r_str_appendf (out, "+%s", value->regdelta->name);
-			if (value->base!=0) out = r_str_appendf (out, "0x%"PFMT64x, value->base);
-			if (value->delta>0) out = r_str_appendf (out, "+0x%"PFMT64x, value->delta);
-			else if (value->delta<0) out = r_str_appendf (out, "-0x%"PFMT64x, -value->delta);
-			if (value->memref) out = r_str_append (out, "]");
+			if (value->mul) {
+				out = r_str_appendf (out, "%d*", value->mul);
+			}
+			if (value->reg) {
+				out = r_str_appendf (out, "%s", value->reg->name);
+			}
+			if (value->regdelta) {
+				out = r_str_appendf (out, "+%s", value->regdelta->name);
+			}
+			if (value->base != 0) {
+				out = r_str_appendf (out, "0x%" PFMT64x, value->base);
+			}
+			if (value->delta > 0) {
+				out = r_str_appendf (out, "+0x%" PFMT64x, value->delta);
+			} else if (value->delta < 0) {
+				out = r_str_appendf (out, "-0x%" PFMT64x, -value->delta);
+			}
+			if (value->memref) {
+				out = r_str_append (out, "]");
+			}
 		}
 	}
 	return out;
diff --git a/libr/anal/vtable.c b/libr/anal/vtable.c
index 72adc40062..3dc9c1e704 100644
--- a/libr/anal/vtable.c
+++ b/libr/anal/vtable.c
@@ -247,8 +247,9 @@ R_API void r_anal_list_vtables(RAnal *anal, int rad) {
 			bool isFirstMethod = true;
 			r_cons_printf ("{\"offset\":%"PFMT64d",\"methods\":[", table->saddr);
 			r_vector_foreach (&table->methods, curMethod) {
-				if(!isFirstMethod)
+				if (!isFirstMethod) {
 					r_cons_print (",");
+				}
 				RAnalFunction *fcn = r_anal_get_fcn_in (anal, curMethod->addr, 0);
 				const char* const name = fcn ? fcn->name : NULL;
 				r_cons_printf ("{\"offset\":%"PFMT64d",\"name\":\"%s\"}",
diff --git a/libr/asm/arch/arc/gnu/arc-dis.c b/libr/asm/arch/arc/gnu/arc-dis.c
index b1b871e361..1e8f6fb39d 100644
--- a/libr/asm/arch/arc/gnu/arc-dis.c
+++ b/libr/asm/arch/arc/gnu/arc-dis.c
@@ -183,25 +183,28 @@ typedef enum
 static const char *
 core_reg_name (struct arcDisState * state, int val)
 {
-  if (state->coreRegName)
-    return (*state->coreRegName)(state->_this, val);
-  return 0;
+	if (state->coreRegName) {
+		return (*state->coreRegName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
 aux_reg_name (struct arcDisState * state, int val)
 {
-  if (state->auxRegName)
-    return (*state->auxRegName)(state->_this, val);
-  return 0;
+	if (state->auxRegName) {
+		return (*state->auxRegName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
 cond_code_name (struct arcDisState * state, int val)
 {
-  if (state->condCodeName)
-    return (*state->condCodeName)(state->_this, val);
-  return 0;
+	if (state->condCodeName) {
+		return (*state->condCodeName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
@@ -210,16 +213,18 @@ instruction_name (struct arcDisState * state,
 		  int    op2,
 		  int *  flags)
 {
-  if (state->instName)
-    return (*state->instName)(state->_this, op1, op2, flags);
-  return 0;
+	if (state->instName) {
+		return (*state->instName) (state->_this, op1, op2, flags);
+	}
+	return 0;
 }
 
 static void
 mwerror (struct arcDisState * state, const char * msg)
 {
-  if (state->err != 0)
-    (*state->err)(state->_this, (msg));
+	if (state->err != 0) {
+		(*state->err) (state->_this, (msg));
+	}
 }
 
 static const char *
@@ -258,42 +263,39 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
   regMap[0] = 0;
   regMap[1] = 0;
 
-  while (1)
-    switch (*p++)
-      {
-      case 0:
-	goto DOCOMM; /* Return.  */
-      default:
-	*bp++ = p[-1];
-	break;
-      case '%':
-	size = 0;
-	leading_zero = 0;
-      RETRY: ;
-	switch (*p++)
-	  {
-	  case '0':
-	  case '1':
-	  case '2':
-	  case '3':
-	  case '4':
-	  case '5':
-	  case '6':
-	  case '7':
-	  case '8':
-	  case '9':
-	    {
-	      /* size.  */
-	      size = p[-1] - '0';
-	      if (size == 0)
-		leading_zero = 1; /* e.g. %08x */
-	      while (*p >= '0' && *p <= '9')
-		{
-		  size = size * 10 + *p - '0';
-		  p++;
-		}
-	      goto RETRY;
-	    }
+  while (1) {
+	  switch (*p++) {
+	  case 0:
+		  goto DOCOMM; /* Return.  */
+	  default:
+		  *bp++ = p[-1];
+		  break;
+	  case '%':
+		  size = 0;
+		  leading_zero = 0;
+	  RETRY:;
+		  switch (*p++) {
+		  case '0':
+		  case '1':
+		  case '2':
+		  case '3':
+		  case '4':
+		  case '5':
+		  case '6':
+		  case '7':
+		  case '8':
+		  case '9': {
+			  /* size.  */
+			  size = p[-1] - '0';
+			  if (size == 0) {
+				  leading_zero = 1; /* e.g. %08x */
+			  }
+			  while (*p >= '0' && *p <= '9') {
+				  size = size * 10 + *p - '0';
+				  p++;
+			  }
+			  goto RETRY;
+		  }
 #define inc_bp() bp = bp + strlen (bp)
 
 	  case 'h':
@@ -307,13 +309,15 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
 	    {
 	      int val = va_arg (ap, int);
 
-	      if (size != 0)
-		if (leading_zero)
-		  sprintf (bp, "%0*x", size, val);
-		else
-		  sprintf (bp, "%*x", size, val);
-	      else
-		sprintf (bp, "%x", val);
+	      if (size != 0) {
+		      if (leading_zero) {
+			      sprintf (bp, "%0*x", size, val);
+		      } else {
+			      sprintf (bp, "%*x", size, val);
+		      }
+	      } else {
+		      sprintf (bp, "%x", val);
+	      }
 	      inc_bp ();
 	    }
 	    break;
@@ -321,10 +325,11 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
 	    {
 	      int val = va_arg (ap, int);
 
-	      if (size != 0)
-		sprintf (bp, "%*d", size, val);
-	      else
-		sprintf (bp, "%d", val);
+	      if (size != 0) {
+		      sprintf (bp, "%*d", size, val);
+	      } else {
+		      sprintf (bp, "%d", val);
+	      }
 	      inc_bp ();
 	    }
 	    break;
@@ -349,10 +354,11 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
 		    const char *ext;
 
 		    ext = core_reg_name (state, val);
-		    if (ext)
-		      sprintf (bp, "%s", ext);
-		    else
-		      sprintf (bp, "r%d", val);
+		    if (ext) {
+			    sprintf (bp, "%s", ext);
+		    } else {
+			    sprintf (bp, "r%d", val);
+		    }
 		  }
 		  break;
 		}
@@ -378,10 +384,11 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
 		    const char *ext;
 
 		    ext = aux_reg_name (state, val);
-		    if (ext)
-		      sprintf (bp, "%s", ext);
-		    else
-		      arc_sprintf (state, bp, "%h", val);
+		    if (ext) {
+			    sprintf (bp, "%s", ext);
+		    } else {
+			    arc_sprintf (state, bp, "%h", val);
+		    }
 		  }
 		  break;
 		}
@@ -398,7 +405,8 @@ arc_sprintf (struct arcDisState *state, char *buf, const char *format, ...)
 	    fprintf (stderr, "?? format %c\n", p[-1]);
 	    break;
 	  }
-      }
+	  }
+  }
 
  DOCOMM: *bp = 0;
   va_end (ap);
@@ -426,20 +434,23 @@ write_instr_name_(struct arcDisState * state,
     {
       const char *cc = 0;
 
-      if (!condCodeIsPartOfName)
-	strcat (state->instrBuffer, ".");
-      if (cond < 16)
-	cc = condName[cond];
-      else
-	cc = cond_code_name (state, cond);
-      if (!cc)
-	cc = "???";
+      if (!condCodeIsPartOfName) {
+	      strcat (state->instrBuffer, ".");
+      }
+      if (cond < 16) {
+	      cc = condName[cond];
+      } else {
+	      cc = cond_code_name (state, cond);
+      }
+      if (!cc) {
+	      cc = "???";
+      }
       strcat (state->instrBuffer, cc);
     }
-  if (flag)
-    strcat (state->instrBuffer, ".f");
-  switch (state->nullifyMode)
-    {
+    if (flag) {
+	    strcat (state->instrBuffer, ".f");
+    }
+    switch (state->nullifyMode) {
     case BR_exec_always:
       strcat (state->instrBuffer, ".d");
       break;
@@ -449,12 +460,15 @@ write_instr_name_(struct arcDisState * state,
     case BR_exec_when_no_jump:
       break;
     }
-  if (signExtend)
-    strcat (state->instrBuffer, ".x");
-  if (addrWriteBack)
-    strcat (state->instrBuffer, ".a");
-  if (directMem)
-    strcat (state->instrBuffer, ".di");
+    if (signExtend) {
+	    strcat (state->instrBuffer, ".x");
+    }
+    if (addrWriteBack) {
+	    strcat (state->instrBuffer, ".a");
+    }
+    if (directMem) {
+	    strcat (state->instrBuffer, ".di");
+    }
 }
 
 #define write_instr_name()						\
@@ -506,8 +520,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
   state->ea_reg2 = no_reg;
   state->_offset = 0;
 
-  if (! NEXT_WORD (0))
-    return 0;
+  if (!NEXT_WORD (0)) {
+	  return 0;
+  }
 
   state->_opcode = OPCODE (state->words[0]);
   instrName = 0;
@@ -651,16 +666,23 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	      instrName = "???";
 	      state->flow = invalid_instr;
 	    }
-	  if (flags & IGNORE_FIRST_OPD)
-	    ignoreFirstOpd = 1;
-	  break;
+	    if (flags & IGNORE_FIRST_OPD) {
+		    ignoreFirstOpd = 1;
+	    }
+	    break;
 
 	}
       break;
 
     case op_BC:  instrName = "b";
-    case op_BLC: if (!instrName) instrName = "bl";
-    case op_LPC: if (!instrName) instrName = "lp";
+    case op_BLC:
+	    if (!instrName) {
+		    instrName = "bl";
+	    }
+    case op_LPC:
+	    if (!instrName) {
+		    instrName = "lp";
+	    }
     case op_JC:
       if (!instrName)
 	{
@@ -706,9 +728,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	   with ARC).  This encoding says: xor -1, -1, -1.  */
 	  instrName = "nop";
 	  decodingClass = CLASS_A4_OP3_SUBOPC3F;
-	}
-      else
-	instrName = "xor";
+      } else {
+	      instrName = "xor";
+      }
       break;
 
     default:
@@ -719,9 +741,10 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	  instrName = "???";
 	  state->flow=invalid_instr;
 	}
-      if (flags & IGNORE_FIRST_OPD)
-	ignoreFirstOpd = 1;
-      break;
+	if (flags & IGNORE_FIRST_OPD) {
+		ignoreFirstOpd = 1;
+	}
+	break;
     }
 
   fieldAisReg = fieldBisReg = fieldCisReg = 1; /* Assume regs for now.  */
@@ -735,8 +758,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
     case CLASS_A4_ARITH:
       CHECK_FIELD_A ();
       CHECK_FIELD_B ();
-      if (!repeatsOp)
-	CHECK_FIELD_C ();
+      if (!repeatsOp) {
+	      CHECK_FIELD_C ();
+      }
       CHECK_FLAG_COND_NULLIFY ();
 
       write_instr_name ();
@@ -744,8 +768,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	{
 	  WRITE_FORMAT_x (A);
 	  WRITE_FORMAT_COMMA_x (B);
-	  if (!repeatsOp)
-	    WRITE_FORMAT_COMMA_x (C);
+	  if (!repeatsOp) {
+		  WRITE_FORMAT_COMMA_x (C);
+	  }
 	  WRITE_NOP_COMMENT ();
 	  arc_sprintf (state, state->operandBuffer, formatString,
 		      fieldA, fieldB, fieldC);
@@ -753,8 +778,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
       else
 	{
 	  WRITE_FORMAT_x (B);
-	  if (!repeatsOp)
-	    WRITE_FORMAT_COMMA_x (C);
+	  if (!repeatsOp) {
+		  WRITE_FORMAT_COMMA_x (C);
+	  }
 	  arc_sprintf (state, state->operandBuffer, formatString,
 		      fieldB, fieldC);
 	}
@@ -831,8 +857,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	  add_target (fieldB);
 	  /* Screwy JLcc requires .jd mode to execute correctly
 	     but we pretend it is .nd (no delay slot).  */
-	  if (is_linked && state->nullifyMode == BR_exec_when_jump)
-	    state->nullifyMode = BR_exec_when_no_jump;
+	  if (is_linked && state->nullifyMode == BR_exec_when_jump) {
+		  state->nullifyMode = BR_exec_when_no_jump;
+	  }
 	}
       else
 	{
@@ -852,31 +879,35 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	  fieldAisReg = 0;
 	  WRITE_FORMAT_COMMA_x (A);
 	}
-      if (IS_REG (B))
-	arc_sprintf (state, state->operandBuffer, formatString, fieldB, fieldA);
-      else
-	arc_sprintf (state, state->operandBuffer, formatString,
-		    post_address (state, fieldB), fieldA);
-      break;
+	if (IS_REG (B)) {
+		arc_sprintf (state, state->operandBuffer, formatString, fieldB, fieldA);
+	} else {
+		arc_sprintf (state, state->operandBuffer, formatString,
+			post_address (state, fieldB), fieldA);
+	}
+	break;
 
     case CLASS_A4_LD0:
       /* LD instruction.  B and C can be regs, or one (both?) can be limm.  */
       CHECK_FIELD_A ();
       CHECK_FIELD_B ();
       CHECK_FIELD_C ();
-      if (dbg)
-	printf ("5:b reg %d %d c reg %d %d  \n",
-		fieldBisReg,fieldB,fieldCisReg,fieldC);
+      if (dbg) {
+	      printf ("5:b reg %d %d c reg %d %d  \n",
+		      fieldBisReg, fieldB, fieldCisReg, fieldC);
+      }
       state->_offset = 0;
       state->_ea_present = 1;
-      if (fieldBisReg)
-	state->ea_reg1 = fieldB;
-      else
-	state->_offset += fieldB;
-      if (fieldCisReg)
-	state->ea_reg2 = fieldC;
-      else
-	state->_offset += fieldC;
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+      } else {
+	      state->_offset += fieldB;
+      }
+      if (fieldCisReg) {
+	      state->ea_reg2 = fieldC;
+      } else {
+	      state->_offset += fieldC;
+      }
       state->_mem_load = 1;
 
       directMem     = BIT (state->words[0], 5);
@@ -885,10 +916,11 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 
       write_instr_name ();
       WRITE_FORMAT_x_COMMA_LB(A);
-      if (fieldBisReg || fieldB != 0)
-	WRITE_FORMAT_x_COMMA (B);
-      else
-	fieldB = fieldC;
+      if (fieldBisReg || fieldB != 0) {
+	      WRITE_FORMAT_x_COMMA (B);
+      } else {
+	      fieldB = fieldC;
+      }
 
       WRITE_FORMAT_x_RB (C);
       arc_sprintf (state, state->operandBuffer, formatString,
@@ -901,18 +933,20 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
       CHECK_FIELD_A ();
       fieldC = FIELDD (state->words[0]);
 
-      if (dbg)
-	eprintf ("6:b reg %d %d c 0x%x  \n",
-			   fieldBisReg, fieldB, fieldC);
+      if (dbg) {
+	      eprintf ("6:b reg %d %d c 0x%x  \n",
+		      fieldBisReg, fieldB, fieldC);
+      }
       state->_ea_present = 1;
       state->_offset = fieldC;
       state->_mem_load = 1;
-      if (fieldBisReg)
-	state->ea_reg1 = fieldB;
-      /* Field B is either a shimm (same as fieldC) or limm (different!)
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+	      /* Field B is either a shimm (same as fieldC) or limm (different!)
 	 Say ea is not present, so only one of us will do the name lookup.  */
-      else
-	state->_offset += fieldB, state->_ea_present = 0;
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       directMem     = BIT (state->words[0],14);
       addrWriteBack = BIT (state->words[0],12);
@@ -932,9 +966,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	    {
 	      fieldCisReg = 0;
 	      WRITE_FORMAT_COMMA_x_RB (C);
-	    }
-	  else
-	    WRITE_FORMAT_RB ();
+	  } else {
+		  WRITE_FORMAT_RB ();
+	  }
 	}
       arc_sprintf (state, state->operandBuffer, formatString,
 		  fieldA, fieldB, fieldC);
@@ -947,17 +981,20 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
       fieldA = FIELDD(state->words[0]); /* shimm */
 
       /* [B,A offset] */
-      if (dbg) eprintf("7:b reg %d %x off %x\n",
-				 fieldBisReg,fieldB,fieldA);
+      if (dbg) {
+	      eprintf ("7:b reg %d %x off %x\n",
+		      fieldBisReg, fieldB, fieldA);
+      }
       state->_ea_present = 1;
       state->_offset = fieldA;
-      if (fieldBisReg)
-	state->ea_reg1 = fieldB;
-      /* Field B is either a shimm (same as fieldA) or limm (different!)
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+	      /* Field B is either a shimm (same as fieldA) or limm (different!)
 	 Say ea is not present, so only one of us will do the name lookup.
 	 (for is_limm we do the name translation here).  */
-      else
-	state->_offset += fieldB, state->_ea_present = 0;
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       directMem     = BIT (state->words[0], 26);
       addrWriteBack = BIT (state->words[0], 24);
@@ -977,9 +1014,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState * state)
 	    {
 	      fieldAisReg = 0;
 	      WRITE_FORMAT_COMMA_x_RB(A);
-	    }
-	  else
-	    WRITE_FORMAT_RB();
+	  } else {
+		  WRITE_FORMAT_RB ();
+	  }
 	}
       arc_sprintf (state, state->operandBuffer, formatString,
 		  fieldC, fieldB, fieldA);
@@ -1088,45 +1125,46 @@ ARCTangent_decodeInstr (bfd_vma address, disassemble_info *info)
       (*info->memory_error_func) (status, address, info);
       return -1;
     }
-  if (info->endian == BFD_ENDIAN_LITTLE)
-    s.words[0] = bfd_getl32(buffer);
-  else
-    s.words[0] = bfd_getb32(buffer);
-  /* Always read second word in case of limm.  */
-  /* We ignore the result since last insn may not have a limm.  */
-  status = (*info->read_memory_func) (address + 4, buffer, 4, info);
-  if (info->endian == BFD_ENDIAN_LITTLE)
-    s.words[1] = bfd_getl32(buffer);
-  else
-    s.words[1] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[0] = bfd_getl32 (buffer);
+    } else {
+	    s.words[0] = bfd_getb32 (buffer);
+    }
+    /* Always read second word in case of limm.  */
+    /* We ignore the result since last insn may not have a limm.  */
+    status = (*info->read_memory_func) (address + 4, buffer, 4, info);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[1] = bfd_getl32 (buffer);
+    } else {
+	    s.words[1] = bfd_getb32 (buffer);
+    }
 
-  s._this = &s;
-  s.coreRegName = _coreRegName;
-  s.auxRegName = _auxRegName;
-  s.condCodeName = _condCodeName;
-  s.instName = _instName;
+    s._this = &s;
+    s.coreRegName = _coreRegName;
+    s.auxRegName = _auxRegName;
+    s.condCodeName = _condCodeName;
+    s.instName = _instName;
 
-  /* Disassemble.  */
-  dsmOneArcInst (address, (void *)&s);
+    /* Disassemble.  */
+    dsmOneArcInst (address, (void *)&s);
 
-  /* Display the disassembly instruction.  */
-/*
+    /* Display the disassembly instruction.  */
+    /*
   (*func) (stream, "%08lx ", s.words[0]);
   (*func) (stream, "  ");
 */
-  (*func) (stream, "%s ", s.instrBuffer);
+    (*func) (stream, "%s ", s.instrBuffer);
 
-  if (__TRANSLATION_REQUIRED (s))
-    {
-      bfd_vma addr = s.addresses[s.operandBuffer[1] - '0'];
+    if (__TRANSLATION_REQUIRED (s)) {
+	    bfd_vma addr = s.addresses[s.operandBuffer[1] - '0'];
 
-      (*info->print_address_func) ((bfd_vma) addr, info);
-      //(*func) (stream, "\n");
+	    (*info->print_address_func) ((bfd_vma)addr, info);
+	    //(*func) (stream, "\n");
+    } else {
+	    (*func) (stream, "%s", s.operandBuffer);
     }
-  else
-    (*func) (stream, "%s",s.operandBuffer);
 
-  return s.instructionLen;
+    return s.instructionLen;
 
 }
 
diff --git a/libr/asm/arch/arc/gnu/arc-ext.c b/libr/asm/arch/arc/gnu/arc-ext.c
index 85938df59c..bc8bd748e4 100644
--- a/libr/asm/arch/arc/gnu/arc-ext.c
+++ b/libr/asm/arch/arc/gnu/arc-ext.c
@@ -329,10 +329,11 @@ arcExtMap_instName (int opcode, int insn, int *flags)
 	  c = (insn & 0x00e0) >> 5;
 	  i = (insn & 0x001f);
 
-	  if (i)
-	    minor = i;
-	  else
-	    minor = (c == 0x07) ? b : c;
+	  if (i) {
+		  minor = i;
+	  } else {
+		  minor = (c == 0x07) ? b : c;
+	  }
 	}
       /* 32-bit instructions.  */
       else
@@ -370,15 +371,16 @@ arcExtMap_instName (int opcode, int insn, int *flags)
 	    }
 	  else
 	    {
-	      if (A != 0x3f)
-		minor = A;
-	      else
-		minor = B;
+		    if (A != 0x3f) {
+			    minor = A;
+		    } else {
+			    minor = B;
+		    }
 	    }
 	}
-    }
-  else /* ARCTangent extension instructions.  */
-    minor = insn;
+  } else { /* ARCTangent extension instructions.  */
+	  minor = insn;
+  }
 
   temp = arc_extension_map.instructions[INST_HASH (opcode, minor)];
   while (temp)
@@ -399,9 +401,10 @@ arcExtMap_instName (int opcode, int insn, int *flags)
 const char *
 arcExtMap_coreRegName (int regnum)
 {
-  if (regnum < FIRST_EXTENSION_CORE_REGISTER || regnum > LAST_EXTENSION_CORE_REGISTER)
-    return NULL;
-  return arc_extension_map.coreRegisters[regnum - FIRST_EXTENSION_CORE_REGISTER].name;
+	if (regnum < FIRST_EXTENSION_CORE_REGISTER || regnum > LAST_EXTENSION_CORE_REGISTER) {
+		return NULL;
+	}
+	return arc_extension_map.coreRegisters[regnum - FIRST_EXTENSION_CORE_REGISTER].name;
 }
 
 
@@ -409,9 +412,10 @@ arcExtMap_coreRegName (int regnum)
 enum ExtReadWrite
 arcExtMap_coreReadWrite (int regnum)
 {
-  if (regnum < FIRST_EXTENSION_CORE_REGISTER || regnum > LAST_EXTENSION_CORE_REGISTER)
-    return REG_INVALID;
-  return arc_extension_map.coreRegisters[regnum - FIRST_EXTENSION_CORE_REGISTER].rw;
+	if (regnum < FIRST_EXTENSION_CORE_REGISTER || regnum > LAST_EXTENSION_CORE_REGISTER) {
+		return REG_INVALID;
+	}
+	return arc_extension_map.coreRegisters[regnum - FIRST_EXTENSION_CORE_REGISTER].rw;
 }
 
 
@@ -419,9 +423,10 @@ arcExtMap_coreReadWrite (int regnum)
 const char *
 arcExtMap_condCodeName (int code)
 {
-  if (code < FIRST_EXTENSION_CONDITION_CODE || code > LAST_EXTENSION_CONDITION_CODE)
-    return NULL;
-  return arc_extension_map.condCodes[code - FIRST_EXTENSION_CONDITION_CODE];
+	if (code < FIRST_EXTENSION_CONDITION_CODE || code > LAST_EXTENSION_CONDITION_CODE) {
+		return NULL;
+	}
+	return arc_extension_map.condCodes[code - FIRST_EXTENSION_CONDITION_CODE];
 }
 
 
@@ -434,8 +439,9 @@ arcExtMap_auxRegName (long address)
 
   for (r = arc_extension_map.auxRegisters; r; r = r->next)
     {
-      if (r->address == address)
-        return (const char *)r->name;
+	  if (r->address == address) {
+		  return (const char *)r->name;
+	  }
     }
   return NULL;
 }
@@ -491,21 +497,25 @@ void dump_ARC_extmap (void)
     {
         struct ExtInstruction *insn;
 
-        for (insn = arc_extension_map.instructions[i]; insn != NULL; insn = insn->next)
-            printf("INST: %d %d %x %s\n", insn->major, insn->minor, insn->flags, insn->name);
+	for (insn = arc_extension_map.instructions[i]; insn != NULL; insn = insn->next) {
+		printf ("INST: %d %d %x %s\n", insn->major, insn->minor, insn->flags, insn->name);
+	}
     }
 
     for (i = 0; i < NUM_EXT_CORE; i++)
     {
         struct ExtCoreRegister reg = arc_extension_map.coreRegisters[i];
 
-        if (reg.name)
-            printf("CORE: %s %d %s\n", reg.name, reg.number, ExtReadWrite_image(reg.rw));
+	if (reg.name) {
+		printf ("CORE: %s %d %s\n", reg.name, reg.number, ExtReadWrite_image (reg.rw));
+	}
     }
 
-    for (i = 0; i < NUM_EXT_COND; i++)
-        if (arc_extension_map.condCodes[i])
-            printf("COND: %s\n", arc_extension_map.condCodes[i]);
+    for (i = 0; i < NUM_EXT_COND; i++) {
+	    if (arc_extension_map.condCodes[i]) {
+		    printf ("COND: %s\n", arc_extension_map.condCodes[i]);
+	    }
+    }
 }
 
 /******************************************************************************/
diff --git a/libr/asm/arch/arc/gnu/arc-opc.c b/libr/asm/arch/arc/gnu/arc-opc.c
index aa1e3eff7b..c4e24e172d 100644
--- a/libr/asm/arch/arc/gnu/arc-opc.c
+++ b/libr/asm/arch/arc/gnu/arc-opc.c
@@ -950,8 +950,9 @@ insert_s12  (arc_insn insn,  long *ex,
   lsb6 = (value & 0x3f) << 6 ;
 
   insn |= lsb6;
-  if(ex)
-      *ex |= msb6;
+  if (ex) {
+	  *ex |= msb6;
+  }
   return insn;
 }
 /* Insert an unsigned sixteen bit number into a 64 bit instruction.
@@ -982,8 +983,9 @@ insert_u16  (arc_insn insn, long *ex,
   lsb6 = (value & 0x3f) << 6 ;
 
   insn |= lsb6;
-  if(ex)
-      *ex |= msb6;
+  if (ex) {
+	  *ex |= msb6;
+  }
   return insn;
 }
 /* Insert upper half of unsigned sixteen bit number into a 64 bit instruction.
@@ -1010,8 +1012,9 @@ insert_uu16  (arc_insn insn, long *ex,
   long msb8;
 
   msb8 = (value & 0xff) << 2;
-  if(ex)
-      *ex |= msb8;
+  if (ex) {
+	  *ex |= msb8;
+  }
   return insn;
 }
 /* Insert lower eight bits of unsigned sixteen bit number into a 64 bit
@@ -1043,8 +1046,9 @@ insert_ul16  (arc_insn insn, long *ex,
   lsb6 = (value & 0x3f) << 6 ;
 
   insn |= lsb6;
-  if(ex)
-      *ex |= msb2;
+  if (ex) {
+	  *ex |= msb2;
+  }
   return insn;
 }
 /* Insert 15 bits of signed number into a 64 bit instruction.
@@ -1066,9 +1070,10 @@ insert_s15  (arc_insn insn, long *ex,
            )
 {
 
-  if(ex)
-      *ex |= (value & 0x7fff);
-  return insn;
+	if (ex) {
+		*ex |= (value & 0x7fff);
+	}
+	return insn;
 }
 /* Discarded field.
  * insn is top 32 bits of instruction and gets the least significant six
@@ -1153,18 +1158,20 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 		{
 		  /* if an ld/ldw insn */
 		  if ((((insn >> 7) & 3) == 0) ||
-		      (((insn >> 7) & 3) == 2))
-		    /* Set .aa to 3 */
-		    addrwb_p =  0x600;
+			  (((insn >> 7) & 3) == 2)) {
+			  /* Set .aa to 3 */
+			  addrwb_p = 0x600;
+		  }
 		}
 	      /* Check for st with .aa=0 */
 	      else if ((insn & 0xf8000001) == 0x18000000)
 		{
 		  /* if an st/stw insn */
 		  if ((((insn >> 1) & 3) == 0) ||
-		  (((insn >> 1) & 3) == 2))
-		    /* Set .aa to 3 */
-		    addrwb_p = 0x18;
+			  (((insn >> 1) & 3) == 2)) {
+			  /* Set .aa to 3 */
+			  addrwb_p = 0x18;
+		  }
 		}
 	    } /* addrwb_p == 0 */
 	}
@@ -1176,15 +1183,17 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 		op_type = OP_LIMM;
 		limm_p = 1;
 		limm = value;
-		if (arc_mach_a4)
-		  insn |= ARC_REG_LIMM << operand->shift;
+		if (arc_mach_a4) {
+			insn |= ARC_REG_LIMM << operand->shift;
+		}
 		/* The constant is stored later.  */
 	      }
 	    else
 	      {
-		if (arc_mach_a4)
-		  insn |= ARC_REG_SHIMM << operand->shift;
-		/* insn |= value & 511; - done later.  */
+		      if (arc_mach_a4) {
+			      insn |= ARC_REG_SHIMM << operand->shift;
+		      }
+		      /* insn |= value & 511; - done later.  */
 	      }
 	}
       else{
@@ -1197,22 +1206,21 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 
       if ((reg->type == AUXREG) || (reg->type == AUXREG_AC))
 	{
-	  if (!(mods & ARC_MOD_AUXREG))
-	    *errmsg = _("auxiliary register not allowed here");
-	  else if (arc_mach_a4)
-	    {
-	      if ((insn & I(-1)) == I(2)) /* Check for use validity.  */
-		{
-		  if (reg->flags & ARC_REGISTER_READONLY)
-		    *errmsg = _("attempt to set readonly register");
-		}
-	      else
-		{
-		  if (reg->flags & ARC_REGISTER_WRITEONLY)
-		    *errmsg = _("attempt to read writeonly register");
-		}
-	      insn |= ARC_REG_SHIMM << operand->shift;
-	      insn |= reg->value << arc_operands[reg->type].shift;
+	      if (!(mods & ARC_MOD_AUXREG)) {
+		      *errmsg = _ ("auxiliary register not allowed here");
+	      } else if (arc_mach_a4) {
+		      if ((insn & I (-1)) == I (2)) /* Check for use validity.  */
+		      {
+			      if (reg->flags & ARC_REGISTER_READONLY) {
+				      *errmsg = _ ("attempt to set readonly register");
+			      }
+		      } else {
+			      if (reg->flags & ARC_REGISTER_WRITEONLY) {
+				      *errmsg = _ ("attempt to read writeonly register");
+			      }
+		      }
+		      insn |= ARC_REG_SHIMM << operand->shift;
+		      insn |= reg->value << arc_operands[reg->type].shift;
 	    }
 	  else /* Insert auxiliary register value for ARCompact ISA.  */
 	    {
@@ -1233,13 +1241,15 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
           if (('a' == operand->fmt) || (arc_mach_a4 && ((insn & I(-1)) < I(2))) ||
               (!arc_mach_a4 && (('A' == operand->fmt)||('#' == operand->fmt))))
             {
-	      if (reg->flags & ARC_REGISTER_READONLY)
-		*errmsg = _("attempt to set readonly register");
-            }
+		  if (reg->flags & ARC_REGISTER_READONLY) {
+			  *errmsg = _ ("attempt to set readonly register");
+		  }
+	    }
           if ('a' != operand->fmt || (!arc_mach_a4 && ('A' != operand->fmt)))
             {
-	      if (reg->flags & ARC_REGISTER_WRITEONLY)
-		*errmsg = _("attempt to read writeonly register");
+		  if (reg->flags & ARC_REGISTER_WRITEONLY) {
+			  *errmsg = _ ("attempt to read writeonly register");
+		  }
 	    }
 	  /* We should never get an invalid register number here.  */
 	  if (arc_mach_a4 && ((unsigned int) reg->value > 60))
@@ -1271,12 +1281,13 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 		 register field, H, will raise an Instruction Error
 		 exception.
 		 This should solve the mov_s pcl, whatever bug.  */
-	      if ((insn & 0xFF) == 0xFF)
-		*errmsg = _("attempt to set readonly register");
-            }
-          else
-	    insn |= reg->value << operand->shift;
-          op_type = OP_REG;
+	      if ((insn & 0xFF) == 0xFF) {
+		      *errmsg = _ ("attempt to set readonly register");
+	      }
+	    } else {
+		    insn |= reg->value << operand->shift;
+	    }
+	    op_type = OP_REG;
 	}
     }
 
@@ -1291,11 +1302,12 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 	  ls_operand[LS_BASE] = op_type;
 	  break;
 	case 'c':
-	  if ((insn & I(-1)) == I(2))
-	    ls_operand[LS_VALUE] = op_type;
-	  else
-	    ls_operand[LS_OFFSET] = op_type;
-	  break;
+		if ((insn & I (-1)) == I (2)) {
+			ls_operand[LS_VALUE] = op_type;
+		} else {
+			ls_operand[LS_OFFSET] = op_type;
+		}
+		break;
 	case 'o': case 'O':
 	  ls_operand[LS_OFFSET] = op_type;
 	  break;
@@ -1315,11 +1327,12 @@ insert_reg (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
         case ')':
         case '}':
         case '>':
-          if ((insn & I(-1)) == I(3))
-            ls_operand[LS_VALUE] = op_type;
-          else
-            ls_operand[LS_OFFSET] = op_type;
-          break;
+		if ((insn & I (-1)) == I (3)) {
+			ls_operand[LS_VALUE] = op_type;
+		} else {
+			ls_operand[LS_OFFSET] = op_type;
+		}
+		break;
         }
     }
   return insn;
@@ -1425,13 +1438,11 @@ insert_addr_wb (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
      * adding suport for it in the arc_suffixes_ac by defining aw, ab and as
      * to be ADDRESS3_AC also */
 
-    if (!arc_mach_a4 && (('p' == operand->fmt)
-		      || ('P' == operand->fmt)
-		      || ('w' == operand->fmt)
-		      || ('&' == operand->fmt)))
-      addrwb_p = value << operand->shift;
-    else
-      addrwb_p = 1 << operand->shift;
+    if (!arc_mach_a4 && (('p' == operand->fmt) || ('P' == operand->fmt) || ('w' == operand->fmt) || ('&' == operand->fmt))) {
+	    addrwb_p = value << operand->shift;
+    } else {
+	    addrwb_p = 1 << operand->shift;
+    }
     return insn;
 }
 
@@ -1446,13 +1457,11 @@ insert_base (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
   if (reg != NULL)
     {
       arc_insn myinsn;
-      if (!arc_mach_a4 && ('g' == operand->fmt))
-        insn |= insert_reg (0, ex, operand,mods, reg, value, errmsg);
-      else
-	{
-	  myinsn = (insert_reg (0, ex, operand,mods, reg, value, errmsg)
-		    >> operand->shift);
-	  insn |= B (myinsn);
+      if (!arc_mach_a4 && ('g' == operand->fmt)) {
+	      insn |= insert_reg (0, ex, operand, mods, reg, value, errmsg);
+      } else {
+	      myinsn = (insert_reg (0, ex, operand, mods, reg, value, errmsg) >> operand->shift);
+	      insn |= B (myinsn);
 	}
       ls_operand[LS_BASE] = OP_REG;
     }
@@ -1511,25 +1520,28 @@ insert_offset (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 	       >> operand->shift);
 
 	  /* Not if store, catch it later.  */
-	  if (operand->flags & ARC_OPERAND_LOAD)
-	    /* Not if opcode == 1, catch it later.  */
-	    if ((insn & I(-1)) != I(1))
-	      insn |= C(myinsn);
-        }
-      else
-        insn |= insert_reg (0, ex, operand, mods, reg, value, errmsg);
+	  if (operand->flags & ARC_OPERAND_LOAD) {
+		  /* Not if opcode == 1, catch it later.  */
+		  if ((insn & I (-1)) != I (1)) {
+			  insn |= C (myinsn);
+		  }
+	  }
+      } else {
+	      insn |= insert_reg (0, ex, operand, mods, reg, value, errmsg);
+      }
       ls_operand[LS_OFFSET] = OP_REG;
     }
   else
     {
       int bits;
 
-      if (operand->flags & ARC_OPERAND_2BYTE_ALIGNED)
-	bits = operand->bits + 1;
-      else if (operand->flags & ARC_OPERAND_4BYTE_ALIGNED)
-	bits = operand->bits + 2;
-      else
-	bits = operand->bits;
+      if (operand->flags & ARC_OPERAND_2BYTE_ALIGNED) {
+	      bits = operand->bits + 1;
+      } else if (operand->flags & ARC_OPERAND_4BYTE_ALIGNED) {
+	      bits = operand->bits + 2;
+      } else {
+	      bits = operand->bits;
+      }
 
       /* This is *way* more general than necessary, but maybe some day it'll
 	 be useful.  */
@@ -1545,54 +1557,48 @@ insert_offset (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 	}
       if (arc_mach_a4 && ((arc_cond_p && !limm_p) || value < minval || value > maxval))
 	{
-	  if (limm_p && value != limm)
-	    *errmsg = _("too many long constants");
-	  else
-	    {
-	      limm_p = 1;
-	      limm = value;
-	      if (operand->flags & ARC_OPERAND_STORE)
-		insn |= B(ARC_REG_LIMM);
-	      if (operand->flags & ARC_OPERAND_LOAD)
-		insn |= C(ARC_REG_LIMM);
-	      ls_operand[LS_OFFSET] = OP_LIMM;
+	      if (limm_p && value != limm) {
+		      *errmsg = _ ("too many long constants");
+	      } else {
+		      limm_p = 1;
+		      limm = value;
+		      if (operand->flags & ARC_OPERAND_STORE) {
+			      insn |= B (ARC_REG_LIMM);
+		      }
+		      if (operand->flags & ARC_OPERAND_LOAD) {
+			      insn |= C (ARC_REG_LIMM);
+		      }
+		      ls_operand[LS_OFFSET] = OP_LIMM;
 	    }
 	}
       else
 	{
-	  if ((value < minval || value > maxval))
-	    *errmsg = _("need too many limms");
-	  else if (arc_mach_a4 && shimm_p && value != shimm)
-	    {
-	      /* Check for bad operand combinations
+		if ((value < minval || value > maxval)) {
+			*errmsg = _ ("need too many limms");
+		} else if (arc_mach_a4 && shimm_p && value != shimm) {
+			/* Check for bad operand combinations
 		 before we lose info about them.  */
-	      if ((insn & I(-1)) == I(1))
-		{
-		  *errmsg = _("to many shimms in load");
-		  goto out;
-		}
-	      if (limm_p && operand->flags & ARC_OPERAND_LOAD)
-		{
-		  *errmsg = _("too many long constants");
-		  goto out;
-		}
-	      /* Convert what we thought was a shimm to a limm.  */
-	      limm_p = 1;
-	      limm = shimm;
-	      if (ls_operand[LS_VALUE] == OP_SHIMM
-		  && operand->flags & ARC_OPERAND_STORE)
-		{
-		  insn &= ~C(-1);
-		  insn |= C(ARC_REG_LIMM);
-		  ls_operand[LS_VALUE] = OP_LIMM;
-		}
-	      if (ls_operand[LS_BASE] == OP_SHIMM
-		  && operand->flags & ARC_OPERAND_STORE)
-		{
-		  insn &= ~B(-1);
-		  insn |= B(ARC_REG_LIMM);
-		  ls_operand[LS_BASE] = OP_LIMM;
-		}
+			if ((insn & I (-1)) == I (1)) {
+				*errmsg = _ ("to many shimms in load");
+				goto out;
+			}
+			if (limm_p && operand->flags & ARC_OPERAND_LOAD) {
+				*errmsg = _ ("too many long constants");
+				goto out;
+			}
+			/* Convert what we thought was a shimm to a limm.  */
+			limm_p = 1;
+			limm = shimm;
+			if (ls_operand[LS_VALUE] == OP_SHIMM && operand->flags & ARC_OPERAND_STORE) {
+				insn &= ~C (-1);
+				insn |= C (ARC_REG_LIMM);
+				ls_operand[LS_VALUE] = OP_LIMM;
+			}
+			if (ls_operand[LS_BASE] == OP_SHIMM && operand->flags & ARC_OPERAND_STORE) {
+				insn &= ~B (-1);
+				insn |= B (ARC_REG_LIMM);
+				ls_operand[LS_BASE] = OP_LIMM;
+			}
 	    }
 	  if (!arc_mach_a4)
 	    {
@@ -1642,22 +1648,10 @@ extract_st_syntax (arc_insn *insn,
   ls_operand[LS_BASE]   == (B) && \
   ls_operand[LS_OFFSET] == (O)))
 
-  if (!((ST_SYNTAX(OP_REG,OP_REG,OP_NONE) && (insn[0] & 511) == 0)
-	|| ST_SYNTAX(OP_REG,OP_LIMM,OP_NONE)
-	|| (ST_SYNTAX(OP_SHIMM,OP_REG,OP_NONE) && (insn[0] & 511) == 0)
-	|| (ST_SYNTAX(OP_SHIMM,OP_SHIMM,OP_NONE) && (insn[0] & 511) == 0)
-	|| ST_SYNTAX(OP_SHIMM,OP_LIMM,OP_NONE)
-	|| ST_SYNTAX(OP_SHIMM,OP_LIMM,OP_SHIMM)
-	|| ST_SYNTAX(OP_SHIMM,OP_SHIMM,OP_SHIMM)
-	|| (ST_SYNTAX(OP_LIMM,OP_REG,OP_NONE) && (insn[0] & 511) == 0)
-	|| ST_SYNTAX(OP_REG,OP_REG,OP_SHIMM)
-	|| ST_SYNTAX(OP_REG,OP_SHIMM,OP_SHIMM)
-	|| ST_SYNTAX(OP_SHIMM,OP_REG,OP_SHIMM)
-	|| ST_SYNTAX(OP_LIMM,OP_SHIMM,OP_SHIMM)
-	|| ST_SYNTAX(OP_LIMM,OP_SHIMM,OP_NONE)
-	|| ST_SYNTAX(OP_LIMM,OP_REG,OP_SHIMM)))
-    *invalid = 1;
-  return 0;
+	if (!((ST_SYNTAX (OP_REG, OP_REG, OP_NONE) && (insn[0] & 511) == 0) || ST_SYNTAX (OP_REG, OP_LIMM, OP_NONE) || (ST_SYNTAX (OP_SHIMM, OP_REG, OP_NONE) && (insn[0] & 511) == 0) || (ST_SYNTAX (OP_SHIMM, OP_SHIMM, OP_NONE) && (insn[0] & 511) == 0) || ST_SYNTAX (OP_SHIMM, OP_LIMM, OP_NONE) || ST_SYNTAX (OP_SHIMM, OP_LIMM, OP_SHIMM) || ST_SYNTAX (OP_SHIMM, OP_SHIMM, OP_SHIMM) || (ST_SYNTAX (OP_LIMM, OP_REG, OP_NONE) && (insn[0] & 511) == 0) || ST_SYNTAX (OP_REG, OP_REG, OP_SHIMM) || ST_SYNTAX (OP_REG, OP_SHIMM, OP_SHIMM) || ST_SYNTAX (OP_SHIMM, OP_REG, OP_SHIMM) || ST_SYNTAX (OP_LIMM, OP_SHIMM, OP_SHIMM) || ST_SYNTAX (OP_LIMM, OP_SHIMM, OP_NONE) || ST_SYNTAX (OP_LIMM, OP_REG, OP_SHIMM))) {
+		*invalid = 1;
+	}
+	return 0;
 }
 
 int
@@ -1671,8 +1665,9 @@ arc_limm_fixup_adjust (arc_insn insn)
       (I(2) | C(ARC_REG_SHIMM) | B(ARC_REG_LIMM)))
     {
       retval = insn & 0x1ff;
-      if (retval & 0x100) /* Sign extend 9 bit offset.  */
-	retval |= ~0x1ff;
+      if (retval & 0x100) { /* Sign extend 9 bit offset.  */
+	      retval |= ~0x1ff;
+      }
     }
   return -retval; /* Negate offset for return.  */
 }
@@ -1694,9 +1689,10 @@ insert_st_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 
       if (addrwb_p)
         {
-          if (ls_operand[LS_BASE] != OP_REG)
-            *errmsg = _("address writeback not allowed");
-          insn |= addrwb_p;
+	      if (ls_operand[LS_BASE] != OP_REG) {
+		      *errmsg = _ ("address writeback not allowed");
+	      }
+	      insn |= addrwb_p;
         }
       return insn;
     }
@@ -1721,15 +1717,16 @@ insert_st_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
       /* Try to salvage this syntax.  */
       if (shimm & 0x1) /* Odd shimms won't work.  */
 	{
-	  if (limm_p) /* Do we have a limm already?  */
-	    *errmsg = _("impossible store");
-	  limm_p = 1;
-	  limm = shimm;
-	  shimm = 0;
-	  shimm_p = 0;
-	  insn = insn & ~(B(-1) | 511);
-	  insn |= B(ARC_REG_LIMM);
-	  ls_operand[LS_BASE] = OP_LIMM;
+	      if (limm_p) { /* Do we have a limm already?  */
+		      *errmsg = _ ("impossible store");
+	      }
+	      limm_p = 1;
+	      limm = shimm;
+	      shimm = 0;
+	      shimm_p = 0;
+	      insn = insn & ~(B (-1) | 511);
+	      insn |= B (ARC_REG_LIMM);
+	      ls_operand[LS_BASE] = OP_LIMM;
 	}
       else
 	{
@@ -1739,38 +1736,29 @@ insert_st_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 	  ls_operand[LS_OFFSET] = OP_SHIMM;
 	}
     }
-  if (ST_SYNTAX (OP_SHIMM, OP_LIMM, OP_NONE))
-    limm += arc_limm_fixup_adjust (insn);
-  if (ST_SYNTAX (OP_LIMM, OP_SHIMM, OP_SHIMM) && (shimm * 2 == limm))
-    {
-      insn &= ~C (-1);
-      limm_p = 0;
-      limm = 0;
-      insn |= C (ARC_REG_SHIMM);
-      ls_operand[LS_VALUE] = OP_SHIMM;
+    if (ST_SYNTAX (OP_SHIMM, OP_LIMM, OP_NONE)) {
+	    limm += arc_limm_fixup_adjust (insn);
     }
-  if (!(   ST_SYNTAX (OP_REG,OP_REG,OP_NONE)
-	|| ST_SYNTAX (OP_REG,OP_LIMM,OP_NONE)
-	|| ST_SYNTAX (OP_REG,OP_REG,OP_SHIMM)
-	|| ST_SYNTAX (OP_REG,OP_SHIMM,OP_SHIMM)
-	|| (ST_SYNTAX (OP_SHIMM,OP_SHIMM,OP_NONE) && (shimm == 0))
-	|| ST_SYNTAX (OP_SHIMM,OP_LIMM,OP_NONE)
-	|| ST_SYNTAX (OP_SHIMM,OP_REG,OP_NONE)
-	|| ST_SYNTAX (OP_SHIMM,OP_REG,OP_SHIMM)
-	|| ST_SYNTAX (OP_SHIMM,OP_SHIMM,OP_SHIMM)
-	|| ST_SYNTAX (OP_LIMM,OP_SHIMM,OP_SHIMM)
-	|| ST_SYNTAX (OP_LIMM,OP_REG,OP_NONE)
-	|| ST_SYNTAX (OP_LIMM,OP_REG,OP_SHIMM)))
-    *errmsg = _("st operand error");
-  if (addrwb_p)
-    {
-      if (ls_operand[LS_BASE] != OP_REG)
-	*errmsg = _("address writeback not allowed");
-      insn |= addrwb_p;
+    if (ST_SYNTAX (OP_LIMM, OP_SHIMM, OP_SHIMM) && (shimm * 2 == limm)) {
+	    insn &= ~C (-1);
+	    limm_p = 0;
+	    limm = 0;
+	    insn |= C (ARC_REG_SHIMM);
+	    ls_operand[LS_VALUE] = OP_SHIMM;
     }
-  if (ST_SYNTAX(OP_SHIMM,OP_REG,OP_NONE) && shimm)
-    *errmsg = _("store value must be zero");
-  return insn;
+    if (!(ST_SYNTAX (OP_REG, OP_REG, OP_NONE) || ST_SYNTAX (OP_REG, OP_LIMM, OP_NONE) || ST_SYNTAX (OP_REG, OP_REG, OP_SHIMM) || ST_SYNTAX (OP_REG, OP_SHIMM, OP_SHIMM) || (ST_SYNTAX (OP_SHIMM, OP_SHIMM, OP_NONE) && (shimm == 0)) || ST_SYNTAX (OP_SHIMM, OP_LIMM, OP_NONE) || ST_SYNTAX (OP_SHIMM, OP_REG, OP_NONE) || ST_SYNTAX (OP_SHIMM, OP_REG, OP_SHIMM) || ST_SYNTAX (OP_SHIMM, OP_SHIMM, OP_SHIMM) || ST_SYNTAX (OP_LIMM, OP_SHIMM, OP_SHIMM) || ST_SYNTAX (OP_LIMM, OP_REG, OP_NONE) || ST_SYNTAX (OP_LIMM, OP_REG, OP_SHIMM))) {
+	    *errmsg = _ ("st operand error");
+    }
+    if (addrwb_p) {
+	    if (ls_operand[LS_BASE] != OP_REG) {
+		    *errmsg = _ ("address writeback not allowed");
+	    }
+	    insn |= addrwb_p;
+    }
+    if (ST_SYNTAX (OP_SHIMM, OP_REG, OP_NONE) && shimm) {
+	    *errmsg = _ ("store value must be zero");
+    }
+    return insn;
 }
 
 /* Used in ld insns to do final syntax check.  */
@@ -1802,11 +1790,12 @@ insert_ld_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 
       if (addrwb_p)
 	{
-	  if (ls_operand[LS_BASE] != OP_REG
-	      /* .as is not actually an address write-back.  */
-	      && addrwb_p != 0xc00000)
-	    *errmsg = _("address writeback not allowed");
-	  insn |= addrwb_p;
+	      if (ls_operand[LS_BASE] != OP_REG
+		      /* .as is not actually an address write-back.  */
+		      && addrwb_p != 0xc00000) {
+		      *errmsg = _ ("address writeback not allowed");
+	      }
+	      insn |= addrwb_p;
 	}
 
       /* Fixme: We should hash define register names to their respective
@@ -1814,8 +1803,9 @@ insert_ld_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 
       if (0x20 <= ac_reg_num && ac_reg_num <= 0x3F)
 	{
-	  if (!((arc_ld_ext_mask >> (ac_reg_num - 32)) & 1))
-	    *errmsg = _("ld operand error: Instruction Error exception");
+	      if (!((arc_ld_ext_mask >> (ac_reg_num - 32)) & 1)) {
+		      *errmsg = _ ("ld operand error: Instruction Error exception");
+	      }
 	}
 
       /* Ravi: operand validity checks for the ARC700 */
@@ -1834,23 +1824,18 @@ insert_ld_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
   /* do syntax check for ARCtangent-A4 'ld' insn */
   if (!(test == I (1)))
     {
-      if ((ls_operand[LS_DEST] == OP_SHIMM || ls_operand[LS_BASE] == OP_SHIMM
-	   || ls_operand[LS_OFFSET] == OP_SHIMM))
-	*errmsg = _("invalid load/shimm insn");
+	  if ((ls_operand[LS_DEST] == OP_SHIMM || ls_operand[LS_BASE] == OP_SHIMM || ls_operand[LS_OFFSET] == OP_SHIMM)) {
+		  *errmsg = _ ("invalid load/shimm insn");
+	  }
     }
-  if (!(LD_SYNTAX(OP_REG,OP_REG,OP_NONE)
-	|| LD_SYNTAX(OP_REG,OP_REG,OP_REG)
-	|| LD_SYNTAX(OP_REG,OP_REG,OP_SHIMM)
-	|| (LD_SYNTAX(OP_REG,OP_LIMM,OP_REG) && !(test == I(1)))
-	|| (LD_SYNTAX(OP_REG,OP_REG,OP_LIMM) && !(test == I(1)))
-	|| LD_SYNTAX(OP_REG,OP_SHIMM,OP_SHIMM)
-	|| (LD_SYNTAX(OP_REG,OP_LIMM,OP_NONE) && (test == I(1)))))
-    *errmsg = _("ld operand error");
-  if (addrwb_p)
-    {
-      if (ls_operand[LS_BASE] != OP_REG)
-	*errmsg = _("address writeback not allowed");
-      insn |= addrwb_p;
+    if (!(LD_SYNTAX (OP_REG, OP_REG, OP_NONE) || LD_SYNTAX (OP_REG, OP_REG, OP_REG) || LD_SYNTAX (OP_REG, OP_REG, OP_SHIMM) || (LD_SYNTAX (OP_REG, OP_LIMM, OP_REG) && !(test == I (1))) || (LD_SYNTAX (OP_REG, OP_REG, OP_LIMM) && !(test == I (1))) || LD_SYNTAX (OP_REG, OP_SHIMM, OP_SHIMM) || (LD_SYNTAX (OP_REG, OP_LIMM, OP_NONE) && (test == I (1))))) {
+	    *errmsg = _ ("ld operand error");
+    }
+    if (addrwb_p) {
+	    if (ls_operand[LS_BASE] != OP_REG) {
+		    *errmsg = _ ("address writeback not allowed");
+	    }
+	    insn |= addrwb_p;
     }
   return insn;
 }
@@ -1868,20 +1853,14 @@ extract_ld_syntax (arc_insn *insn,
 
   if (!(test == I(1)))
     {
-      if ((ls_operand[LS_DEST] == OP_SHIMM || ls_operand[LS_BASE] == OP_SHIMM
-	   || ls_operand[LS_OFFSET] == OP_SHIMM))
-	*invalid = 1;
+	  if ((ls_operand[LS_DEST] == OP_SHIMM || ls_operand[LS_BASE] == OP_SHIMM || ls_operand[LS_OFFSET] == OP_SHIMM)) {
+		  *invalid = 1;
+	  }
     }
-  if (!(   (LD_SYNTAX (OP_REG, OP_REG, OP_NONE) && test == I (1))
-	||  LD_SYNTAX (OP_REG, OP_REG, OP_REG)
-	||  LD_SYNTAX (OP_REG, OP_REG, OP_SHIMM)
-	|| (LD_SYNTAX (OP_REG, OP_REG, OP_LIMM) && test != I (1))
-	|| (LD_SYNTAX (OP_REG, OP_LIMM, OP_REG) && test != I (1))
-	|| (LD_SYNTAX (OP_REG, OP_SHIMM, OP_NONE) && shimm == 0)
-	||  LD_SYNTAX (OP_REG, OP_SHIMM, OP_SHIMM)
-	|| (LD_SYNTAX (OP_REG, OP_LIMM, OP_NONE) && test == I (1))))
-       *invalid = 1;
-  return 0;
+    if (!((LD_SYNTAX (OP_REG, OP_REG, OP_NONE) && test == I (1)) || LD_SYNTAX (OP_REG, OP_REG, OP_REG) || LD_SYNTAX (OP_REG, OP_REG, OP_SHIMM) || (LD_SYNTAX (OP_REG, OP_REG, OP_LIMM) && test != I (1)) || (LD_SYNTAX (OP_REG, OP_LIMM, OP_REG) && test != I (1)) || (LD_SYNTAX (OP_REG, OP_SHIMM, OP_NONE) && shimm == 0) || LD_SYNTAX (OP_REG, OP_SHIMM, OP_SHIMM) || (LD_SYNTAX (OP_REG, OP_LIMM, OP_NONE) && test == I (1)))) {
+	    *invalid = 1;
+    }
+    return 0;
 }
 
 static arc_insn
@@ -1900,11 +1879,12 @@ insert_ex_syntax (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
       unsigned ac_reg_lo = X (insn, 24, 3);
       unsigned ac_reg_num = (ac_reg_hi << 3) | ac_reg_lo;
 
-      if (arc_user_mode_only && (ac_reg_num == 29 || ac_reg_num == 30))
-	*errmsg = _("ex operand error: Privilege Violation exception");
-      if (0x20 <= ac_reg_num && ac_reg_num <= 0x3F
-	  && !((arc_ld_ext_mask >> (ac_reg_num - 32)) & 1))
-	*errmsg = _("ld operand error: Instruction Error exception");
+      if (arc_user_mode_only && (ac_reg_num == 29 || ac_reg_num == 30)) {
+	      *errmsg = _ ("ex operand error: Privilege Violation exception");
+      }
+      if (0x20 <= ac_reg_num && ac_reg_num <= 0x3F && !((arc_ld_ext_mask >> (ac_reg_num - 32)) & 1)) {
+	      *errmsg = _ ("ld operand error: Instruction Error exception");
+      }
     }
   return insn;
 }
@@ -1921,9 +1901,10 @@ insert_shimmfinish (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 		    long value ATTRIBUTE_UNUSED,
 		    const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if (shimm_p)
-    insn |= (shimm & ((1 << operand->bits) - 1)) << operand->shift;
-  return insn;
+	if (shimm_p) {
+		insn |= (shimm & ((1 << operand->bits) - 1)) << operand->shift;
+	}
+	return insn;
 }
 
 /* Called at the end of processing normal insns (eg: add) to insert a limm
@@ -1957,25 +1938,25 @@ insert_jumpflags (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 		  long value,
 		  const char **errmsg)
 {
-  if (!flag_p)
-    *errmsg = _("jump flags, but no .f seen");
+	if (!flag_p) {
+		*errmsg = _ ("jump flags, but no .f seen");
 
-  else if (!limm_p)
-    *errmsg = _("jump flags, but no limm addr");
+	} else if (!limm_p) {
+		*errmsg = _ ("jump flags, but no limm addr");
 
-  else if (limm & 0xfc000000)
-    *errmsg = _("flag bits of jump address limm lost");
+	} else if (limm & 0xfc000000) {
+		*errmsg = _ ("flag bits of jump address limm lost");
 
-  else if (limm & 0x03000000)
-    *errmsg = _("attempt to set HR bits");
+	} else if (limm & 0x03000000) {
+		*errmsg = _ ("attempt to set HR bits");
 
-  else if ((value & ((1 << operand->bits) - 1)) != value)
-    *errmsg = _("bad jump flags value");
+	} else if ((value & ((1 << operand->bits) - 1)) != value) {
+		*errmsg = _ ("bad jump flags value");
+	}
 
-  jumpflags_p = 1;
-  limm = ((limm & ((1 << operand->shift) - 1))
-	  | ((value & ((1 << operand->bits) - 1)) << operand->shift));
-  return insn;
+	jumpflags_p = 1;
+	limm = ((limm & ((1 << operand->shift) - 1)) | ((value & ((1 << operand->bits) - 1)) << operand->shift));
+	return insn;
 }
 
 /* Called at the end of unary operand macros to copy the B field to C.  */
@@ -2004,51 +1985,55 @@ insert_reladdr (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
 {
   if (!arc_mach_a4 && ('h' == operand->fmt))
     {
-      if (value & 3)
-	*errmsg = _("branch address not on 4 byte boundary");
+	  if (value & 3) {
+		  *errmsg = _ ("branch address not on 4 byte boundary");
+	  }
 
-      value = value >> 2;
-      /* Insert least significant 9-bits.  */
-      insn |= (value & 0x1ff) << operand->shift;
-      /* Insert most significant 10-bits.  */
-      insn |= ((value >> 9) & 0x3ff) << 6;
+	  value = value >> 2;
+	  /* Insert least significant 9-bits.  */
+	  insn |= (value & 0x1ff) << operand->shift;
+	  /* Insert most significant 10-bits.  */
+	  insn |= ((value >> 9) & 0x3ff) << 6;
     }
   else if (!arc_mach_a4 && ('H' == operand->fmt))
     {
-      if (value & 3)
-	*errmsg = _("branch address not on 4 byte boundary");
+	    if (value & 3) {
+		    *errmsg = _ ("branch address not on 4 byte boundary");
+	    }
 
-      value = value >> 2;
-      /* Insert least significant 9-bits.  */
-      insn |= (value & 0x1ff) << operand->shift;
-      /* Insert next least significant 10-bits.  */
-      insn |= ((value >> 9) & 0x3ff) << 6;
-      /* Insert most significant 4-bits.  */
-      insn |= (value >> 19) & 0xf;
+	    value = value >> 2;
+	    /* Insert least significant 9-bits.  */
+	    insn |= (value & 0x1ff) << operand->shift;
+	    /* Insert next least significant 10-bits.  */
+	    insn |= ((value >> 9) & 0x3ff) << 6;
+	    /* Insert most significant 4-bits.  */
+	    insn |= (value >> 19) & 0xf;
     }
   else if (!arc_mach_a4 && ('i' == operand->fmt))
     {
-      if (value & 1)
-	*errmsg = _("branch address not on 2 byte boundary");
+	    if (value & 1) {
+		    *errmsg = _ ("branch address not on 2 byte boundary");
+	    }
 
-      value = value >> 1;
-      /* Insert least significant 10-bits.  */
-      insn |= (value & 0x3ff) << operand->shift;
-      /* Insert most significant 10-bits.  */
-      insn |= ((value >> 10) & 0x3ff) << 6;
+	    value = value >> 1;
+	    /* Insert least significant 10-bits.  */
+	    insn |= (value & 0x3ff) << operand->shift;
+	    /* Insert most significant 10-bits.  */
+	    insn |= ((value >> 10) & 0x3ff) << 6;
     }
   else if (!arc_mach_a4 && ('I' == operand->fmt))
     {
-      if (value & 1)
-	*errmsg = _("branch address not on 2 byte boundary");
+	    if (value & 1) {
+		    *errmsg = _ ("branch address not on 2 byte boundary");
+	    }
 
-      value = value >> 1;
-      /* Insert least significant 10-bits.  */
-      insn |= (value & 0x3ff) << operand->shift;
-      /* Insert next least significant 10-bits.  */
-      insn |= ((value >> 10) & 0x3ff) << 6;
-      /* Insert most significant 4-bits.  */
-      insn |= (value >> 20) & 0xf;
+	    value = value >> 1;
+	    /* Insert least significant 10-bits.  */
+	    insn |= (value & 0x3ff) << operand->shift;
+	    /* Insert next least significant 10-bits.  */
+	    insn |= ((value >> 10) & 0x3ff) << 6;
+	    /* Insert most significant 4-bits.  */
+	    insn |= (value >> 20) & 0xf;
     }
   else if (!arc_mach_a4 && ('d' == operand->fmt))
     {
@@ -2072,22 +2057,25 @@ insert_reladdr (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
   else if (!arc_mach_a4 && (('s' == operand->fmt) || ('S' == operand->fmt)
 			|| ('Z' == operand->fmt)))
     {
-      if (value & 1)
-	*errmsg = _("branch address not on 2 byte boundary");
-      insn |= ((value >> 1) & ((1 << operand->bits) - 1)) << operand->shift;
+	    if (value & 1) {
+		    *errmsg = _ ("branch address not on 2 byte boundary");
+	    }
+	    insn |= ((value >> 1) & ((1 << operand->bits) - 1)) << operand->shift;
     }
   else if (!arc_mach_a4 && ('W' == operand->fmt))
     {
-      if (value & 3)
-	*errmsg = _("branch address not on 4 byte boundary");
-      insn |= ((value >> 2) & ((1 << operand->bits) - 1)) << operand->shift;
+	    if (value & 3) {
+		    *errmsg = _ ("branch address not on 4 byte boundary");
+	    }
+	    insn |= ((value >> 2) & ((1 << operand->bits) - 1)) << operand->shift;
     }
   else
     {
       /* for ARCtangent-A4 */
 
-      if (value & 3)
-	*errmsg = _("branch address not on 4 byte boundary");
+      if (value & 3) {
+	      *errmsg = _ ("branch address not on 4 byte boundary");
+      }
       insn |= ((value >> 2) & ((1 << operand->bits) - 1)) << operand->shift;
     }
   return insn;
@@ -2120,10 +2108,11 @@ insert_absaddr (arc_insn insn,long *ex ATTRIBUTE_UNUSED,
       /* If it is a jump and link, .jd must be specified.  */
       if (insn & R (-1, 9, 1))
 	{
-	  if (!nullify_p)
-	    insn |=  0x02 << 5;  /* Default nullify to .jd.  */
-	  else if (nullify != 0x02)
-	    *errmsg = _("must specify .jd or no nullify suffix");
+	      if (!nullify_p) {
+		      insn |= 0x02 << 5; /* Default nullify to .jd.  */
+	      } else if (nullify != 0x02) {
+		      *errmsg = _ ("must specify .jd or no nullify suffix");
+	      }
 	}
     }
   return insn;
@@ -2152,20 +2141,24 @@ lookup_register (int type, long regno)
 
   while (ext_oper)
     {
-      if (ext_oper->operand.type == type && ext_oper->operand.value == regno)
-	return (&ext_oper->operand);
-      ext_oper = ext_oper->next;
+	  if (ext_oper->operand.type == type && ext_oper->operand.value == regno) {
+		  return (&ext_oper->operand);
+	  }
+	  ext_oper = ext_oper->next;
     }
 
-  if (type == REG || type == REG_AC)
-    return &arc_reg_names[regno];
+    if (type == REG || type == REG_AC) {
+	    return &arc_reg_names[regno];
+    }
 
-  /* ??? This is a little slow and can be speeded up.  */
-  for (r = arc_reg_names, end = arc_reg_names + arc_reg_names_count;
-       r < end; ++r)
-    if (type == r->type	&& regno == r->value)
-      return r;
-  return 0;
+    /* ??? This is a little slow and can be speeded up.  */
+    for (r = arc_reg_names, end = arc_reg_names + arc_reg_names_count;
+	    r < end; ++r) {
+	    if (type == r->type && regno == r->value) {
+		    return r;
+	    }
+    }
+    return 0;
 }
 
 /* As we're extracting registers, keep an eye out for the 'f' indicator
@@ -2198,15 +2191,16 @@ extract_reg (arc_insn *insn,
       if ('a' != operand->fmt)
 	{
 	  value = *insn & 511;
-	  if ((operand->flags & ARC_OPERAND_SIGNED)
-	      && (value & 256))
-	    value -= 512;
-	  if (!flagshimm_handled_p)
-	    flag_p = 0;
+	  if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256)) {
+		  value -= 512;
+	  }
+	  if (!flagshimm_handled_p) {
+		  flag_p = 0;
+	  }
 	  flagshimm_handled_p = 1;
-	}
-      else
-	value = 0;
+      } else {
+	      value = 0;
+      }
     }
   else if (regno == ARC_REG_SHIMM_UPDATE)
     {
@@ -2216,11 +2210,12 @@ extract_reg (arc_insn *insn,
       if ('a' != operand->fmt)
 	{
 	  value = *insn & 511;
-	  if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256))
-	    value -= 512;
-	}
-      else
-	value = 0;
+	  if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256)) {
+		  value -= 512;
+	  }
+      } else {
+	      value = 0;
+      }
 
       flag_p = 1;
       flagshimm_handled_p = 1;
@@ -2232,8 +2227,9 @@ extract_reg (arc_insn *insn,
       limm_p = 1;
 
       /* If this is a jump instruction (j,jl), show new pc correctly.  */
-      if (0x07 == ((*insn & I(-1)) >> 27))
-	value = (value & 0xffffff);
+      if (0x07 == ((*insn & I (-1)) >> 27)) {
+	      value = (value & 0xffffff);
+      }
     }
 
   /* It's a register, set OPVAL (that's the only way we distinguish registers
@@ -2244,10 +2240,12 @@ extract_reg (arc_insn *insn,
 
       op_type = OP_REG;
 
-      if (!reg)
-	return 0;
-      if (opval != NULL)
-	*opval = reg;
+      if (!reg) {
+	      return 0;
+      }
+      if (opval != NULL) {
+	      *opval = reg;
+      }
       value = regno;
     }
 
@@ -2259,8 +2257,9 @@ extract_reg (arc_insn *insn,
 
       /* This is really a constant, but tell the caller it has a special
 	 name.  */
-      if (reg != NULL && opval != NULL)
-	*opval = reg;
+      if (reg != NULL && opval != NULL) {
+	      *opval = reg;
+      }
     }
 
   switch (operand->fmt)
@@ -2272,11 +2271,12 @@ extract_reg (arc_insn *insn,
       ls_operand[LS_BASE] = op_type;
       break;
     case 'c':
-      if ((insn[0]& I(-1)) == I(2))
-	ls_operand[LS_VALUE] = op_type;
-      else
-	ls_operand[LS_OFFSET] = op_type;
-      break;
+	    if ((insn[0] & I (-1)) == I (2)) {
+		    ls_operand[LS_VALUE] = op_type;
+	    } else {
+		    ls_operand[LS_OFFSET] = op_type;
+	    }
+	    break;
     case 'o': case 'O':
       ls_operand[LS_OFFSET] = op_type;
       break;
@@ -2298,18 +2298,21 @@ extract_flag (arc_insn *insn,
   int f;
   const struct arc_operand_value *val;
 
-  if (flagshimm_handled_p)
-    f = flag_p != 0;
-  else
-    f = (*insn & (1 << operand->shift)) != 0;
+  if (flagshimm_handled_p) {
+	  f = flag_p != 0;
+  } else {
+	  f = (*insn & (1 << operand->shift)) != 0;
+  }
 
   /* There is no text for zero values.  */
-  if (f == 0)
-    return 0;
+  if (f == 0) {
+	  return 0;
+  }
   flag_p = 1;
   val = arc_opcode_lookup_suffix (operand, 1);
-  if (opval != NULL && val != NULL)
-    *opval = val;
+  if (opval != NULL && val != NULL) {
+	  *opval = val;
+  }
   return val?val->value:0;
 }
 
@@ -2328,16 +2331,18 @@ extract_cond (arc_insn *insn,
   long cond;
   const struct arc_operand_value *val;
 
-  if (flagshimm_handled_p)
-    return 0;
+  if (flagshimm_handled_p) {
+	  return 0;
+  }
 
   cond = (*insn >> operand->shift) & ((1 << operand->bits) - 1);
   val = arc_opcode_lookup_suffix (operand, cond);
 
   /* Ignore NULL values of `val'.  Several condition code values are
      reserved for extensions.  */
-  if (opval != NULL && val != NULL)
-    *opval = val;
+  if (opval != NULL && val != NULL) {
+	  *opval = val;
+  }
   return cond;
 }
 
@@ -2354,9 +2359,9 @@ extract_reladdr (arc_insn *insn,
   long addr;
 
   addr = (*insn >> operand->shift) & ((1 << operand->bits) - 1);
-  if ((operand->flags & ARC_OPERAND_SIGNED)
-      && (addr & (1 << (operand->bits - 1))))
-    addr -= 1 << operand->bits;
+  if ((operand->flags & ARC_OPERAND_SIGNED) && (addr & (1 << (operand->bits - 1)))) {
+	  addr -= 1 << operand->bits;
+  }
 
   return addr << 2;
 }
@@ -2370,10 +2375,12 @@ extract_jumpflags (arc_insn *insn,
 		   const struct arc_operand_value **opval ATTRIBUTE_UNUSED,
 		   int *invalid)
 {
-  if (!flag_p || !limm_p)
-    *invalid = 1;
-  return ((flag_p && limm_p)
-	  ? (insn[1] >> operand->shift) & ((1 << operand->bits) -1): 0);
+	if (!flag_p || !limm_p) {
+		*invalid = 1;
+	}
+	return ((flag_p && limm_p)
+			? (insn[1] >> operand->shift) & ((1 << operand->bits) - 1)
+			: 0);
 }
 
 /* Extract st insn's offset.  */
@@ -2390,13 +2397,15 @@ extract_st_offset (arc_insn *insn,
   if (ls_operand[LS_VALUE] != OP_SHIMM || ls_operand[LS_BASE] != OP_LIMM)
     {
       value = insn[0] & 511;
-      if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256))
-	value -= 512;
-      if (value)
-	ls_operand[LS_OFFSET] = OP_SHIMM;
-    }
-  else
-    *invalid = 1;
+      if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256)) {
+	      value -= 512;
+      }
+      if (value) {
+	      ls_operand[LS_OFFSET] = OP_SHIMM;
+      }
+  } else {
+	  *invalid = 1;
+  }
 
   return value;
 }
@@ -2416,10 +2425,12 @@ extract_ld_offset (arc_insn *insn,
   if (test)
     {
       value = insn[0] & 511;
-      if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256))
-	value -= 512;
-      if (value)
-	ls_operand[LS_OFFSET] = OP_SHIMM;
+      if ((operand->flags & ARC_OPERAND_SIGNED) && (value & 256)) {
+	      value -= 512;
+      }
+      if (value) {
+	      ls_operand[LS_OFFSET] = OP_SHIMM;
+      }
 
       return value;
     }
@@ -2442,10 +2453,11 @@ extract_unopmacro (arc_insn *insn,
   /* This misses the case where B == ARC_REG_SHIMM_UPDATE &&
      C == ARC_REG_SHIMM (or vice versa).  No big deal.  Those insns will get
      printed as "and"s.  */
-  if (((*insn >> ARC_SHIFT_REGB) & ARC_MASK_REG)
-      != ((*insn >> ARC_SHIFT_REGC) & ARC_MASK_REG))
-    if (invalid != NULL)
-      *invalid = 1;
+  if (((*insn >> ARC_SHIFT_REGB) & ARC_MASK_REG) != ((*insn >> ARC_SHIFT_REGC) & ARC_MASK_REG)) {
+	  if (invalid != NULL) {
+		  *invalid = 1;
+	  }
+  }
 
   return 0;
 }
@@ -4296,8 +4308,9 @@ arc_opcode_init_tables (int flags)
   /* If initialization was already done but current cpu type is different
      from the one for which initialization was done earlier, then do
      initialization again */
-  if (init_p && cpu_type != flags)
-    init_p = 0;
+  if (init_p && cpu_type != flags) {
+	  init_p = 0;
+  }
 
   cpu_type = flags;
 
@@ -4315,10 +4328,11 @@ arc_opcode_init_tables (int flags)
           /* Initialize operand map table for ARCtanget-A4 */
           memset (arc_operand_map_a4, 0, sizeof (arc_operand_map_a4));
 
-          for (i = 0; i < (int) ELEMENTS_IN (arc_operands_a4); ++i)
-	    arc_operand_map_a4[arc_operands_a4[i].fmt] = i;
+	  for (i = 0; i < (int)ELEMENTS_IN (arc_operands_a4); ++i) {
+		  arc_operand_map_a4[arc_operands_a4[i].fmt] = i;
+	  }
 
-          /* Set the pointers to operand table, operand map table */
+	  /* Set the pointers to operand table, operand map table */
           arc_operands        = arc_operands_a4;
           arc_operand_map     = arc_operand_map_a4;
           arc_reg_names       = arc_reg_names_a4;
@@ -4331,10 +4345,11 @@ arc_opcode_init_tables (int flags)
           /* Initialize operand map table for ARCompact */
           memset (arc_operand_map_ac, 0, sizeof (arc_operand_map_ac));
 
-          for (i = 0; i < (int) ELEMENTS_IN (arc_operands_ac); ++i)
-	    arc_operand_map_ac[arc_operands_ac[i].fmt] = i;
+	  for (i = 0; i < (int)ELEMENTS_IN (arc_operands_ac); ++i) {
+		  arc_operand_map_ac[arc_operands_ac[i].fmt] = i;
+	  }
 
-          /* Set the pointers to operand table, operand map table */
+	  /* Set the pointers to operand table, operand map table */
           arc_operands = arc_operands_ac;
           arc_operand_map = arc_operand_map_ac;
 
@@ -4384,11 +4399,13 @@ arc_opcode_init_tables (int flags)
 int
 arc_opcode_supported (const struct arc_opcode *opcode)
 {
-  if (ARC_OPCODE_CPU (opcode->flags) == 0)
-    return 1;
-  if (ARC_OPCODE_CPU (opcode->flags) & ARC_HAVE_CPU (cpu_type))
-    return 1;
-  return 0;
+	if (ARC_OPCODE_CPU (opcode->flags) == 0) {
+		return 1;
+	}
+	if (ARC_OPCODE_CPU (opcode->flags) & ARC_HAVE_CPU (cpu_type)) {
+		return 1;
+	}
+	return 0;
 }
 
 
@@ -4441,8 +4458,9 @@ arc_opcode_init_insert (void)
 {
   int i;
 
-  for(i = 0; i < OPERANDS; i++)
-    ls_operand[i] = OP_NONE;
+  for (i = 0; i < OPERANDS; i++) {
+	  ls_operand[i] = OP_NONE;
+  }
 
   flag_p = 0;
   flagshimm_handled_p = 0;
@@ -4462,9 +4480,10 @@ arc_opcode_init_insert (void)
 int
 arc_opcode_limm_p (long *limmp)
 {
-  if (limmp)
-    *limmp = limm;
-  return limm_p;
+	if (limmp) {
+		*limmp = limm;
+	}
+	return limm_p;
 }
 
 
@@ -4478,18 +4497,19 @@ arc_opcode_lookup_suffix (const struct arc_operand *type, int value)
   struct arc_ext_operand_value *ext_oper = arc_ext_operands;
   while (ext_oper)
     {
-    if (type == &arc_operands[ext_oper->operand.type]
-         && value == ext_oper->operand.value)
-      return (&ext_oper->operand);
-    ext_oper = ext_oper->next;
+	  if (type == &arc_operands[ext_oper->operand.type] && value == ext_oper->operand.value) {
+		  return (&ext_oper->operand);
+	  }
+	  ext_oper = ext_oper->next;
     }
 
   /* ??? This is a little slow and can be speeded up.  */
-  for (v = arc_suffixes, end = arc_suffixes + arc_suffixes_count; v < end; ++v)
-    if (type == &arc_operands[v->type]
-	&& value == v->value)
-      return v;
-  return 0;
+    for (v = arc_suffixes, end = arc_suffixes + arc_suffixes_count; v < end; ++v) {
+	    if (type == &arc_operands[v->type] && value == v->value) {
+		    return v;
+	    }
+    }
+    return 0;
 }
 
 
@@ -4634,21 +4654,23 @@ ac_get_load_sdasym_insn_type (arc_insn insn, int compact_insn_16)
 	{
 	  /* ld */
 	case 0x10000000:
-	  if (((insn>>9) & 3) == 3)
-	    load_type = 0;
-	  else
-	    load_type = 1;
-	  break;
+		if (((insn >> 9) & 3) == 3) {
+			load_type = 0;
+		} else {
+			load_type = 1;
+		}
+		break;
 
-	  /* ldw */
+		/* ldw */
 	case 0x10000100:
-	  if (((insn>>9) & 3) == 3)
-	    load_type = 2;
-	  else
-	    load_type = 1;
-	  break;
+		if (((insn >> 9) & 3) == 3) {
+			load_type = 2;
+		} else {
+			load_type = 1;
+		}
+		break;
 
-	  /* ldb */
+		/* ldb */
 	case 0x10000080:
 	  load_type = 1;
 	  break;
@@ -4682,21 +4704,23 @@ ac_get_store_sdasym_insn_type (arc_insn insn,
     {
       /* st */
     case 0x18000000:
-      if (((insn>>3) & 3) == 3)
-	store_type = 0;
-      else
-	store_type = 1;
-      break;
+	    if (((insn >> 3) & 3) == 3) {
+		    store_type = 0;
+	    } else {
+		    store_type = 1;
+	    }
+	    break;
 
-      /* stw */
+	    /* stw */
     case 0x18000004:
-      if (((insn>>3) & 3) == 3)
-	store_type = 2;
-      else
-	store_type = 1;
-      break;
+	    if (((insn >> 3) & 3) == 3) {
+		    store_type = 2;
+	    } else {
+		    store_type = 1;
+	    }
+	    break;
 
-      /* stb */
+	    /* stb */
     case 0x18000002:
       store_type = 1;
       break;
@@ -4917,14 +4941,14 @@ get_ext_suffix (char *s, char field)
       ctype = arc_mach_a4 ? COND : COND_AC;
       break;
       } /* end switch(field) */
-  if(ctype == 0)
-      ctype = arc_mach_a4 ? COND : COND_AC;
-  while (suffix){
-    if ((suffix->operand.type == ctype)
-        && !strcmp(s,suffix->operand.name)){
-	return(&suffix->operand);
+      if (ctype == 0) {
+	      ctype = arc_mach_a4 ? COND : COND_AC;
       }
-      suffix = suffix->next;
+      while (suffix) {
+	      if ((suffix->operand.type == ctype) && !strcmp (s, suffix->operand.name)) {
+		      return (&suffix->operand);
+	      }
+	      suffix = suffix->next;
   } /* end while(suffix) */
 
   return NULL;
@@ -4945,9 +4969,9 @@ arc_aux_reg_name (int regVal)
 
   for (i= arc_reg_names_count ; i > 0  ; i--)
     {
-      if ((arc_reg_names[i].type == AUXREG_AC)
-	  && (arc_reg_names[i].value == regVal ))
-	return arc_reg_names[i].name;
+	  if ((arc_reg_names[i].type == AUXREG_AC) && (arc_reg_names[i].value == regVal)) {
+		  return arc_reg_names[i].name;
+	  }
     }
 
   return NULL;
diff --git a/libr/asm/arch/arc/gnu/arcompact-dis.c b/libr/asm/arch/arc/gnu/arcompact-dis.c
index 19b207aecb..329d9b6579 100644
--- a/libr/asm/arch/arc/gnu/arcompact-dis.c
+++ b/libr/asm/arch/arc/gnu/arcompact-dis.c
@@ -277,40 +277,45 @@ static short int enable_insn_stream = 0;
 static const char *
 core_reg_name(struct arcDisState *state, int val)
 {
-  if (state->coreRegName)
-    return (*state->coreRegName)(state->_this, val);
-  return 0;
+	if (state->coreRegName) {
+		return (*state->coreRegName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
 aux_reg_name(struct arcDisState *state, int val)
 {
-  if (state->auxRegName)
-    return (*state->auxRegName)(state->_this, val);
-  return 0;
+	if (state->auxRegName) {
+		return (*state->auxRegName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
 cond_code_name(struct arcDisState *state, int val)
 {
-  if (state->condCodeName)
-    return (*state->condCodeName)(state->_this, val);
-  return 0;
+	if (state->condCodeName) {
+		return (*state->condCodeName) (state->_this, val);
+	}
+	return 0;
 }
 
 static const char *
 instruction_name(struct arcDisState *state, int op1, int op2, int *flags)
 {
-  if (state->instName)
-    return (*state->instName)(state->_this, op1, op2, flags);
-  return 0;
+	if (state->instName) {
+		return (*state->instName) (state->_this, op1, op2, flags);
+	}
+	return 0;
 }
 
 static void
 mwerror(struct arcDisState *state, const char *msg)
 {
-  if (state->err != 0)
-    (*state->err)(state->_this, (msg));
+	if (state->err != 0) {
+		(*state->err) (state->_this, (msg));
+	}
 }
 
 static const char *
@@ -344,36 +349,37 @@ my_sprintf (struct arcDisState *state, char *buf, const char*format, ...)
   p = format;
   regMap[0] = 0;
   regMap[1] = 0;
-  while (1)
-    switch(*p++) {
-    case 0: goto DOCOMM; /*(return) */
-    default:
-      *bp++ = p[-1];
-      break;
-    case '%':
-      size = 0;
-      leading_zero = 0;
-    RETRY: ;
-      switch(*p++)
-	{
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  {
-	    /* size. */
-	    size = p[-1]-'0';
-	    if (size == 0) leading_zero = 1; /* e.g. %08x */
-	    while (*p >= '0' && *p <= '9')
-	      size = size*10+*p-'0', p++;
-	    goto RETRY;
-	  }
+  while (1) {
+	  switch (*p++) {
+	  case 0: goto DOCOMM; /*(return) */
+	  default:
+		  *bp++ = p[-1];
+		  break;
+	  case '%':
+		  size = 0;
+		  leading_zero = 0;
+	  RETRY:;
+		  switch (*p++) {
+		  case '0':
+		  case '1':
+		  case '2':
+		  case '3':
+		  case '4':
+		  case '5':
+		  case '6':
+		  case '7':
+		  case '8':
+		  case '9': {
+			  /* size. */
+			  size = p[-1] - '0';
+			  if (size == 0) {
+				  leading_zero = 1; /* e.g. %08x */
+			  }
+			  while (*p >= '0' && *p <= '9') {
+				  size = size * 10 + *p - '0', p++;
+			  }
+			  goto RETRY;
+		  }
 #define inc_bp() bp = bp+strlen(bp)
 
 	case 'h':
@@ -385,32 +391,41 @@ my_sprintf (struct arcDisState *state, char *buf, const char*format, ...)
 	     * We add underscores for easy reading.
 	     */
 #define CDT_DEBUG
-	    if (u > 65536)
+	    if (u > 65536) {
 #ifndef CDT_DEBUG
 	      sprintf(bp,"0x%x_%04x",u >> 16, u & 0xffff);
 #else
 	      sprintf(bp,"0x%08x",u);
 #endif // CDT_DEBUG
-	    else
-	      sprintf(bp,"0x%x",u);
+	    } else {
+		    sprintf (bp, "0x%x", u);
+	    }
 	    inc_bp();
 	  }
 	  break;
 	case 'X': case 'x':
 	  {
 	    int val = va_arg(ap,int);
-	    if (size != 0)
-	      if (leading_zero) sprintf(bp,"%0*x",size,val);
-	      else sprintf(bp,"%*x",size,val);
-	    else sprintf(bp,"%x",val);
+	    if (size != 0) {
+		    if (leading_zero) {
+			    sprintf (bp, "%0*x", size, val);
+		    } else {
+			    sprintf (bp, "%*x", size, val);
+		    }
+	    } else {
+		    sprintf (bp, "%x", val);
+	    }
 	    inc_bp();
 	  }
 	  break;
 	case 'd':
 	  {
 	    int val = va_arg(ap,int);
-	    if (size != 0) sprintf(bp,"%*d",size,val);
-	    else sprintf(bp,"%d",val);
+	    if (size != 0) {
+		    sprintf (bp, "%*d", size, val);
+	    } else {
+		    sprintf (bp, "%d", val);
+	    }
 	    inc_bp();
 	  }
 	  break;
@@ -435,8 +450,11 @@ my_sprintf (struct arcDisState *state, char *buf, const char*format, ...)
 		{
 		  const char *ext;
 		  ext = core_reg_name(state, val);
-		  if (ext) sprintf(bp, "%s", ext);
-		  else     sprintf(bp,"r%d",val);
+		  if (ext) {
+			  sprintf (bp, "%s", ext);
+		  } else {
+			  sprintf (bp, "r%d", val);
+		  }
 		}break;
 	      }
 	    inc_bp();
@@ -448,14 +466,16 @@ my_sprintf (struct arcDisState *state, char *buf, const char*format, ...)
 	    int val = va_arg(ap,int);
 	    char *ret;
 	    ret = arc_aux_reg_name(val);
-	    if(ret)
-	      sprintf(bp,"%s",ret);
-	    else
-	      {
-		const char *ext;
-		  ext = aux_reg_name(state, val);
-		  if (ext) sprintf(bp, "%s", ext);
-		  else     my_sprintf(state, bp,"%h",val);
+	    if (ret) {
+		    sprintf (bp, "%s", ret);
+	    } else {
+		    const char *ext;
+		    ext = aux_reg_name (state, val);
+		    if (ext) {
+			    sprintf (bp, "%s", ext);
+		    } else {
+			    my_sprintf (state, bp, "%h", val);
+		    }
 	      }
 
 	    inc_bp();
@@ -513,8 +533,8 @@ my_sprintf (struct arcDisState *state, char *buf, const char*format, ...)
 	  fprintf(stderr,"?? format %c\n",p[-1]);
 	  break;
 	}
-    }
-
+	  }
+  }
 
  DOCOMM:
   *bp = 0;
@@ -540,34 +560,46 @@ write_instr_name_(struct arcDisState *state,
 		  int addrWriteBack,
 		  int directMem)
 {
-  if(!instrName)
-	return;
-  strncpy(state->instrBuffer, instrName, sizeof(state->instrBuffer)-1);
-  if (cond > 0)
-    {
-      int condlim = 0; /* condition code limit*/
-      const char *cc = 0;
-      if (!condCodeIsPartOfName) strcat(state->instrBuffer, ".");
-      condlim = 18;
-      if (cond < condlim)
-	cc = condName[cond];
-      else
-	cc = cond_code_name(state, cond);
-      if (!cc) cc = "???";
-      strcat(state->instrBuffer, cc);
+	if (!instrName) {
+		return;
+	}
+	strncpy (state->instrBuffer, instrName, sizeof (state->instrBuffer) - 1);
+	if (cond > 0) {
+		int condlim = 0; /* condition code limit*/
+		const char *cc = 0;
+		if (!condCodeIsPartOfName) {
+			strcat (state->instrBuffer, ".");
+		}
+		condlim = 18;
+		if (cond < condlim) {
+			cc = condName[cond];
+		} else {
+			cc = cond_code_name (state, cond);
+		}
+		if (!cc) {
+			cc = "???";
+		}
+		strcat (state->instrBuffer, cc);
     }
-  if (flag) strcat(state->instrBuffer, ".f");
-  if (state->nullifyMode)
-    if (strstr(state->instrBuffer, ".d") == NULL)
-      strcat(state->instrBuffer, ".d");
-  if (signExtend)    strcat(state->instrBuffer, ".x");
-  switch (addrWriteBack)
-  {
+    if (flag) {
+	    strcat (state->instrBuffer, ".f");
+    }
+    if (state->nullifyMode) {
+	    if (strstr (state->instrBuffer, ".d") == NULL) {
+		    strcat (state->instrBuffer, ".d");
+	    }
+    }
+    if (signExtend) {
+	    strcat (state->instrBuffer, ".x");
+    }
+    switch (addrWriteBack) {
     case 1: strcat(state->instrBuffer, ".a"); break;
     case 2: strcat(state->instrBuffer, ".ab"); break;
     case 3: strcat(state->instrBuffer, ".as"); break;
   }
-  if (directMem)     strcat(state->instrBuffer, ".di");
+  if (directMem) {
+	  strcat (state->instrBuffer, ".di");
+  }
 }
 
 #define write_instr_name()	{\
@@ -625,9 +657,10 @@ bfd_getm32_ac (data)
 static int
 sign_extend (int value, int bits)
 {
-  if (BIT(value, (bits-1)))
-    value |= (0xffffffff << bits);
-  return value;
+	if (BIT (value, (bits - 1))) {
+		value |= (0xffffffff << bits);
+	}
+	return value;
 }
 
 /* dsmOneArcInst - This module is used to identify the instruction
@@ -673,21 +706,24 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
   state->sourceType = ARC_UNDEFINED;
 
   /* ARCtangent-A5 basecase instruction and little-endian mode */
-  if ((info->endian == BFD_ENDIAN_LITTLE) && (state->instructionLen == 4))
-    state->words[0] = bfd_getm32(state->words[0]);
+  if ((info->endian == BFD_ENDIAN_LITTLE) && (state->instructionLen == 4)) {
+	  state->words[0] = bfd_getm32 (state->words[0]);
+  }
 
   if (state->instructionLen == 4)
   {
-    if (!NEXT_WORD(0))
-      return 0;
-    /* Get the major opcode of the ARCtangent-A5 32-bit instruction. */
-    state->_opcode = OPCODE(state->words[0]);
+	  if (!NEXT_WORD (0)) {
+		  return 0;
+	  }
+	  /* Get the major opcode of the ARCtangent-A5 32-bit instruction. */
+	  state->_opcode = OPCODE (state->words[0]);
   }
   else
   {
     /* ARCompact 16-bit instruction */
-    if (!NEXT_WORD_AC(0))
-      return 0;
+    if (!NEXT_WORD_AC (0)) {
+	    return 0;
+    }
     /* Get the major opcode of the ARCompact 16-bit instruction. */
     state->_opcode = OPCODE_AC(state->words[0]);
   }
@@ -726,11 +762,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       switch (BITS(state->words[0],16,16))
       {
 	case 0:
-	  if (!instrName)
-	    instrName = "bl";
-	  decodingClass = 13;
-      	  condCodeIsPartOfName = 1;
-	  break;
+		if (!instrName) {
+			instrName = "bl";
+		}
+		decodingClass = 13;
+		condCodeIsPartOfName = 1;
+		break;
 	case 1:
 	  switch (BITS(state->words[0],0,3))
 	  {
@@ -837,11 +874,13 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 	  instrName = "j";
         case 34:
         case 35:
-	  if (!instrName) instrName = "jl";
-	  decodingClass = 4;
-	  condCodeIsPartOfName = 1;
-          state->isBranch = 1;
-	  break;
+		if (!instrName) {
+			instrName = "jl";
+		}
+		decodingClass = 4;
+		condCodeIsPartOfName = 1;
+		state->isBranch = 1;
+		break;
         case 40:
 	  instrName = "lp";
 	  decodingClass = 11;
@@ -884,17 +923,19 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 	      {
 	      case 1 : instrName = "sleep"; decodingClass = 32; break;
 	      case 2 :
-		if((info->mach) == ARC_MACH_ARC7)
-		  instrName = "trap0";
-		else
-		  instrName = "swi";
-		break;
+		      if ((info->mach) == ARC_MACH_ARC7) {
+			      instrName = "trap0";
+		      } else {
+			      instrName = "swi";
+		      }
+		      break;
 	      case 3:
 
-		if(BITS(state->words[0],22,23) == 1)
-		  instrName = "sync" ;
+		      if (BITS (state->words[0], 22, 23) == 1) {
+			      instrName = "sync";
+		      }
 
-		break;
+		      break;
 	      case 4 : instrName = "rtie" ; break;
 	      case 5 : instrName = "brk"; break;
 	      default:
@@ -2028,15 +2069,24 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
           switch(BITS(state->words[0],5,7))
 	  {
             case 0 : instrName = "j_s";
-            case 2 : if (!instrName) instrName = "jl_s";
-	             state->isBranch = 1;
-		     state->nullifyMode = BR_exec_when_no_jump;
-		     break;
-            case 1 : if (!instrName) instrName = "j_s.d";
-            case 3 : if (!instrName) instrName = "jl_s.d";
-          	     state->isBranch = 1;
-		     state->nullifyMode = BR_exec_always;
-		     break;
+            case 2 :
+		    if (!instrName) {
+			    instrName = "jl_s";
+		    }
+		    state->isBranch = 1;
+		    state->nullifyMode = BR_exec_when_no_jump;
+		    break;
+            case 1 :
+		    if (!instrName) {
+			    instrName = "j_s.d";
+		    }
+	    case 3 :
+		    if (!instrName) {
+			    instrName = "jl_s.d";
+		    }
+		    state->isBranch = 1;
+		    state->nullifyMode = BR_exec_always;
+		    break;
             case 6 : instrName = "sub_s.ne";
 	             decodingClass = 35;
 	             break;
@@ -2051,19 +2101,24 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 
 
 	        case 4: instrName = "jeq_s [blink]";
-		case 5: if (!instrName) instrName = "jne_s [blink]";
+		case 5:
+			if (!instrName) {
+				instrName = "jne_s [blink]";
+			}
 		case 6:
-		  if (!instrName)
-		    instrName = "j_s [blink]";
-		  state->isBranch = 1;
-		  state->nullifyMode = BR_exec_when_no_jump;
-		  break;
+			if (!instrName) {
+				instrName = "j_s [blink]";
+			}
+			state->isBranch = 1;
+			state->nullifyMode = BR_exec_when_no_jump;
+			break;
 		case 7:
-		  if (!instrName)
-		    instrName = "j_s.d [blink]";
-		  state->isBranch = 1;
-		  state->nullifyMode = BR_exec_always;
-		  break;
+			if (!instrName) {
+				instrName = "j_s.d [blink]";
+			}
+			state->isBranch = 1;
+			state->nullifyMode = BR_exec_always;
+			break;
                 default:
 		  instrName = "??? (2[3])";
 	      	  state->flow = invalid_instr;
@@ -2178,11 +2233,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
         case 3: instrName = "stb_s"; break;
         case 4: instrName = "add_s"; break;
         case 5:
-      	  if (!BITS(state->words[0],8,8))
-	    instrName = "add_s";
-	  else
-	    instrName = "sub_s";
-	  break;
+		if (!BITS (state->words[0], 8, 8)) {
+			instrName = "add_s";
+		} else {
+			instrName = "sub_s";
+		}
+		break;
         case 6: instrName = "pop_s"; decodingClass = 31; break;
         case 7: instrName = "push_s"; decodingClass = 31; break;
 	default:
@@ -2219,19 +2275,21 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
     case op_ADD_CMP:
     /* ARCompact 16-bit Add/compare immediate */
       decodingClass = 21;  /* default for major opcode 0x1c ... */
-      if (BIT(state->words[0],7))
-	instrName = "cmp_s";
-      else
-	instrName = "add_s";
+      if (BIT (state->words[0], 7)) {
+	      instrName = "cmp_s";
+      } else {
+	      instrName = "add_s";
+      }
       break;
 
     case op_BR_S:
     /* ARCompact 16-bit Branch conditionally on reg z/nz */
       decodingClass = 25; /* Default for BR_S instruction ... */
-      if (BIT(state->words[0],7))
-	instrName = "brne_s";
-      else
-	instrName = "breq_s";
+      if (BIT (state->words[0], 7)) {
+	      instrName = "brne_s";
+      } else {
+	      instrName = "breq_s";
+      }
       state->isBranch = 1;
       break;
 
@@ -2278,30 +2336,29 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
    * instead of all over this crazy switch case. */
   if (state->flow == invalid_instr)
     {
-      if (!((state->_opcode == op_SIMD) && enable_simd))
-	instrName = instruction_name(state,state->_opcode,
-				     state->words[0],
-				     &flags);
+	  if (!((state->_opcode == op_SIMD) && enable_simd)) {
+		  instrName = instruction_name (state, state->_opcode,
+			  state->words[0],
+			  &flags);
+	  }
 
-      if (state->instructionLen == 2)
-	{
-	  switch (flags)
-	    {
-	    case AC_SYNTAX_3OP:
-	      decodingClass = 22;
-	      break;
-	    case AC_SYNTAX_2OP:
-	      decodingClass = 14;
-	      break;
-	    case AC_SYNTAX_1OP:
-	      decodingClass = 36;
-	      break;
-	    case AC_SYNTAX_NOP:
-	      decodingClass = 26;
-	      break;
-	    default:
-	      mwerror(state, "Invalid syntax class\n");
-	    }
+	  if (state->instructionLen == 2) {
+		  switch (flags) {
+		  case AC_SYNTAX_3OP:
+			  decodingClass = 22;
+			  break;
+		  case AC_SYNTAX_2OP:
+			  decodingClass = 14;
+			  break;
+		  case AC_SYNTAX_1OP:
+			  decodingClass = 36;
+			  break;
+		  case AC_SYNTAX_NOP:
+			  decodingClass = 26;
+			  break;
+		  default:
+			  mwerror (state, "Invalid syntax class\n");
+		  }
 	}
       else
 	{
@@ -2364,8 +2421,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       	  else
 	  {
             FIELD_B();
-      	    if (!fieldBisReg)
-	      fieldB = fieldC;
+	    if (!fieldBisReg) {
+		    fieldB = fieldC;
+	    }
 	  }
       	  CHECK_FIELD_A();
       	  CHECK_FLAG();
@@ -2401,11 +2459,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
           /* Say ea is not present, so only one of us will do the
 	     name lookup. */
 	  state->_offset += fieldB, state->_ea_present = 0;
-	  if (is_limm)
-	    fieldAisReg = fieldA = 0;
-	  else
-	    fieldA = fieldB;
-      	  CHECK_FLAG();
+	  if (is_limm) {
+		  fieldAisReg = fieldA = 0;
+	  } else {
+		  fieldA = fieldB;
+	  }
+	  CHECK_FLAG();
 	  break;
 
 	case 3:
@@ -2422,12 +2481,11 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 	  {
 	    fieldAisReg = fieldA = 0;
             FIELD_C();
-            if (BIT(state->words[0],5))
-	      fieldCisReg = 0;
-	    else if (fieldC == 62)
-	    {
-              fieldCisReg = 0;
-	      fieldC = fieldB;
+	    if (BIT (state->words[0], 5)) {
+		    fieldCisReg = 0;
+	    } else if (fieldC == 62) {
+		    fieldCisReg = 0;
+		    fieldC = fieldB;
 	    }
 	  }
 	  else
@@ -2464,12 +2522,16 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       FIELD_B();
       CHECK_FLAG();
 
-      if (BITS(state->words[0],22,23) == 1 )
-	fieldCisReg = 0;
-      if (fieldCisReg) state->ea_reg1 = fieldC;
-      /* field C is either a shimm (same as fieldC) or limm (different!) */
-      /* Say ea is not present, so only one of us will do the name lookup. */
-      else state->_offset += fieldB, state->_ea_present = 0;
+      if (BITS (state->words[0], 22, 23) == 1) {
+	      fieldCisReg = 0;
+      }
+      if (fieldCisReg) {
+	      state->ea_reg1 = fieldC;
+	      /* field C is either a shimm (same as fieldC) or limm (different!) */
+	      /* Say ea is not present, so only one of us will do the name lookup. */
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       write_instr_name();
       WRITE_FORMAT_x(B);
@@ -2490,8 +2552,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 	if (is_limm)
 	{
 	  FIELD_B();
-	  if (!fieldBisReg)
-	    fieldB = fieldC;
+	  if (!fieldBisReg) {
+		  fieldB = fieldC;
+	  }
 	}
 	else
 	{
@@ -2513,10 +2576,13 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       if (subopcode == 3)
 	CHECK_COND();
 
-      if (fieldCisReg) state->ea_reg1 = fieldC;
-      /* field C is either a shimm (same as fieldC) or limm (different!) */
-      /* Say ea is not present, so only one of us will do the name lookup. */
-      else state->_offset += fieldB, state->_ea_present = 0;
+      if (fieldCisReg) {
+	      state->ea_reg1 = fieldC;
+	      /* field C is either a shimm (same as fieldC) or limm (different!) */
+	      /* Say ea is not present, so only one of us will do the name lookup. */
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       write_instr_name();
       if (mul)
@@ -2617,11 +2683,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       strcat(formatString,
 	     IS_REG(C)?"[%r]":"%s"); /* address/label name */
 
-      if (IS_REG(C))
-	my_sprintf(state, state->operandBuffer, formatString, fieldC);
-      else
-	my_sprintf(state, state->operandBuffer, formatString,
-		   post_address(state, fieldC));
+      if (IS_REG (C)) {
+	      my_sprintf (state, state->operandBuffer, formatString, fieldC);
+      } else {
+	      my_sprintf (state, state->operandBuffer, formatString,
+		      post_address (state, fieldC));
+      }
       break;
 
     case 5:
@@ -2640,19 +2707,30 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       if (is_limm)
       {
         FIELD_C();
-        if (!fieldCisReg)
-          fieldC = fieldB;
+	if (!fieldCisReg) {
+		fieldC = fieldB;
+	}
       }
       else
       {
         CHECK_FIELD_C();
       }
-      if (dbg) printf("5:b reg %d %d c reg %d %d  \n",
-		      fieldBisReg,fieldB,fieldCisReg,fieldC);
+      if (dbg) {
+	      printf ("5:b reg %d %d c reg %d %d  \n",
+		      fieldBisReg, fieldB, fieldCisReg, fieldC);
+      }
       state->_offset = 0;
       state->_ea_present = 1;
-      if (fieldBisReg) state->ea_reg1 = fieldB; else state->_offset += fieldB;
-      if (fieldCisReg) state->ea_reg2 = fieldC; else state->_offset += fieldC;
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+      } else {
+	      state->_offset += fieldB;
+      }
+      if (fieldCisReg) {
+	      state->ea_reg2 = fieldC;
+      } else {
+	      state->_offset += fieldC;
+      }
       state->_mem_load = 1;
 
       directMem     = BIT(state->words[0],15);
@@ -2671,23 +2749,22 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       write_instr_name();
 
       /* Check for prefetch or ld 0,...*/
-      if(IS_REG(A))
-	WRITE_FORMAT_x_COMMA_LB(A);
-      else
-	{
-	  strcat(formatString,"%*");
-	  WRITE_FORMAT_LB();
+      if (IS_REG (A)) {
+	      WRITE_FORMAT_x_COMMA_LB (A);
+      } else {
+	      strcat (formatString, "%*");
+	      WRITE_FORMAT_LB ();
 	}
 
+	if (fieldBisReg || fieldB != 0) {
+		WRITE_FORMAT_x (B);
+	} else {
+		fieldB = fieldC;
+	}
 
-      if (fieldBisReg || fieldB != 0)
-	WRITE_FORMAT_x(B);
-      else
-	fieldB = fieldC;
-
-      WRITE_FORMAT_COMMA_x_RB(C);
-      my_sprintf(state, state->operandBuffer, formatString, fieldA, fieldB, fieldC);
-      break;
+	WRITE_FORMAT_COMMA_x_RB (C);
+	my_sprintf (state, state->operandBuffer, formatString, fieldA, fieldB, fieldC);
+	break;
 
     case 6:
       /* LD instruction. */
@@ -2704,30 +2781,35 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       fieldC = FIELDD9(state->words[0]);
       fieldCisReg = 0;
 
-      if (dbg) eprintf("6:b reg %d %d c 0x%x  \n",
-				 fieldBisReg,fieldB,fieldC);
+      if (dbg) {
+	      eprintf ("6:b reg %d %d c 0x%x  \n",
+		      fieldBisReg, fieldB, fieldC);
+      }
       state->_ea_present = 1;
       state->_offset = fieldC;
       state->_mem_load = 1;
-      if (fieldBisReg) state->ea_reg1 = fieldB;
-      /* field B is either a shimm (same as fieldC) or limm (different!) */
-      /* Say ea is not present, so only one of us will do the name lookup. */
-      else state->_offset += fieldB, state->_ea_present = 0;
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+	      /* field B is either a shimm (same as fieldC) or limm (different!) */
+	      /* Say ea is not present, so only one of us will do the name lookup. */
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       directMem     = BIT(state->words[0],11);
       /* Check if address writeback is allowed before decoding the
 	 address writeback field of a load instruction.*/
-      if (fieldBisReg && (fieldB != 62))
-        addrWriteBack = BITS(state->words[0],9,10);
+      if (fieldBisReg && (fieldB != 62)) {
+	      addrWriteBack = BITS (state->words[0], 9, 10);
+      }
       signExtend    = BIT(state->words[0],6);
 
       write_instr_name();
-      if(IS_REG(A))
-	WRITE_FORMAT_x_COMMA_LB(A);
-      else
-	{
-	  strcat(formatString,"%*");
-	  WRITE_FORMAT_LB();
+      if (IS_REG (A)) {
+	      WRITE_FORMAT_x_COMMA_LB (A);
+      } else {
+	      strcat (formatString, "%*");
+	      WRITE_FORMAT_LB ();
 	}
       if (!fieldBisReg)
 	{
@@ -2752,18 +2834,22 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       fieldAisReg=0;
 
       /* [B,A offset] */
-      if (dbg) eprintf("7:b reg %d %x off %x\n",
-				 fieldBisReg,fieldB,fieldA);
+      if (dbg) {
+	      eprintf ("7:b reg %d %x off %x\n",
+		      fieldBisReg, fieldB, fieldA);
+      }
       state->_ea_present = 1;
       state->_offset = fieldA;
-      if (fieldBisReg) state->ea_reg1 = fieldB;
-      /*
+      if (fieldBisReg) {
+	      state->ea_reg1 = fieldB;
+	      /*
        * field B is either a shimm (same as fieldA) or limm (different!)
        * Say ea is not present, so only one of us will do the name lookup.
        * (for is_limm we do the name translation here).
        */
-      else
-	state->_offset += fieldB, state->_ea_present = 0;
+      } else {
+	      state->_offset += fieldB, state->_ea_present = 0;
+      }
 
       directMem     = BIT(state->words[0],5);
       addrWriteBack = BITS(state->words[0],3,4);
@@ -2792,9 +2878,10 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
           if (is_limm)
           {
        	    FIELD_C();
-      	    if (!fieldCisReg)
-	      fieldC = fieldB;
-      	  }
+	    if (!fieldCisReg) {
+		    fieldC = fieldB;
+	    }
+	  }
       	  else
 	  {
 	    CHECK_FIELD_C();
@@ -2962,27 +3049,26 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 	fieldA = fieldA << 1;
       }
 
-      if ((state->_opcode == op_BC  && (BIT(state->words[0],16))) ||
- 	  (state->_opcode == op_BLC && (BIT(state->words[0],17))))
-	/* unconditional branch s25 or branch and link d25 */
-        fieldA = sign_extend(fieldA, 25);
-      else
-	/* conditional branch s21 or branch and link d21 */
-        fieldA = sign_extend(fieldA, 21);
+      if ((state->_opcode == op_BC && (BIT (state->words[0], 16))) ||
+	      (state->_opcode == op_BLC && (BIT (state->words[0], 17)))) {
+	      /* unconditional branch s25 or branch and link d25 */
+	      fieldA = sign_extend (fieldA, 25);
+      } else {
+	      /* conditional branch s21 or branch and link d21 */
+	      fieldA = sign_extend (fieldA, 21);
+      }
 
       fieldA += (addr & ~0x3);
 
-      if (BIT(state->words[0],16) && state->_opcode == op_BC)
-        CHECK_NULLIFY();
-      else
-	/* Checking for bl unconditionally FIX For Bug #553 */
-	if((state->_opcode == op_BLC && BITS(state->words[0],16,17) == 2 )
-	   ||(state->_opcode == op_BC && (BIT(state->words[0],16))))
-	    CHECK_NULLIFY();
-	  else
-	    CHECK_COND_NULLIFY();
-
-
+      if (BIT (state->words[0], 16) && state->_opcode == op_BC) {
+	      CHECK_NULLIFY ();
+      } else
+	      /* Checking for bl unconditionally FIX For Bug #553 */
+	      if ((state->_opcode == op_BLC && BITS (state->words[0], 16, 17) == 2) || (state->_opcode == op_BC && (BIT (state->words[0], 16)))) {
+	      CHECK_NULLIFY ();
+      } else {
+	      CHECK_COND_NULLIFY ();
+      }
 
       write_instr_name();
       /* This address could be a label we know.  Convert it. */
@@ -3010,15 +3096,16 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
         fieldA = fieldAisReg = 0;
 	WRITE_FORMAT_x(A);
         WRITE_FORMAT_COMMA_x(B);
+      } else {
+	      WRITE_FORMAT_x (B);
       }
-      else
-        WRITE_FORMAT_x(B);
       WRITE_FORMAT_COMMA_x(C);
       WRITE_NOP_COMMENT();
-      if (mul)
-        my_sprintf(state, state->operandBuffer, formatString, 0, fieldB, fieldC);
-      else
-        my_sprintf(state, state->operandBuffer, formatString, fieldB, fieldC);
+      if (mul) {
+	      my_sprintf (state, state->operandBuffer, formatString, 0, fieldB, fieldC);
+      } else {
+	      my_sprintf (state, state->operandBuffer, formatString, fieldB, fieldC);
+      }
       break;
 
     case 15:
@@ -3114,12 +3201,11 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 
       /* Stack pointer-based instructions [major opcode 0x18] */
 
-      if (BITS(state->words[0],5,7) == 5)
-        fieldA = 28;
-      else
-      {
-        FIELD_B_AC();
-	fieldA = fieldB;
+      if (BITS (state->words[0], 5, 7) == 5) {
+	      fieldA = 28;
+      } else {
+	      FIELD_B_AC ();
+	      fieldA = fieldB;
       }
       fieldB = 28; /* Field B is the stack pointer register */
       fieldC = (FIELDU_AC(state->words[0])) << 2;
@@ -3188,10 +3274,11 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       /* add/cmp/btst instructions [major opcode 28] */
 
       FIELD_B_AC();
-      if (state->_opcode == op_Su5)
-        fieldC = (BITS(state->words[0],0,4));
-      else
-        fieldC = (BITS(state->words[0],0,6));
+      if (state->_opcode == op_Su5) {
+	      fieldC = (BITS (state->words[0], 0, 4));
+      } else {
+	      fieldC = (BITS (state->words[0], 0, 6));
+      }
       fieldCisReg = 0;
       write_instr_name();
 
@@ -3393,9 +3480,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       if (BITS(state->words[0],0,4) == 1)
       {
         FIELD_B_AC();
+      } else if (BITS (state->words[0], 0, 4) == 17) {
+	      fieldB = 31;
       }
-      else if (BITS(state->words[0],0,4) == 17)
-	fieldB = 31;
 
       write_instr_name();
 
@@ -3420,13 +3507,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
 
       write_instr_name();
 
-      if (!fieldC)
-        state->operandBuffer[0] = '\0';
-      else
-      {
-        WRITE_FORMAT_x(C);
-        WRITE_NOP_COMMENT();
-        my_sprintf(state, state->operandBuffer, formatString, fieldC);
+      if (!fieldC) {
+	      state->operandBuffer[0] = '\0';
+      } else {
+	      WRITE_FORMAT_x (C);
+	      WRITE_NOP_COMMENT ();
+	      my_sprintf (state, state->operandBuffer, formatString, fieldC);
       }
       break;
 
@@ -3459,11 +3545,12 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
     FIELD_B();
     directMem = BIT(state->words[0],15);
 
-
-    if (BITS(state->words[0],22,23) == 1 )
-      fieldCisReg = 0;
-    if (fieldCisReg)
-      state->ea_reg1 = fieldC;
+    if (BITS (state->words[0], 22, 23) == 1) {
+	    fieldCisReg = 0;
+    }
+    if (fieldCisReg) {
+	    state->ea_reg1 = fieldC;
+    }
 
     write_instr_name();
     WRITE_FORMAT_x_COMMA_LB(B);
@@ -3536,8 +3623,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
       {
 	FIELD_U8();
 
-	if (simd_scale_u8>0)
-	  fieldC = fieldC << simd_scale_u8;
+	if (simd_scale_u8 > 0) {
+		fieldC = fieldC << simd_scale_u8;
+	}
       }
 
     fieldCisReg = 0;
@@ -3604,8 +3692,9 @@ dsmOneArcInst (bfd_vma addr, struct arcDisState *state, disassemble_info * info)
      %C*/
     CHECK_FIELD_C();
 
-    if (BITS(state->words[0], 17, 23) == 55)
-      fieldCisReg = 0;
+    if (BITS (state->words[0], 17, 23) == 55) {
+	    fieldCisReg = 0;
+    }
 
     write_instr_name();
     WRITE_FORMAT_x(C);
@@ -3697,10 +3786,10 @@ parse_disassembler_options (char *options)
 	    }
 	  
 	  p = strchr (p, ',');
-	  
-	  if (p != NULL)
-		p++;
-	  
+
+	  if (p != NULL) {
+		  p++;
+	  }
     }
 	
 }
@@ -3747,10 +3836,11 @@ ARCompact_decodeInstr (bfd_vma           address,    /* Address of this instruct
     s.instructionLen = 2;
     s.words[0] = (buffer[lowbyte] << 8) | buffer[highbyte];
     status = (*info->read_memory_func) (address + 2, buffer, 4, info);
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[1] = bfd_getl32(buffer);
-    else
-      s.words[1] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[1] = bfd_getl32 (buffer);
+    } else {
+	    s.words[1] = bfd_getb32 (buffer);
+    }
   }
   else
   {
@@ -3761,18 +3851,20 @@ ARCompact_decodeInstr (bfd_vma           address,    /* Address of this instruct
       (*info->memory_error_func) (status, address + 2, info);
       return -1;
     }
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[0] = bfd_getl32(buffer);
-    else
-      s.words[0] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[0] = bfd_getl32 (buffer);
+    } else {
+	    s.words[0] = bfd_getb32 (buffer);
+    }
 
     /* always read second word in case of limm */
     /* we ignore the result since last insn may not have a limm */
     status = (*info->read_memory_func) (address + 4, buffer, 4, info);
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[1] = bfd_getl32(buffer);
-    else
-      s.words[1] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[1] = bfd_getl32 (buffer);
+    } else {
+	    s.words[1] = bfd_getb32 (buffer);
+    }
   }
 
   s._this = &s;
@@ -3794,12 +3886,13 @@ ARCompact_decodeInstr (bfd_vma           address,    /* Address of this instruct
       {
         /* Show instruction stream from MSB to LSB*/
 
-        if (s.instructionLen == 2)
-          (*func) (stream, "    %04x ", (unsigned int) s.words[0]);
-        else
-          (*func) (stream, "%08x ",     (unsigned int) s.words[0]);
+	if (s.instructionLen == 2) {
+		(*func) (stream, "    %04x ", (unsigned int)s.words[0]);
+	} else {
+		(*func) (stream, "%08x ", (unsigned int)s.words[0]);
+	}
 
-        (*func) (stream, "    ");
+	(*func) (stream, "    ");
       }
 
     /* if the operand is actually in the instruction buffer */
@@ -3830,9 +3923,9 @@ ARCompact_decodeInstr (bfd_vma           address,    /* Address of this instruct
         addr = s.addresses[operand[i] - '0'];
         (*info->print_address_func) ((bfd_vma) addr, info);
         //(*func) (stream, "\n");
-      }
-    else
-      (*func) (stream, "%s", operand);
+    } else {
+	    (*func) (stream, "%s", operand);
+    }
   }
 
   /* We print max bytes for instruction */
@@ -3880,10 +3973,11 @@ arcAnalyzeInstr
     s.instructionLen = 2;
     s.words[0] = (buffer[lowbyte] << 8) | buffer[highbyte];
     status = (*info->read_memory_func) (address + 2, buffer, 4, info);
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[1] = bfd_getl32(buffer);
-    else
-      s.words[1] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[1] = bfd_getl32 (buffer);
+    } else {
+	    s.words[1] = bfd_getb32 (buffer);
+    }
   }
   else
   {
@@ -3895,18 +3989,20 @@ arcAnalyzeInstr
       s.instructionLen = -1;
       return s;
     }
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[0] = bfd_getl32(buffer);
-    else
-      s.words[0] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[0] = bfd_getl32 (buffer);
+    } else {
+	    s.words[0] = bfd_getb32 (buffer);
+    }
 
     /* always read second word in case of limm */
     /* we ignore the result since last insn may not have a limm */
     status = (*info->read_memory_func) (address + 4, buffer, 4, info);
-    if (info->endian == BFD_ENDIAN_LITTLE)
-      s.words[1] = bfd_getl32(buffer);
-    else
-      s.words[1] = bfd_getb32(buffer);
+    if (info->endian == BFD_ENDIAN_LITTLE) {
+	    s.words[1] = bfd_getl32 (buffer);
+    } else {
+	    s.words[1] = bfd_getb32 (buffer);
+    }
   }
 
   s._this = &s;
diff --git a/libr/asm/arch/arm/aarch64/aarch64-dis.c b/libr/asm/arch/arm/aarch64/aarch64-dis.c
index b678e81acb..72b2d4c510 100644
--- a/libr/asm/arch/arm/aarch64/aarch64-dis.c
+++ b/libr/asm/arch/arm/aarch64/aarch64-dis.c
@@ -87,8 +87,9 @@ parse_aarch64_dis_options (const char *options)
 {
   const char *option_end;
 
-  if (!options)
-    return;
+  if (!options) {
+	  return;
+  }
 
   while (*options != '\0')
     {
@@ -101,8 +102,9 @@ parse_aarch64_dis_options (const char *options)
 
       /* We know that *options is neither NUL or a comma.  */
       option_end = options + 1;
-      while (*option_end != ',' && *option_end != '\0')
-	option_end++;
+      while (*option_end != ',' && *option_end != '\0') {
+	      option_end++;
+      }
 
       parse_aarch64_dis_option (options, option_end - options);
 
@@ -212,10 +214,11 @@ get_expected_qualifier (const aarch64_inst *inst, int i)
   /* Should not be called if the qualifier is known.  */
   assert (inst->operands[i].qualifier == AARCH64_OPND_QLF_NIL);
   if (aarch64_find_best_match (inst, inst->opcode->qualifiers_list,
-			       i, qualifiers))
-    return qualifiers[i];
-  else
-    return AARCH64_OPND_QLF_NIL;
+	      i, qualifiers)) {
+	  return qualifiers[i];
+  } else {
+	  return AARCH64_OPND_QLF_NIL;
+  }
 }
 
 /* Operand extractors.  */
@@ -284,10 +287,12 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info,
 	     1000	D  */
 	  int pos = -1;
 	  aarch64_insn value = extract_field (FLD_imm5, code, 0);
-	  while (++pos <= 3 && (value & 0x1) == 0)
-	    value >>= 1;
-	  if (pos > 3)
-	    return 0;
+	  while (++pos <= 3 && (value & 0x1) == 0) {
+		  value >>= 1;
+	  }
+	  if (pos > 3) {
+		  return 0;
+	  }
 	  info->qualifier = get_sreg_qualifier_from_value (pos);
 	  info->reglane.index = (unsigned) (value >> 1);
 	}
@@ -368,8 +373,9 @@ aarch64_ext_ldst_reglist (const aarch64_operand *self ATTRIBUTE_UNUSED,
   info->reglist.first_regno = extract_field (FLD_Rt, code, 0);
   /* opcode */
   value = extract_field (FLD_opcode, code, 0);
-  if (expected_num != data[value].num_elements || data[value].is_reserved)
-    return 0;
+  if (expected_num != data[value].num_elements || data[value].is_reserved) {
+	  return 0;
+  }
   info->reglist.num_regs = data[value].num_regs;
 
   return 1;
@@ -395,8 +401,9 @@ aarch64_ext_ldst_reglist_r (const aarch64_operand *self ATTRIBUTE_UNUSED,
   assert (info->reglist.num_regs >= 1 && info->reglist.num_regs <= 4);
 
   /* Except when it is LD1R.  */
-  if (info->reglist.num_regs == 1 && value == (aarch64_insn) 1)
-    info->reglist.num_regs = 2;
+  if (info->reglist.num_regs == 1 && value == (aarch64_insn)1) {
+	  info->reglist.num_regs = 2;
+  }
 
   return 1;
 }
@@ -443,9 +450,10 @@ aarch64_ext_ldst_elemlist (const aarch64_operand *self ATTRIBUTE_UNUSED,
 	  info->qualifier = AARCH64_OPND_QLF_S_D;
 	  /* Index encoded in "Q".  */
 	  info->reglist.index = QSsize >> 3;
-	  if (extract_field (FLD_S, code, 0))
-	    /* UND */
-	    return 0;
+	  if (extract_field (FLD_S, code, 0)) {
+		  /* UND */
+		  return 0;
+	  }
 	}
       break;
     default:
@@ -476,13 +484,15 @@ aarch64_ext_advsimd_imm_shift (const aarch64_operand *self ATTRIBUTE_UNUSED,
   enum aarch64_insn_class iclass = inst->opcode->iclass;
 
   immh = extract_field (FLD_immh, code, 0);
-  if (immh == 0)
-    return 0;
+  if (immh == 0) {
+	  return 0;
+  }
   imm = extract_fields (code, 0, 2, FLD_immh, FLD_immb);
   pos = 4;
   /* Get highest set bit in immh.  */
-  while (--pos >= 0 && (immh & 0x8) == 0)
-    immh <<= 1;
+  while (--pos >= 0 && (immh & 0x8) == 0) {
+	  immh <<= 1;
+  }
 
   assert ((iclass == asimdshf || iclass == asisdshf)
 	  && (info->type == AARCH64_OPND_IMM_VLSR
@@ -503,27 +513,28 @@ aarch64_ext_advsimd_imm_shift (const aarch64_operand *self ATTRIBUTE_UNUSED,
 	 1xxx	1	2D  */
       info->qualifier =
 	get_vreg_qualifier_from_value ((pos << 1) | (int) Q);
-    }
-  else
-    info->qualifier = get_sreg_qualifier_from_value (pos);
+  } else {
+	  info->qualifier = get_sreg_qualifier_from_value (pos);
+  }
 
-  if (info->type == AARCH64_OPND_IMM_VLSR)
-    /* immh	<shift>
+  if (info->type == AARCH64_OPND_IMM_VLSR) {
+	  /* immh	<shift>
        0000	SEE AdvSIMD modified immediate
        0001	(16-UInt(immh:immb))
        001x	(32-UInt(immh:immb))
        01xx	(64-UInt(immh:immb))
        1xxx	(128-UInt(immh:immb))  */
-    info->imm.value = (16 << pos) - imm;
-  else
-    /* immh:immb
+	  info->imm.value = (16 << pos) - imm;
+  } else {
+	  /* immh:immb
        immh	<shift>
        0000	SEE AdvSIMD modified immediate
        0001	(UInt(immh:immb)-8)
        001x	(UInt(immh:immb)-16)
        01xx	(UInt(immh:immb)-32)
        1xxx	(UInt(immh:immb)-64)  */
-    info->imm.value = imm - (8 << pos);
+	  info->imm.value = imm - (8 << pos);
+  }
 
   return 1;
 }
@@ -559,23 +570,28 @@ aarch64_ext_imm (const aarch64_operand *self, aarch64_opnd_info *info,
   /* Maximum of two fields to extract.  */
   assert (self->fields[2] == FLD_NIL);
 
-  if (self->fields[1] == FLD_NIL)
-    imm = extract_field (self->fields[0], code, 0);
-  else
-    /* e.g. TBZ b5:b40.  */
-    imm = extract_fields (code, 0, 2, self->fields[0], self->fields[1]);
+  if (self->fields[1] == FLD_NIL) {
+	  imm = extract_field (self->fields[0], code, 0);
+  } else {
+	  /* e.g. TBZ b5:b40.  */
+	  imm = extract_fields (code, 0, 2, self->fields[0], self->fields[1]);
+  }
 
-  if (info->type == AARCH64_OPND_FPIMM)
-    info->imm.is_fp = 1;
+  if (info->type == AARCH64_OPND_FPIMM) {
+	  info->imm.is_fp = 1;
+  }
 
-  if (operand_need_sign_extension (self))
-    imm = sign_extend (imm, get_operand_fields_width (self) - 1);
+  if (operand_need_sign_extension (self)) {
+	  imm = sign_extend (imm, get_operand_fields_width (self) - 1);
+  }
 
-  if (operand_need_shift_by_two (self))
-    imm <<= 2;
+  if (operand_need_shift_by_two (self)) {
+	  imm <<= 2;
+  }
 
-  if (info->type == AARCH64_OPND_ADDR_ADRP)
-    imm <<= 12;
+  if (info->type == AARCH64_OPND_ADDR_ADRP) {
+	  imm <<= 12;
+  }
 
   info->imm.value = imm;
   return 1;
@@ -607,8 +623,9 @@ aarch64_ext_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED,
 
   assert (info->idx == 1);
 
-  if (info->type == AARCH64_OPND_SIMD_FPIMM)
-    info->imm.is_fp = 1;
+  if (info->type == AARCH64_OPND_SIMD_FPIMM) {
+	  info->imm.is_fp = 1;
+  }
 
   /* a:b:c:d:e:f:g:h */
   imm = extract_fields (code, 0, 2, FLD_abc, FLD_defgh);
@@ -621,9 +638,11 @@ aarch64_ext_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED,
 	 encoded in "a:b:c:d:e:f:g:h".	*/
       int i;
       unsigned abcdefgh = imm;
-      for (imm = 0ull, i = 0; i < 8; i++)
-	if (((abcdefgh >> i) & 0x1) != 0)
-	  imm |= 0xffull << (8 * i);
+      for (imm = 0ull, i = 0; i < 8; i++) {
+	      if (((abcdefgh >> i) & 0x1) != 0) {
+		      imm |= 0xffull << (8 * i);
+	      }
+      }
     }
   info->imm.value = imm;
 
@@ -684,8 +703,9 @@ aarch64_ext_aimm (const aarch64_operand *self ATTRIBUTE_UNUSED,
   info->shifter.kind = AARCH64_MOD_LSL;
   /* shift */
   value = extract_field (FLD_shift, code, 0);
-  if (value >= 2)
-    return 0;
+  if (value >= 2) {
+	  return 0;
+  }
   info->shifter.amount = value ? 12 : 0;
   /* imm12 (unsigned) */
   info->imm.value = extract_field (FLD_imm12, code, 0);
@@ -716,8 +736,9 @@ aarch64_ext_limm (const aarch64_operand *self ATTRIBUTE_UNUSED,
   R = (value >> 6) & 0x3f;
   N = (value >> 12) & 0x1;
 
-  if (sf == 0 && N == 1)
-    return 0;
+  if (sf == 0 && N == 1) {
+	  return 0;
+  }
 
   /* The immediate value is S+1 bits to 1, left rotated by SIMDsize - R
      (in other words, right rotated by R), then replicated.  */
@@ -739,17 +760,18 @@ aarch64_ext_limm (const aarch64_operand *self ATTRIBUTE_UNUSED,
       R &= simd_size - 1;
     }
   /* NOTE: if S = simd_size - 1 we get 0xf..f which is rejected.  */
-  if (S == simd_size - 1)
-    return 0;
-  /* S+1 consecutive bits to 1.  */
-  /* NOTE: S can't be 63 due to detection above.  */
-  imm = (1ull << (S + 1)) - 1;
-  /* Rotate to the left by simd_size - R.  */
-  if (R != 0)
-    imm = ((imm << (simd_size - R)) & mask) | (imm >> R);
-  /* Replicate the value according to SIMD size.  */
-  switch (simd_size)
-    {
+    if (S == simd_size - 1) {
+	    return 0;
+    }
+    /* S+1 consecutive bits to 1.  */
+    /* NOTE: S can't be 63 due to detection above.  */
+    imm = (1ull << (S + 1)) - 1;
+    /* Rotate to the left by simd_size - R.  */
+    if (R != 0) {
+	    imm = ((imm << (simd_size - R)) & mask) | (imm >> R);
+    }
+    /* Replicate the value according to SIMD size.  */
+    switch (simd_size) {
     case  2: imm = (imm <<  2) | imm;
     case  4: imm = (imm <<  4) | imm;
     case  8: imm = (imm <<  8) | imm;
@@ -797,8 +819,9 @@ aarch64_ext_ft (const aarch64_operand *self ATTRIBUTE_UNUSED,
     {
       /* opc1:size */
       value = extract_fields (code, 0, 2, FLD_opc1, FLD_ldst_size);
-      if (value > 0x4)
-	return 0;
+      if (value > 0x4) {
+	      return 0;
+      }
       info->qualifier = get_sreg_qualifier_from_value (value);
     }
 
@@ -836,8 +859,9 @@ aarch64_ext_addr_regoff (const aarch64_operand *self ATTRIBUTE_UNUSED,
     aarch64_get_operand_modifier_from_value (value, TRUE /* extend_p */);
   /* Fix-up the shifter kind; although the table-driven approach is
      efficient, it is slightly inflexible, thus needing this fix-up.  */
-  if (info->shifter.kind == AARCH64_MOD_UXTX)
-    info->shifter.kind = AARCH64_MOD_LSL;
+  if (info->shifter.kind == AARCH64_MOD_UXTX) {
+	  info->shifter.kind = AARCH64_MOD_LSL;
+  }
   /* S */
   S = extract_field (FLD_S, code, 0);
   if (S == 0)
@@ -874,23 +898,21 @@ aarch64_ext_addr_simm (const aarch64_operand *self, aarch64_opnd_info *info,
   /* simm (imm9 or imm7)  */
   imm = extract_field (self->fields[0], code, 0);
   info->addr.offset.imm = sign_extend (imm, aarch64_fields[self->fields[0]].width - 1);
-  if (self->fields[0] == FLD_imm7)
-    /* scaled immediate in ld/st pair instructions.  */
-    info->addr.offset.imm *= aarch64_get_qualifier_esize (info->qualifier);
+  if (self->fields[0] == FLD_imm7) {
+	  /* scaled immediate in ld/st pair instructions.  */
+	  info->addr.offset.imm *= aarch64_get_qualifier_esize (info->qualifier);
+  }
   /* qualifier */
-  if (inst->opcode->iclass == ldst_unscaled
-      || inst->opcode->iclass == ldstnapair_offs
-      || inst->opcode->iclass == ldstpair_off
-      || inst->opcode->iclass == ldst_unpriv)
-    info->addr.writeback = 0;
-  else
-    {
-      /* pre/post- index */
-      info->addr.writeback = 1;
-      if (extract_field (self->fields[1], code, 0) == 1)
-	info->addr.preind = 1;
-      else
-	info->addr.postind = 1;
+  if (inst->opcode->iclass == ldst_unscaled || inst->opcode->iclass == ldstnapair_offs || inst->opcode->iclass == ldstpair_off || inst->opcode->iclass == ldst_unpriv) {
+	  info->addr.writeback = 0;
+  } else {
+	  /* pre/post- index */
+	  info->addr.writeback = 1;
+	  if (extract_field (self->fields[1], code, 0) == 1) {
+		  info->addr.preind = 1;
+	  } else {
+		  info->addr.postind = 1;
+	  }
     }
 
   return 1;
@@ -929,18 +951,17 @@ aarch64_ext_simd_addr_post (const aarch64_operand *self ATTRIBUTE_UNUSED,
   info->addr.offset.regno = extract_field (FLD_Rm, code, 0);
   if (info->addr.offset.regno == 31)
     {
-      if (inst->opcode->operands[0] == AARCH64_OPND_LVt_AL)
-	/* Special handling of loading single structure to all lane.  */
-	info->addr.offset.imm = (is_ld1r ? 1
-				 : inst->operands[0].reglist.num_regs)
-	  * aarch64_get_qualifier_esize (inst->operands[0].qualifier);
-      else
-	info->addr.offset.imm = inst->operands[0].reglist.num_regs
-	  * aarch64_get_qualifier_esize (inst->operands[0].qualifier)
-	  * aarch64_get_qualifier_nelem (inst->operands[0].qualifier);
-    }
-  else
-    info->addr.offset.is_reg = 1;
+	  if (inst->opcode->operands[0] == AARCH64_OPND_LVt_AL) {
+		  /* Special handling of loading single structure to all lane.  */
+		  info->addr.offset.imm = (is_ld1r ? 1
+						   : inst->operands[0].reglist.num_regs) *
+					  aarch64_get_qualifier_esize (inst->operands[0].qualifier);
+	  } else {
+		  info->addr.offset.imm = inst->operands[0].reglist.num_regs * aarch64_get_qualifier_esize (inst->operands[0].qualifier) * aarch64_get_qualifier_nelem (inst->operands[0].qualifier);
+	  }
+  } else {
+	  info->addr.offset.is_reg = 1;
+  }
   info->addr.writeback = 1;
 
   return 1;
@@ -981,9 +1002,11 @@ aarch64_ext_pstatefield (const aarch64_operand *self ATTRIBUTE_UNUSED,
   int i;
   /* op1:op2 */
   info->pstatefield = extract_fields (code, 0, 2, FLD_op1, FLD_op2);
-  for (i = 0; aarch64_pstatefields[i].name != NULL; ++i)
-    if (aarch64_pstatefields[i].value == (aarch64_insn)info->pstatefield)
-      return 1;
+  for (i = 0; aarch64_pstatefields[i].name != NULL; ++i) {
+	  if (aarch64_pstatefields[i].value == (aarch64_insn)info->pstatefield) {
+		  return 1;
+	  }
+  }
   /* Reserved value in <pstatefield>.  */
   return 0;
 }
@@ -1012,18 +1035,18 @@ aarch64_ext_sysins_op (const aarch64_operand *self ATTRIBUTE_UNUSED,
     default: assert (0); return 0;
     }
 
-  for (i = 0; sysins_ops[i].template != NULL; ++i)
-    if (sysins_ops[i].value == value)
-      {
-	info->sysins_op = sysins_ops + i;
-	DEBUG_TRACE ("%s found value: %x, has_xt: %d, i: %d.",
-		     info->sysins_op->template,
-		     (unsigned)info->sysins_op->value,
-		     info->sysins_op->has_xt, i);
-	return 1;
-      }
+    for (i = 0; sysins_ops[i].template != NULL; ++i) {
+	    if (sysins_ops[i].value == value) {
+		    info->sysins_op = sysins_ops + i;
+		    DEBUG_TRACE ("%s found value: %x, has_xt: %d, i: %d.",
+			    info->sysins_op->template,
+			    (unsigned)info->sysins_op->value,
+			    info->sysins_op->has_xt, i);
+		    return 1;
+	    }
+    }
 
-  return 0;
+    return 0;
 }
 
 /* Decode the memory barrier option operand for e.g. DMB <option>|#<imm>.  */
@@ -1077,10 +1100,9 @@ aarch64_ext_reg_extended (const aarch64_operand *self ATTRIBUTE_UNUSED,
   /* Assume inst->operands[0].qualifier has been resolved.  */
   assert (inst->operands[0].qualifier != AARCH64_OPND_QLF_NIL);
   info->qualifier = AARCH64_OPND_QLF_W;
-  if (inst->operands[0].qualifier == AARCH64_OPND_QLF_X
-      && (info->shifter.kind == AARCH64_MOD_UXTX
-	  || info->shifter.kind == AARCH64_MOD_SXTX))
-    info->qualifier = AARCH64_OPND_QLF_X;
+  if (inst->operands[0].qualifier == AARCH64_OPND_QLF_X && (info->shifter.kind == AARCH64_MOD_UXTX || info->shifter.kind == AARCH64_MOD_SXTX)) {
+	  info->qualifier = AARCH64_OPND_QLF_X;
+  }
 
   return 1;
 }
@@ -1101,11 +1123,11 @@ aarch64_ext_reg_shifted (const aarch64_operand *self ATTRIBUTE_UNUSED,
   value = extract_field (FLD_shift, code, 0);
   info->shifter.kind =
     aarch64_get_operand_modifier_from_value (value, FALSE /* extend_p */);
-  if (info->shifter.kind == AARCH64_MOD_ROR
-      && inst->opcode->iclass != log_shift)
-    /* ROR is not available for the shifted register operand in arithmetic
+  if (info->shifter.kind == AARCH64_MOD_ROR && inst->opcode->iclass != log_shift) {
+	  /* ROR is not available for the shifted register operand in arithmetic
        instructions.  */
-    return 0;
+	  return 0;
+  }
   /* imm6 */
   info->shifter.amount = extract_field (FLD_imm6, code,  0);
 
@@ -1146,11 +1168,13 @@ get_qualifier_from_partial_encoding (aarch64_insn value,
   for (i = 0; i < AARCH64_MAX_QLF_SEQ_NUM; ++i)
     {
       aarch64_insn standard_value;
-      if (candidates[i] == AARCH64_OPND_QLF_NIL)
-	break;
+      if (candidates[i] == AARCH64_OPND_QLF_NIL) {
+	      break;
+      }
       standard_value = aarch64_get_qualifier_standard_value (candidates[i]);
-      if ((standard_value & mask) == (value & mask))
-	return candidates[i];
+      if ((standard_value & mask) == (value & mask)) {
+	      return candidates[i];
+      }
     }
   return AARCH64_OPND_QLF_NIL;
 }
@@ -1165,9 +1189,11 @@ get_operand_possible_qualifiers (int idx,
 				 enum aarch64_opnd_qualifier *qualifiers)
 {
   int i;
-  for (i = 0; i < AARCH64_MAX_QLF_SEQ_NUM; ++i)
-    if ((qualifiers[i] = list[i][idx]) == AARCH64_OPND_QLF_NIL)
-      break;
+  for (i = 0; i < AARCH64_MAX_QLF_SEQ_NUM; ++i) {
+	  if ((qualifiers[i] = list[i][idx]) == AARCH64_OPND_QLF_NIL) {
+		  break;
+	  }
+  }
 }
 
 /* Decode the size Q field for e.g. SHADD.
@@ -1185,13 +1211,11 @@ decode_sizeq (aarch64_inst *inst)
   enum aarch64_field_kind fld_sz;
   enum aarch64_opnd_qualifier candidates[AARCH64_MAX_QLF_SEQ_NUM];
 
-  if (inst->opcode->iclass == asisdlse
-     || inst->opcode->iclass == asisdlsep
-     || inst->opcode->iclass == asisdlso
-     || inst->opcode->iclass == asisdlsop)
-    fld_sz = FLD_vldst_size;
-  else
-    fld_sz = FLD_size;
+  if (inst->opcode->iclass == asisdlse || inst->opcode->iclass == asisdlsep || inst->opcode->iclass == asisdlso || inst->opcode->iclass == asisdlsop) {
+	  fld_sz = FLD_vldst_size;
+  } else {
+	  fld_sz = FLD_size;
+  }
 
   code = inst->value;
   value = extract_fields (code, inst->opcode->mask, 2, fld_sz, FLD_Q);
@@ -1230,8 +1254,9 @@ decode_sizeq (aarch64_inst *inst)
 
   qualifier = get_qualifier_from_partial_encoding (value, candidates, mask);
 
-  if (qualifier == AARCH64_OPND_QLF_NIL)
-    return 0;
+  if (qualifier == AARCH64_OPND_QLF_NIL) {
+	  return 0;
+  }
 
   inst->operands[idx].qualifier = qualifier;
   return 1;
@@ -1279,8 +1304,9 @@ decode_asisd_fcvtxn (aarch64_inst *inst)
 {
   aarch64_field field = {0, 0};
   gen_sub_field (FLD_size, 0, 1, &field);
-  if (!extract_field_2 (&field, inst->value, 0))
-    return 0;
+  if (!extract_field_2 (&field, inst->value, 0)) {
+	  return 0;
+  }
   inst->operands[0].qualifier = AARCH64_OPND_QLF_S_S;
   return 1;
 }
@@ -1352,25 +1378,24 @@ do_special_decoding (aarch64_inst *inst)
       idx = select_operand_for_sf_field_coding (inst->opcode);
       value = extract_field (FLD_sf, inst->value, 0);
       inst->operands[idx].qualifier = get_greg_qualifier_from_value (value);
-      if ((inst->opcode->flags & F_N)
-	  && extract_field (FLD_N, inst->value, 0) != value)
-	return 0;
+      if ((inst->opcode->flags & F_N) && extract_field (FLD_N, inst->value, 0) != value) {
+	      return 0;
+      }
     }
   /* size:Q fields.  */
-  if (inst->opcode->flags & F_SIZEQ)
-    return decode_sizeq (inst);
+    if (inst->opcode->flags & F_SIZEQ) {
+	    return decode_sizeq (inst);
+    }
 
-  if (inst->opcode->flags & F_FPTYPE)
-    {
-      idx = select_operand_for_fptype_field_coding (inst->opcode);
-      value = extract_field (FLD_type, inst->value, 0);
-      switch (value)
-	{
-	case 0: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_S; break;
-	case 1: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_D; break;
-	case 3: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_H; break;
-	default: return 0;
-	}
+    if (inst->opcode->flags & F_FPTYPE) {
+	    idx = select_operand_for_fptype_field_coding (inst->opcode);
+	    value = extract_field (FLD_type, inst->value, 0);
+	    switch (value) {
+	    case 0: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_S; break;
+	    case 1: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_D; break;
+	    case 3: inst->operands[idx].qualifier = AARCH64_OPND_QLF_S_H; break;
+	    default: return 0;
+	    }
     }
 
   if (inst->opcode->flags & F_SSIZE)
@@ -1384,14 +1409,12 @@ do_special_decoding (aarch64_inst *inst)
       mask = extract_field (FLD_size, ~inst->opcode->mask, 0);
       /* For most related instruciton, the 'size' field is fully available for
 	 operand encoding.  */
-      if (mask == 0x3)
-	inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value);
-      else
-	{
-	  get_operand_possible_qualifiers (idx, inst->opcode->qualifiers_list,
-					   candidates);
-	  inst->operands[idx].qualifier
-	    = get_qualifier_from_partial_encoding (value, candidates, mask);
+      if (mask == 0x3) {
+	      inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value);
+      } else {
+	      get_operand_possible_qualifiers (idx, inst->opcode->qualifiers_list,
+		      candidates);
+	      inst->operands[idx].qualifier = get_qualifier_from_partial_encoding (value, candidates, mask);
 	}
     }
 
@@ -1413,10 +1436,12 @@ do_special_decoding (aarch64_inst *inst)
 	 1000		0	reserved
 	 1000		1	2d  */
       val = extract_field (FLD_imm5, inst->value, 0);
-      while ((val & 0x1) == 0 && ++num <= 3)
-	val >>= 1;
-      if (num > 3)
-	return 0;
+      while ((val & 0x1) == 0 && ++num <= 3) {
+	      val >>= 1;
+      }
+      if (num > 3) {
+	      return 0;
+      }
       Q = (unsigned) extract_field (FLD_Q, inst->value, inst->opcode->mask);
       inst->operands[0].qualifier =
 	get_vreg_qualifier_from_value ((num << 1) | Q);
@@ -1452,10 +1477,11 @@ do_special_decoding (aarch64_inst *inst)
     }
 
   /* Miscellaneous decoding; done as the last step.  */
-  if (inst->opcode->flags & F_MISC)
-    return do_misc_decoding (inst);
+    if (inst->opcode->flags & F_MISC) {
+	    return do_misc_decoding (inst);
+    }
 
-  return 1;
+    return 1;
 }
 
 /* Converters converting a real opcode instruction to its alias form.  */
@@ -1652,8 +1678,9 @@ convert_movewide_to_mov (aarch64_inst *inst)
 {
   uint64_t value = inst->operands[1].imm.value;
   /* MOVZ/MOVN #0 have a shift amount other than LSL #0.  */
-  if (value == 0 && inst->operands[1].shifter.amount != 0)
-    return 0;
+  if (value == 0 && inst->operands[1].shifter.amount != 0) {
+	  return 0;
+  }
   inst->operands[1].type = AARCH64_OPND_IMM_MOV;
   inst->operands[1].shifter.kind = AARCH64_MOD_NONE;
   value <<= inst->operands[1].shifter.amount;
@@ -1664,8 +1691,9 @@ convert_movewide_to_mov (aarch64_inst *inst)
       int is32 = inst->operands[0].qualifier == AARCH64_OPND_QLF_W;
       value = ~value;
       /* A MOVN has an immediate that could be encoded by MOVZ.  */
-      if (aarch64_wide_constant_p (value, is32, NULL) == TRUE)
-	return 0;
+      if (aarch64_wide_constant_p (value, is32, NULL) == TRUE) {
+	      return 0;
+      }
     }
   inst->operands[1].imm.value = value;
   inst->operands[1].shifter.amount = 0;
@@ -1696,10 +1724,9 @@ convert_movebitmask_to_mov (aarch64_inst *inst)
   value = inst->operands[1].imm.value;
   /* ORR has an immediate that could be generated by a MOVZ or MOVN
      instruction.  */
-  if (inst->operands[0].reg.regno != 0x1f
-      && (aarch64_wide_constant_p (value, is32, NULL) == TRUE
-	  || aarch64_wide_constant_p (~value, is32, NULL) == TRUE))
-    return 0;
+  if (inst->operands[0].reg.regno != 0x1f && (aarch64_wide_constant_p (value, is32, NULL) == TRUE || aarch64_wide_constant_p (~value, is32, NULL) == TRUE)) {
+	  return 0;
+  }
 
   inst->operands[2].type = AARCH64_OPND_NIL;
   return 1;
@@ -1817,8 +1844,9 @@ determine_disassembling_preference (struct aarch64_inst *inst)
   opcode = inst->opcode;
 
   /* This opcode does not have an alias, so use itself.  */
-  if (opcode_has_alias (opcode) == FALSE)
-    return;
+  if (opcode_has_alias (opcode) == FALSE) {
+	  return;
+  }
 
   alias = aarch64_find_alias_opcode (opcode);
   assert (alias);
@@ -1928,10 +1956,11 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code,
   /* Assign operand codes and indexes.  */
   for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i)
     {
-      if (opcode->operands[i] == AARCH64_OPND_NIL)
-	break;
-      inst->operands[i].type = opcode->operands[i];
-      inst->operands[i].idx = i;
+	  if (opcode->operands[i] == AARCH64_OPND_NIL) {
+		  break;
+	  }
+	  inst->operands[i].type = opcode->operands[i];
+	  inst->operands[i].idx = i;
     }
 
   /* Call the opcode decoder indicated by flags.  */
@@ -1947,8 +1976,9 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code,
       const aarch64_operand *opnd;
       enum aarch64_opnd type;
       type = opcode->operands[i];
-      if (type == AARCH64_OPND_NIL)
-	break;
+      if (type == AARCH64_OPND_NIL) {
+	      break;
+      }
       opnd = &aarch64_operands[type];
       if (operand_has_extractor (opnd)
 	  && (! aarch64_extract_operand (opnd, &inst->operands[i], code, inst)))
@@ -1966,8 +1996,9 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code,
 	 instruction.  Before the return, check if the instruction has any
 	 alias and should be disassembled in the form of its alias instead.
 	 If the answer is yes, *INST will be updated.  */
-      if (!noaliases_p)
-	determine_disassembling_preference (inst);
+      if (!noaliases_p) {
+	      determine_disassembling_preference (inst);
+      }
       DEBUG_TRACE ("SUCCESS");
       return 1;
     }
@@ -1996,8 +2027,9 @@ user_friendly_fixup (aarch64_inst *inst)
 	 the register, which may be written and should be disassembled as Wn if
 	 uimm is less than 32. Limited to a branch offset range of +/- 32KiB.
 	 */
-      if (inst->operands[1].imm.value < 32)
-	inst->operands[0].qualifier = AARCH64_OPND_QLF_W;
+      if (inst->operands[1].imm.value < 32) {
+	      inst->operands[0].qualifier = AARCH64_OPND_QLF_W;
+      }
       break;
     default: break;
     }
@@ -2034,8 +2066,9 @@ disas_aarch64_insn (uint64_t pc ATTRIBUTE_UNUSED, uint32_t insn,
     {
       /* But only one opcode can be decoded successfully for, as the
 	 decoding routine will check the constraint carefully.  */
-      if (aarch64_opcode_decode (opcode, insn, inst, no_aliases) == 1)
-	return ERR_OK;
+      if (aarch64_opcode_decode (opcode, insn, inst, no_aliases) == 1) {
+	      return ERR_OK;
+      }
       opcode = aarch64_find_next_opcode (opcode);
     }
 
@@ -2057,24 +2090,26 @@ print_operands (bfd_vma pc, const aarch64_opcode *opcode,
 	 operand.
 	 The two operand code should be the same in all cases, apart from
 	 when the operand can be optional.  */
-      if (opcode->operands[i] == AARCH64_OPND_NIL
-	  || opnds[i].type == AARCH64_OPND_NIL)
-	break;
+      if (opcode->operands[i] == AARCH64_OPND_NIL || opnds[i].type == AARCH64_OPND_NIL) {
+	      break;
+      }
 
       /* Generate the operand string in STR.  */
       aarch64_print_operand (str, SIZE, pc, opcode, opnds, i, &pcrel_p,
 			     &info->target);
 
       /* Print the delimiter (taking account of omitted operand(s)).  */
-      if (str[0] != '\0')
-	(*info->fprintf_func) (info->stream, "%s",
-			       num_printed++ == 0 ? " " : ", ");
+      if (str[0] != '\0') {
+	      (*info->fprintf_func) (info->stream, "%s",
+		      num_printed++ == 0 ? " " : ", ");
+      }
 
       /* Print the operand.  */
-      if (pcrel_p)
-	(*info->print_address_func) (info->target, info);
-      else
-	(*info->fprintf_func) (info->stream, "%s", str);
+      if (pcrel_p) {
+	      (*info->print_address_func) (info->target, info);
+      } else {
+	      (*info->fprintf_func) (info->stream, "%s", str);
+      }
     }
 }
 
@@ -2098,9 +2133,9 @@ print_mnemonic_name (const aarch64_inst *inst, struct disassemble_info *info)
       strncpy (name, inst->opcode->name, len);
       name [len] = '\0';
       (*info->fprintf_func) (info->stream, "%s.%s", name, inst->cond->names[0]);
-    }
-  else
-    (*info->fprintf_func) (info->stream, "%s", inst->opcode->name);
+  } else {
+	  (*info->fprintf_func) (info->stream, "%s", inst->opcode->name);
+  }
 }
 
 /* Print the instruction according to *INST.  */
@@ -2139,13 +2174,14 @@ print_insn_aarch64_word (bfd_vma pc,
   info->target = 0;
   info->target2 = 0;
 
-  if (info->flags & INSN_HAS_RELOC)
-    /* If the instruction has a reloc associated with it, then
+  if (info->flags & INSN_HAS_RELOC) {
+	  /* If the instruction has a reloc associated with it, then
        the offset field in the instruction will actually be the
        addend for the reloc.  (If we are using REL type relocs).
        In such cases, we can ignore the pc when computing
        addresses, since the addend is not currently pc-relative.  */
-    pc = 0;
+	  pc = 0;
+  }
 
   ret = disas_aarch64_insn (pc, word, &inst);
 
@@ -2185,8 +2221,9 @@ aarch64_symbol_is_valid (asymbol * sym,
 {
   const char * name;
 
-  if (!sym)
-    return FALSE;
+  if (!sym) {
+	  return FALSE;
+  }
 
   name = bfd_asymbol_name (sym);
 
@@ -2292,21 +2329,24 @@ print_insn_aarch64 (bfd_vma pc,
       bfd_vma addr;
       int n;
 
-      if (pc <= last_mapping_addr)
-	last_mapping_sym = -1;
+      if (pc <= last_mapping_addr) {
+	      last_mapping_sym = -1;
+      }
 
       /* Start scanning at the start of the function, or wherever
 	 we finished last time.  */
       n = info->symtab_pos + 1;
-      if (n < last_mapping_sym)
-	n = last_mapping_sym;
+      if (n < last_mapping_sym) {
+	      n = last_mapping_sym;
+      }
 
       /* Scan up to the location being disassembled.  */
       for (; n < info->symtab_size; n++)
 	{
 	  addr = bfd_asymbol_value (info->symtab[n]);
-	  if (addr > pc)
-	    break;
+	  if (addr > pc) {
+		  break;
+	  }
 	  if ((!info->section
 	       || info->section == info->symtab[n]->section)
 	      && get_sym_code_type (info, n, &type))
@@ -2319,8 +2359,9 @@ print_insn_aarch64 (bfd_vma pc,
       if (!found)
 	{
 	  n = info->symtab_pos;
-	  if (n < last_mapping_sym)
-	    n = last_mapping_sym;
+	  if (n < last_mapping_sym) {
+		  n = last_mapping_sym;
+	  }
 
 	  /* No mapping symbol found at this address.  Look backwards
 	     for a preceding one.  */
@@ -2350,16 +2391,18 @@ print_insn_aarch64 (bfd_vma pc,
 	      addr = bfd_asymbol_value (info->symtab[n]);
 	      if (addr > pc)
 		{
-		  if (addr - pc < size)
-		    size = addr - pc;
-		  break;
+		      if (addr - pc < size) {
+			      size = addr - pc;
+		      }
+		      break;
 		}
 	    }
 	  /* If the next symbol is after three bytes, we need to
 	     print only part of the data, so that we can use either
 	     .byte or .short.  */
-	  if (size == 3)
-	    size = (pc & 1) ? 1 : 2;
+	    if (size == 3) {
+		    size = (pc & 1) ? 1 : 2;
+	    }
 	}
     }
 
diff --git a/libr/asm/arch/arm/aarch64/aarch64-opc.c b/libr/asm/arch/arm/aarch64/aarch64-opc.c
index 4610e14185..cb28e66ee2 100644
--- a/libr/asm/arch/arm/aarch64/aarch64-opc.c
+++ b/libr/asm/arch/arm/aarch64/aarch64-opc.c
@@ -83,37 +83,26 @@ get_data_pattern (const aarch64_opnd_qualifier_seq_t qualifiers)
     {
       /* e.g. v.4s, v.4s, v.4s
 	   or v.4h, v.4h, v.h[3].  */
-      if (qualifiers[0] == qualifiers[1]
-	  && vector_qualifier_p (qualifiers[2]) == TRUE
-	  && (aarch64_get_qualifier_esize (qualifiers[0])
-	      == aarch64_get_qualifier_esize (qualifiers[1]))
-	  && (aarch64_get_qualifier_esize (qualifiers[0])
-	      == aarch64_get_qualifier_esize (qualifiers[2])))
-	return DP_VECTOR_3SAME;
+      if (qualifiers[0] == qualifiers[1] && vector_qualifier_p (qualifiers[2]) == TRUE && (aarch64_get_qualifier_esize (qualifiers[0]) == aarch64_get_qualifier_esize (qualifiers[1])) && (aarch64_get_qualifier_esize (qualifiers[0]) == aarch64_get_qualifier_esize (qualifiers[2]))) {
+	      return DP_VECTOR_3SAME;
+      }
       /* e.g. v.8h, v.8b, v.8b.
            or v.4s, v.4h, v.h[2].
 	   or v.8h, v.16b.  */
-      if (vector_qualifier_p (qualifiers[1]) == TRUE
-	  && aarch64_get_qualifier_esize (qualifiers[0]) != 0
-	  && (aarch64_get_qualifier_esize (qualifiers[0])
-	      == aarch64_get_qualifier_esize (qualifiers[1]) << 1))
-	return DP_VECTOR_LONG;
+      if (vector_qualifier_p (qualifiers[1]) == TRUE && aarch64_get_qualifier_esize (qualifiers[0]) != 0 && (aarch64_get_qualifier_esize (qualifiers[0]) == aarch64_get_qualifier_esize (qualifiers[1]) << 1)) {
+	      return DP_VECTOR_LONG;
+      }
       /* e.g. v.8h, v.8h, v.8b.  */
-      if (qualifiers[0] == qualifiers[1]
-	  && vector_qualifier_p (qualifiers[2]) == TRUE
-	  && aarch64_get_qualifier_esize (qualifiers[0]) != 0
-	  && (aarch64_get_qualifier_esize (qualifiers[0])
-	      == aarch64_get_qualifier_esize (qualifiers[2]) << 1)
-	  && (aarch64_get_qualifier_esize (qualifiers[0])
-	      == aarch64_get_qualifier_esize (qualifiers[1])))
-	return DP_VECTOR_WIDE;
+      if (qualifiers[0] == qualifiers[1] && vector_qualifier_p (qualifiers[2]) == TRUE && aarch64_get_qualifier_esize (qualifiers[0]) != 0 && (aarch64_get_qualifier_esize (qualifiers[0]) == aarch64_get_qualifier_esize (qualifiers[2]) << 1) && (aarch64_get_qualifier_esize (qualifiers[0]) == aarch64_get_qualifier_esize (qualifiers[1]))) {
+	      return DP_VECTOR_WIDE;
+      }
     }
   else if (fp_qualifier_p (qualifiers[0]) == TRUE)
     {
       /* e.g. SADDLV <V><d>, <Vn>.<T>.  */
-      if (vector_qualifier_p (qualifiers[1]) == TRUE
-	  && qualifiers[2] == AARCH64_OPND_QLF_NIL)
-	return DP_VECTOR_ACROSS_LANES;
+      if (vector_qualifier_p (qualifiers[1]) == TRUE && qualifiers[2] == AARCH64_OPND_QLF_NIL) {
+	      return DP_VECTOR_ACROSS_LANES;
+      }
     }
 
   return DP_UNKNOWN;
@@ -294,10 +283,11 @@ enum aarch64_modifier_kind
 aarch64_get_operand_modifier_from_value (aarch64_insn value,
 					 bfd_boolean extend_p)
 {
-  if (extend_p == TRUE)
-    return AARCH64_MOD_UXTB + value;
-  else
-    return AARCH64_MOD_LSL - value;
+	if (extend_p == TRUE) {
+		return AARCH64_MOD_UXTB + value;
+	} else {
+		return AARCH64_MOD_LSL - value;
+	}
 }
 
 bfd_boolean
@@ -397,8 +387,9 @@ value_fit_signed_field_p (int64_t value, unsigned width)
   if (width < sizeof (value) * 8)
     {
       int64_t lim = (int64_t)1 << (width - 1);
-      if (value >= -lim && value < lim)
-	return 1;
+      if (value >= -lim && value < lim) {
+	      return 1;
+      }
     }
   return 0;
 }
@@ -411,8 +402,9 @@ value_fit_unsigned_field_p (int64_t value, unsigned width)
   if (width < sizeof (value) * 8)
     {
       int64_t lim = (int64_t)1 << width;
-      if (value >= 0 && value < lim)
-	return 1;
+      if (value >= 0 && value < lim) {
+	      return 1;
+      }
     }
   return 0;
 }
@@ -448,23 +440,25 @@ operand_also_qualified_p (const struct aarch64_opnd_info *operand,
   switch (operand->qualifier)
     {
     case AARCH64_OPND_QLF_W:
-      if (target == AARCH64_OPND_QLF_WSP && aarch64_stack_pointer_p (operand))
-	return 1;
-      break;
+	    if (target == AARCH64_OPND_QLF_WSP && aarch64_stack_pointer_p (operand)) {
+		    return 1;
+	    }
+	    break;
     case AARCH64_OPND_QLF_X:
-      if (target == AARCH64_OPND_QLF_SP && aarch64_stack_pointer_p (operand))
-	return 1;
-      break;
+	    if (target == AARCH64_OPND_QLF_SP && aarch64_stack_pointer_p (operand)) {
+		    return 1;
+	    }
+	    break;
     case AARCH64_OPND_QLF_WSP:
-      if (target == AARCH64_OPND_QLF_W
-	  && operand_maybe_stack_pointer (aarch64_operands + operand->type))
-	return 1;
-      break;
+	    if (target == AARCH64_OPND_QLF_W && operand_maybe_stack_pointer (aarch64_operands + operand->type)) {
+		    return 1;
+	    }
+	    break;
     case AARCH64_OPND_QLF_SP:
-      if (target == AARCH64_OPND_QLF_X
-	  && operand_maybe_stack_pointer (aarch64_operands + operand->type))
-	return 1;
-      break;
+	    if (target == AARCH64_OPND_QLF_X && operand_maybe_stack_pointer (aarch64_operands + operand->type)) {
+		    return 1;
+	    }
+	    break;
     default:
       break;
     }
@@ -510,11 +504,12 @@ aarch64_get_expected_qualifier (const aarch64_opnd_qualifier_seq_t *qseq_list,
     {
       if (qseq_list[i][known_idx] == known_qlf)
 	{
-	  if (saved_i != -1)
-	    /* More than one sequences are found to have KNOWN_QLF at
+	      if (saved_i != -1) {
+		      /* More than one sequences are found to have KNOWN_QLF at
 	       KNOWN_IDX.  */
-	    return AARCH64_OPND_NIL;
-	  saved_i = i;
+		      return AARCH64_OPND_NIL;
+	      }
+	      saved_i = i;
 	}
     }
 
@@ -696,8 +691,9 @@ aarch64_num_of_operands (const aarch64_opcode *opcode)
 {
   int i = 0;
   const enum aarch64_opnd *opnds = opcode->operands;
-  while (opnds[i++] != AARCH64_OPND_NIL)
-    ;
+  while (opnds[i++] != AARCH64_OPND_NIL) {
+	  ;
+  }
   --i;
   assert (i >= 0 && i <= AARCH64_MAX_OPND_NUM);
   return i;
@@ -741,19 +737,19 @@ aarch64_find_best_match (const aarch64_inst *inst,
       return 1;
     }
 
-  if (stop_at < 0 || stop_at >= num_opnds)
-    stop_at = num_opnds - 1;
+    if (stop_at < 0 || stop_at >= num_opnds) {
+	    stop_at = num_opnds - 1;
+    }
 
-  /* For each pattern.  */
-  for (i = 0; i < AARCH64_MAX_QLF_SEQ_NUM; ++i, ++qualifiers_list)
-    {
-      int j;
-      qualifiers = *qualifiers_list;
+    /* For each pattern.  */
+    for (i = 0; i < AARCH64_MAX_QLF_SEQ_NUM; ++i, ++qualifiers_list) {
+	    int j;
+	    qualifiers = *qualifiers_list;
 
-      /* Start as positive.  */
-      found = 1;
+	    /* Start as positive.  */
+	    found = 1;
 
-      DEBUG_TRACE ("%d", i);
+	    DEBUG_TRACE ("%d", i);
 #ifdef DEBUG_AARCH64
       if (debug_dump)
 	dump_match_qualifiers (inst->operands, qualifiers);
@@ -764,8 +760,9 @@ aarch64_find_best_match (const aarch64_inst *inst,
       if (empty_qualifier_sequence_p (qualifiers) == TRUE)
 	{
 	  DEBUG_TRACE_IF (i == 0, "SUCCEED: empty qualifier list");
-	  if (i)
-	    found = 0;
+	  if (i) {
+		  found = 0;
+	  }
 	  break;
 	}
 
@@ -786,21 +783,21 @@ aarch64_find_best_match (const aarch64_inst *inst,
 	      /* Unless the target qualifier can also qualify the operand
 		 (which has already had a non-nil qualifier), non-equal
 		 qualifiers are generally un-matched.  */
-	      if (operand_also_qualified_p (inst->operands + j, *qualifiers))
-		continue;
-	      else
-		{
-		  found = 0;
-		  break;
+	      if (operand_also_qualified_p (inst->operands + j, *qualifiers)) {
+		      continue;
+	      } else {
+		      found = 0;
+		      break;
 		}
+	    } else {
+		    continue; /* Equal qualifiers are certainly matched.  */
 	    }
-	  else
-	    continue;	/* Equal qualifiers are certainly matched.  */
 	}
 
       /* Qualifiers established.  */
-      if (found == 1)
-	break;
+	if (found == 1) {
+		break;
+	}
     }
 
   if (found == 1)
@@ -815,10 +812,12 @@ aarch64_find_best_match (const aarch64_inst *inst,
 	dump_qualifier_sequence (qualifiers);
 #endif
 
-      for (j = 0; j <= stop_at; ++j, ++qualifiers)
-	ret[j] = *qualifiers;
-      for (; j < AARCH64_MAX_OPND_NUM; ++j)
-	ret[j] = AARCH64_OPND_QLF_NIL;
+      for (j = 0; j <= stop_at; ++j, ++qualifiers) {
+	      ret[j] = *qualifiers;
+      }
+      for (; j < AARCH64_MAX_OPND_NUM; ++j) {
+	      ret[j] = AARCH64_OPND_QLF_NIL;
+      }
 
       DEBUG_TRACE ("SUCCESS");
       return 1;
@@ -850,20 +849,21 @@ match_operands_qualifier (aarch64_inst *inst, bfd_boolean update_p)
     }
 
   /* Update the qualifiers.  */
-  if (update_p == TRUE)
-    for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i)
-      {
-	if (inst->opcode->operands[i] == AARCH64_OPND_NIL)
-	  break;
-	DEBUG_TRACE_IF (inst->operands[i].qualifier != qualifiers[i],
-			"update %s with %s for operand %d",
-			aarch64_get_qualifier_name (inst->operands[i].qualifier),
-			aarch64_get_qualifier_name (qualifiers[i]), i);
-	inst->operands[i].qualifier = qualifiers[i];
-      }
+    if (update_p == TRUE) {
+	    for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i) {
+		    if (inst->opcode->operands[i] == AARCH64_OPND_NIL) {
+			    break;
+		    }
+		    DEBUG_TRACE_IF (inst->operands[i].qualifier != qualifiers[i],
+			    "update %s with %s for operand %d",
+			    aarch64_get_qualifier_name (inst->operands[i].qualifier),
+			    aarch64_get_qualifier_name (qualifiers[i]), i);
+		    inst->operands[i].qualifier = qualifiers[i];
+	    }
+    }
 
-  DEBUG_TRACE ("matching SUCCESS");
-  return 1;
+    DEBUG_TRACE ("matching SUCCESS");
+    return 1;
 }
 
 /* Return TRUE if VALUE is a wide constant that can be moved into a general
@@ -886,22 +886,24 @@ aarch64_wide_constant_p (int64_t value, int is32, unsigned int *shift_amount)
 	 32-bit constant expressions like ~0x80000000 are
 	 permitted.  */
       uint64_t ext = value;
-      if (ext >> 32 != 0 && ext >> 32 != (uint64_t) 0xffffffff)
-	/* Immediate out of range.  */
-	return FALSE;
+      if (ext >> 32 != 0 && ext >> 32 != (uint64_t)0xffffffff) {
+	      /* Immediate out of range.  */
+	      return FALSE;
+      }
       value &= (int64_t) 0xffffffff;
     }
 
   /* first, try movz then movn */
   amount = -1;
-  if ((value & ((int64_t) 0xffff << 0)) == value)
-    amount = 0;
-  else if ((value & ((int64_t) 0xffff << 16)) == value)
-    amount = 16;
-  else if (!is32 && (value & ((int64_t) 0xffff << 32)) == value)
-    amount = 32;
-  else if (!is32 && (value & ((int64_t) 0xffff << 48)) == value)
-    amount = 48;
+  if ((value & ((int64_t)0xffff << 0)) == value) {
+	  amount = 0;
+  } else if ((value & ((int64_t)0xffff << 16)) == value) {
+	  amount = 16;
+  } else if (!is32 && (value & ((int64_t)0xffff << 32)) == value) {
+	  amount = 32;
+  } else if (!is32 && (value & ((int64_t)0xffff << 48)) == value) {
+	  amount = 48;
+  }
 
   if (amount == -1)
     {
@@ -909,12 +911,13 @@ aarch64_wide_constant_p (int64_t value, int is32, unsigned int *shift_amount)
       return FALSE;
     }
 
-  if (shift_amount != NULL)
-    *shift_amount = amount;
+    if (shift_amount != NULL) {
+	    *shift_amount = amount;
+    }
 
-  DEBUG_TRACE ("exit TRUE with amount %d", amount);
+    DEBUG_TRACE ("exit TRUE with amount %d", amount);
 
-  return TRUE;
+    return TRUE;
 }
 
 /* Build the accepted values for immediate logical SIMD instructions.
@@ -952,10 +955,12 @@ simd_imm_encoding_cmp(const void *i1, const void *i2)
   const simd_imm_encoding *imm1 = (const simd_imm_encoding *)i1;
   const simd_imm_encoding *imm2 = (const simd_imm_encoding *)i2;
 
-  if (imm1->imm < imm2->imm)
-    return -1;
-  if (imm1->imm > imm2->imm)
-    return +1;
+  if (imm1->imm < imm2->imm) {
+	  return -1;
+  }
+  if (imm1->imm > imm2->imm) {
+	  return +1;
+  }
   return 0;
 }
 
@@ -1004,30 +1009,30 @@ build_immediate_table (void)
 	     5     ((1 << 0) - 1) << 6 = 000000  */
 	  s_mask = ((1u << (5 - log_e)) - 1) << (log_e + 1);
 	}
-      for (s = 0; s < e - 1; s++)
-	for (r = 0; r < e; r++)
-	  {
-	    /* s+1 consecutive bits to 1 (s < 63) */
-	    imm = (1ull << (s + 1)) - 1;
-	    /* rotate right by r */
-	    if (r != 0)
-	      imm = (imm >> r) | ((imm << (e - r)) & mask);
-	    /* replicate the constant depending on SIMD size */
-	    switch (log_e)
-	      {
-	      case 1: imm = (imm <<  2) | imm;
-	      case 2: imm = (imm <<  4) | imm;
-	      case 3: imm = (imm <<  8) | imm;
-	      case 4: imm = (imm << 16) | imm;
-	      case 5: imm = (imm << 32) | imm;
-	      case 6: break;
-	      default: abort ();
-	      }
-	    simd_immediates[nb_imms].imm = imm;
-	    simd_immediates[nb_imms].encoding =
-	      encode_immediate_bitfield(is64, s | s_mask, r);
-	    nb_imms++;
-	  }
+	for (s = 0; s < e - 1; s++) {
+		for (r = 0; r < e; r++) {
+			/* s+1 consecutive bits to 1 (s < 63) */
+			imm = (1ull << (s + 1)) - 1;
+			/* rotate right by r */
+			if (r != 0) {
+				imm = (imm >> r) | ((imm << (e - r)) & mask);
+			}
+			/* replicate the constant depending on SIMD size */
+			switch (log_e) {
+			case 1: imm = (imm << 2) | imm;
+			case 2: imm = (imm << 4) | imm;
+			case 3: imm = (imm << 8) | imm;
+			case 4: imm = (imm << 16) | imm;
+			case 5: imm = (imm << 32) | imm;
+			case 6: break;
+			default: abort ();
+			}
+			simd_immediates[nb_imms].imm = imm;
+			simd_immediates[nb_imms].encoding =
+				encode_immediate_bitfield (is64, s | s_mask, r);
+			nb_imms++;
+		}
+	}
     }
   assert (nb_imms == TOTAL_IMM_NB);
   qsort(simd_immediates, nb_imms,
@@ -1062,8 +1067,9 @@ aarch64_logical_immediate_p (uint64_t value, int is32, aarch64_insn *encoding)
     {
       /* Allow all zeros or all ones in top 32-bits, so that
 	 constant expressions like ~1 are permitted.  */
-      if (value >> 32 != 0 && value >> 32 != 0xffffffff)
-	return 0xffffffff;
+      if (value >> 32 != 0 && value >> 32 != 0xffffffff) {
+	      return 0xffffffff;
+      }
       /* Replicate the 32 lower bits to the 32 upper bits.  */
       value &= 0xffffffff;
       value |= value << 32;
@@ -1078,10 +1084,11 @@ aarch64_logical_immediate_p (uint64_t value, int is32, aarch64_insn *encoding)
       DEBUG_TRACE ("exit with FALSE");
       return FALSE;
     }
-  if (encoding != NULL)
-    *encoding = imm_encoding->encoding;
-  DEBUG_TRACE ("exit with TRUE");
-  return TRUE;
+    if (encoding != NULL) {
+	    *encoding = imm_encoding->encoding;
+    }
+    DEBUG_TRACE ("exit with TRUE");
+    return TRUE;
 }
 
 /* If 64-bit immediate IMM is in the format of
@@ -1098,10 +1105,11 @@ aarch64_shrink_expanded_imm8 (uint64_t imm)
   for (i = 0; i < 8; i++)
     {
       byte = (imm >> (8 * i)) & 0xff;
-      if (byte == 0xff)
-	ret |= 1 << i;
-      else if (byte != 0x00)
-	return -1;
+      if (byte == 0xff) {
+	      ret |= 1 << i;
+      } else if (byte != 0x00) {
+	      return -1;
+      }
     }
   return ret;
 }
@@ -1113,11 +1121,12 @@ set_error (aarch64_operand_error *mismatch_detail,
 	   enum aarch64_operand_error_kind kind, int idx,
 	   const char* error)
 {
-  if (!mismatch_detail)
-    return;
-  mismatch_detail->kind = kind;
-  mismatch_detail->index = idx;
-  mismatch_detail->error = error;
+	if (!mismatch_detail) {
+		return;
+	}
+	mismatch_detail->kind = kind;
+	mismatch_detail->index = idx;
+	mismatch_detail->error = error;
 }
 
 static inline void
@@ -1125,90 +1134,99 @@ set_out_of_range_error (aarch64_operand_error *mismatch_detail,
 			int idx, int lower_bound, int upper_bound,
 			const char* error)
 {
-  if (!mismatch_detail)
-    return;
-  set_error (mismatch_detail, AARCH64_OPDE_OUT_OF_RANGE, idx, error);
-  mismatch_detail->data[0] = lower_bound;
-  mismatch_detail->data[1] = upper_bound;
+	if (!mismatch_detail) {
+		return;
+	}
+	set_error (mismatch_detail, AARCH64_OPDE_OUT_OF_RANGE, idx, error);
+	mismatch_detail->data[0] = lower_bound;
+	mismatch_detail->data[1] = upper_bound;
 }
 
 static inline void
 set_imm_out_of_range_error (aarch64_operand_error *mismatch_detail,
 			    int idx, int lower_bound, int upper_bound)
 {
-  if (!mismatch_detail)
-    return;
-  set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
-			  _("immediate value"));
+	if (!mismatch_detail) {
+		return;
+	}
+	set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
+		_ ("immediate value"));
 }
 
 static inline void
 set_offset_out_of_range_error (aarch64_operand_error *mismatch_detail,
 			       int idx, int lower_bound, int upper_bound)
 {
-  if (!mismatch_detail)
-    return;
-  set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
-			  _("immediate offset"));
+	if (!mismatch_detail) {
+		return;
+	}
+	set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
+		_ ("immediate offset"));
 }
 
 static inline void
 set_regno_out_of_range_error (aarch64_operand_error *mismatch_detail,
 			      int idx, int lower_bound, int upper_bound)
 {
-  if (!mismatch_detail)
-    return;
-  set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
-			  _("register number"));
+	if (!mismatch_detail) {
+		return;
+	}
+	set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
+		_ ("register number"));
 }
 
 static inline void
 set_elem_idx_out_of_range_error (aarch64_operand_error *mismatch_detail,
 				 int idx, int lower_bound, int upper_bound)
 {
-  if (!mismatch_detail)
-    return;
-  set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
-			  _("register element index"));
+	if (!mismatch_detail) {
+		return;
+	}
+	set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
+		_ ("register element index"));
 }
 
 static inline void
 set_sft_amount_out_of_range_error (aarch64_operand_error *mismatch_detail,
 				   int idx, int lower_bound, int upper_bound)
 {
-  if (!mismatch_detail)
-    return;
-  set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
-			  _("shift amount"));
+	if (!mismatch_detail) {
+		return;
+	}
+	set_out_of_range_error (mismatch_detail, idx, lower_bound, upper_bound,
+		_ ("shift amount"));
 }
 
 static inline void
 set_unaligned_error (aarch64_operand_error *mismatch_detail, int idx,
 		     int alignment)
 {
-  if (!mismatch_detail)
-    return;
-  set_error (mismatch_detail, AARCH64_OPDE_UNALIGNED, idx, NULL);
-  mismatch_detail->data[0] = alignment;
+	if (!mismatch_detail) {
+		return;
+	}
+	set_error (mismatch_detail, AARCH64_OPDE_UNALIGNED, idx, NULL);
+	mismatch_detail->data[0] = alignment;
 }
 
 static inline void
 set_reg_list_error (aarch64_operand_error *mismatch_detail, int idx,
 		    int expected_num)
 {
-  if (!mismatch_detail)
-    return;
-  set_error (mismatch_detail, AARCH64_OPDE_REG_LIST, idx, NULL);
-  mismatch_detail->data[0] = expected_num;
+	if (!mismatch_detail) {
+		return;
+	}
+	set_error (mismatch_detail, AARCH64_OPDE_REG_LIST, idx, NULL);
+	mismatch_detail->data[0] = expected_num;
 }
 
 static inline void
 set_other_error (aarch64_operand_error *mismatch_detail, int idx,
 		 const char* error)
 {
-  if (!mismatch_detail)
-    return;
-  set_error (mismatch_detail, AARCH64_OPDE_OTHER_ERROR, idx, error);
+	if (!mismatch_detail) {
+		return;
+	}
+	set_error (mismatch_detail, AARCH64_OPDE_OTHER_ERROR, idx, error);
 }
 
 /* General constraint checking based on operand code.
@@ -1340,10 +1358,9 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
 	  /* Unscaled signed 9 bits immediate offset, which has to be negative
 	     or unaligned.  */
 	  size = aarch64_get_qualifier_esize (qualifier);
-	  if ((value_in_range_p (opnd->addr.offset.imm, 0, 255)
-	       && !value_aligned_p (opnd->addr.offset.imm, size))
-	      || value_in_range_p (opnd->addr.offset.imm, -256, -1))
-	    return 1;
+	  if ((value_in_range_p (opnd->addr.offset.imm, 0, 255) && !value_aligned_p (opnd->addr.offset.imm, size)) || value_in_range_p (opnd->addr.offset.imm, -256, -1)) {
+		  return 1;
+	  }
 	  set_other_error (mismatch_detail, idx,
 			   _("negative or unaligned offset expected"));
 	  return 0;
@@ -1353,13 +1370,12 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
 	  assert (idx == 1);
 	  if (opnd->addr.offset.is_reg)
 	    {
-	      if (value_in_range_p (opnd->addr.offset.regno, 0, 30))
-		return 1;
-	      else
-		{
-		  set_other_error (mismatch_detail, idx,
-				   _("invalid register offset"));
-		  return 0;
+		  if (value_in_range_p (opnd->addr.offset.regno, 0, 30)) {
+			  return 1;
+		  } else {
+			  set_other_error (mismatch_detail, idx,
+				  _ ("invalid register offset"));
+			  return 0;
 		}
 	    }
 	  else
@@ -1369,14 +1385,12 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
 	      /* The opcode dependent area stores the number of elements in
 		 each structure to be loaded/stored.  */
 	      int is_ld1r = get_opcode_dependent_value (opcode) == 1;
-	      if (opcode->operands[0] == AARCH64_OPND_LVt_AL)
-		/* Special handling of loading single structure to all lane.  */
-		num_bytes = (is_ld1r ? 1 : prev->reglist.num_regs)
-		  * aarch64_get_qualifier_esize (prev->qualifier);
-	      else
-		num_bytes = prev->reglist.num_regs
-		  * aarch64_get_qualifier_esize (prev->qualifier)
-		  * aarch64_get_qualifier_nelem (prev->qualifier);
+	      if (opcode->operands[0] == AARCH64_OPND_LVt_AL) {
+		      /* Special handling of loading single structure to all lane.  */
+		      num_bytes = (is_ld1r ? 1 : prev->reglist.num_regs) * aarch64_get_qualifier_esize (prev->qualifier);
+	      } else {
+		      num_bytes = prev->reglist.num_regs * aarch64_get_qualifier_esize (prev->qualifier) * aarch64_get_qualifier_nelem (prev->qualifier);
+	      }
 	      if ((int) num_bytes != opnd->addr.offset.imm)
 		{
 		  set_other_error (mismatch_detail, idx,
@@ -1636,8 +1650,9 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
 	    {
 	      int is32 = opnds[0].qualifier == AARCH64_OPND_QLF_W;
 	      uint64_t uimm = opnd->imm.value;
-	      if (opcode->op == OP_BIC)
-		uimm = ~uimm;
+	      if (opcode->op == OP_BIC) {
+		      uimm = ~uimm;
+	      }
 	      if (aarch64_logical_immediate_p (uimm, is32, NULL) == FALSE)
 		{
 		  set_other_error (mismatch_detail, idx,
@@ -2002,8 +2017,9 @@ aarch64_match_operands_constraint (aarch64_inst *inst,
   for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i)
     {
       enum aarch64_opnd type = inst->opcode->operands[i];
-      if (type == AARCH64_OPND_NIL)
-	break;
+      if (type == AARCH64_OPND_NIL) {
+	      break;
+      }
       if (inst->operands[i].skip)
 	{
 	  DEBUG_TRACE ("skip the incomplete operand %d", i);
@@ -2043,8 +2059,9 @@ aarch64_replace_opcode (aarch64_inst *inst, const aarch64_opcode *opcode)
   for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i)
     {
       inst->operands[i].type = opcode->operands[i];
-      if (opcode->operands[i] == AARCH64_OPND_NIL)
-	break;
+      if (opcode->operands[i] == AARCH64_OPND_NIL) {
+	      break;
+      }
     }
 
   DEBUG_TRACE ("replace %s with %s", old->name, opcode->name);
@@ -2056,11 +2073,13 @@ int
 aarch64_operand_index (const enum aarch64_opnd *operands, enum aarch64_opnd operand)
 {
   int i;
-  for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i)
-    if (operands[i] == operand)
-      return i;
-    else if (operands[i] == AARCH64_OPND_NIL)
-      break;
+  for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i) {
+	  if (operands[i] == operand) {
+		  return i;
+	  } else if (operands[i] == AARCH64_OPND_NIL) {
+		  break;
+	  }
+  }
   return -1;
 }
 
@@ -2177,43 +2196,42 @@ print_register_list (char *buf, size_t size, const aarch64_opnd_info *opnd)
   assert (num_regs >= 1 && num_regs <= 4);
 
   /* Prepare the index if any.  */
-  if (opnd->reglist.has_index)
-    snprintf (tb, 8, "[%d]", opnd->reglist.index);
-  else
-    tb[0] = '\0';
+  if (opnd->reglist.has_index) {
+	  snprintf (tb, 8, "[%d]", opnd->reglist.index);
+  } else {
+	  tb[0] = '\0';
+  }
 
   /* The hyphenated form is preferred for disassembly if there are
      more than two registers in the list, and the register numbers
      are monotonically increasing in increments of one.  */
-  if (num_regs > 2 && last_reg > first_reg)
-    snprintf (buf, size, "{v%d.%s-v%d.%s}%s", first_reg, qlf_name,
-	      last_reg, qlf_name, tb);
-  else
-    {
-      const int reg0 = first_reg;
-      const int reg1 = (first_reg + 1) & 0x1f;
-      const int reg2 = (first_reg + 2) & 0x1f;
-      const int reg3 = (first_reg + 3) & 0x1f;
+  if (num_regs > 2 && last_reg > first_reg) {
+	  snprintf (buf, size, "{v%d.%s-v%d.%s}%s", first_reg, qlf_name,
+		  last_reg, qlf_name, tb);
+  } else {
+	  const int reg0 = first_reg;
+	  const int reg1 = (first_reg + 1) & 0x1f;
+	  const int reg2 = (first_reg + 2) & 0x1f;
+	  const int reg3 = (first_reg + 3) & 0x1f;
 
-      switch (num_regs)
-	{
-	case 1:
-	  snprintf (buf, size, "{v%d.%s}%s", reg0, qlf_name, tb);
-	  break;
-	case 2:
-	  snprintf (buf, size, "{v%d.%s, v%d.%s}%s", reg0, qlf_name,
-		    reg1, qlf_name, tb);
-	  break;
-	case 3:
-	  snprintf (buf, size, "{v%d.%s, v%d.%s, v%d.%s}%s", reg0, qlf_name,
-		    reg1, qlf_name, reg2, qlf_name, tb);
-	  break;
-	case 4:
-	  snprintf (buf, size, "{v%d.%s, v%d.%s, v%d.%s, v%d.%s}%s",
-		    reg0, qlf_name, reg1, qlf_name, reg2, qlf_name,
-		    reg3, qlf_name, tb);
-	  break;
-	}
+	  switch (num_regs) {
+	  case 1:
+		  snprintf (buf, size, "{v%d.%s}%s", reg0, qlf_name, tb);
+		  break;
+	  case 2:
+		  snprintf (buf, size, "{v%d.%s, v%d.%s}%s", reg0, qlf_name,
+			  reg1, qlf_name, tb);
+		  break;
+	  case 3:
+		  snprintf (buf, size, "{v%d.%s, v%d.%s, v%d.%s}%s", reg0, qlf_name,
+			  reg1, qlf_name, reg2, qlf_name, tb);
+		  break;
+	  case 4:
+		  snprintf (buf, size, "{v%d.%s, v%d.%s, v%d.%s, v%d.%s}%s",
+			  reg0, qlf_name, reg1, qlf_name, reg2, qlf_name,
+			  reg3, qlf_name, tb);
+		  break;
+	  }
     }
 }
 
@@ -2248,20 +2266,22 @@ print_register_offset_address (char *buf, size_t size,
       print_amount_p = FALSE;
       /* Likewise, no need to print the shift operator LSL in such a
 	 situation.  */
-      if (lsl_p)
-	print_extend_p = FALSE;
+      if (lsl_p) {
+	      print_extend_p = FALSE;
+      }
     }
 
   /* Prepare for the extend/shift.  */
   if (print_extend_p)
     {
-      if (print_amount_p)
-	snprintf (tb, tblen, ",%s %d", shift_name, opnd->shifter.amount); // #
-      else
-	snprintf (tb, tblen, ",%s", shift_name);
-    }
-  else
-    tb[0] = '\0';
+	  if (print_amount_p) {
+		  snprintf (tb, tblen, ",%s %d", shift_name, opnd->shifter.amount); // #
+	  } else {
+		  snprintf (tb, tblen, ",%s", shift_name);
+	  }
+  } else {
+	  tb[0] = '\0';
+  }
 
   snprintf (buf, size, "[%s,%c%d%s]",
 	    get_64bit_int_reg_name (opnd->addr.base_regno, 1),
@@ -2293,8 +2313,9 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
   uint64_t addr;
 
   buf[0] = '\0';
-  if (pcrel_p)
-    *pcrel_p = 0;
+  if (pcrel_p) {
+	  *pcrel_p = 0;
+  }
 
   switch (opnd->type)
     {
@@ -2309,12 +2330,13 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
       /* The optional-ness of <Xt> in e.g. IC <ic_op>{, <Xt>} is determined by
 	 the <ic_op>, therefore we use opnd->present to override the
 	 generic optional-ness information.  */
-      if (opnd->type == AARCH64_OPND_Rt_SYS && !opnd->present)
-	break;
+      if (opnd->type == AARCH64_OPND_Rt_SYS && !opnd->present) {
+	      break;
+      }
       /* Omit the operand, e.g. RET.  */
-      if (optional_operand_p (opcode, idx)
-	  && opnd->reg.regno == get_optional_operand_default_value (opcode))
-	break;
+      if (optional_operand_p (opcode, idx) && opnd->reg.regno == get_optional_operand_default_value (opcode)) {
+	      break;
+      }
       assert (opnd->qualifier == AARCH64_OPND_QLF_W
 	      || opnd->qualifier == AARCH64_OPND_QLF_X);
       snprintf (buf, size, "%s",
@@ -2352,28 +2374,30 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
 	      break;
 	    }
 	}
-      if (opnd->shifter.amount)
-	snprintf (buf, size, "%s, %s %d", // #%d
-		  get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
-		  aarch64_operand_modifiers[kind].name,
-		  opnd->shifter.amount);
-      else
-	snprintf (buf, size, "%s, %s",
-		  get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
-		  aarch64_operand_modifiers[kind].name);
-      break;
+	if (opnd->shifter.amount) {
+		snprintf (buf, size, "%s, %s %d", // #%d
+			get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
+			aarch64_operand_modifiers[kind].name,
+			opnd->shifter.amount);
+	} else {
+		snprintf (buf, size, "%s, %s",
+			get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
+			aarch64_operand_modifiers[kind].name);
+	}
+	break;
 
     case AARCH64_OPND_Rm_SFT:
       assert (opnd->qualifier == AARCH64_OPND_QLF_W
 	      || opnd->qualifier == AARCH64_OPND_QLF_X);
-      if (opnd->shifter.amount == 0 && opnd->shifter.kind == AARCH64_MOD_LSL)
-	snprintf (buf, size, "%s",
-		  get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0));
-      else
-	snprintf (buf, size, "%s, %s %d", // #%d
-		  get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
-		  aarch64_operand_modifiers[opnd->shifter.kind].name,
-		  opnd->shifter.amount);
+      if (opnd->shifter.amount == 0 && opnd->shifter.kind == AARCH64_MOD_LSL) {
+	      snprintf (buf, size, "%s",
+		      get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0));
+      } else {
+	      snprintf (buf, size, "%s, %s %d", // #%d
+		      get_int_reg_name (opnd->reg.regno, opnd->qualifier, 0),
+		      aarch64_operand_modifiers[opnd->shifter.kind].name,
+		      opnd->shifter.amount);
+      }
       break;
 
     case AARCH64_OPND_Fd:
@@ -2463,23 +2487,24 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
     case AARCH64_OPND_LIMM:
     case AARCH64_OPND_AIMM:
     case AARCH64_OPND_HALF:
-      if (opnd->shifter.amount)
-	snprintf (buf, size, "0x%" PRIx64 ", lsl %d", opnd->imm.value, // #
-		  opnd->shifter.amount);
-      else
-	snprintf (buf, size, "0x%" PRIx64, opnd->imm.value);
-      break;
+	    if (opnd->shifter.amount) {
+		    snprintf (buf, size, "0x%" PRIx64 ", lsl %d", opnd->imm.value, // #
+			    opnd->shifter.amount);
+	    } else {
+		    snprintf (buf, size, "0x%" PRIx64, opnd->imm.value);
+	    }
+	    break;
 
     case AARCH64_OPND_SIMD_IMM:
     case AARCH64_OPND_SIMD_IMM_SFT:
-      if ((! opnd->shifter.amount && opnd->shifter.kind == AARCH64_MOD_LSL)
-	  || opnd->shifter.kind == AARCH64_MOD_NONE)
-	snprintf (buf, size, "0x%" PRIx64, opnd->imm.value);
-      else
-	snprintf (buf, size, "0x%" PRIx64 ", %s %d", opnd->imm.value, // #
-		  aarch64_operand_modifiers[opnd->shifter.kind].name,
-		  opnd->shifter.amount);
-      break;
+	    if ((!opnd->shifter.amount && opnd->shifter.kind == AARCH64_MOD_LSL) || opnd->shifter.kind == AARCH64_MOD_NONE) {
+		    snprintf (buf, size, "0x%" PRIx64, opnd->imm.value);
+	    } else {
+		    snprintf (buf, size, "0x%" PRIx64 ", %s %d", opnd->imm.value, // #
+			    aarch64_operand_modifiers[opnd->shifter.kind].name,
+			    opnd->shifter.amount);
+	    }
+	    break;
 
     case AARCH64_OPND_FPIMM:
     case AARCH64_OPND_SIMD_FPIMM:
@@ -2508,13 +2533,13 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
     case AARCH64_OPND_EXCEPTION:
     case AARCH64_OPND_UIMM4:
     case AARCH64_OPND_UIMM7:
-      if (optional_operand_p (opcode, idx) == TRUE
-	  && (opnd->imm.value ==
-	      (int64_t) get_optional_operand_default_value (opcode)))
-	/* Omit the operand, e.g. DCPS1.  */
-	break;
-      snprintf (buf, size, "0x%x", (unsigned int)opnd->imm.value);
-      break;
+	    if (optional_operand_p (opcode, idx) == TRUE && (opnd->imm.value ==
+								    (int64_t)get_optional_operand_default_value (opcode))) {
+		    /* Omit the operand, e.g. DCPS1.  */
+		    break;
+	    }
+	    snprintf (buf, size, "0x%x", (unsigned int)opnd->imm.value);
+	    break;
 
     case AARCH64_OPND_COND:
       snprintf (buf, size, "%s", opnd->cond->names[0]);
@@ -2523,10 +2548,12 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
     case AARCH64_OPND_ADDR_ADRP:
       addr = ((pc + AARCH64_PCREL_OFFSET) & ~(uint64_t)0xfff)
 	+ opnd->imm.value;
-      if (pcrel_p)
-	*pcrel_p = 1;
-      if (address)
-	*address = addr;
+      if (pcrel_p) {
+	      *pcrel_p = 1;
+      }
+      if (address) {
+	      *address = addr;
+      }
       /* This is not necessary during the disassembling, as print_address_func
 	 in the disassemble_info will take care of the printing.  But some
 	 other callers may be still interested in getting the string in *STR,
@@ -2539,10 +2566,12 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
     case AARCH64_OPND_ADDR_PCREL21:
     case AARCH64_OPND_ADDR_PCREL26:
       addr = pc + AARCH64_PCREL_OFFSET + opnd->imm.value;
-      if (pcrel_p)
-	*pcrel_p = 1;
-      if (address)
-	*address = addr;
+      if (pcrel_p) {
+	      *pcrel_p = 1;
+      }
+      if (address) {
+	      *address = addr;
+      }
       /* This is not necessary during the disassembling, as print_address_func
 	 in the disassemble_info will take care of the printing.  But some
 	 other callers may be still interested in getting the string in *STR,
@@ -2556,13 +2585,14 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
       name = get_64bit_int_reg_name (opnd->addr.base_regno, 1);
       if (opnd->type == AARCH64_OPND_SIMD_ADDR_POST)
 	{
-	  if (opnd->addr.offset.is_reg)
-	    snprintf (buf, size, "[%s], x%d", name, opnd->addr.offset.regno);
-	  else
-	    snprintf (buf, size, "[%s], %d", name, opnd->addr.offset.imm); // #
-	}
-      else
-	snprintf (buf, size, "[%s]", name);
+	      if (opnd->addr.offset.is_reg) {
+		      snprintf (buf, size, "[%s], x%d", name, opnd->addr.offset.regno);
+	      } else {
+		      snprintf (buf, size, "[%s], %d", name, opnd->addr.offset.imm); // #
+	      }
+      } else {
+	      snprintf (buf, size, "[%s]", name);
+      }
       break;
 
     case AARCH64_OPND_ADDR_REGOFF:
@@ -2575,51 +2605,57 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
       name = get_64bit_int_reg_name (opnd->addr.base_regno, 1);
       if (opnd->addr.writeback)
 	{
-	  if (opnd->addr.preind)
-	    snprintf (buf, size, "[%s, %d]!", name, opnd->addr.offset.imm); // #
-	  else
-	    snprintf (buf, size, "[%s], %d", name, opnd->addr.offset.imm); // #
+	      if (opnd->addr.preind) {
+		      snprintf (buf, size, "[%s, %d]!", name, opnd->addr.offset.imm); // #
+	      } else {
+		      snprintf (buf, size, "[%s], %d", name, opnd->addr.offset.imm); // #
+	      }
 	}
       else
 	{
-	  if (opnd->addr.offset.imm)
-	    snprintf (buf, size, "[%s, %d]", name, opnd->addr.offset.imm); // #
-	  else
-	    snprintf (buf, size, "[%s]", name);
+		if (opnd->addr.offset.imm) {
+			snprintf (buf, size, "[%s, %d]", name, opnd->addr.offset.imm); // #
+		} else {
+			snprintf (buf, size, "[%s]", name);
+		}
 	}
       break;
 
     case AARCH64_OPND_ADDR_UIMM12:
       name = get_64bit_int_reg_name (opnd->addr.base_regno, 1);
-      if (opnd->addr.offset.imm)
-	snprintf (buf, size, "[%s, %d]", name, opnd->addr.offset.imm); // #
-      else
-	snprintf (buf, size, "[%s]", name);
+      if (opnd->addr.offset.imm) {
+	      snprintf (buf, size, "[%s, %d]", name, opnd->addr.offset.imm); // #
+      } else {
+	      snprintf (buf, size, "[%s]", name);
+      }
       break;
 
     case AARCH64_OPND_SYSREG:
-      for (i = 0; aarch64_sys_regs[i].name; ++i)
-	if (aarch64_sys_regs[i].value == opnd->sysreg)
-	  break;
-      if (aarch64_sys_regs[i].name)
-	snprintf (buf, size, "%s", aarch64_sys_regs[i].name);
-      else
-	{
-	  /* Implementation defined system register.  */
-	  unsigned int value = opnd->sysreg;
-	  snprintf (buf, size, "s%u_%u_c%u_c%u_%u", (value >> 14) & 0x3,
-		    (value >> 11) & 0x7, (value >> 7) & 0xf, (value >> 3) & 0xf,
-		    value & 0x7);
+	    for (i = 0; aarch64_sys_regs[i].name; ++i) {
+		    if (aarch64_sys_regs[i].value == opnd->sysreg) {
+			    break;
+		    }
+	    }
+	    if (aarch64_sys_regs[i].name) {
+		    snprintf (buf, size, "%s", aarch64_sys_regs[i].name);
+	    } else {
+		    /* Implementation defined system register.  */
+		    unsigned int value = opnd->sysreg;
+		    snprintf (buf, size, "s%u_%u_c%u_c%u_%u", (value >> 14) & 0x3,
+			    (value >> 11) & 0x7, (value >> 7) & 0xf, (value >> 3) & 0xf,
+			    value & 0x7);
 	}
       break;
 
     case AARCH64_OPND_PSTATEFIELD:
-      for (i = 0; aarch64_pstatefields[i].name; ++i)
-	if (aarch64_pstatefields[i].value == opnd->pstatefield)
-	  break;
-      assert (aarch64_pstatefields[i].name);
-      snprintf (buf, size, "%s", aarch64_pstatefields[i].name);
-      break;
+	    for (i = 0; aarch64_pstatefields[i].name; ++i) {
+		    if (aarch64_pstatefields[i].value == opnd->pstatefield) {
+			    break;
+		    }
+	    }
+	    assert (aarch64_pstatefields[i].name);
+	    snprintf (buf, size, "%s", aarch64_pstatefields[i].name);
+	    break;
 
     case AARCH64_OPND_SYSREG_AT:
     case AARCH64_OPND_SYSREG_DC:
@@ -2634,18 +2670,18 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
 
     case AARCH64_OPND_BARRIER_ISB:
       /* Operand can be omitted, e.g. in DCPS1.  */
-      if (! optional_operand_p (opcode, idx)
-	  || (opnd->barrier->value
-	      != get_optional_operand_default_value (opcode)))
-	snprintf (buf, size, "0x%x", opnd->barrier->value);
+      if (!optional_operand_p (opcode, idx) || (opnd->barrier->value != get_optional_operand_default_value (opcode))) {
+	      snprintf (buf, size, "0x%x", opnd->barrier->value);
+      }
       break;
 
     case AARCH64_OPND_PRFOP:
-      if (opnd->prfop->name != NULL)
-	snprintf (buf, size, "%s", opnd->prfop->name);
-      else
-	snprintf (buf, size, "0x%02x", opnd->prfop->value);
-      break;
+	    if (opnd->prfop->name != NULL) {
+		    snprintf (buf, size, "%s", opnd->prfop->name);
+	    } else {
+		    snprintf (buf, size, "0x%02x", opnd->prfop->value);
+	    }
+	    break;
 
     default:
       assert (0);
diff --git a/libr/asm/arch/arm/armass.c b/libr/asm/arch/arm/armass.c
index 84b64b738e..faf484637f 100644
--- a/libr/asm/arch/arm/armass.c
+++ b/libr/asm/arch/arm/armass.c
@@ -47,8 +47,9 @@ enum {
 };
 
 static int strcmpnull(const char *a, const char *b) {
-	if (!a || !b)
+	if (!a || !b) {
 		return -1;
+	}
 	return strcmp (a, b);
 }
 
@@ -601,13 +602,17 @@ static char *getrange(char *s) {
 			p = s+1;
 			*p=0;
 		}
-		if (*s == '[' || *s == ']')
-			memmove (s, s+1, strlen (s+1)+1);
-		if (*s == '}')
+		if (*s == '[' || *s == ']') {
+			memmove (s, s + 1, strlen (s + 1) + 1);
+		}
+		if (*s == '}') {
 			*s = 0;
+		}
 		s++;
 	}
-	while (p && *p == ' ') p++;
+	while (p && *p == ' ') {
+		p++;
+	}
 	return p;
 }
 
@@ -656,8 +661,12 @@ static st32 getlistmask(char *input) {
 	}
 	otemp = temp;
 	while (*input != '\0') {
-		for (; *input == ' '; input++);
-		for (i = 0; input[i] != ',' && input[i] != '\0'; i++);
+		for (; *input == ' '; input++) {
+			;
+		}
+		for (i = 0; input[i] != ',' && input[i] != '\0'; i++) {
+			;
+		}
 		strncpy (temp, input, i);
 		temp[i] = 0;
 
@@ -666,7 +675,9 @@ static st32 getlistmask(char *input) {
 			input++;
 		}
 
-		for (i = 0; temp[i] != '-' && temp[i] != '\0'; i++);
+		for (i = 0; temp[i] != '-' && temp[i] != '\0'; i++) {
+			;
+		}
 		if (i == strlen (temp)) {
 			tempres = getreg (temp);
 			if (tempres == -1 || tempres > 15) {
@@ -966,7 +977,9 @@ void collect_list(char *input[]) {
 	int conc = 0;
 	int start, end = 0;
 	int arrsz;
-	for (arrsz = 1; input[arrsz] != NULL; arrsz++);
+	for (arrsz = 1; input[arrsz] != NULL; arrsz++) {
+		;
+	}
 
 	for (i = 0; input[i]; i++) {
 		if (conc) {
@@ -1112,7 +1125,9 @@ static ut32 getshift(const char *str) {
 //			i|=1; // use reg
 			i |= (1 << 4); // bitshift
 			i |= shift << 4; // set shift mode
-			if (shift == 6) i |= (1 << 20);
+			if (shift == 6) {
+				i |= (1 << 20);
+			}
 		} else {
 			char *bracket = strchr (arg, ']');
 			if (bracket) {
@@ -1120,7 +1135,9 @@ static ut32 getshift(const char *str) {
 			}
 			// ensure only the bottom 5 bits are used
 			i &= 0x1f;
-			if (!i) i = 32;
+			if (!i) {
+				i = 32;
+			}
 			i = (i * 8);
 			i |= shift; // lsl, ror, ...
 			i = i << 4;
@@ -1133,8 +1150,9 @@ static ut32 getshift(const char *str) {
 static void arm_opcode_parse(ArmOpcode *ao, const char *str) {
 	int i;
 	memset (ao, 0, sizeof (ArmOpcode));
-	if (strlen (str)+1>=sizeof (ao->op))
+	if (strlen (str) + 1 >= sizeof (ao->op)) {
 		return;
+	}
 	strncpy (ao->op, str, sizeof (ao->op)-1);
 	strcpy (ao->opstr, ao->op);
 	ao->a[0] = strchr (ao->op, ' ');
@@ -1142,7 +1160,9 @@ static void arm_opcode_parse(ArmOpcode *ao, const char *str) {
 		if (ao->a[i]) {
 			*ao->a[i] = 0;
 			ao->a[i+1] = strchr (++ao->a[i], ',');
-		} else break;
+		} else {
+			break;
+		}
 	}
 	if (ao->a[i]) {
 		*ao->a[i] = 0;
@@ -2790,9 +2810,10 @@ static int thumb_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 			if (ldrsel == 0) {
 				ao->a[1][strlen (ao->a[1]) - 1] = '\0';
 				ao->a[2] = "0]";
-			} else 
+			} else {
 				return -1;
-		        }
+			}
+			}
 			// intentional fallthrough
 		case THUMB_REG_BRACKREG_CONSTBRACK: {
 			st32 num = getnummemend (ao->a[2]);
@@ -6041,7 +6062,9 @@ static int findyz(int x, int *y, int *z) {
 	for (i = 0;i < 0xff; i++) {
 		for (j = 0;j < 0xf;j++) {
 			int v = i << j;
-			if (v > x) continue;
+			if (v > x) {
+				continue;
+			}
 			if (v == x) {
 				*y = i;
 				*z = 16 - (j / 2);
@@ -6061,160 +6084,164 @@ static int arm_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 		if (!strncmp (ao->op, ops[i].name, strlen (ops[i].name))) {
 			ao->o = ops[i].code;
 			arm_opcode_cond (ao, strlen(ops[i].name));
-			if (ao->a[0] || ops[i].type == TYPE_BKP)
-			switch (ops[i].type) {
-			case TYPE_MEM:
-				if (!strncmp (ops[i].name, "strex", 5)) {
-					rex = 1;
-				}
-				if (!strcmp (ops[i].name, "str") || !strcmp (ops[i].name, "ldr")) {
-					if (!ao->a[2]) {
-						ao->a[2] = "0";
+			if (ao->a[0] || ops[i].type == TYPE_BKP) {
+				switch (ops[i].type) {
+				case TYPE_MEM:
+					if (!strncmp (ops[i].name, "strex", 5)) {
+						rex = 1;
 					}
-				}
-				getrange (ao->a[0]);
-				getrange (ao->a[1]);
-				getrange (ao->a[2]);
-				if (ao->a[0] && ao->a[1]) {
-					char rn[8];
-					strncpy (rn, ao->a[1], 7);
-					int r0 = getreg (ao->a[0]);
-					int r1 = getreg (ao->a[1]);
-					if ( (r0 < 0 || r0 > 15) || (r1 > 15 || r1 < 0) ) {
-						return 0;
+					if (!strcmp (ops[i].name, "str") || !strcmp (ops[i].name, "ldr")) {
+						if (!ao->a[2]) {
+							ao->a[2] = "0";
+						}
 					}
-					ao->o |= r0 << 20;
-					if (!strcmp (ops[i].name, "strd")) {
-						r1 = getreg (ao->a[2]);
-						if (r1 == -1) {
+					getrange (ao->a[0]);
+					getrange (ao->a[1]);
+					getrange (ao->a[2]);
+					if (ao->a[0] && ao->a[1]) {
+						char rn[8];
+						strncpy (rn, ao->a[1], 7);
+						int r0 = getreg (ao->a[0]);
+						int r1 = getreg (ao->a[1]);
+						if ((r0 < 0 || r0 > 15) || (r1 > 15 || r1 < 0)) {
+							return 0;
+						}
+						ao->o |= r0 << 20;
+						if (!strcmp (ops[i].name, "strd")) {
+							r1 = getreg (ao->a[2]);
+							if (r1 == -1) {
+								break;
+							}
+							ao->o |= r1 << 8;
+							if (ao->a[3]) {
+								char *bracket = strchr (ao->a[3], ']');
+								if (bracket) {
+									*bracket = '\0';
+								}
+								int num = getnum (ao->a[3]);
+								ao->o |= (num & 0x0f) << 24;
+								ao->o |= ((num >> 4) & 0x0f) << 16;
+							}
 							break;
 						}
-						ao->o |= r1 << 8;
-						if (ao->a[3]) {
-							char *bracket = strchr (ao->a[3], ']');
-							if (bracket) {
-								*bracket = '\0';
-							}
-							int num = getnum (ao->a[3]);
-							ao->o |= (num & 0x0f) << 24;
-							ao->o |= ((num >> 4) & 0x0f) << 16;
-						}
-						break;
-					}
-					if (!strcmp (ops[i].name, "strh")) {
-						ao->o |=  r1 << 8;
-						if (ao->a[2]) {
-							reg = getreg (ao->a[2]);
-							if (reg != -1) {
-								ao->o |= reg << 24;
+						if (!strcmp (ops[i].name, "strh")) {
+							ao->o |= r1 << 8;
+							if (ao->a[2]) {
+								reg = getreg (ao->a[2]);
+								if (reg != -1) {
+									ao->o |= reg << 24;
+								} else {
+									ao->o |= 1 << 14;
+									ao->o |= getnum (ao->a[2]) << 24;
+								}
 							} else {
 								ao->o |= 1 << 14;
-								ao->o |= getnum (ao->a[2]) << 24;
 							}
+							break;
+						}
+						if (rex) {
+							ao->o |= r1 << 24;
 						} else {
-							ao->o |= 1 << 14;
+							ao->o |= r1 << 8; // delta
 						}
-						break;
-					}
-					if (rex) {
-						ao->o |=  r1 << 24;
 					} else {
-						ao->o |=  r1 << 8; // delta
-					}
-				} else {
-					return 0;
-				}
-
-				ret = getreg (ao->a[2]);
-				if (ret != -1) {
-					if (rex) {
-						ao->o |= 1;
-						ao->o |= (ret & 0x0f) << 8;
-					} else {
-						ao->o |= (strstr (str,"],")) ? 6 : 7;
-						ao->o |= (ret & 0x0f) << 24;
-					}
-					if (ao->a[3]) {
-						shift = getshift (ao->a[3]);
-						low = shift & 0xFF;
-						high = shift & 0xFF00;
-						ao->o |= low << 24;
-						ao->o |= high << 8;
-					}
-				} else {
-					int num = getnum (ao->a[2]) & 0xfff;
-					if (err) {
-						break;
-					}
-					if (rex) {
-						ao->o |= 1;
-					} else {
-						ao->o |= (strstr (str, "],")) ? 4 : 5;
-					}
-					ao->o |= 1;
-					ao->o |= (num & 0xff) << 24;
-					ao->o |= ((num >> 8) & 0xf) << 16;
-				}
-
-				break;
-			case TYPE_IMM:
-				if (*ao->a[0] ++== '{') {
-					for (j = 0; j < 16; j++) {
-						if (ao->a[j] && *ao->a[j]) {
-							getrange (ao->a[j]); // XXX filter regname string
-							reg = getreg (ao->a[j]);
-							if (reg != -1) {
-								if (reg < 8)
-									ao->o |= 1 << (24 + reg);
-								else
-									ao->o |= 1 << (8 + reg);
-							}
-						}
-					}
-				} else ao->o |= getnum (ao->a[0]) << 24; // ???
-				break;
-			case TYPE_BRA:
-				if ((ret = getreg (ao->a[0])) == -1) {
-					// TODO: control if branch out of range
-					ret = (getnum (ao->a[0]) - (int)ao->off - 8) / 4;
-					if (ret >= 0x00800000 || ret < (int)0xff800000) {
-						eprintf("Branch into out of range\n");
 						return 0;
 					}
-					ao->o |= ((ret >> 16) & 0xff) << 8;
-					ao->o |= ((ret >> 8) & 0xff) << 16;
-					ao->o |= ((ret) & 0xff) << 24;
-				} else {
-					eprintf("This branch does not accept reg as arg\n");
-					return 0;
-				}
-				break;
-			case TYPE_BKP:
-				ao->o |= 0x70 << 24;
-				if (ao->a[0]) {
-					int n = getnum (ao->a[0]);
-					ao->o |= ((n & 0xf) << 24);
-					ao->o |= (((n >> 4) & 0xff) << 16);
-				}
-				break;
-			case TYPE_BRR:
-				if ((ret = getreg (ao->a[0])) == -1) {
-					ut32 dst = getnum (ao->a[0]);
-					dst -= (ao->off + 8);
-					if (dst & 0x2) {
-						ao->o = 0xfb;
+
+					ret = getreg (ao->a[2]);
+					if (ret != -1) {
+						if (rex) {
+							ao->o |= 1;
+							ao->o |= (ret & 0x0f) << 8;
+						} else {
+							ao->o |= (strstr (str, "],")) ? 6 : 7;
+							ao->o |= (ret & 0x0f) << 24;
+						}
+						if (ao->a[3]) {
+							shift = getshift (ao->a[3]);
+							low = shift & 0xFF;
+							high = shift & 0xFF00;
+							ao->o |= low << 24;
+							ao->o |= high << 8;
+						}
 					} else {
-						ao->o = 0xfa;
+						int num = getnum (ao->a[2]) & 0xfff;
+						if (err) {
+							break;
+						}
+						if (rex) {
+							ao->o |= 1;
+						} else {
+							ao->o |= (strstr (str, "],")) ? 4 : 5;
+						}
+						ao->o |= 1;
+						ao->o |= (num & 0xff) << 24;
+						ao->o |= ((num >> 8) & 0xf) << 16;
 					}
-					dst /= 4;
-					ao->o |= ((dst >> 16) & 0xff) << 8;
-					ao->o |= ((dst >> 8) & 0xff) << 16;
-					ao->o |= ((dst) & 0xff) << 24;
-					return 4;
-				} else ao->o |= (getreg (ao->a[0]) << 24);
-				break;
-			case TYPE_HLT:
-				{
+
+					break;
+				case TYPE_IMM:
+					if (*ao->a[0]++ == '{') {
+						for (j = 0; j < 16; j++) {
+							if (ao->a[j] && *ao->a[j]) {
+								getrange (ao->a[j]); // XXX filter regname string
+								reg = getreg (ao->a[j]);
+								if (reg != -1) {
+									if (reg < 8) {
+										ao->o |= 1 << (24 + reg);
+									} else {
+										ao->o |= 1 << (8 + reg);
+									}
+								}
+							}
+						}
+					} else {
+						ao->o |= getnum (ao->a[0]) << 24; // ???
+					}
+					break;
+				case TYPE_BRA:
+					if ((ret = getreg (ao->a[0])) == -1) {
+						// TODO: control if branch out of range
+						ret = (getnum (ao->a[0]) - (int)ao->off - 8) / 4;
+						if (ret >= 0x00800000 || ret < (int)0xff800000) {
+							eprintf ("Branch into out of range\n");
+							return 0;
+						}
+						ao->o |= ((ret >> 16) & 0xff) << 8;
+						ao->o |= ((ret >> 8) & 0xff) << 16;
+						ao->o |= ((ret)&0xff) << 24;
+					} else {
+						eprintf ("This branch does not accept reg as arg\n");
+						return 0;
+					}
+					break;
+				case TYPE_BKP:
+					ao->o |= 0x70 << 24;
+					if (ao->a[0]) {
+						int n = getnum (ao->a[0]);
+						ao->o |= ((n & 0xf) << 24);
+						ao->o |= (((n >> 4) & 0xff) << 16);
+					}
+					break;
+				case TYPE_BRR:
+					if ((ret = getreg (ao->a[0])) == -1) {
+						ut32 dst = getnum (ao->a[0]);
+						dst -= (ao->off + 8);
+						if (dst & 0x2) {
+							ao->o = 0xfb;
+						} else {
+							ao->o = 0xfa;
+						}
+						dst /= 4;
+						ao->o |= ((dst >> 16) & 0xff) << 8;
+						ao->o |= ((dst >> 8) & 0xff) << 16;
+						ao->o |= ((dst)&0xff) << 24;
+						return 4;
+					} else {
+						ao->o |= (getreg (ao->a[0]) << 24);
+					}
+					break;
+				case TYPE_HLT: {
 					ut32 o = 0, n = getnum (ao->a[0]);
 					o |= ((n >> 12) & 0xf) << 8;
 					o |= ((n >> 8) & 0xf) << 20;
@@ -6274,9 +6301,10 @@ static int arm_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 						return 0;
 					}
 				}
-				if (0xff == ((ao->o >> 16) & 0xff))
+				if (0xff == ((ao->o >> 16) & 0xff)) {
 					return 0;
 				}
+				}
 				break;
 			case TYPE_MOV:
 				if (!strcmpnull (ao->op, "movs")) {
@@ -6382,8 +6410,9 @@ static int arm_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 				} else {
 					ao->o |= (a << 8);
 					ao->o |= (b << 24);
-					if (ao->a[2])
+					if (ao->a[2]) {
 						ao->o |= getshift (ao->a[2]);
+					}
 				}
 				if (ao->a[2]) {
 					int n = getnum (ao->a[2]);
@@ -6504,6 +6533,7 @@ static int arm_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 
 				break;
 			}
+			}
 			return 1;
 		}
 	}
diff --git a/libr/asm/arch/arm/gnu/arm-dis.c b/libr/asm/arch/arm/gnu/arm-dis.c
index 1cc0cad9c2..6092f126e0 100644
--- a/libr/asm/arch/arm/gnu/arm-dis.c
+++ b/libr/asm/arch/arm/gnu/arm-dis.c
@@ -3283,13 +3283,16 @@ arm_decode_bitfield (const char *ptr,
       int start, end;
       int bits;
 
-      for (start = 0; *ptr >= '0' && *ptr <= '9'; ptr++)
-	start = start * 10 + *ptr - '0';
-      if (*ptr == '-')
-	for (end = 0, ptr++; *ptr >= '0' && *ptr <= '9'; ptr++)
-	  end = end * 10 + *ptr - '0';
-      else
-	end = start;
+      for (start = 0; *ptr >= '0' && *ptr <= '9'; ptr++) {
+	      start = start * 10 + *ptr - '0';
+      }
+      if (*ptr == '-') {
+	      for (end = 0, ptr++; *ptr >= '0' && *ptr <= '9'; ptr++) {
+		      end = end * 10 + *ptr - '0';
+	      }
+      } else {
+	      end = start;
+      }
       bits = end - start;
       if (bits < 0) {
 return NULL;
@@ -3299,8 +3302,9 @@ return NULL;
     }
   while (*ptr++ == ',');
   *valuep = value;
-  if (widthp)
-    *widthp = width;
+  if (widthp) {
+	  *widthp = width;
+  }
   return ptr - 1;
 }
 
@@ -3328,18 +3332,19 @@ arm_decode_shift (long given, fprintf_ftype func, void *stream,
 	      amount = 32;
 	    }
 
-	  if (print_shift)
-	    func (stream, ", %s %d", arm_shift[shift], amount);
-	  else
-	    func (stream, ", %d", amount);
-	}
-      else if ((given & 0x80) == 0x80)
-	func (stream, " ; <illegal shifter operand>");
-      else if (print_shift)
-	func (stream, ", %s %s", arm_shift[(given & 0x60) >> 5],
-	      arm_regnames[(given & 0xf00) >> 8]);
-      else
-	func (stream, ", %s", arm_regnames[(given & 0xf00) >> 8]);
+	    if (print_shift) {
+		    func (stream, ", %s %d", arm_shift[shift], amount);
+	    } else {
+		    func (stream, ", %d", amount);
+	    }
+      } else if ((given & 0x80) == 0x80) {
+	      func (stream, " ; <illegal shifter operand>");
+      } else if (print_shift) {
+	      func (stream, ", %s %s", arm_shift[(given & 0x60) >> 5],
+		      arm_regnames[(given & 0xf00) >> 8]);
+      } else {
+	      func (stream, ", %s", arm_regnames[(given & 0xf00) >> 8]);
+      }
     }
 }
 
@@ -3382,26 +3387,24 @@ print_insn_coprocessor (bfd_vma pc,
       // long value_in_comment = 0;
       const char *c;
 
-      if (ARM_FEATURE_ZERO (insn->arch))
-	switch (insn->value)
-	  {
-	  case SENTINEL_IWMMXT_START:
-	    if (info->mach != bfd_mach_arm_XScale
-		&& info->mach != bfd_mach_arm_iWMMXt
-		&& info->mach != bfd_mach_arm_iWMMXt2)
-	      do
-		insn++;
-	      while ((! ARM_FEATURE_ZERO (insn->arch))
-		     && insn->value != SENTINEL_IWMMXT_END);
-	    continue;
+      if (ARM_FEATURE_ZERO (insn->arch)) {
+	      switch (insn->value) {
+	      case SENTINEL_IWMMXT_START:
+		      if (info->mach != bfd_mach_arm_XScale && info->mach != bfd_mach_arm_iWMMXt && info->mach != bfd_mach_arm_iWMMXt2) {
+			      do {
+				      insn++;
+			      } while ((!ARM_FEATURE_ZERO (insn->arch)) && insn->value != SENTINEL_IWMMXT_END);
+		      }
+		      continue;
 
-	  case SENTINEL_IWMMXT_END:
-	    continue;
+	      case SENTINEL_IWMMXT_END:
+		      continue;
 
-	  case SENTINEL_GENERIC_START:
-	    ARM_FEATURE_COPY (allowed_arches, private_data->features);
-	    continue;
-	  }
+	      case SENTINEL_GENERIC_START:
+		      ARM_FEATURE_COPY (allowed_arches, private_data->features);
+		      continue;
+	      }
+      }
 
       mask = insn->mask;
       value = insn->value;
@@ -3414,10 +3417,11 @@ print_insn_coprocessor (bfd_vma pc,
 	     encoding is the same.  */
 	  mask |= 0xf0000000;
 	  value |= 0xe0000000;
-	  if (ifthen_state)
-	    cond = IFTHEN_COND;
-	  else
-	    cond = COND_UNCOND;
+	  if (ifthen_state) {
+		  cond = IFTHEN_COND;
+	  } else {
+		  cond = COND_UNCOND;
+	  }
 	}
       else
 	{
@@ -3431,24 +3435,28 @@ print_insn_coprocessor (bfd_vma pc,
 	  else
 	    {
 	      cond = (given >> 28) & 0xf;
-	      if (cond == 0xe)
-		cond = COND_UNCOND;
+	      if (cond == 0xe) {
+		      cond = COND_UNCOND;
+	      }
 	    }
 	}
 
-      if ((given & mask) != value)
-	continue;
+	if ((given & mask) != value) {
+		continue;
+	}
 
-      if (! ARM_CPU_HAS_FEATURE (insn->arch, allowed_arches))
-	continue;
+	if (!ARM_CPU_HAS_FEATURE (insn->arch, allowed_arches)) {
+		continue;
+	}
 
-      if (insn->value == 0xfe000010     /* mcr2  */
-	  || insn->value == 0xfe100010  /* mrc2  */
-	  || insn->value == 0xfc100000  /* ldc2  */
-	  || insn->value == 0xfc000000) /* stc2  */
+	if (insn->value == 0xfe000010	 /* mcr2  */
+		|| insn->value == 0xfe100010  /* mrc2  */
+		|| insn->value == 0xfc100000  /* ldc2  */
+		|| insn->value == 0xfc000000) /* stc2  */
 	{
-	  if (cp_num == 9 || cp_num == 10 || cp_num == 11)
-	    is_unpredictable = TRUE;
+		if (cp_num == 9 || cp_num == 10 || cp_num == 11) {
+			is_unpredictable = TRUE;
+		}
 	}
       else if (insn->value == 0x0e000000     /* cdp  */
 	       || insn->value == 0xfe000000  /* cdp2  */
@@ -3458,8 +3466,9 @@ print_insn_coprocessor (bfd_vma pc,
 	       || insn->value == 0x0c000000) /* stc  */
 	{
 	  /* Floating-point instructions.  */
-	  if (cp_num == 9 || cp_num == 10 || cp_num == 11)
-	    continue;
+	  if (cp_num == 9 || cp_num == 10 || cp_num == 11) {
+		  continue;
+	  }
 	}
 
       for (c = insn->assembler; *c; c++)
@@ -3482,29 +3491,32 @@ print_insn_coprocessor (bfd_vma pc,
 		    if (PRE_BIT_SET || WRITEBACK_BIT_SET)
 		      {
 			/* Not unindexed.  The offset is scaled.  */
-			if (cp_num == 9)
-			  /* vldr.16/vstr.16 will shift the address
+			if (cp_num == 9) {
+				/* vldr.16/vstr.16 will shift the address
 			     left by 1 bit only.  */
-			  offset = offset * 2;
-			else
-			  offset = offset * 4;
+				offset = offset * 2;
+			} else {
+				offset = offset * 4;
+			}
 
-			if (NEGATIVE_BIT_SET)
-			  offset = - offset;
-		//	if (rn != 15)
-			  // value_in_comment = offset;
+			if (NEGATIVE_BIT_SET) {
+				offset = -offset;
+			}
+			//	if (rn != 15)
+			// value_in_comment = offset;
 		      }
 
 		    if (PRE_BIT_SET)
 		      {
-			if (offset)
-			  func (stream, ", 0x%x]%s",
-				(int) offset,
-				WRITEBACK_BIT_SET ? "!" : "");
-			else if (NEGATIVE_BIT_SET)
-			  func (stream, ", #-0]");
-			else
-			  func (stream, "]");
+			    if (offset) {
+				    func (stream, ", 0x%x]%s",
+					    (int)offset,
+					    WRITEBACK_BIT_SET ? "!" : "");
+			    } else if (NEGATIVE_BIT_SET) {
+				    func (stream, ", #-0]");
+			    } else {
+				    func (stream, "]");
+			    }
 		      }
 		    else
 		      {
@@ -3512,10 +3524,11 @@ print_insn_coprocessor (bfd_vma pc,
 
 			if (WRITEBACK_BIT_SET)
 			  {
-			    if (offset)
-			      func (stream, ", 0x%x", (int) offset);
-			    else if (NEGATIVE_BIT_SET)
-			      func (stream, ", #-0");
+				if (offset) {
+					func (stream, ", 0x%x", (int)offset);
+				} else if (NEGATIVE_BIT_SET) {
+					func (stream, ", #-0");
+				}
 			  }
 			else
 			  {
@@ -3543,26 +3556,29 @@ print_insn_coprocessor (bfd_vma pc,
 		    int regno = ((given >> 12) & 0xf) | ((given >> (22 - 4)) & 0x10);
 		    int offset = (given >> 1) & 0x3f;
 
-		    if (offset == 1)
-		      func (stream, "{d%d}", regno);
-		    else if (regno + offset > 32)
-		      func (stream, "{d%d-<overflow reg d%d>}", regno, regno + offset - 1);
-		    else
-		      func (stream, "{d%d-d%d}", regno, regno + offset - 1);
+		    if (offset == 1) {
+			    func (stream, "{d%d}", regno);
+		    } else if (regno + offset > 32) {
+			    func (stream, "{d%d-<overflow reg d%d>}", regno, regno + offset - 1);
+		    } else {
+			    func (stream, "{d%d-d%d}", regno, regno + offset - 1);
+		    }
 		  }
 		  break;
 
 		case 'u':
-		  if (cond != COND_UNCOND)
-		    is_unpredictable = TRUE;
+			if (cond != COND_UNCOND) {
+				is_unpredictable = TRUE;
+			}
 
-		  /* Fall through.  */
+			/* Fall through.  */
 		case 'c':
-		  if (cond != COND_UNCOND && cp_num == 9)
-		    is_unpredictable = TRUE;
+			if (cond != COND_UNCOND && cp_num == 9) {
+				is_unpredictable = TRUE;
+			}
 
-		  func (stream, "%s", arm_conditional[cond]);
-		  break;
+			func (stream, "%s", arm_conditional[cond]);
+			break;
 
 		case 'I':
 		  /* Print a Cirrus/DSP shift immediate.  */
@@ -3575,8 +3591,9 @@ print_insn_coprocessor (bfd_vma pc,
 		    imm = (given & 0xf) | ((given & 0xe0) >> 1);
 
 		    /* Is ``imm'' a negative number?  */
-		    if (imm & 0x40)
-		      imm -= 0x80;
+		    if (imm & 0x40) {
+			    imm -= 0x80;
+		    }
 
 		    func (stream, "%d", imm);
 		  }
@@ -3663,36 +3680,40 @@ print_insn_coprocessor (bfd_vma pc,
 		    switch (*c)
 		      {
 		      case 'R':
-			if (value == 15)
-			  is_unpredictable = TRUE;
-			/* Fall through.  */
+			      if (value == 15) {
+				      is_unpredictable = TRUE;
+			      }
+			      /* Fall through.  */
 		      case 'r':
 			if (c[1] == 'u')
 			  {
 			    /* Eat the 'u' character.  */
 			    ++ c;
 
-			    if (u_reg == value)
-			      is_unpredictable = TRUE;
+			    if (u_reg == value) {
+				    is_unpredictable = TRUE;
+			    }
 			    u_reg = value;
 			  }
                         func (stream, "%s", arm_regnames [value & 0xf]);
 
 			break;
 		      case 'V':
-			if (given & (1 << 6))
-			  goto Q;
-			/* FALLTHROUGH */
+			      if (given & (1 << 6)) {
+				      goto Q;
+			      }
+			      /* FALLTHROUGH */
 		      case 'D':
 			func (stream, "d%ld", value);
 			break;
 		      case 'Q':
 		      Q:
-			if (value & 1)
-			  func (stream, "<illegal reg q%ld.5>", value >> 1);
-			else
-			  func (stream, "q%ld", value >> 1);
-			break;
+			      if (value & 1) {
+				      func (stream, "<illegal reg q%ld.5>", value >> 1);
+			      } else {
+				      func (stream, "q%ld", value >> 1);
+			      }
+			      break;
 		      case 'd':
 			func (stream, "%ld", value);
 			// value_in_comment = value;
@@ -3711,20 +3732,21 @@ print_insn_coprocessor (bfd_vma pc,
 			    (78125 << (((floatVal >> 23) & 0xFF) - 124)) *
 			    (16 + (value & 0xF));
 
-			  if (!(decVal % 1000000))
-			    func (stream, "%ld ; 0x%08x %c%u.%01u", value,
-				  floatVal, value & 0x80 ? '-' : ' ',
-				  decVal / 10000000,
-				  decVal % 10000000 / 1000000);
-			  else if (!(decVal % 10000))
-			    func (stream, "%ld ; 0x%08x %c%u.%03u", value,
-				  floatVal, value & 0x80 ? '-' : ' ',
-				  decVal / 10000000,
-				  decVal % 10000000 / 10000);
-			  else
-			    func (stream, "%ld ; 0x%08x %c%u.%07u", value,
-				  floatVal, value & 0x80 ? '-' : ' ',
-				  decVal / 10000000, decVal % 10000000);
+			  if (!(decVal % 1000000)) {
+				  func (stream, "%ld ; 0x%08x %c%u.%01u", value,
+					  floatVal, value & 0x80 ? '-' : ' ',
+					  decVal / 10000000,
+					  decVal % 10000000 / 1000000);
+			  } else if (!(decVal % 10000)) {
+				  func (stream, "%ld ; 0x%08x %c%u.%03u", value,
+					  floatVal, value & 0x80 ? '-' : ' ',
+					  decVal / 10000000,
+					  decVal % 10000000 / 10000);
+			  } else {
+				  func (stream, "%ld ; 0x%08x %c%u.%07u", value,
+					  floatVal, value & 0x80 ? '-' : ' ',
+					  decVal / 10000000, decVal % 10000000);
+			  }
 			  break;
 			}
 		      case 'k':
@@ -3735,18 +3757,20 @@ print_insn_coprocessor (bfd_vma pc,
 			break;
 
 		      case 'f':
-			if (value > 7)
-			  func (stream, "%s", arm_fp_const[value & 7]);
-			else
-			  func (stream, "f%ld", value);
-			break;
+			      if (value > 7) {
+				      func (stream, "%s", arm_fp_const[value & 7]);
+			      } else {
+				      func (stream, "f%ld", value);
+			      }
+			      break;
 
 		      case 'w':
-			if (width == 2)
-			  func (stream, "%s", iwmmxt_wwnames[value]);
-			else
-			  func (stream, "%s", iwmmxt_wwssnames[value]);
-			break;
+			      if (width == 2) {
+				      func (stream, "%s", iwmmxt_wwnames[value]);
+			      } else {
+				      func (stream, "%s", iwmmxt_wwssnames[value]);
+			      }
+			      break;
 
 		      case 'g':
 			func (stream, "%s", iwmmxt_regnames[value]);
@@ -3786,13 +3810,15 @@ print_insn_coprocessor (bfd_vma pc,
 
 		      case '`':
 			c++;
-			if (value == 0)
-			  func (stream, "%c", *c);
+			if (value == 0) {
+				func (stream, "%c", *c);
+			}
 			break;
 		      case '\'':
 			c++;
-			if (value == ((1ul << width) - 1))
-			  func (stream, "%c", *c);
+			if (value == ((1ul << width) - 1)) {
+				func (stream, "%c", *c);
+			}
 			break;
 		      case '?':
 			func (stream, "%c", c[(1 << width) - (int) value]);
@@ -3818,9 +3844,9 @@ print_insn_coprocessor (bfd_vma pc,
 			    {
 			      regno <<= 1;
 			      regno += (given >> 5) & 1;
-			    }
-			  else
-			    regno += ((given >> 5) & 1) << 4;
+			  } else {
+				  regno += ((given >> 5) & 1) << 4;
+			  }
 			  break;
 
 			case '1': /* Sd, Dd */
@@ -3829,9 +3855,9 @@ print_insn_coprocessor (bfd_vma pc,
 			    {
 			      regno <<= 1;
 			      regno += (given >> 22) & 1;
-			    }
-			  else
-			    regno += ((given >> 22) & 1) << 4;
+			  } else {
+				  regno += ((given >> 22) & 1) << 4;
+			  }
 			  break;
 
 			case '2': /* Sn, Dn */
@@ -3840,9 +3866,9 @@ print_insn_coprocessor (bfd_vma pc,
 			    {
 			      regno <<= 1;
 			      regno += (given >> 7) & 1;
-			    }
-			  else
-			    regno += ((given >> 7) & 1) << 4;
+			  } else {
+				  regno += ((given >> 7) & 1) << 4;
+			  }
 			  break;
 
 			case '3': /* List */
@@ -3852,9 +3878,9 @@ print_insn_coprocessor (bfd_vma pc,
 			    {
 			      regno <<= 1;
 			      regno += (given >> 22) & 1;
-			    }
-			  else
-			    regno += ((given >> 22) & 1) << 4;
+			  } else {
+				  regno += ((given >> 22) & 1) << 4;
+			  }
 			  break;
 
 			default:
@@ -3867,8 +3893,9 @@ print_insn_coprocessor (bfd_vma pc,
 			{
 			  int count = given & 0xff;
 
-			  if (single == 0)
-			    count >>= 1;
+			  if (single == 0) {
+				  count >>= 1;
+			  }
 
 			  if (--count)
 			    {
@@ -3878,10 +3905,10 @@ print_insn_coprocessor (bfd_vma pc,
 			    }
 
 			  func (stream, "}");
-			}
-		      else if (*c == '4')
-			func (stream, ", %c%d", single ? 's' : 'd',
-			      regno + 1);
+		      } else if (*c == '4') {
+			      func (stream, ", %c%d", single ? 's' : 'd',
+				      regno + 1);
+		      }
 		    }
 		    break;
 
@@ -3926,18 +3953,19 @@ print_insn_coprocessor (bfd_vma pc,
 
 		      if (offset)
 			{
-			  if (PRE_BIT_SET)
-			    func (stream, ", %s%d]%s",
-				  NEGATIVE_BIT_SET ? "-" : "",
-				  offset * multiplier,
-				  WRITEBACK_BIT_SET ? "!" : "");
-			  else
-			    func (stream, "], %s%d",
-				  NEGATIVE_BIT_SET ? "-" : "",
-				  offset * multiplier);
-			}
-		      else
-			func (stream, "]");
+			      if (PRE_BIT_SET) {
+				      func (stream, ", %s%d]%s",
+					      NEGATIVE_BIT_SET ? "-" : "",
+					      offset * multiplier,
+					      WRITEBACK_BIT_SET ? "!" : "");
+			      } else {
+				      func (stream, "], %s%d",
+					      NEGATIVE_BIT_SET ? "-" : "",
+					      offset * multiplier);
+			      }
+		      } else {
+			      func (stream, "]");
+		      }
 		    }
 		    break;
 
@@ -3954,8 +3982,9 @@ print_insn_coprocessor (bfd_vma pc,
 			case 1:
 			case 3:
 			  func (stream, "[%s], %c%s", rn, ubit ? '+' : '-', rm);
-			  if (imm4)
-			    func (stream, ", lsl %d", imm4);
+			  if (imm4) {
+				  func (stream, ", lsl %d", imm4);
+			  }
 			  break;
 
 			case 4:
@@ -3963,11 +3992,13 @@ print_insn_coprocessor (bfd_vma pc,
 			case 6:
 			case 7:
 			  func (stream, "[%s, %c%s", rn, ubit ? '+' : '-', rm);
-			  if (imm4 > 0)
-			    func (stream, ", lsl %d", imm4);
+			  if (imm4 > 0) {
+				  func (stream, ", lsl %d", imm4);
+			  }
 			  func (stream, "]");
-			  if (puw_bits == 5 || puw_bits == 7)
-			    func (stream, "!");
+			  if (puw_bits == 5 || puw_bits == 7) {
+				  func (stream, "!");
+			  }
 			  break;
 
 			default:
@@ -3985,9 +4016,9 @@ print_insn_coprocessor (bfd_vma pc,
 		    break;
 		  }
 		}
-	    }
-	  else
-	    func (stream, "%c", *c);
+	  } else {
+		  func (stream, "%c", *c);
+	  }
 	}
 
 #if 0
@@ -3995,10 +4026,11 @@ print_insn_coprocessor (bfd_vma pc,
 	func (stream, " ; 0x%lx", (value_in_comment & 0xffffffffUL));
 #endif
 
-      if (is_unpredictable)
-	func (stream, UNPREDICTABLE_INSTRUCTION);
+	if (is_unpredictable) {
+		func (stream, UNPREDICTABLE_INSTRUCTION);
+	}
 
-      return TRUE;
+	return TRUE;
     }
   return FALSE;
 }
@@ -4026,11 +4058,13 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
 	{
 	  /* Pre-indexed.  Elide offset of positive zero when
 	     non-writeback.  */
-	  if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET || offset)
-	    func (stream, ", %s%d", NEGATIVE_BIT_SET ? "-" : "", (int) offset);
+	  if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET || offset) {
+		  func (stream, ", %s%d", NEGATIVE_BIT_SET ? "-" : "", (int)offset);
+	  }
 
-	  if (NEGATIVE_BIT_SET)
-	    offset = -offset;
+	  if (NEGATIVE_BIT_SET) {
+		  offset = -offset;
+	  }
 
 	  offset += pc + 8;
 
@@ -4063,8 +4097,9 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
 	    {
 	      /* Elide offset of positive zero when non-writeback.  */
 	      offset = given & 0xfff;
-	      if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET || offset)
-		func (stream, ", %s%d", NEGATIVE_BIT_SET ? "-" : "", (int) offset);
+	      if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET || offset) {
+		      func (stream, ", %s%d", NEGATIVE_BIT_SET ? "-" : "", (int)offset);
+	      }
 	    }
 	  else
 	    {
@@ -4091,8 +4126,9 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
 	      arm_decode_shift (given, func, stream, TRUE);
 	    }
 	}
-      if (NEGATIVE_BIT_SET)
-	offset = -offset;
+	if (NEGATIVE_BIT_SET) {
+		offset = -offset;
+	}
     }
 
   return (signed long) offset;
@@ -4117,15 +4153,16 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 	  unsigned long bit28 = given & (1 << 28);
 
 	  given &= 0x00ffffff;
-	  if (bit28)
-            given |= 0xf3000000;
-          else
-	    given |= 0xf2000000;
-	}
-      else if ((given & 0xff000000) == 0xf9000000)
-	given ^= 0xf9000000 ^ 0xf4000000;
-      else
-	return FALSE;
+	  if (bit28) {
+		  given |= 0xf3000000;
+	  } else {
+		  given |= 0xf2000000;
+	  }
+      } else if ((given & 0xff000000) == 0xf9000000) {
+	      given ^= 0xf9000000 ^ 0xf4000000;
+      } else {
+	      return FALSE;
+      }
     }
 
   for (insn = neon_opcodes; insn->assembler; insn++)
@@ -4147,14 +4184,16 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 		      break;
 
 		    case 'u':
-		      if (thumb && ifthen_state)
-			is_unpredictable = TRUE;
+			    if (thumb && ifthen_state) {
+				    is_unpredictable = TRUE;
+			    }
 
-		      /* Fall through.  */
+			    /* Fall through.  */
 		    case 'c':
-		      if (thumb && ifthen_state)
-			func (stream, "%s", arm_conditional[IFTHEN_COND]);
-		      break;
+			    if (thumb && ifthen_state) {
+				    func (stream, "%s", arm_conditional[IFTHEN_COND]);
+			    }
+			    break;
 
 		    case 'A':
 		      {
@@ -4182,21 +4221,25 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 			int ix;
 
 			func (stream, "{");
-			if (stride > 1)
-			  for (ix = 0; ix != n; ix++)
-			    func (stream, "%sd%d", ix ? "," : "", rd + ix * stride);
-			else if (n == 1)
-			  func (stream, "d%d", rd);
-			else
-			  func (stream, "d%d-d%d", rd, rd + n - 1);
+			if (stride > 1) {
+				for (ix = 0; ix != n; ix++) {
+					func (stream, "%sd%d", ix ? "," : "", rd + ix * stride);
+				}
+			} else if (n == 1) {
+				func (stream, "d%d", rd);
+			} else {
+				func (stream, "d%d-d%d", rd, rd + n - 1);
+			}
 			func (stream, "}, [%s", arm_regnames[rn]);
-			if (align)
-			  func (stream, " :%d", 32 << align);
+			if (align) {
+				func (stream, " :%d", 32 << align);
+			}
 			func (stream, "]");
-			if (rm == 0xd)
-			  func (stream, "!");
-			else if (rm != 0xf)
-			  func (stream, ", %s", arm_regnames[rm]);
+			if (rm == 0xd) {
+				func (stream, "!");
+			} else if (rm != 0xf) {
+				func (stream, ", %s", arm_regnames[rm]);
+			}
 		      }
 		      break;
 
@@ -4213,62 +4256,70 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
                         int stride = 1;
                         int i;
 
-                        if (length > 1 && size > 0)
-                          stride = (idx_align & (1 << size)) ? 2 : 1;
+			if (length > 1 && size > 0) {
+				stride = (idx_align & (1 << size)) ? 2 : 1;
+			}
 
-                        switch (length)
+			switch (length)
                           {
                           case 1:
                             {
                               int amask = (1 << size) - 1;
-                              if ((idx_align & (1 << size)) != 0)
-                                return FALSE;
-                              if (size > 0)
+			      if ((idx_align & (1 << size)) != 0) {
+				      return FALSE;
+			      }
+			      if (size > 0)
                                 {
-                                  if ((idx_align & amask) == amask)
-                                    align = 8 << size;
-                                  else if ((idx_align & amask) != 0)
-                                    return FALSE;
-                                }
+				      if ((idx_align & amask) == amask) {
+					      align = 8 << size;
+				      } else if ((idx_align & amask) != 0) {
+					      return FALSE;
+				      }
+				}
                               }
                             break;
 
                           case 2:
-                            if (size == 2 && (idx_align & 2) != 0)
-                              return FALSE;
-                            align = (idx_align & 1) ? 16 << size : 0;
-                            break;
+				  if (size == 2 && (idx_align & 2) != 0) {
+					  return FALSE;
+				  }
+				  align = (idx_align & 1) ? 16 << size : 0;
+				  break;
 
                           case 3:
-                            if ((size == 2 && (idx_align & 3) != 0)
-                                || (idx_align & 1) != 0)
-                              return FALSE;
-                            break;
+				  if ((size == 2 && (idx_align & 3) != 0) || (idx_align & 1) != 0) {
+					  return FALSE;
+				  }
+				  break;
 
                           case 4:
                             if (size == 2)
                               {
-                                if ((idx_align & 3) == 3)
-                                  return FALSE;
-                                align = (idx_align & 3) * 64;
-                              }
-                            else
-                              align = (idx_align & 1) ? 32 << size : 0;
-                            break;
+				    if ((idx_align & 3) == 3) {
+					    return FALSE;
+				    }
+				    align = (idx_align & 3) * 64;
+			    } else {
+				    align = (idx_align & 1) ? 32 << size : 0;
+			    }
+			    break;
                           }
 
 			func (stream, "{");
-                        for (i = 0; i < length; i++)
-                          func (stream, "%sd%d[%d]", (i == 0) ? "" : ",",
-                            rd + i * stride, idx);
-                        func (stream, "}, [%s", arm_regnames[rn]);
-			if (align)
-			  func (stream, " :%d", align);
+			for (i = 0; i < length; i++) {
+				func (stream, "%sd%d[%d]", (i == 0) ? "" : ",",
+					rd + i * stride, idx);
+			}
+			func (stream, "}, [%s", arm_regnames[rn]);
+			if (align) {
+				func (stream, " :%d", align);
+			}
 			func (stream, "]");
-			if (rm == 0xd)
-			  func (stream, "!");
-			else if (rm != 0xf)
-			  func (stream, ", %s", arm_regnames[rm]);
+			if (rm == 0xd) {
+				func (stream, "!");
+			} else if (rm != 0xf) {
+				func (stream, ", %s", arm_regnames[rm]);
+			}
 		      }
 		      break;
 
@@ -4284,35 +4335,41 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 			int stride = ((given >> 5) & 0x1);
 			int ix;
 
-			if (stride && (n == 1))
-			  n++;
-			else
-			  stride++;
+			if (stride && (n == 1)) {
+				n++;
+			} else {
+				stride++;
+			}
 
 			func (stream, "{");
-			if (stride > 1)
-			  for (ix = 0; ix != n; ix++)
-			    func (stream, "%sd%d[]", ix ? "," : "", rd + ix * stride);
-			else if (n == 1)
-			  func (stream, "d%d[]", rd);
-			else
-			  func (stream, "d%d[]-d%d[]", rd, rd + n - 1);
+			if (stride > 1) {
+				for (ix = 0; ix != n; ix++) {
+					func (stream, "%sd%d[]", ix ? "," : "", rd + ix * stride);
+				}
+			} else if (n == 1) {
+				func (stream, "d%d[]", rd);
+			} else {
+				func (stream, "d%d[]-d%d[]", rd, rd + n - 1);
+			}
 			func (stream, "}, [%s", arm_regnames[rn]);
 			if (align)
 			  {
                             align = (8 * (type + 1)) << size;
-                            if (type == 3)
-                              align = (size > 1) ? align >> 1 : align;
-			    if (type == 2 || (type == 0 && !size))
-			      func (stream, " :<bad align %d>", align);
-			    else
-			      func (stream, " :%d", align);
+			    if (type == 3) {
+				    align = (size > 1) ? align >> 1 : align;
+			    }
+			    if (type == 2 || (type == 0 && !size)) {
+				    func (stream, " :<bad align %d>", align);
+			    } else {
+				    func (stream, " :%d", align);
+			    }
 			  }
 			func (stream, "]");
-			if (rm == 0xd)
-			  func (stream, "!");
-			else if (rm != 0xf)
-			  func (stream, ", %s", arm_regnames[rm]);
+			if (rm == 0xd) {
+				func (stream, "!");
+			} else if (rm != 0xf) {
+				func (stream, ", %s", arm_regnames[rm]);
+			}
 		      }
 		      break;
 
@@ -4374,10 +4431,11 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 				for (ix = 7; ix >= 0; ix--)
 				  {
 				    mask = ((bits >> ix) & 1) ? 0xff : 0;
-                                    if (ix <= 3)
-				      value = (value << 8) | mask;
-                                    else
-                                      hival = (hival << 8) | mask;
+				    if (ix <= 3) {
+					    value = (value << 8) | mask;
+				    } else {
+					    hival = (hival << 8) | mask;
+				    }
 				  }
                                 size = 64;
 			      }
@@ -4438,13 +4496,14 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 
                                 func (stream, "%.7g ; 0x%.8lx", fvalue,
                                       value);
-                              }
-                            else
-                              func (stream, "%ld ; 0x%.8lx",
-				    (long) (((value & 0x80000000L) != 0)
-					    ? value | ~0xffffffffL : value),
-				    value);
-                            break;
+			    } else {
+				    func (stream, "%ld ; 0x%.8lx",
+					    (long)(((value & 0x80000000L) != 0)
+							    ? value | ~0xffffffffL
+							    : value),
+					    value);
+			    }
+			    break;
 
                           case 64:
                             func (stream, "#0x%.8lx%.8lx", hival, value);
@@ -4458,12 +4517,13 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 			int regno = ((given >> 16) & 0xf) | ((given >> (7 - 4)) & 0x10);
 			int num = (given >> 8) & 0x3;
 
-			if (!num)
-			  func (stream, "{d%d}", regno);
-			else if (num + regno >= 32)
-			  func (stream, "{d%d-<overflow reg d%d}", regno, regno + num);
-			else
-			  func (stream, "{d%d-d%d}", regno, regno + num);
+			if (!num) {
+				func (stream, "{d%d}", regno);
+			} else if (num + regno >= 32) {
+				func (stream, "{d%d-<overflow reg d%d}", regno, regno + num);
+			} else {
+				func (stream, "{d%d-d%d}", regno, regno + num);
+			}
 		      }
 		      break;
 
@@ -4499,45 +4559,51 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 			      unsigned low, high;
 
 			      c++;
-			      if (*c >= '0' && *c <= '9')
-				limit = *c - '0';
-			      else if (*c >= 'a' && *c <= 'f')
-				limit = *c - 'a' + 10;
-			      else
-				return FALSE;
+			      if (*c >= '0' && *c <= '9') {
+				      limit = *c - '0';
+			      } else if (*c >= 'a' && *c <= 'f') {
+				      limit = *c - 'a' + 10;
+			      } else {
+				      return FALSE;
+			      }
 			      low = limit >> 2;
 			      high = limit & 3;
 
-			      if (value < low || value > high)
-				func (stream, "<illegal width %d>", base << value);
-			      else
-				func (stream, "%d", base << value);
+			      if (value < low || value > high) {
+				      func (stream, "<illegal width %d>", base << value);
+			      } else {
+				      func (stream, "%d", base << value);
+			      }
 			    }
 			    break;
 			  case 'R':
-			    if (given & (1 << 6))
-			      goto Q;
-			    /* FALLTHROUGH */
+				  if (given & (1 << 6)) {
+					  goto Q;
+				  }
+				  /* FALLTHROUGH */
 			  case 'D':
 			    func (stream, "d%ld", value);
 			    break;
 			  case 'Q':
 			  Q:
-			    if (value & 1)
-			      func (stream, "<illegal reg q%ld.5>", value >> 1);
-			    else
-			      func (stream, "q%ld", value >> 1);
-			    break;
+				  if (value & 1) {
+					  func (stream, "<illegal reg q%ld.5>", value >> 1);
+				  } else {
+					  func (stream, "q%ld", value >> 1);
+				  }
+				  break;
 
 			  case '`':
 			    c++;
-			    if (value == 0)
-			      func (stream, "%c", *c);
+			    if (value == 0) {
+				    func (stream, "%c", *c);
+			    }
 			    break;
 			  case '\'':
 			    c++;
-			    if (value == ((1ul << width) - 1))
-			      func (stream, "%c", *c);
+			    if (value == ((1ul << width) - 1)) {
+				    func (stream, "%c", *c);
+			    }
 			    break;
 			  case '?':
 			    func (stream, "%c", c[(1 << width) - (int) value]);
@@ -4552,9 +4618,9 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 			return FALSE;
 		      }
 		    }
-		}
-	      else
-		func (stream, "%c", *c);
+	      } else {
+		      func (stream, "%c", *c);
+	      }
 	    }
 
 #if 0
@@ -4562,10 +4628,11 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
 	    func (stream, " ; 0x%lx", value_in_comment);
 #endif
 
-	  if (is_unpredictable)
-	    func (stream, UNPREDICTABLE_INSTRUCTION);
+	    if (is_unpredictable) {
+		    func (stream, UNPREDICTABLE_INSTRUCTION);
+	    }
 
-	  return TRUE;
+	    return TRUE;
 	}
     }
   return FALSE;
@@ -4649,515 +4716,511 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info, long given)
   fprintf_ftype func = info->fprintf_func;
   struct arm_private_data *private_data = info->private_data;
 
-  if (print_insn_coprocessor (pc, info, given, FALSE))
-    return;
+  if (print_insn_coprocessor (pc, info, given, FALSE)) {
+	  return;
+  }
 
-  if (print_insn_neon (info, given, FALSE))
-    return;
+  if (print_insn_neon (info, given, FALSE)) {
+	  return;
+  }
 
   for (insn = arm_opcodes; insn->assembler; insn++)
     {
-      if ((given & insn->mask) != insn->value)
-	continue;
+	  if ((given & insn->mask) != insn->value) {
+		  continue;
+	  }
 
-      if (! ARM_CPU_HAS_FEATURE (insn->arch, private_data->features))
-	continue;
+	  if (!ARM_CPU_HAS_FEATURE (insn->arch, private_data->features)) {
+		  continue;
+	  }
 
-      /* Special case: an instruction with all bits set in the condition field
+	  /* Special case: an instruction with all bits set in the condition field
 	 (0xFnnn_nnnn) is only matched if all those bits are set in insn->mask,
 	 or by the catchall at the end of the table.  */
-      if ((given & 0xF0000000) != 0xF0000000
-	  || (insn->mask & 0xF0000000) == 0xF0000000
-	  || (insn->mask == 0 && insn->value == 0))
-	{
-	  unsigned long u_reg = 16;
-	  unsigned long U_reg = 16;
-	  bfd_boolean is_unpredictable = FALSE;
-	  signed long value_in_comment = 0;
-	  const char *c;
+	  if ((given & 0xF0000000) != 0xF0000000 || (insn->mask & 0xF0000000) == 0xF0000000 || (insn->mask == 0 && insn->value == 0)) {
+		  unsigned long u_reg = 16;
+		  unsigned long U_reg = 16;
+		  bfd_boolean is_unpredictable = FALSE;
+		  signed long value_in_comment = 0;
+		  const char *c;
 
-	  for (c = insn->assembler; *c; c++)
-	    {
-	      if (*c == '%')
-		{
-		  bfd_boolean allow_unpredictable = FALSE;
+		  for (c = insn->assembler; *c; c++) {
+			  if (*c == '%') {
+				  bfd_boolean allow_unpredictable = FALSE;
 
-		  switch (*++c)
-		    {
-		    case '%':
-		      func (stream, "%%");
-		      break;
+				  switch (*++c) {
+				  case '%':
+					  func (stream, "%%");
+					  break;
 
-		    case 'a':
-		      value_in_comment = print_arm_address (pc, info, given);
-		      break;
+				  case 'a':
+					  value_in_comment = print_arm_address (pc, info, given);
+					  break;
 
-		    case 'P':
-		      /* Set P address bit and use normal address
+				  case 'P':
+					  /* Set P address bit and use normal address
 			 printing routine.  */
-		      value_in_comment = print_arm_address (pc, info, given | (1 << P_BIT));
-		      break;
+					  value_in_comment = print_arm_address (pc, info, given | (1 << P_BIT));
+					  break;
 
-		    case 'S':
-		      allow_unpredictable = TRUE;
-		      /* Fall through.  */
-		    case 's':
-                      if ((given & 0x004f0000) == 0x004f0000)
-			{
-                          /* PC relative with immediate offset.  */
-			  bfd_vma offset = ((given & 0xf00) >> 4) | (given & 0xf);
+				  case 'S':
+					  allow_unpredictable = TRUE;
+					  /* Fall through.  */
+				  case 's':
+					  if ((given & 0x004f0000) == 0x004f0000) {
+						  /* PC relative with immediate offset.  */
+						  bfd_vma offset = ((given & 0xf00) >> 4) | (given & 0xf);
 
-			  if (PRE_BIT_SET)
-			    {
-			      /* Elide positive zero offset.  */
-			      if (offset || NEGATIVE_BIT_SET)
-				func (stream, "[pc, %s%d] ; ",
-				      NEGATIVE_BIT_SET ? "-" : "", (int) offset);
-			      else
-				func (stream, "[pc] ; ");
-			      if (NEGATIVE_BIT_SET)
-				offset = -offset;
-			      info->print_address_func (offset + pc + 8, info);
-			    }
-			  else
-			    {
-			      /* Always show the offset.  */
-			      func (stream, "[pc], %s%d",
-				    NEGATIVE_BIT_SET ? "-" : "", (int) offset);
-			      if (! allow_unpredictable)
-				is_unpredictable = TRUE;
-			    }
-			}
-		      else
-			{
-			  int offset = ((given & 0xf00) >> 4) | (given & 0xf);
+						  if (PRE_BIT_SET) {
+							  /* Elide positive zero offset.  */
+							  if (offset || NEGATIVE_BIT_SET) {
+								  func (stream, "[pc, %s%d] ; ",
+									  NEGATIVE_BIT_SET ? "-" : "", (int)offset);
+							  } else {
+								  func (stream, "[pc] ; ");
+							  }
+							  if (NEGATIVE_BIT_SET) {
+								  offset = -offset;
+							  }
+							  info->print_address_func (offset + pc + 8, info);
+						  } else {
+							  /* Always show the offset.  */
+							  func (stream, "[pc], %s%d",
+								  NEGATIVE_BIT_SET ? "-" : "", (int)offset);
+							  if (!allow_unpredictable) {
+								  is_unpredictable = TRUE;
+							  }
+						  }
+					  } else {
+						  int offset = ((given & 0xf00) >> 4) | (given & 0xf);
 
-			  func (stream, "[%s",
-				arm_regnames[(given >> 16) & 0xf]);
+						  func (stream, "[%s",
+							  arm_regnames[(given >> 16) & 0xf]);
 
-			  if (PRE_BIT_SET)
-			    {
-			      if (IMMEDIATE_BIT_SET)
-				{
-				  /* Elide offset for non-writeback
+						  if (PRE_BIT_SET) {
+							  if (IMMEDIATE_BIT_SET) {
+								  /* Elide offset for non-writeback
 				     positive zero.  */
-				  if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET
-				      || offset)
-				    func (stream, ", %s%d",
-					  NEGATIVE_BIT_SET ? "-" : "", offset);
+								  if (WRITEBACK_BIT_SET || NEGATIVE_BIT_SET || offset) {
+									  func (stream, ", %s%d",
+										  NEGATIVE_BIT_SET ? "-" : "", offset);
+								  }
 
-				  if (NEGATIVE_BIT_SET)
-				    offset = -offset;
+								  if (NEGATIVE_BIT_SET) {
+									  offset = -offset;
+								  }
 
-				  value_in_comment = offset;
-				}
-			      else
-				{
-				  /* Register Offset or Register Pre-Indexed.  */
-				  func (stream, ", %s%s",
-					NEGATIVE_BIT_SET ? "-" : "",
-					arm_regnames[given & 0xf]);
+								  value_in_comment = offset;
+							  } else {
+								  /* Register Offset or Register Pre-Indexed.  */
+								  func (stream, ", %s%s",
+									  NEGATIVE_BIT_SET ? "-" : "",
+									  arm_regnames[given & 0xf]);
 
-				  /* Writing back to the register that is the source/
+								  /* Writing back to the register that is the source/
 				     destination of the load/store is unpredictable.  */
-				  if (! allow_unpredictable
-				      && WRITEBACK_BIT_SET
-				      && ((given & 0xf) == ((given >> 12) & 0xf)))
-				    is_unpredictable = TRUE;
-				}
+								  if (!allow_unpredictable && WRITEBACK_BIT_SET && ((given & 0xf) == ((given >> 12) & 0xf))) {
+									  is_unpredictable = TRUE;
+								  }
+							  }
 
-			      func (stream, "]%s",
-				    WRITEBACK_BIT_SET ? "!" : "");
-			    }
-			  else
-			    {
-			      if (IMMEDIATE_BIT_SET)
-				{
-				  /* Immediate Post-indexed.  */
-				  /* PR 10924: Offset must be printed, even if it is zero.  */
-				  func (stream, "], %s%d",
-					NEGATIVE_BIT_SET ? "-" : "", offset);
-				  if (NEGATIVE_BIT_SET)
-				    offset = -offset;
-				  value_in_comment = offset;
-				}
-			      else
-				{
-				  /* Register Post-indexed.  */
-				  func (stream, "], %s%s",
-					NEGATIVE_BIT_SET ? "-" : "",
-					arm_regnames[given & 0xf]);
+							  func (stream, "]%s",
+								  WRITEBACK_BIT_SET ? "!" : "");
+						  } else {
+							  if (IMMEDIATE_BIT_SET) {
+								  /* Immediate Post-indexed.  */
+								  /* PR 10924: Offset must be printed, even if it is zero.  */
+								  func (stream, "], %s%d",
+									  NEGATIVE_BIT_SET ? "-" : "", offset);
+								  if (NEGATIVE_BIT_SET) {
+									  offset = -offset;
+								  }
+								  value_in_comment = offset;
+							  } else {
+								  /* Register Post-indexed.  */
+								  func (stream, "], %s%s",
+									  NEGATIVE_BIT_SET ? "-" : "",
+									  arm_regnames[given & 0xf]);
 
-				  /* Writing back to the register that is the source/
+								  /* Writing back to the register that is the source/
 				     destination of the load/store is unpredictable.  */
-				  if (! allow_unpredictable
-				      && (given & 0xf) == ((given >> 12) & 0xf))
-				    is_unpredictable = TRUE;
-				}
+								  if (!allow_unpredictable && (given & 0xf) == ((given >> 12) & 0xf)) {
+									  is_unpredictable = TRUE;
+								  }
+							  }
 
-			      if (! allow_unpredictable)
-				{
-				  /* Writeback is automatically implied by post- addressing.
+							  if (!allow_unpredictable) {
+								  /* Writeback is automatically implied by post- addressing.
 				     Setting the W bit is unnecessary and ARM specify it as
 				     being unpredictable.  */
-				  if (WRITEBACK_BIT_SET
-				      /* Specifying the PC register as the post-indexed
+								  if (WRITEBACK_BIT_SET
+									  /* Specifying the PC register as the post-indexed
 					 registers is also unpredictable.  */
-				      || (! IMMEDIATE_BIT_SET && ((given & 0xf) == 0xf)))
-				    is_unpredictable = TRUE;
-				}
-			    }
-			}
-		      break;
+									  || (!IMMEDIATE_BIT_SET && ((given & 0xf) == 0xf))) {
+									  is_unpredictable = TRUE;
+								  }
+							  }
+						  }
+					  }
+					  break;
 
-		    case 'b':
-		      {
-			bfd_vma disp = (((given & 0xffffff) ^ 0x800000) - 0x800000);
-			info->print_address_func (disp * 4 + pc + 8, info);
-		      }
-		      break;
+				  case 'b': {
+					  bfd_vma disp = (((given & 0xffffff) ^ 0x800000) - 0x800000);
+					  info->print_address_func (disp * 4 + pc + 8, info);
+				  } break;
 
-		    case 'c':
-		      if (((given >> 28) & 0xf) != 0xe)
-			func (stream, "%s",
-			      arm_conditional [(given >> 28) & 0xf]);
-		      break;
+				  case 'c':
+					  if (((given >> 28) & 0xf) != 0xe) {
+						  func (stream, "%s",
+							  arm_conditional[(given >> 28) & 0xf]);
+					  }
+					  break;
 
-		    case 'm':
-		      {
-			int started = 0;
-			int reg;
+				  case 'm': {
+					  int started = 0;
+					  int reg;
 
-			func (stream, "{");
-			for (reg = 0; reg < 16; reg++)
-			  if ((given & (1 << reg)) != 0)
-			    {
-			      if (started)
-				func (stream, ", ");
-			      started = 1;
-			      func (stream, "%s", arm_regnames[reg]);
-			    }
-			func (stream, "}");
-			if (! started)
-			  is_unpredictable = TRUE;
-		      }
-		      break;
+					  func (stream, "{");
+					  for (reg = 0; reg < 16; reg++) {
+						  if ((given & (1 << reg)) != 0) {
+							  if (started) {
+								  func (stream, ", ");
+							  }
+							  started = 1;
+							  func (stream, "%s", arm_regnames[reg]);
+						  }
+					  }
+					  func (stream, "}");
+					  if (!started) {
+						  is_unpredictable = TRUE;
+					  }
+				  } break;
 
-		    case 'q':
-		      arm_decode_shift (given, func, stream, FALSE);
-		      break;
+				  case 'q':
+					  arm_decode_shift (given, func, stream, FALSE);
+					  break;
 
-		    case 'o':
-		      if ((given & 0x02000000) != 0)
-			{
-			  unsigned int rotate = (given & 0xf00) >> 7;
-			  unsigned int immed = (given & 0xff);
-			  unsigned int a, i;
+				  case 'o':
+					  if ((given & 0x02000000) != 0) {
+						  unsigned int rotate = (given & 0xf00) >> 7;
+						  unsigned int immed = (given & 0xff);
+						  unsigned int a, i;
 
-			  a = (((immed << (32 - rotate))
-				| (immed >> rotate)) & 0xffffffff);
-			  /* If there is another encoding with smaller rotate,
+						  a = (((immed << (32 - rotate)) | (immed >> rotate)) & 0xffffffff);
+						  /* If there is another encoding with smaller rotate,
 			     the rotate should be specified directly.  */
-			  for (i = 0; i < 32; i += 2)
-			    if ((a << i | a >> (32 - i)) <= 0xff)
-			      break;
+						  for (i = 0; i < 32; i += 2) {
+							  if ((a << i | a >> (32 - i)) <= 0xff) {
+								  break;
+							  }
+						  }
 
-			  if (i != rotate)
-			    func (stream, "%d, %d", immed, rotate);
-			  else
-			    func (stream, "%d", a);
-			  value_in_comment = a;
-			}
-		      else
-			arm_decode_shift (given, func, stream, TRUE);
-		      break;
+						  if (i != rotate) {
+							  func (stream, "%d, %d", immed, rotate);
+						  } else {
+							  func (stream, "%d", a);
+						  }
+						  value_in_comment = a;
+					  } else {
+						  arm_decode_shift (given, func, stream, TRUE);
+					  }
+					  break;
 
-		    case 'p':
-		      if ((given & 0x0000f000) == 0x0000f000)
-			{
-			  arm_feature_set arm_ext_v6 =
-			    ARM_FEATURE_CORE_LOW (ARM_EXT_V6);
+				  case 'p':
+					  if ((given & 0x0000f000) == 0x0000f000) {
+						  arm_feature_set arm_ext_v6 =
+							  ARM_FEATURE_CORE_LOW (ARM_EXT_V6);
 
-			  /* The p-variants of tst/cmp/cmn/teq are the pre-V6
+						  /* The p-variants of tst/cmp/cmn/teq are the pre-V6
 			     mechanism for setting PSR flag bits.  They are
 			     obsolete in V6 onwards.  */
-			  if (! ARM_CPU_HAS_FEATURE (private_data->features, \
-						     arm_ext_v6))
-			    func (stream, "p");
-			  else
-			    is_unpredictable = TRUE;
-			}
-		      break;
+						  if (!ARM_CPU_HAS_FEATURE (private_data->features,
+							      arm_ext_v6)) {
+							  func (stream, "p");
+						  } else {
+							  is_unpredictable = TRUE;
+						  }
+					  }
+					  break;
 
-		    case 't':
-		      if ((given & 0x01200000) == 0x00200000)
-			func (stream, "t");
-		      break;
+				  case 't':
+					  if ((given & 0x01200000) == 0x00200000) {
+						  func (stream, "t");
+					  }
+					  break;
 
-		    case 'A':
-		      {
-			int offset = given & 0xff;
+				  case 'A': {
+					  int offset = given & 0xff;
 
-			value_in_comment = offset * 4;
-			if (NEGATIVE_BIT_SET)
-			  value_in_comment = - value_in_comment;
+					  value_in_comment = offset * 4;
+					  if (NEGATIVE_BIT_SET) {
+						  value_in_comment = -value_in_comment;
+					  }
 
-			func (stream, "[%s", arm_regnames [(given >> 16) & 0xf]);
+					  func (stream, "[%s", arm_regnames[(given >> 16) & 0xf]);
 
-			if (PRE_BIT_SET)
-			  {
-			    if (offset)
-			      func (stream, ", %d]%s",
-				    (int) value_in_comment,
-				    WRITEBACK_BIT_SET ? "!" : "");
-			    else
-			      func (stream, "]");
-			  }
-			else
-			  {
-			    func (stream, "]");
+					  if (PRE_BIT_SET) {
+						  if (offset) {
+							  func (stream, ", %d]%s",
+								  (int)value_in_comment,
+								  WRITEBACK_BIT_SET ? "!" : "");
+						  } else {
+							  func (stream, "]");
+						  }
+					  } else {
+						  func (stream, "]");
 
-			    if (WRITEBACK_BIT_SET)
-			      {
-				if (offset)
-				  func (stream, ", %d", (int) value_in_comment);
-			      }
-			    else
-			      {
-				func (stream, ", {%d}", (int) offset);
-				value_in_comment = offset;
-			      }
-			  }
-		      }
-		      break;
+						  if (WRITEBACK_BIT_SET) {
+							  if (offset) {
+								  func (stream, ", %d", (int)value_in_comment);
+							  }
+						  } else {
+							  func (stream, ", {%d}", (int)offset);
+							  value_in_comment = offset;
+						  }
+					  }
+				  } break;
 
-		    case 'B':
-		      /* Print ARM V5 BLX(1) address: pc+25 bits.  */
-		      {
-			bfd_vma address;
-			bfd_vma offset = 0;
+				  case 'B':
+					  /* Print ARM V5 BLX(1) address: pc+25 bits.  */
+					  {
+						  bfd_vma address;
+						  bfd_vma offset = 0;
 
-			if (! NEGATIVE_BIT_SET)
-			  /* Is signed, hi bits should be ones.  */
-			  offset = (-1) ^ 0x00ffffff;
+						  if (!NEGATIVE_BIT_SET) {
+							  /* Is signed, hi bits should be ones.  */
+							  offset = (-1) ^ 0x00ffffff;
+						  }
 
-			/* Offset is (SignExtend(offset field)<<2).  */
-			offset += given & 0x00ffffff;
-			offset <<= 2;
-			address = offset + pc + 8;
+						  /* Offset is (SignExtend(offset field)<<2).  */
+						  offset += given & 0x00ffffff;
+						  offset <<= 2;
+						  address = offset + pc + 8;
 
-			if (given & 0x01000000)
-			  /* H bit allows addressing to 2-byte boundaries.  */
-			  address += 2;
+						  if (given & 0x01000000) {
+							  /* H bit allows addressing to 2-byte boundaries.  */
+							  address += 2;
+						  }
 
-		        info->print_address_func (address, info);
-		      }
-		      break;
+						  info->print_address_func (address, info);
+					  }
+					  break;
 
-		    case 'C':
-		      if ((given & 0x02000200) == 0x200)
-			{
-			  const char * name;
-			  unsigned sysm = (given & 0x004f0000) >> 16;
+				  case 'C':
+					  if ((given & 0x02000200) == 0x200) {
+						  const char *name;
+						  unsigned sysm = (given & 0x004f0000) >> 16;
 
-			  sysm |= (given & 0x300) >> 4;
-			  name = banked_regname (sysm);
+						  sysm |= (given & 0x300) >> 4;
+						  name = banked_regname (sysm);
 
-			  if (name != NULL)
-			    func (stream, "%s", name);
-			  else
-			    func (stream, "(UNDEF: %lu)", (unsigned long) sysm);
-			}
-		      else
-			{
-			  func (stream, "%cPSR_",
-				(given & 0x00400000) ? 'S' : 'C');
-			  if (given & 0x80000)
-			    func (stream, "f");
-			  if (given & 0x40000)
-			    func (stream, "s");
-			  if (given & 0x20000)
-			    func (stream, "x");
-			  if (given & 0x10000)
-			    func (stream, "c");
-			}
-		      break;
+						  if (name != NULL) {
+							  func (stream, "%s", name);
+						  } else {
+							  func (stream, "(UNDEF: %lu)", (unsigned long)sysm);
+						  }
+					  } else {
+						  func (stream, "%cPSR_",
+							  (given & 0x00400000) ? 'S' : 'C');
+						  if (given & 0x80000) {
+							  func (stream, "f");
+						  }
+						  if (given & 0x40000) {
+							  func (stream, "s");
+						  }
+						  if (given & 0x20000) {
+							  func (stream, "x");
+						  }
+						  if (given & 0x10000) {
+							  func (stream, "c");
+						  }
+					  }
+					  break;
 
-		    case 'U':
-		      if ((given & 0xf0) == 0x60)
-			{
-			  switch (given & 0xf)
-			    {
-			    case 0xf: func (stream, "sy"); break;
-			    default:
-			      func (stream, "%d", (int) given & 0xf);
-			      break;
-			    }
-			}
-		      else
-			{
-			  const char * opt = data_barrier_option (given & 0xf);
-			  if (opt != NULL)
-			    func (stream, "%s", opt);
-			  else
-			      func (stream, "%d", (int) given & 0xf);
-			}
-		      break;
+				  case 'U':
+					  if ((given & 0xf0) == 0x60) {
+						  switch (given & 0xf) {
+						  case 0xf: func (stream, "sy"); break;
+						  default:
+							  func (stream, "%d", (int)given & 0xf);
+							  break;
+						  }
+					  } else {
+						  const char *opt = data_barrier_option (given & 0xf);
+						  if (opt != NULL) {
+							  func (stream, "%s", opt);
+						  } else {
+							  func (stream, "%d", (int)given & 0xf);
+						  }
+					  }
+					  break;
 
-		    case '0': case '1': case '2': case '3': case '4':
-		    case '5': case '6': case '7': case '8': case '9':
-		      {
-			int width;
-			unsigned long value;
+				  case '0':
+				  case '1':
+				  case '2':
+				  case '3':
+				  case '4':
+				  case '5':
+				  case '6':
+				  case '7':
+				  case '8':
+				  case '9': {
+					  int width;
+					  unsigned long value;
 
-			c = arm_decode_bitfield (c, given, &value, &width);
+					  c = arm_decode_bitfield (c, given, &value, &width);
 
-			switch (*c)
-			  {
-			  case 'R':
-			    if (value == 15)
-			      is_unpredictable = TRUE;
-			    /* Fall through.  */
-			  case 'r':
-			  case 'T':
-			    /* We want register + 1 when decoding T.  */
-			    if (*c == 'T')
-			      ++value;
+					  switch (*c) {
+					  case 'R':
+						  if (value == 15) {
+							  is_unpredictable = TRUE;
+						  }
+						  /* Fall through.  */
+					  case 'r':
+					  case 'T':
+						  /* We want register + 1 when decoding T.  */
+						  if (*c == 'T') {
+							  ++value;
+						  }
 
-			    if (c[1] == 'u')
-			      {
-				/* Eat the 'u' character.  */
-				++ c;
+						  if (c[1] == 'u') {
+							  /* Eat the 'u' character.  */
+							  ++c;
 
-				if (u_reg == value)
-				  is_unpredictable = TRUE;
-				u_reg = value;
-			      }
-			    if (c[1] == 'U')
-			      {
-				/* Eat the 'U' character.  */
-				++ c;
+							  if (u_reg == value) {
+								  is_unpredictable = TRUE;
+							  }
+							  u_reg = value;
+						  }
+						  if (c[1] == 'U') {
+							  /* Eat the 'U' character.  */
+							  ++c;
 
-				if (U_reg == value)
-				  is_unpredictable = TRUE;
-				U_reg = value;
-			      }
-			    func (stream, "%s", arm_regnames[value]);
-			    break;
-			  case 'd':
-			    func (stream, "%ld", value);
-			    value_in_comment = value;
-			    break;
-			  case 'b':
-			    func (stream, "%ld", value * 8);
-			    value_in_comment = value * 8;
-			    break;
-			  case 'W':
-			    func (stream, "%ld", value + 1);
-			    value_in_comment = value + 1;
-			    break;
-			  case 'x':
-			    func (stream, "0x%08lx", value);
+							  if (U_reg == value) {
+								  is_unpredictable = TRUE;
+							  }
+							  U_reg = value;
+						  }
+						  func (stream, "%s", arm_regnames[value]);
+						  break;
+					  case 'd':
+						  func (stream, "%ld", value);
+						  value_in_comment = value;
+						  break;
+					  case 'b':
+						  func (stream, "%ld", value * 8);
+						  value_in_comment = value * 8;
+						  break;
+					  case 'W':
+						  func (stream, "%ld", value + 1);
+						  value_in_comment = value + 1;
+						  break;
+					  case 'x':
+						  func (stream, "0x%08lx", value);
 
-			    /* Some SWI instructions have special
+						  /* Some SWI instructions have special
 			       meanings.  */
-			    if ((given & 0x0fffffff) == 0x0FF00000)
-			      func (stream, " ; IMB");
-			    else if ((given & 0x0fffffff) == 0x0FF00001)
-			      func (stream, " ; IMBRange");
-			    break;
-			  case 'X':
-			    func (stream, "%01lx", value & 0xf);
-			    value_in_comment = value;
-			    break;
-			  case '`':
-			    c++;
-			    if (value == 0)
-			      func (stream, "%c", *c);
-			    break;
-			  case '\'':
-			    c++;
-			    if (value == ((1ul << width) - 1))
-			      func (stream, "%c", *c);
-			    break;
-			  case '?':
-			    func (stream, "%c", c[(1 << width) - (int) value]);
-			    c += 1 << width;
-			    break;
-			  default:
-			    return;
-			  }
-			break;
+						  if ((given & 0x0fffffff) == 0x0FF00000) {
+							  func (stream, " ; IMB");
+						  } else if ((given & 0x0fffffff) == 0x0FF00001) {
+							  func (stream, " ; IMBRange");
+						  }
+						  break;
+					  case 'X':
+						  func (stream, "%01lx", value & 0xf);
+						  value_in_comment = value;
+						  break;
+					  case '`':
+						  c++;
+						  if (value == 0) {
+							  func (stream, "%c", *c);
+						  }
+						  break;
+					  case '\'':
+						  c++;
+						  if (value == ((1ul << width) - 1)) {
+							  func (stream, "%c", *c);
+						  }
+						  break;
+					  case '?':
+						  func (stream, "%c", c[(1 << width) - (int)value]);
+						  c += 1 << width;
+						  break;
+					  default:
+						  return;
+					  }
+					  break;
 
-		      case 'e':
-			{
-			  int imm;
+				  case 'e': {
+					  int imm;
 
-			  imm = (given & 0xf) | ((given & 0xfff00) >> 4);
-			  func (stream, "%d", imm);
-			  value_in_comment = imm;
-			}
-			break;
+					  imm = (given & 0xf) | ((given & 0xfff00) >> 4);
+					  func (stream, "%d", imm);
+					  value_in_comment = imm;
+				  } break;
 
-		      case 'E':
-			/* LSB and WIDTH fields of BFI or BFC.  The machine-
+				  case 'E':
+					  /* LSB and WIDTH fields of BFI or BFC.  The machine-
 			   language instruction encodes LSB and MSB.  */
-			{
-			  long msb = (given & 0x001f0000) >> 16;
-			  long lsb = (given & 0x00000f80) >> 7;
-			  long w = msb - lsb + 1;
+					  {
+						  long msb = (given & 0x001f0000) >> 16;
+						  long lsb = (given & 0x00000f80) >> 7;
+						  long w = msb - lsb + 1;
 
-			  if (w > 0)
-			    func (stream, "%lu, %lu", lsb, w);
-			  else
-			    func (stream, "(invalid: %lu:%lu)", lsb, msb);
-			}
-			break;
+						  if (w > 0) {
+							  func (stream, "%lu, %lu", lsb, w);
+						  } else {
+							  func (stream, "(invalid: %lu:%lu)", lsb, msb);
+						  }
+					  }
+					  break;
 
-		      case 'R':
-			/* Get the PSR/banked register name.  */
-			{
-			  const char * name;
-			  unsigned sysm = (given & 0x004f0000) >> 16;
+				  case 'R':
+					  /* Get the PSR/banked register name.  */
+					  {
+						  const char *name;
+						  unsigned sysm = (given & 0x004f0000) >> 16;
 
-			  sysm |= (given & 0x300) >> 4;
-			  name = banked_regname (sysm);
+						  sysm |= (given & 0x300) >> 4;
+						  name = banked_regname (sysm);
 
-			  if (name != NULL)
-			    func (stream, "%s", name);
-			  else
-			    func (stream, "(UNDEF: %lu)", (unsigned long) sysm);
-			}
-			break;
+						  if (name != NULL) {
+							  func (stream, "%s", name);
+						  } else {
+							  func (stream, "(UNDEF: %lu)", (unsigned long)sysm);
+						  }
+					  }
+					  break;
 
-		      case 'V':
-			/* 16-bit unsigned immediate from a MOVT or MOVW
+				  case 'V':
+					  /* 16-bit unsigned immediate from a MOVT or MOVW
 			   instruction, encoded in bits 0:11 and 15:19.  */
-			{
-			  long hi = (given & 0x000f0000) >> 4;
-			  long lo = (given & 0x00000fff);
-			  long imm16 = hi | lo;
+					  {
+						  long hi = (given & 0x000f0000) >> 4;
+						  long lo = (given & 0x00000fff);
+						  long imm16 = hi | lo;
 
-			  func (stream, "%lu", imm16);
-			  value_in_comment = imm16;
-			}
-			break;
-		      }
-		    }
-		}
-	      else
-		func (stream, "%c", *c);
-	    }
+						  func (stream, "%lu", imm16);
+						  value_in_comment = imm16;
+					  }
+					  break;
+				  }
+				  }
+			  } else {
+				  func (stream, "%c", *c);
+			  }
+		  }
 
 #if 0
 	  if (value_in_comment > 32 || value_in_comment < -16)
 	    func (stream, " ; 0x%lx", (value_in_comment & 0xffffffffUL));
 #endif
 
-	  if (is_unpredictable)
-	    func (stream, UNPREDICTABLE_INSTRUCTION);
+		  if (is_unpredictable) {
+			  func (stream, UNPREDICTABLE_INSTRUCTION);
+		  }
 
-	  return;
+		  return;
 	}
     }
 }
@@ -5171,259 +5234,260 @@ print_insn_thumb16 (bfd_vma pc, struct disassemble_info *info, long given)
   void *stream = info->stream;
   fprintf_ftype func = info->fprintf_func;
 
-  for (insn = thumb_opcodes; insn->assembler; insn++)
-    if ((given & insn->mask) == insn->value)
-      {
-	// signed long value_in_comment = 0;
-	const char *c = insn->assembler;
+  for (insn = thumb_opcodes; insn->assembler; insn++) {
+	  if ((given & insn->mask) == insn->value) {
+		  // signed long value_in_comment = 0;
+		  const char *c = insn->assembler;
 
-	for (; *c; c++)
-	  {
-	    int domaskpc = 0;
-	    int domasklr = 0;
+		  for (; *c; c++) {
+			  int domaskpc = 0;
+			  int domasklr = 0;
 
-	    if (*c != '%')
-	      {
-		func (stream, "%c", *c);
-		continue;
-	      }
+			  if (*c != '%') {
+				  func (stream, "%c", *c);
+				  continue;
+			  }
 
-	    switch (*++c)
-	      {
-	      case '%':
-		func (stream, "%%");
-		break;
-
-	      case 'c':
-		if (ifthen_state)
-		  func (stream, "%s", arm_conditional[IFTHEN_COND]);
-		break;
-
-	      case 'C':
-		if (ifthen_state)
-		  func (stream, "%s", arm_conditional[IFTHEN_COND]);
-		else
-		  func (stream, "s");
-		break;
-
-	      case 'I':
-		{
-		  unsigned int tmp;
-
-		  ifthen_next_state = given & 0xff;
-		  for (tmp = given << 1; tmp & 0xf; tmp <<= 1)
-		    func (stream, ((given ^ tmp) & 0x10) ? "e" : "t");
-		  func (stream, " %s", arm_conditional[(given >> 4) & 0xf]);
-		}
-		break;
-
-	      case 'x':
-		if (ifthen_next_state)
-		  func (stream, " ; unpredictable branch in IT block\n");
-		break;
-
-	      case 'X':
-		if (ifthen_state)
-		  func (stream, " ; unpredictable <IT:%s>",
-			arm_conditional[IFTHEN_COND]);
-		break;
-
-	      case 'S':
-		{
-		  long reg;
-
-		  reg = (given >> 3) & 0x7;
-		  if (given & (1 << 6))
-		    reg += 8;
-
-		  func (stream, "%s", arm_regnames[reg]);
-		}
-		break;
-
-	      case 'D':
-		{
-		  long reg;
-
-		  reg = given & 0x7;
-		  if (given & (1 << 7))
-		    reg += 8;
-
-		  func (stream, "%s", arm_regnames[reg]);
-		}
-		break;
-
-	      case 'N':
-		if (given & (1 << 8))
-		  domasklr = 1;
-		/* Fall through.  */
-	      case 'O':
-		if (*c == 'O' && (given & (1 << 8)))
-		  domaskpc = 1;
-		/* Fall through.  */
-	      case 'M':
-		{
-		  int started = 0;
-		  int reg;
-
-		  func (stream, "{");
-
-		  /* It would be nice if we could spot
-		     ranges, and generate the rS-rE format: */
-		  for (reg = 0; (reg < 8); reg++)
-		    if ((given & (1 << reg)) != 0)
-		      {
-			if (started)
-			  func (stream, ", ");
-			started = 1;
-			func (stream, "%s", arm_regnames[reg]);
-		      }
-
-		  if (domasklr)
-		    {
-		      if (started)
-			func (stream, ", ");
-		      started = 1;
-		      func (stream, "%s", arm_regnames[14] /* "lr" */);
-		    }
-
-		  if (domaskpc)
-		    {
-		      if (started)
-			func (stream, ", ");
-		      func (stream, "%s", arm_regnames[15] /* "pc" */);
-		    }
-
-		  func (stream, "}");
-		}
-		break;
-
-	      case 'W':
-		/* Print writeback indicator for a LDMIA.  We are doing a
-		   writeback if the base register is not in the register
-		   mask.  */
-		if ((given & (1 << ((given & 0x0700) >> 8))) == 0)
-		  func (stream, "!");
-	      	break;
-
-	      case 'b':
-		/* Print ARM V6T2 CZB address: pc+4+6 bits.  */
-		{
-		  bfd_vma address = (pc + 4
-				     + ((given & 0x00f8) >> 2)
-				     + ((given & 0x0200) >> 3));
-		  info->print_address_func (address, info);
-		}
-		break;
-
-	      case 's':
-		/* Right shift immediate -- bits 6..10; 1-31 print
-		   as themselves, 0 prints as 32.  */
-		{
-		  long imm = (given & 0x07c0) >> 6;
-		  if (imm == 0)
-		    imm = 32;
-		  func (stream, "%ld", imm);
-		}
-		break;
-
-	      case '0': case '1': case '2': case '3': case '4':
-	      case '5': case '6': case '7': case '8': case '9':
-		{
-		  int bitstart = *c++ - '0';
-		  int bitend = 0;
-
-		  while (*c >= '0' && *c <= '9')
-		    bitstart = (bitstart * 10) + *c++ - '0';
-
-		  switch (*c)
-		    {
-		    case '-':
-		      {
-			bfd_vma reg;
-
-			c++;
-			while (*c >= '0' && *c <= '9')
-			  bitend = (bitend * 10) + *c++ - '0';
-			if (!bitend)
-			  return;
-			reg = given >> bitstart;
-			reg &= (2 << (bitend - bitstart)) - 1;
-
-			switch (*c)
-			  {
-			  case 'r':
-			    func (stream, "%s", arm_regnames[reg]);
-			    break;
-
-			  case 'd':
-			    func (stream, "%ld", (long) reg);
-			    // value_in_comment = reg;
-			    break;
-
-			  case 'H':
-			    func (stream, "%ld", (long) (reg << 1));
-			    // value_in_comment = reg << 1;
-			    break;
-
-			  case 'W':
-			    func (stream, "%ld", (long) (reg << 2));
-			    // value_in_comment = reg << 2;
-			    break;
-
-			  case 'a':
-			    /* PC-relative address -- the bottom two
-			       bits of the address are dropped
-			       before the calculation.  */
-			    info->print_address_func
-			      (((pc + 4) & ~3) + (reg << 2), info);
-			    //value_in_comment = 0;
-			    break;
-
-			  case 'x':
-			    func (stream, "0x%04lx", (long) reg);
-			    break;
-
-			  case 'B':
-			    reg = ((reg ^ (1 << bitend)) - (1 << bitend));
-			    info->print_address_func (reg * 2 + pc + 4, info);
-			    //value_in_comment = 0;
-			    break;
+			  switch (*++c) {
+			  case '%':
+				  func (stream, "%%");
+				  break;
 
 			  case 'c':
-			    func (stream, "%s", arm_conditional [reg]);
-			    break;
+				  if (ifthen_state) {
+					  func (stream, "%s", arm_conditional[IFTHEN_COND]);
+				  }
+				  break;
 
+			  case 'C':
+				  if (ifthen_state) {
+					  func (stream, "%s", arm_conditional[IFTHEN_COND]);
+				  } else {
+					  func (stream, "s");
+				  }
+				  break;
+
+			  case 'I': {
+				  unsigned int tmp;
+
+				  ifthen_next_state = given & 0xff;
+				  for (tmp = given << 1; tmp & 0xf; tmp <<= 1) {
+					  func (stream, ((given ^ tmp) & 0x10) ? "e" : "t");
+				  }
+				  func (stream, " %s", arm_conditional[(given >> 4) & 0xf]);
+			  } break;
+
+			  case 'x':
+				  if (ifthen_next_state) {
+					  func (stream, " ; unpredictable branch in IT block\n");
+				  }
+				  break;
+
+			  case 'X':
+				  if (ifthen_state) {
+					  func (stream, " ; unpredictable <IT:%s>",
+						  arm_conditional[IFTHEN_COND]);
+				  }
+				  break;
+
+			  case 'S': {
+				  long reg;
+
+				  reg = (given >> 3) & 0x7;
+				  if (given & (1 << 6)) {
+					  reg += 8;
+				  }
+
+				  func (stream, "%s", arm_regnames[reg]);
+			  } break;
+
+			  case 'D': {
+				  long reg;
+
+				  reg = given & 0x7;
+				  if (given & (1 << 7)) {
+					  reg += 8;
+				  }
+
+				  func (stream, "%s", arm_regnames[reg]);
+			  } break;
+
+			  case 'N':
+				  if (given & (1 << 8)) {
+					  domasklr = 1;
+				  }
+				  /* Fall through.  */
+			  case 'O':
+				  if (*c == 'O' && (given & (1 << 8))) {
+					  domaskpc = 1;
+				  }
+				  /* Fall through.  */
+			  case 'M': {
+				  int started = 0;
+				  int reg;
+
+				  func (stream, "{");
+
+				  /* It would be nice if we could spot
+		     ranges, and generate the rS-rE format: */
+				  for (reg = 0; (reg < 8); reg++) {
+					  if ((given & (1 << reg)) != 0) {
+						  if (started) {
+							  func (stream, ", ");
+						  }
+						  started = 1;
+						  func (stream, "%s", arm_regnames[reg]);
+					  }
+				  }
+
+				  if (domasklr) {
+					  if (started) {
+						  func (stream, ", ");
+					  }
+					  started = 1;
+					  func (stream, "%s", arm_regnames[14] /* "lr" */);
+				  }
+
+				  if (domaskpc) {
+					  if (started) {
+						  func (stream, ", ");
+					  }
+					  func (stream, "%s", arm_regnames[15] /* "pc" */);
+				  }
+
+				  func (stream, "}");
+			  } break;
+
+			  case 'W':
+				  /* Print writeback indicator for a LDMIA.  We are doing a
+		   writeback if the base register is not in the register
+		   mask.  */
+				  if ((given & (1 << ((given & 0x0700) >> 8))) == 0) {
+					  func (stream, "!");
+				  }
+				  break;
+
+			  case 'b':
+				  /* Print ARM V6T2 CZB address: pc+4+6 bits.  */
+				  {
+					  bfd_vma address = (pc + 4 + ((given & 0x00f8) >> 2) + ((given & 0x0200) >> 3));
+					  info->print_address_func (address, info);
+				  }
+				  break;
+
+			  case 's':
+				  /* Right shift immediate -- bits 6..10; 1-31 print
+		   as themselves, 0 prints as 32.  */
+				  {
+					  long imm = (given & 0x07c0) >> 6;
+					  if (imm == 0) {
+						  imm = 32;
+					  }
+					  func (stream, "%ld", imm);
+				  }
+				  break;
+
+			  case '0':
+			  case '1':
+			  case '2':
+			  case '3':
+			  case '4':
+			  case '5':
+			  case '6':
+			  case '7':
+			  case '8':
+			  case '9': {
+				  int bitstart = *c++ - '0';
+				  int bitend = 0;
+
+				  while (*c >= '0' && *c <= '9') {
+					  bitstart = (bitstart * 10) + *c++ - '0';
+				  }
+
+				  switch (*c) {
+				  case '-': {
+					  bfd_vma reg;
+
+					  c++;
+					  while (*c >= '0' && *c <= '9') {
+						  bitend = (bitend * 10) + *c++ - '0';
+					  }
+					  if (!bitend) {
+						  return;
+					  }
+					  reg = given >> bitstart;
+					  reg &= (2 << (bitend - bitstart)) - 1;
+
+					  switch (*c) {
+					  case 'r':
+						  func (stream, "%s", arm_regnames[reg]);
+						  break;
+
+					  case 'd':
+						  func (stream, "%ld", (long)reg);
+						  // value_in_comment = reg;
+						  break;
+
+					  case 'H':
+						  func (stream, "%ld", (long)(reg << 1));
+						  // value_in_comment = reg << 1;
+						  break;
+
+					  case 'W':
+						  func (stream, "%ld", (long)(reg << 2));
+						  // value_in_comment = reg << 2;
+						  break;
+
+					  case 'a':
+						  /* PC-relative address -- the bottom two
+			       bits of the address are dropped
+			       before the calculation.  */
+						  info->print_address_func (((pc + 4) & ~3) + (reg << 2), info);
+						  //value_in_comment = 0;
+						  break;
+
+					  case 'x':
+						  func (stream, "0x%04lx", (long)reg);
+						  break;
+
+					  case 'B':
+						  reg = ((reg ^ (1 << bitend)) - (1 << bitend));
+						  info->print_address_func (reg * 2 + pc + 4, info);
+						  //value_in_comment = 0;
+						  break;
+
+					  case 'c':
+						  func (stream, "%s", arm_conditional[reg]);
+						  break;
+					  }
+				  } break;
+
+				  case '\'':
+					  c++;
+					  if ((given & (1 << bitstart)) != 0) {
+						  func (stream, "%c", *c);
+					  }
+					  break;
+
+				  case '?':
+					  ++c;
+					  if ((given & (1 << bitstart)) != 0) {
+						  func (stream, "%c", *c++);
+					  } else {
+						  func (stream, "%c", *++c);
+					  }
+					  break;
+				  }
+			  } break;
 			  }
-		      }
-		      break;
-
-		    case '\'':
-		      c++;
-		      if ((given & (1 << bitstart)) != 0)
-			func (stream, "%c", *c);
-		      break;
-
-		    case '?':
-		      ++c;
-		      if ((given & (1 << bitstart)) != 0)
-			func (stream, "%c", *c++);
-		      else
-			func (stream, "%c", *++c);
-		      break;
-
-		    }
-		}
-		break;
-
-	      }
-	  }
+		  }
 #if 0
 	if (value_in_comment > 32 || value_in_comment < -16)
 	  func (stream, " ; 0x%lx", value_in_comment);
 #endif
 	return;
-      }
-
+	  }
+  }
 }
 
 /* Return the name of an V7M special register.  */
@@ -5471,583 +5535,555 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
   void *stream = info->stream;
   fprintf_ftype func = info->fprintf_func;
 
-  if (print_insn_coprocessor (pc, info, given, TRUE))
-    return;
-
-  if (print_insn_neon (info, given, TRUE))
-    return;
-
-  for (insn = thumb32_opcodes; insn->assembler; insn++)
-    if ((given & insn->mask) == insn->value)
-      {
-	bfd_boolean is_unpredictable = FALSE;
-	// signed long value_in_comment = 0;
-	const char *c = insn->assembler;
-
-	for (; *c; c++)
-	  {
-	    if (*c != '%')
-	      {
-		func (stream, "%c", *c);
-		continue;
-	      }
-
-	    switch (*++c)
-	      {
-	      case '%':
-		func (stream, "%%");
-		break;
-
-	      case 'c':
-		if (ifthen_state)
-		  func (stream, "%s", arm_conditional[IFTHEN_COND]);
-		break;
-
-	      case 'x':
-		if (ifthen_next_state)
-		  func (stream, " ; unpredictable branch in IT block\n");
-		break;
-
-	      case 'X':
-		if (ifthen_state)
-		  func (stream, " ; unpredictable <IT:%s>",
-			arm_conditional[IFTHEN_COND]);
-		break;
-
-	      case 'I':
-		{
-		  unsigned int imm12 = 0;
-
-		  imm12 |= (given & 0x000000ffu);
-		  imm12 |= (given & 0x00007000u) >> 4;
-		  imm12 |= (given & 0x04000000u) >> 15;
-		  func (stream, "%u", imm12);
-		  //value_in_comment = imm12;
-		}
-		break;
-
-	      case 'M':
-		{
-		  unsigned int bits = 0, imm, imm8, mod;
-
-		  bits |= (given & 0x000000ffu);
-		  bits |= (given & 0x00007000u) >> 4;
-		  bits |= (given & 0x04000000u) >> 15;
-		  imm8 = (bits & 0x0ff);
-		  mod = (bits & 0xf00) >> 8;
-		  switch (mod)
-		    {
-		    case 0: imm = imm8; break;
-		    case 1: imm = ((imm8 << 16) | imm8); break;
-		    case 2: imm = ((imm8 << 24) | (imm8 << 8)); break;
-		    case 3: imm = ((imm8 << 24) | (imm8 << 16) | (imm8 << 8) | imm8); break;
-		    default:
-		      mod  = (bits & 0xf80) >> 7;
-		      imm8 = (bits & 0x07f) | 0x80;
-		      imm  = (((imm8 << (32 - mod)) | (imm8 >> mod)) & 0xffffffff);
-		    }
-		  func (stream, "%u", imm);
-		  //value_in_comment = imm;
-		}
-		break;
-
-	      case 'J':
-		{
-		  unsigned int imm = 0;
-
-		  imm |= (given & 0x000000ffu);
-		  imm |= (given & 0x00007000u) >> 4;
-		  imm |= (given & 0x04000000u) >> 15;
-		  imm |= (given & 0x000f0000u) >> 4;
-		  func (stream, "%u", imm);
-		  //value_in_comment = imm;
-		}
-		break;
-
-	      case 'K':
-		{
-		  unsigned int imm = 0;
-
-		  imm |= (given & 0x000f0000u) >> 16;
-		  imm |= (given & 0x00000ff0u) >> 0;
-		  imm |= (given & 0x0000000fu) << 12;
-		  func (stream, "%u", imm);
-		  //value_in_comment = imm;
-		}
-		break;
-
-	      case 'H':
-		{
-		  unsigned int imm = 0;
-
-		  imm |= (given & 0x000f0000u) >> 4;
-		  imm |= (given & 0x00000fffu) >> 0;
-		  func (stream, "%u", imm);
-		  //value_in_comment = imm;
-		}
-		break;
-
-	      case 'V':
-		{
-		  unsigned int imm = 0;
-
-		  imm |= (given & 0x00000fffu);
-		  imm |= (given & 0x000f0000u) >> 4;
-		  func (stream, "%u", imm);
-		  //value_in_comment = imm;
-		}
-		break;
-
-	      case 'S':
-		{
-		  unsigned int reg = (given & 0x0000000fu);
-		  unsigned int stp = (given & 0x00000030u) >> 4;
-		  unsigned int imm = 0;
-		  imm |= (given & 0x000000c0u) >> 6;
-		  imm |= (given & 0x00007000u) >> 10;
-
-		  func (stream, "%s", arm_regnames[reg]);
-		  switch (stp)
-		    {
-		    case 0:
-		      if (imm > 0)
-			func (stream, ", lsl %u", imm);
-		      break;
-
-		    case 1:
-		      if (imm == 0)
-			imm = 32;
-		      func (stream, ", lsr %u", imm);
-		      break;
-
-		    case 2:
-		      if (imm == 0)
-			imm = 32;
-		      func (stream, ", asr %u", imm);
-		      break;
-
-		    case 3:
-		      if (imm == 0)
-			func (stream, ", rrx");
-		      else
-			func (stream, ", ror %u", imm);
-		    }
-		}
-		break;
-
-	      case 'a':
-		{
-		  unsigned int Rn  = (given & 0x000f0000) >> 16;
-		  unsigned int U   = ! NEGATIVE_BIT_SET;
-		  unsigned int op  = (given & 0x00000f00) >> 8;
-		  unsigned int i12 = (given & 0x00000fff);
-		  unsigned int i8  = (given & 0x000000ff);
-		  bfd_boolean writeback = FALSE, postind = FALSE;
-		  bfd_vma offset = 0;
-
-		  func (stream, "[%s", arm_regnames[Rn]);
-		  if (U) /* 12-bit positive immediate offset.  */
-		    {
-		      offset = i12;
-		      if (Rn != 15) {
-//			value_in_comment = offset;
-                      }
-		    }
-		  else if (Rn == 15) /* 12-bit negative immediate offset.  */
-		    offset = - (int) i12;
-		  else if (op == 0x0) /* Shifted register offset.  */
-		    {
-		      unsigned int Rm = (i8 & 0x0f);
-		      unsigned int sh = (i8 & 0x30) >> 4;
-
-		      func (stream, ", %s", arm_regnames[Rm]);
-		      if (sh)
-			func (stream, ", lsl %u", sh);
-		      func (stream, "]");
-		      break;
-		    }
-		  else switch (op)
-		    {
-		    case 0xE:  /* 8-bit positive immediate offset.  */
-		      offset = i8;
-		      break;
-
-		    case 0xC:  /* 8-bit negative immediate offset.  */
-		      offset = -i8;
-		      break;
-
-		    case 0xF:  /* 8-bit + preindex with wb.  */
-		      offset = i8;
-		      writeback = TRUE;
-		      break;
-
-		    case 0xD:  /* 8-bit - preindex with wb.  */
-		      offset = -i8;
-		      writeback = TRUE;
-		      break;
-
-		    case 0xB:  /* 8-bit + postindex.  */
-		      offset = i8;
-		      postind = TRUE;
-		      break;
-
-		    case 0x9:  /* 8-bit - postindex.  */
-		      offset = -i8;
-		      postind = TRUE;
-		      break;
-
-		    default:
-		      func (stream, ", <undefined>]");
-		      goto skip;
-		    }
-
-		  if (postind)
-		    func (stream, "], %d", (int) offset);
-		  else
-		    {
-		      if (offset)
-			func (stream, ", %d", (int) offset);
-		      func (stream, writeback ? "]!" : "]");
-		    }
-
-		  if (Rn == 15)
-		    {
-		      func (stream, " ; ");
-		      info->print_address_func (((pc + 4) & ~3) + offset, info);
-		    }
-		}
-	      skip:
-		break;
-
-	      case 'A':
-		{
-		  unsigned int U   = ! NEGATIVE_BIT_SET;
-		  unsigned int W   = WRITEBACK_BIT_SET;
-		  unsigned int Rn  = (given & 0x000f0000) >> 16;
-		  unsigned int off = (given & 0x000000ff);
-
-		  func (stream, "[%s", arm_regnames[Rn]);
-
-		  if (PRE_BIT_SET)
-		    {
-		      if (off || !U)
-			{
-			  func (stream, ", %c%u", U ? '+' : '-', off * 4);
-			  //value_in_comment = (off && U) ? 1 : -1;
-			}
-		      func (stream, "]");
-		      if (W)
-			func (stream, "!");
-		    }
-		  else
-		    {
-		      func (stream, "], ");
-		      if (W)
-			{
-			  func (stream, "%c%u", U ? '+' : '-', off * 4);
-			  //value_in_comment = (off && U) ? 1 : -1;
-			}
-		      else
-			{
-			  func (stream, "{%u}", off);
-			 // value_in_comment = off;
-			}
-		    }
-		}
-		break;
-
-	      case 'w':
-		{
-		  unsigned int Sbit = (given & 0x01000000) >> 24;
-		  unsigned int type = (given & 0x00600000) >> 21;
-
-		  switch (type)
-		    {
-		    case 0: func (stream, Sbit ? "sb" : "b"); break;
-		    case 1: func (stream, Sbit ? "sh" : "h"); break;
-		    case 2:
-		      if (Sbit)
-			func (stream, "??");
-		      break;
-		    case 3:
-		      func (stream, "??");
-		      break;
-		    }
-		}
-		break;
-
-	      case 'm':
-		{
-		  int started = 0;
-		  int reg;
-
-		  func (stream, "{");
-		  for (reg = 0; reg < 16; reg++)
-		    if ((given & (1 << reg)) != 0)
-		      {
-			if (started)
-			  func (stream, ", ");
-			started = 1;
-			func (stream, "%s", arm_regnames[reg]);
-		      }
-		  func (stream, "}");
-		}
-		break;
-
-	      case 'E':
-		{
-		  unsigned int msb = (given & 0x0000001f);
-		  unsigned int lsb = 0;
-
-		  lsb |= (given & 0x000000c0u) >> 6;
-		  lsb |= (given & 0x00007000u) >> 10;
-		  func (stream, "%u, %u", lsb, msb - lsb + 1);
-		}
-		break;
-
-	      case 'F':
-		{
-		  unsigned int width = (given & 0x0000001f) + 1;
-		  unsigned int lsb = 0;
-
-		  lsb |= (given & 0x000000c0u) >> 6;
-		  lsb |= (given & 0x00007000u) >> 10;
-		  func (stream, "%u, %u", lsb, width);
-		}
-		break;
-
-	      case 'b':
-		{
-		  unsigned int S = (given & 0x04000000u) >> 26;
-		  unsigned int J1 = (given & 0x00002000u) >> 13;
-		  unsigned int J2 = (given & 0x00000800u) >> 11;
-		  bfd_vma offset = 0;
-
-		  offset |= !S << 20;
-		  offset |= J2 << 19;
-		  offset |= J1 << 18;
-		  offset |= (given & 0x003f0000) >> 4;
-		  offset |= (given & 0x000007ff) << 1;
-		  offset -= (1 << 20);
-
-		  info->print_address_func (pc + 4 + offset, info);
-		}
-		break;
-
-	      case 'B':
-		{
-		  unsigned int S = (given & 0x04000000u) >> 26;
-		  unsigned int I1 = (given & 0x00002000u) >> 13;
-		  unsigned int I2 = (given & 0x00000800u) >> 11;
-		  bfd_vma offset = 0;
-
-		  offset |= !S << 24;
-		  offset |= !(I1 ^ S) << 23;
-		  offset |= !(I2 ^ S) << 22;
-		  offset |= (given & 0x03ff0000u) >> 4;
-		  offset |= (given & 0x000007ffu) << 1;
-		  offset -= (1 << 24);
-		  offset += pc + 4;
-
-		  /* BLX target addresses are always word aligned.  */
-		  if ((given & 0x00001000u) == 0)
-		      offset &= ~2u;
-
-		  info->print_address_func (offset, info);
-		}
-		break;
-
-	      case 's':
-		{
-		  unsigned int shift = 0;
-
-		  shift |= (given & 0x000000c0u) >> 6;
-		  shift |= (given & 0x00007000u) >> 10;
-		  if (WRITEBACK_BIT_SET)
-		    func (stream, ", asr %u", shift);
-		  else if (shift)
-		    func (stream, ", lsl %u", shift);
-		  /* else print nothing - lsl #0 */
-		}
-		break;
-
-	      case 'R':
-		{
-		  unsigned int rot = (given & 0x00000030) >> 4;
-
-		  if (rot)
-		    func (stream, ", ror %u", rot * 8);
-		}
-		break;
-
-	      case 'U':
-		if ((given & 0xf0) == 0x60)
-		  {
-		    switch (given & 0xf)
-		      {
-			case 0xf: func (stream, "sy"); break;
-			default:
-			  func (stream, "%d", (int) given & 0xf);
-			      break;
-		      }
-		  }
-		else
-		  {
-		    const char * opt = data_barrier_option (given & 0xf);
-		    if (opt != NULL)
-		      func (stream, "%s", opt);
-		    else
-		      func (stream, "%d", (int) given & 0xf);
-		   }
-		break;
-
-	      case 'C':
-		if ((given & 0xff) == 0)
-		  {
-		    func (stream, "%cPSR_", (given & 0x100000) ? 'S' : 'C');
-		    if (given & 0x800)
-		      func (stream, "f");
-		    if (given & 0x400)
-		      func (stream, "s");
-		    if (given & 0x200)
-		      func (stream, "x");
-		    if (given & 0x100)
-		      func (stream, "c");
-		  }
-		else if ((given & 0x20) == 0x20)
-		  {
-		    char const* name;
-		    unsigned sysm = (given & 0xf00) >> 8;
-
-		    sysm |= (given & 0x30);
-		    sysm |= (given & 0x00100000) >> 14;
-		    name = banked_regname (sysm);
-
-		    if (name != NULL)
-		      func (stream, "%s", name);
-		    else
-		      func (stream, "(UNDEF: %lu)", (unsigned long) sysm);
-		  }
-		else
-		  {
-		    func (stream, "%s", psr_name (given & 0xff));
-		  }
-		break;
-
-	      case 'D':
-		if (((given & 0xff) == 0)
-		    || ((given & 0x20) == 0x20))
-		  {
-		    char const* name;
-		    unsigned sm = (given & 0xf0000) >> 16;
-
-		    sm |= (given & 0x30);
-		    sm |= (given & 0x00100000) >> 14;
-		    name = banked_regname (sm);
-
-		    if (name != NULL)
-		      func (stream, "%s", name);
-		    else
-		      func (stream, "(UNDEF: %lu)", (unsigned long) sm);
-		  }
-		else
-		  func (stream, "%s", psr_name (given & 0xff));
-		break;
-
-	      case '0': case '1': case '2': case '3': case '4':
-	      case '5': case '6': case '7': case '8': case '9':
-		{
-		  int width;
-		  unsigned long val;
-
-		  c = arm_decode_bitfield (c, given, &val, &width);
-
-		  switch (*c)
-		    {
-		    case 'd':
-		      func (stream, "%lu", val);
-		      //value_in_comment = val;
-		      break;
-
-		    case 'D':
-		      func (stream, "%lu", val + 1);
-		      // value_in_comment = val + 1;
-		      break;
-
-		    case 'W':
-		      func (stream, "%lu", val * 4);
-		      // value_in_comment = val * 4;
-		      break;
-
-		    case 'S':
-		      if (val == 13)
-			is_unpredictable = TRUE;
-		      /* Fall through.  */
-		    case 'R':
-		      if (val == 15)
-			is_unpredictable = TRUE;
-		      /* Fall through.  */
-		    case 'r':
-		      func (stream, "%s", arm_regnames[val]);
-		      break;
-
-		    case 'c':
-		      func (stream, "%s", arm_conditional[val]);
-		      break;
-
-		    case '\'':
-		      c++;
-		      if (val == ((1ul << width) - 1))
-			func (stream, "%c", *c);
-		      break;
-
-		    case '`':
-		      c++;
-		      if (val == 0)
-			func (stream, "%c", *c);
-		      break;
-
-		    case '?':
-		      func (stream, "%c", c[(1 << width) - (int) val]);
-		      c += 1 << width;
-		      break;
-
-		    case 'x':
-		      func (stream, "0x%lx", val & 0xffffffffUL);
-		      break;
-
-		    }
-		}
-		break;
-
-	      case 'L':
-		/* PR binutils/12534
+  if (print_insn_coprocessor (pc, info, given, TRUE)) {
+	  return;
+  }
+
+  if (print_insn_neon (info, given, TRUE)) {
+	  return;
+  }
+
+  for (insn = thumb32_opcodes; insn->assembler; insn++) {
+	  if ((given & insn->mask) == insn->value) {
+		  bfd_boolean is_unpredictable = FALSE;
+		  // signed long value_in_comment = 0;
+		  const char *c = insn->assembler;
+
+		  for (; *c; c++) {
+			  if (*c != '%') {
+				  func (stream, "%c", *c);
+				  continue;
+			  }
+
+			  switch (*++c) {
+			  case '%':
+				  func (stream, "%%");
+				  break;
+
+			  case 'c':
+				  if (ifthen_state) {
+					  func (stream, "%s", arm_conditional[IFTHEN_COND]);
+				  }
+				  break;
+
+			  case 'x':
+				  if (ifthen_next_state) {
+					  func (stream, " ; unpredictable branch in IT block\n");
+				  }
+				  break;
+
+			  case 'X':
+				  if (ifthen_state) {
+					  func (stream, " ; unpredictable <IT:%s>",
+						  arm_conditional[IFTHEN_COND]);
+				  }
+				  break;
+
+			  case 'I': {
+				  unsigned int imm12 = 0;
+
+				  imm12 |= (given & 0x000000ffu);
+				  imm12 |= (given & 0x00007000u) >> 4;
+				  imm12 |= (given & 0x04000000u) >> 15;
+				  func (stream, "%u", imm12);
+				  //value_in_comment = imm12;
+			  } break;
+
+			  case 'M': {
+				  unsigned int bits = 0, imm, imm8, mod;
+
+				  bits |= (given & 0x000000ffu);
+				  bits |= (given & 0x00007000u) >> 4;
+				  bits |= (given & 0x04000000u) >> 15;
+				  imm8 = (bits & 0x0ff);
+				  mod = (bits & 0xf00) >> 8;
+				  switch (mod) {
+				  case 0: imm = imm8; break;
+				  case 1: imm = ((imm8 << 16) | imm8); break;
+				  case 2: imm = ((imm8 << 24) | (imm8 << 8)); break;
+				  case 3: imm = ((imm8 << 24) | (imm8 << 16) | (imm8 << 8) | imm8); break;
+				  default:
+					  mod = (bits & 0xf80) >> 7;
+					  imm8 = (bits & 0x07f) | 0x80;
+					  imm = (((imm8 << (32 - mod)) | (imm8 >> mod)) & 0xffffffff);
+				  }
+				  func (stream, "%u", imm);
+				  //value_in_comment = imm;
+			  } break;
+
+			  case 'J': {
+				  unsigned int imm = 0;
+
+				  imm |= (given & 0x000000ffu);
+				  imm |= (given & 0x00007000u) >> 4;
+				  imm |= (given & 0x04000000u) >> 15;
+				  imm |= (given & 0x000f0000u) >> 4;
+				  func (stream, "%u", imm);
+				  //value_in_comment = imm;
+			  } break;
+
+			  case 'K': {
+				  unsigned int imm = 0;
+
+				  imm |= (given & 0x000f0000u) >> 16;
+				  imm |= (given & 0x00000ff0u) >> 0;
+				  imm |= (given & 0x0000000fu) << 12;
+				  func (stream, "%u", imm);
+				  //value_in_comment = imm;
+			  } break;
+
+			  case 'H': {
+				  unsigned int imm = 0;
+
+				  imm |= (given & 0x000f0000u) >> 4;
+				  imm |= (given & 0x00000fffu) >> 0;
+				  func (stream, "%u", imm);
+				  //value_in_comment = imm;
+			  } break;
+
+			  case 'V': {
+				  unsigned int imm = 0;
+
+				  imm |= (given & 0x00000fffu);
+				  imm |= (given & 0x000f0000u) >> 4;
+				  func (stream, "%u", imm);
+				  //value_in_comment = imm;
+			  } break;
+
+			  case 'S': {
+				  unsigned int reg = (given & 0x0000000fu);
+				  unsigned int stp = (given & 0x00000030u) >> 4;
+				  unsigned int imm = 0;
+				  imm |= (given & 0x000000c0u) >> 6;
+				  imm |= (given & 0x00007000u) >> 10;
+
+				  func (stream, "%s", arm_regnames[reg]);
+				  switch (stp) {
+				  case 0:
+					  if (imm > 0) {
+						  func (stream, ", lsl %u", imm);
+					  }
+					  break;
+
+				  case 1:
+					  if (imm == 0) {
+						  imm = 32;
+					  }
+					  func (stream, ", lsr %u", imm);
+					  break;
+
+				  case 2:
+					  if (imm == 0) {
+						  imm = 32;
+					  }
+					  func (stream, ", asr %u", imm);
+					  break;
+
+				  case 3:
+					  if (imm == 0) {
+						  func (stream, ", rrx");
+					  } else {
+						  func (stream, ", ror %u", imm);
+					  }
+				  }
+			  } break;
+
+			  case 'a': {
+				  unsigned int Rn = (given & 0x000f0000) >> 16;
+				  unsigned int U = !NEGATIVE_BIT_SET;
+				  unsigned int op = (given & 0x00000f00) >> 8;
+				  unsigned int i12 = (given & 0x00000fff);
+				  unsigned int i8 = (given & 0x000000ff);
+				  bfd_boolean writeback = FALSE, postind = FALSE;
+				  bfd_vma offset = 0;
+
+				  func (stream, "[%s", arm_regnames[Rn]);
+				  if (U) /* 12-bit positive immediate offset.  */
+				  {
+					  offset = i12;
+					  if (Rn != 15) {
+						  //			value_in_comment = offset;
+					  }
+				  } else if (Rn == 15) { /* 12-bit negative immediate offset.  */
+					  offset = -(int)i12;
+				  } else if (op == 0x0) /* Shifted register offset.  */
+				  {
+					  unsigned int Rm = (i8 & 0x0f);
+					  unsigned int sh = (i8 & 0x30) >> 4;
+
+					  func (stream, ", %s", arm_regnames[Rm]);
+					  if (sh) {
+						  func (stream, ", lsl %u", sh);
+					  }
+					  func (stream, "]");
+					  break;
+				  } else {
+					  switch (op) {
+					  case 0xE: /* 8-bit positive immediate offset.  */
+						  offset = i8;
+						  break;
+
+					  case 0xC: /* 8-bit negative immediate offset.  */
+						  offset = -i8;
+						  break;
+
+					  case 0xF: /* 8-bit + preindex with wb.  */
+						  offset = i8;
+						  writeback = TRUE;
+						  break;
+
+					  case 0xD: /* 8-bit - preindex with wb.  */
+						  offset = -i8;
+						  writeback = TRUE;
+						  break;
+
+					  case 0xB: /* 8-bit + postindex.  */
+						  offset = i8;
+						  postind = TRUE;
+						  break;
+
+					  case 0x9: /* 8-bit - postindex.  */
+						  offset = -i8;
+						  postind = TRUE;
+						  break;
+
+					  default:
+						  func (stream, ", <undefined>]");
+						  goto skip;
+					  }
+				  }
+
+				  if (postind) {
+					  func (stream, "], %d", (int)offset);
+				  } else {
+					  if (offset) {
+						  func (stream, ", %d", (int)offset);
+					  }
+					  func (stream, writeback ? "]!" : "]");
+				  }
+
+				  if (Rn == 15) {
+					  func (stream, " ; ");
+					  info->print_address_func (((pc + 4) & ~3) + offset, info);
+				  }
+			  }
+			  skip:
+				  break;
+
+			  case 'A': {
+				  unsigned int U = !NEGATIVE_BIT_SET;
+				  unsigned int W = WRITEBACK_BIT_SET;
+				  unsigned int Rn = (given & 0x000f0000) >> 16;
+				  unsigned int off = (given & 0x000000ff);
+
+				  func (stream, "[%s", arm_regnames[Rn]);
+
+				  if (PRE_BIT_SET) {
+					  if (off || !U) {
+						  func (stream, ", %c%u", U ? '+' : '-', off * 4);
+						  //value_in_comment = (off && U) ? 1 : -1;
+					  }
+					  func (stream, "]");
+					  if (W) {
+						  func (stream, "!");
+					  }
+				  } else {
+					  func (stream, "], ");
+					  if (W) {
+						  func (stream, "%c%u", U ? '+' : '-', off * 4);
+						  //value_in_comment = (off && U) ? 1 : -1;
+					  } else {
+						  func (stream, "{%u}", off);
+						  // value_in_comment = off;
+					  }
+				  }
+			  } break;
+
+			  case 'w': {
+				  unsigned int Sbit = (given & 0x01000000) >> 24;
+				  unsigned int type = (given & 0x00600000) >> 21;
+
+				  switch (type) {
+				  case 0: func (stream, Sbit ? "sb" : "b"); break;
+				  case 1: func (stream, Sbit ? "sh" : "h"); break;
+				  case 2:
+					  if (Sbit) {
+						  func (stream, "??");
+					  }
+					  break;
+				  case 3:
+					  func (stream, "??");
+					  break;
+				  }
+			  } break;
+
+			  case 'm': {
+				  int started = 0;
+				  int reg;
+
+				  func (stream, "{");
+				  for (reg = 0; reg < 16; reg++) {
+					  if ((given & (1 << reg)) != 0) {
+						  if (started) {
+							  func (stream, ", ");
+						  }
+						  started = 1;
+						  func (stream, "%s", arm_regnames[reg]);
+					  }
+				  }
+				  func (stream, "}");
+			  } break;
+
+			  case 'E': {
+				  unsigned int msb = (given & 0x0000001f);
+				  unsigned int lsb = 0;
+
+				  lsb |= (given & 0x000000c0u) >> 6;
+				  lsb |= (given & 0x00007000u) >> 10;
+				  func (stream, "%u, %u", lsb, msb - lsb + 1);
+			  } break;
+
+			  case 'F': {
+				  unsigned int width = (given & 0x0000001f) + 1;
+				  unsigned int lsb = 0;
+
+				  lsb |= (given & 0x000000c0u) >> 6;
+				  lsb |= (given & 0x00007000u) >> 10;
+				  func (stream, "%u, %u", lsb, width);
+			  } break;
+
+			  case 'b': {
+				  unsigned int S = (given & 0x04000000u) >> 26;
+				  unsigned int J1 = (given & 0x00002000u) >> 13;
+				  unsigned int J2 = (given & 0x00000800u) >> 11;
+				  bfd_vma offset = 0;
+
+				  offset |= !S << 20;
+				  offset |= J2 << 19;
+				  offset |= J1 << 18;
+				  offset |= (given & 0x003f0000) >> 4;
+				  offset |= (given & 0x000007ff) << 1;
+				  offset -= (1 << 20);
+
+				  info->print_address_func (pc + 4 + offset, info);
+			  } break;
+
+			  case 'B': {
+				  unsigned int S = (given & 0x04000000u) >> 26;
+				  unsigned int I1 = (given & 0x00002000u) >> 13;
+				  unsigned int I2 = (given & 0x00000800u) >> 11;
+				  bfd_vma offset = 0;
+
+				  offset |= !S << 24;
+				  offset |= !(I1 ^ S) << 23;
+				  offset |= !(I2 ^ S) << 22;
+				  offset |= (given & 0x03ff0000u) >> 4;
+				  offset |= (given & 0x000007ffu) << 1;
+				  offset -= (1 << 24);
+				  offset += pc + 4;
+
+				  /* BLX target addresses are always word aligned.  */
+				  if ((given & 0x00001000u) == 0) {
+					  offset &= ~2u;
+				  }
+
+				  info->print_address_func (offset, info);
+			  } break;
+
+			  case 's': {
+				  unsigned int shift = 0;
+
+				  shift |= (given & 0x000000c0u) >> 6;
+				  shift |= (given & 0x00007000u) >> 10;
+				  if (WRITEBACK_BIT_SET) {
+					  func (stream, ", asr %u", shift);
+				  } else if (shift) {
+					  func (stream, ", lsl %u", shift);
+				  }
+				  /* else print nothing - lsl #0 */
+			  } break;
+
+			  case 'R': {
+				  unsigned int rot = (given & 0x00000030) >> 4;
+
+				  if (rot) {
+					  func (stream, ", ror %u", rot * 8);
+				  }
+			  } break;
+
+			  case 'U':
+				  if ((given & 0xf0) == 0x60) {
+					  switch (given & 0xf) {
+					  case 0xf: func (stream, "sy"); break;
+					  default:
+						  func (stream, "%d", (int)given & 0xf);
+						  break;
+					  }
+				  } else {
+					  const char *opt = data_barrier_option (given & 0xf);
+					  if (opt != NULL) {
+						  func (stream, "%s", opt);
+					  } else {
+						  func (stream, "%d", (int)given & 0xf);
+					  }
+				  }
+				  break;
+
+			  case 'C':
+				  if ((given & 0xff) == 0) {
+					  func (stream, "%cPSR_", (given & 0x100000) ? 'S' : 'C');
+					  if (given & 0x800) {
+						  func (stream, "f");
+					  }
+					  if (given & 0x400) {
+						  func (stream, "s");
+					  }
+					  if (given & 0x200) {
+						  func (stream, "x");
+					  }
+					  if (given & 0x100) {
+						  func (stream, "c");
+					  }
+				  } else if ((given & 0x20) == 0x20) {
+					  char const *name;
+					  unsigned sysm = (given & 0xf00) >> 8;
+
+					  sysm |= (given & 0x30);
+					  sysm |= (given & 0x00100000) >> 14;
+					  name = banked_regname (sysm);
+
+					  if (name != NULL) {
+						  func (stream, "%s", name);
+					  } else {
+						  func (stream, "(UNDEF: %lu)", (unsigned long)sysm);
+					  }
+				  } else {
+					  func (stream, "%s", psr_name (given & 0xff));
+				  }
+				  break;
+
+			  case 'D':
+				  if (((given & 0xff) == 0) || ((given & 0x20) == 0x20)) {
+					  char const *name;
+					  unsigned sm = (given & 0xf0000) >> 16;
+
+					  sm |= (given & 0x30);
+					  sm |= (given & 0x00100000) >> 14;
+					  name = banked_regname (sm);
+
+					  if (name != NULL) {
+						  func (stream, "%s", name);
+					  } else {
+						  func (stream, "(UNDEF: %lu)", (unsigned long)sm);
+					  }
+				  } else {
+					  func (stream, "%s", psr_name (given & 0xff));
+				  }
+				  break;
+
+			  case '0':
+			  case '1':
+			  case '2':
+			  case '3':
+			  case '4':
+			  case '5':
+			  case '6':
+			  case '7':
+			  case '8':
+			  case '9': {
+				  int width;
+				  unsigned long val;
+
+				  c = arm_decode_bitfield (c, given, &val, &width);
+
+				  switch (*c) {
+				  case 'd':
+					  func (stream, "%lu", val);
+					  //value_in_comment = val;
+					  break;
+
+				  case 'D':
+					  func (stream, "%lu", val + 1);
+					  // value_in_comment = val + 1;
+					  break;
+
+				  case 'W':
+					  func (stream, "%lu", val * 4);
+					  // value_in_comment = val * 4;
+					  break;
+
+				  case 'S':
+					  if (val == 13) {
+						  is_unpredictable = TRUE;
+					  }
+					  /* Fall through.  */
+				  case 'R':
+					  if (val == 15) {
+						  is_unpredictable = TRUE;
+					  }
+					  /* Fall through.  */
+				  case 'r':
+					  func (stream, "%s", arm_regnames[val]);
+					  break;
+
+				  case 'c':
+					  func (stream, "%s", arm_conditional[val]);
+					  break;
+
+				  case '\'':
+					  c++;
+					  if (val == ((1ul << width) - 1)) {
+						  func (stream, "%c", *c);
+					  }
+					  break;
+
+				  case '`':
+					  c++;
+					  if (val == 0) {
+						  func (stream, "%c", *c);
+					  }
+					  break;
+
+				  case '?':
+					  func (stream, "%c", c[(1 << width) - (int)val]);
+					  c += 1 << width;
+					  break;
+
+				  case 'x':
+					  func (stream, "0x%lx", val & 0xffffffffUL);
+					  break;
+				  }
+			  } break;
+
+			  case 'L':
+				  /* PR binutils/12534
 		   If we have a PC relative offset in an LDRD or STRD
 		   instructions then display the decoded address.  */
-		if (((given >> 16) & 0xf) == 0xf)
-		  {
-		    bfd_vma offset = (given & 0xff) * 4;
+				  if (((given >> 16) & 0xf) == 0xf) {
+					  bfd_vma offset = (given & 0xff) * 4;
 
-		    if ((given & (1 << 23)) == 0)
-		      offset = - offset;
-		    func (stream, " ; ");
-		    info->print_address_func ((pc & ~3) + 4 + offset, info);
+					  if ((given & (1 << 23)) == 0) {
+						  offset = -offset;
+					  }
+					  func (stream, " ; ");
+					  info->print_address_func ((pc & ~3) + 4 + offset, info);
+				  }
+				  break;
+			  }
 		  }
-		break;
-
-	      }
-	  }
 
 #if 0
 	if (value_in_comment > 32 || value_in_comment < -16)
 	  func (stream, " ; 0x%lx", value_in_comment);
 #endif
 
-	if (is_unpredictable)
-	  func (stream, UNPREDICTABLE_INSTRUCTION);
+		  if (is_unpredictable) {
+			  func (stream, UNPREDICTABLE_INSTRUCTION);
+		  }
 
-	return;
-      }
+		  return;
+	  }
+  }
 
   /* No match.  */
 }
@@ -6085,8 +6121,9 @@ arm_symbol_is_valid (asymbol * sym,
 {
   const char * name;
 
-  if (sym == NULL)
-    return FALSE;
+  if (sym == NULL) {
+	  return FALSE;
+  }
 
   name = bfd_asymbol_name (sym);
 
@@ -6106,13 +6143,16 @@ disassembler_options_cmp (const char *s1, const char *s2)
   do
     {
       c1 = (unsigned char) *s1++;
-      if (c1 == ',')
-        c1 = '\0';
+      if (c1 == ',') {
+	      c1 = '\0';
+      }
       c2 = (unsigned char) *s2++;
-      if (c2 == ',')
-        c2 = '\0';
-      if (c1 == '\0')
-        return c1 - c2;
+      if (c2 == ',') {
+	      c2 = '\0';
+      }
+      if (c1 == '\0') {
+	      return c1 - c2;
+      }
     }
   while (c1 == c2);
 
@@ -6129,22 +6169,23 @@ parse_arm_disassembler_options (char *options)
       if (CONST_STRNEQ (opt, "reg-names-"))
 	{
 	  unsigned int i;
-	  for (i = 0; i < NUM_ARM_OPTIONS; i++)
-	    if (disassembler_options_cmp (opt, regnames[i].name) == 0)
-	      {
-		regname_selected = i;
-		break;
-	      }
+	  for (i = 0; i < NUM_ARM_OPTIONS; i++) {
+		  if (disassembler_options_cmp (opt, regnames[i].name) == 0) {
+			  regname_selected = i;
+			  break;
+		  }
+	  }
 
-	  if (i >= NUM_ARM_OPTIONS)
-	    fprintf (stderr, _("Unrecognised register name set: %s\n"), opt);
-	}
-      else if (CONST_STRNEQ (opt, "force-thumb"))
-	force_thumb = 1;
-      else if (CONST_STRNEQ (opt, "no-force-thumb"))
-	force_thumb = 0;
-      else
-	fprintf (stderr, _("Unrecognised disassembler option: %s\n"), opt);
+	  if (i >= NUM_ARM_OPTIONS) {
+		  fprintf (stderr, _ ("Unrecognised register name set: %s\n"), opt);
+	  }
+      } else if (CONST_STRNEQ (opt, "force-thumb")) {
+	      force_thumb = 1;
+      } else if (CONST_STRNEQ (opt, "no-force-thumb")) {
+	      force_thumb = 0;
+      } else {
+	      fprintf (stderr, _ ("Unrecognised disassembler option: %s\n"), opt);
+      }
     }
 
   return;
@@ -6188,20 +6229,23 @@ find_ifthen_state (bfd_vma pc,
 	{
 	  /* A symbol must be on an instruction boundary, and will not
 	     be within an IT block.  */
-	  if (seen_it && (count & 1))
-	    break;
+	  if (seen_it && (count & 1)) {
+		  break;
+	  }
 
 	  return;
 	}
       addr -= 2;
       status = info->read_memory_func (addr, (bfd_byte *) b, 2, info);
-      if (status)
-	return;
+      if (status) {
+	      return;
+      }
 
-      if (little)
-	insn = (b[0]) | (b[1] << 8);
-      else
-	insn = (b[1]) | (b[0] << 8);
+      if (little) {
+	      insn = (b[0]) | (b[1] << 8);
+      } else {
+	      insn = (b[1]) | (b[0] << 8);
+      }
       if (seen_it)
 	{
 	  if ((insn & 0xf800) < 0xe800)
@@ -6209,8 +6253,9 @@ find_ifthen_state (bfd_vma pc,
 	      /* Addr + 2 is an instruction boundary.  See if this matches
 	         the expected boundary based on the position of the last
 		 IT candidate.  */
-	      if (count & 1)
-		break;
+	      if (count & 1) {
+		      break;
+	      }
 	      seen_it = 0;
 	    }
 	}
@@ -6226,18 +6271,21 @@ find_ifthen_state (bfd_vma pc,
 	      it_count = count >> 1;
 	    }
 	}
-      if ((insn & 0xf800) >= 0xe800)
-	count++;
-      else
-	count = (count + 2) | 1;
-      /* IT blocks contain at most 4 instructions.  */
-      if (count >= 8 && !seen_it)
-	return;
+	if ((insn & 0xf800) >= 0xe800) {
+		count++;
+	} else {
+		count = (count + 2) | 1;
+	}
+	/* IT blocks contain at most 4 instructions.  */
+	if (count >= 8 && !seen_it) {
+		return;
+	}
     }
   /* We found an IT instruction.  */
   ifthen_state = (seen_it & 0xe0) | ((seen_it << it_count) & 0x1f);
-  if ((ifthen_state & 0xf) == 0)
-    ifthen_state = 0;
+  if ((ifthen_state & 0xf) == 0) {
+	  ifthen_state = 0;
+  }
 }
 
 /* Returns nonzero and sets *MAP_TYPE if the N'th symbol is a
@@ -6271,8 +6319,9 @@ get_map_sym_type (struct disassemble_info *info,
 		  enum map_type *map_type)
 {
   /* If the symbol is in a different section, ignore it.  */
-  if (info->section != NULL && info->section != info->symtab[n]->section)
-    return FALSE;
+  if (info->section != NULL && info->section != info->symtab[n]->section) {
+	  return FALSE;
+  }
 
   return is_mapping_symbol (info, n, map_type);
 }
@@ -6332,23 +6381,25 @@ mapping_symbol_for_insn (bfd_vma pc, struct disassemble_info *info,
   enum map_type type = MAP_ARM;
   struct arm_private_data *private_data;
 
-  if (info->private_data == NULL || info->symtab_size == 0
-      || bfd_asymbol_flavour (*info->symtab) != bfd_target_elf_flavour)
-    return FALSE;
+  if (info->private_data == NULL || info->symtab_size == 0 || bfd_asymbol_flavour (*info->symtab) != bfd_target_elf_flavour) {
+	  return FALSE;
+  }
 
   private_data = info->private_data;
-  if (pc == 0)
-    start = 0;
-  else
-    start = private_data->last_mapping_sym;
+  if (pc == 0) {
+	  start = 0;
+  } else {
+	  start = private_data->last_mapping_sym;
+  }
 
   start = (start == -1)? 0 : start;
   addr = bfd_asymbol_value (info->symtab[start]);
 
   if (pc >= addr)
     {
-      if (get_map_sym_type (info, start, &type))
-      found = TRUE;
+	  if (get_map_sym_type (info, start, &type)) {
+		  found = TRUE;
+	  }
     }
   else
     {
@@ -6479,8 +6530,8 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
     {
       static struct arm_private_data private;
 
-      if ((info->flags & USER_SPECIFIED_MACHINE_TYPE) == 0)
-	/* If the user did not use the -m command line switch then default to
+      if ((info->flags & USER_SPECIFIED_MACHINE_TYPE) == 0) {
+	      /* If the user did not use the -m command line switch then default to
 	   disassembling all types of ARM instruction.
 
 	   The info->mach value has to be ignored as this will be based on
@@ -6498,7 +6549,8 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 	   all ARM instructions then use "-marm".  This will select the
 	   "unknown" arm architecture which is compatible with any ARM
 	   instruction.  */
-	  info->mach = bfd_mach_arm_unknown;
+	      info->mach = bfd_mach_arm_unknown;
+      }
 
       /* Compute the architecture bitmask from the machine number.
 	 Note: This assumes that the machine number will not change
@@ -6535,13 +6587,13 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 	 executable section (eg because of -ffunction-sections).  Either way
 	 start scanning from the beginning of the symbol table, not where we
 	 left off last time.  */
-      if (pc == 0)
-	start = 0;
-      else
-	{
-	  start = info->symtab_pos + 1;
-	  if (start < private_data->last_mapping_sym)
-	    start = private_data->last_mapping_sym;
+      if (pc == 0) {
+	      start = 0;
+      } else {
+	      start = info->symtab_pos + 1;
+	      if (start < private_data->last_mapping_sym) {
+		      start = private_data->last_mapping_sym;
+	      }
 	}
       found = FALSE;
 
@@ -6552,8 +6604,9 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 	  for (n = start; n < info->symtab_size; n++)
 	    {
 	      addr = bfd_asymbol_value (info->symtab[n]);
-	      if (addr > pc)
-		break;
+	      if (addr > pc) {
+		      break;
+	      }
 	      if (get_map_sym_type (info, n, &type))
 		{
 		  last_sym = n;
@@ -6576,25 +6629,26 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 		}
 	    }
 
-	  if (found)
-	    private_data->has_mapping_symbols = 1;
+	    if (found) {
+		    private_data->has_mapping_symbols = 1;
+	    }
 
-	  /* No mapping symbols were found.  A leading $d may be
+	    /* No mapping symbols were found.  A leading $d may be
 	     omitted for sections which start with data; but for
 	     compatibility with legacy and stripped binaries, only
 	     assume the leading $d if there is at least one mapping
 	     symbol in the file.  */
-	  if (!found && private_data->has_mapping_symbols == -1)
-	    {
-	      /* Look for mapping symbols, in any section.  */
-	      for (n = 0; n < info->symtab_size; n++)
-		if (is_mapping_symbol (info, n, &type))
-		  {
-		    private_data->has_mapping_symbols = 1;
-		    break;
-		  }
-	      if (private_data->has_mapping_symbols == -1)
-		private_data->has_mapping_symbols = 0;
+	    if (!found && private_data->has_mapping_symbols == -1) {
+		    /* Look for mapping symbols, in any section.  */
+		    for (n = 0; n < info->symtab_size; n++) {
+			    if (is_mapping_symbol (info, n, &type)) {
+				    private_data->has_mapping_symbols = 1;
+				    break;
+			    }
+		    }
+		    if (private_data->has_mapping_symbols == -1) {
+			    private_data->has_mapping_symbols = 0;
+		    }
 	    }
 
 	  if (!found && private_data->has_mapping_symbols == 1)
@@ -6612,8 +6666,9 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 	  for (n = start; n < info->symtab_size; n++)
 	    {
 	      addr = bfd_asymbol_value (info->symtab[n]);
-	      if (addr > pc)
-		break;
+	      if (addr > pc) {
+		      break;
+	      }
 	      if (get_sym_code_type (info, n, &type))
 		{
 		  last_sym = n;
@@ -6656,46 +6711,52 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 		  && (info->section == NULL
 		      || info->section == info->symtab[n]->section))
 		{
-		  if (addr - pc < size)
-		    size = addr - pc;
-		  break;
+		      if (addr - pc < size) {
+			      size = addr - pc;
+		      }
+		      break;
 		}
 	    }
 	  /* If the next symbol is after three bytes, we need to
 	     print only part of the data, so that we can use either
 	     .byte or .short.  */
-	  if (size == 3)
-	    size = (pc & 1) ? 1 : 2;
+	    if (size == 3) {
+		    size = (pc & 1) ? 1 : 2;
+	    }
 	}
     }
 
-  if (force_thumb)
-    is_thumb = TRUE;
+    if (force_thumb) {
+	    is_thumb = TRUE;
+    }
 
-  if (is_data)
-    info->display_endian = little ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG;
-  else
-    info->display_endian = little_code ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG;
+    if (is_data) {
+	    info->display_endian = little ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG;
+    } else {
+	    info->display_endian = little_code ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG;
+    }
 
-  info->bytes_per_line = 4;
+    info->bytes_per_line = 4;
 
-  /* PR 10263: Disassemble data if requested to do so by the user.  */
-  if (is_data && ((info->flags & DISASSEMBLE_DATA) == 0))
-    {
-      int i;
+    /* PR 10263: Disassemble data if requested to do so by the user.  */
+    if (is_data && ((info->flags & DISASSEMBLE_DATA) == 0)) {
+	    int i;
 
-      /* Size was already set above.  */
-      info->bytes_per_chunk = size;
-      printer = print_insn_data;
+	    /* Size was already set above.  */
+	    info->bytes_per_chunk = size;
+	    printer = print_insn_data;
 
-      status = info->read_memory_func (pc, (bfd_byte *) b, size, info);
-      given = 0;
-      if (little)
-	for (i = size - 1; i >= 0; i--)
-	  given = b[i] | (given << 8);
-      else
-	for (i = 0; i < (int) size; i++)
-	  given = b[i] | (given << 8);
+	    status = info->read_memory_func (pc, (bfd_byte *)b, size, info);
+	    given = 0;
+	    if (little) {
+		    for (i = size - 1; i >= 0; i--) {
+			    given = b[i] | (given << 8);
+		    }
+	    } else {
+		    for (i = 0; i < (int)size; i++) {
+			    given = b[i] | (given << 8);
+		    }
+	    }
     }
   else if (!is_thumb)
     {
@@ -6706,10 +6767,11 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
       size = 4;
 
       status = info->read_memory_func (pc, (bfd_byte *) b, 4, info);
-      if (little_code)
-	given = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24);
-      else
-	given = (b[3]) | (b[2] << 8) | (b[1] << 16) | (b[0] << 24);
+      if (little_code) {
+	      given = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24);
+      } else {
+	      given = (b[3]) | (b[2] << 8) | (b[1] << 16) | (b[0] << 24);
+      }
     }
   else
     {
@@ -6722,10 +6784,11 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
       size = 2;
 
       status = info->read_memory_func (pc, (bfd_byte *) b, 2, info);
-      if (little_code)
-	given = (b[0]) | (b[1] << 8);
-      else
-	given = (b[1]) | (b[0] << 8);
+      if (little_code) {
+	      given = (b[0]) | (b[1] << 8);
+      } else {
+	      given = (b[1]) | (b[0] << 8);
+      }
 
       if (!status)
 	{
@@ -6736,26 +6799,27 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
 	      || (given & 0xF800) == 0xE800)
 	    {
 	      status = info->read_memory_func (pc + 2, (bfd_byte *) b, 2, info);
-	      if (little_code)
-		given = (b[0]) | (b[1] << 8) | (given << 16);
-	      else
-		given = (b[1]) | (b[0] << 8) | (given << 16);
+	      if (little_code) {
+		      given = (b[0]) | (b[1] << 8) | (given << 16);
+	      } else {
+		      given = (b[1]) | (b[0] << 8) | (given << 16);
+	      }
 
 	      printer = print_insn_thumb32;
 	      size = 4;
 	    }
 	}
 
-      if (ifthen_address != pc)
-	find_ifthen_state (pc, info, little_code);
+	if (ifthen_address != pc) {
+		find_ifthen_state (pc, info, little_code);
+	}
 
-      if (ifthen_state)
-	{
-	  if ((ifthen_state & 0xf) == 0x8)
-	    ifthen_next_state = 0;
-	  else
-	    ifthen_next_state = (ifthen_state & 0xe0)
-				| ((ifthen_state & 0xf) << 1);
+	if (ifthen_state) {
+		if ((ifthen_state & 0xf) == 0x8) {
+			ifthen_next_state = 0;
+		} else {
+			ifthen_next_state = (ifthen_state & 0xe0) | ((ifthen_state & 0xf) << 1);
+		}
 	}
     }
 
@@ -6764,20 +6828,20 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
       info->memory_error_func (status, pc, info);
       return -1;
     }
-  if (info->flags & INSN_HAS_RELOC)
-    /* If the instruction has a reloc associated with it, then
+    if (info->flags & INSN_HAS_RELOC) {
+	    /* If the instruction has a reloc associated with it, then
        the offset field in the instruction will actually be the
        addend for the reloc.  (We are using REL type relocs).
        In such cases, we can ignore the pc when computing
        addresses, since the addend is not currently pc-relative.  */
-    pc = 0;
+	    pc = 0;
+    }
 
-  printer (pc, info, given);
+    printer (pc, info, given);
 
-  if (is_thumb)
-    {
-      ifthen_state = ifthen_next_state;
-      ifthen_address += size;
+    if (is_thumb) {
+	    ifthen_state = ifthen_next_state;
+	    ifthen_address += size;
     }
   return size;
 }
@@ -6816,10 +6880,11 @@ disassembler_options_arm (void)
       for (i = 0; i < NUM_ARM_OPTIONS; i++)
 	{
 	  opts->name[i] = regnames[i].name;
-	  if (regnames[i].description != NULL)
-	    opts->description[i] = _(regnames[i].description);
-	  else
-	    opts->description[i] = NULL;
+	  if (regnames[i].description != NULL) {
+		  opts->description[i] = _ (regnames[i].description);
+	  } else {
+		  opts->description[i] = NULL;
+	  }
 	}
       /* The array we return must be NULL terminated.  */
       opts->name[i] = NULL;
@@ -6840,13 +6905,15 @@ the -M switch:\n"));
   for (i = 0; i < NUM_ARM_OPTIONS; i++)
     {
       unsigned int len = strlen (regnames[i].name);
-      if (max_len < len)
-	max_len = len;
+      if (max_len < len) {
+	      max_len = len;
+      }
     }
 
-  for (i = 0, max_len++; i < NUM_ARM_OPTIONS; i++)
-    fprintf (stream, "  %s%*c %s\n",
-	     regnames[i].name,
-	     (int)(max_len - strlen (regnames[i].name)), ' ',
-	     _(regnames[i].description));
+    for (i = 0, max_len++; i < NUM_ARM_OPTIONS; i++) {
+	    fprintf (stream, "  %s%*c %s\n",
+		    regnames[i].name,
+		    (int)(max_len - strlen (regnames[i].name)), ' ',
+		    _ (regnames[i].description));
+    }
 }
diff --git a/libr/asm/arch/arm/gnu/floatformat.c b/libr/asm/arch/arm/gnu/floatformat.c
index 5334507645..d86364dac9 100644
--- a/libr/asm/arch/arm/gnu/floatformat.c
+++ b/libr/asm/arch/arm/gnu/floatformat.c
@@ -182,10 +182,11 @@ floatformat_i387_ext_is_valid (const struct floatformat *fmt, const void *from)
   int_bit = get_field (ufrom, fmt->byteorder, fmt->totalsize,
 		       fmt->man_start, 1);
 
-  if ((exponent == 0) != (int_bit == 0))
-    return 0;
-  else
-    return 1;
+  if ((exponent == 0) != (int_bit == 0)) {
+	  return 0;
+  } else {
+	  return 1;
+  }
 }
 
 const struct floatformat floatformat_i387_ext =
@@ -297,21 +298,24 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt,
   bot_exp = get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize,
 		       hfmt->exp_start, hfmt->exp_len);
 
-  if ((unsigned long) top_exp == hfmt->exp_nan)
-    top_nan = mant_bits_set (hfmt, ufrom);
+  if ((unsigned long)top_exp == hfmt->exp_nan) {
+	  top_nan = mant_bits_set (hfmt, ufrom);
+  }
 
   /* A NaN is valid with any low part.  */
-  if (top_nan)
-    return 1;
+  if (top_nan) {
+	  return 1;
+  }
 
   /* An infinity, zero or denormal requires low part 0 (positive or
      negative).  */
   if ((unsigned long) top_exp == hfmt->exp_nan || top_exp == 0)
     {
-      if (bot_exp != 0)
-	return 0;
+	  if (bot_exp != 0) {
+		  return 0;
+	  }
 
-      return !mant_bits_set (hfmt, ufrom + 8);
+	  return !mant_bits_set (hfmt, ufrom + 8);
     }
 
   /* The top part is now a finite normal value.  The long double value
@@ -320,42 +324,46 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt,
      the bottom part must be <= 0.5ulp of the top part in absolute
      value, and if it is < 0.5ulp then the long double is definitely
      valid.  */
-  if (bot_exp < top_exp - 53)
-    return 1;
-  if (bot_exp > top_exp - 53 && bot_exp != 0)
-    return 0;
-  if (bot_exp == 0)
-    {
-      /* The bottom part is 0 or denormal.  Determine which, and if
+    if (bot_exp < top_exp - 53) {
+	    return 1;
+    }
+    if (bot_exp > top_exp - 53 && bot_exp != 0) {
+	    return 0;
+    }
+    if (bot_exp == 0) {
+	    /* The bottom part is 0 or denormal.  Determine which, and if
 	 denormal the first two set bits.  */
-      int first_bit = -1, second_bit = -1, cur_bit;
-      for (cur_bit = 0; (unsigned int) cur_bit < hfmt->man_len; cur_bit++)
-	if (get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize,
-		       hfmt->man_start + cur_bit, 1))
-	  {
-	    if (first_bit == -1)
-	      first_bit = cur_bit;
-	    else
-	      {
-		second_bit = cur_bit;
-		break;
-	      }
-	  }
-      /* Bottom part 0 is OK.  */
-      if (first_bit == -1)
-	return 1;
-      /* The real exponent of the bottom part is -first_bit.  */
-      if (-first_bit < top_exp - 53)
-	return 1;
-      if (-first_bit > top_exp - 53)
-	return 0;
-      /* The bottom part is at least 0.5ulp of the top part.  For this
+	    int first_bit = -1, second_bit = -1, cur_bit;
+	    for (cur_bit = 0; (unsigned int)cur_bit < hfmt->man_len; cur_bit++) {
+		    if (get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize,
+				hfmt->man_start + cur_bit, 1)) {
+			    if (first_bit == -1) {
+				    first_bit = cur_bit;
+			    } else {
+				    second_bit = cur_bit;
+				    break;
+			    }
+		    }
+	    }
+	    /* Bottom part 0 is OK.  */
+	    if (first_bit == -1) {
+		    return 1;
+	    }
+	    /* The real exponent of the bottom part is -first_bit.  */
+	    if (-first_bit < top_exp - 53) {
+		    return 1;
+	    }
+	    if (-first_bit > top_exp - 53) {
+		    return 0;
+	    }
+	    /* The bottom part is at least 0.5ulp of the top part.  For this
 	 to be OK, the bottom part must be exactly 0.5ulp (i.e. no
 	 more bits set) and the top part must have last bit 0.  */
-      if (second_bit != -1)
-	return 0;
-      return !get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
-			 hfmt->man_start + hfmt->man_len - 1, 1);
+	    if (second_bit != -1) {
+		    return 0;
+	    }
+	    return !get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
+		    hfmt->man_start + hfmt->man_len - 1, 1);
     }
   else
     {
@@ -363,8 +371,9 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt,
 	 to be OK, it must be exactly 0.5ulp (i.e. no explicit bits
 	 set) and the top part must have last bit 0.  */
       if (get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
-		     hfmt->man_start + hfmt->man_len - 1, 1))
-	return 0;
+		  hfmt->man_start + hfmt->man_len - 1, 1)) {
+	      return 0;
+      }
       return !mant_bits_set (hfmt, ufrom + 8);
     }
 }
@@ -407,8 +416,9 @@ mant_bits_set (const struct floatformat *fmt, const unsigned char *ufrom)
       mant_bits = min (mant_bits_left, 32);
 
       if (get_field (ufrom, fmt->byteorder, fmt->totalsize,
-		     mant_off, mant_bits) != 0)
-	return 1;
+		  mant_off, mant_bits) != 0) {
+	      return 1;
+      }
 
       mant_off += mant_bits;
       mant_bits_left -= mant_bits;
@@ -431,10 +441,11 @@ get_field (const unsigned char *data, enum floatformat_byteorders order,
   start = total_len - (start + len);
 
   /* Start at the least significant part of the field.  */
-  if (order == floatformat_little)
-    cur_byte = start / FLOATFORMAT_CHAR_BIT;
-  else
-    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+  if (order == floatformat_little) {
+	  cur_byte = start / FLOATFORMAT_CHAR_BIT;
+  } else {
+	  cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+  }
 
   lo_bit = start % FLOATFORMAT_CHAR_BIT;
   hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
@@ -492,13 +503,15 @@ floatformat_to_double (const struct floatformat *fmt,
 	 conjunction with the GNU/C99 extension for hexadecimal
 	 floating point constants and will issue a warning when
 	 compiling with -pedantic.  */
-      if (nan)
-	dto = NAN;
-      else
-	dto = INFINITY;
+      if (nan) {
+	      dto = NAN;
+      } else {
+	      dto = INFINITY;
+      }
 
-      if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1))
-	dto = -dto;
+      if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1)) {
+	      dto = -dto;
+      }
 
       *to = dto;
 
@@ -513,20 +526,20 @@ floatformat_to_double (const struct floatformat *fmt,
      who cares. */
 
   /* For denorms use minimum exponent.  */
-  if (exponent == 0)
-    exponent = 1 - fmt->exp_bias;
-  else
-    {
-      exponent -= fmt->exp_bias;
+  if (exponent == 0) {
+	  exponent = 1 - fmt->exp_bias;
+  } else {
+	  exponent -= fmt->exp_bias;
 
-      /* If this format uses a hidden bit, explicitly add it in now.
+	  /* If this format uses a hidden bit, explicitly add it in now.
 	 Otherwise, increment the exponent by one to account for the
 	 integer bit.  */
 
-      if (fmt->intbit == floatformat_intbit_no)
-	dto = ldexp (1.0, exponent);
-      else
-	exponent++;
+	  if (fmt->intbit == floatformat_intbit_no) {
+		  dto = ldexp (1.0, exponent);
+	  } else {
+		  exponent++;
+	  }
     }
 
   while (mant_bits_left > 0)
@@ -543,9 +556,10 @@ floatformat_to_double (const struct floatformat *fmt,
     }
 
   /* Negate it if negative.  */
-  if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1))
-    dto = -dto;
-  *to = dto;
+    if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1)) {
+	    dto = -dto;
+    }
+    *to = dto;
 }
 
 static void put_field (unsigned char *, enum floatformat_byteorders,
@@ -569,10 +583,11 @@ put_field (unsigned char *data, enum floatformat_byteorders order,
   start = total_len - (start + len);
 
   /* Start at the least significant part of the field.  */
-  if (order == floatformat_little)
-    cur_byte = start / FLOATFORMAT_CHAR_BIT;
-  else
-    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+  if (order == floatformat_little) {
+	  cur_byte = start / FLOATFORMAT_CHAR_BIT;
+  } else {
+	  cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+  }
 
   lo_bit = start % FLOATFORMAT_CHAR_BIT;
   hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
@@ -653,16 +668,15 @@ floatformat_from_double (const struct floatformat *fmt,
 #else
   mant = frexp (dfrom, &exponent);
 #endif
-  if (exponent + fmt->exp_bias - 1 > 0)
-    put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
-	       fmt->exp_len, exponent + fmt->exp_bias - 1);
-  else
-    {
-      /* Handle a denormalized number.  FIXME: What should we do for
+  if (exponent + fmt->exp_bias - 1 > 0) {
+	  put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+		  fmt->exp_len, exponent + fmt->exp_bias - 1);
+  } else {
+	  /* Handle a denormalized number.  FIXME: What should we do for
 	 non-IEEE formats?  */
-      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
-		 fmt->exp_len, 0);
-      mant = ldexp (mant, exponent + fmt->exp_bias - 1);
+	  put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+		  fmt->exp_len, 0);
+	  mant = ldexp (mant, exponent + fmt->exp_bias - 1);
     }
 
   mant_bits_left = fmt->man_len;
diff --git a/libr/asm/arch/arm/winedbg/be_arm.c b/libr/asm/arch/arm/winedbg/be_arm.c
index 77efeadac2..aedfddb52b 100644
--- a/libr/asm/arch/arm/winedbg/be_arm.c
+++ b/libr/asm/arch/arm/winedbg/be_arm.c
@@ -323,8 +323,11 @@ static ut32 arm_disasm_blocktrans(struct winedbg_arm_insn *arminsn, ut32 inst) {
 			get_cond (inst), tbl_regs[get_nibble (inst, 4)], writeback ? "!" : "");
 	for (i=0;i<=15;i++) {
 		if ((inst>>i) & 1) {
-			if (i == last) arminsn->str_asm = r_str_appendf (arminsn->str_asm, "%s", tbl_regs[i]);
-			else arminsn->str_asm = r_str_appendf (arminsn->str_asm, "%s, ", tbl_regs[i]);
+			if (i == last) {
+				arminsn->str_asm = r_str_appendf (arminsn->str_asm, "%s", tbl_regs[i]);
+			} else {
+				arminsn->str_asm = r_str_appendf (arminsn->str_asm, "%s, ", tbl_regs[i]);
+			}
 		}
 	}
 	arminsn->str_asm = r_str_appendf (arminsn->str_asm, "}%s", psr ? "^" : "");
@@ -378,12 +381,13 @@ static ut32 arm_disasm_coprocdatatrans(struct winedbg_arm_insn *arminsn, ut32 in
 	}
 
 	arminsn->str_asm = r_str_appendf (arminsn->str_asm, "%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond (inst));
-	if (indexing)
+	if (indexing) {
 		arminsn->str_asm = r_str_appendf (arminsn->str_asm, " %u, cr%u, [%s, #%d]%s", CPnum, CRd, tbl_regs[get_nibble (inst, 4)],
-				offset, writeback?"!":"");
-	else
+			offset, writeback ? "!" : "");
+	} else {
 		arminsn->str_asm = r_str_appendf (arminsn->str_asm, " %u, cr%u, [%s], #%d", CPnum, CRd, tbl_regs[get_nibble (inst, 4)],
-				offset);
+			offset);
+	}
 	return 0;
 }
 
diff --git a/libr/asm/arch/cr16/cr16_disas.c b/libr/asm/arch/cr16/cr16_disas.c
index 615ee379a9..edc7dc4778 100644
--- a/libr/asm/arch/cr16/cr16_disas.c
+++ b/libr/asm/arch/cr16/cr16_disas.c
@@ -423,8 +423,9 @@ static inline int cr16_decode_i_r(const ut8 *instr, struct cr16_cmd *cmd)
 
 	in = r_read_le16 (instr);
 
-	if (in == 0x0200)
+	if (in == 0x0200) {
 		return -1;
+	}
 
 	if (((in >> 9) != CR16_TBIT_I_R) && ((in >> 9) != CR16_TBIT_R_R)) {
 		if (cr16_print_4biti_opcode(cmd, in)) {
@@ -528,8 +529,9 @@ static inline int cr16_decode_ld_st(const ut8 *instr, struct cr16_cmd *cmd)
 		ret = -1;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	ret = 2;
 
@@ -584,8 +586,9 @@ static inline int cr16_decode_ld_st(const ut8 *instr, struct cr16_cmd *cmd)
 		ret = -1;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	ret = 2;
 	switch (c >> 14) {
@@ -765,11 +768,13 @@ static int cr16_decode_bcond_br(const ut8 *instr, struct cr16_cmd *cmd)
 
 	c = r_read_le16 (instr);
 
-	if (c & 0x1)
+	if (c & 0x1) {
 		return -1;
+	}
 
-	if (!(c >> 14) && cr16_get_opcode_low(c) != 0xA)
+	if (!(c >> 14) && cr16_get_opcode_low (c) != 0xA) {
 		return -1;
+	}
 
 	if (((c >> 5) & 0xF) == 0xE) {
 		snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "br");
@@ -816,8 +821,9 @@ static int cr16_decode_bcond_br(const ut8 *instr, struct cr16_cmd *cmd)
 	} else {
 		snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "b%s",
 				cr16_conds[cr16_get_cond(c)]);
-		if (c & 0x1)
+		if (c & 0x1) {
 			return -1;
+		}
 
 		if ((c >> 8) == CR16_BCOND_2) {
 			disp = r_read_at_le16 (instr, 2);
@@ -856,12 +862,13 @@ static int cr16_decode_bcond01i(const ut8 *instr, struct cr16_cmd *cmd)
 
 	c = r_read_le16 (instr);
 
-	if (!(c & 1))
+	if (!(c & 1)) {
 		return -1;
+	}
 
-	if (c >> 14)
+	if (c >> 14) {
 		return -1;
-
+	}
 
 	switch ((c >> 6) & 0x3) {
 	case 0x0:
@@ -976,8 +983,9 @@ int cr16_decode_loadm_storm(const ut8 *instr, struct cr16_cmd *cmd)
 
 	c = r_read_le16 (instr);
 
-	if ((c & 0x1F) != 4)
+	if ((c & 0x1F) != 4) {
 		return -1;
+	}
 
 	snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "%s",
 			instrs_4bit[c >> 7]);
@@ -995,8 +1003,9 @@ int cr16_decode_movz(const ut8 *instr, struct cr16_cmd *cmd)
 	ut16 c;
 	c = r_read_le16 (instr);
 
-	if (c & 1)
+	if (c & 1) {
 		return -1;
+	}
 
 	switch (c >> 9) {
 	case CR16_MOVXB:
@@ -1026,8 +1035,9 @@ int cr16_decode_movd(const ut8 *instr, struct cr16_cmd *cmd)
 	c = r_read_le16 (instr);
 	imm = r_read_at_le16 (instr, 2);
 
-	if (c & 1)
+	if (c & 1) {
 		return -1;
+	}
 
 	snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "movd");
 
@@ -1060,8 +1070,9 @@ int cr16_decode_muls(const ut8 *instr, struct cr16_cmd *cmd)
 			cr16_regs_names[cr16_get_dstreg(c)]);
 		break;
 	case CR16_MULUW:
-		if (c & 0x000C)
+		if (c & 0x000C) {
 			return -1;
+		}
 
 		snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "muluw");
 		snprintf(cmd->operands, CR16_INSTR_MAXLEN - 1, "%s,(%s,%s)",
@@ -1081,8 +1092,9 @@ int cr16_decode_scond(const ut8 *instr, struct cr16_cmd *cmd)
 
 	c = r_read_le16 (instr);
 
-	if (c & 1)
+	if (c & 1) {
 		return -1;
+	}
 
 	snprintf(cmd->instr, CR16_INSTR_MAXLEN - 1, "s%s",
 			cr16_conds[cr16_get_dstreg(c)]);
@@ -1196,8 +1208,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		ret = -1;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	switch ((in >> 13)) {
 	case 0x2:
@@ -1206,8 +1219,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	switch (in >> 9) {
 	case CR16_LPR:
@@ -1216,8 +1230,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	case CR16_TBIT_R_R:
 		ret = cr16_decode_r_r(instr, cmd);
-		if (ret == -1)
-			ret = cr16_decode_bal(instr, cmd);
+		if (ret == -1) {
+			ret = cr16_decode_bal (instr, cmd);
+		}
 		break;
 	case CR16_TBIT_I_R:
 		ret = cr16_decode_i_r(instr, cmd);
@@ -1229,8 +1244,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 	case CR16_JAL:
 	case 0x0B:
 		ret = cr16_decode_jmp(instr, cmd);
-		if (ret == -1)
-			ret = cr16_decode_bcond_br(instr, cmd);
+		if (ret == -1) {
+			ret = cr16_decode_bcond_br (instr, cmd);
+		}
 		break;
 	case CR16_MOVXB:
 	case CR16_MOVZB:
@@ -1243,8 +1259,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	switch (in >> 7) {
 	case CR16_PUSH:
@@ -1259,8 +1276,9 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	switch (in >> 10) {
 	case CR16_MOVD:
@@ -1268,13 +1286,15 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	ret = cr16_decode_misc(instr, cmd);
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 
 	switch (cr16_get_opcode_hi(in)) {
 	case 0x2:
@@ -1285,7 +1305,8 @@ int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd)
 		break;
 	}
 
-	if (ret != -1)
+	if (ret != -1) {
 		return ret;
+	}
 	return ret;
 }
diff --git a/libr/asm/arch/cris/gnu/cris-dis.c b/libr/asm/arch/cris/gnu/cris-dis.c
index 930872f971..5b729eaa90 100644
--- a/libr/asm/arch/cris/gnu/cris-dis.c
+++ b/libr/asm/arch/cris/gnu/cris-dis.c
@@ -110,8 +110,9 @@ cris_parse_disassembler_options (disassemble_info *info,
 
   info->private_data = calloc (1, sizeof (struct cris_disasm_data));
   disdata = (struct cris_disasm_data *) info->private_data;
-  if (!disdata)
-    return FALSE;
+  if (!disdata) {
+	  return FALSE;
+  }
 
   /* Default true.  */
   disdata->trace_case
@@ -131,23 +132,23 @@ spec_reg_info (unsigned int sreg, enum cris_disass_family distype)
     {
       if (cris_spec_regs[i].number == sreg)
 	{
-	  if (distype == cris_dis_v32)
-	    switch (cris_spec_regs[i].applicable_version)
-	      {
-	      case cris_ver_warning:
-	      case cris_ver_version_all:
-	      case cris_ver_v3p:
-	      case cris_ver_v8p:
-	      case cris_ver_v10p:
-	      case cris_ver_v32p:
-		/* No ambiguous sizes or register names with CRISv32.  */
-		if (!cris_spec_regs[i].warning)
-		  return &cris_spec_regs[i];
-	      default:
-		;
+	      if (distype == cris_dis_v32) {
+		      switch (cris_spec_regs[i].applicable_version) {
+		      case cris_ver_warning:
+		      case cris_ver_version_all:
+		      case cris_ver_v3p:
+		      case cris_ver_v8p:
+		      case cris_ver_v10p:
+		      case cris_ver_v32p:
+			      /* No ambiguous sizes or register names with CRISv32.  */
+			      if (!cris_spec_regs[i].warning) {
+				      return &cris_spec_regs[i];
+			      }
+		      default:;
+		      }
+	      } else if (cris_spec_regs[i].applicable_version != cris_ver_v32p) {
+		      return &cris_spec_regs[i];
 	      }
-	  else if (cris_spec_regs[i].applicable_version != cris_ver_v32p)
-	    return &cris_spec_regs[i];
 	}
     }
 
@@ -161,8 +162,9 @@ number_of_bits (unsigned int val)
 {
   int bits;
 
-  for (bits = 0; val != 0; val &= val - 1)
-    bits++;
+  for (bits = 0; val != 0; val &= val - 1) {
+	  bits++;
+  }
 
   return bits;
 }
@@ -192,43 +194,49 @@ get_opcode_entry (unsigned int insn,
   if (!opc_table)
     {
       opc_table = malloc (65536 * sizeof (opc_table[0]));
-      if (!opc_table)
-	return NULL;
+      if (!opc_table) {
+	      return NULL;
+      }
 
       memset (opc_table, 0, 65536 * sizeof (const struct cris_opcode *));
 
       dip_prefixes
 	= malloc (65536 * sizeof (const struct cris_opcode **));
-      if (!dip_prefixes)
-	return NULL;
+      if (!dip_prefixes) {
+	      return NULL;
+      }
 
       memset (dip_prefixes, 0, 65536 * sizeof (dip_prefixes[0]));
 
       bdapq_m1_prefixes
 	= malloc (65536 * sizeof (const struct cris_opcode **));
-      if (!bdapq_m1_prefixes)
-	return NULL;
+      if (!bdapq_m1_prefixes) {
+	      return NULL;
+      }
 
       memset (bdapq_m1_prefixes, 0, 65536 * sizeof (bdapq_m1_prefixes[0]));
 
       bdapq_m2_prefixes
 	= malloc (65536 * sizeof (const struct cris_opcode **));
-      if (!bdapq_m2_prefixes)
-	return NULL;
+      if (!bdapq_m2_prefixes) {
+	      return NULL;
+      }
 
       memset (bdapq_m2_prefixes, 0, 65536 * sizeof (bdapq_m2_prefixes[0]));
 
       bdapq_m4_prefixes
 	= malloc (65536 * sizeof (const struct cris_opcode **));
-      if (!bdapq_m4_prefixes)
-	return NULL;
+      if (!bdapq_m4_prefixes) {
+	      return NULL;
+      }
 
       memset (bdapq_m4_prefixes, 0, 65536 * sizeof (bdapq_m4_prefixes[0]));
 
       rest_prefixes
 	= malloc (65536 * sizeof (const struct cris_opcode **));
-      if (!rest_prefixes)
-	return NULL;
+      if (!rest_prefixes) {
+	      return NULL;
+      }
 
       memset (rest_prefixes, 0, 65536 * sizeof (rest_prefixes[0]));
     }
@@ -246,8 +254,9 @@ get_opcode_entry (unsigned int insn,
 	   ? opc_table[prefix_insn]
 	   : get_opcode_entry (prefix_insn, NO_CRIS_PREFIX, disdata));
 
-      if (!popcodep)
-	return NULL;
+      if (!popcodep) {
+	      return NULL;
+      }
 
       if (popcodep->match == BDAP_QUICK_OPCODE)
 	{
@@ -255,8 +264,9 @@ get_opcode_entry (unsigned int insn,
 	     have to have different tables for them.  */
 	  int offset = (prefix_insn & 255);
 
-	  if (offset > 127)
-	    offset -= 256;
+	  if (offset > 127) {
+		  offset -= 256;
+	  }
 
 	  switch (offset)
 	    {
@@ -276,111 +286,92 @@ get_opcode_entry (unsigned int insn,
 	      prefix_opc_table = rest_prefixes;
 	      break;
 	    }
-	}
-      else if (popcodep->match == DIP_OPCODE)
-	/* We don't allow postincrement when the prefix is DIP, so use a
+      } else if (popcodep->match == DIP_OPCODE) {
+	      /* We don't allow postincrement when the prefix is DIP, so use a
 	   different table for DIP.  */
-	prefix_opc_table = dip_prefixes;
-      else
-	prefix_opc_table = rest_prefixes;
+	      prefix_opc_table = dip_prefixes;
+      } else {
+	      prefix_opc_table = rest_prefixes;
+      }
     }
 
-  if (prefix_insn != NO_CRIS_PREFIX
-      && prefix_opc_table[insn] != NULL)
-    max_matchedp = prefix_opc_table[insn];
-  else if (prefix_insn == NO_CRIS_PREFIX && opc_table[insn] != NULL)
-    max_matchedp = opc_table[insn];
-  else
-    {
-      const struct cris_opcode *opcodep;
-      int max_level_of_match = -1;
+    if (prefix_insn != NO_CRIS_PREFIX && prefix_opc_table[insn] != NULL) {
+	    max_matchedp = prefix_opc_table[insn];
+    } else if (prefix_insn == NO_CRIS_PREFIX && opc_table[insn] != NULL) {
+	    max_matchedp = opc_table[insn];
+    } else {
+	    const struct cris_opcode *opcodep;
+	    int max_level_of_match = -1;
 
-      for (opcodep = cris_opcodes;
-	   opcodep->name != NULL;
-	   opcodep++)
-	{
-	  int level_of_match;
+	    for (opcodep = cris_opcodes;
+		    opcodep->name != NULL;
+		    opcodep++) {
+		    int level_of_match;
 
-	  if (disdata->distype == cris_dis_v32)
-	    {
-	      switch (opcodep->applicable_version)
-		{
-		case cris_ver_version_all:
-		  break;
+		    if (disdata->distype == cris_dis_v32) {
+			    switch (opcodep->applicable_version) {
+			    case cris_ver_version_all:
+				    break;
 
-		case cris_ver_v0_3:
-		case cris_ver_v0_10:
-		case cris_ver_v3_10:
-		case cris_ver_sim_v0_10:
-		case cris_ver_v8_10:
-		case cris_ver_v10:
-		case cris_ver_warning:
-		  continue;
+			    case cris_ver_v0_3:
+			    case cris_ver_v0_10:
+			    case cris_ver_v3_10:
+			    case cris_ver_sim_v0_10:
+			    case cris_ver_v8_10:
+			    case cris_ver_v10:
+			    case cris_ver_warning:
+				    continue;
 
-		case cris_ver_v3p:
-		case cris_ver_v8p:
-		case cris_ver_v10p:
-		case cris_ver_v32p:
-		  break;
+			    case cris_ver_v3p:
+			    case cris_ver_v8p:
+			    case cris_ver_v10p:
+			    case cris_ver_v32p:
+				    break;
 
-		case cris_ver_v8:
-		  abort ();
-		default:
-		  abort ();
-		}
-	    }
-	  else
-	    {
-	      switch (opcodep->applicable_version)
-		{
-		case cris_ver_version_all:
-		case cris_ver_v0_3:
-		case cris_ver_v3p:
-		case cris_ver_v0_10:
-		case cris_ver_v8p:
-		case cris_ver_v8_10:
-		case cris_ver_v10:
-		case cris_ver_sim_v0_10:
-		case cris_ver_v10p:
-		case cris_ver_warning:
-		  break;
+			    case cris_ver_v8:
+				    abort ();
+			    default:
+				    abort ();
+			    }
+		    } else {
+			    switch (opcodep->applicable_version) {
+			    case cris_ver_version_all:
+			    case cris_ver_v0_3:
+			    case cris_ver_v3p:
+			    case cris_ver_v0_10:
+			    case cris_ver_v8p:
+			    case cris_ver_v8_10:
+			    case cris_ver_v10:
+			    case cris_ver_sim_v0_10:
+			    case cris_ver_v10p:
+			    case cris_ver_warning:
+				    break;
 
-		case cris_ver_v32p:
-		  continue;
+			    case cris_ver_v32p:
+				    continue;
 
-		case cris_ver_v8:
-		  abort ();
-		default:
-		  abort ();
-		}
-	    }
+			    case cris_ver_v8:
+				    abort ();
+			    default:
+				    abort ();
+			    }
+		    }
 
-	  /* We give a double lead for bits matching the template in
+		    /* We give a double lead for bits matching the template in
 	     cris_opcodes.  Not even, because then "move p8,r10" would
 	     be given 2 bits lead over "clear.d r10".  When there's a
 	     tie, the first entry in the table wins.  This is
 	     deliberate, to avoid a more complicated recognition
 	     formula.  */
-	  if ((opcodep->match & insn) == opcodep->match
-	      && (opcodep->lose & insn) == 0
-	      && ((level_of_match
-		   = cris_constraint (opcodep->args,
-				      insn,
-				      prefix_insn,
-				      disdata))
-		  >= 0)
-	      && ((level_of_match
-		   += 2 * number_of_bits (opcodep->match
-					  | opcodep->lose))
-			  > max_level_of_match))
-		    {
-		      max_matchedp = opcodep;
-		      max_level_of_match = level_of_match;
+		    if ((opcodep->match & insn) == opcodep->match && (opcodep->lose & insn) == 0 && ((level_of_match = cris_constraint (opcodep->args, insn, prefix_insn, disdata)) >= 0) && ((level_of_match += 2 * number_of_bits (opcodep->match | opcodep->lose)) > max_level_of_match)) {
+			    max_matchedp = opcodep;
+			    max_level_of_match = level_of_match;
 
-		      /* If there was a full match, never mind looking
+			    /* If there was a full match, never mind looking
 			 further.  */
-		      if (level_of_match >= 2 * 16)
-			break;
+			    if (level_of_match >= 2 * 16) {
+				    break;
+			    }
 		    }
 		}
       /* Fill in the new entry.
@@ -390,10 +381,11 @@ get_opcode_entry (unsigned int insn,
 	 else-clause below that fills in the prefix-table.  If that
 	 helps, you need to change the prefix_opc_table setting above, or
 	 something related.  */
-      if (prefix_insn == NO_CRIS_PREFIX)
-	opc_table[insn] = max_matchedp;
-      else
-	prefix_opc_table[insn] = max_matchedp;
+		if (prefix_insn == NO_CRIS_PREFIX) {
+			opc_table[insn] = max_matchedp;
+		} else {
+			prefix_opc_table[insn] = max_matchedp;
+		}
     }
 
   return max_matchedp;
@@ -414,121 +406,114 @@ cris_constraint (const char *cs,
   int prefix_ok = 0;
   const char *s;
 
-  for (s = cs; *s; s++)
-    switch (*s)
-      {
-      case '!':
-	/* Do not recognize "pop" if there's a prefix and then only for
+  for (s = cs; *s; s++) {
+	  switch (*s) {
+	  case '!':
+		  /* Do not recognize "pop" if there's a prefix and then only for
            v0..v10.  */
-	if (prefix_insn != NO_CRIS_PREFIX
-	    || disdata->distype != cris_dis_v0_v10)
-	  return -1;
-	break;
+		  if (prefix_insn != NO_CRIS_PREFIX || disdata->distype != cris_dis_v0_v10) {
+			  return -1;
+		  }
+		  break;
 
-      case 'U':
-	/* Not recognized at disassembly.  */
-	return -1;
+	  case 'U':
+		  /* Not recognized at disassembly.  */
+		  return -1;
 
-      case 'M':
-	/* Size modifier for "clear", i.e. special register 0, 4 or 8.
+	  case 'M':
+		  /* Size modifier for "clear", i.e. special register 0, 4 or 8.
 	   Check that it is one of them.  Only special register 12 could
 	   be mismatched, but checking for matches is more logical than
 	   checking for mismatches when there are only a few cases.  */
-	tmp = ((insn >> 12) & 0xf);
-	if (tmp != 0 && tmp != 4 && tmp != 8)
-	  return -1;
-	break;
+		  tmp = ((insn >> 12) & 0xf);
+		  if (tmp != 0 && tmp != 4 && tmp != 8) {
+			  return -1;
+		  }
+		  break;
 
-      case 'm':
-	if ((insn & 0x30) == 0x30)
-	  return -1;
-	break;
+	  case 'm':
+		  if ((insn & 0x30) == 0x30) {
+			  return -1;
+		  }
+		  break;
 
-      case 'S':
-	/* A prefix operand without side-effect.  */
-	if (prefix_insn != NO_CRIS_PREFIX && (insn & 0x400) == 0)
-	  {
-	    prefix_ok = 1;
-	    break;
-	  }
-	else
-	  return -1;
+	  case 'S':
+		  /* A prefix operand without side-effect.  */
+		  if (prefix_insn != NO_CRIS_PREFIX && (insn & 0x400) == 0) {
+			  prefix_ok = 1;
+			  break;
+		  } else {
+			  return -1;
+		  }
 
-      case 's':
-      case 'y':
-      case 'Y':
-	/* If this is a prefixed insn with postincrement (side-effect),
+	  case 's':
+	  case 'y':
+	  case 'Y':
+		  /* If this is a prefixed insn with postincrement (side-effect),
 	   the prefix must not be DIP.  */
-	if (prefix_insn != NO_CRIS_PREFIX)
-	  {
-	    if (insn & 0x400)
-	      {
-		const struct cris_opcode *prefix_opcodep
-		  = get_opcode_entry (prefix_insn, NO_CRIS_PREFIX, disdata);
+		  if (prefix_insn != NO_CRIS_PREFIX) {
+			  if (insn & 0x400) {
+				  const struct cris_opcode *prefix_opcodep = get_opcode_entry (prefix_insn, NO_CRIS_PREFIX, disdata);
 
-		if (prefix_opcodep->match == DIP_OPCODE)
-		  return -1;
-	      }
+				  if (prefix_opcodep->match == DIP_OPCODE) {
+					  return -1;
+				  }
+			  }
 
-	    prefix_ok = 1;
-	  }
-	break;
+			  prefix_ok = 1;
+		  }
+		  break;
 
-      case 'B':
-	/* If we don't fall through, then the prefix is ok.  */
-	prefix_ok = 1;
+	  case 'B':
+		  /* If we don't fall through, then the prefix is ok.  */
+		  prefix_ok = 1;
 
-	/* A "push" prefix.  Check for valid "push" size.
+		  /* A "push" prefix.  Check for valid "push" size.
 	   In case of special register, it may be != 4.  */
-	if (prefix_insn != NO_CRIS_PREFIX)
-	  {
-	    /* Match the prefix insn to BDAPQ.  */
-	    const struct cris_opcode *prefix_opcodep
-	      = get_opcode_entry (prefix_insn, NO_CRIS_PREFIX, disdata);
+		  if (prefix_insn != NO_CRIS_PREFIX) {
+			  /* Match the prefix insn to BDAPQ.  */
+			  const struct cris_opcode *prefix_opcodep = get_opcode_entry (prefix_insn, NO_CRIS_PREFIX, disdata);
 
-	    if (prefix_opcodep->match == BDAP_QUICK_OPCODE)
-	      {
-		int pushsize = (prefix_insn & 255);
+			  if (prefix_opcodep->match == BDAP_QUICK_OPCODE) {
+				  int pushsize = (prefix_insn & 255);
 
-		if (pushsize > 127)
-		  pushsize -= 256;
+				  if (pushsize > 127) {
+					  pushsize -= 256;
+				  }
 
-		if (s[1] == 'P')
-		  {
-		    unsigned int spec_reg = (insn >> 12) & 15;
-		    const struct cris_spec_reg *sregp
-		      = spec_reg_info (spec_reg, disdata->distype);
+				  if (s[1] == 'P') {
+					  unsigned int spec_reg = (insn >> 12) & 15;
+					  const struct cris_spec_reg *sregp = spec_reg_info (spec_reg, disdata->distype);
 
-		    /* For a special-register, the "prefix size" must
+					  /* For a special-register, the "prefix size" must
 		       match the size of the register.  */
-		    if (sregp && sregp->reg_size == (unsigned int) -pushsize)
-		      break;
-		  }
-		else if (s[1] == 'R')
-		  {
-		    if ((insn & 0x30) == 0x20 && pushsize == -4)
-		      break;
-		  }
-		/* FIXME:  Should abort here; next constraint letter
+					  if (sregp && sregp->reg_size == (unsigned int)-pushsize) {
+						  break;
+					  }
+				  } else if (s[1] == 'R') {
+					  if ((insn & 0x30) == 0x20 && pushsize == -4) {
+						  break;
+					  }
+				  }
+				  /* FIXME:  Should abort here; next constraint letter
 		   *must* be 'P' or 'R'.  */
-	      }
-	  }
-	return -1;
+			  }
+		  }
+		  return -1;
 
-      case 'D':
-	retval = (((insn >> 12) & 15) == (insn & 15));
-	if (!retval)
-	  return -1;
-	else
-	  retval += 4;
-	break;
+	  case 'D':
+		  retval = (((insn >> 12) & 15) == (insn & 15));
+		  if (!retval) {
+			  return -1;
+		  } else {
+			  retval += 4;
+		  }
+		  break;
 
-      case 'P':
-	{
-	  const struct cris_spec_reg *sregp
-	    = spec_reg_info ((insn >> 12) & 15, disdata->distype);
+	  case 'P': {
+		  const struct cris_spec_reg *sregp = spec_reg_info ((insn >> 12) & 15, disdata->distype);
 
-	  /* Since we match four bits, we will give a value of 4-1 = 3
+		  /* Since we match four bits, we will give a value of 4-1 = 3
 	     in a match.  If there is a corresponding exact match of a
 	     special register in another pattern, it will get a value of
 	     4, which will be higher.  This should be correct in that an
@@ -540,18 +525,19 @@ cris_constraint (const char *cs,
 	     for a move from a special register is matched in the
 	     register constraint.  */
 
-	  if (sregp != NULL)
-	    {
-	      retval += 3;
-	      break;
-	    }
-	  else
-	    return -1;
-	}
-      }
+		  if (sregp != NULL) {
+			  retval += 3;
+			  break;
+		  } else {
+			  return -1;
+		  }
+	  }
+	  }
+  }
 
-  if (prefix_insn != NO_CRIS_PREFIX && ! prefix_ok)
-    return -1;
+  if (prefix_insn != NO_CRIS_PREFIX && !prefix_ok) {
+	  return -1;
+  }
 
   return retval;
 }
@@ -569,8 +555,9 @@ format_hex (unsigned long number,
   sprintf (outbuffer, "0x%lx", number);
 
   /* Save this value for the "case" support.  */
-  if (TRACE_CASE)
-    last_immediate = number;
+  if (TRACE_CASE) {
+	  last_immediate = number;
+  }
 
   return outbuffer + strlen (outbuffer);
 }
@@ -598,17 +585,19 @@ format_reg (struct cris_disasm_data *disdata,
 {
   char *outbuffer = outbuffer_start;
 
-  if (with_reg_prefix)
-    *outbuffer++ = REGISTER_PREFIX_CHAR;
+  if (with_reg_prefix) {
+	  *outbuffer++ = REGISTER_PREFIX_CHAR;
+  }
 
   switch (regno)
     {
     case 15:
       /* For v32, there is no context in which we output PC.  */
-      if (disdata->distype == cris_dis_v32)
-	strcpy (outbuffer, "acr");
-      else
-	strcpy (outbuffer, "pc");
+      if (disdata->distype == cris_dis_v32) {
+	      strcpy (outbuffer, "acr");
+      } else {
+	      strcpy (outbuffer, "pc");
+      }
       break;
 
     case 14:
@@ -633,15 +622,16 @@ format_sup_reg (unsigned int regno,
   char *outbuffer = outbuffer_start;
   int i;
 
-  if (with_reg_prefix)
-    *outbuffer++ = REGISTER_PREFIX_CHAR;
+  if (with_reg_prefix) {
+	  *outbuffer++ = REGISTER_PREFIX_CHAR;
+  }
 
-  for (i = 0; cris_support_regs[i].name != NULL; i++)
-    if (cris_support_regs[i].number == regno)
-      {
-	sprintf (outbuffer, "%s", cris_support_regs[i].name);
-	return outbuffer_start + strlen (outbuffer_start);
-      }
+  for (i = 0; cris_support_regs[i].name != NULL; i++) {
+	  if (cris_support_regs[i].number == regno) {
+		  sprintf (outbuffer, "%s", cris_support_regs[i].name);
+		  return outbuffer_start + strlen (outbuffer_start);
+	  }
+  }
 
   /* There's supposed to be register names covering all numbers, though
      some may be generic names.  */
@@ -662,40 +652,37 @@ bytes_to_skip (unsigned int insn,
   const char *template = matchedp->args;
   const char *s;
 
-  for (s = template; *s; s++)
-    if ((*s == 's' || *s == 'N' || *s == 'Y')
-	&& (insn & 0x400) && (insn & 15) == 15
-	&& !prefix_matchedp)
-      {
-	/* Immediate via [pc+], so we have to check the size of the
+  for (s = template; *s; s++) {
+	  if ((*s == 's' || *s == 'N' || *s == 'Y') && (insn & 0x400) && (insn & 15) == 15 && !prefix_matchedp) {
+		  /* Immediate via [pc+], so we have to check the size of the
 	   operand.  */
-	int mode_size = 1 << ((insn >> 4) & (*template == 'z' ? 1 : 3));
+		  int mode_size = 1 << ((insn >> 4) & (*template == 'z' ? 1 : 3));
 
-	if (matchedp->imm_oprnd_size == SIZE_FIX_32)
-	  to_skip += 4;
-	else if (matchedp->imm_oprnd_size == SIZE_SPEC_REG)
-	  {
-	    const struct cris_spec_reg *sregp
-	      = spec_reg_info ((insn >> 12) & 15, distype);
+		  if (matchedp->imm_oprnd_size == SIZE_FIX_32) {
+			  to_skip += 4;
+		  } else if (matchedp->imm_oprnd_size == SIZE_SPEC_REG) {
+			  const struct cris_spec_reg *sregp = spec_reg_info ((insn >> 12) & 15, distype);
 
-	    /* FIXME: Improve error handling; should have been caught
+			  /* FIXME: Improve error handling; should have been caught
 	       earlier.  */
-	    if (!sregp)
-	      return 2;
+			  if (!sregp) {
+				  return 2;
+			  }
 
-	    /* PC is incremented by two, not one, for a byte.  Except on
+			  /* PC is incremented by two, not one, for a byte.  Except on
 	       CRISv32, where constants are always DWORD-size for
 	       special registers.  */
-	    to_skip +=
-	      distype == cris_dis_v32 ? 4 : (sregp->reg_size + 1) & ~1;
+			  to_skip +=
+				  distype == cris_dis_v32 ? 4 : (sregp->reg_size + 1) & ~1;
+		  } else {
+			  to_skip += (mode_size + 1) & ~1;
+		  }
+	  } else if (*s == 'n') {
+		  to_skip += 4;
+	  } else if (*s == 'b') {
+		  to_skip += 2;
 	  }
-	else
-	  to_skip += (mode_size + 1) & ~1;
-      }
-    else if (*s == 'n')
-      to_skip += 4;
-    else if (*s == 'b')
-      to_skip += 2;
+  }
 
   return to_skip;
 }
@@ -718,9 +705,11 @@ print_flags (struct cris_disasm_data *disdata, unsigned int insn, char *cp)
   unsigned char flagbits = (((insn >> 8) & 0xf0) | (insn & 15));
   int i;
 
-  for (i = 0; i < 8; i++)
-    if (flagbits & (1 << i))
-      *cp++ = fnames[i];
+  for (i = 0; i < 8; i++) {
+	  if (flagbits & (1 << i)) {
+		  *cp++ = fnames[i];
+	  }
+  }
 
   return cp;
 }
@@ -760,8 +749,9 @@ print_with_operands (const struct cris_opcode *opcodep,
   s = cs;
 
   /* Ignore any prefix indicator.  */
-  if (*s == 'p')
-    s++;
+  if (*s == 'p') {
+	  s++;
+  }
 
   if (*s == 'm' || *s == 'M' || *s == 'z')
     {
@@ -779,19 +769,20 @@ print_with_operands (const struct cris_opcode *opcodep,
 
   /* Add a space if this isn't a long-branch, because for those will add
      the condition part of the name later.  */
-  if (opcodep->match != (BRANCH_PC_LOW + BRANCH_INCR_HIGH * 256))
-    *tp++ = ' ';
+    if (opcodep->match != (BRANCH_PC_LOW + BRANCH_INCR_HIGH * 256)) {
+	    *tp++ = ' ';
+    }
 
-  /* Fill in the insn-type if deducible from the name (and there's no
+    /* Fill in the insn-type if deducible from the name (and there's no
      better way).  */
-  if (opcodep->name[0] == 'j')
-    {
-      if (CONST_STRNEQ (opcodep->name, "jsr"))
-	/* It's "jsr" or "jsrc".  */
-	info->insn_type = dis_jsr;
-      else
-	/* Any other jump-type insn is considered a branch.  */
-	info->insn_type = dis_branch;
+    if (opcodep->name[0] == 'j') {
+	    if (CONST_STRNEQ (opcodep->name, "jsr")) {
+		    /* It's "jsr" or "jsrc".  */
+		    info->insn_type = dis_jsr;
+	    } else {
+		    /* Any other jump-type insn is considered a branch.  */
+		    info->insn_type = dis_branch;
+	    }
     }
 
   /* We might know some more fields right now.  */
@@ -807,12 +798,13 @@ print_with_operands (const struct cris_opcode *opcodep,
 	break;
 
       case 'A':
-	if (with_reg_prefix)
-	  *tp++ = REGISTER_PREFIX_CHAR;
-	*tp++ = 'a';
-	*tp++ = 'c';
-	*tp++ = 'r';
-	break;
+	      if (with_reg_prefix) {
+		      *tp++ = REGISTER_PREFIX_CHAR;
+	      }
+	      *tp++ = 'a';
+	      *tp++ = 'c';
+	      *tp++ = 'r';
+	      break;
 	
       case '[':
       case ']':
@@ -856,8 +848,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 
 	  /* Finish off and output previous formatted bytes.  */
 	  *tp = 0;
-	  if (temp[0])
-	    (*info->fprintf_func) (info->stream, "%s", temp);
+	  if (temp[0]) {
+		  (*info->fprintf_func) (info->stream, "%s", temp);
+	  }
 	  tp = temp;
 
 	  (*info->print_address_func) ((bfd_vma) number, info);
@@ -871,8 +864,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 
 	  /* Finish off and output previous formatted bytes.  */
 	  *tp = 0;
-	  if (temp[0])
-	    (*info->fprintf_func) (info->stream, "%s", temp);
+	  if (temp[0]) {
+		  (*info->fprintf_func) (info->stream, "%s", temp);
+	  }
 	  tp = temp;
 
 	  (*info->print_address_func) ((bfd_vma) number, info);
@@ -895,48 +889,51 @@ print_with_operands (const struct cris_opcode *opcodep,
 		 || opcodep->match == BDAP_QUICK_OPCODE);
 	    int nbytes;
 
-	    if (opcodep->imm_oprnd_size == SIZE_FIX_32)
-	      nbytes = 4;
-	    else if (opcodep->imm_oprnd_size == SIZE_SPEC_REG)
-	      {
-		const struct cris_spec_reg *sregp
-		  = spec_reg_info ((insn >> 12) & 15, disdata->distype);
+	    if (opcodep->imm_oprnd_size == SIZE_FIX_32) {
+		    nbytes = 4;
+	    } else if (opcodep->imm_oprnd_size == SIZE_SPEC_REG) {
+		    const struct cris_spec_reg *sregp = spec_reg_info ((insn >> 12) & 15, disdata->distype);
 
-		/* A NULL return should have been as a non-match earlier,
+		    /* A NULL return should have been as a non-match earlier,
 		   so catch it as an internal error in the error-case
 		   below.  */
-		if (!sregp)
-		  /* Whatever non-valid size.  */
-		  nbytes = 42;
-		else
-		  /* PC is always incremented by a multiple of two.
+		    if (!sregp) {
+			    /* Whatever non-valid size.  */
+			    nbytes = 42;
+		    } else {
+			    /* PC is always incremented by a multiple of two.
 		     For CRISv32, immediates are always 4 bytes for
 		     special registers.  */
-		  nbytes = disdata->distype == cris_dis_v32
-		    ? 4 : (sregp->reg_size + 1) & ~1;
+			    nbytes = disdata->distype == cris_dis_v32
+					     ? 4
+					     : (sregp->reg_size + 1) & ~1;
+		    }
 	      }
 	    else
 	      {
 		int mode_size = 1 << ((insn >> 4) & (*cs == 'z' ? 1 : 3));
 
-		if (mode_size == 1)
-		  nbytes = 2;
-		else
-		  nbytes = mode_size;
+		if (mode_size == 1) {
+			nbytes = 2;
+		} else {
+			nbytes = mode_size;
+		}
 	      }
 
 	    switch (nbytes)
 	      {
 	      case 1:
 		number = buffer[2];
-		if (signedp && number > 127)
-		  number -= 256;
+		if (signedp && number > 127) {
+			number -= 256;
+		}
 		break;
 
 	      case 2:
 		number = buffer[2] + buffer[3] * 256;
-		if (signedp && number > 32767)
-		  number -= 65536;
+		if (signedp && number > 32767) {
+			number -= 65536;
+		}
 		break;
 
 	      case 4:
@@ -951,37 +948,30 @@ print_with_operands (const struct cris_opcode *opcodep,
 		number = 42;
 	      }
 
-	    if ((*cs == 'z' && (insn & 0x20))
-		|| (opcodep->match == BDAP_QUICK_OPCODE
-		    && (nbytes <= 2 || buffer[1 + nbytes] == 0)))
-	      tp = format_dec (number, tp, signedp);
-	    else
-	      {
-		unsigned int highbyte = (number >> 24) & 0xff;
+	      if ((*cs == 'z' && (insn & 0x20)) || (opcodep->match == BDAP_QUICK_OPCODE && (nbytes <= 2 || buffer[1 + nbytes] == 0))) {
+		      tp = format_dec (number, tp, signedp);
+	      } else {
+		      unsigned int highbyte = (number >> 24) & 0xff;
 
-		/* Either output this as an address or as a number.  If it's
+		      /* Either output this as an address or as a number.  If it's
 		   a dword with the same high-byte as the address of the
 		   insn, assume it's an address, and also if it's a non-zero
 		   non-0xff high-byte.  If this is a jsr or a jump, then
 		   it's definitely an address.  */
-		if (nbytes == 4
-		    && (highbyte == ((addr >> 24) & 0xff)
-			|| (highbyte != 0 && highbyte != 0xff)
-			|| info->insn_type == dis_branch
-			|| info->insn_type == dis_jsr))
-		  {
-		    /* Finish off and output previous formatted bytes.  */
-		    *tp = 0;
-		    tp = temp;
-		    if (temp[0])
-		      (*info->fprintf_func) (info->stream, "%s", temp);
+		      if (nbytes == 4 && (highbyte == ((addr >> 24) & 0xff) || (highbyte != 0 && highbyte != 0xff) || info->insn_type == dis_branch || info->insn_type == dis_jsr)) {
+			      /* Finish off and output previous formatted bytes.  */
+			      *tp = 0;
+			      tp = temp;
+			      if (temp[0]) {
+				      (*info->fprintf_func) (info->stream, "%s", temp);
+			      }
 
-		    (*info->print_address_func) ((bfd_vma) number, info);
+			      (*info->print_address_func) ((bfd_vma)number, info);
 
-		    info->target = number;
-		  }
-		else
-		  tp = format_hex (number, tp, disdata);
+			      info->target = number;
+		      } else {
+			      tp = format_hex (number, tp, disdata);
+		      }
 	      }
 	  }
 	else
@@ -997,22 +987,21 @@ print_with_operands (const struct cris_opcode *opcodep,
 		info->insn_type = dis_dref;
 		info->flags |= CRIS_DIS_FLAG_MEMREF;
 
-		if (opcodep->imm_oprnd_size == SIZE_FIX_32)
-		  size = 4;
-		else if (opcodep->imm_oprnd_size == SIZE_SPEC_REG)
-		  {
-		    const struct cris_spec_reg *sregp
-		      = spec_reg_info ((insn >> 12) & 15, disdata->distype);
+		if (opcodep->imm_oprnd_size == SIZE_FIX_32) {
+			size = 4;
+		} else if (opcodep->imm_oprnd_size == SIZE_SPEC_REG) {
+			const struct cris_spec_reg *sregp = spec_reg_info ((insn >> 12) & 15, disdata->distype);
 
-		    /* FIXME: Improve error handling; should have been caught
+			/* FIXME: Improve error handling; should have been caught
 		       earlier.  */
-		    if (!sregp)
-		      size = 4;
-		    else
-		      size = sregp->reg_size;
-		  }
-		else
-		  size = mode_size;
+			if (!sregp) {
+				size = 4;
+			} else {
+				size = sregp->reg_size;
+			}
+		} else {
+			size = mode_size;
+		}
 
 		info->data_size = size;
 	      }
@@ -1053,8 +1042,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 			   data.  */
 			*tp = 0;
 			tp = temp;
-			if (temp[0])
-			  (*info->fprintf_func) (info->stream, "%s", temp);
+			if (temp[0]) {
+				(*info->fprintf_func) (info->stream, "%s", temp);
+			}
 
 			(*info->print_address_func) ((bfd_vma) number, info);
 		      }
@@ -1071,8 +1061,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 			*tp++ = '[';
 			tp = format_reg (disdata, prefix_insn & 15, tp,
 					 with_reg_prefix);
-			if (prefix_insn & 0x400)
-			  *tp++ = '+';
+			if (prefix_insn & 0x400) {
+				*tp++ = '+';
+			}
 			*tp++ = ']';
 		      }
 		    break;
@@ -1082,14 +1073,16 @@ print_with_operands (const struct cris_opcode *opcodep,
 		      int number;
 
 		      number = prefix_buffer[0];
-		      if (number > 127)
-			number -= 256;
+		      if (number > 127) {
+			      number -= 256;
+		      }
 
 		      /* Output "reg+num" or, if num < 0, "reg-num".  */
 		      tp = format_reg (disdata, (prefix_insn >> 12) & 15, tp,
 				       with_reg_prefix);
-		      if (number >= 0)
-			*tp++ = '+';
+		      if (number >= 0) {
+			      *tp++ = '+';
+		      }
 		      tp = format_dec (number, tp, 1);
 
 		      info->flags |= CRIS_DIS_FLAG_MEM_TARGET_IS_REG;
@@ -1118,9 +1111,10 @@ print_with_operands (const struct cris_opcode *opcodep,
 				? CRIS_DIS_FLAG_MEM_TARGET2_MULT2 : 0)));
 
 		    /* Is it the casejump?  It's a "adds.w [pc+r%d.w],pc".  */
-		    if (insn == 0xf83f && (prefix_insn & ~0xf000) == 0x55f)
-		      /* Then start interpreting data as offsets.  */
-		      case_offset_counter = no_of_case_offsets;
+		    if (insn == 0xf83f && (prefix_insn & ~0xf000) == 0x55f) {
+			    /* Then start interpreting data as offsets.  */
+			    case_offset_counter = no_of_case_offsets;
+		    }
 		    break;
 
 		  case BDAP_INDIR_OPCODE:
@@ -1137,23 +1131,26 @@ print_with_operands (const struct cris_opcode *opcodep,
 			/* It's a value.  Get its size.  */
 			int mode_size = 1 << ((prefix_insn >> 4) & 3);
 
-			if (mode_size == 1)
-			  nbytes = 2;
-			else
-			  nbytes = mode_size;
+			if (mode_size == 1) {
+				nbytes = 2;
+			} else {
+				nbytes = mode_size;
+			}
 
 			switch (nbytes)
 			  {
 			  case 1:
 			    number = prefix_buffer[2];
-			    if (number > 127)
-			      number -= 256;
+			    if (number > 127) {
+				    number -= 256;
+			    }
 			    break;
 
 			  case 2:
 			    number = prefix_buffer[2] + prefix_buffer[3] * 256;
-			    if (number > 32767)
-			      number -= 65536;
+			    if (number > 32767) {
+				    number -= 65536;
+			    }
 			    break;
 
 			  case 4:
@@ -1187,9 +1184,10 @@ print_with_operands (const struct cris_opcode *opcodep,
 			  }
 			else
 			  {
-			    if (number >= 0)
-			      *tp++ = '+';
-			    tp = format_dec (number, tp, 1);
+				  if (number >= 0) {
+					  *tp++ = '+';
+				  }
+				  tp = format_dec (number, tp, 1);
 			  }
 		      }
 		    else
@@ -1199,8 +1197,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 			*tp++ = '[';
 			tp = format_reg (disdata, prefix_insn & 15, tp,
 					 with_reg_prefix);
-			if (prefix_insn & 0x400)
-			  *tp++ = '+';
+			if (prefix_insn & 0x400) {
+				*tp++ = '+';
+			}
 			*tp++ = ']';
 			*tp++ = '.';
 			*tp++ = mode_char[(prefix_insn >> 4) & 3];
@@ -1232,8 +1231,9 @@ print_with_operands (const struct cris_opcode *opcodep,
 		info->flags |= CRIS_DIS_FLAG_MEM_TARGET_IS_REG;
 		info->target = insn & 15;
 
-		if (insn & 0x400)
-		  *tp++ = '+';
+		if (insn & 0x400) {
+			*tp++ = '+';
+		}
 	      }
 	    *tp++ = ']';
 	  }
@@ -1253,15 +1253,17 @@ print_with_operands (const struct cris_opcode *opcodep,
 	{
 	  int where = buffer[2] + buffer[3] * 256;
 
-	  if (where > 32767)
-	    where -= 65536;
+	  if (where > 32767) {
+		  where -= 65536;
+	  }
 
 	  where += addr + ((disdata->distype == cris_dis_v32) ? 0 : 4);
 
-	  if (insn == BA_PC_INCR_OPCODE)
-	    info->insn_type = dis_branch;
-	  else
-	    info->insn_type = dis_condbranch;
+	  if (insn == BA_PC_INCR_OPCODE) {
+		  info->insn_type = dis_branch;
+	  } else {
+		  info->insn_type = dis_condbranch;
+	  }
 
 	  info->target = (bfd_vma) where;
 
@@ -1287,13 +1289,15 @@ print_with_operands (const struct cris_opcode *opcodep,
 	long offset = insn & 0xfe;
 	bfd_vma target;
 
-	if (insn & 1)
-	  offset |= ~0xff;
+	if (insn & 1) {
+		offset |= ~0xff;
+	}
 
-	if (opcodep->match == BA_QUICK_OPCODE)
-	  info->insn_type = dis_branch;
-	else
-	  info->insn_type = dis_condbranch;
+	if (opcodep->match == BA_QUICK_OPCODE) {
+		info->insn_type = dis_branch;
+	} else {
+		info->insn_type = dis_condbranch;
+	}
 
 	target = addr + ((disdata->distype == cris_dis_v32) ? 0 : 2) + offset;
 	info->target = target;
@@ -1309,8 +1313,9 @@ print_with_operands (const struct cris_opcode *opcodep,
       {
 	long number = buffer[0];
 
-	if (number > 127)
-	  number = number - 256;
+	if (number > 127) {
+		number = number - 256;
+	}
 
 	tp = format_dec (number, tp, 1);
 	*tp++ = ',';
@@ -1332,15 +1337,15 @@ print_with_operands (const struct cris_opcode *opcodep,
 	  = spec_reg_info ((insn >> 12) & 15, disdata->distype);
 
 if (sregp) {
-	if (!sregp->name)
-	  /* Should have been caught as a non-match eariler.  */
-	  *tp++ = '?';
-	else
-	  {
-	    if (with_reg_prefix)
-	      *tp++ = REGISTER_PREFIX_CHAR;
-	    strcpy (tp, sregp->name);
-	    tp += strlen (tp);
+	if (!sregp->name) {
+		/* Should have been caught as a non-match eariler.  */
+		*tp++ = '?';
+	} else {
+		if (with_reg_prefix) {
+			*tp++ = REGISTER_PREFIX_CHAR;
+		}
+		strcpy (tp, sregp->name);
+		tp += strlen (tp);
 	  }
 }
       }
@@ -1354,9 +1359,10 @@ if (sregp) {
 
   *tp = 0;
 
-  if (prefix_opcodep)
-    (*info->fprintf_func) (info->stream, " (OOPS unused prefix \"%s: %s\")",
-			   prefix_opcodep->name, prefix_opcodep->args);
+  if (prefix_opcodep) {
+	  (*info->fprintf_func) (info->stream, " (OOPS unused prefix \"%s: %s\")",
+		  prefix_opcodep->name, prefix_opcodep->args);
+  }
 
   (*info->fprintf_func) (info->stream, "%s", temp);
 
@@ -1365,24 +1371,23 @@ if (sregp) {
      itself or in a "move.d const,rN, sub.d rN,rM"-like sequence.  */
   if (TRACE_CASE && case_offset_counter == 0)
     {
-      if (CONST_STRNEQ (opcodep->name, "sub"))
-	case_offset = last_immediate;
+	  if (CONST_STRNEQ (opcodep->name, "sub")) {
+		  case_offset = last_immediate;
 
-      /* It could also be an "add", if there are negative case-values.  */
-      else if (CONST_STRNEQ (opcodep->name, "add"))
-	/* The first case is the negated operand to the add.  */
-	case_offset = -last_immediate;
+		  /* It could also be an "add", if there are negative case-values.  */
+	  } else if (CONST_STRNEQ (opcodep->name, "add")) {
+		  /* The first case is the negated operand to the add.  */
+		  case_offset = -last_immediate;
 
-      /* A bound insn will tell us the number of cases.  */
-      else if (CONST_STRNEQ (opcodep->name, "bound"))
-	no_of_case_offsets = last_immediate + 1;
+		  /* A bound insn will tell us the number of cases.  */
+	  } else if (CONST_STRNEQ (opcodep->name, "bound")) {
+		  no_of_case_offsets = last_immediate + 1;
 
-      /* A jump or jsr or branch breaks the chain of insns for a
+		  /* A jump or jsr or branch breaks the chain of insns for a
 	 case-table, so assume default first-case again.  */
-      else if (info->insn_type == dis_jsr
-	       || info->insn_type == dis_branch
-	       || info->insn_type == dis_condbranch)
-	case_offset = 0;
+	  } else if (info->insn_type == dis_jsr || info->insn_type == dis_branch || info->insn_type == dis_condbranch) {
+		  case_offset = 0;
+	  }
     }
 }
 
@@ -1420,142 +1425,124 @@ print_insn_cris_generic (bfd_vma memaddr,
   for (nbytes = MAX_BYTES_PER_CRIS_INSN; nbytes > 0; nbytes -= 2)
     {
       status = (*info->read_memory_func) (memaddr, buffer, nbytes, info);
-      if (status == 0)
-	break;
+      if (status == 0) {
+	      break;
+      }
     }
 
   /* If we did not get all we asked for, then clear the rest.
      Hopefully this makes a reproducible result in case of errors.  */
-  if (nbytes != MAX_BYTES_PER_CRIS_INSN)
-    memset (buffer + nbytes, 0, MAX_BYTES_PER_CRIS_INSN - nbytes);
+    if (nbytes != MAX_BYTES_PER_CRIS_INSN) {
+	    memset (buffer + nbytes, 0, MAX_BYTES_PER_CRIS_INSN - nbytes);
+    }
 
-  addr = memaddr;
-  bufp = buffer;
+    addr = memaddr;
+    bufp = buffer;
 
-  /* Set some defaults for the insn info.  */
-  info->insn_info_valid = 1;
-  info->branch_delay_insns = 0;
-  info->data_size = 0;
-  info->insn_type = dis_nonbranch;
-  info->flags = 0;
-  info->target = 0;
-  info->target2 = 0;
+    /* Set some defaults for the insn info.  */
+    info->insn_info_valid = 1;
+    info->branch_delay_insns = 0;
+    info->data_size = 0;
+    info->insn_type = dis_nonbranch;
+    info->flags = 0;
+    info->target = 0;
+    info->target2 = 0;
 
-  /* If we got any data, disassemble it.  */
-  if (nbytes != 0)
-    {
-      matchedp = NULL;
+    /* If we got any data, disassemble it.  */
+    if (nbytes != 0) {
+	    matchedp = NULL;
 
-      insn = bufp[0] + bufp[1] * 256;
+	    insn = bufp[0] + bufp[1] * 256;
 
-      /* If we're in a case-table, don't disassemble the offsets.  */
-      if (TRACE_CASE && case_offset_counter != 0)
-	{
-	  info->insn_type = dis_noninsn;
-	  advance += 2;
+	    /* If we're in a case-table, don't disassemble the offsets.  */
+	    if (TRACE_CASE && case_offset_counter != 0) {
+		    info->insn_type = dis_noninsn;
+		    advance += 2;
 
-	  /* If to print data as offsets, then shortcut here.  */
-	  (*info->fprintf_func) (info->stream, "case %ld%s: -> ",
-				 case_offset + no_of_case_offsets
-				 - case_offset_counter,
-				 case_offset_counter == 1 ? "/default" :
-				 "");
+		    /* If to print data as offsets, then shortcut here.  */
+		    (*info->fprintf_func) (info->stream, "case %ld%s: -> ",
+			    case_offset + no_of_case_offsets - case_offset_counter,
+			    case_offset_counter == 1 ? "/default" : "");
 
-	  (*info->print_address_func) ((bfd_vma)
-				       ((short) (insn)
-					+ (long) (addr
-						  - (no_of_case_offsets
-						     - case_offset_counter)
-						  * 2)), info);
-	  case_offset_counter--;
+		    (*info->print_address_func) ((bfd_vma) ((short)(insn) + (long)(addr - (no_of_case_offsets - case_offset_counter) * 2)), info);
+		    case_offset_counter--;
 
-	  /* The default case start (without a "sub" or "add") must be
+		    /* The default case start (without a "sub" or "add") must be
 	     zero.  */
-	  if (case_offset_counter == 0)
-	    case_offset = 0;
-	}
-      else if (insn == 0)
-	{
-	  /* We're often called to disassemble zeroes.  While this is a
+		    if (case_offset_counter == 0) {
+			    case_offset = 0;
+		    }
+	    } else if (insn == 0) {
+		    /* We're often called to disassemble zeroes.  While this is a
 	     valid "bcc .+2" insn, it is also useless enough and enough
 	     of a nuiscance that we will just output "bcc .+2" for it
 	     and signal it as a noninsn.  */
-	  (*info->fprintf_func) (info->stream,
-				 disdata->distype == cris_dis_v32
-				 ? "bcc ." : "bcc .+2");
-	  info->insn_type = dis_noninsn;
-	  advance += 2;
-	}
-      else
-	{
-	  const struct cris_opcode *prefix_opcodep = NULL;
-	  unsigned char *prefix_buffer = bufp;
-	  unsigned int prefix_insn = insn;
-	  int prefix_size = 0;
+		    (*info->fprintf_func) (info->stream,
+			    disdata->distype == cris_dis_v32
+				    ? "bcc ."
+				    : "bcc .+2");
+		    info->insn_type = dis_noninsn;
+		    advance += 2;
+	    } else {
+		    const struct cris_opcode *prefix_opcodep = NULL;
+		    unsigned char *prefix_buffer = bufp;
+		    unsigned int prefix_insn = insn;
+		    int prefix_size = 0;
 
-	  matchedp = get_opcode_entry (insn, NO_CRIS_PREFIX, disdata);
+		    matchedp = get_opcode_entry (insn, NO_CRIS_PREFIX, disdata);
 
-	  /* Check if we're supposed to write out prefixes as address
+		    /* Check if we're supposed to write out prefixes as address
 	     modes and if this was a prefix.  */
-	  if (matchedp != NULL && PARSE_PREFIX && matchedp->args[0] == 'p')
-	    {
-	      /* If it's a prefix, put it into the prefix vars and get the
+		    if (matchedp != NULL && PARSE_PREFIX && matchedp->args[0] == 'p') {
+			    /* If it's a prefix, put it into the prefix vars and get the
 		 main insn.  */
-	      prefix_size = bytes_to_skip (prefix_insn, matchedp,
-					   disdata->distype, NULL);
-	      prefix_opcodep = matchedp;
+			    prefix_size = bytes_to_skip (prefix_insn, matchedp,
+				    disdata->distype, NULL);
+			    prefix_opcodep = matchedp;
 
-	      insn = bufp[prefix_size] + bufp[prefix_size + 1] * 256;
-	      matchedp = get_opcode_entry (insn, prefix_insn, disdata);
+			    insn = bufp[prefix_size] + bufp[prefix_size + 1] * 256;
+			    matchedp = get_opcode_entry (insn, prefix_insn, disdata);
 
-	      if (matchedp != NULL)
-		{
-		  addr += prefix_size;
-		  bufp += prefix_size;
-		  advance += prefix_size;
-		}
-	      else
-		{
-		  /* The "main" insn wasn't valid, at least not when
+			    if (matchedp != NULL) {
+				    addr += prefix_size;
+				    bufp += prefix_size;
+				    advance += prefix_size;
+			    } else {
+				    /* The "main" insn wasn't valid, at least not when
 		     prefixed.  Put back things enough to output the
 		     prefix insn only, as a normal insn.  */
-		  matchedp = prefix_opcodep;
-		  insn = prefix_insn;
-		  prefix_opcodep = NULL;
-		}
-	    }
+				    matchedp = prefix_opcodep;
+				    insn = prefix_insn;
+				    prefix_opcodep = NULL;
+			    }
+		    }
 
-	  if (!matchedp)
-	    {
-	      (*info->fprintf_func) (info->stream, "??0x%x", insn);
-	      advance += 2;
+		    if (!matchedp) {
+			    (*info->fprintf_func) (info->stream, "??0x%x", insn);
+			    advance += 2;
 
-	      info->insn_type = dis_noninsn;
-	    }
-	  else
-	    {
-	      advance
-		+= bytes_to_skip (insn, matchedp, disdata->distype,
-				  prefix_opcodep);
+			    info->insn_type = dis_noninsn;
+		    } else {
+			    advance += bytes_to_skip (insn, matchedp, disdata->distype,
+				    prefix_opcodep);
 
-	      /* The info_type and assorted fields will be set according
+			    /* The info_type and assorted fields will be set according
 		 to the operands.   */
-	      print_with_operands (matchedp, insn, bufp, addr, info,
-				   prefix_opcodep, prefix_insn,
-				   prefix_buffer, with_reg_prefix);
+			    print_with_operands (matchedp, insn, bufp, addr, info,
+				    prefix_opcodep, prefix_insn,
+				    prefix_buffer, with_reg_prefix);
+		    }
 	    }
-	}
+    } else {
+	    info->insn_type = dis_noninsn;
     }
-  else
-    info->insn_type = dis_noninsn;
 
-  /* If we read less than MAX_BYTES_PER_CRIS_INSN, i.e. we got an error
+    /* If we read less than MAX_BYTES_PER_CRIS_INSN, i.e. we got an error
      status when reading that much, and the insn decoding indicated a
      length exceeding what we read, there is an error.  */
-  if (status != 0 && (nbytes == 0 || advance > nbytes))
-    {
-      (*info->memory_error_func) (status, memaddr, info);
-      return -1;
+    if (status != 0 && (nbytes == 0 || advance > nbytes)) {
+	    (*info->memory_error_func) (status, memaddr, info);
+	    return -1;
     }
 
   /* Max supported insn size with one folded prefix insn.  */
@@ -1583,10 +1570,10 @@ static int
 print_insn_cris_with_register_prefix (bfd_vma vma,
 				      disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_v0_v10))
-    return -1;
-  return print_insn_cris_generic (vma, info, TRUE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_v0_v10)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, TRUE);
 }
 
 /* Disassemble, prefixing register names with `$'.  CRIS v32.  */
@@ -1595,10 +1582,10 @@ static int
 print_insn_crisv32_with_register_prefix (bfd_vma vma,
 					 disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_v32))
-    return -1;
-  return print_insn_cris_generic (vma, info, TRUE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_v32)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, TRUE);
 }
 
 /* Disassemble, prefixing register names with `$'.
@@ -1608,10 +1595,10 @@ int
 print_insn_crisv10_v32_with_register_prefix (bfd_vma vma,
 					     disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))
-    return -1;
-  return print_insn_cris_generic (vma, info, TRUE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, TRUE);
 }
 
 /* Disassemble, no prefixes on register names.  CRIS v0..v10.  */
@@ -1620,10 +1607,10 @@ static int
 print_insn_cris_without_register_prefix (bfd_vma vma,
 					 disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_v0_v10))
-    return -1;
-  return print_insn_cris_generic (vma, info, FALSE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_v0_v10)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, FALSE);
 }
 
 /* Disassemble, no prefixes on register names.  CRIS v32.  */
@@ -1632,10 +1619,10 @@ int
 print_insn_crisv32_without_register_prefix (bfd_vma vma,
 					    disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_v32))
-    return -1;
-  return print_insn_cris_generic (vma, info, FALSE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_v32)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, FALSE);
 }
 
 /* Disassemble, no prefixes on register names.
@@ -1645,10 +1632,10 @@ int
 print_insn_crisv10_v32_without_register_prefix (bfd_vma vma,
 						disassemble_info *info)
 {
-  if (!info->private_data
-      && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))
-    return -1;
-  return print_insn_cris_generic (vma, info, FALSE);
+	if (!info->private_data && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32)) {
+		return -1;
+	}
+	return print_insn_cris_generic (vma, info, FALSE);
 }
 
 /* Return a disassembler-function that prints registers with a `$' prefix,
@@ -1663,22 +1650,22 @@ const int mode = 0; // V32 by default
   /* If there's no bfd in sight, we return what is valid as input in all
      contexts if fed back to the assembler: disassembly *with* register
      prefix.  Unfortunately this will be totally wrong for v32.  */
-  if (!abfd)
-    return print_insn_cris_with_register_prefix;
-
-  if (bfd_get_symbol_leading_char (abfd) == 0)
-    {
-switch (mode) {
-case 0: // V32
-	return print_insn_crisv32_with_register_prefix;
-case 1: // V10_V32
-	return print_insn_crisv10_v32_with_register_prefix;
-default:
-
-      /* We default to v10.  This may be specifically specified in the
-	 bfd mach, but is also the default setting.  */
-      return print_insn_cris_with_register_prefix;
+if (!abfd) {
+	return print_insn_cris_with_register_prefix;
 }
+
+if (bfd_get_symbol_leading_char (abfd) == 0) {
+	switch (mode) {
+	case 0: // V32
+		return print_insn_crisv32_with_register_prefix;
+	case 1: // V10_V32
+		return print_insn_crisv10_v32_with_register_prefix;
+	default:
+
+		/* We default to v10.  This may be specifically specified in the
+	 bfd mach, but is also the default setting.  */
+		return print_insn_cris_with_register_prefix;
+	}
     }
 
 switch (mode) {
diff --git a/libr/asm/arch/ebc/ebc_disas.c b/libr/asm/arch/ebc/ebc_disas.c
index 703c629e0e..0b713e2e01 100644
--- a/libr/asm/arch/ebc/ebc_disas.c
+++ b/libr/asm/arch/ebc/ebc_disas.c
@@ -141,9 +141,12 @@ static int decode_jmp(const ut8 *bytes, ebc_command_t *cmd) {
 		ret = 10;
 		snprintf(cmd->operands, EBC_OPERANDS_MAXLEN, "0x%lx", immed);
 	} else {
-		if ((bytes[1] & 0x7) != 0)
-			snprintf(op1, sizeof (op1), "%sr%u ",
-					TEST_BIT(bytes[1], 3) ? "@" : "", bytes[1] & 0x7);
+		if ((bytes[1] & 0x7) != 0) {
+			{
+				snprintf (op1, sizeof (op1), "%sr%u ",
+					TEST_BIT (bytes[1], 3) ? "@" : "", bytes[1] & 0x7);
+			}
+		}
 		if (TEST_BIT (bytes[0], 7)) {
 			if (TEST_BIT(bytes[1], 3)) {
 				decode_index32(bytes + 2, &idx32);
@@ -978,7 +981,10 @@ static decode decodes[EBC_COMMAND_NUM] = {
 };
 
 int ebc_decode_command(const ut8 *instr, ebc_command_t *cmd) {
-	if ((instr[0] & EBC_OPCODE_MASK) > 0x39)
-		return -1;
+	if ((instr[0] & EBC_OPCODE_MASK) > 0x39) {
+		{
+			return -1;
+		}
+	}
 	return decodes[instr[0] & EBC_OPCODE_MASK](instr, cmd);
 }
diff --git a/libr/asm/arch/h8300/h8300_disas.c b/libr/asm/arch/h8300/h8300_disas.c
index eac3baeb93..56dd325418 100644
--- a/libr/asm/arch/h8300/h8300_disas.c
+++ b/libr/asm/arch/h8300/h8300_disas.c
@@ -833,8 +833,11 @@ int h8300_decode_command(const ut8 *instr, struct h8300_cmd *cmd)
 		break;
 	}
 
-	if (ret)
-		return ret;
+	if (ret) {
+		{
+			return ret;
+		}
+	}
 
 	switch (instr[0]) {
 	case H8300_ANDC:
diff --git a/libr/asm/arch/hppa/gnu/hppa-dis.c b/libr/asm/arch/hppa/gnu/hppa-dis.c
index e7974e1a27..1fba17af59 100644
--- a/libr/asm/arch/hppa/gnu/hppa-dis.c
+++ b/libr/asm/arch/hppa/gnu/hppa-dis.c
@@ -190,10 +190,11 @@ static void
 fput_fp_reg_r (unsigned reg, disassemble_info *info)
 {
   /* Special case floating point exception registers.  */
-  if (reg < 4)
-    (*info->fprintf_func) (info->stream, "fpe%d", reg * 2 + 1);
-  else
-    (*info->fprintf_func) (info->stream, "%sR", fp_reg_names[reg]);
+  if (reg < 4) {
+	  (*info->fprintf_func) (info->stream, "fpe%d", reg * 2 + 1);
+  } else {
+	  (*info->fprintf_func) (info->stream, "%sR", fp_reg_names[reg]);
+  }
 }
 
 static void
@@ -207,10 +208,11 @@ fput_creg (unsigned reg, disassemble_info *info)
 static void
 fput_const (unsigned num, disassemble_info *info)
 {
-  if ((int) num < 0)
-    (*info->fprintf_func) (info->stream, "-%x", - (int) num);
-  else
-    (*info->fprintf_func) (info->stream, "%x", num);
+	if ((int)num < 0) {
+		(*info->fprintf_func) (info->stream, "-%x", -(int)num);
+	} else {
+		(*info->fprintf_func) (info->stream, "%x", num);
+	}
 }
 
 /* Routines to extract various sized constants out of hppa
@@ -386,8 +388,9 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 #endif
 	  (*info->fprintf_func) (info->stream, "%s", opcode->name);
 
-	  if (!strchr ("cfCY?-+nHNZFIuv{", opcode->args[0]))
-	    (*info->fprintf_func) (info->stream, " ");
+	  if (!strchr ("cfCY?-+nHNZFIuv{", opcode->args[0])) {
+		  (*info->fprintf_func) (info->stream, " ");
+	  }
 	  for (s = opcode->args; *s != '\0'; ++s)
 	    {
 	      switch (*s)
@@ -414,19 +417,21 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		      fput_fp_reg (GET_FIELD (insn, 27, 31), info);
 		      break;
 		    case 'T':
-		      if (GET_FIELD (insn, 25, 25))
-			fput_fp_reg_r (GET_FIELD (insn, 27, 31), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 27, 31), info);
-		      break;
+			    if (GET_FIELD (insn, 25, 25)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 27, 31), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 27, 31), info);
+			    }
+			    break;
 		    case 'a':
-		      if (GET_FIELD (insn, 25, 25))
-			fput_fp_reg_r (GET_FIELD (insn, 6, 10), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 6, 10), info);
-		      break;
+			    if (GET_FIELD (insn, 25, 25)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 6, 10), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 6, 10), info);
+			    }
+			    break;
 
-		      /* 'fA' will not generate a space before the register
+			    /* 'fA' will not generate a space before the register
 			 name.  Normally that is fine.  Except that it
 			 causes problems with xmpyu which has no FP format
 			 completer.  */
@@ -435,31 +440,35 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		      /* FALLTHRU */
 
 		    case 'A':
-		      if (GET_FIELD (insn, 24, 24))
-			fput_fp_reg_r (GET_FIELD (insn, 6, 10), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 6, 10), info);
-		      break;
+			    if (GET_FIELD (insn, 24, 24)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 6, 10), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 6, 10), info);
+			    }
+			    break;
 		    case 'b':
-		      if (GET_FIELD (insn, 25, 25))
-			fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 11, 15), info);
-		      break;
+			    if (GET_FIELD (insn, 25, 25)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 11, 15), info);
+			    }
+			    break;
 		    case 'B':
-		      if (GET_FIELD (insn, 19, 19))
-			fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 11, 15), info);
-		      break;
+			    if (GET_FIELD (insn, 19, 19)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 11, 15), info);
+			    }
+			    break;
 		    case 'C':
 		      {
 			int reg = GET_FIELD (insn, 21, 22);
 			reg |= GET_FIELD (insn, 16, 18) << 2;
-			if (GET_FIELD (insn, 23, 23) != 0)
-			  fput_fp_reg_r (reg, info);
-			else
-			  fput_fp_reg (reg, info);
+			if (GET_FIELD (insn, 23, 23) != 0) {
+				fput_fp_reg_r (reg, info);
+			} else {
+				fput_fp_reg (reg, info);
+			}
 			break;
 		      }
 		    case 'i':
@@ -512,11 +521,12 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		      /* FALLTHRU */
 
 		    case 'e':
-		      if (GET_FIELD (insn, 30, 30))
-			fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
-		      else
-			fput_fp_reg (GET_FIELD (insn, 11, 15), info);
-		      break;
+			    if (GET_FIELD (insn, 30, 30)) {
+				    fput_fp_reg_r (GET_FIELD (insn, 11, 15), info);
+			    } else {
+				    fput_fp_reg (GET_FIELD (insn, 11, 15), info);
+			    }
+			    break;
 		    case 'x':
 		      fput_fp_reg (GET_FIELD (insn, 11, 15), info);
 		      break;
@@ -530,8 +540,9 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		  {
 		    int space = GET_FIELD (insn, 16, 17);
 		    /* Zero means implicit addressing, not use of sr0.  */
-		    if (space != 0)
-		      (*info->fprintf_func) (info->stream, "sr%d", space);
+		    if (space != 0) {
+			    (*info->fprintf_func) (info->stream, "sr%d", space);
+		    }
 		  }
 		  break;
 
@@ -623,23 +634,27 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		      (*info->fprintf_func) (info->stream, ",w ");
 		      break;
 		    case 'r':
-		      if (GET_FIELD (insn, 23, 26) == 5)
-			(*info->fprintf_func) (info->stream, ",r");
-		      break;
+			    if (GET_FIELD (insn, 23, 26) == 5) {
+				    (*info->fprintf_func) (info->stream, ",r");
+			    }
+			    break;
 		    case 'Z':
-		      if (GET_FIELD (insn, 26, 26))
-			(*info->fprintf_func) (info->stream, ",m ");
-		      else
-			(*info->fprintf_func) (info->stream, " ");
-		      break;
+			    if (GET_FIELD (insn, 26, 26)) {
+				    (*info->fprintf_func) (info->stream, ",m ");
+			    } else {
+				    (*info->fprintf_func) (info->stream, " ");
+			    }
+			    break;
 		    case 'i':
-		      if (GET_FIELD (insn, 25, 25))
-			(*info->fprintf_func) (info->stream, ",i");
-		      break;
+			    if (GET_FIELD (insn, 25, 25)) {
+				    (*info->fprintf_func) (info->stream, ",i");
+			    }
+			    break;
 		    case 'z':
-		      if (!GET_FIELD (insn, 21, 21))
-			(*info->fprintf_func) (info->stream, ",z");
-		      break;
+			    if (!GET_FIELD (insn, 21, 21)) {
+				    (*info->fprintf_func) (info->stream, ",z");
+			    }
+			    break;
 		    case 'a':
 		      (*info->fprintf_func)
 			(info->stream, "%s",
@@ -656,38 +671,42 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 			 add_compl_names[GET_FIELD (insn, 20, 21)]);
 		      break;
 		    case 'v':
-		      if (GET_FIELD (insn, 20, 20))
-			(*info->fprintf_func) (info->stream, ",tsv");
-		      break;
+			    if (GET_FIELD (insn, 20, 20)) {
+				    (*info->fprintf_func) (info->stream, ",tsv");
+			    }
+			    break;
 		    case 't':
 		      (*info->fprintf_func) (info->stream, ",tc");
-		      if (GET_FIELD (insn, 20, 20))
-			(*info->fprintf_func) (info->stream, ",tsv");
+		      if (GET_FIELD (insn, 20, 20)) {
+			      (*info->fprintf_func) (info->stream, ",tsv");
+		      }
 		      break;
 		    case 'B':
 		      (*info->fprintf_func) (info->stream, ",db");
-		      if (GET_FIELD (insn, 20, 20))
-			(*info->fprintf_func) (info->stream, ",tsv");
+		      if (GET_FIELD (insn, 20, 20)) {
+			      (*info->fprintf_func) (info->stream, ",tsv");
+		      }
 		      break;
 		    case 'b':
 		      (*info->fprintf_func) (info->stream, ",b");
-		      if (GET_FIELD (insn, 20, 20))
-			(*info->fprintf_func) (info->stream, ",tsv");
+		      if (GET_FIELD (insn, 20, 20)) {
+			      (*info->fprintf_func) (info->stream, ",tsv");
+		      }
 		      break;
 		    case 'T':
-		      if (GET_FIELD (insn, 25, 25))
-			(*info->fprintf_func) (info->stream, ",tc");
-		      break;
+			    if (GET_FIELD (insn, 25, 25)) {
+				    (*info->fprintf_func) (info->stream, ",tc");
+			    }
+			    break;
 		    case 'S':
 		      /* EXTRD/W has a following condition.  */
-		      if (*(s + 1) == '?')
-			(*info->fprintf_func)
-			  (info->stream, "%s",
-			   signed_unsigned_names[GET_FIELD (insn, 21, 21)]);
-		      else
-			(*info->fprintf_func)
-			  (info->stream, "%s ",
-			   signed_unsigned_names[GET_FIELD (insn, 21, 21)]);
+		      if (*(s + 1) == '?') {
+			      (*info->fprintf_func) (info->stream, "%s",
+				      signed_unsigned_names[GET_FIELD (insn, 21, 21)]);
+		      } else {
+			      (*info->fprintf_func) (info->stream, "%s ",
+				      signed_unsigned_names[GET_FIELD (insn, 21, 21)]);
+		      }
 		      break;
 		    case 'h':
 		      (*info->fprintf_func)
@@ -713,12 +732,13 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 			m = GET_FIELD (insn, 28, 28);
 			a = GET_FIELD (insn, 29, 29);
 
-			if (m && !a)
-			  fputs_filtered (",ma ", info);
-			else if (m && a)
-			  fputs_filtered (",mb ", info);
-			else
-			  fputs_filtered (" ", info);
+			if (m && !a) {
+				fputs_filtered (",ma ", info);
+			} else if (m && a) {
+				fputs_filtered (",mb ", info);
+			} else {
+				fputs_filtered (" ", info);
+			}
 			break;
 		      }
 
@@ -728,13 +748,14 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
 			if (opc == 0x16 || opc == 0x1e)
 			  {
-			    if (GET_FIELD (insn, 29, 29) == 0)
-			      fputs_filtered (",ma ", info);
-			    else
-			      fputs_filtered (",mb ", info);
-			  }
-			else
-			  fputs_filtered (" ", info);
+				if (GET_FIELD (insn, 29, 29) == 0) {
+					fputs_filtered (",ma ", info);
+				} else {
+					fputs_filtered (",mb ", info);
+				}
+			} else {
+				fputs_filtered (" ", info);
+			}
 			break;
 		      }
 
@@ -744,22 +765,24 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
 			if (opc == 0x13 || opc == 0x1b)
 			  {
-			    if (GET_FIELD (insn, 18, 18) == 1)
-			      fputs_filtered (",mb ", info);
-			    else
-			      fputs_filtered (",ma ", info);
+				if (GET_FIELD (insn, 18, 18) == 1) {
+					fputs_filtered (",mb ", info);
+				} else {
+					fputs_filtered (",ma ", info);
+				}
 			  }
 			else if (opc == 0x17 || opc == 0x1f)
 			  {
-			    if (GET_FIELD (insn, 31, 31) == 1)
-			      fputs_filtered (",ma ", info);
-			    else
-			      fputs_filtered (",mb ", info);
+				  if (GET_FIELD (insn, 31, 31) == 1) {
+					  fputs_filtered (",ma ", info);
+				  } else {
+					  fputs_filtered (",mb ", info);
+				  }
+			  } else {
+				  fputs_filtered (" ", info);
 			  }
-			else
-			  fputs_filtered (" ", info);
 
-			break;
+			  break;
 		      }
 		    }
 		  break;
@@ -869,8 +892,9 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
 			/* If the next character in args is 'n', it will handle
 			   putting out the space.  */
-			if (s[1] != 'n')
-			  (*info->fprintf_func) (info->stream, " ");
+			if (s[1] != 'n') {
+				(*info->fprintf_func) (info->stream, " ");
+			}
 			break;
 		      case 'X':
 			(*info->fprintf_func)
@@ -884,8 +908,9 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
 			/* If the next character in args is 'n', it will handle
 			   putting out the space.  */
-			if (s[1] != 'n')
-			  (*info->fprintf_func) (info->stream, " ");
+			if (s[1] != 'n') {
+				(*info->fprintf_func) (info->stream, " ");
+			}
 			break;
 		      }
 		    break;
@@ -923,19 +948,21 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		  fput_const (extract_16 (insn), info);
 		  break;
 		case 'n':
-		  if (insn & 0x2)
-		    (*info->fprintf_func) (info->stream, ",n ");
-		  else
-		    (*info->fprintf_func) (info->stream, " ");
-		  break;
+			if (insn & 0x2) {
+				(*info->fprintf_func) (info->stream, ",n ");
+			} else {
+				(*info->fprintf_func) (info->stream, " ");
+			}
+			break;
 		case 'N':
-		  if ((insn & 0x20) && s[1])
-		    (*info->fprintf_func) (info->stream, ",n ");
-		  else if (insn & 0x20)
-		    (*info->fprintf_func) (info->stream, ",n");
-		  else if (s[1])
-		    (*info->fprintf_func) (info->stream, " ");
-		  break;
+			if ((insn & 0x20) && s[1]) {
+				(*info->fprintf_func) (info->stream, ",n ");
+			} else if (insn & 0x20) {
+				(*info->fprintf_func) (info->stream, ",n");
+			} else if (s[1]) {
+				(*info->fprintf_func) (info->stream, " ");
+			}
+			break;
 		case 'w':
 		  (*info->print_address_func)
 		    (memaddr + 8 + extract_12 (insn), info);
@@ -1060,13 +1087,12 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		case 'F':
 		  /* If no destination completer and not before a completer
 		     for fcmp, need a space here.  */
-		  if (s[1] == 'G' || s[1] == '?')
-		    fputs_filtered
-		      (float_format_names[GET_FIELD (insn, 19, 20)], info);
-		  else
-		    (*info->fprintf_func)
-		      (info->stream, "%s ",
-		       float_format_names[GET_FIELD (insn, 19, 20)]);
+		  if (s[1] == 'G' || s[1] == '?') {
+			  fputs_filtered (float_format_names[GET_FIELD (insn, 19, 20)], info);
+		  } else {
+			  (*info->fprintf_func) (info->stream, "%s ",
+				  float_format_names[GET_FIELD (insn, 19, 20)]);
+		  }
 		  break;
 		case 'G':
 		  (*info->fprintf_func)
@@ -1074,23 +1100,23 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		     float_format_names[GET_FIELD (insn, 17, 18)]);
 		  break;
 		case 'H':
-		  if (GET_FIELD (insn, 26, 26) == 1)
-		    (*info->fprintf_func) (info->stream, "%s ",
-					   float_format_names[0]);
-		  else
-		    (*info->fprintf_func) (info->stream, "%s ",
-					   float_format_names[1]);
-		  break;
+			if (GET_FIELD (insn, 26, 26) == 1) {
+				(*info->fprintf_func) (info->stream, "%s ",
+					float_format_names[0]);
+			} else {
+				(*info->fprintf_func) (info->stream, "%s ",
+					float_format_names[1]);
+			}
+			break;
 		case 'I':
 		  /* If no destination completer and not before a completer
 		     for fcmp, need a space here.  */
-		  if (s[1] == '?')
-		    fputs_filtered
-		      (float_format_names[GET_FIELD (insn, 20, 20)], info);
-		  else
-		    (*info->fprintf_func)
-		      (info->stream, "%s ",
-		       float_format_names[GET_FIELD (insn, 20, 20)]);
+		  if (s[1] == '?') {
+			  fputs_filtered (float_format_names[GET_FIELD (insn, 20, 20)], info);
+		  } else {
+			  (*info->fprintf_func) (info->stream, "%s ",
+				  float_format_names[GET_FIELD (insn, 20, 20)]);
+		  }
 		  break;
 
 		case 'J':
@@ -1103,10 +1129,11 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		    int imm10 = GET_FIELD (insn, 18, 27);
 		    int disp;
 
-		    if (sign)
-		      disp = (UT64_MAX << 10) | imm10;
-		    else
-		      disp = imm10;
+		    if (sign) {
+			    disp = (UT64_MAX << 10) | imm10;
+		    } else {
+			    disp = imm10;
+		    }
 
 		    disp <<= 3;
 		    fput_const (disp, info);
@@ -1119,10 +1146,11 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 		    int imm11 = GET_FIELD (insn, 18, 28);
 		    int disp;
 
-		    if (sign)
-		      disp = (UT64_MAX << 11) | imm11;
-		    else
-		      disp = imm11;
+		    if (sign) {
+			    disp = (UT64_MAX << 11) | imm11;
+		    } else {
+			    disp = imm11;
+		    }
 
 		    disp <<= 2;
 		    fput_const (disp, info);
@@ -1165,24 +1193,28 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 			fputs_filtered (",UND ", info);
 			break;
 		      }
-		    if ((sub & 3) == 3)
-		      t = ",t";
-		    if ((sub & 3) == 1)
-		      source = sub & 4 ? fcnv_ufixed_names : fcnv_fixed_names;
-		    if (sub & 2)
-		      dest = sub & 4 ? fcnv_ufixed_names : fcnv_fixed_names;
+		      if ((sub & 3) == 3) {
+			      t = ",t";
+		      }
+		      if ((sub & 3) == 1) {
+			      source = sub & 4 ? fcnv_ufixed_names : fcnv_fixed_names;
+		      }
+		      if (sub & 2) {
+			      dest = sub & 4 ? fcnv_ufixed_names : fcnv_fixed_names;
+		      }
 
-		    (*info->fprintf_func) (info->stream, "%s%s%s ",
-					   t, source[sf], dest[df]);
-		    break;
+		      (*info->fprintf_func) (info->stream, "%s%s%s ",
+			      t, source[sf], dest[df]);
+		      break;
 		  }
 
 		case 'm':
 		  {
 		    int y = GET_FIELD (insn, 16, 18);
 
-		    if (y != 1)
-		      fput_const ((y ^ 1) - 1, info);
+		    if (y != 1) {
+			    fput_const ((y ^ 1) - 1, info);
+		    }
 		  }
 		  break;
 
@@ -1192,8 +1224,9 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
 		    cbit = GET_FIELD (insn, 16, 18);
 
-		    if (cbit > 0)
-		      (*info->fprintf_func) (info->stream, ",%d", cbit - 1);
+		    if (cbit > 0) {
+			    (*info->fprintf_func) (info->stream, ",%d", cbit - 1);
+		    }
 		    break;
 		  }
 
diff --git a/libr/asm/arch/lanai/gnu/lanai-dis.c b/libr/asm/arch/lanai/gnu/lanai-dis.c
index f2e8d5e4a4..900544ea29 100644
--- a/libr/asm/arch/lanai/gnu/lanai-dis.c
+++ b/libr/asm/arch/lanai/gnu/lanai-dis.c
@@ -84,9 +84,9 @@ is_delayed_branch (insn)
   for (i = 0; i < NUMOPCODES; ++i)
     {
       CONST struct lanai_opcode *opcode = &lanai_opcodes[i];
-      if ((opcode->match & insn) == opcode->match
-	  && (opcode->lose & insn) == 0)
-	return (opcode->flags & F_BR);
+      if ((opcode->match & insn) == opcode->match && (opcode->lose & insn) == 0) {
+	      return (opcode->flags & F_BR);
+      }
     }
   return 0;
 }
@@ -212,8 +212,9 @@ print_insn_lanai (memaddr, info)
 		    break;
 		  case '5': /* Op2 (for RRR) */
 		    (*info->fprintf_func) (stream, "%s", op_names[X_OP2(insn)]);
-		    if(insn&L3_RRR_F)
-		      (*info->fprintf_func) (stream, ".f");
+		    if (insn & L3_RRR_F) {
+			    (*info->fprintf_func) (stream, ".f");
+		    }
 		    break;
 		  case '6': /* Op2 (for RRM) */
 		    (*info->fprintf_func) (stream, "%s", op_names[X_OP2(insn)]);
@@ -237,14 +238,18 @@ print_insn_lanai (memaddr, info)
 			break;
 		  case 'o':
 		    imm = SEX (X_C16(insn), 16);
-		    if (X_RS1 (insn) == 0) goto print_address;
+		    if (X_RS1 (insn) == 0) {
+			    goto print_address;
+		    }
 		    goto print_immediate;
 		  case 's':
 		    imm = SEX (X_C16(insn), 16);
 		    goto print_immediate;
 		  case 'i':
 		    imm = SEX (X_C10(insn), 10);
-		    if (X_RS1 (insn) == 0) goto print_address;
+		    if (X_RS1 (insn) == 0) {
+			    goto print_address;
+		    }
 		    goto print_immediate;
 		  case 'I':
 		    imm = X_C21(insn);
@@ -372,14 +377,15 @@ print_insn_lanai (memaddr, info)
 	  if (opcode->flags & (F_UNBR|F_CONDBR|F_JSR))
 	    {
 		/* FIXME -- check is_annulled flag */
-	      if (opcode->flags & F_UNBR)
-		info->insn_type = dis_branch;
-	      else if (opcode->flags & F_CONDBR)
-		info->insn_type = dis_condbranch;
-	      else if (opcode->flags & F_JSR)
-		info->insn_type = dis_jsr;
-	      else if (opcode->flags & F_BR)
-		info->branch_delay_insns = 1;
+		if (opcode->flags & F_UNBR) {
+			info->insn_type = dis_branch;
+		} else if (opcode->flags & F_CONDBR) {
+			info->insn_type = dis_condbranch;
+		} else if (opcode->flags & F_JSR) {
+			info->insn_type = dis_jsr;
+		} else if (opcode->flags & F_BR) {
+			info->branch_delay_insns = 1;
+		}
 	    }
 
 	  return sizeof (buffer);
@@ -429,8 +435,9 @@ compare_opcodes (a, b)
       int x0 = (match0 & x) != 0;
       int x1 = (match1 & x) != 0;
 
-      if (x0 != x1)
-	return x1 - x0;
+      if (x0 != x1) {
+	      return x1 - x0;
+      }
     }
 
   for (i = 0; i < 32; ++i)
@@ -439,8 +446,9 @@ compare_opcodes (a, b)
       int x0 = (lose0 & x) != 0;
       int x1 = (lose1 & x) != 0;
 
-      if (x0 != x1)
-	return x1 - x0;
+      if (x0 != x1) {
+	      return x1 - x0;
+      }
     }
 
   /* They are functionally equal.  So as long as the opcode table is
@@ -449,9 +457,10 @@ compare_opcodes (a, b)
   /* Our first aesthetic ground is that aliases defer to real insns.  */
   {
     int alias_diff = (op0->flags & F_ALIAS) - (op1->flags & F_ALIAS);
-    if (alias_diff != 0)
-      /* Put the one that isn't an alias first.  */
-      return alias_diff;
+    if (alias_diff != 0) {
+	    /* Put the one that isn't an alias first.  */
+	    return alias_diff;
+    }
   }
 
   /* Except for aliases, two "identical" instructions had
@@ -474,9 +483,10 @@ compare_opcodes (a, b)
   /* Fewer arguments are preferred.  */
   {
     int length_diff = strlen (op0->args) - strlen (op1->args);
-    if (length_diff != 0)
-      /* Put the one with fewer arguments first.  */
-      return length_diff;
+    if (length_diff != 0) {
+	    /* Put the one with fewer arguments first.  */
+	    return length_diff;
+    }
   }
 
   /* Put 1+i before i+1.  */
@@ -489,12 +499,14 @@ compare_opcodes (a, b)
 	/* There is a plus in both operands.  Note that a plus
 	   sign cannot be the first character in args,
 	   so the following [-1]'s are valid.  */
-	if (p0[-1] == 'i' && p1[1] == 'i')
-	  /* op0 is i+1 and op1 is 1+i, so op1 goes first.  */
-	  return 1;
-	if (p0[1] == 'i' && p1[-1] == 'i')
-	  /* op0 is 1+i and op1 is i+1, so op0 goes first.  */
-	  return -1;
+	if (p0[-1] == 'i' && p1[1] == 'i') {
+		/* op0 is i+1 and op1 is 1+i, so op1 goes first.  */
+		return 1;
+	}
+	if (p0[1] == 'i' && p1[-1] == 'i') {
+		/* op0 is 1+i and op1 is i+1, so op0 goes first.  */
+		return -1;
+	}
       }
   }
 
diff --git a/libr/asm/arch/mips/gnu/mips-dis.c b/libr/asm/arch/mips/gnu/mips-dis.c
index e20732bef0..bc5a53b4ce 100644
--- a/libr/asm/arch/mips/gnu/mips-dis.c
+++ b/libr/asm/arch/mips/gnu/mips-dis.c
@@ -457,10 +457,11 @@ choose_abi_by_name (const char *name, unsigned int namelen)
   const struct mips_abi_choice *c;
   unsigned int i;
 
-  for (i = 0, c = NULL; i < ARRAY_SIZE (mips_abi_choices) && !c; i++)
-    if (strncmp (mips_abi_choices[i].name, name, namelen) == 0
-	&& strlen (mips_abi_choices[i].name) == namelen)
-      c = &mips_abi_choices[i];
+  for (i = 0, c = NULL; i < ARRAY_SIZE (mips_abi_choices) && !c; i++) {
+	  if (strncmp (mips_abi_choices[i].name, name, namelen) == 0 && strlen (mips_abi_choices[i].name) == namelen) {
+		  c = &mips_abi_choices[i];
+	  }
+  }
 
   return c;
 }
@@ -471,10 +472,11 @@ choose_arch_by_name (const char *name, unsigned int namelen)
   const struct mips_arch_choice *c = NULL;
   unsigned int i;
 
-  for (i = 0, c = NULL; i < ARRAY_SIZE (mips_arch_choices) && !c; i++)
-    if (strncmp (mips_arch_choices[i].name, name, namelen) == 0
-	&& strlen (mips_arch_choices[i].name) == namelen)
-      c = &mips_arch_choices[i];
+  for (i = 0, c = NULL; i < ARRAY_SIZE (mips_arch_choices) && !c; i++) {
+	  if (strncmp (mips_arch_choices[i].name, name, namelen) == 0 && strlen (mips_arch_choices[i].name) == namelen) {
+		  c = &mips_arch_choices[i];
+	  }
+  }
 
   return c;
 }
@@ -489,10 +491,9 @@ choose_arch_by_number (unsigned long mach)
 
   /* We optimize this because even if the user specifies no
      flags, this will be done for every instruction!  */
-  if (hint_bfd_mach == mach
-      && hint_arch_choice != NULL
-      && hint_arch_choice->bfd_mach == hint_bfd_mach)
-    return hint_arch_choice;
+  if (hint_bfd_mach == mach && hint_arch_choice != NULL && hint_arch_choice->bfd_mach == hint_bfd_mach) {
+	  return hint_arch_choice;
+  }
 
   for (i = 0, c = NULL; i < ARRAY_SIZE (mips_arch_choices) && !c; i++)
     {
@@ -513,12 +514,14 @@ static int
 is_newabi (Elf_Internal_Ehdr *header)
 {
   /* There are no old-style ABIs which use 64-bit ELF.  */
-  if (header->e_ident[EI_CLASS] == ELFCLASS64)
-    return 1;
+  if (header->e_ident[EI_CLASS] == ELFCLASS64) {
+	  return 1;
+  }
 
   /* If a 32-bit ELF file, n32 is a new-style ABI.  */
-  if ((header->e_flags & EF_MIPS_ABI2) != 0)
-    return 1;
+  if ((header->e_flags & EF_MIPS_ABI2) != 0) {
+	  return 1;
+  }
 
   return 0;
 }
@@ -546,8 +549,9 @@ set_default_mips_dis_options (struct disassemble_info *info)
       Elf_Internal_Ehdr *header;
 
       header = elf_elfheader (info->section->owner);
-      if (is_newabi (header))
-	mips_gpr_names = mips_gpr_names_newabi;
+      if (is_newabi (header)) {
+	      mips_gpr_names = mips_gpr_names_newabi;
+      }
     }
 
   /* Set ISA, architecture, and cp0 register names as best we can.  */
@@ -586,16 +590,21 @@ parse_mips_dis_option (const char *option, unsigned int len)
     } */
   
   /* Look for the = that delimits the end of the option name.  */
-  for (i = 0; i < len; i++)
-    if (option[i] == '=')
-      break;
+  for (i = 0; i < len; i++) {
+	  if (option[i] == '=') {
+		  break;
+	  }
+  }
 
-  if (i == 0)		/* Invalid option: no name before '='.  */
-    return;
-  if (i == len)		/* Invalid option: no '='.  */
-    return;
-  if (i == (len - 1))	/* Invalid option: no value after '='.  */
-    return;
+  if (i == 0) { /* Invalid option: no name before '='.  */
+	  return;
+  }
+  if (i == len) { /* Invalid option: no '='.  */
+	  return;
+  }
+  if (i == (len - 1)) { /* Invalid option: no value after '='.  */
+	  return;
+  }
 
   optionlen = i;
   val = option + (optionlen + 1);
@@ -605,8 +614,9 @@ parse_mips_dis_option (const char *option, unsigned int len)
       && strlen ("gpr-names") == optionlen)
     {
       chosen_abi = choose_abi_by_name (val, vallen);
-      if (chosen_abi != NULL)
-	mips_gpr_names = chosen_abi->gpr_names;
+      if (chosen_abi != NULL) {
+	      mips_gpr_names = chosen_abi->gpr_names;
+      }
       return;
     }
 
@@ -614,8 +624,9 @@ parse_mips_dis_option (const char *option, unsigned int len)
       && strlen ("fpr-names") == optionlen)
     {
       chosen_abi = choose_abi_by_name (val, vallen);
-      if (chosen_abi != NULL)
-	mips_fpr_names = chosen_abi->fpr_names;
+      if (chosen_abi != NULL) {
+	      mips_fpr_names = chosen_abi->fpr_names;
+      }
       return;
     }
 
@@ -636,8 +647,9 @@ parse_mips_dis_option (const char *option, unsigned int len)
       && strlen ("hwr-names") == optionlen)
     {
       chosen_arch = choose_arch_by_name (val, vallen);
-      if (chosen_arch != NULL)
-	mips_hwr_names = chosen_arch->hwr_names;
+      if (chosen_arch != NULL) {
+	      mips_hwr_names = chosen_arch->hwr_names;
+      }
       return;
     }
 
@@ -673,8 +685,9 @@ parse_mips_dis_options (const char *options)
 {
   const char *option_end;
 
-  if (!options)
-    return;
+  if (!options) {
+	  return;
+  }
 
   while (*options != '\0')
     {
@@ -687,8 +700,9 @@ parse_mips_dis_options (const char *options)
 
       /* We know that *options is neither NUL or a comma.  */
       option_end = options + 1;
-      while (*option_end != ',' && *option_end != '\0')
-	option_end++;
+      while (*option_end != ',' && *option_end != '\0') {
+	      option_end++;
+      }
 
       parse_mips_dis_option (options, option_end - options);
 
@@ -706,9 +720,11 @@ lookup_mips_cp0sel_name (const struct mips_cp0sel_name *names,
 {
   unsigned int i;
 
-  for (i = 0; i < len; i++)
-    if (names[i].cp0reg == cp0reg && names[i].sel == sel)
-      return &names[i];
+  for (i = 0; i < len; i++) {
+	  if (names[i].cp0reg == cp0reg && names[i].sel == sel) {
+		  return &names[i];
+	  }
+  }
   return NULL;
 }
 
@@ -802,10 +818,11 @@ print_insn_args (const char *d,
 		   printed.  */
 		n = lookup_mips_cp0sel_name(mips_cp0sel_names,
 					    mips_cp0sel_names_len, cp0reg, sel);
-		if (n != NULL)
-		  (*info->fprintf_func) (info->stream, "%s", n->name);
-		else
-		  (*info->fprintf_func) (info->stream, "$%d,%d", cp0reg, sel);
+		if (n != NULL) {
+			(*info->fprintf_func) (info->stream, "%s", n->name);
+		} else {
+			(*info->fprintf_func) (info->stream, "$%d,%d", cp0reg, sel);
+		}
 		break;
 	      }
 
@@ -845,10 +862,11 @@ print_insn_args (const char *d,
 		   printed.  */
 		n = lookup_mips_cp0sel_name(mips_cp0sel_names,
 					    mips_cp0sel_names_len, cp0reg, sel);
-		if (n != NULL)
-		  (*info->fprintf_func) (info->stream, "%s", n->name);
-		else
-		  (*info->fprintf_func) (info->stream, "$%d,%d", cp0reg, sel);
+		if (n != NULL) {
+			(*info->fprintf_func) (info->stream, "%s", n->name);
+		} else {
+			(*info->fprintf_func) (info->stream, "$%d,%d", cp0reg, sel);
+		}
 		break;
 	      }
 
@@ -903,15 +921,17 @@ print_insn_args (const char *d,
 
 	case '0': /* dsp 6-bit signed immediate in bit 20 */
 	  delta = ((l >> OP_SH_DSPSFT) & OP_MASK_DSPSFT);
-	  if (delta & 0x20) /* test sign bit */
-	    delta |= ~OP_MASK_DSPSFT;
+	  if (delta & 0x20) { /* test sign bit */
+		  delta |= ~OP_MASK_DSPSFT;
+	  }
 	  (*info->fprintf_func) (info->stream, "%d", delta);
 	  break;
 
 	case ':': /* dsp 7-bit signed immediate in bit 19 */
 	  delta = ((l >> OP_SH_DSPSFT_7) & OP_MASK_DSPSFT_7);
-	  if (delta & 0x40) /* test sign bit */
-	    delta |= ~OP_MASK_DSPSFT_7;
+	  if (delta & 0x40) { /* test sign bit */
+		  delta |= ~OP_MASK_DSPSFT_7;
+	  }
 	  (*info->fprintf_func) (info->stream, "%d", delta);
 	  break;
 
@@ -922,8 +942,9 @@ print_insn_args (const char *d,
 
 	case '@': /* dsp 10-bit signed immediate in bit 16 */
 	  delta = ((l >> OP_SH_IMM10) & OP_MASK_IMM10);
-	  if (delta & 0x200) /* test sign bit */
-	    delta |= ~OP_MASK_IMM10;
+	  if (delta & 0x200) { /* test sign bit */
+		  delta |= ~OP_MASK_IMM10;
+	  }
 	  (*info->fprintf_func) (info->stream, "%d", delta);
 	  break;
 
@@ -976,8 +997,9 @@ print_insn_args (const char *d,
 	case 'j': /* Same as i, but sign-extended.  */
 	case 'o':
 	  delta = (l >> OP_SH_DELTA) & OP_MASK_DELTA;
-	  if (delta & 0x8000)
-	    delta |= ~0xffff;
+	  if (delta & 0x8000) {
+		  delta |= ~0xffff;
+	  }
 	  (*info->fprintf_func) (info->stream, "%d",
 				 delta);
 	  break;
@@ -1007,8 +1029,9 @@ print_insn_args (const char *d,
 	case 'p':
 	  /* Sign extend the displacement.  */
 	  delta = (l >> OP_SH_DELTA) & OP_MASK_DELTA;
-	  if (delta & 0x8000)
-	    delta |= ~0xffff;
+	  if (delta & 0x8000) {
+		  delta |= ~0xffff;
+	  }
 	  info->target = (delta << 2) + pc + INSNLEN;
 	  (*info->print_address_func) (info->target, info);
 	  break;
@@ -1022,22 +1045,22 @@ print_insn_args (const char *d,
 	  {
 	    /* First check for both rd and rt being equal.  */
 	    unsigned int reg = (l >> OP_SH_RD) & OP_MASK_RD;
-	    if (reg == ((l >> OP_SH_RT) & OP_MASK_RT))
-	      (*info->fprintf_func) (info->stream, "%s",
-				     mips_gpr_names[reg]);
-	    else
-	      {
-		/* If one is zero use the other.  */
-		if (reg == 0)
-		  (*info->fprintf_func) (info->stream, "%s",
-					 mips_gpr_names[(l >> OP_SH_RT) & OP_MASK_RT]);
-		else if (((l >> OP_SH_RT) & OP_MASK_RT) == 0)
-		  (*info->fprintf_func) (info->stream, "%s",
-					 mips_gpr_names[reg]);
-		else /* Bogus, result depends on processor.  */
-		  (*info->fprintf_func) (info->stream, "%s or %s",
-					 mips_gpr_names[reg],
-					 mips_gpr_names[(l >> OP_SH_RT) & OP_MASK_RT]);
+	    if (reg == ((l >> OP_SH_RT) & OP_MASK_RT)) {
+		    (*info->fprintf_func) (info->stream, "%s",
+			    mips_gpr_names[reg]);
+	    } else {
+		    /* If one is zero use the other.  */
+		    if (reg == 0) {
+			    (*info->fprintf_func) (info->stream, "%s",
+				    mips_gpr_names[(l >> OP_SH_RT) & OP_MASK_RT]);
+		    } else if (((l >> OP_SH_RT) & OP_MASK_RT) == 0) {
+			    (*info->fprintf_func) (info->stream, "%s",
+				    mips_gpr_names[reg]);
+		    } else { /* Bogus, result depends on processor.  */
+			    (*info->fprintf_func) (info->stream, "%s or %s",
+				    mips_gpr_names[reg],
+				    mips_gpr_names[(l >> OP_SH_RT) & OP_MASK_RT]);
+		    }
 	      }
 	  }
 	  break;
@@ -1117,12 +1140,13 @@ print_insn_args (const char *d,
 	     'S' format.  Therefore, we only need to worry about cp0,
 	     cp2, and cp3.  */
 	  op = (l >> OP_SH_OP) & OP_MASK_OP;
-	  if (op == OP_OP_COP0)
-	    (*info->fprintf_func) (info->stream, "%s",
-				   mips_cp0_names[(l >> OP_SH_RD) & OP_MASK_RD]);
-	  else
-	    (*info->fprintf_func) (info->stream, "$%ld",
-				   (l >> OP_SH_RD) & OP_MASK_RD);
+	  if (op == OP_OP_COP0) {
+		  (*info->fprintf_func) (info->stream, "%s",
+			  mips_cp0_names[(l >> OP_SH_RD) & OP_MASK_RD]);
+	  } else {
+		  (*info->fprintf_func) (info->stream, "$%ld",
+			  (l >> OP_SH_RD) & OP_MASK_RD);
+	  }
 	  break;
 
 	case 'K':
@@ -1176,9 +1200,11 @@ print_insn_args (const char *d,
 		int fmt;
 
 		vsel &= 0x0f;
-		for (fmt = 0; fmt < 3; fmt++, vsel >>= 1)
-		  if ((vsel & 1) == 0)
-		    break;
+		for (fmt = 0; fmt < 3; fmt++, vsel >>= 1) {
+			if ((vsel & 1) == 0) {
+				break;
+			}
+		}
 		(*info->fprintf_func) (info->stream, "$v%ld[%d]",
 				       (l >> OP_SH_FT) & OP_MASK_FT,
 				       vsel >> 1);
@@ -1244,13 +1270,12 @@ print_insn_mips (bfd_vma memaddr,
 	{
 	  for (op = mips_opcodes; op < &mips_opcodes[NUMOPCODES]; op++)
 	    {
-	      if (op->pinfo == INSN_MACRO
-		  || (no_aliases && (op->pinfo2 & INSN2_ALIAS)))
-		continue;
-	      if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP))
-		{
-		  mips_hash[i] = op;
-		  break;
+		  if (op->pinfo == INSN_MACRO || (no_aliases && (op->pinfo2 & INSN2_ALIAS))) {
+			  continue;
+		  }
+		  if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP)) {
+			  mips_hash[i] = op;
+			  break;
 		}
 	    }
 	}
@@ -1279,39 +1304,39 @@ print_insn_mips (bfd_vma memaddr,
 	      const char *d;
 
 	      /* We always allow to disassemble the jalx instruction.  */
-	      if (! OPCODE_IS_MEMBER (op, mips_isa, mips_processor)
-		  && strcmp (op->name, "jalx"))
-		continue;
+	      if (!OPCODE_IS_MEMBER (op, mips_isa, mips_processor) && strcmp (op->name, "jalx")) {
+		      continue;
+	      }
 
 	      /* Figure out instruction type and branch delay information.  */
 	      if ((op->pinfo & INSN_UNCOND_BRANCH_DELAY) != 0)
 	        {
-		  if ((info->insn_type & INSN_WRITE_GPR_31) != 0)
-		    info->insn_type = dis_jsr;
-		  else
-		    info->insn_type = dis_branch;
-		  info->branch_delay_insns = 1;
+		      if ((info->insn_type & INSN_WRITE_GPR_31) != 0) {
+			      info->insn_type = dis_jsr;
+		      } else {
+			      info->insn_type = dis_branch;
+		      }
+		      info->branch_delay_insns = 1;
 		}
 	      else if ((op->pinfo & (INSN_COND_BRANCH_DELAY
 				     | INSN_COND_BRANCH_LIKELY)) != 0)
 		{
-		  if ((info->insn_type & INSN_WRITE_GPR_31) != 0)
-		    info->insn_type = dis_condjsr;
-		  else
-		    info->insn_type = dis_condbranch;
-		  info->branch_delay_insns = 1;
+			if ((info->insn_type & INSN_WRITE_GPR_31) != 0) {
+				info->insn_type = dis_condjsr;
+			} else {
+				info->insn_type = dis_condbranch;
+			}
+			info->branch_delay_insns = 1;
+		} else if ((op->pinfo & (INSN_STORE_MEMORY | INSN_LOAD_MEMORY_DELAY)) != 0) {
+			info->insn_type = dis_dref;
 		}
-	      else if ((op->pinfo & (INSN_STORE_MEMORY
-				     | INSN_LOAD_MEMORY_DELAY)) != 0)
-		info->insn_type = dis_dref;
 
-	      (*info->fprintf_func) (info->stream, "%s", op->name);
+		(*info->fprintf_func) (info->stream, "%s", op->name);
 
-	      d = op->args;
-	      if (d != NULL && *d != '\0')
-		{
-		  (*info->fprintf_func) (info->stream, " ");
-		  print_insn_args (d, word, memaddr, info, op);
+		d = op->args;
+		if (d != NULL && *d != '\0') {
+			(*info->fprintf_func) (info->stream, " ");
+			print_insn_args (d, word, memaddr, info, op);
 		}
 
 	      return INSNLEN;
@@ -1581,79 +1606,76 @@ print_mips16_insn_arg (char type,
 
 	if (! use_extend)
 	  {
-	    if (signedp && immed >= (1 << (nbits - 1)))
-	      immed -= 1 << nbits;
-	    immed <<= shift;
-	    if ((type == '<' || type == '>' || type == '[' || type == ']')
-		&& immed == 0)
-	      immed = 8;
+		if (signedp && immed >= (1 << (nbits - 1))) {
+			immed -= 1 << nbits;
+		}
+		immed <<= shift;
+		if ((type == '<' || type == '>' || type == '[' || type == ']') && immed == 0) {
+			immed = 8;
+		}
 	  }
 	else
 	  {
-	    if (extbits == 16)
-	      immed |= ((extend & 0x1f) << 11) | (extend & 0x7e0);
-	    else if (extbits == 15)
-	      immed |= ((extend & 0xf) << 11) | (extend & 0x7f0);
-	    else
-	      immed = ((extend >> 6) & 0x1f) | (extend & 0x20);
-	    immed &= (1 << extbits) - 1;
-	    if (! extu && immed >= (1 << (extbits - 1)))
-	      immed -= 1 << extbits;
+		  if (extbits == 16) {
+			  immed |= ((extend & 0x1f) << 11) | (extend & 0x7e0);
+		  } else if (extbits == 15) {
+			  immed |= ((extend & 0xf) << 11) | (extend & 0x7f0);
+		  } else {
+			  immed = ((extend >> 6) & 0x1f) | (extend & 0x20);
+		  }
+		  immed &= (1 << extbits) - 1;
+		  if (!extu && immed >= (1 << (extbits - 1))) {
+			  immed -= 1 << extbits;
+		  }
 	  }
 
-	if (! pcrel)
-	  (*info->fprintf_func) (info->stream, "%d", immed);
-	else
-	  {
-	    bfd_vma baseaddr;
+	  if (!pcrel) {
+		  (*info->fprintf_func) (info->stream, "%d", immed);
+	  } else {
+		  bfd_vma baseaddr;
 
-	    if (branch)
-	      {
-		immed *= 2;
-		baseaddr = memaddr + 2;
-	      }
-	    else if (use_extend)
-	      baseaddr = memaddr - 2;
-	    else
-	      {
-		int status;
-		bfd_byte buffer[2];
+		  if (branch) {
+			  immed *= 2;
+			  baseaddr = memaddr + 2;
+		  } else if (use_extend) {
+			  baseaddr = memaddr - 2;
+		  } else {
+			  int status;
+			  bfd_byte buffer[2];
 
-		baseaddr = memaddr;
+			  baseaddr = memaddr;
 
-		/* If this instruction is in the delay slot of a jr
+			  /* If this instruction is in the delay slot of a jr
                    instruction, the base address is the address of the
                    jr instruction.  If it is in the delay slot of jalr
                    instruction, the base address is the address of the
                    jalr instruction.  This test is unreliable: we have
                    no way of knowing whether the previous word is
                    instruction or data.  */
-		status = (*info->read_memory_func) (memaddr - 4, buffer, 2,
-						    info);
-		if (status == 0
-		    && (((info->endian == BFD_ENDIAN_BIG
-			  ? bfd_getb16 (buffer)
-			  : bfd_getl16 (buffer))
-			 & 0xf800) == 0x1800))
-		  baseaddr = memaddr - 4;
-		else
-		  {
-		    status = (*info->read_memory_func) (memaddr - 2, buffer,
-							2, info);
-		    if (status == 0
-			&& (((info->endian == BFD_ENDIAN_BIG
-			      ? bfd_getb16 (buffer)
-			      : bfd_getl16 (buffer))
-			     & 0xf81f) == 0xe800))
-		      baseaddr = memaddr - 2;
+			  status = (*info->read_memory_func) (memaddr - 4, buffer, 2,
+				  info);
+			  if (status == 0 && (((info->endian == BFD_ENDIAN_BIG
+							       ? bfd_getb16 (buffer)
+							       : bfd_getl16 (buffer)) &
+						      0xf800) == 0x1800)) {
+				  baseaddr = memaddr - 4;
+			  } else {
+				  status = (*info->read_memory_func) (memaddr - 2, buffer,
+					  2, info);
+				  if (status == 0 && (((info->endian == BFD_ENDIAN_BIG
+								       ? bfd_getb16 (buffer)
+								       : bfd_getl16 (buffer)) &
+							      0xf81f) == 0xe800)) {
+					  baseaddr = memaddr - 2;
+				  }
+			  }
 		  }
-	      }
-	    info->target = (baseaddr & ~((1 << shift) - 1)) + immed;
-	    if (pcrel && branch
-		&& info->flavour == bfd_target_unknown_flavour)
-	      /* For gdb disassembler, maintain odd address.  */
-	      info->target |= 1;
-	    (*info->print_address_func) (info->target, info);
+		  info->target = (baseaddr & ~((1 << shift) - 1)) + immed;
+		  if (pcrel && branch && info->flavour == bfd_target_unknown_flavour) {
+			  /* For gdb disassembler, maintain odd address.  */
+			  info->target |= 1;
+		  }
+		  (*info->print_address_func) (info->target, info);
 	  }
       }
       break;
@@ -1662,12 +1684,14 @@ print_mips16_insn_arg (char type,
       {
 	int jalx = l & 0x400;
 
-	if (! use_extend)
-	  extend = 0;
+	if (!use_extend) {
+		extend = 0;
+	}
 	l = ((l & 0x1f) << 23) | ((l & 0x3e0) << 13) | (extend << 2);
-	if (!jalx && info->flavour == bfd_target_unknown_flavour)
-	  /* For gdb disassembler, maintain odd address.  */
-	  l |= 1;
+	if (!jalx && info->flavour == bfd_target_unknown_flavour) {
+		/* For gdb disassembler, maintain odd address.  */
+		l |= 1;
+	}
       }
       info->target = ((memaddr + 4) & ~(bfd_vma) 0x0fffffff) | l;
       (*info->print_address_func) (info->target, info);
@@ -1689,9 +1713,10 @@ print_mips16_insn_arg (char type,
 	if (amask > 0 && amask < 5)
 	  {
 	    (*info->fprintf_func) (info->stream, "%s", mips_gpr_names[4]);
-	    if (amask > 1)
-	      (*info->fprintf_func) (info->stream, "-%s",
-				     mips_gpr_names[amask + 3]);
+	    if (amask > 1) {
+		    (*info->fprintf_func) (info->stream, "-%s",
+			    mips_gpr_names[amask + 3]);
+	    }
 	    need_comma = 1;
 	  }
 
@@ -1707,9 +1732,10 @@ print_mips16_insn_arg (char type,
 	    (*info->fprintf_func) (info->stream, "%s%s",
 				   need_comma ? ", " : "",
 				   mips_gpr_names[16]);
-	    if (smask > 1)
-	      (*info->fprintf_func) (info->stream, "-%s",
-				     mips_gpr_names[smask + 15]);
+	    if (smask > 1) {
+		    (*info->fprintf_func) (info->stream, "-%s",
+			    mips_gpr_names[smask + 15]);
+	    }
 	    need_comma = 1;
 	  }
 
@@ -1725,8 +1751,9 @@ print_mips16_insn_arg (char type,
 	  {
 	    (*info->fprintf_func) (info->stream, "%s$f0",
 				   need_comma ? ", " : "");
-	    if (amask == 6)
-	      (*info->fprintf_func) (info->stream, "-$f1");
+	    if (amask == 6) {
+		    (*info->fprintf_func) (info->stream, "-$f1");
+	    }
 	  }
       }
       break;
@@ -1742,8 +1769,9 @@ print_mips16_insn_arg (char type,
       int i, j;
 
       l = l & 0x7f;
-      if (use_extend)
-        l |= extend << 16;
+      if (use_extend) {
+	      l |= extend << 16;
+      }
 
       amask = (l >> 16) & 0xf;
       if (amask == MIPS16_ALL_ARGS)
@@ -1764,31 +1792,37 @@ print_mips16_insn_arg (char type,
 
       if (args > 0) {
           (*info->fprintf_func) (info->stream, "%s", mips_gpr_names[4]);
-          if (args > 1)
-            (*info->fprintf_func) (info->stream, "-%s",
-                                   mips_gpr_names[4 + args - 1]);
-          need_comma = 1;
+	  if (args > 1) {
+		  (*info->fprintf_func) (info->stream, "-%s",
+			  mips_gpr_names[4 + args - 1]);
+	  }
+	  need_comma = 1;
       }
 
       framesz = (((l >> 16) & 0xf0) | (l & 0x0f)) * 8;
-      if (framesz == 0 && !use_extend)
-        framesz = 128;
+      if (framesz == 0 && !use_extend) {
+	      framesz = 128;
+      }
 
       (*info->fprintf_func) (info->stream, "%s%d", 
                              need_comma ? ", " : "",
                              framesz);
 
-      if (l & 0x40)                   /* $ra */
-        (*info->fprintf_func) (info->stream, ", %s", mips_gpr_names[31]);
+      if (l & 0x40) { /* $ra */
+	      (*info->fprintf_func) (info->stream, ", %s", mips_gpr_names[31]);
+      }
 
       nsreg = (l >> 24) & 0x7;
       smask = 0;
-      if (l & 0x20)                   /* $s0 */
-        smask |= 1 << 0;
-      if (l & 0x10)                   /* $s1 */
-        smask |= 1 << 1;
-      if (nsreg > 0)                  /* $s2-$s8 */
-        smask |= ((1 << nsreg) - 1) << 2;
+      if (l & 0x20) { /* $s0 */
+	      smask |= 1 << 0;
+      }
+      if (l & 0x10) { /* $s1 */
+	      smask |= 1 << 1;
+      }
+      if (nsreg > 0) { /* $s2-$s8 */
+	      smask |= ((1 << nsreg) - 1) << 2;
+      }
 
       /* Find first set static reg bit.  */
       for (i = 0; i < 9; i++)
@@ -1798,22 +1832,25 @@ print_mips16_insn_arg (char type,
               (*info->fprintf_func) (info->stream, ", %s",
                                      mips_gpr_names[i == 8 ? 30 : (16 + i)]);
               /* Skip over string of set bits.  */
-              for (j = i; smask & (2 << j); j++)
-                continue;
-              if (j > i)
-                (*info->fprintf_func) (info->stream, "-%s",
-                                       mips_gpr_names[j == 8 ? 30 : (16 + j)]);
-              i = j + 1;
+	      for (j = i; smask & (2 << j); j++) {
+		      continue;
+	      }
+	      if (j > i) {
+		      (*info->fprintf_func) (info->stream, "-%s",
+			      mips_gpr_names[j == 8 ? 30 : (16 + j)]);
+	      }
+	      i = j + 1;
             }
         }
 
       /* Statics $ax - $a3.  */
-      if (statics == 1)
-        (*info->fprintf_func) (info->stream, ", %s", mips_gpr_names[7]);
-      else if (statics > 0) 
-        (*info->fprintf_func) (info->stream, ", %s-%s", 
-                               mips_gpr_names[7 - statics + 1],
-                               mips_gpr_names[7]);
+	if (statics == 1) {
+		(*info->fprintf_func) (info->stream, ", %s", mips_gpr_names[7]);
+	} else if (statics > 0) {
+		(*info->fprintf_func) (info->stream, ", %s-%s",
+			mips_gpr_names[7 - statics + 1],
+			mips_gpr_names[7]);
+	}
       }
       break;
 
@@ -1858,10 +1895,11 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
 
   length = 2;
 
-  if (info->endian == BFD_ENDIAN_BIG)
-    insn = bfd_getb16 (buffer);
-  else
-    insn = bfd_getl16 (buffer);
+  if (info->endian == BFD_ENDIAN_BIG) {
+	  insn = bfd_getb16 (buffer);
+  } else {
+	  insn = bfd_getl16 (buffer);
+  }
 
   /* Plugin the extend opcode specially.  */
   use_extend = FALSE;
@@ -1881,18 +1919,18 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
 	  return -1;
 	}
 
-      if (info->endian == BFD_ENDIAN_BIG)
-	insn = bfd_getb16 (buffer);
-      else
-	insn = bfd_getl16 (buffer);
+	if (info->endian == BFD_ENDIAN_BIG) {
+		insn = bfd_getb16 (buffer);
+	} else {
+		insn = bfd_getl16 (buffer);
+	}
 
-      /* Check for an extend opcode followed by an extend opcode.  */
-      if ((insn & 0xf800) == 0xf000)
-	{
-	  (*info->fprintf_func) (info->stream, "extend 0x%x",
-				 (unsigned int) extend);
-	  info->insn_type = dis_noninsn;
-	  return length;
+	/* Check for an extend opcode followed by an extend opcode.  */
+	if ((insn & 0xf800) == 0xf000) {
+		(*info->fprintf_func) (info->stream, "extend 0x%x",
+			(unsigned int)extend);
+		info->insn_type = dis_noninsn;
+		return length;
 	}
 
       length += 2;
@@ -1928,17 +1966,19 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
 	      if (status == 0)
 		{
 		  use_extend = TRUE;
-		  if (info->endian == BFD_ENDIAN_BIG)
-		    extend = bfd_getb16 (buffer);
-		  else
-		    extend = bfd_getl16 (buffer);
+		  if (info->endian == BFD_ENDIAN_BIG) {
+			  extend = bfd_getb16 (buffer);
+		  } else {
+			  extend = bfd_getl16 (buffer);
+		  }
 		  length += 2;
 		}
 	    }
 
 	  (*info->fprintf_func) (info->stream, "%s", op->name);
-	  if (op->args[0] != '\0')
-	    (*info->fprintf_func) (info->stream, " ");
+	  if (op->args[0] != '\0') {
+		  (*info->fprintf_func) (info->stream, " ");
+	  }
 
 	  for (s = op->args; *s != '\0'; s++)
 	    {
@@ -1967,20 +2007,22 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
 	  if ((op->pinfo & INSN_UNCOND_BRANCH_DELAY) != 0)
 	    {
 	      info->branch_delay_insns = 1;
-	      if (info->insn_type != dis_jsr)
-		info->insn_type = dis_branch;
+	      if (info->insn_type != dis_jsr) {
+		      info->insn_type = dis_branch;
+	      }
 	    }
 
 	  return length;
 	}
     }
 
-  if (use_extend)
-    (*info->fprintf_func) (info->stream, "0x%x", extend | 0xf000);
-  (*info->fprintf_func) (info->stream, "0x%x", insn);
-  info->insn_type = dis_noninsn;
+    if (use_extend) {
+	    (*info->fprintf_func) (info->stream, "0x%x", extend | 0xf000);
+    }
+    (*info->fprintf_func) (info->stream, "0x%x", insn);
+    info->insn_type = dis_noninsn;
 
-  return length;
+    return length;
 }
 
 /* In an environment where we do not know the symbol type of the
@@ -2003,17 +2045,15 @@ _print_insn_mips (bfd_vma memaddr,
 #if 1
   /* FIXME: If odd address, this is CLEARLY a mips 16 instruction.  */
   /* Only a few tools will work this way.  */
-  if (memaddr & 0x01)
-    return print_insn_mips16 (memaddr, info);
+  if (memaddr & 0x01) {
+	  return print_insn_mips16 (memaddr, info);
+  }
 #endif
 
 #if SYMTAB_AVAILABLE
-  if (info->mach == bfd_mach_mips16
-      || (info->flavour == bfd_target_elf_flavour
-	  && info->symbols != NULL
-	  && ((*(elf_symbol_type **) info->symbols)->internal_elf_sym.st_other
-	      == STO_MIPS16)))
-    return print_insn_mips16 (memaddr, info);
+  if (info->mach == bfd_mach_mips16 || (info->flavour == bfd_target_elf_flavour && info->symbols != NULL && ((*(elf_symbol_type **)info->symbols)->internal_elf_sym.st_other == STO_MIPS16))) {
+	  return print_insn_mips16 (memaddr, info);
+  }
 #endif
 
   status = (*info->read_memory_func) (memaddr, buffer, INSNLEN, info);
@@ -2021,10 +2061,11 @@ _print_insn_mips (bfd_vma memaddr,
     {
       unsigned long insn;
 
-      if (endianness == BFD_ENDIAN_BIG)
-	insn = (unsigned long) bfd_getb32 (buffer);
-      else
-	insn = (unsigned long) bfd_getl32 (buffer);
+      if (endianness == BFD_ENDIAN_BIG) {
+	      insn = (unsigned long)bfd_getb32 (buffer);
+      } else {
+	      insn = (unsigned long)bfd_getl32 (buffer);
+      }
 
       return print_insn_mips (memaddr, insn, info);
     }
@@ -2085,16 +2126,19 @@ with the -M switch (multiple options should be separated by commas):\n"));
   fprintf (stream, _("\n\
   For the options above, the following values are supported for \"ABI\":\n\
    "));
-  for (i = 0; i < ARRAY_SIZE (mips_abi_choices); i++)
-    fprintf (stream, " %s", mips_abi_choices[i].name);
+  for (i = 0; i < ARRAY_SIZE (mips_abi_choices); i++) {
+	  fprintf (stream, " %s", mips_abi_choices[i].name);
+  }
   fprintf (stream, _("\n"));
 
   fprintf (stream, _("\n\
   For the options above, The following values are supported for \"ARCH\":\n\
    "));
-  for (i = 0; i < ARRAY_SIZE (mips_arch_choices); i++)
-    if (*mips_arch_choices[i].name != '\0')
-      fprintf (stream, " %s", mips_arch_choices[i].name);
+  for (i = 0; i < ARRAY_SIZE (mips_arch_choices); i++) {
+	  if (*mips_arch_choices[i].name != '\0') {
+		  fprintf (stream, " %s", mips_arch_choices[i].name);
+	  }
+  }
   fprintf (stream, _("\n"));
 
   fprintf (stream, _("\n"));
diff --git a/libr/asm/arch/mips/mipsasm.c b/libr/asm/arch/mips/mipsasm.c
index c89d87d8db..369f81063a 100644
--- a/libr/asm/arch/mips/mipsasm.c
+++ b/libr/asm/arch/mips/mipsasm.c
@@ -158,72 +158,79 @@ R_IPI int mips_assemble(const char *str, ut64 pc, ut8 *out) {
 	*out = 0;
 	*w0=*w1=*w2=*w3=0;
 	sscanf (s, "%31s", w0);
-	if (*w0)
-	for (i=0; ops[i].name; i++) {
-		if (!strcmp (ops[i].name, w0)) {
-			switch (ops[i].args) {
-			case 3: sscanf (s, "%31s %31s %31s %31s", w0, w1, w2, w3); break;
-			case -3: sscanf (s, "%31s %31s %31s %31s", w0, w1, w2, w3); break;
-			case 2: sscanf (s, "%31s %31s %31s", w0, w1, w2); break;
-			case -2:sscanf (s, "%31s %31s %31s", w0, w1, w2); break;
-			case 1: sscanf (s, "%31s %31s", w0, w1); break;
-			case -1: sscanf (s, "%31s %31s", w0, w1); break;
-			case 0: sscanf (s, "%31s", w0); break;
-			}
-			if (hasp) {
-				char tmp[32];
-				strcpy (tmp, w2);
-				strcpy (w2, w3);
-				strcpy (w3, tmp);
-			}
-			switch (ops[i].type) {
-			case 'R'://reg order diff per instruction 'group' - ordered to number of likelyhood to call (add > mfhi)
+	if (*w0) {
+		for (i = 0; ops[i].name; i++) {
+			if (!strcmp (ops[i].name, w0)) {
 				switch (ops[i].args) {
-				case 3: return mips_r (out, 0, getreg (w2), getreg (w3), getreg (w1), 0, ops[i].n); break;
-				case -3:
-					if(ops[i].n > -1) {
-						return mips_r (out, 0, 0, getreg (w2), getreg (w1), getreg (w3), ops[i].n); break;
-					}
-					else {
-						return mips_r (out, 0, getreg (w3), getreg (w2), getreg (w1), 0, (-1 * ops[i].n) ); break;
-					}
-				case 2: return mips_r (out, 0, getreg (w1), getreg (w2), 0, 0, ops[i].n); break;
-				case 1: return mips_r (out, 0, getreg (w1), 0, 0, 0, ops[i].n);
-				case -2: return mips_r (out, 0, getreg (w2), 0, getreg (w1), 0, ops[i].n); break;
-				case -1: return mips_r (out, 0, 0, 0, getreg (w1), 0, ops[i].n);
-				case 0: return mips_r (out, 0, 0, 0, 0, 0, ops[i].n);
+				case 3: sscanf (s, "%31s %31s %31s %31s", w0, w1, w2, w3); break;
+				case -3: sscanf (s, "%31s %31s %31s %31s", w0, w1, w2, w3); break;
+				case 2: sscanf (s, "%31s %31s %31s", w0, w1, w2); break;
+				case -2: sscanf (s, "%31s %31s %31s", w0, w1, w2); break;
+				case 1: sscanf (s, "%31s %31s", w0, w1); break;
+				case -1: sscanf (s, "%31s %31s", w0, w1); break;
+				case 0: sscanf (s, "%31s", w0); break;
 				}
-				break;
-			case 'I':
-			case 'B':
-				is_branch = ops[i].type == 'B';
-				switch (ops[i].args) {
-				case 2: return mips_i (out, ops[i].n, 0, getreg (w1), getreg (w2), is_branch); break;
-				case 3: return mips_i (out, ops[i].n, getreg (w2), getreg (w1), getreg (w3), is_branch); break;
-				case -2:
-					if (ops[i].n > 0) {
-						return mips_i (out, ops[i].n, getreg (w1), 0, getreg (w2), is_branch); break;
-					} else {
-						return mips_i (out, (-1 * ops[i].n), getreg (w1), ops[i].x, getreg (w2), is_branch); break;
+				if (hasp) {
+					char tmp[32];
+					strcpy (tmp, w2);
+					strcpy (w2, w3);
+					strcpy (w3, tmp);
+				}
+				switch (ops[i].type) {
+				case 'R': //reg order diff per instruction 'group' - ordered to number of likelyhood to call (add > mfhi)
+					switch (ops[i].args) {
+					case 3: return mips_r (out, 0, getreg (w2), getreg (w3), getreg (w1), 0, ops[i].n); break;
+					case -3:
+						if (ops[i].n > -1) {
+							return mips_r (out, 0, 0, getreg (w2), getreg (w1), getreg (w3), ops[i].n);
+							break;
+						} else {
+							return mips_r (out, 0, getreg (w3), getreg (w2), getreg (w1), 0, (-1 * ops[i].n));
+							break;
+						}
+					case 2: return mips_r (out, 0, getreg (w1), getreg (w2), 0, 0, ops[i].n); break;
+					case 1: return mips_r (out, 0, getreg (w1), 0, 0, 0, ops[i].n);
+					case -2: return mips_r (out, 0, getreg (w2), 0, getreg (w1), 0, ops[i].n); break;
+					case -1: return mips_r (out, 0, 0, 0, getreg (w1), 0, ops[i].n);
+					case 0: return mips_r (out, 0, 0, 0, 0, 0, ops[i].n);
 					}
+					break;
+				case 'I':
+				case 'B':
+					is_branch = ops[i].type == 'B';
+					switch (ops[i].args) {
+					case 2: return mips_i (out, ops[i].n, 0, getreg (w1), getreg (w2), is_branch); break;
+					case 3: return mips_i (out, ops[i].n, getreg (w2), getreg (w1), getreg (w3), is_branch); break;
+					case -2:
+						if (ops[i].n > 0) {
+							return mips_i (out, ops[i].n, getreg (w1), 0, getreg (w2), is_branch);
+							break;
+						} else {
+							return mips_i (out, (-1 * ops[i].n), getreg (w1), ops[i].x, getreg (w2), is_branch);
+							break;
+						}
 
-				case -1: if (ops[i].n > 0) {
-						return mips_i (out, ops[i].n, 0, 0, getreg (w1), is_branch); break;
-					} else {
-						return mips_i (out, (-1 * ops[i].n), 0, ops[i].x, getreg (w1), is_branch); break;
+					case -1:
+						if (ops[i].n > 0) {
+							return mips_i (out, ops[i].n, 0, 0, getreg (w1), is_branch);
+							break;
+						} else {
+							return mips_i (out, (-1 * ops[i].n), 0, ops[i].x, getreg (w1), is_branch);
+							break;
+						}
 					}
+					break;
+				case 'J':
+					switch (ops[i].args) {
+					case 1: return mips_j (out, ops[i].n, getreg (w1)); break;
+					}
+					break;
+				case 'N': // nop
+					memset (out, 0, 4);
+					return 4;
 				}
-				break;
-			case 'J':
-				switch (ops[i].args) {
-				case 1: return mips_j (out, ops[i].n, getreg (w1)); break;
-				}
-				break;
-			case 'N': // nop
-				memset (out, 0, 4);
-				return 4;
+				return -1;
 			}
-			return -1;
 		}
 	}
 	free (s);
diff --git a/libr/asm/arch/msp430/msp430_disas.c b/libr/asm/arch/msp430/msp430_disas.c
index a15a0f2ef4..f734bc9d79 100644
--- a/libr/asm/arch/msp430/msp430_disas.c
+++ b/libr/asm/arch/msp430/msp430_disas.c
@@ -77,8 +77,11 @@ static void remove_first_operand(struct msp430_cmd *cmd)
 
 static void remove_second_operand(struct msp430_cmd *cmd)
 {
-	if (strchr(cmd->operands, ','))
-		*strchr(cmd->operands, ',') = '\0';
+	if (strchr (cmd->operands, ',')) {
+		{
+			*strchr (cmd->operands, ',') = '\0';
+		}
+	}
 }
 
 /* TODO: This is ugly as hell */
diff --git a/libr/asm/arch/nios/gnu/nios2-dis.c b/libr/asm/arch/nios/gnu/nios2-dis.c
index e22f862844..7bc597fd19 100644
--- a/libr/asm/arch/nios/gnu/nios2-dis.c
+++ b/libr/asm/arch/nios/gnu/nios2-dis.c
@@ -59,41 +59,39 @@ nios2_init_opcode_hash (void)
   unsigned int i;
   register const struct nios2_opcode *op;
 
-  for (i = 0; i <= OP_MASK_OP; ++i)
-    nios2_hash[0] = NULL;
-  for (i = 0; i <= OP_MASK_OP; i++)
-    for (op = nios2_opcodes; op < &nios2_opcodes[NUMOPCODES]; op++)
-      {
-	nios2_opcode_hash *new_hash;
-	nios2_opcode_hash **bucket = NULL;
+  for (i = 0; i <= OP_MASK_OP; ++i) {
+	  nios2_hash[0] = NULL;
+  }
+  for (i = 0; i <= OP_MASK_OP; i++) {
+	  for (op = nios2_opcodes; op < &nios2_opcodes[NUMOPCODES]; op++) {
+		  nios2_opcode_hash *new_hash;
+		  nios2_opcode_hash **bucket = NULL;
 
-	if ((op->pinfo & NIOS2_INSN_MACRO) == NIOS2_INSN_MACRO)
-	  {
-	    if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP)
-		&& (op->pinfo & (NIOS2_INSN_MACRO_MOV | NIOS2_INSN_MACRO_MOVI)
-		    & 0x7fffffff))
-	      bucket = &(nios2_ps_hash[i]);
-	  }
-	else if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP))
-	  bucket = &(nios2_hash[i]);
+		  if ((op->pinfo & NIOS2_INSN_MACRO) == NIOS2_INSN_MACRO) {
+			  if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP) && (op->pinfo & (NIOS2_INSN_MACRO_MOV | NIOS2_INSN_MACRO_MOVI) & 0x7fffffff)) {
+				  bucket = &(nios2_ps_hash[i]);
+			  }
+		  } else if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP)) {
+			  bucket = &(nios2_hash[i]);
+		  }
 
-	if (bucket)
-	  {
-	    new_hash =
-	      (nios2_opcode_hash *) malloc (sizeof (nios2_opcode_hash));
-	    if (!new_hash)
-	      {
-		fprintf (stderr,
-			 "error allocating memory...broken disassembler\n");
-		abort ();
-	      }
-	    new_hash->opcode = op;
-	    new_hash->next = NULL;
-	    while (*bucket)
-	      bucket = &((*bucket)->next);
-	    *bucket = new_hash;
+		  if (bucket) {
+			  new_hash =
+				  (nios2_opcode_hash *)malloc (sizeof (nios2_opcode_hash));
+			  if (!new_hash) {
+				  fprintf (stderr,
+					  "error allocating memory...broken disassembler\n");
+				  abort ();
+			  }
+			  new_hash->opcode = op;
+			  new_hash->next = NULL;
+			  while (*bucket) {
+				  bucket = &((*bucket)->next);
+			  }
+			  *bucket = new_hash;
+		  }
 	  }
-      }
+  }
   nios2_hash_init = 1;
 #ifdef DEBUG_HASHTABLE
   for (i = 0; i <= OP_MASK_OP; ++i)
@@ -130,20 +128,25 @@ nios2_find_opcode_hash (unsigned long opcode)
   nios2_opcode_hash *entry;
 
   /* Build a hash table to shorten the search time.  */
-  if (!nios2_hash_init)
-    nios2_init_opcode_hash ();
+  if (!nios2_hash_init) {
+	  nios2_init_opcode_hash ();
+  }
 
   /* First look in the pseudo-op hashtable.  */
   for (entry = nios2_ps_hash[(opcode >> OP_SH_OP) & OP_MASK_OP];
-       entry; entry = entry->next)
-    if (entry->opcode->match == (opcode & entry->opcode->mask))
-      return entry->opcode;
+	  entry; entry = entry->next) {
+	  if (entry->opcode->match == (opcode & entry->opcode->mask)) {
+		  return entry->opcode;
+	  }
+  }
 
   /* Otherwise look in the main hashtable.  */
   for (entry = nios2_hash[(opcode >> OP_SH_OP) & OP_MASK_OP];
-       entry; entry = entry->next)
-    if (entry->opcode->match == (opcode & entry->opcode->mask))
-      return entry->opcode;
+	  entry; entry = entry->next) {
+	  if (entry->opcode->match == (opcode & entry->opcode->mask)) {
+		  return entry->opcode;
+	  }
+  }
 
   return NULL;
 }
@@ -161,12 +164,12 @@ nios2_coprocessor_regs (void)
   if (!cached)
     {
       int i;
-      for (i = NUMREGNAMES; i < nios2_num_regs; i++)
-	if (!strcmp (nios2_regs[i].name, "c0"))
-	  {
-	    cached = nios2_regs + i;
-	    break;
-	  }
+      for (i = NUMREGNAMES; i < nios2_num_regs; i++) {
+	      if (!strcmp (nios2_regs[i].name, "c0")) {
+		      cached = nios2_regs + i;
+		      break;
+	      }
+      }
       assert (cached);
     }
   return cached;
@@ -181,12 +184,12 @@ nios2_control_regs (void)
   if (!cached)
     {
       int i;
-      for (i = NUMREGNAMES; i < nios2_num_regs; i++)
-	if (!strcmp (nios2_regs[i].name, "status"))
-	  {
-	    cached = nios2_regs + i;
-	    break;
-	  }
+      for (i = NUMREGNAMES; i < nios2_num_regs; i++) {
+	      if (!strcmp (nios2_regs[i].name, "status")) {
+		      cached = nios2_regs + i;
+		      break;
+	      }
+      }
       assert (cached);
     }
   return cached;
@@ -213,44 +216,47 @@ nios2_print_insn_arg (const char *argptr,
     case 'd':
       i = GET_INSN_FIELD (RRD, opcode);
 
-      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM
-	  && GET_INSN_FIELD (CUSTOM_C, opcode) == 0)
-	reg_base = nios2_coprocessor_regs ();
-      else
-	reg_base = nios2_regs;
+      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM && GET_INSN_FIELD (CUSTOM_C, opcode) == 0) {
+	      reg_base = nios2_coprocessor_regs ();
+      } else {
+	      reg_base = nios2_regs;
+      }
 
-      if (i < NUMREGNAMES)
-	(*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
-      else
-	(*info->fprintf_func) (info->stream, "unknown");
+      if (i < NUMREGNAMES) {
+	      (*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
+      } else {
+	      (*info->fprintf_func) (info->stream, "unknown");
+      }
       break;
     case 's':
       i = GET_INSN_FIELD (RRS, opcode);
 
-      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM
-	  && GET_INSN_FIELD (CUSTOM_A, opcode) == 0)
-	reg_base = nios2_coprocessor_regs ();
-      else
-	reg_base = nios2_regs;
+      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM && GET_INSN_FIELD (CUSTOM_A, opcode) == 0) {
+	      reg_base = nios2_coprocessor_regs ();
+      } else {
+	      reg_base = nios2_regs;
+      }
 
-      if (i < NUMREGNAMES)
-	(*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
-      else
-	(*info->fprintf_func) (info->stream, "unknown");
+      if (i < NUMREGNAMES) {
+	      (*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
+      } else {
+	      (*info->fprintf_func) (info->stream, "unknown");
+      }
       break;
     case 't':
       i = GET_INSN_FIELD (RRT, opcode);
 
-      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM
-	  && GET_INSN_FIELD (CUSTOM_B, opcode) == 0)
-	reg_base = nios2_coprocessor_regs ();
-      else
-	reg_base = nios2_regs;
+      if (GET_INSN_FIELD (OP, opcode) == OP_MATCH_CUSTOM && GET_INSN_FIELD (CUSTOM_B, opcode) == 0) {
+	      reg_base = nios2_coprocessor_regs ();
+      } else {
+	      reg_base = nios2_regs;
+      }
 
-      if (i < NUMREGNAMES)
-	(*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
-      else
-	(*info->fprintf_func) (info->stream, "unknown");
+      if (i < NUMREGNAMES) {
+	      (*info->fprintf_func) (info->stream, "%s", reg_base[i].name);
+      } else {
+	      (*info->fprintf_func) (info->stream, "unknown");
+      }
       break;
     case 'i':
       /* 16-bit signed immediate.  */
@@ -344,12 +350,12 @@ nios2_disassemble (bfd_vma address, unsigned long opcode,
 	    {
 	      (*info->fprintf_func) (info->stream, "nop");
 	      is_nop = TRUE;
-	    }
-	  else
-	    (*info->fprintf_func) (info->stream, "%s", op->name);
-	}
-      else
-	(*info->fprintf_func) (info->stream, "%s", op->name);
+	  } else {
+		  (*info->fprintf_func) (info->stream, "%s", op->name);
+	  }
+      } else {
+	      (*info->fprintf_func) (info->stream, "%s", op->name);
+      }
 
       if (!is_nop)
 	{
@@ -395,10 +401,11 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info,
   if (status == 0)
     {
       unsigned long insn;
-      if (endianness == BFD_ENDIAN_BIG)
-	insn = (unsigned long) bfd_getb32 (buffer);
-      else
-	insn = (unsigned long) bfd_getl32 (buffer);
+      if (endianness == BFD_ENDIAN_BIG) {
+	      insn = (unsigned long)bfd_getb32 (buffer);
+      } else {
+	      insn = (unsigned long)bfd_getl32 (buffer);
+      }
       status = nios2_disassemble (address, insn, info);
     }
   else
diff --git a/libr/asm/arch/pic/pic_pic18.c b/libr/asm/arch/pic/pic_pic18.c
index 74f041e96b..daf3a82887 100644
--- a/libr/asm/arch/pic/pic_pic18.c
+++ b/libr/asm/arch/pic/pic_pic18.c
@@ -121,7 +121,9 @@ int pic_pic18_disassemble(RAsmOp *op, char *opbuf, const ut8 *b, int blen) {
 	const char *buf_asm = "invalid";
 	strcpy (opbuf, buf_asm);
 
-	for (i = 0;ops[i].opmin != (ops[i].opmin & instr) || ops[i].opmax != (ops[i].opmax | instr); i++);
+	for (i = 0; ops[i].opmin != (ops[i].opmin & instr) || ops[i].opmax != (ops[i].opmax | instr); i++) {
+		;
+	}
 	if (ops[i].opmin == 0 && ops[i].opmax == 0xffff) {
 		strcpy (opbuf, ops[i].name);
 		op->size = 2;
diff --git a/libr/asm/arch/ppc/gnu/ppc-dis.c b/libr/asm/arch/ppc/gnu/ppc-dis.c
index 3836405a14..51697fe10a 100644
--- a/libr/asm/arch/ppc/gnu/ppc-dis.c
+++ b/libr/asm/arch/ppc/gnu/ppc-dis.c
@@ -76,83 +76,67 @@ powerpc_init_dialect (struct disassemble_info *info)
   ppc_cpu_t dialect = PPC_OPCODE_PPC;
   struct dis_private *priv = calloc (sizeof (*priv), 1);
 
-  if (priv == NULL)
-    return FALSE;
+  if (priv == NULL) {
+	  return FALSE;
+  }
 
-  if (BFD_DEFAULT_TARGET_SIZE == 64)
-    dialect |= PPC_OPCODE_64;
+  if (BFD_DEFAULT_TARGET_SIZE == 64) {
+	  dialect |= PPC_OPCODE_64;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "ppcps") != NULL)
-    dialect |= PPC_OPCODE_PPCPS;
-  else if (info->disassembler_options
-      && strstr (info->disassembler_options, "booke") != NULL)
-    dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_BOOKE64;
-  else if ((info->mach == bfd_mach_ppc_e500mc)
-	   || (info->disassembler_options
-	       && strstr (info->disassembler_options, "e500mc") != NULL))
-    dialect |= (PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK
-		| PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
-  else if ((info->mach == bfd_mach_ppc_e500)
-	   || (info->disassembler_options
-	       && strstr (info->disassembler_options, "e500") != NULL))
-    dialect |= (PPC_OPCODE_BOOKE
-		| PPC_OPCODE_SPE | PPC_OPCODE_ISEL
-		| PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK
-		| PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
-  else if (info->disassembler_options
-	   && strstr (info->disassembler_options, "efs") != NULL)
-    dialect |= PPC_OPCODE_EFS;
-  else if (info->disassembler_options
-	   && strstr (info->disassembler_options, "e300") != NULL)
-    dialect |= PPC_OPCODE_E300 | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON;
-  else if (info->disassembler_options
-	   && (strstr (info->disassembler_options, "440") != NULL
-	       || strstr (info->disassembler_options, "464") != NULL))
-    dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_32
-      | PPC_OPCODE_440 | PPC_OPCODE_ISEL | PPC_OPCODE_RFMCI;
-  else
-    dialect |= (PPC_OPCODE_403 | PPC_OPCODE_601 | PPC_OPCODE_CLASSIC
-		| PPC_OPCODE_COMMON | PPC_OPCODE_ALTIVEC);
+  if (info->disassembler_options && strstr (info->disassembler_options, "ppcps") != NULL) {
+	  dialect |= PPC_OPCODE_PPCPS;
+  } else if (info->disassembler_options && strstr (info->disassembler_options, "booke") != NULL) {
+	  dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_BOOKE64;
+  } else if ((info->mach == bfd_mach_ppc_e500mc) || (info->disassembler_options && strstr (info->disassembler_options, "e500mc") != NULL)) {
+	  dialect |= (PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
+  } else if ((info->mach == bfd_mach_ppc_e500) || (info->disassembler_options && strstr (info->disassembler_options, "e500") != NULL)) {
+	  dialect |= (PPC_OPCODE_BOOKE | PPC_OPCODE_SPE | PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
+  } else if (info->disassembler_options && strstr (info->disassembler_options, "efs") != NULL) {
+	  dialect |= PPC_OPCODE_EFS;
+  } else if (info->disassembler_options && strstr (info->disassembler_options, "e300") != NULL) {
+	  dialect |= PPC_OPCODE_E300 | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON;
+  } else if (info->disassembler_options && (strstr (info->disassembler_options, "440") != NULL || strstr (info->disassembler_options, "464") != NULL)) {
+	  dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_32 | PPC_OPCODE_440 | PPC_OPCODE_ISEL | PPC_OPCODE_RFMCI;
+  } else {
+	  dialect |= (PPC_OPCODE_403 | PPC_OPCODE_601 | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON | PPC_OPCODE_ALTIVEC);
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "power4") != NULL)
-    dialect |= PPC_OPCODE_POWER4;
+  if (info->disassembler_options && strstr (info->disassembler_options, "power4") != NULL) {
+	  dialect |= PPC_OPCODE_POWER4;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "power5") != NULL)
-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5;
+  if (info->disassembler_options && strstr (info->disassembler_options, "power5") != NULL) {
+	  dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "cell") != NULL)
-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;
+  if (info->disassembler_options && strstr (info->disassembler_options, "cell") != NULL) {
+	  dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "power6") != NULL)
-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
-	       | PPC_OPCODE_ALTIVEC;
+  if (info->disassembler_options && strstr (info->disassembler_options, "power6") != NULL) {
+	  dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "power7") != NULL)
-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
-	       | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX;
+  if (info->disassembler_options && strstr (info->disassembler_options, "power7") != NULL) {
+	  dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "vsx") != NULL)
-    dialect |= PPC_OPCODE_VSX;
+  if (info->disassembler_options && strstr (info->disassembler_options, "vsx") != NULL) {
+	  dialect |= PPC_OPCODE_VSX;
+  }
 
-  if (info->disassembler_options
-      && strstr (info->disassembler_options, "any") != NULL)
-    dialect |= PPC_OPCODE_ANY;
+  if (info->disassembler_options && strstr (info->disassembler_options, "any") != NULL) {
+	  dialect |= PPC_OPCODE_ANY;
+  }
 
   if (info->disassembler_options)
     {
-      if (strstr (info->disassembler_options, "32") != NULL)
-	dialect &= ~PPC_OPCODE_64;
-      else if (strstr (info->disassembler_options, "64") != NULL)
-	dialect |= PPC_OPCODE_64;
+	  if (strstr (info->disassembler_options, "32") != NULL) {
+		  dialect &= ~PPC_OPCODE_64;
+	  } else if (strstr (info->disassembler_options, "64") != NULL) {
+		  dialect |= PPC_OPCODE_64;
+	  }
     }
 
   info->private_data = priv;
@@ -166,9 +150,10 @@ powerpc_init_dialect (struct disassemble_info *info)
 int
 print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
-  if (info->private_data == NULL && !powerpc_init_dialect (info))
-    return -1;
-  return print_insn_powerpc (memaddr, info, 1, POWERPC_DIALECT(info));
+	if (info->private_data == NULL && !powerpc_init_dialect (info)) {
+		return -1;
+	}
+	return print_insn_powerpc (memaddr, info, 1, POWERPC_DIALECT (info));
 }
 
 /* Print a little endian PowerPC instruction.  */
@@ -176,9 +161,10 @@ print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 int
 print_insn_little_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
-  if (info->private_data == NULL && !powerpc_init_dialect (info))
-    return -1;
-  return print_insn_powerpc (memaddr, info, 0, POWERPC_DIALECT(info));
+	if (info->private_data == NULL && !powerpc_init_dialect (info)) {
+		return -1;
+	}
+	return print_insn_powerpc (memaddr, info, 0, POWERPC_DIALECT (info));
 }
 
 /* Print a POWER (RS/6000) instruction.  */
@@ -198,22 +184,20 @@ operand_value_powerpc (const struct powerpc_operand *operand,
   long value;
   int invalid;
   /* Extract the value from the instruction.  */
-  if (operand->extract)
-    value = (*operand->extract) (insn, dialect, &invalid);
-  else
-    {
-      value = (insn >> operand->shift) & operand->bitm;
-      if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
-	{
-	  /* BITM is always some number of zeros followed by some
+  if (operand->extract) {
+	  value = (*operand->extract) (insn, dialect, &invalid);
+  } else {
+	  value = (insn >> operand->shift) & operand->bitm;
+	  if ((operand->flags & PPC_OPERAND_SIGNED) != 0) {
+		  /* BITM is always some number of zeros followed by some
 	     number of ones, followed by some numer of zeros.  */
-	  unsigned long top = operand->bitm;
-	  /* top & -top gives the rightmost 1 bit, so this
+		  unsigned long top = operand->bitm;
+		  /* top & -top gives the rightmost 1 bit, so this
 	     fills in any trailing zeros.  */
-	  top |= (top & -top) - 1;
-	  top &= ~(top >> 1);
-	  value = (value ^ top) - top;
-	}
+		  top |= (top & -top) - 1;
+		  top &= ~(top >> 1);
+		  value = (value ^ top) - top;
+	  }
     }
 
   return value;
@@ -230,10 +214,9 @@ skip_optional_operands (const unsigned char *opindex,
   for (; *opindex != 0; opindex++)
     {
       operand = &powerpc_operands[*opindex];
-      if ((operand->flags & PPC_OPERAND_NEXT) != 0
-	  || ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
-	      && operand_value_powerpc (operand, insn, dialect) != 0))
-	return 0;
+      if ((operand->flags & PPC_OPERAND_NEXT) != 0 || ((operand->flags & PPC_OPERAND_OPTIONAL) != 0 && operand_value_powerpc (operand, insn, dialect) != 0)) {
+	      return 0;
+      }
     }
 
   return 1;
@@ -261,17 +244,18 @@ print_insn_powerpc (bfd_vma memaddr,
       return -1;
     }
 
-  if (bigendian)
-    insn = __bfd_getb32 (buffer);
-  else
-    insn = __bfd_getl32 (buffer);
+    if (bigendian) {
+	    insn = __bfd_getb32 (buffer);
+    } else {
+	    insn = __bfd_getl32 (buffer);
+    }
 
-  /* Get the major opcode of the instruction.  */
-  op = PPC_OP (insn);
+    /* Get the major opcode of the instruction.  */
+    op = PPC_OP (insn);
 
-  /* Find the first match in the opcode table.  We could speed this up
+    /* Find the first match in the opcode table.  We could speed this up
      a bit by doing a binary search on the major opcode.  */
-  opcode_end = powerpc_opcodes + powerpc_num_opcodes;
+    opcode_end = powerpc_opcodes + powerpc_num_opcodes;
  again:
   for (opcode = powerpc_opcodes; opcode < opcode_end; opcode++)
     {
@@ -284,14 +268,16 @@ print_insn_powerpc (bfd_vma memaddr,
       int skip_optional;
 
       table_op = PPC_OP (opcode->opcode);
-      if (op < table_op)
-	break;
-      if (op > table_op)
-	continue;
+      if (op < table_op) {
+	      break;
+      }
+      if (op > table_op) {
+	      continue;
+      }
 
-      if ((insn & opcode->mask) != opcode->opcode
-	  || (opcode->flags & dialect) == 0)
-	continue;
+      if ((insn & opcode->mask) != opcode->opcode || (opcode->flags & dialect) == 0) {
+	      continue;
+      }
 
       /* Make two passes over the operands.  First see if any of them
 	 have extraction functions, and, if they do, make sure the
@@ -300,107 +286,105 @@ print_insn_powerpc (bfd_vma memaddr,
       for (opindex = opcode->operands; *opindex != 0; opindex++)
 	{
 	  operand = powerpc_operands + *opindex;
-	  if (operand->extract)
-	    (*operand->extract) (insn, dialect, &invalid);
+	  if (operand->extract) {
+		  (*operand->extract) (insn, dialect, &invalid);
+	  }
+	}
+	if (invalid) {
+		continue;
 	}
-      if (invalid)
-	continue;
 
-      /* The instruction is valid.  */
-      if (opcode->operands[0] != 0)
-	(*info->fprintf_func) (info->stream, "%s ", opcode->name);
-      else
-	(*info->fprintf_func) (info->stream, "%s", opcode->name);
+	/* The instruction is valid.  */
+	if (opcode->operands[0] != 0) {
+		(*info->fprintf_func) (info->stream, "%s ", opcode->name);
+	} else {
+		(*info->fprintf_func) (info->stream, "%s", opcode->name);
+	}
 
-      /* Now extract and print the operands.  */
-      need_comma = 0;
-      need_paren = 0;
-      skip_optional = -1;
-      for (opindex = opcode->operands; *opindex != 0; opindex++)
-	{
-	  long value;
+	/* Now extract and print the operands.  */
+	need_comma = 0;
+	need_paren = 0;
+	skip_optional = -1;
+	for (opindex = opcode->operands; *opindex != 0; opindex++) {
+		long value;
 
-	  operand = powerpc_operands + *opindex;
+		operand = powerpc_operands + *opindex;
 
-	  /* Operands that are marked FAKE are simply ignored.  We
+		/* Operands that are marked FAKE are simply ignored.  We
 	     already made sure that the extract function considered
 	     the instruction to be valid.  */
-	  if ((operand->flags & PPC_OPERAND_FAKE) != 0)
-	    continue;
-
-	  /* If all of the optional operands have the value zero,
-	     then don't print any of them.  */
-	  if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0)
-	    {
-	      if (skip_optional < 0)
-		skip_optional = skip_optional_operands (opindex, insn,
-							dialect);
-	      if (skip_optional)
-		continue;
-	    }
-
-	  value = operand_value_powerpc (operand, insn, dialect);
-
-	  if (need_comma)
-	    {
-	      (*info->fprintf_func) (info->stream, ", ");
-	      need_comma = 0;
-	    }
-
-	  /* Print the operand as directed by the flags.  */
-	  if ((operand->flags & PPC_OPERAND_GPR) != 0
-	      || ((operand->flags & PPC_OPERAND_GPR_0) != 0 && value != 0))
-	    (*info->fprintf_func) (info->stream, "r%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_FPR) != 0)
-	    (*info->fprintf_func) (info->stream, "f%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_VR) != 0)
-	    (*info->fprintf_func) (info->stream, "v%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_VSR) != 0)
-	    (*info->fprintf_func) (info->stream, "vs%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0)
-	    (*info->print_address_func) (memaddr + value, info);
-	  else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0)
-	    (*info->print_address_func) ((bfd_vma) value & 0xffffffff, info);
-	  else if ((operand->flags & PPC_OPERAND_CR) == 0
-		   || (dialect & PPC_OPCODE_PPC) == 0)
-	    (*info->fprintf_func) (info->stream, "%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_FSL) != 0) 
-	    (*info->fprintf_func) (info->stream, "fsl%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_FCR) != 0)
-	    (*info->fprintf_func) (info->stream, "fcr%ld", value);
-	  else if ((operand->flags & PPC_OPERAND_UDI) != 0)
-	    (*info->fprintf_func) (info->stream, "%ld", value);
-	  else
-	    {
-	      if (operand->bitm == 7)
-		(*info->fprintf_func) (info->stream, "cr%ld", value);
-	      else
-		{
-		  static const char *cbnames[4] = { "lt", "gt", "eq", "so" };
-		  int cr;
-		  int cc;
-
-		  cr = value >> 2;
-		  if (cr != 0)
-		    (*info->fprintf_func) (info->stream, "4*cr%d+", cr);
-		  cc = value & 3;
-		  (*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
+		if ((operand->flags & PPC_OPERAND_FAKE) != 0) {
+			continue;
 		}
-	    }
 
-	  if (need_paren)
-	    {
-	      (*info->fprintf_func) (info->stream, ")");
-	      need_paren = 0;
-	    }
+		/* If all of the optional operands have the value zero,
+	     then don't print any of them.  */
+		if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0) {
+			if (skip_optional < 0) {
+				skip_optional = skip_optional_operands (opindex, insn,
+					dialect);
+			}
+			if (skip_optional) {
+				continue;
+			}
+		}
 
-	  if ((operand->flags & PPC_OPERAND_PARENS) == 0)
-	    need_comma = 1;
-	  else
-	    {
-	      (*info->fprintf_func) (info->stream, "(");
-	      need_paren = 1;
-	    }
+		value = operand_value_powerpc (operand, insn, dialect);
+
+		if (need_comma) {
+			(*info->fprintf_func) (info->stream, ", ");
+			need_comma = 0;
+		}
+
+		/* Print the operand as directed by the flags.  */
+		if ((operand->flags & PPC_OPERAND_GPR) != 0 || ((operand->flags & PPC_OPERAND_GPR_0) != 0 && value != 0)) {
+			(*info->fprintf_func) (info->stream, "r%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_FPR) != 0) {
+			(*info->fprintf_func) (info->stream, "f%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_VR) != 0) {
+			(*info->fprintf_func) (info->stream, "v%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_VSR) != 0) {
+			(*info->fprintf_func) (info->stream, "vs%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0) {
+			(*info->print_address_func) (memaddr + value, info);
+		} else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0) {
+			(*info->print_address_func) ((bfd_vma)value & 0xffffffff, info);
+		} else if ((operand->flags & PPC_OPERAND_CR) == 0 || (dialect & PPC_OPCODE_PPC) == 0) {
+			(*info->fprintf_func) (info->stream, "%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_FSL) != 0) {
+			(*info->fprintf_func) (info->stream, "fsl%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_FCR) != 0) {
+			(*info->fprintf_func) (info->stream, "fcr%ld", value);
+		} else if ((operand->flags & PPC_OPERAND_UDI) != 0) {
+			(*info->fprintf_func) (info->stream, "%ld", value);
+		} else {
+			if (operand->bitm == 7) {
+				(*info->fprintf_func) (info->stream, "cr%ld", value);
+			} else {
+				static const char *cbnames[4] = {"lt", "gt", "eq", "so"};
+				int cr;
+				int cc;
+
+				cr = value >> 2;
+				if (cr != 0) {
+					(*info->fprintf_func) (info->stream, "4*cr%d+", cr);
+				}
+				cc = value & 3;
+				(*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
+			}
+		}
+
+		if (need_paren) {
+			(*info->fprintf_func) (info->stream, ")");
+			need_paren = 0;
+		}
+
+		if ((operand->flags & PPC_OPERAND_PARENS) == 0) {
+			need_comma = 1;
+		} else {
+			(*info->fprintf_func) (info->stream, "(");
+			need_paren = 1;
+		}
 	}
 
       /* We have found and printed an instruction; return.  */
diff --git a/libr/asm/arch/ppc/gnu/ppc-opc.c b/libr/asm/arch/ppc/gnu/ppc-opc.c
index cac261a512..45cfa3be52 100644
--- a/libr/asm/arch/ppc/gnu/ppc-opc.c
+++ b/libr/asm/arch/ppc/gnu/ppc-opc.c
@@ -657,9 +657,10 @@ extract_bat (unsigned long insn,
 	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	     int *invalid)
 {
-  if (((insn >> 21) & 0x1f) != ((insn >> 16) & 0x1f))
-    *invalid = 1;
-  return 0;
+	if (((insn >> 21) & 0x1f) != ((insn >> 16) & 0x1f)) {
+		*invalid = 1;
+	}
+	return 0;
 }
 
 /* The BB field in an XL form instruction when it must be the same as
@@ -682,9 +683,10 @@ extract_bba (unsigned long insn,
 	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	     int *invalid)
 {
-  if (((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f))
-    *invalid = 1;
-  return 0;
+	if (((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f)) {
+		*invalid = 1;
+	}
+	return 0;
 }
 
 /* The BD field in a B form instruction when the - modifier is used.
@@ -712,15 +714,17 @@ insert_bdm (unsigned long insn,
 {
   if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
-      if ((value & 0x8000) != 0)
-	insn |= 1 << 21;
+	  if ((value & 0x8000) != 0) {
+		  insn |= 1 << 21;
+	  }
     }
   else
     {
-      if ((insn & (0x14 << 21)) == (0x04 << 21))
-	insn |= 0x02 << 21;
-      else if ((insn & (0x14 << 21)) == (0x10 << 21))
-	insn |= 0x08 << 21;
+	    if ((insn & (0x14 << 21)) == (0x04 << 21)) {
+		    insn |= 0x02 << 21;
+	    } else if ((insn & (0x14 << 21)) == (0x10 << 21)) {
+		    insn |= 0x08 << 21;
+	    }
     }
   return insn | (value & 0xfffc);
 }
@@ -732,14 +736,15 @@ extract_bdm (unsigned long insn,
 {
   if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
-      if (((insn & (1 << 21)) == 0) != ((insn & (1 << 15)) == 0))
-	*invalid = 1;
+	  if (((insn & (1 << 21)) == 0) != ((insn & (1 << 15)) == 0)) {
+		  *invalid = 1;
+	  }
     }
   else
     {
-      if ((insn & (0x17 << 21)) != (0x06 << 21)
-	  && (insn & (0x1d << 21)) != (0x18 << 21))
-	*invalid = 1;
+	    if ((insn & (0x17 << 21)) != (0x06 << 21) && (insn & (0x1d << 21)) != (0x18 << 21)) {
+		    *invalid = 1;
+	    }
     }
 
   return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
@@ -757,15 +762,17 @@ insert_bdp (unsigned long insn,
 {
   if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
-      if ((value & 0x8000) == 0)
-	insn |= 1 << 21;
+	  if ((value & 0x8000) == 0) {
+		  insn |= 1 << 21;
+	  }
     }
   else
     {
-      if ((insn & (0x14 << 21)) == (0x04 << 21))
-	insn |= 0x03 << 21;
-      else if ((insn & (0x14 << 21)) == (0x10 << 21))
-	insn |= 0x09 << 21;
+	    if ((insn & (0x14 << 21)) == (0x04 << 21)) {
+		    insn |= 0x03 << 21;
+	    } else if ((insn & (0x14 << 21)) == (0x10 << 21)) {
+		    insn |= 0x09 << 21;
+	    }
     }
   return insn | (value & 0xfffc);
 }
@@ -777,14 +784,15 @@ extract_bdp (unsigned long insn,
 {
   if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
-      if (((insn & (1 << 21)) == 0) == ((insn & (1 << 15)) == 0))
-	*invalid = 1;
+	  if (((insn & (1 << 21)) == 0) == ((insn & (1 << 15)) == 0)) {
+		  *invalid = 1;
+	  }
     }
   else
     {
-      if ((insn & (0x17 << 21)) != (0x07 << 21)
-	  && (insn & (0x1d << 21)) != (0x19 << 21))
-	*invalid = 1;
+	    if ((insn & (0x17 << 21)) != (0x07 << 21) && (insn & (0x1d << 21)) != (0x19 << 21)) {
+		    *invalid = 1;
+	    }
     }
 
   return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
@@ -823,10 +831,9 @@ valid_bo (long value, ppc_cpu_t dialect, int extract)
 	  break;
 	}
       /* When disassembling with -Many, accept power4 encodings too.  */
-      if (valid
-	  || (dialect & PPC_OPCODE_ANY) == 0
-	  || !extract)
-	return valid;
+	if (valid || (dialect & PPC_OPCODE_ANY) == 0 || !extract) {
+		return valid;
+	}
     }
 
   /* Certain encodings have bits that are required to be zero.
@@ -841,12 +848,13 @@ valid_bo (long value, ppc_cpu_t dialect, int extract)
 	 1a01t
 	 1z1zz
   */
-  if ((value & 0x14) == 0)
-    return (value & 0x1) == 0;
-  else if ((value & 0x14) == 0x14)
-    return value == 0x14;
-  else
-    return 1;
+    if ((value & 0x14) == 0) {
+	    return (value & 0x1) == 0;
+    } else if ((value & 0x14) == 0x14) {
+	    return value == 0x14;
+    } else {
+	    return 1;
+    }
 }
 
 /* The BO field in a B form instruction.  Warn about attempts to set
@@ -858,9 +866,10 @@ insert_bo (unsigned long insn,
 	   ppc_cpu_t dialect,
 	   const char **errmsg)
 {
-  if (!valid_bo (value, dialect, 0))
-    *errmsg = _("invalid conditional option");
-  return insn | ((value & 0x1f) << 21);
+	if (!valid_bo (value, dialect, 0)) {
+		*errmsg = _ ("invalid conditional option");
+	}
+	return insn | ((value & 0x1f) << 21);
 }
 
 static long
@@ -871,8 +880,9 @@ extract_bo (unsigned long insn,
   long value;
 
   value = (insn >> 21) & 0x1f;
-  if (!valid_bo (value, dialect, 1))
-    *invalid = 1;
+  if (!valid_bo (value, dialect, 1)) {
+	  *invalid = 1;
+  }
   return value;
 }
 
@@ -886,12 +896,13 @@ insert_boe (unsigned long insn,
 	    ppc_cpu_t dialect,
 	    const char **errmsg)
 {
-  if (!valid_bo (value, dialect, 0))
-    *errmsg = _("invalid conditional option");
-  else if ((value & 1) != 0)
-    *errmsg = _("attempt to set y bit when using + or - modifier");
+	if (!valid_bo (value, dialect, 0)) {
+		*errmsg = _ ("invalid conditional option");
+	} else if ((value & 1) != 0) {
+		*errmsg = _ ("attempt to set y bit when using + or - modifier");
+	}
 
-  return insn | ((value & 0x1f) << 21);
+	return insn | ((value & 0x1f) << 21);
 }
 
 static long
@@ -902,8 +913,9 @@ extract_boe (unsigned long insn,
   long value;
 
   value = (insn >> 21) & 0x1f;
-  if (!valid_bo (value, dialect, 1))
-    *invalid = 1;
+  if (!valid_bo (value, dialect, 1)) {
+	  *invalid = 1;
+  }
   return value & 0x1e;
 }
 
@@ -924,31 +936,27 @@ insert_fxm (unsigned long insn,
 	  *errmsg = _("invalid mask field");
 	  value = 0;
 	}
-    }
+  }
 
   /* If the optional field on mfcr is missing that means we want to use
      the old form of the instruction that moves the whole cr.  In that
      case we'll have VALUE zero.  There doesn't seem to be a way to
      distinguish this from the case where someone writes mfcr %r3,0.  */
-  else if (value == 0)
-    ;
+  else if (value == 0) {
+	  ;
 
-  /* If only one bit of the FXM field is set, we can use the new form
+	  /* If only one bit of the FXM field is set, we can use the new form
      of the instruction, which is faster.  Unlike the Power4 branch hint
      encoding, this is not backward compatible.  Do not generate the
      new form unless -mpower4 has been given, or -many and the two
      operand form of mfcr was used.  */
-  else if ((value & -value) == value
-	   && ((dialect & PPC_OPCODE_POWER4) != 0
-	       || ((dialect & PPC_OPCODE_ANY) != 0
-		   && (insn & (0x3ff << 1)) == 19 << 1)))
-    insn |= 1 << 20;
+  } else if ((value & -value) == value && ((dialect & PPC_OPCODE_POWER4) != 0 || ((dialect & PPC_OPCODE_ANY) != 0 && (insn & (0x3ff << 1)) == 19 << 1))) {
+	  insn |= 1 << 20;
 
-  /* Any other value on mfcr is an error.  */
-  else if ((insn & (0x3ff << 1)) == 19 << 1)
-    {
-      *errmsg = _("ignoring invalid mfcr mask");
-      value = 0;
+	  /* Any other value on mfcr is an error.  */
+  } else if ((insn & (0x3ff << 1)) == 19 << 1) {
+	  *errmsg = _ ("ignoring invalid mfcr mask");
+	  value = 0;
     }
 
   return insn | ((value & 0xff) << 12);
@@ -965,15 +973,17 @@ extract_fxm (unsigned long insn,
   if ((insn & (1 << 20)) != 0)
     {
       /* Exactly one bit of MASK should be set.  */
-      if (mask == 0 || (mask & -mask) != mask)
-	*invalid = 1;
+      if (mask == 0 || (mask & -mask) != mask) {
+	      *invalid = 1;
+      }
     }
 
   /* Check that non-power4 form of mfcr has a zero MASK.  */
   else if ((insn & (0x3ff << 1)) == 19 << 1)
     {
-      if (mask != 0)
-	*invalid = 1;
+	    if (mask != 0) {
+		    *invalid = 1;
+	    }
     }
 
   return mask;
@@ -1003,10 +1013,11 @@ insert_mbe (unsigned long insn,
 
   mb = 0;
   me = 32;
-  if ((uval & 1) != 0)
-    last = 1;
-  else
-    last = 0;
+  if ((uval & 1) != 0) {
+	  last = 1;
+  } else {
+	  last = 0;
+  }
   count = 0;
 
   /* mb: location of last 0->1 transition */
@@ -1028,13 +1039,15 @@ insert_mbe (unsigned long insn,
 	  last = 0;
 	}
     }
-  if (me == 0)
-    me = 32;
+    if (me == 0) {
+	    me = 32;
+    }
 
-  if (count != 2 && (count != 0 || ! last))
-    *errmsg = _("illegal bitmask");
+    if (count != 2 && (count != 0 || !last)) {
+	    *errmsg = _ ("illegal bitmask");
+    }
 
-  return insn | (mb << 6) | ((me - 1) << 1);
+    return insn | (mb << 6) | ((me - 1) << 1);
 }
 
 static long
@@ -1053,16 +1066,17 @@ extract_mbe (unsigned long insn,
   if (mb < me + 1)
     {
       ret = 0;
-      for (i = mb; i <= me; i++)
-	ret |= 1L << (31 - i);
-    }
-  else if (mb == me + 1)
-    ret = ~0;
-  else /* (mb > me + 1) */
-    {
-      ret = ~0;
-      for (i = me + 1; i < mb; i++)
-	ret &= ~(1L << (31 - i));
+      for (i = mb; i <= me; i++) {
+	      ret |= 1L << (31 - i);
+      }
+  } else if (mb == me + 1) {
+	  ret = ~0;
+  } else /* (mb > me + 1) */
+  {
+	  ret = ~0;
+	  for (i = me + 1; i < mb; i++) {
+		  ret &= ~(1L << (31 - i));
+	  }
     }
   return ret;
 }
@@ -1098,8 +1112,9 @@ extract_nb (unsigned long insn,
   long ret;
 
   ret = (insn >> 11) & 0x1f;
-  if (ret == 0)
-    ret = 32;
+  if (ret == 0) {
+	  ret = 32;
+  }
   return ret;
 }
 
@@ -1136,10 +1151,10 @@ insert_ral (unsigned long insn,
 	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	    const char **errmsg)
 {
-  if (value == 0
-      || (unsigned long) value == ((insn >> 21) & 0x1f))
-    *errmsg = "invalid register operand when updating";
-  return insn | ((value & 0x1f) << 16);
+	if (value == 0 || (unsigned long)value == ((insn >> 21) & 0x1f)) {
+		*errmsg = "invalid register operand when updating";
+	}
+	return insn | ((value & 0x1f) << 16);
 }
 
 /* The RA field in an lmw instruction, which has special value
@@ -1151,9 +1166,10 @@ insert_ram (unsigned long insn,
 	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	    const char **errmsg)
 {
-  if ((unsigned long) value >= ((insn >> 21) & 0x1f))
-    *errmsg = _("index register in load range");
-  return insn | ((value & 0x1f) << 16);
+	if ((unsigned long)value >= ((insn >> 21) & 0x1f)) {
+		*errmsg = _ ("index register in load range");
+	}
+	return insn | ((value & 0x1f) << 16);
 }
 
 /* The RA field in the DQ form lq instruction, which has special
@@ -1167,8 +1183,9 @@ insert_raq (unsigned long insn,
 {
   long rtvalue = (insn & RT_MASK) >> 21;
 
-  if (value == rtvalue)
-    *errmsg = _("source and target register operands must be different");
+  if (value == rtvalue) {
+	  *errmsg = _ ("source and target register operands must be different");
+  }
   return insn | ((value & 0x1f) << 16);
 }
 
@@ -1182,9 +1199,10 @@ insert_ras (unsigned long insn,
 	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	    const char **errmsg)
 {
-  if (value == 0)
-    *errmsg = _("invalid register operand when updating");
-  return insn | ((value & 0x1f) << 16);
+	if (value == 0) {
+		*errmsg = _ ("invalid register operand when updating");
+	}
+	return insn | ((value & 0x1f) << 16);
 }
 
 /* The RB field in an X form instruction when it must be the same as
@@ -1207,9 +1225,10 @@ extract_rbs (unsigned long insn,
 	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	     int *invalid)
 {
-  if (((insn >> 21) & 0x1f) != ((insn >> 11) & 0x1f))
-    *invalid = 1;
-  return 0;
+	if (((insn >> 21) & 0x1f) != ((insn >> 11) & 0x1f)) {
+		*invalid = 1;
+	}
+	return 0;
 }
 
 /* The SH field in an MD form instruction.  This is split.  */
@@ -1259,17 +1278,17 @@ insert_sprg (unsigned long insn,
 	     ppc_cpu_t dialect,
 	     const char **errmsg)
 {
-  if (value > 7
-      || (value > 3
-	  && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0))
-    *errmsg = _("invalid sprg number");
+	if (value > 7 || (value > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0)) {
+		*errmsg = _ ("invalid sprg number");
+	}
 
-  /* If this is mfsprg4..7 then use spr 260..263 which can be read in
+	/* If this is mfsprg4..7 then use spr 260..263 which can be read in
      user mode.  Anything else must use spr 272..279.  */
-  if (value <= 3 || (insn & 0x100) != 0)
-    value |= 0x10;
+	if (value <= 3 || (insn & 0x100) != 0) {
+		value |= 0x10;
+	}
 
-  return insn | ((value & 0x17) << 16);
+	return insn | ((value & 0x17) << 16);
 }
 
 static long
@@ -1281,11 +1300,9 @@ extract_sprg (unsigned long insn,
 
   /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279
      If not BOOKE or 405, then both use only 272..275.  */
-  if ((val - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0)
-      || (val - 0x10 > 7 && (insn & 0x100) != 0)
-      || val <= 3
-      || (val & 8) != 0)
-    *invalid = 1;
+  if ((val - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0) || (val - 0x10 > 7 && (insn & 0x100) != 0) || val <= 3 || (val & 8) != 0) {
+	  *invalid = 1;
+  }
   return val & 7;
 }
 
@@ -1305,9 +1322,10 @@ insert_tbr (unsigned long insn,
 	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if (value == 0)
-    value = TB;
-  return insn | ((value & 0x1f) << 16) | ((value & 0x3e0) << 6);
+	if (value == 0) {
+		value = TB;
+	}
+	return insn | ((value & 0x1f) << 16) | ((value & 0x3e0) << 6);
 }
 
 static long
@@ -1318,8 +1336,9 @@ extract_tbr (unsigned long insn,
   long ret;
 
   ret = ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
-  if (ret == TB)
-    ret = 0;
+  if (ret == TB) {
+	  ret = 0;
+  }
   return ret;
 }
 
@@ -1400,10 +1419,10 @@ extract_xb6s (unsigned long insn,
 	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,
 	     int *invalid)
 {
-  if ((((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f))
-      || (((insn >> 2) & 0x1) != ((insn >> 1) & 0x1)))
-    *invalid = 1;
-  return 0;
+	if ((((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f)) || (((insn >> 2) & 0x1) != ((insn >> 1) & 0x1))) {
+		*invalid = 1;
+	}
+	return 0;
 }
 
 /* Macros used to form opcodes.  */
diff --git a/libr/asm/arch/sh/gnu/sh-dis.c b/libr/asm/arch/sh/gnu/sh-dis.c
index 6a281ed32f..9e3a9fd3ad 100644
--- a/libr/asm/arch/sh/gnu/sh-dis.c
+++ b/libr/asm/arch/sh/gnu/sh-dis.c
@@ -80,22 +80,25 @@ print_insn_shx (bfd_vma memaddr, struct disassemble_info *info)
 
 	  if (i < 16)
 	    {
-	      if (nibs[n] == i)
-		continue;
-	      goto fail;
+		  if (nibs[n] == i) {
+			  continue;
+		  }
+		  goto fail;
 	    }
 	  switch (i)
 	    {
 	    case BRANCH_8:
 	      imm = (nibs[2] << 4) | (nibs[3]);
-	      if (imm & 0x80)
-		imm |= ~0xff;
+	      if (imm & 0x80) {
+		      imm |= ~0xff;
+	      }
 	      imm = (imm * 2) + 4 ;
 	      goto ok;
 	    case BRANCH_12:
 	      imm = ((nibs[1]) << 8) | (nibs[2] << 4) | (nibs[3]);
-	      if (imm & 0x800)
-		imm |= ~0xfff;
+	      if (imm & 0x800) {
+		      imm |= ~0xfff;
+	      }
 	      imm = imm * 2 + 4;
 	      goto ok;
 	    case IMM_4:
@@ -153,151 +156,150 @@ print_insn_shx (bfd_vma memaddr, struct disassemble_info *info)
       fprintf_fn (stream,"%s ", op->name);
       for (n = 0; n < 3 && op->arg[n] != A_END; n++)
 	{
-	  if (n && op->arg[1] != A_END)
-	    fprintf_fn (stream, ",");
-	  switch (op->arg[n])
-	    {
-	    case A_IMM:
-	      fprintf_fn (stream, "0x%02X", (unsigned char)(imm));
-	      break;
-	    case A_R0:
-	      fprintf_fn (stream, "r0");
-	      break;
-	    case A_REG_N:
-	      fprintf_fn (stream, "r%d", rn);
-	      break;
-	    case A_INC_N:
-	      fprintf_fn (stream, "@r%d+", rn);
-	      break;
-	    case A_DEC_N:
-	      fprintf_fn (stream, "@-r%d", rn);
-	      break;
-	    case A_IND_N:
-	      fprintf_fn (stream, "@r%d", rn);
-	      break;
-	    case A_DISP_REG_N:
-	      fprintf_fn (stream, "@(0x%X,r%d)", imm, rn);
-	      break;
-	    case A_REG_M:
-	      fprintf_fn (stream, "r%d", rm);
-	      break;
-	    case A_INC_M:
-	      fprintf_fn (stream, "@r%d+", rm);
-	      break;
-	    case A_DEC_M:
-	      fprintf_fn (stream, "@-r%d", rm);
-	      break;
-	    case A_IND_M:
-	      fprintf_fn (stream, "@r%d", rm);
-	      break;
-	    case A_DISP_REG_M:
-	      fprintf_fn (stream, "@(0x%X,r%d)", imm, rm);
-	      break;
-	    case A_REG_B:
-	      fprintf_fn (stream, "r%d_bank", rb);
-	      break;
-	    case A_DISP_PC:
-	      disp_pc = 1;
-	      disp_pc_addr = imm + 4 + (memaddr & relmask);
-	      fprintf_fn(stream, "@(0x%X,PC)",imm);
-	      break;
-	    case A_IND_R0_REG_N:
-	      fprintf_fn (stream, "@(r0,r%d)", rn);
-	      break;
-	    case A_IND_R0_REG_M:
-	      fprintf_fn (stream, "@(r0,r%d)", rm);
-	      break;
-	    case A_DISP_GBR:
-	      fprintf_fn (stream, "@(0x%X,gbr)",imm);
-	      break;
-	    case A_R0_GBR:
-	      fprintf_fn (stream, "@(r0,gbr)");
-	      break;
-	    case A_BDISP12:
-	    case A_BDISP8:
-	      (*info->print_address_func) (imm + memaddr, info);
-	      break;
-	    case A_SR:
-	      fprintf_fn (stream, "sr");
-	      break;
-	    case A_GBR:
-	      fprintf_fn (stream, "gbr");
-	      break;
-	    case A_VBR:
-	      fprintf_fn (stream, "vbr");
-	      break;
-	    case A_SSR:
-	      fprintf_fn (stream, "ssr");
-	      break;
-	    case A_SPC:
-	      fprintf_fn (stream, "spc");
-	      break;
-	    case A_MACH:
-	      fprintf_fn (stream, "mach");
-	      break;
-	    case A_MACL:
-	      fprintf_fn (stream ,"macl");
-	      break;
-	    case A_PR:
-	      fprintf_fn (stream, "pr");
-	      break;
-	    case A_SGR:
-	      fprintf_fn (stream, "sgr");
-	      break;
-	    case A_DBR:
-	      fprintf_fn (stream, "dbr");
-	      break;
-	    case FD_REG_N:
-	      if (0)
-		goto d_reg_n;
-	    case F_REG_N:
-	      fprintf_fn (stream, "fr%d", rn);
-	      break;
-	    case F_REG_M:
-	      fprintf_fn (stream, "fr%d", rm);
-	      break;
-	    case DX_REG_N:
-	      if (rn & 1)
-		{
-		  fprintf_fn (stream, "xd%d", rn & ~1);
-		  break;
-		}
-	    d_reg_n:
-	    case D_REG_N:
-	      fprintf_fn (stream, "dr%d", rn);
-	      break;
-	    case DX_REG_M:
-	      if (rm & 1)
-		{
-		  fprintf_fn (stream, "xd%d", rm & ~1);
-		  break;
-		}
-	    case D_REG_M:
-	      fprintf_fn (stream, "dr%d", rm);
-	      break;
-	    case FPSCR_M:
-	    case FPSCR_N:
-	      fprintf_fn (stream, "fpscr");
-	      break;
-	    case FPUL_M:
-	    case FPUL_N:
-	      fprintf_fn (stream, "fpul");
-	      break;
-	    case F_FR0:
-	      fprintf_fn (stream, "fr0");
-	      break;
-	    case V_REG_N:
-	      fprintf_fn (stream, "fv%d", rn*4);
-	      break;
-	    case V_REG_M:
-	      fprintf_fn (stream, "fv%d", rm*4);
-	      break;
-	    case XMTRX_M4:
-	      fprintf_fn (stream, "xmtrx");
-	      break;
-	    default:
-	      fprintf(stderr, "sh-dis: abort");
-	      return 0;
+	      if (n && op->arg[1] != A_END) {
+		      fprintf_fn (stream, ",");
+	      }
+	      switch (op->arg[n]) {
+	      case A_IMM:
+		      fprintf_fn (stream, "0x%02X", (unsigned char)(imm));
+		      break;
+	      case A_R0:
+		      fprintf_fn (stream, "r0");
+		      break;
+	      case A_REG_N:
+		      fprintf_fn (stream, "r%d", rn);
+		      break;
+	      case A_INC_N:
+		      fprintf_fn (stream, "@r%d+", rn);
+		      break;
+	      case A_DEC_N:
+		      fprintf_fn (stream, "@-r%d", rn);
+		      break;
+	      case A_IND_N:
+		      fprintf_fn (stream, "@r%d", rn);
+		      break;
+	      case A_DISP_REG_N:
+		      fprintf_fn (stream, "@(0x%X,r%d)", imm, rn);
+		      break;
+	      case A_REG_M:
+		      fprintf_fn (stream, "r%d", rm);
+		      break;
+	      case A_INC_M:
+		      fprintf_fn (stream, "@r%d+", rm);
+		      break;
+	      case A_DEC_M:
+		      fprintf_fn (stream, "@-r%d", rm);
+		      break;
+	      case A_IND_M:
+		      fprintf_fn (stream, "@r%d", rm);
+		      break;
+	      case A_DISP_REG_M:
+		      fprintf_fn (stream, "@(0x%X,r%d)", imm, rm);
+		      break;
+	      case A_REG_B:
+		      fprintf_fn (stream, "r%d_bank", rb);
+		      break;
+	      case A_DISP_PC:
+		      disp_pc = 1;
+		      disp_pc_addr = imm + 4 + (memaddr & relmask);
+		      fprintf_fn (stream, "@(0x%X,PC)", imm);
+		      break;
+	      case A_IND_R0_REG_N:
+		      fprintf_fn (stream, "@(r0,r%d)", rn);
+		      break;
+	      case A_IND_R0_REG_M:
+		      fprintf_fn (stream, "@(r0,r%d)", rm);
+		      break;
+	      case A_DISP_GBR:
+		      fprintf_fn (stream, "@(0x%X,gbr)", imm);
+		      break;
+	      case A_R0_GBR:
+		      fprintf_fn (stream, "@(r0,gbr)");
+		      break;
+	      case A_BDISP12:
+	      case A_BDISP8:
+		      (*info->print_address_func) (imm + memaddr, info);
+		      break;
+	      case A_SR:
+		      fprintf_fn (stream, "sr");
+		      break;
+	      case A_GBR:
+		      fprintf_fn (stream, "gbr");
+		      break;
+	      case A_VBR:
+		      fprintf_fn (stream, "vbr");
+		      break;
+	      case A_SSR:
+		      fprintf_fn (stream, "ssr");
+		      break;
+	      case A_SPC:
+		      fprintf_fn (stream, "spc");
+		      break;
+	      case A_MACH:
+		      fprintf_fn (stream, "mach");
+		      break;
+	      case A_MACL:
+		      fprintf_fn (stream, "macl");
+		      break;
+	      case A_PR:
+		      fprintf_fn (stream, "pr");
+		      break;
+	      case A_SGR:
+		      fprintf_fn (stream, "sgr");
+		      break;
+	      case A_DBR:
+		      fprintf_fn (stream, "dbr");
+		      break;
+	      case FD_REG_N:
+		      if (0) {
+			      goto d_reg_n;
+		      }
+	      case F_REG_N:
+		      fprintf_fn (stream, "fr%d", rn);
+		      break;
+	      case F_REG_M:
+		      fprintf_fn (stream, "fr%d", rm);
+		      break;
+	      case DX_REG_N:
+		      if (rn & 1) {
+			      fprintf_fn (stream, "xd%d", rn & ~1);
+			      break;
+		      }
+	      d_reg_n:
+	      case D_REG_N:
+		      fprintf_fn (stream, "dr%d", rn);
+		      break;
+	      case DX_REG_M:
+		      if (rm & 1) {
+			      fprintf_fn (stream, "xd%d", rm & ~1);
+			      break;
+		      }
+	      case D_REG_M:
+		      fprintf_fn (stream, "dr%d", rm);
+		      break;
+	      case FPSCR_M:
+	      case FPSCR_N:
+		      fprintf_fn (stream, "fpscr");
+		      break;
+	      case FPUL_M:
+	      case FPUL_N:
+		      fprintf_fn (stream, "fpul");
+		      break;
+	      case F_FR0:
+		      fprintf_fn (stream, "fr0");
+		      break;
+	      case V_REG_N:
+		      fprintf_fn (stream, "fv%d", rn * 4);
+		      break;
+	      case V_REG_M:
+		      fprintf_fn (stream, "fv%d", rm * 4);
+		      break;
+	      case XMTRX_M4:
+		      fprintf_fn (stream, "xmtrx");
+		      break;
+	      default:
+		      fprintf (stderr, "sh-dis: abort");
+		      return 0;
 	    }
 	}
 
@@ -329,12 +331,13 @@ print_insn_shx (bfd_vma memaddr, struct disassemble_info *info)
 	  int size;
 	  bfd_byte bytes[4];
 
-	  if (relmask == ~ (bfd_vma) 1)
-	    size = 2;
-	  else
-	    size = 4;
+	  if (relmask == ~(bfd_vma)1) {
+		  size = 2;
+	  } else {
+		  size = 4;
+	  }
 
-	    //read_memory_func() is broken on ALL GNU disassemblers ! see libr/asm/p/asm_sh.c
+	  //read_memory_func() is broken on ALL GNU disassemblers ! see libr/asm/p/asm_sh.c
 	  status = info->read_memory_func (disp_pc_addr, bytes, size, info);
 	  if (status != 0) {
 			info->memory_error_func (status, memaddr, info);
diff --git a/libr/asm/arch/sparc/gnu/sparc-dis.c b/libr/asm/arch/sparc/gnu/sparc-dis.c
index 1807f39e55..42cc3f21a3 100644
--- a/libr/asm/arch/sparc/gnu/sparc-dis.c
+++ b/libr/asm/arch/sparc/gnu/sparc-dis.c
@@ -211,9 +211,9 @@ is_delayed_branch (unsigned long insn)
     {
       const sparc_opcode *opcode = op->opcode;
 
-      if ((opcode->match & insn) == opcode->match
-	  && (opcode->lose & insn) == 0)
-	return opcode->flags & F_DELAYED;
+      if ((opcode->match & insn) == opcode->match && (opcode->lose & insn) == 0) {
+	      return opcode->flags & F_DELAYED;
+      }
     }
   return 0;
 }
@@ -274,15 +274,17 @@ compare_opcodes (const void * a, const void * b)
      by comparing the bitmasks).  */
   if (op0->architecture & current_arch_mask)
     {
-      if (! (op1->architecture & current_arch_mask))
-	return -1;
+	  if (!(op1->architecture & current_arch_mask)) {
+		  return -1;
+	  }
     }
   else
     {
-      if (op1->architecture & current_arch_mask)
-	return 1;
-      else if (op0->architecture != op1->architecture)
-	return op0->architecture - op1->architecture;
+	    if (op1->architecture & current_arch_mask) {
+		    return 1;
+	    } else if (op0->architecture != op1->architecture) {
+		    return op0->architecture - op1->architecture;
+	    }
     }
 
   /* If a bit is set in both match and lose, there is something
@@ -317,8 +319,9 @@ compare_opcodes (const void * a, const void * b)
       int x0 = (match0 & x) != 0;
       int x1 = (match1 & x) != 0;
 
-      if (x0 != x1)
-	return x1 - x0;
+      if (x0 != x1) {
+	      return x1 - x0;
+      }
     }
 
   for (i = 0; i < 32; ++i)
@@ -327,8 +330,9 @@ compare_opcodes (const void * a, const void * b)
       int x0 = (lose0 & x) != 0;
       int x1 = (lose1 & x) != 0;
 
-      if (x0 != x1)
-	return x1 - x0;
+      if (x0 != x1) {
+	      return x1 - x0;
+      }
     }
 
   /* They are functionally equal.  So as long as the opcode table is
@@ -338,9 +342,10 @@ compare_opcodes (const void * a, const void * b)
   {
     int alias_diff = (op0->flags & F_ALIAS) - (op1->flags & F_ALIAS);
 
-    if (alias_diff != 0)
-      /* Put the one that isn't an alias first.  */
-      return alias_diff;
+    if (alias_diff != 0) {
+	    /* Put the one that isn't an alias first.  */
+	    return alias_diff;
+    }
   }
 
   /* Except for aliases, two "identical" instructions had
@@ -348,22 +353,24 @@ compare_opcodes (const void * a, const void * b)
   i = strcmp (op0->name, op1->name);
   if (i)
     {
-      if (op0->flags & F_ALIAS) /* If they're both aliases, be arbitrary.  */
-	return i;
-      else
-	fprintf (stderr,
-		 /* xgettext:c-format */
-		 _("Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n"),
-		 op0->name, op1->name);
+	  if (op0->flags & F_ALIAS) { /* If they're both aliases, be arbitrary.  */
+		  return i;
+	  } else {
+		  fprintf (stderr,
+			  /* xgettext:c-format */
+			  _ ("Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n"),
+			  op0->name, op1->name);
+	  }
     }
 
   /* Fewer arguments are preferred.  */
   {
     int length_diff = strlen (op0->args) - strlen (op1->args);
 
-    if (length_diff != 0)
-      /* Put the one with fewer arguments first.  */
-      return length_diff;
+    if (length_diff != 0) {
+	    /* Put the one with fewer arguments first.  */
+	    return length_diff;
+    }
   }
 
   /* Put 1+i before i+1.  */
@@ -376,12 +383,14 @@ compare_opcodes (const void * a, const void * b)
 	/* There is a plus in both operands.  Note that a plus
 	   sign cannot be the first character in args,
 	   so the following [-1]'s are valid.  */
-	if (p0[-1] == 'i' && p1[1] == 'i')
-	  /* op0 is i+1 and op1 is 1+i, so op1 goes first.  */
-	  return 1;
-	if (p0[1] == 'i' && p1[-1] == 'i')
-	  /* op0 is 1+i and op1 is i+1, so op0 goes first.  */
-	  return -1;
+	if (p0[-1] == 'i' && p1[1] == 'i') {
+		/* op0 is i+1 and op1 is 1+i, so op1 goes first.  */
+		return 1;
+	}
+	if (p0[1] == 'i' && p1[-1] == 'i') {
+		/* op0 is 1+i and op1 is i+1, so op0 goes first.  */
+		return -1;
+	}
       }
   }
 
@@ -390,8 +399,9 @@ compare_opcodes (const void * a, const void * b)
     int i0 = strncmp (op0->args, "i,1", 3) == 0;
     int i1 = strncmp (op1->args, "i,1", 3) == 0;
 
-    if (i0 ^ i1)
-      return i0 - i1;
+    if (i0 ^ i1) {
+	    return i0 - i1;
+    }
   }
 
   /* They are, as far as we can tell, identical.
@@ -420,8 +430,9 @@ build_hash_table (const sparc_opcode **opcode_table,
 
   memset (hash_table, 0, HASH_SIZE * sizeof (hash_table[0]));
   memset (hash_count, 0, HASH_SIZE * sizeof (hash_count[0]));
-  if (hash_buf != NULL)
-    free (hash_buf);
+  if (hash_buf != NULL) {
+	  free (hash_buf);
+  }
   hash_buf = calloc (sizeof (* hash_buf), num_opcodes);
   if (!hash_buf) {
     return;
@@ -485,12 +496,14 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 
       current_arch_mask = compute_arch_mask (info->mach);
 
-      if (!opcodes_initialized)
-	sorted_opcodes =
-	  xmalloc (sparc_num_opcodes * sizeof (sparc_opcode *));
+      if (!opcodes_initialized) {
+	      sorted_opcodes =
+		      xmalloc (sparc_num_opcodes * sizeof (sparc_opcode *));
+      }
       /* Reset the sorted table so we can resort it.  */
-      for (i = 0; i < sparc_num_opcodes; ++i)
-	sorted_opcodes[i] = &sparc_opcodes[i];
+      for (i = 0; i < sparc_num_opcodes; ++i) {
+	      sorted_opcodes[i] = &sparc_opcodes[i];
+      }
       qsort ((char *) sorted_opcodes, sparc_num_opcodes,
 	     sizeof (sorted_opcodes[0]), compare_opcodes);
 
@@ -512,10 +525,11 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 
   /* On SPARClite variants such as DANlite (sparc86x), instructions
      are always big-endian even when the machine is in little-endian mode.  */
-  if (info->endian == BFD_ENDIAN_BIG || info->mach == bfd_mach_sparc_sparclite)
-    getword = bfd_getb32;
-  else
-    getword = bfd_getl32;
+  if (info->endian == BFD_ENDIAN_BIG || info->mach == bfd_mach_sparc_sparclite) {
+	  getword = bfd_getb32;
+  } else {
+	  getword = bfd_getl32;
+  }
 
   insn = getword (buffer);
 
@@ -529,8 +543,9 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
       const sparc_opcode *opcode = op->opcode;
 
       /* If the insn isn't supported by the current architecture, skip it.  */
-      if (! (opcode->architecture & current_arch_mask))
-	continue;
+      if (!(opcode->architecture & current_arch_mask)) {
+	      continue;
+      }
 
       if ((opcode->match & insn) == opcode->match
 	  && (opcode->lose & insn) == 0)
@@ -549,19 +564,21 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 
 	  /* Do we have an `add' or `or' instruction combining an
              immediate with rs1?  */
-	  if (opcode->match == 0x80102000) /* or */
-	    imm_ored_to_rs1 = 1;
-	  if (opcode->match == 0x80002000) /* add */
-	    imm_added_to_rs1 = 1;
+	  if (opcode->match == 0x80102000) { /* or */
+		  imm_ored_to_rs1 = 1;
+	  }
+	  if (opcode->match == 0x80002000) { /* add */
+		  imm_added_to_rs1 = 1;
+	  }
 
-	  if (X_RS1 (insn) != X_RD (insn)
-	      && strchr (opcode->args, 'r') != 0)
-	      /* Can't do simple format if source and dest are different.  */
-	      continue;
-	  if (X_RS2 (insn) != X_RD (insn)
-	      && strchr (opcode->args, 'O') != 0)
-	      /* Can't do simple format if source and dest are different.  */
-	      continue;
+	  if (X_RS1 (insn) != X_RD (insn) && strchr (opcode->args, 'r') != 0) {
+		  /* Can't do simple format if source and dest are different.  */
+		  continue;
+	  }
+	  if (X_RS2 (insn) != X_RD (insn) && strchr (opcode->args, 'O') != 0) {
+		  /* Can't do simple format if source and dest are different.  */
+		  continue;
+	  }
 
 	  (*info->fprintf_func) (stream, "%s", opcode->name);
 
@@ -693,12 +710,13 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		    {
 		      int imm;
 
-		      if (*s == 'i')
-		        imm = X_SIMM (insn, 13);
-		      else if (*s == 'I')
-			imm = X_SIMM (insn, 11);
-		      else
-			imm = X_SIMM (insn, 10);
+		      if (*s == 'i') {
+			      imm = X_SIMM (insn, 13);
+		      } else if (*s == 'I') {
+			      imm = X_SIMM (insn, 11);
+		      } else {
+			      imm = X_SIMM (insn, 10);
+		      }
 
 		      /* Check to see whether we have a 1+i, and take
 			 note of that fact.
@@ -707,13 +725,15 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 			 we will be matching 1+i rather than i+1,
 			 so it is OK to assume that i is after +,
 			 not before it.  */
-		      if (found_plus)
-			imm_added_to_rs1 = 1;
+		      if (found_plus) {
+			      imm_added_to_rs1 = 1;
+		      }
 
-		      if (imm <= 9)
-			(*info->fprintf_func) (stream, "%d", imm);
-		      else
-			(*info->fprintf_func) (stream, "%#x", imm);
+		      if (imm <= 9) {
+			      (*info->fprintf_func) (stream, "%d", imm);
+		      } else {
+			      (*info->fprintf_func) (stream, "%#x", imm);
+		      }
 		    }
 		    break;
 
@@ -722,10 +742,11 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		    {
 		      int imm = X_IMM (insn, *s == 'X' ? 5 : 6);
 
-		      if (imm <= 9)
-			(info->fprintf_func) (stream, "%d", imm);
-		      else
-			(info->fprintf_func) (stream, "%#x", (unsigned) imm);
+		      if (imm <= 9) {
+			      (info->fprintf_func) (stream, "%d", imm);
+		      } else {
+			      (info->fprintf_func) (stream, "%#x", (unsigned)imm);
+		      }
 		    }
 		    break;
 
@@ -739,21 +760,21 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		      int bit = 0x40, printed_one = 0;
 		      const char *name;
 
-		      if (mask == 0)
-			(info->fprintf_func) (stream, "0");
-		      else
-			while (bit)
-			  {
-			    if (mask & bit)
-			      {
-				if (printed_one)
-				  (info->fprintf_func) (stream, "|");
-				name = sparc_decode_membar (bit);
-				(info->fprintf_func) (stream, "%s", name);
-				printed_one = 1;
+		      if (mask == 0) {
+			      (info->fprintf_func) (stream, "0");
+		      } else {
+			      while (bit) {
+				      if (mask & bit) {
+					      if (printed_one) {
+						      (info->fprintf_func) (stream, "|");
+					      }
+					      name = sparc_decode_membar (bit);
+					      (info->fprintf_func) (stream, "%s", name);
+					      printed_one = 1;
+				      }
+				      bit >>= 1;
 			      }
-			    bit >>= 1;
-			  }
+		      }
 		      break;
 		    }
 
@@ -803,63 +824,70 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		    break;
 
 		  case '?':
-		    if (X_RS1 (insn) == 31)
-		      (*info->fprintf_func) (stream, "%%ver");
-		    else if ((unsigned) X_RS1 (insn) < 17)
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9_priv_reg_names[X_RS1 (insn)]);
-		    else
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    break;
+			  if (X_RS1 (insn) == 31) {
+				  (*info->fprintf_func) (stream, "%%ver");
+			  } else if ((unsigned)X_RS1 (insn) < 17) {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9_priv_reg_names[X_RS1 (insn)]);
+			  } else {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  }
+			  break;
 
 		  case '!':
-		    if ((unsigned) X_RD (insn) < 17)
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9_priv_reg_names[X_RD (insn)]);
-		    else
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    break;
+			  if ((unsigned)X_RD (insn) < 17) {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9_priv_reg_names[X_RD (insn)]);
+			  } else {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  }
+			  break;
 
 		  case '$':
-		    if ((unsigned) X_RS1 (insn) < 32)
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9_hpriv_reg_names[X_RS1 (insn)]);
-		    else
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    break;
+			  if ((unsigned)X_RS1 (insn) < 32) {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9_hpriv_reg_names[X_RS1 (insn)]);
+			  } else {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  }
+			  break;
 
 		  case '%':
-		    if ((unsigned) X_RD (insn) < 32)
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9_hpriv_reg_names[X_RD (insn)]);
-		    else
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    break;
+			  if ((unsigned)X_RD (insn) < 32) {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9_hpriv_reg_names[X_RD (insn)]);
+			  } else {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  }
+			  break;
 
 		  case '/':
-		    if (X_RS1 (insn) < 16 || X_RS1 (insn) > 25)
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    else
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9a_asr_reg_names[X_RS1 (insn)-16]);
-		    break;
+			  if (X_RS1 (insn) < 16 || X_RS1 (insn) > 25) {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  } else {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9a_asr_reg_names[X_RS1 (insn) - 16]);
+			  }
+			  break;
 
 		  case '_':
-		    if (X_RD (insn) < 16 || X_RD (insn) > 25)
-		      (*info->fprintf_func) (stream, "%%reserved");
-		    else
-		      (*info->fprintf_func) (stream, "%%%s",
-					     v9a_asr_reg_names[X_RD (insn)-16]);
-		    break;
+			  if (X_RD (insn) < 16 || X_RD (insn) > 25) {
+				  (*info->fprintf_func) (stream, "%%reserved");
+			  } else {
+				  (*info->fprintf_func) (stream, "%%%s",
+					  v9a_asr_reg_names[X_RD (insn) - 16]);
+			  }
+			  break;
 
 		  case '*':
 		    {
 		      const char *name = sparc_decode_prefetch (X_RD (insn));
 
-		      if (name)
-			(*info->fprintf_func) (stream, "%s", name);
-		      else
-			(*info->fprintf_func) (stream, "%ld", X_RD (insn));
+		      if (name) {
+			      (*info->fprintf_func) (stream, "%s", name);
+		      } else {
+			      (*info->fprintf_func) (stream, "%ld", X_RD (insn));
+		      }
 		      break;
 		    }
 
@@ -890,10 +918,11 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		    {
 		      const char *name = sparc_decode_asi (X_ASI (insn));
 
-		      if (name)
-			(*info->fprintf_func) (stream, "%s", name);
-		      else
-			(*info->fprintf_func) (stream, "(%ld)", X_ASI (insn));
+		      if (name) {
+			      (*info->fprintf_func) (stream, "%s", name);
+		      } else {
+			      (*info->fprintf_func) (stream, "(%ld)", X_ASI (insn));
+		      }
 		      break;
 		    }
 
@@ -941,10 +970,11 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		      int val = *s == 'U' ? X_RS1 (insn) : X_RD (insn);
 		      const char *name = sparc_decode_sparclet_cpreg (val);
 
-		      if (name)
-			(*info->fprintf_func) (stream, "%s", name);
-		      else
-			(*info->fprintf_func) (stream, "%%cpreg(%d)", val);
+		      if (name) {
+			      (*info->fprintf_func) (stream, "%s", name);
+		      } else {
+			      (*info->fprintf_func) (stream, "%%cpreg(%d)", val);
+		      }
 		      break;
 		    }
 		  }
@@ -962,12 +992,12 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 	      unsigned long prev_insn;
 	      int errcode;
 
-	      if (memaddr >= 4)
-		errcode =
-		  (*info->read_memory_func)
-		  (memaddr - 4, buffer, sizeof (buffer), info);
-	      else
-		errcode = 1;
+	      if (memaddr >= 4) {
+		      errcode =
+			      (*info->read_memory_func) (memaddr - 4, buffer, sizeof (buffer), info);
+	      } else {
+		      errcode = 1;
+	      }
 
 	      prev_insn = getword (buffer);
 
@@ -983,13 +1013,13 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 
 		  if (is_delayed_branch (prev_insn))
 		    {
-		      if (memaddr >= 8)
-			errcode = (*info->read_memory_func)
-			  (memaddr - 8, buffer, sizeof (buffer), info);
-		      else
-			errcode = 1;
+			  if (memaddr >= 8) {
+				  errcode = (*info->read_memory_func) (memaddr - 8, buffer, sizeof (buffer), info);
+			  } else {
+				  errcode = 1;
+			  }
 
-		      prev_insn = getword (buffer);
+			  prev_insn = getword (buffer);
 		    }
 		}
 
@@ -1005,10 +1035,11 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 		      info->target =
 			((unsigned) 0xFFFFFFFF
 			 & ((int) X_IMM22 (prev_insn) << 10));
-		      if (imm_added_to_rs1)
-			info->target += X_SIMM (insn, 13);
-		      else
-			info->target |= X_SIMM (insn, 13);
+		      if (imm_added_to_rs1) {
+			      info->target += X_SIMM (insn, 13);
+		      } else {
+			      info->target |= X_SIMM (insn, 13);
+		      }
 		      (*info->print_address_func) (info->target, info);
 		      info->insn_type = dis_dref;
 		      info->data_size = 4;  /* FIXME!!! */
@@ -1020,14 +1051,18 @@ print_insn_sparc (bfd_vma memaddr, disassemble_info *info)
 	    {
 	      /* FIXME -- check is_annulled flag.  */
 	      (void) is_annulled;
-	      if (opcode->flags & F_UNBR)
-		info->insn_type = dis_branch;
-	      if (opcode->flags & F_CONDBR)
-		info->insn_type = dis_condbranch;
-	      if (opcode->flags & F_JSR)
-		info->insn_type = dis_jsr;
-	      if (opcode->flags & F_DELAYED)
-		info->branch_delay_insns = 1;
+	      if (opcode->flags & F_UNBR) {
+		      info->insn_type = dis_branch;
+	      }
+	      if (opcode->flags & F_CONDBR) {
+		      info->insn_type = dis_condbranch;
+	      }
+	      if (opcode->flags & F_JSR) {
+		      info->insn_type = dis_jsr;
+	      }
+	      if (opcode->flags & F_DELAYED) {
+		      info->branch_delay_insns = 1;
+	      }
 	    }
 
 	  return sizeof (buffer);
diff --git a/libr/asm/arch/sparc/gnu/sparc-opc.c b/libr/asm/arch/sparc/gnu/sparc-opc.c
index e51a227e05..dcf11adec9 100644
--- a/libr/asm/arch/sparc/gnu/sparc-opc.c
+++ b/libr/asm/arch/sparc/gnu/sparc-opc.c
@@ -95,9 +95,11 @@ sparc_opcode_lookup_arch (const char *name)
 {
   const struct sparc_opcode_arch *p;
 
-  for (p = &sparc_opcode_archs[0]; p->name; ++p)
-    if (strcmp (name, p->name) == 0)
-      return (enum sparc_opcode_arch_val) (p - &sparc_opcode_archs[0]);
+  for (p = &sparc_opcode_archs[0]; p->name; ++p) {
+	  if (strcmp (name, p->name) == 0) {
+		  return (enum sparc_opcode_arch_val) (p - &sparc_opcode_archs[0]);
+	  }
+  }
 
   return SPARC_OPCODE_ARCH_BAD;
 }
@@ -1843,9 +1845,11 @@ lookup_name (const arg *table, const char *name)
 {
   const arg *p;
 
-  for (p = table; p->name; ++p)
-    if (strcmp (name, p->name) == 0)
-      return p->value;
+  for (p = table; p->name; ++p) {
+	  if (strcmp (name, p->name) == 0) {
+		  return p->value;
+	  }
+  }
 
   return -1;
 }
@@ -1857,9 +1861,11 @@ lookup_value (const arg *table, int value)
 {
   const arg *p;
 
-  for (p = table; p->name; ++p)
-    if (value == p->value)
-      return p->name;
+  for (p = table; p->name; ++p) {
+	  if (value == p->value) {
+		  return p->name;
+	  }
+  }
 
   return NULL;
 }
diff --git a/libr/asm/arch/tms320/c55x_plus/c55plus.c b/libr/asm/arch/tms320/c55x_plus/c55plus.c
index 65560c1b30..2cbfb2bd82 100644
--- a/libr/asm/arch/tms320/c55x_plus/c55plus.c
+++ b/libr/asm/arch/tms320/c55x_plus/c55plus.c
@@ -38,8 +38,11 @@ int c55x_plus_disassemble(tms320_dasm_t *dasm, const ut8 *buf, int len) {
 	// opcode length
 	dasm->length = next_ins_pos;
 	ins_decoded_len = strlen(ins_decoded);
-	for (i = 0; i < ins_decoded_len; i++)
-		ins_decoded[i] = tolower((unsigned char)ins_decoded[i]);
+	for (i = 0; i < ins_decoded_len; i++) {
+		{
+			ins_decoded[i] = tolower ((unsigned char)ins_decoded[i]);
+		}
+	}
 	snprintf (dasm->syntax, sizeof(dasm->syntax), "%s", ins_decoded);
 	free (ins_decoded);
 	
diff --git a/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c b/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c
index 5fed7536fb..628c1bf7cc 100644
--- a/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c
+++ b/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c
@@ -60,8 +60,9 @@ static ut32 get_ins_bits(ut32 hash_code, ut32 ins_pos, char *ins,
 	ut32 len, x, i;
 	char *op_str, *aux;
 
-	if (ins[0] == 'q')
-		return get_q_bits(magic_value, ins, ins_len, err_code);
+	if (ins[0] == 'q') {
+		return get_q_bits (magic_value, ins, ins_len, err_code);
+	}
 
 	op_str = ins_str[1 + hash_code * 4];
 	//printf("OPSTR => %s %d\n", ins, ins_len);
@@ -83,8 +84,9 @@ static ut32 get_ins_bits(ut32 hash_code, ut32 ins_pos, char *ins,
 
 		x = len + 1;
 		res = (res * 2) | ((op_b >> ((1023 - len) % 8)) & 1);
-		if (!op_str[x])
+		if (!op_str[x]) {
 			x = 0;
+		}
 	}
 
 	if (C55PLUS_DEBUG) {
@@ -245,8 +247,9 @@ static char *decode_ins(st32 hash_code, ut32 ins_pos, ut32 ins_off, ut32 *ins_le
 		}
 	}
 
-	if (C55PLUS_DEBUG)
-		printf("PSEUDO INS %s\n", ins);
+	if (C55PLUS_DEBUG) {
+		printf ("PSEUDO INS %s\n", ins);
+	}
 
 	pos = ins;
 	// instruction length
@@ -274,8 +277,9 @@ static char *decode_ins(st32 hash_code, ut32 ins_pos, ut32 ins_off, ut32 *ins_le
 			token_aux[len] = '\0';
 			pos = aux;
 
-			if (C55PLUS_DEBUG)
-				printf("TOKEN AUX: %s\n", token_aux);
+			if (C55PLUS_DEBUG) {
+				printf ("TOKEN AUX: %s\n", token_aux);
+			}
 
 			reg = NULL;
 			for (i = 0; i < len; i++) {
@@ -283,8 +287,9 @@ static char *decode_ins(st32 hash_code, ut32 ins_pos, ut32 ins_off, ut32 *ins_le
 					len = (unsigned int)(size_t)(&token_aux[i] - token_aux);
 					reg = &token_aux[i + 1];
 
-					if (C55PLUS_DEBUG)
-						printf("REG : %s\n", reg);
+					if (C55PLUS_DEBUG) {
+						printf ("REG : %s\n", reg);
+					}
 					break;
 				}
 			}
@@ -306,8 +311,9 @@ static char *decode_ins(st32 hash_code, ut32 ins_pos, ut32 ins_off, ut32 *ins_le
 		pos++;
 	}
 
-	if (C55PLUS_DEBUG)
-		printf("RESULT DECODE: %s\n", res_decode);
+	if (C55PLUS_DEBUG) {
+		printf ("RESULT DECODE: %s\n", res_decode);
+	}
 
 	return res_decode;
 }
@@ -593,8 +599,9 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 			sprintf(buff_aux, "-#0x%lx", (long unsigned int)ins_bits);
 		}
 		res = strdup(buff_aux);
-		if (!reg_arg || *reg_arg != 'm')
+		if (!reg_arg || *reg_arg != 'm') {
 			break;
+		}
 
 		res = strcat_dup(res, ")", 1);
 		res = strcat_dup("*(", res, 2);
@@ -691,17 +698,21 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 		if (reg_arg) {
 			if (*reg_arg == '1') {
 				res = get_tc2_tc1(ins_bits >> 1);
-			} else if (*reg_arg == '2')
-				res = get_tc2_tc1(ins_bits & 1);
-		} else res = get_tc2_tc1(ins_bits);
+			} else if (*reg_arg == '2') {
+				res = get_tc2_tc1 (ins_bits & 1);
+			}
+		} else {
+			res = get_tc2_tc1 (ins_bits);
+		}
 		if (!res) {
 			*err_code = -1;
 			return NULL;
 		}
 		break;
 	case 52:
-		if (ins_bits == 0)
+		if (ins_bits == 0) {
 			break;
+		}
 		if (reg_arg) {
 			if (*reg_arg == 'H') {
 				res = "hi(";
@@ -766,8 +777,9 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 		break;
 	case 0:
 	case 1:
-		if (!ins_bits)
+		if (!ins_bits) {
 			break;
+		}
 		if (!reg_arg) {
 			res = "U";
 		} else {
@@ -775,13 +787,16 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 				res = "uns(";
 			} else if (*reg_arg == ')') {
 				res = ")";
-			} else res = "<$/#>";
+			} else {
+				res = "<$/#>";
+			}
 		}
 		res = strdup(res);
 		break;
 	case 2:
-		if (!ins_bits)
+		if (!ins_bits) {
 			break;
+		}
 		if (!reg_arg) {
 			res = "R";
 		} else {
@@ -789,13 +804,16 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 				res = "rnd(";
 			} else if (*reg_arg == ')') {
 				res = ")";
-			} else res = "<%>";
+			} else {
+				res = "<%>";
+			}
 		}
 		res = strdup(res);
 		break;
 	case 12:
-		if (!ins_bits)
+		if (!ins_bits) {
 			break;
+		}
 		if(!reg_arg) {
 			res = "F";
 		} else {
@@ -812,8 +830,9 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 		res = strdup(res);
 		break;
 	case 29:
-		if (!ins_bits)
+		if (!ins_bits) {
 			break;
+		}
 		if (!reg_arg) {
 			res = "saturate";
 		} else {
@@ -831,8 +850,9 @@ static char* get_token_decoded(st32 hash_code, char *ins_token, ut32 ins_token_l
 		res = (ins_bits != 0)? strdup("t3 = ") : NULL;
 		break;
 	case 17:
-		if (!ins_bits)
+		if (!ins_bits) {
 			break;
+		}
 		if (!reg_arg) {
 			res = "40";
 		} else {
diff --git a/libr/asm/arch/tms320/c55x_plus/decode_funcs.c b/libr/asm/arch/tms320/c55x_plus/decode_funcs.c
index 70e334e7d8..8567e173a6 100644
--- a/libr/asm/arch/tms320/c55x_plus/decode_funcs.c
+++ b/libr/asm/arch/tms320/c55x_plus/decode_funcs.c
@@ -258,8 +258,9 @@ char *get_reg_pair(ut32 idx) {
 	default: res = NULL;
 	}
 
-	if(res != NULL)
-		res = strdup(res);
+	if (res != NULL) {
+		res = strdup (res);
+	}
 
 	return res;
 }
@@ -322,8 +323,9 @@ char *get_reg_name_3(ut32 idx) {
 	default: res = NULL;
 	}
 
-	if (res != NULL)
-		res = strdup(res);
+	if (res != NULL) {
+		res = strdup (res);
+	}
 	return res;
 }
 
@@ -377,8 +379,9 @@ char *get_reg_name_2(ut32 idx) {
 	default: res = NULL;
 	}
 
-	if(res != NULL)
-		res = strdup(res);
+	if (res != NULL) {
+		res = strdup (res);
+	}
 
 	return res;
 }
@@ -631,8 +634,9 @@ char *get_reg_name_1(ut32 idx) {
 	default: res = NULL;
 	}
 
-	if(res != NULL)
-		res = strdup(res);
+	if (res != NULL) {
+		res = strdup (res);
+	}
 
 	return res;
 }
@@ -846,8 +850,9 @@ char *get_status_regs_and_bits(char *reg_arg, int reg_bit) {
         }
   }
 
-  if(res != NULL)
-	res = strdup(res);
+  if (res != NULL) {
+	  res = strdup (res);
+  }
 
   return res;
 }
diff --git a/libr/asm/arch/tms320/c55x_plus/hashtable.c b/libr/asm/arch/tms320/c55x_plus/hashtable.c
index 6caf6ef4b1..6691932801 100644
--- a/libr/asm/arch/tms320/c55x_plus/hashtable.c
+++ b/libr/asm/arch/tms320/c55x_plus/hashtable.c
@@ -26,25 +26,29 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 				if ( (ut32)v2 > 0xC4000000 ) {
 					if ( (ut32)v2 > 0xCE000000 ) {
 						if ( (ut32)v2 > 0xD4000000 ) {
-							if ( v2 == -704643072 )
+							if (v2 == -704643072) {
 								return 95;
+							}
 							return arg1;
 						}
 						if ( v2 != -738197504 && v2 != -805306368 ) {
-							if ( v2 == -771751936 )
+							if (v2 == -771751936) {
 								return 95;
+							}
 							return arg1;
 						}
 					} else {
 						if ( v2 != -838860800 ) {
 							if ( (ut32)v2 > 0xCA000000 ) {
-								if ( v2 == -872415232 )
+								if (v2 == -872415232) {
 									return 95;
+								}
 								return arg1;
 							}
 							if ( v2 != -905969664 && v2 != -973078528 ) {
-								if ( v2 == -939524096 )
+								if (v2 == -939524096) {
 									return 95;
+								}
 								return arg1;
 							}
 						}
@@ -54,12 +58,14 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 						if ( (ut32)v2 <= 0x7E000000 ) {
 							if ( v2 != 2113929216 ) {
 								if ( (ut32)v2 > 0x78000000 ) {
-									if ( v2 != 2046820352 && v2 != 2080374784 )
+									if (v2 != 2046820352 && v2 != 2080374784) {
 										return arg1;
+									}
 								} else {
 									if ( v2 != 2013265920 && v2 != 1946157056 ) {
-										if ( v2 == 1979711488 )
+										if (v2 == 1979711488) {
 											return 226;
+										}
 										return arg1;
 									}
 								}
@@ -67,15 +73,18 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 							return 226;
 						}
 						if ( (ut32)v2 > 0xC0000000 ) {
-							if ( v2 == -1040187392 )
+							if (v2 == -1040187392) {
 								return 95;
+							}
 							return arg1;
 						}
 						if ( v2 != 0xC0000000 ) {
-							if ( v2 == -1610612736 )
+							if (v2 == -1610612736) {
 								return 540;
-							if ( v2 == -1577058304 )
+							}
+							if (v2 == -1577058304) {
 								return 541;
+							}
 							return arg1;
 						}
 					}
@@ -86,63 +95,75 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 		if ( (ut32)v2 > 0xEC000000 ) {
 			if ( (ut32)v2 > 0xF6000000 ) {
 				if ( (ut32)v2 > 0xFC000000 ) {
-					if ( v2 != -33554432 )
+					if (v2 != -33554432) {
 						return arg1;
+					}
 					return 96;
 				}
-				if ( v2 == -67108864 || v2 == -134217728 )
+				if (v2 == -67108864 || v2 == -134217728) {
 					return 96;
+				}
 				v4 = v2 == -100663296;
 			} else {
-				if ( v2 == -167772160 )
+				if (v2 == -167772160) {
 					return 96;
+				}
 				if ( (ut32)v2 > 0xF2000000 ) {
 					v4 = v2 == -201326592;
 				} else {
-					if ( v2 == -234881024 || v2 == -301989888 )
+					if (v2 == -234881024 || v2 == -301989888) {
 						return 96;
+					}
 					v4 = v2 == -268435456;
 				}
 			}
 		} else {
-			if ( v2 == -335544320 )
+			if (v2 == -335544320) {
 				return 96;
+			}
 			if ( (ut32)v2 > 0xE2000000 ) {
 				if ( (ut32)v2 > 0xE8000000 ) {
 					v4 = v2 == -369098752;
 				} else {
-					if ( v2 == -402653184 || v2 == -469762048 )
+					if (v2 == -402653184 || v2 == -469762048) {
 						return 96;
+					}
 					v4 = v2 == -436207616;
 				}
 			} else {
-				if ( v2 == -503316480 )
+				if (v2 == -503316480) {
 					return 96;
+				}
 				if ( (ut32)v2 <= 0xDE000000 ) {
-					if ( v2 != -570425344 && v2 != -637534208 && v2 != -603979776 )
+					if (v2 != -570425344 && v2 != -637534208 && v2 != -603979776) {
 						return arg1;
+					}
 					return 95;
 				}
 				v4 = v2 == -536870912;
 			}
 		}
-		if ( !v4 )
+		if (!v4) {
 			return arg1;
+		}
 		return 96;
 	}
-	if ( (arg2 & 0xFE000000) == 1912602624 )
+	if ((arg2 & 0xFE000000) == 1912602624) {
 		return 226;
+	}
 	if ( (ut32)v2 > 0x48000000 ) {
 		if ( (ut32)v2 <= 0x5E000000 ) {
 			if ( v2 != 1577058304 ) {
 				if ( (ut32)v2 > 0x54000000 ) {
 					if ( (ut32)v2 > 0x5A000000 ) {
-						if ( v2 != 1543503872 )
+						if (v2 != 1543503872) {
 							return arg1;
+						}
 					} else {
 						if ( v2 != 1509949440 && v2 != 1442840576 ) {
-							if ( v2 == 1476395008 )
+							if (v2 == 1476395008) {
 								return 178;
+							}
 							return arg1;
 						}
 					}
@@ -150,14 +171,16 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 					if ( v2 != 1409286144 ) {
 						if ( (ut32)v2 > 0x4E000000 ) {
 							if ( v2 != 1342177280 ) {
-								if ( v2 == 1375731712 )
+								if (v2 == 1375731712) {
 									return 178;
+								}
 								return arg1;
 							}
 						} else {
 							if ( v2 != 1308622848 && v2 != 1241513984 ) {
-								if ( v2 == 1275068416 )
+								if (v2 == 1275068416) {
 									return 178;
+								}
 								return arg1;
 							}
 						}
@@ -168,58 +191,67 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 		}
 		if ( (ut32)v2 > 0x68000000 ) {
 			if ( (ut32)v2 > 0x6E000000 ) {
-				if ( v2 == 1879048192 )
+				if (v2 == 1879048192) {
 					return 226;
+				}
 				return arg1;
 			}
 			if ( v2 != 1845493760 && v2 != 1778384896 ) {
-				if ( v2 == 1811939328 )
+				if (v2 == 1811939328) {
 					return 226;
+				}
 				return arg1;
 			}
 		} else {
 			if ( v2 != 1744830464 ) {
 				if ( (ut32)v2 > 0x64000000 ) {
-					if ( v2 == 1711276032 )
+					if (v2 == 1711276032) {
 						return 226;
+					}
 					return arg1;
 				}
 				if ( v2 != 1677721600 && v2 != 1610612736 ) {
-					if ( v2 == 1644167168 )
+					if (v2 == 1644167168) {
 						return 226;
+					}
 					return arg1;
 				}
 			}
 		}
 		return 226;
 	}
-	if ( v2 == 1207959552 )
+	if (v2 == 1207959552) {
 		return 178;
+	}
 	if ( (ut32)v2 <= 0x14000000 ) {
 		if ( v2 != 335544320 ) {
 			if ( (ut32)v2 > 0xA000000 ) {
 				if ( (ut32)v2 > 0x10000000 ) {
-					if ( v2 == 301989888 )
+					if (v2 == 301989888) {
 						return 142;
+					}
 					return arg1;
 				}
 				if ( v2 != 268435456 && v2 != 201326592 ) {
-					if ( v2 == 234881024 )
+					if (v2 == 234881024) {
 						return 142;
+					}
 					return arg1;
 				}
 			} else {
 				if ( v2 != 167772160 ) {
 					if ( (ut32)v2 > 0x4000000 ) {
 						if ( v2 != 100663296 ) {
-							if ( v2 == 134217728 )
+							if (v2 == 134217728) {
 								return 142;
+							}
 							return arg1;
 						}
 					} else {
 						if ( v2 != 67108864 && v2 ) {
-							if ( v2 == 33554432 )
+							if (v2 == 33554432) {
 								return 142;
+							}
 							return arg1;
 						}
 					}
@@ -230,45 +262,54 @@ st32 get_hashfunc_02(st32 arg1, st32 arg2) {
 	}
 	if ( (ut32)v2 > 0x1E000000 ) {
 		if ( (ut32)v2 > 0x44000000 ) {
-			if ( v2 == 1174405120 )
+			if (v2 == 1174405120) {
 				return 178;
+			}
 			return arg1;
 		}
 		if ( v2 != 1140850688 && v2 != 0x40000000 ) {
-			if ( v2 == 1107296256 )
+			if (v2 == 1107296256) {
 				return 178;
+			}
 			return arg1;
 		}
 		return 178;
 	}
-	if ( v2 == 503316480 )
+	if (v2 == 503316480) {
 		return 142;
+	}
 	if ( (ut32)v2 <= 0x1A000000 ) {
 		if ( v2 != 436207616 && v2 != 369098752 ) {
-			if ( v2 == 402653184 )
+			if (v2 == 402653184) {
 				return 142;
+			}
 			return arg1;
 		}
 		return 142;
 	}
-	if ( v2 == 469762048 )
+	if (v2 == 469762048) {
 		return 142;
+	}
 	return arg1;
 }
 
 st32 get_hashfunc_03(st32 arg1, st32 arg2) {
 	st32 v2 = arg2 & 0xE0000000;
 	if ( (arg2 & 0xE0000000u) <= 0x80000000 ) {
-		if ( (arg2 & 0xE0000000) == 0x80000000)
+		if ((arg2 & 0xE0000000) == 0x80000000) {
 			return 102;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 485;
-		if ( v2 == 536870912 )
+		}
+		if (v2 == 536870912) {
 			return 486;
+		}
 		return arg1;
 	}
-	if (v2 != 0xA0000000)
+	if (v2 != 0xA0000000) {
 		return arg1;
+	}
 	return 475;
 }
 
@@ -276,10 +317,14 @@ st32 get_hashfunc_04(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x80000000 ) {
-		if ( (arg2 & 0x80000000) == 0x80000000)
+		if ((arg2 & 0x80000000) == 0x80000000) {
 			result = 99;
-		else result = arg1;
-	} else result = 100;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 100;
+	}
 	return result;
 }
 
@@ -287,10 +332,14 @@ st32 get_hashfunc_05(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x80000000 ) {
-		if ( (arg2 & 0x80000000) == 0x80000000)
+		if ((arg2 & 0x80000000) == 0x80000000) {
 			result = 97;
-		else result = arg1;
-	} else result = 98;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 98;
+	}
 	return result;
 }
 
@@ -298,10 +347,14 @@ st32 get_hashfunc_06(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x80000000 ) {
-		if ( (st32)(arg2 & 0x80000000) == 0x80000000 )
+		if ((st32) (arg2 & 0x80000000) == 0x80000000) {
 			result = 228;
-		else result = arg1;
-	} else result = 227;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 227;
+	}
 	return result;
 }
 
@@ -309,10 +362,14 @@ st32 get_hashfunc_07(st32 arg1, st32 arg2) {
 	st32 result;
 
 	if ( arg2 & 0x80000000 ) {
-		if ( (arg2 & 0x80000000) == 0x80000000)
+		if ((arg2 & 0x80000000) == 0x80000000) {
 			result = 52;
-		else result = arg1;
-	} else result = 140;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 140;
+	}
 	return result;
 }
 
@@ -321,16 +378,20 @@ st32 get_hashfunc_08(st32 arg1, st32 arg2) {
 
 	tmp = arg2 & 0xC0000000;
 	if ( (arg2 & 0xC0000000u) <= 0x80000000 ) {
-		if ( (arg2 & 0xC0000000) == 0x80000000)
+		if ((arg2 & 0xC0000000) == 0x80000000) {
 			return 87;
-		if ( !tmp )
+		}
+		if (!tmp) {
 			return 85;
-		if ( tmp == 0x40000000 )
+		}
+		if (tmp == 0x40000000) {
 			return 86;
+		}
 		return arg1;
 	}
-	if ( tmp != 0xC0000000 )
+	if (tmp != 0xC0000000) {
 		return arg1;
+	}
 	return 88;
 }
 
@@ -339,16 +400,20 @@ st32 get_hashfunc_09(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0xC0000000;
 	if ( (arg2 & 0xC0000000u) <= 0x80000000 ) {
-		if ( (arg2 & 0xC0000000) == 0x80000000)
+		if ((arg2 & 0xC0000000) == 0x80000000) {
 			return 91;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 89;
-		if ( v2 == 0x40000000 )
+		}
+		if (v2 == 0x40000000) {
 			return 90;
+		}
 		return arg1;
 	}
-	if ( v2 != 0xC0000000 )
+	if (v2 != 0xC0000000) {
 		return arg1;
+	}
 	return 92;
 }
 
@@ -359,16 +424,20 @@ st32 get_hashfunc_10(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x500000;
 	if ( (ut32)v3 <= 0x400000 ) {
-		if ( v3 == 4194304 )
+		if (v3 == 4194304) {
 			return 247;
-		if ( !v3 )
+		}
+		if (!v3) {
 			return 245;
-		if ( v3 == 1048576 )
+		}
+		if (v3 == 1048576) {
 			return 249;
+		}
 		return arg1;
 	}
-	if ( v3 != 5242880 )
+	if (v3 != 5242880) {
 		return arg1;
+	}
 	return 248;
 }
 
@@ -378,10 +447,11 @@ st32 get_hashfunc_11(st32 arg1, st32 arg2) {
 	/* */
 
 	if ( (ut32)hash_const_05 & arg2 ) {
-		if ( ((ut32)hash_const_05 & arg2) == 524288 )
+		if (((ut32)hash_const_05 & arg2) == 524288) {
 			result = 460;
-		else
+		} else {
 			result = arg1;
+		}
 	} else {
 		result = 244;
 	}
@@ -396,10 +466,14 @@ st32 get_hashfunc_12(st32 arg1, st32 arg2) {
 	tmp = arg2;
 	v3 = tmp & 0x400000;
 	if ( v3 ) {
-		if ( v3 == 4194304 )
+		if (v3 == 4194304) {
 			result = 521;
-		else result = arg1;
-	} else result = 374;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 374;
+	}
 	return result;
 }
 
@@ -407,10 +481,14 @@ st32 get_hashfunc_13(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 30;
-		else result = arg1;
-	} else result = 32;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 32;
+	}
 	return result;
 }
 
@@ -418,10 +496,14 @@ st32 get_hashfunc_14(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if (arg2 & 0x1000000) {
-		if ( (arg2 & 0x1000000) == 0x1000000)
+		if ((arg2 & 0x1000000) == 0x1000000) {
 			result = 61;
-		else result = arg1;
-	} else result = 60;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 60;
+	}
 	return result;
 }
 
@@ -429,11 +511,14 @@ st32 get_hashfunc_15(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 63;
-		else
+		} else {
 			result = arg1;
-	} else result = 62;
+		}
+	} else {
+		result = 62;
+	}
 	return result;
 }
 
@@ -441,11 +526,14 @@ st32 get_hashfunc_16(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 69;
-		else
+		} else {
 			result = arg1;
-	} else result = 64;
+		}
+	} else {
+		result = 64;
+	}
 	return result;
 }
 
@@ -453,11 +541,14 @@ st32 get_hashfunc_17(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 68;
-		else
+		} else {
 			result = arg1;
-	} else result = 67;
+		}
+	} else {
+		result = 67;
+	}
 	return result;
 }
 
@@ -465,11 +556,14 @@ st32 get_hashfunc_18(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 66;
-		else
+		} else {
 			result = arg1;
-	} else result = 65;
+		}
+	} else {
+		result = 65;
+	}
 	return result;
 }
 
@@ -478,12 +572,14 @@ st32 get_hashfunc_19(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0xC1000000;
 	if ( (arg2 & 0xC1000000u) > 0x40000000 ) {
-		if ( v2 != 0x80000000 && v2 != 0xC0000000 )
+		if (v2 != 0x80000000 && v2 != 0xC0000000) {
 			return arg1;
+		}
 	} else {
 		if ( (arg2 & 0xC1000000) != 0x40000000 && v2 ) {
-			if ( v2 == 16777216 )
+			if (v2 == 16777216) {
 				return 469;
+			}
 			return arg1;
 		}
 	}
@@ -495,16 +591,20 @@ st32 get_hashfunc_20(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0x1400000;
 	if ( (arg2 & 0x1400000u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1400000) == 16777216 )
+		if ((arg2 & 0x1400000) == 16777216) {
 			return 75;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 74;
-		if ( v2 == 4194304 )
+		}
+		if (v2 == 4194304) {
 			return 78;
+		}
 		return arg1;
 	}
-	if ( v2 != 20971520 )
+	if (v2 != 20971520) {
 		return arg1;
+	}
 	return 77;
 }
 
@@ -513,16 +613,20 @@ st32 get_hashfunc_21(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0x1400000;
 	if ( (arg2 & 0x1400000u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1400000) == 16777216 )
+		if ((arg2 & 0x1400000) == 16777216) {
 			return 73;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 72;
-		if ( v2 == 4194304 )
+		}
+		if (v2 == 4194304) {
 			return 108;
+		}
 		return arg1;
 	}
-	if ( v2 != 20971520 )
+	if (v2 != 20971520) {
 		return arg1;
+	}
 	return 109;
 }
 
@@ -530,10 +634,14 @@ st32 get_hashfunc_22(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x8200 ) {
-		if ( (unsigned short)(arg2 & 0x8200) == 512 )
+		if ((unsigned short)(arg2 & 0x8200) == 512) {
 			result = 364;
-		else result = arg1;
-	} else result = 357;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 357;
+	}
 	return result;
 }
 
@@ -544,24 +652,29 @@ st32 get_hashfunc_23(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x41C000;
 	if ( (ut32)v3 <= 0x400000 ) {
-		if ( v3 == 4194304 )
+		if (v3 == 4194304) {
 			return 323;
+		}
 		if ( (ut32)v3 <= 0xC000 ) {
 			if ( v3 != 49152 ) {
-				if ( !v3 )
+				if (!v3) {
 					return 324;
-				if ( v3 == 16384 )
+				}
+				if (v3 == 16384) {
 					return 370;
-				if ( v3 == 32768 )
+				}
+				if (v3 == 32768) {
 					return 325;
+				}
 				return arg1;
 			}
 			return 372;
 		}
 		if ( v3 != 65536 ) {
 			if ( v3 != 81920 ) {
-				if ( v3 == 114688 )
+				if (v3 == 114688) {
 					return 371;
+				}
 				return arg1;
 			}
 			return 373;
@@ -570,20 +683,24 @@ st32 get_hashfunc_23(st32 arg1, st32 arg2) {
 	}
 	if ( (ut32)v3 <= 0x410000 ) {
 		if ( v3 != 4259840 ) {
-			if ( v3 == 4210688 )
+			if (v3 == 4210688) {
 				return 369;
+			}
 			//if ( (st32 (*)(char))v3 == (char *)hash_const_01 )
-			if (v3 == hash_const_01)
+			if (v3 == hash_const_01) {
 				return 325;
-			if ( v3 != 4243456 )
+			}
+			if (v3 != 4243456) {
 				return arg1;
+			}
 			return 372;
 		}
 		return 314;
 	}
 	if ( v3 != 4276224 ) {
-		if ( v3 == 4308992 )
+		if (v3 == 4308992) {
 			return 371;
+		}
 		return arg1;
 	}
 	return 373;
@@ -596,26 +713,34 @@ st32 get_hashfunc_24(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x418000;
 	if ( (ut32)v3 <= 0x400000 ) {
-		if ( v3 == 4194304 )
+		if (v3 == 4194304) {
 			return 330;
+		}
 		if ( (ut32)v3 <= 0x10000 ) {
 			if ( v3 != 65536 ) {
-				if ( !v3 )
+				if (!v3) {
 					return 329;
-				if ( v3 == 32768 )
+				}
+				if (v3 == 32768) {
 					return 307;
+				}
 				return arg1;
 			}
 			return 480;
 		}
-		if ( v3 == 98304 )
+		if (v3 == 98304) {
 			return 467;
+		}
 		return arg1;
 	}
 	//if ( (st32 (*)(char))v3 != (char *)hash_const_01 ) {
 	if (v3 != hash_const_01) {
-		if (v3 == 4259840) return 480;
-		if (v3 == 4292608) return 467;
+		if (v3 == 4259840) {
+			return 480;
+		}
+		if (v3 == 4292608) {
+			return 467;
+		}
 		return arg1;
 	}
 	return 308;
@@ -629,26 +754,30 @@ st32 get_hashfunc_25(st32 arg1, st32 arg2) {
 		if ( ((ut32)hash_const_02 & arg2) != 32768 ) {
 			if ( v2 <= 0x400 ) {
 				if ( v2 != 1024 && v2 ) {
-					if ( v2 == 512 )
+					if (v2 == 512) {
 						return 365;
+					}
 					return arg1;
 				}
 				return 365;
 			}
-			if ( v2 == 1536 )
+			if (v2 == 1536) {
 				return 365;
+			}
 			return arg1;
 		}
 		return 382;
 	}
 	if ( v2 <= 0x8600 ) {
-		if ( v2 != 34304 && v2 != 33280 && v2 != 33792 )
+		if (v2 != 34304 && v2 != 33280 && v2 != 33792) {
 			return arg1;
+		}
 		return 382;
 	}
 	//if ( (st32 (*)(char))v2 != (char *)hash_const_01 )
-	if (v2 != hash_const_01)
+	if (v2 != hash_const_01) {
 		return arg1;
+	}
 	return 380;
 }
 
@@ -659,19 +788,22 @@ st32 get_hashfunc_26(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x41C000;
 	if ( (ut32)v3 <= 0x404000 ) {
-		if ( v3 == 4210688 || v3 == 16384 )
+		if (v3 == 4210688 || v3 == 16384) {
 			return 310;
+		}
 		if ( v3 != 49152 ) {
-			if ( v3 == 4194304 )
+			if (v3 == 4194304) {
 				return 312;
+			}
 			return arg1;
 		}
 		return 311;
 	}
 	//if ( (st32 (*)(char))v3 != (st32 (*)(char))hash_const_01 ) {
 	if (v3 != hash_const_01) {
-		if ( v3 != 4243456 )
+		if (v3 != 4243456) {
 			return arg1;
+		}
 		return 311;
 	}
 	return 313;
@@ -688,10 +820,11 @@ st32 get_hashfunc_27(st32 arg1, st32 arg2) {
 		if ( v3 == 32768 ) {
 			result = 376;
 		} else {
-			if ( v3 == 65536 )
+			if (v3 == 65536) {
 				result = 377;
-			else
+			} else {
 				result = arg1;
+			}
 		}
 	} else {
 		result = 375;
@@ -710,33 +843,39 @@ st32 get_hashfunc_28(st32 arg1, st32 arg2) {
 	if ( (ut32)v3 <= 0xA000 ) {
 		if ( v3 != 40960 ) {
 			if ( (ut32)v3 <= 0x3000 ) {
-				if ( v3 == 12288 )
+				if (v3 == 12288) {
 					return 384;
+				}
 				if ( (ut32)v3 <= 0x1800 ) {
 					if ( v3 != 6144 && v3 && v3 != 2048 ) {
-						if ( v3 == 4096 )
+						if (v3 == 4096) {
 							return 384;
+						}
 						return arg1;
 					}
 					return 384;
 				}
-				if ( v3 == 8192 || v3 == 10240 )
+				if (v3 == 8192 || v3 == 10240) {
 					return 384;
+				}
 				return arg1;
 			}
 			if ( (ut32)v3 > 0x8800 ) {
 				if ( v3 != 36864 ) {
-					if ( v3 == 38912 )
+					if (v3 == 38912) {
 						return 385;
+					}
 					return arg1;
 				}
 			} else {
 				if ( v3 != 34816 ) {
 					if ( v3 != 14336 ) {
-						if ( v3 == 24576 )
+						if (v3 == 24576) {
 							return 388;
-						if ( v3 == 32768 )
+						}
+						if (v3 == 32768) {
 							return 385;
+						}
 						return arg1;
 					}
 					return 384;
@@ -746,33 +885,41 @@ st32 get_hashfunc_28(st32 arg1, st32 arg2) {
 		return 385;
 	}
 	if ( (ut32)v3 <= 0x11000 ) {
-		if ( v3 == 69632 )
+		if (v3 == 69632) {
 			return 386;
+		}
 		if ( (ut32)v3 <= 0xE000 ) {
-			if ( v3 == 57344 )
+			if (v3 == 57344) {
 				return 387;
-			if ( v3 != 43008 && v3 != 45056 && v3 != 47104 )
+			}
+			if (v3 != 43008 && v3 != 45056 && v3 != 47104) {
 				return arg1;
+			}
 			return 385;
 		}
-		if ( v3 == 65536 )
+		if (v3 == 65536) {
 			return 386;
+		}
 		v5 = v3 == 67584;
 		LABEL_35:
-		if ( !v5 )
-			return arg1;
-		return 386;
+			if (!v5) {
+				return arg1;
+			}
+			return 386;
 	}
 	if ( (ut32)v3 <= 0x13000 ) {
-		if ( v3 == 77824 || v3 == 71680 || v3 == 73728 )
+		if (v3 == 77824 || v3 == 71680 || v3 == 73728) {
 			return 386;
+		}
 		v5 = v3 == 75776;
 		goto LABEL_35;
 	}
-	if ( v3 == 79872 )
+	if (v3 == 79872) {
 		return 386;
-	if ( v3 != 90112 )
+	}
+	if (v3 != 90112) {
 		return arg1;
+	}
 	return 389;
 }
 
@@ -784,16 +931,20 @@ st32 get_hashfunc_29(st32 arg1, st32 arg2) {
 	v3 = v2 & 0x40F800;
 	if ( v3 <= (ut32)hash_const_03 ) {
 		//if ( (st32 (*)(int, int, int))v3 == (st32 (*)(int, int, int))hash_const_03)
-		if (v3 == hash_const_03)
+		if (v3 == hash_const_03) {
 			return 305;
-		if ( v3 == 40960 )
+		}
+		if (v3 == 40960) {
 			return 306;
-		if ( v3 == 57344 )
+		}
+		if (v3 == 57344) {
 			return 391;
+		}
 		return arg1;
 	}
-	if (v3 != 4218880)
+	if (v3 != 4218880) {
 		return arg1;
+	}
 	return 390;
 }
 
@@ -808,12 +959,15 @@ st32 get_hashfunc_30(st32 arg1, st32 arg2) {
 		if ( v3 == 32768 ) {
 			result = 303;
 		} else {
-			if ( v3 == 65536 )
+			if (v3 == 65536) {
 				result = 304;
-			else
+			} else {
 				result = arg1;
+			}
 		}
-	} else result = 302;
+	} else {
+		result = 302;
+	}
 	return result;
 }
 
@@ -822,18 +976,23 @@ st32 get_hashfunc_31(st32 arg1, st32 arg2) {
 	st32 v3 = arg2 & 0x380000;
 
 	if ( (ut32)v3 <= 0x200000 ) {
-		if ( v3 == 2097152 )
+		if (v3 == 2097152) {
 			return 271;
+		}
 		if ( (ut32)v3 > 0x100000 ) {
-			if ( v3 == 1572864 )
+			if (v3 == 1572864) {
 				return 534;
+			}
 		} else {
-			if ( v3 == 1048576 )
+			if (v3 == 1048576) {
 				return 317;
-			if ( !v3 )
+			}
+			if (!v3) {
 				return 319;
-			if ( v3 == 524288 )
+			}
+			if (v3 == 524288) {
 				return 533;
+			}
 		}
 		return arg1;
 	}
@@ -843,8 +1002,9 @@ st32 get_hashfunc_31(st32 arg1, st32 arg2) {
 		if ( v3 == 3145728 ) {
 			result = 321;
 		} else {
-			if ( v3 != 3670016 )
+			if (v3 != 3670016) {
 				return arg1;
+			}
 			result = 536;
 		}
 	}
@@ -862,10 +1022,11 @@ st32 get_hashfunc_32(st32 arg1, st32 arg2) {
 		if ( v3 == 32768 ) {
 			result = 258;
 		} else {
-			if ( v3 == 65536 )
+			if (v3 == 65536) {
 				result = 259;
-			else
+			} else {
 				result = arg1;
+			}
 		}
 	} else {
 		result = 261;
@@ -878,11 +1039,14 @@ st32 get_hashfunc_33(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x8000 ) {
-		if ( (unsigned short)(arg2 & 0x8000) == 32768 )
+		if ((unsigned short)(arg2 & 0x8000) == 32768) {
 			result = 327;
-		else
+		} else {
 			result = arg1;
-	} else result = 326;
+		}
+	} else {
+		result = 326;
+	}
 	return result;
 }
 
@@ -891,21 +1055,26 @@ st32 get_hashfunc_34(st32 arg1, st32 arg2) {
 	st32 v2 = arg2;
 	st32 v3 = v2 & 0x580000;
 	if ( (ut32)v3 <= 0x180000 ) {
-		if ( v3 == 1572864 )
+		if (v3 == 1572864) {
 			return 471;
-		if ( !v3 )
+		}
+		if (!v3) {
 			return 392;
-		if ( v3 == 524288 )
+		}
+		if (v3 == 524288) {
 			return 470;
-		if ( v3 == 1048576 )
+		}
+		if (v3 == 1048576) {
 			return 393;
+		}
 		return arg1;
 	}
 	if ( v3 == 4194304 ) {
 		result = 394;
 	} else {
-		if ( v3 != 5242880 )
+		if (v3 != 5242880) {
 			return arg1;
+		}
 		result = 395;
 	}
 	return result;
@@ -916,11 +1085,14 @@ st32 get_hashfunc_35(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 189;
-		else
+		} else {
 			result = arg1;
-	} else result = 186;
+		}
+	} else {
+		result = 186;
+	}
 	return result;
 }
 
@@ -928,11 +1100,14 @@ st32 get_hashfunc_36(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1C00000 ) {
-		if ( (arg2 & 0x1C00000) == 16777216 )
+		if ((arg2 & 0x1C00000) == 16777216) {
 			result = 188;
-		else
+		} else {
 			result = arg1;
-	} else result = 187;
+		}
+	} else {
+		result = 187;
+	}
 	return result;
 }
 
@@ -942,10 +1117,11 @@ st32 get_hashfunc_37(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1800000) == 8388608 ) {
 		result = 473;
 	} else {
-		if ( (arg2 & 0x1800000) == 25165824 )
+		if ((arg2 & 0x1800000) == 25165824) {
 			result = 474;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -953,16 +1129,20 @@ st32 get_hashfunc_37(st32 arg1, st32 arg2) {
 st32 get_hashfunc_38(st32 arg1, st32 arg2) {
 	st32 v2 = arg2 & 0x1010000;
 	if ( (arg2 & 0x1010000u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1010000) == 16777216 )
+		if ((arg2 & 0x1010000) == 16777216) {
 			return 472;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 23;
-		if ( v2 == 65536 )
+		}
+		if (v2 == 65536) {
 			return 24;
+		}
 		return arg1;
 	}
-	if ( v2 != 16842752 )
+	if (v2 != 16842752) {
 		return arg1;
+	}
 	return 26;
 }
 
@@ -972,10 +1152,11 @@ st32 get_hashfunc_39(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1010000) == 65536 ) {
 		result = 25;
 	} else {
-		if ( (arg2 & 0x1010000) == 16842752 )
+		if ((arg2 & 0x1010000) == 16842752) {
 			result = 27;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -984,11 +1165,14 @@ st32 get_hashfunc_40(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1010000 ) {
-		if ( (arg2 & 0x1010000) == 16777216 )
+		if ((arg2 & 0x1010000) == 16777216) {
 			result = 135;
-		else
+		} else {
 			result = arg1;
-	} else result = 134;
+		}
+	} else {
+		result = 134;
+	}
 	return result;
 }
 
@@ -999,28 +1183,35 @@ st32 get_hashfunc_41(st32 arg1, st32 arg2) {
 		if ( v2 == 16777216 ) {
 			result = 138;
 		} else {
-			if ( v2 == 16842752 )
+			if (v2 == 16842752) {
 				result = 139;
-			else
+			} else {
 				result = arg1;
+			}
 		}
-	} else result = 137;
+	} else {
+		result = 137;
+	}
 	return result;
 }
 
 st32 get_hashfunc_42(st32 arg1, st32 arg2) {
 	st32 v2 = arg2 & 0x1010000;
 	if ( (arg2 & 0x1010000u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1010000) == 16777216 )
+		if ((arg2 & 0x1010000) == 16777216) {
 			return 12;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 11;
-		if ( v2 == 65536 )
+		}
+		if (v2 == 65536) {
 			return 8;
+		}
 		return arg1;
 	}
-	if ( v2 != 16842752 )
+	if (v2 != 16842752) {
 		return arg1;
+	}
 	return 9;
 }
 
@@ -1029,16 +1220,20 @@ st32 get_hashfunc_43(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0x1010000;
 	if ( (arg2 & 0x1010000u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1010000) == 16777216 )
+		if ((arg2 & 0x1010000) == 16777216) {
 			return 13;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 15;
-		if ( v2 == 65536 )
+		}
+		if (v2 == 65536) {
 			return 10;
+		}
 		return arg1;
 	}
-	if ( v2 != 16842752 )
+	if (v2 != 16842752) {
 		return arg1;
+	}
 	return 14;
 }
 
@@ -1046,11 +1241,14 @@ st32 get_hashfunc_44(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 29;
-		else
+		} else {
 			result = arg1;
-	} else result = 28;
+		}
+	} else {
+		result = 28;
+	}
 	return result;
 }
 
@@ -1058,11 +1256,14 @@ st32 get_hashfunc_45(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 17;
-		else
+		} else {
 			result = arg1;
-	} else result = 16;
+		}
+	} else {
+		result = 16;
+	}
 	return result;
 }
 
@@ -1071,12 +1272,14 @@ st32 get_hashfunc_46(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0xC1000000;
 	if ( (arg2 & 0xC1000000u) > 0x40000000 ) {
-		if ( v2 != 0x80000000 && v2 != 0xC0000000 )
+		if (v2 != 0x80000000 && v2 != 0xC0000000) {
 			return arg1;
+		}
 	} else {
 		if ( (arg2 & 0xC1000000) != 0x40000000 && v2 ) {
-			if ( v2 == 16777216 )
+			if (v2 == 16777216) {
 				return 136;
+			}
 			return arg1;
 		}
 	}
@@ -1087,11 +1290,14 @@ st32 get_hashfunc_47(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 130;
-		else
+		} else {
 			result = arg1;
-	} else result = 132;
+		}
+	} else {
+		result = 132;
+	}
 	return result;
 }
 
@@ -1099,11 +1305,14 @@ st32 get_hashfunc_48(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 133;
-		else
+		} else {
 			result = arg1;
-	} else result = 131;
+		}
+	} else {
+		result = 131;
+	}
 	return result;
 }
 
@@ -1111,58 +1320,75 @@ st32 get_hashfunc_49(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if (arg2 & 0x80000000) {
-		if ((arg2 & 0x80000000) == 0x80000000)
+		if ((arg2 & 0x80000000) == 0x80000000) {
 			result = 33;
-		else result = arg1;
-	} else result = 35;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 35;
+	}
 	return result;
 }
 
 st32 get_hashfunc_50(st32 arg1, st32 arg2) {
 	st32 v3 = arg2 & 0x780000;
 	if ( (ut32)v3 <= 0x400000 ) {
-		if ( v3 == 4194304 )
+		if (v3 == 4194304) {
 			return 522;
+		}
 		if ( (ut32)v3 > 0x180000 ) {
-			if ( v3 == 2621440 )
+			if (v3 == 2621440) {
 				return 402;
-			if ( v3 == 3145728 )
+			}
+			if (v3 == 3145728) {
 				return 411;
+			}
 		} else {
-			if ( v3 == 1572864 )
+			if (v3 == 1572864) {
 				return 401;
-			if ( !v3 )
+			}
+			if (!v3) {
 				return 403;
-			if ( v3 == 524288 )
+			}
+			if (v3 == 524288) {
 				return 400;
+			}
 		}
 		return arg1;
 	}
 	if ((ut32)v3 <= 0x680000) {
-		if (v3 == 0x680000)
+		if (v3 == 0x680000) {
 			return 526;
-		if (v3 == hash_const_05)
+		}
+		if (v3 == hash_const_05) {
 			return 524;
-		if ( v3 == 0x580000)
+		}
+		if (v3 == 0x580000) {
 			return 525;
+		}
 		return arg1;
 	}
-	if ( v3 != 7340032 )
+	if (v3 != 7340032) {
 		return arg1;
+	}
 	return 523;
 }
 
 st32 get_hashfunc_51(st32 arg1, st32 arg2) {
 	st32 v3 = arg2 & 0x180000;
 	if ( (ut32)v3 > 0x100000 ) {
-		if ( v3 != 1572864 )
+		if (v3 != 1572864) {
 			return arg1;
+		}
 	} else {
 		if ( v3 != 1048576 ) {
-			if ( !v3 )
+			if (!v3) {
 				return 396;
-			if ( v3 == 524288 )
+			}
+			if (v3 == 524288) {
 				return 532;
+			}
 			return arg1;
 		}
 	}
@@ -1172,13 +1398,20 @@ st32 get_hashfunc_51(st32 arg1, st32 arg2) {
 st32 get_hashfunc_52(st32 arg1, st32 arg2) {
 	st32 v3 = arg2 & 0x18000;
 	if ( (ut32)v3 <= 0x10000 ) {
-		if (v3 == 0x10000) return 296;
-		if (v3 == 0x8000) return 300;
-		if (!v3) return 298;
+		if (v3 == 0x10000) {
+			return 296;
+		}
+		if (v3 == 0x8000) {
+			return 300;
+		}
+		if (!v3) {
+			return 298;
+		}
 		return arg1;
 	}
-	if (v3 != 0x18000)
+	if (v3 != 0x18000) {
 		return arg1;
+	}
 	return 301;
 }
 
@@ -1192,33 +1425,43 @@ st32 get_hashfunc_53(st32 arg1, st32 arg2) {
 		} else {
 			result = (v2==0x8000)? 297: arg1;
 		}
-	} else result = 355;
+	} else {
+		result = 355;
+	}
 	return result;
 }
 
 st32 get_hashfunc_54(st32 arg1, st32 arg2) {
 	st32 v2 = arg2 & 0x8200;
 	if ( (ut32)v2 <= 0x8000 ) {
-		if ( v2 == 32768 )
+		if (v2 == 32768) {
 			return 316;
-		if ( !(arg2 & 0x8200) )
+		}
+		if (!(arg2 & 0x8200)) {
 			return 410;
-		if ( v2 == 512 )
+		}
+		if (v2 == 512) {
 			return 531;
+		}
 		return arg1;
 	}
-	if ( v2 != 33280 )
+	if (v2 != 33280) {
 		return arg1;
+	}
 	return 315;
 }
 
 st32 get_hashfunc_55(st32 arg1, st32 arg2) {
 	st32 result;
 	if ((arg2 & 0x8000)) {
-		if ( (unsigned short)(arg2 & 0x8000) == 32768 )
+		if ((unsigned short)(arg2 & 0x8000) == 32768) {
 			result = 295;
-		else result = arg1;
-	} else result = 294;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 294;
+	}
 	return result;
 }
 
@@ -1226,21 +1469,26 @@ st32 get_hashfunc_56(st32 arg1, st32 arg2) {
 	st32 result; 
 	st32 v3 = arg2 & 0x18180;
 	if ( (ut32)v3 <= 0x8080 ) {
-		if ( v3 == 32896 )
+		if (v3 == 32896) {
 			return 528;
-		if ( !v3 )
+		}
+		if (!v3) {
 			return 406;
-		if ( v3 == 128 )
+		}
+		if (v3 == 128) {
 			return 527;
-		if ( v3 == 32768 )
+		}
+		if (v3 == 32768) {
 			return 407;
+		}
 		return arg1;
 	}
 	if ( v3 == 98304 ) {
 		result = 408;
 	} else {
-		if ( v3 != 98432 )
+		if (v3 != 98432) {
 			return arg1;
+		}
 		result = 529;
 	}
 	return result;
@@ -1250,11 +1498,14 @@ st32 get_hashfunc_57(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x8000 ) {
-		if ( (unsigned short)(arg2 & 0x8000) == 32768 )
+		if ((unsigned short)(arg2 & 0x8000) == 32768) {
 			result = 405;
-		else
+		} else {
 			result = arg1;
-	} else result = 404;
+		}
+	} else {
+		result = 404;
+	}
 	return result;
 }
 
@@ -1269,10 +1520,11 @@ st32 get_hashfunc_58(st32 arg1, st32 arg2) {
 		if ( v3 == 32768 ) {
 			result = 263;
 		} else {
-			if ( v3 == 65536 )
+			if (v3 == 65536) {
 				result = 264;
-			else
+			} else {
 				result = arg1;
+			}
 		}
 	} else {
 		result = 262;
@@ -1284,19 +1536,23 @@ st32 get_hashfunc_59(st32 arg1, st32 arg2) {
 	st32 result; 
 	st32 v2 = arg2 & 0x8180;
 	if ( (ut32)v2 <= 0x100 ) {
-		if ( v2 == 256 )
+		if (v2 == 256) {
 			return 505;
-		if ( !(arg2 & 0x8180) )
+		}
+		if (!(arg2 & 0x8180)) {
 			return 503;
-		if ( v2 == 128 )
+		}
+		if (v2 == 128) {
 			return 504;
+		}
 		return arg1;
 	}
 	if ( v2 == 384 ) {
 		result = 506;
 	} else {
-		if ( v2 != 32768 )
+		if (v2 != 32768) {
 			return arg1;
+		}
 		result = 507;
 	}
 	return result;
@@ -1306,11 +1562,14 @@ st32 get_hashfunc_60(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 173;
-		else
+		} else {
 			result = arg1;
-	} else result = 172;
+		}
+	} else {
+		result = 172;
+	}
 	return result;
 }
 
@@ -1318,11 +1577,14 @@ st32 get_hashfunc_61(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 175;
-		else
+		} else {
 			result = arg1;
-	} else result = 174;
+		}
+	} else {
+		result = 174;
+	}
 	return result;
 }
 
@@ -1330,11 +1592,14 @@ st32 get_hashfunc_62(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 152;
-		else
+		} else {
 			result = arg1;
-	} else result = 151;
+		}
+	} else {
+		result = 151;
+	}
 	return result;
 }
 
@@ -1342,11 +1607,14 @@ st32 get_hashfunc_63(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 154;
-		else
+		} else {
 			result = arg1;
-	} else result = 153;
+		}
+	} else {
+		result = 153;
+	}
 	return result;
 }
 
@@ -1354,11 +1622,14 @@ st32 get_hashfunc_64(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 180;
-		else
+		} else {
 			result = arg1;
-	} else result = 179;
+		}
+	} else {
+		result = 179;
+	}
 	return result;
 }
 
@@ -1366,11 +1637,14 @@ st32 get_hashfunc_65(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 182;
-		else
+		} else {
 			result = arg1;
-	} else result = 181;
+		}
+	} else {
+		result = 181;
+	}
 	return result;
 }
 
@@ -1380,10 +1654,11 @@ st32 get_hashfunc_66(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1C00000) == 12582912 ) {
 		result = 157;
 	} else {
-		if ( (arg2 & 0x1C00000) == 29360128 )
+		if ((arg2 & 0x1C00000) == 29360128) {
 			result = 158;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -1393,11 +1668,14 @@ st32 get_hashfunc_67(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 57;
-		else
+		} else {
 			result = arg1;
-	} else result = 56;
+		}
+	} else {
+		result = 56;
+	}
 	return result;
 }
 
@@ -1405,11 +1683,14 @@ st32 get_hashfunc_68(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 208;
-		else
+		} else {
 			result = arg1;
-	} else result = 207;
+		}
+	} else {
+		result = 207;
+	}
 	return result;
 }
 
@@ -1417,11 +1698,14 @@ st32 get_hashfunc_69(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 209;
-		else
+		} else {
 			result = arg1;
-	} else result = 210;
+		}
+	} else {
+		result = 210;
+	}
 	return result;
 }
 
@@ -1434,10 +1718,11 @@ st32 get_hashfunc_70(st32 arg1, st32 arg2) {
 		if ( v2 == 16777216 ) {
 			result = 217;
 		} else {
-			if ( v2 == 20971520 )
+			if (v2 == 20971520) {
 				result = 212;
-			else
+			} else {
 				result = arg1;
+			}
 		}
 	} else {
 		result = 216;
@@ -1449,10 +1734,11 @@ st32 get_hashfunc_71(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1400000 ) {
-		if ( (arg2 & 0x1400000) == 4194304 )
+		if ((arg2 & 0x1400000) == 4194304) {
 			result = 211;
-		else
+		} else {
 			result = arg1;
+		}
 	} else {
 		result = 218;
 	}
@@ -1463,11 +1749,14 @@ st32 get_hashfunc_72(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 221;
-		else
+		} else {
 			result = arg1;
-	} else result = 220;
+		}
+	} else {
+		result = 220;
+	}
 	return result;
 }
 
@@ -1475,11 +1764,14 @@ st32 get_hashfunc_73(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1010000 ) {
-		if ( (arg2 & 0x1010000) == 16777216 )
+		if ((arg2 & 0x1010000) == 16777216) {
 			result = 215;
-		else
+		} else {
 			result = arg1;
-	} else result = 214;
+		}
+	} else {
+		result = 214;
+	}
 	return result;
 }
 
@@ -1489,10 +1781,11 @@ st32 get_hashfunc_74(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1010000) == 65536 ) {
 		result = 213;
 	} else {
-		if ( (arg2 & 0x1010000) == 16842752 )
+		if ((arg2 & 0x1010000) == 16842752) {
 			result = 426;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -1501,10 +1794,14 @@ st32 get_hashfunc_75(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x80000000 ) {
-		if ((arg2 & 0x80000000) == 0x80000000)
+		if ((arg2 & 0x80000000) == 0x80000000) {
 			result = 457;
-		else result = arg1;
-	} else result = 459;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 459;
+	}
 	return result;
 }
 
@@ -1512,10 +1809,14 @@ st32 get_hashfunc_76(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 21;
-		else result = arg1;
-	} else result = 19;
+		} else {
+			result = arg1;
+		}
+	} else {
+		result = 19;
+	}
 	return result;
 }
 
@@ -1523,28 +1824,35 @@ st32 get_hashfunc_77(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 22;
-		else
+		} else {
 			result = arg1;
-	} else result = 20;
+		}
+	} else {
+		result = 20;
+	}
 	return result;
 }
 
 st32 get_hashfunc_78(st32 arg1, st32 arg2) {
 	st32 v3 = arg2 & 0x18000;
 	if ( (ut32)v3 <= 0x10000 ) {
-		if ( v3 == 65536 )
+		if (v3 == 65536) {
 			return 429;
-		if ( !v3 )
+		}
+		if (!v3) {
 			return 427;
-		if ( v3 == 32768 )
+		}
+		if (v3 == 32768) {
 			return 428;
+		}
 
 		return arg1;
 	}
-	if ( v3 != 98304 )
+	if (v3 != 98304) {
 		return arg1;
+	}
 	return 252;
 }
 
@@ -1556,41 +1864,53 @@ st32 get_hashfunc_79(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x18180;
 	if ( (ut32)v3 <= 0x8100 ) {
-		if ( v3 == 33024 )
+		if (v3 == 33024) {
 			return 437;
+		}
 		if ( (ut32)v3 > 0x180 ) {
-			if ( v3 == 32768 )
+			if (v3 == 32768) {
 				return 431;
-			if ( v3 == 32896 )
+			}
+			if (v3 == 32896) {
 				return 435;
+			}
 		} else {
-			if ( v3 == 384 )
+			if (v3 == 384) {
 				return 440;
-			if ( !v3 )
+			}
+			if (!v3) {
 				return 430;
-			if ( v3 == 128 )
+			}
+			if (v3 == 128) {
 				return 432;
-			if ( v3 == 256 )
+			}
+			if (v3 == 256) {
 				return 434;
+			}
 		}
 		return arg1;
 	}
 	if ( (ut32)v3 <= 0x10100 ) {
-		if ( v3 == 65792 )
+		if (v3 == 65792) {
 			return 442;
-		if ( v3 == 33152 )
+		}
+		if (v3 == 33152) {
 			return 441;
-		if ( v3 == 65536 )
+		}
+		if (v3 == 65536) {
 			return 433;
-		if ( v3 == 65664 )
+		}
+		if (v3 == 65664) {
 			return 436;
+		}
 		return arg1;
 	}
 	if ( v3 == 65920 ) {
 		result = 439;
 	} else {
-		if ( v3 != 98688 )
+		if (v3 != 98688) {
 			return arg1;
+		}
 		result = 438;
 	}
 	return result;
@@ -1604,41 +1924,53 @@ st32 get_hashfunc_80(st32 arg1, st32 arg2) {
 	v2 = arg2;
 	v3 = v2 & 0x18180;
 	if ( (ut32)v3 <= 0x8100 ) {
-		if ( v3 == 33024 )
+		if (v3 == 33024) {
 			return 450;
+		}
 		if ( (ut32)v3 > 0x180 ) {
-			if ( v3 == 32768 )
+			if (v3 == 32768) {
 				return 444;
-			if ( v3 == 32896 )
+			}
+			if (v3 == 32896) {
 				return 448;
+			}
 		} else {
-			if ( v3 == 384 )
+			if (v3 == 384) {
 				return 453;
-			if ( !v3 )
+			}
+			if (!v3) {
 				return 443;
-			if ( v3 == 128 )
+			}
+			if (v3 == 128) {
 				return 445;
-			if ( v3 == 256 )
+			}
+			if (v3 == 256) {
 				return 447;
+			}
 		}
 		return arg1;
 	}
 	if ( (ut32)v3 <= 0x10100 ) {
-		if ( v3 == 65792 )
+		if (v3 == 65792) {
 			return 455;
-		if ( v3 == 33152 )
+		}
+		if (v3 == 33152) {
 			return 454;
-		if ( v3 == 65536 )
+		}
+		if (v3 == 65536) {
 			return 446;
-		if ( v3 == 65664 )
+		}
+		if (v3 == 65664) {
 			return 449;
+		}
 		return arg1;
 	}
 	if ( v3 == 65920 ) {
 		result = 452;
 	} else {
-		if ( v3 != 98688 )
+		if (v3 != 98688) {
 			return arg1;
+		}
 		result = 451;
 	}
 	return result;
@@ -1648,18 +1980,23 @@ st32 get_hashfunc_81(st32 arg1, st32 arg2) {
 	st32 result; 
 	st32 v2 = arg2 & 0x1000180;
 	if ( (arg2 & 0x1000180u) <= 0x1000000 ) {
-		if ( (arg2 & 0x1000180) == 16777216 )
+		if ((arg2 & 0x1000180) == 16777216) {
 			return 191;
+		}
 		if ( (ut32)v2 > 0x100 ) {
-			if ( v2 == 384 )
+			if (v2 == 384) {
 				return 200;
+			}
 		} else {
-			if ( v2 == 256 )
+			if (v2 == 256) {
 				return 538;
-			if ( !v2 )
+			}
+			if (!v2) {
 				return 190;
-			if ( v2 == 128 )
+			}
+			if (v2 == 128) {
 				return 537;
+			}
 		}
 		return arg1;
 	}
@@ -1669,8 +2006,9 @@ st32 get_hashfunc_81(st32 arg1, st32 arg2) {
 		if ( v2 == 16777472 ) {
 			result = 539;
 		} else {
-			if ( v2 != 16777600 )
+			if (v2 != 16777600) {
 				return arg1;
+			}
 			result = 201;
 		}
 	}
@@ -1683,19 +2021,23 @@ st32 get_hashfunc_82(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0x1000180;
 	if ( (arg2 & 0x1000180u) <= 0x100 ) {
-		if ( (arg2 & 0x1000180) == 256 )
+		if ((arg2 & 0x1000180) == 256) {
 			return 203;
-		if ( !v2 )
+		}
+		if (!v2) {
 			return 192;
-		if ( v2 == 128 )
+		}
+		if (v2 == 128) {
 			return 195;
+		}
 		return arg1;
 	}
 	if ( v2 == 384 ) {
 		result = 198;
 	} else {
-		if ( v2 != 16777600 )
+		if (v2 != 16777600) {
 			return arg1;
+		}
 		result = 196;
 	}
 	return result;
@@ -1710,13 +2052,15 @@ st32 get_hashfunc_83(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1810180u) <= 0x800080 ) {
 		if ( (arg2 & 0x1810180) != 8388736 ) {
 			if ( (ut32)v2 <= 0x10000 ) {
-				if ( v2 == 65536 )
+				if (v2 == 65536) {
 					return 193;
+				}
 				if ( (ut32)v2 <= 0x100 ) {
 					if ( v2 != 256 ) {
 						if ( v2 ) {
-							if ( v2 == 128 )
+							if (v2 == 128) {
 								return 197;
+							}
 							return arg1;
 						}
 						return 193;
@@ -1725,47 +2069,57 @@ st32 get_hashfunc_83(st32 arg1, st32 arg2) {
 				}
 				v4 = v2 == 384;
 				LABEL_11:
-				if ( v4 )
-					return 199;
-				return arg1;
+					if (v4) {
+						return 199;
+					}
+					return arg1;
 			}
 			if ( (ut32)v2 > 0x10180 ) {
-				if ( v2 == 8388608 )
+				if (v2 == 8388608) {
 					return 193;
+				}
 				return arg1;
 			}
-			if ( v2 == 65920 )
+			if (v2 == 65920) {
 				return 199;
+			}
 			if ( v2 != 65664 ) {
-				if ( v2 == 65792 )
+				if (v2 == 65792) {
 					return 202;
+				}
 				return arg1;
 			}
 		}
 		return 197;
 	}
 	if ( (ut32)v2 <= 0x810100 ) {
-		if ( v2 == 8454400 )
+		if (v2 == 8454400) {
 			return 202;
+		}
 		if ( (ut32)v2 <= 0x810000 ) {
-			if ( v2 == 8454144 )
+			if (v2 == 8454144) {
 				return 193;
-			if ( v2 == 8388864 )
+			}
+			if (v2 == 8388864) {
 				return 202;
+			}
 			v4 = v2 == 8388992;
 			goto LABEL_11;
 		}
-		if ( v2 != 8454272 )
+		if (v2 != 8454272) {
 			return arg1;
+		}
 		return 197;
 	}
-	if ( v2 == 8454528 )
+	if (v2 == 8454528) {
 		return 199;
+	}
 	if ( v2 == 16777216 ) {
 		result = 205;
 	} else {
-		if ( v2 != 16777344 )
+		if (v2 != 16777344) {
 			return arg1;
+		}
 		result = 206;
 	}
 	return result;
@@ -1779,11 +2133,15 @@ st32 get_hashfunc_84(st32 arg1, st32 arg2) {
 		if ( v2 == 16777344 ) {
 			result = 509;
 		} else {
-			if ( v2 == 16777472 )
+			if (v2 == 16777472) {
 				result = 510;
-			else result = arg1;
+			} else {
+				result = arg1;
+			}
 		}
-	} else result = 508;
+	} else {
+		result = 508;
+	}
 	return result;
 }
 
@@ -1793,10 +2151,11 @@ st32 get_hashfunc_85(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1000180) == 128 ) {
 		result = 511;
 	} else {
-		if ( (arg2 & 0x1000180) == 256 )
+		if ((arg2 & 0x1000180) == 256) {
 			result = 512;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -1805,20 +2164,25 @@ st32 get_hashfunc_86(st32 arg1, st32 arg2) {
 	st32 result; 
 
 	if ( arg2 & 0x1000000 ) {
-		if ( (arg2 & 0x1000000) == 16777216 )
+		if ((arg2 & 0x1000000) == 16777216) {
 			result = 171;
-		else
+		} else {
 			result = arg1;
-	} else result = 170;
+		}
+	} else {
+		result = 170;
+	}
 	return result;
 }
 
 st32 get_hashfunc_87(st32 arg1, st32 v2) {
 	st32 result; 
 	st32 v3 = v2 & 0x79B981;
-	if ( v3 == 33024 || v3 == 4227328 )
+	if (v3 == 33024 || v3 == 4227328) {
 		result = 490;
-	else result = ( v3 == 4260097 )? 491: arg1;
+	} else {
+		result = (v3 == 4260097) ? 491 : arg1;
+	}
 	return result;
 }
 
@@ -1826,14 +2190,17 @@ st32 get_hashfunc_88(st32 arg1, st32 arg2) {
 	st32 v2 = arg2;
 	st32 v3 = v2 & 0x79B981;
 	if ( (ut32)v3 <= 0x410101 ) {
-		if (v3 == 0x410101)
+		if (v3 == 0x410101) {
 			return 493;
-		if (v3 == 0x8100 || v3 == 0x408100)
+		}
+		if (v3 == 0x8100 || v3 == 0x408100) {
 			return 492;
+		}
 		return arg1;
 	}
-	if (v3 != hash_const_04)
+	if (v3 != hash_const_04) {
 		return arg1;
+	}
 	return 494;
 }
 
@@ -1843,10 +2210,11 @@ st32 get_hashfunc_89(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1B901B9) == 16777600 ) {
 		result = 488;
 	} else {
-		if ( (arg2 & 0x1B901B9) == 25231616 )
+		if ((arg2 & 0x1B901B9) == 25231616) {
 			result = 495;
-		else
+		} else {
 			result = arg1;
+		}
 	}
 	return result;
 }
@@ -1858,27 +2226,32 @@ st32 get_hashfunc_90(st32 arg1, st32 arg2) {
 
 	v2 = arg2 & 0x1F901B9;
 	if ( (arg2 & 0x1F901B9u) <= 0x1810101 ) {
-		if ( (arg2 & 0x1F901B9) == 25231617 )
+		if ((arg2 & 0x1F901B9) == 25231617) {
 			return 498;
+		}
 		if ( (ut32)v2 <= 0x1000180 ) {
 			if ( v2 != 16777600 ) {
-				if ( v2 == 8454401 )
+				if (v2 == 8454401) {
 					return 497;
-				if ( v2 == 8454529 )
+				}
+				if (v2 == 8454529) {
 					return 499;
+				}
 				return arg1;
 			}
 			return 489;
 		}
-		if ( v2 == 20971904 )
+		if (v2 == 20971904) {
 			return 489;
+		}
 		return arg1;
 	}
 	v4 = v2 - 25231744;
 	if ( v4 ) {
 		v5 = v4 - 1;
-		if ( !v5 )
+		if (!v5) {
 			return 500;
+		}
 
 		/* FIX */
 		v5 -= 0x3FFFFF;
@@ -1899,9 +2272,11 @@ st32 get_hashfunc_91(st32 arg1, st32 arg2) {
 	if ( (arg2 & 0x1F901BF) == 8454145 ) {
 		result = 501;
 	} else {
-		if ( (arg2 & 0x1F901BF) == 25231361 )
+		if ((arg2 & 0x1F901BF) == 25231361) {
 			result = 502;
-		else result = arg1;
+		} else {
+			result = arg1;
+		}
 	}
 	return result;
 }
@@ -1927,13 +2302,15 @@ st32 get_hash_code(ut32 ins_pos) {
 
 	if (ins_len > 1 ) {
 		len = ins_len - 1;
-		if (len >= 4 )
+		if (len >= 4) {
 			len = 4;
+		}
 
 		ins_part1 = get_ins_part(ins_pos + 1, len) << (8 * (4 - len));
 		ins_part2 = 0;
-		if (ins_len > 5 )
-			ins_part2 = get_ins_part(ins_pos + 5, 1);
+		if (ins_len > 5) {
+			ins_part2 = get_ins_part (ins_pos + 5, 1);
+		}
 	}
 
 	pos = (2 * opcode | (ins_part1 >> 31));
diff --git a/libr/asm/arch/tms320/c55x_plus/ins.c b/libr/asm/arch/tms320/c55x_plus/ins.c
index 1918a023ea..0e85fb5d79 100644
--- a/libr/asm/arch/tms320/c55x_plus/ins.c
+++ b/libr/asm/arch/tms320/c55x_plus/ins.c
@@ -50,8 +50,9 @@ ut32 get_ins_len(ut8 opcode) {
 ut32 get_ins_part(ut32 pos, ut32 len) {
 	ut32 ret = 0;
 	has_failed = 0;
-	if (C55PLUS_DEBUG)
-        	printf("pos => 0x%x len => %d ins_buff_len => %d\n", pos, len, ins_buff_len);
+	if (C55PLUS_DEBUG) {
+		printf ("pos => 0x%x len => %d ins_buff_len => %d\n", pos, len, ins_buff_len);
+	}
 
 	if ((st32)pos < 0 || pos >= ins_buff_len) {
 		has_failed = 1;
@@ -60,9 +61,11 @@ ut32 get_ins_part(ut32 pos, ut32 len) {
 
 	for (; len > 0; --len) {
 		ret <<= 8;
-		if (pos >= ins_buff_len) 
+		if (pos >= ins_buff_len) {
 			has_failed = 1;
-		else ret |= ins_buff[pos++];
+		} else {
+			ret |= ins_buff[pos++];
+		}
 	}
 
 	return ret;
diff --git a/libr/asm/arch/tms320/tms320_dasm.c b/libr/asm/arch/tms320/tms320_dasm.c
index afda27af86..ab08bffdc0 100644
--- a/libr/asm/arch/tms320/tms320_dasm.c
+++ b/libr/asm/arch/tms320/tms320_dasm.c
@@ -29,8 +29,9 @@ int run_f_list(tms320_dasm_t * dasm) {
 	ut32 temp;
 	insn_flag_t * flag;
 
-	if (!dasm->insn->f_list)
+	if (!dasm->insn->f_list) {
 		return 1;
+	}
 
 	for (flag = dasm->insn->f_list; !f_list_last(flag); flag++) {
 		switch (flag->v) {
@@ -276,13 +277,15 @@ int run_m_list(tms320_dasm_t * dasm)
 {
 	insn_mask_t * mask;
 
-	if (!dasm->insn->m_list)
+	if (!dasm->insn->m_list) {
 		return 1;
+	}
 
 	for (mask = dasm->insn->m_list; !m_list_last(mask); mask++) {
 		/* match bits in range [f, f + n] with mask's value */
-		if (get_bits(dasm->opcode64, mask->f, mask->n) != mask->v)
+		if (get_bits (dasm->opcode64, mask->f, mask->n) != mask->v) {
 			return 0;
+		}
 	}
 
 	return 1;
@@ -294,8 +297,9 @@ int vreplace(char * string, const char * token, const char * fmt, va_list args)
 	char * pos;
 
 	pos = strstr(string, token);
-	if (!pos)
+	if (!pos) {
 		return 0;
+	}
 
 	vsnprintf(data, sizeof(data), fmt, args);
 
@@ -566,20 +570,24 @@ const char * get_mmm_str(ut8 key, char * str)
 void decode_bits(tms320_dasm_t * dasm)
 {
 	// rounding
-	if (field_valid(dasm, R))
-		substitute(dasm->syntax, "[r]", "%s", field_value(dasm, R) ? "r" : "");
+	if (field_valid (dasm, R)) {
+		substitute (dasm->syntax, "[r]", "%s", field_value (dasm, R) ? "r" : "");
+	}
 
 	// unsigned
-	if (field_valid(dasm, u))
-		substitute(dasm->syntax, "[u]", "%s", field_value(dasm, u) ? "u" : "");
+	if (field_valid (dasm, u)) {
+		substitute (dasm->syntax, "[u]", "%s", field_value (dasm, u) ? "u" : "");
+	}
 
 	// 40 keyword
-	if (field_valid(dasm, g))
-		substitute(dasm->syntax, "[40]", "%s", field_value(dasm, g) ? "40" : "");
+	if (field_valid (dasm, g)) {
+		substitute (dasm->syntax, "[40]", "%s", field_value (dasm, g) ? "40" : "");
+	}
 
 	// T3 update
-	if (field_valid(dasm, U))
-		substitute(dasm->syntax, "[T3 = ]", "%s", field_value(dasm, U) ? "t3=" : "");
+	if (field_valid (dasm, U)) {
+		substitute (dasm->syntax, "[T3 = ]", "%s", field_value (dasm, U) ? "t3=" : "");
+	}
 }
 
 void decode_braces(tms320_dasm_t * dasm)
@@ -639,96 +647,120 @@ void decode_constants(tms320_dasm_t * dasm)
 {
 	// signed constant
 
-	if (field_valid(dasm, K8))
-		substitute(dasm->syntax, "K8", "0x%02X", field_value(dasm, K8));
-	if (field_valid(dasm, K16))
-		substitute(dasm->syntax, "K16", "0x%04X", be16(field_value(dasm, K16)));
+	if (field_valid (dasm, K8)) {
+		substitute (dasm->syntax, "K8", "0x%02X", field_value (dasm, K8));
+	}
+	if (field_valid (dasm, K16)) {
+		substitute (dasm->syntax, "K16", "0x%04X", be16 (field_value (dasm, K16)));
+	}
 
 	// unsigned constant
 
-	if (field_valid(dasm, k4))
-		substitute(dasm->syntax, "K4", "0x%01X", field_value(dasm, k4));
-	if (field_valid(dasm, k5))
-		substitute(dasm->syntax, "k5", "0x%02X", field_value(dasm, k5));
-	if (field_valid(dasm, k8))
-		substitute(dasm->syntax, "k8", "0x%02X", field_value(dasm, k8));
+	if (field_valid (dasm, k4)) {
+		substitute (dasm->syntax, "K4", "0x%01X", field_value (dasm, k4));
+	}
+	if (field_valid (dasm, k5)) {
+		substitute (dasm->syntax, "k5", "0x%02X", field_value (dasm, k5));
+	}
+	if (field_valid (dasm, k8)) {
+		substitute (dasm->syntax, "k8", "0x%02X", field_value (dasm, k8));
+	}
 
-	if (field_valid(dasm, k12))
-		substitute(dasm->syntax, "k12", "0x%03X", be16(field_value(dasm, k12)));
-	if (field_valid(dasm, k16))
-		substitute(dasm->syntax, "k16", "0x%04X", be16(field_value(dasm, k16)));
+	if (field_valid (dasm, k12)) {
+		substitute (dasm->syntax, "k12", "0x%03X", be16 (field_value (dasm, k12)));
+	}
+	if (field_valid (dasm, k16)) {
+		substitute (dasm->syntax, "k16", "0x%04X", be16 (field_value (dasm, k16)));
+	}
 
-	if (field_valid(dasm, k4) && field_valid(dasm, k3))
-		substitute(dasm->syntax, "k7", "0x%02X", (field_value(dasm, k3) << 4) | field_value(dasm, k4));
-	if (field_valid(dasm, k4) && field_valid(dasm, k5))
-		substitute(dasm->syntax, "k9", "0x%03X", (field_value(dasm, k5) << 4) | field_value(dasm, k4));
-	if (field_valid(dasm, k4) && field_valid(dasm, k8))
-		substitute(dasm->syntax, "k12", "0x%03X", (field_value(dasm, k8) << 4) | field_value(dasm, k4));
+	if (field_valid (dasm, k4) && field_valid (dasm, k3)) {
+		substitute (dasm->syntax, "k7", "0x%02X", (field_value (dasm, k3) << 4) | field_value (dasm, k4));
+	}
+	if (field_valid (dasm, k4) && field_valid (dasm, k5)) {
+		substitute (dasm->syntax, "k9", "0x%03X", (field_value (dasm, k5) << 4) | field_value (dasm, k4));
+	}
+	if (field_valid (dasm, k4) && field_valid (dasm, k8)) {
+		substitute (dasm->syntax, "k12", "0x%03X", (field_value (dasm, k8) << 4) | field_value (dasm, k4));
+	}
 
 	// dasm address label
 
-	if (field_valid(dasm, D16))
-		substitute(dasm->syntax, "D16", "0x%04X", be16(field_value(dasm, D16)));
+	if (field_valid (dasm, D16)) {
+		substitute (dasm->syntax, "D16", "0x%04X", be16 (field_value (dasm, D16)));
+	}
 
 	// immediate shift value
 
-	if (field_valid(dasm, SHFT))
-		substitute(dasm->syntax, "#SHFT", "0x%01X", field_value(dasm, SHFT));
-	if (field_valid(dasm, SHIFTW))
-		substitute(dasm->syntax, "#SHIFTW", "0x%02X", field_value(dasm, SHIFTW));
+	if (field_valid (dasm, SHFT)) {
+		substitute (dasm->syntax, "#SHFT", "0x%01X", field_value (dasm, SHFT));
+	}
+	if (field_valid (dasm, SHIFTW)) {
+		substitute (dasm->syntax, "#SHIFTW", "0x%02X", field_value (dasm, SHIFTW));
+	}
 }
 
 void decode_addresses(tms320_dasm_t * dasm)
 {
 	// program address label
 
-	if (field_valid(dasm, L7))
-		substitute(dasm->syntax, "L7", "0x%02X", field_value(dasm, L7));
-	if (field_valid(dasm, L8))
-		substitute(dasm->syntax, "L8", "0x%02X", field_value(dasm, L8));
-	if (field_valid(dasm, L16))
-		substitute(dasm->syntax, "L16", "0x%04X", be16(field_value(dasm, L16)));
+	if (field_valid (dasm, L7)) {
+		substitute (dasm->syntax, "L7", "0x%02X", field_value (dasm, L7));
+	}
+	if (field_valid (dasm, L8)) {
+		substitute (dasm->syntax, "L8", "0x%02X", field_value (dasm, L8));
+	}
+	if (field_valid (dasm, L16)) {
+		substitute (dasm->syntax, "L16", "0x%04X", be16 (field_value (dasm, L16)));
+	}
 
 	// program address label
 
-	if (field_valid(dasm, l1) && field_valid(dasm, l3))
-		substitute(dasm->syntax, "l4", "0x%01X", (field_value(dasm, l3) << 1) | field_value(dasm, l1));
+	if (field_valid (dasm, l1) && field_valid (dasm, l3)) {
+		substitute (dasm->syntax, "l4", "0x%01X", (field_value (dasm, l3) << 1) | field_value (dasm, l1));
+	}
 
 	// program memory address
 
-	if (field_valid(dasm, l7))
-		substitute(dasm->syntax, "pmad", "0x%02X", field_value(dasm, l7));
-	if (field_valid(dasm, l16))
-		substitute(dasm->syntax, "pmad", "0x%04X", be16(field_value(dasm, l16)));
+	if (field_valid (dasm, l7)) {
+		substitute (dasm->syntax, "pmad", "0x%02X", field_value (dasm, l7));
+	}
+	if (field_valid (dasm, l16)) {
+		substitute (dasm->syntax, "pmad", "0x%04X", be16 (field_value (dasm, l16)));
+	}
 
 	// program or dasm address label
 
-	if (field_valid(dasm, P8))
-		substitute(dasm->syntax, "P8", "0x%02X", field_value(dasm, P8));
-	if (field_valid(dasm, P24))
-		substitute(dasm->syntax, "P24", "0x%06X", be24(field_value(dasm, P24)));
+	if (field_valid (dasm, P8)) {
+		substitute (dasm->syntax, "P8", "0x%02X", field_value (dasm, P8));
+	}
+	if (field_valid (dasm, P24)) {
+		substitute (dasm->syntax, "P24", "0x%06X", be24 (field_value (dasm, P24)));
+	}
 }
 
 void decode_swap(tms320_dasm_t * dasm)
 {
 	char tmp[64];
 
-	if (field_valid(dasm, k6))
-		substitute(dasm->syntax, "SWAP ( )", get_swap_str(field_value(dasm, k6), tmp));
+	if (field_valid (dasm, k6)) {
+		substitute (dasm->syntax, "SWAP ( )", get_swap_str (field_value (dasm, k6), tmp));
+	}
 }
 
 void decode_relop(tms320_dasm_t * dasm)
 {
-	if (field_valid(dasm, cc))
-		substitute(dasm->syntax, "RELOP", get_relop_str(field_value(dasm, cc), NULL));
+	if (field_valid (dasm, cc)) {
+		substitute (dasm->syntax, "RELOP", get_relop_str (field_value (dasm, cc), NULL));
+	}
 }
 
 void decode_cond(tms320_dasm_t * dasm)
 {
 	char tmp[64];
 
-	if (field_valid(dasm, CCCCCCC))
-		substitute(dasm->syntax, "cond", "%s", get_cond_str(field_value(dasm, CCCCCCC), tmp));
+	if (field_valid (dasm, CCCCCCC)) {
+		substitute (dasm->syntax, "cond", "%s", get_cond_str (field_value (dasm, CCCCCCC), tmp));
+	}
 
 	substitute(dasm->syntax, "[label, ]", "");
 }
@@ -739,16 +771,19 @@ void decode_registers(tms320_dasm_t * dasm)
 
 	// transition register
 
-	if (field_valid(dasm, r))
-		substitute(dasm->syntax, "TRNx", "trn%d", field_value(dasm, r));
+	if (field_valid (dasm, r)) {
+		substitute (dasm->syntax, "TRNx", "trn%d", field_value (dasm, r));
+	}
 
 	// source and destination temporary registers
 
-	if (field_valid(dasm, ss))
-		substitute(dasm->syntax, "Tx", "t%d", field_value(dasm, ss));
+	if (field_valid (dasm, ss)) {
+		substitute (dasm->syntax, "Tx", "t%d", field_value (dasm, ss));
+	}
 
-	if (field_valid(dasm, dd))
-		substitute(dasm->syntax, "Tx", "t%d", field_value(dasm, dd));
+	if (field_valid (dasm, dd)) {
+		substitute (dasm->syntax, "Tx", "t%d", field_value (dasm, dd));
+	}
 
 	// shifted in/out bit values
 
@@ -759,8 +794,9 @@ void decode_registers(tms320_dasm_t * dasm)
 
 	// source and destination of CRC instruction
 
-	if (field_valid(dasm, t))
-		substitute(dasm->syntax, "TCx", "%s", get_t_str(field_value(dasm, t), NULL));
+	if (field_valid (dasm, t)) {
+		substitute (dasm->syntax, "TCx", "%s", get_t_str (field_value (dasm, t), NULL));
+	}
 
 	if (field_valid(dasm, tt)) {
 		substitute(dasm->syntax, "TCx", "%s", get_t_str(field_value(dasm, tt) >> 0, NULL));
@@ -782,10 +818,11 @@ void decode_registers(tms320_dasm_t * dasm)
 	// source or destination accumulator, auxiliary or temporary register
 
 	if (field_valid(dasm, FSSS) && field_valid(dasm, FDDD)) {
-		if (field_value(dasm, FSSS) == field_value(dasm, FDDD))
-			substitute(dasm->syntax, "[src,] dst", "dst");
-		else
-			substitute(dasm->syntax, "[src,] dst", "src, dst");
+		if (field_value (dasm, FSSS) == field_value (dasm, FDDD)) {
+			substitute (dasm->syntax, "[src,] dst", "dst");
+		} else {
+			substitute (dasm->syntax, "[src,] dst", "src, dst");
+		}
 	}
 
 	if (field_valid(dasm, FSSS) && field_valid(dasm, FDDD)) {
@@ -823,12 +860,13 @@ void decode_registers(tms320_dasm_t * dasm)
 		substitute(dasm->syntax, "dst", "%s", get_freg_str(field_value(dasm, FDDD), NULL));
 	}
 
-	if (field_valid(dasm, XACS))
-		substitute(dasm->syntax, "XACsrc", "%s", get_xreg_str(field_value(dasm, XACS), NULL));
-
-	if (field_valid(dasm, XACD))
-		substitute(dasm->syntax, "XACdst", "%s", get_xreg_str(field_value(dasm, XACD), NULL));
+	if (field_valid (dasm, XACS)) {
+		substitute (dasm->syntax, "XACsrc", "%s", get_xreg_str (field_value (dasm, XACS), NULL));
+	}
 
+	if (field_valid (dasm, XACD)) {
+		substitute (dasm->syntax, "XACdst", "%s", get_xreg_str (field_value (dasm, XACD), NULL));
+	}
 
 	// source and destination accumulator registers
 
@@ -877,8 +915,9 @@ void decode_addressing_modes(tms320_dasm_t * dasm)
 {
 	// Cmem
 
-	if (field_valid(dasm, mm))
-		substitute(dasm->syntax, "Cmem", "%s", get_cmem_str(field_value(dasm, mm), NULL));
+	if (field_valid (dasm, mm)) {
+		substitute (dasm->syntax, "Cmem", "%s", get_cmem_str (field_value (dasm, mm), NULL));
+	}
 
 	// Xmem and Ymem
 
@@ -952,10 +991,12 @@ static insn_item_t * finalize(tms320_dasm_t * dasm)
 
 	// add some qualifiers
 
-	if (field_value(dasm, q_lr))
-		replace(dasm->syntax, " ", ".lr ");
-	if (field_value(dasm, q_cr))
-		replace(dasm->syntax, " ", ".cr ");
+	if (field_value (dasm, q_lr)) {
+		replace (dasm->syntax, " ", ".lr ");
+	}
+	if (field_value (dasm, q_cr)) {
+		replace (dasm->syntax, " ", ".cr ");
+	}
 
 	return dasm->insn;
 }
@@ -992,14 +1033,16 @@ insn_item_t * decode_insn_head(tms320_dasm_t * dasm)
 	if (dasm->insn->i_list) {
 		dasm->insn = dasm->insn->i_list;
 		while (!i_list_last(dasm->insn)) {
-			if (run_m_list(dasm) && run_f_list(dasm))
+			if (run_m_list (dasm) && run_f_list (dasm)) {
 				break;
+			}
 			dasm->insn++;
 		}
 	}
 
-	if (!i_list_last(dasm->insn))
-		return decode_insn(dasm);
+	if (!i_list_last (dasm->insn)) {
+		return decode_insn (dasm);
+	}
 
 	return NULL;
 }
@@ -1058,10 +1101,12 @@ static int full_insn_size(tms320_dasm_t * dasm)
 {
 	int qualifier_size = 0;
 
-	if (field_value(dasm, q_cr))
+	if (field_value (dasm, q_cr)) {
 		qualifier_size = 1;
-	if (field_value(dasm, q_lr))
+	}
+	if (field_value (dasm, q_lr)) {
 		qualifier_size = 1;
+	}
 
 	return dasm->length + qualifier_size;
 }
@@ -1076,18 +1121,21 @@ int tms320_dasm(tms320_dasm_t * dasm, const ut8 * stream, int len)
 
 	if (tms320_f_get_cpu(dasm) != TMS320_F_CPU_C55X_PLUS) {
 		if (lookup_insn_head(dasm) && decode_insn_head(dasm)) {
-			if (dasm->length > len)
+			if (dasm->length > len) {
 				dasm->status |= TMS320_S_INVAL;
+			}
 		}
 	} else {
 		c55x_plus_disassemble(dasm, stream, len);
 	}
 
-	if (strstr(dasm->syntax, "invalid"))
+	if (strstr (dasm->syntax, "invalid")) {
 		dasm->status |= TMS320_S_INVAL;
+	}
 
-	if (dasm->status & TMS320_S_INVAL)
-		strcpy(dasm->syntax, "invalid"), dasm->length = 1;
+	if (dasm->status & TMS320_S_INVAL) {
+		strcpy (dasm->syntax, "invalid"), dasm->length = 1;
+	}
 
 	return full_insn_size(dasm);
 }
diff --git a/libr/asm/arch/tricore/gnu/cpu-tricore.c b/libr/asm/arch/tricore/gnu/cpu-tricore.c
index f9b5dfdb03..5069971aed 100644
--- a/libr/asm/arch/tricore/gnu/cpu-tricore.c
+++ b/libr/asm/arch/tricore/gnu/cpu-tricore.c
@@ -85,19 +85,23 @@ bfd_default_compatible (a, b)
      const bfd_arch_info_type *a;
      const bfd_arch_info_type *b;
 {
-  if (a->arch != b->arch)
-    return NULL;
+	if (a->arch != b->arch) {
+		return NULL;
+	}
 
-  if (a->bits_per_word != b->bits_per_word)
-    return NULL;
+	if (a->bits_per_word != b->bits_per_word) {
+		return NULL;
+	}
 
-  if (a->mach > b->mach)
-    return a;
+	if (a->mach > b->mach) {
+		return a;
+	}
 
-  if (b->mach > a->mach)
-    return b;
+	if (b->mach > a->mach) {
+		return b;
+	}
 
-  return a;
+	return a;
 }
 
 void tricore_init_arch_vars PARAMS ((unsigned long));
@@ -251,10 +255,11 @@ tricore_init_arch_vars (mach)
       tricore_mask_rrr2 = 0x00ff00ff;
       tricore_mask_rrrr = 0x00e000ff;
       tricore_mask_rrrw = 0x00e000ff;
-      if ((mach & bfd_mach_rider_mask) == bfd_mach_rider_2)
-        tricore_mask_sys =  0x0fc000ff;
-      else	
-        tricore_mask_sys =  0x07c000ff;
+      if ((mach & bfd_mach_rider_mask) == bfd_mach_rider_2) {
+	      tricore_mask_sys = 0x0fc000ff;
+      } else {
+	      tricore_mask_sys = 0x07c000ff;
+      }
       tricore_mask_sb =       0x00ff;
       tricore_mask_sbc =      0x00ff;
       tricore_mask_sbr =      0x00ff;
diff --git a/libr/asm/arch/tricore/gnu/tricore-dis.c b/libr/asm/arch/tricore/gnu/tricore-dis.c
index 82cb52e889..0f36599db9 100644
--- a/libr/asm/arch/tricore/gnu/tricore-dis.c
+++ b/libr/asm/arch/tricore/gnu/tricore-dis.c
@@ -205,17 +205,17 @@ decode_abs ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_ABS_OFF18:
-        dec_insn.cexp[i] = extract_off18 ();
-        break;
-      
-      case FMT_ABS_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf00) >> 8;
-	break;
-      }
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_ABS_OFF18:
+		  dec_insn.cexp[i] = extract_off18 ();
+		  break;
+
+	  case FMT_ABS_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -223,21 +223,21 @@ decode_absb ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_ABSB_OFF18:
-        dec_insn.cexp[i] = extract_off18 ();
-        break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_ABSB_OFF18:
+		  dec_insn.cexp[i] = extract_off18 ();
+		  break;
 
-      case FMT_ABSB_B:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x800) >> 11;
-	break;
+	  case FMT_ABSB_B:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x800) >> 11;
+		  break;
 
-      case FMT_ABSB_BPOS3:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x700) >> 8;
-	break;
-      }
+	  case FMT_ABSB_BPOS3:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x700) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -245,16 +245,16 @@ decode_b ()
 {
   int i;
   unsigned long o1, o2;
-      
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_B_DISP24:
-        o1 = (dec_insn.opcode & 0xffff0000) >> 16;
-	o2 = (dec_insn.opcode & 0x0000ff00) << 8;
-	dec_insn.cexp[i] = o1 | o2;
-	break;
-      }
+
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_B_DISP24:
+		  o1 = (dec_insn.opcode & 0xffff0000) >> 16;
+		  o2 = (dec_insn.opcode & 0x0000ff00) << 8;
+		  dec_insn.cexp[i] = o1 | o2;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -262,29 +262,29 @@ decode_bit ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BIT_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BIT_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_BIT_P2:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
-	break;
+	  case FMT_BIT_P2:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
+		  break;
 
-      case FMT_BIT_P1:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
-        break;
+	  case FMT_BIT_P1:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
+		  break;
 
-      case FMT_BIT_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_BIT_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_BIT_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BIT_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -293,23 +293,23 @@ decode_bo ()
   int i;
   unsigned long o1, o2;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BO_OFF10:
-        o1 = (dec_insn.opcode & 0x003f0000) >> 16;
-	o2 = (dec_insn.opcode & 0xf0000000) >> 22;
-	dec_insn.cexp[i] = o1 | o2;
-        break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BO_OFF10:
+		  o1 = (dec_insn.opcode & 0x003f0000) >> 16;
+		  o2 = (dec_insn.opcode & 0xf0000000) >> 22;
+		  dec_insn.cexp[i] = o1 | o2;
+		  break;
 
-      case FMT_BO_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_BO_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_BO_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BO_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -318,24 +318,24 @@ decode_bol ()
   int i;
   unsigned long o1, o2, o3;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BOL_OFF16:
-        o1 = (dec_insn.opcode & 0x003f0000) >> 16;
-	o2 = (dec_insn.opcode & 0xf0000000) >> 22;
-	o3 = (dec_insn.opcode & 0x0fc00000) >> 12;
-	dec_insn.cexp[i] = o1 | o2 | o3;
-        break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BOL_OFF16:
+		  o1 = (dec_insn.opcode & 0x003f0000) >> 16;
+		  o2 = (dec_insn.opcode & 0xf0000000) >> 22;
+		  o3 = (dec_insn.opcode & 0x0fc00000) >> 12;
+		  dec_insn.cexp[i] = o1 | o2 | o3;
+		  break;
 
-      case FMT_BOL_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_BOL_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_BOL_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BOL_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -343,21 +343,21 @@ decode_brc ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BRC_DISP15:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BRC_DISP15:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
+		  break;
 
-      case FMT_BRC_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_BRC_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_BRC_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BRC_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -365,22 +365,22 @@ decode_brn ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BRN_DISP15:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BRN_DISP15:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
+		  break;
 
-      case FMT_BRN_N:
-        dec_insn.cexp[i] =  (dec_insn.opcode & 0x0000f000) >> 12;
-	dec_insn.cexp[i] |= (dec_insn.opcode & 0x00000080) >> 3;
-	break;
+	  case FMT_BRN_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  dec_insn.cexp[i] |= (dec_insn.opcode & 0x00000080) >> 3;
+		  break;
 
-      case FMT_BRN_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BRN_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -388,21 +388,21 @@ decode_brr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_BRR_DISP15:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_BRR_DISP15:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x7fff0000) >> 16;
+		  break;
 
-      case FMT_BRR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_BRR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_BRR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_BRR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -410,20 +410,20 @@ decode_rc ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RC_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RC_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RC_CONST9:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001ff000) >> 12;
-	break;
+	  case FMT_RC_CONST9:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001ff000) >> 12;
+		  break;
 
-      case FMT_RC_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-      }
+	  case FMT_RC_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+	  }
+  }
 }
 
 static void
@@ -431,29 +431,29 @@ decode_rcpw ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RCPW_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RCPW_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RCPW_P:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
-	break;
+	  case FMT_RCPW_P:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
+		  break;
 
-      case FMT_RCPW_W:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
-	break;
+	  case FMT_RCPW_W:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
+		  break;
 
-      case FMT_RCPW_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RCPW_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RCPW_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RCPW_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -461,25 +461,25 @@ decode_rcr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RCR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RCR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RCR_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RCR_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RCR_CONST9:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001ff000) >> 12;
-	break;
+	  case FMT_RCR_CONST9:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001ff000) >> 12;
+		  break;
 
-      case FMT_RCR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RCR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -487,25 +487,25 @@ decode_rcrr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RCRR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RCRR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RCRR_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RCRR_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RCRR_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RCRR_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RCRR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RCRR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -513,29 +513,29 @@ decode_rcrw ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RCRW_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RCRW_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RCRW_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RCRW_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RCRW_W:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
-	break;
+	  case FMT_RCRW_W:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
+		  break;
 
-      case FMT_RCRW_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RCRW_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RCRW_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RCRW_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -543,21 +543,21 @@ decode_rlc ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RLC_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RLC_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RLC_CONST16:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0ffff000) >> 12;
-	break;
+	  case FMT_RLC_CONST16:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0ffff000) >> 12;
+		  break;
 
-      case FMT_RLC_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RLC_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -565,25 +565,25 @@ decode_rr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RR_N:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
-	break;
+	  case FMT_RR_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
+		  break;
 
-      case FMT_RR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -591,25 +591,25 @@ decode_rr1 ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RR1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RR1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RR1_N:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
-	break;
+	  case FMT_RR1_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
+		  break;
 
-      case FMT_RR1_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RR1_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RR1_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RR1_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -617,21 +617,21 @@ decode_rr2 ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RR2_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RR2_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RR2_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RR2_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RR2_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RR2_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -639,29 +639,29 @@ decode_rrpw ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRPW_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRPW_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRPW_P:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
-	break;
+	  case FMT_RRPW_P:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f800000) >> 23;
+		  break;
 
-      case FMT_RRPW_W:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
-	break;
+	  case FMT_RRPW_W:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
+		  break;
 
-      case FMT_RRPW_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRPW_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRPW_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRPW_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -669,29 +669,29 @@ decode_rrr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRR_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RRR_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RRR_N:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
-	break;
+	  case FMT_RRR_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
+		  break;
 
-      case FMT_RRR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -699,29 +699,29 @@ decode_rrr1 ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRR1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRR1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRR1_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RRR1_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RRR1_N:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
-	break;
+	  case FMT_RRR1_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x00030000) >> 16;
+		  break;
 
-      case FMT_RRR1_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRR1_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRR1_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRR1_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -729,25 +729,25 @@ decode_rrr2 ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRR2_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRR2_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRR2_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RRR2_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RRR2_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRR2_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRR2_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRR2_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -755,25 +755,25 @@ decode_rrrr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRRR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRRR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRRR_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RRRR_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RRRR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRRR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRRR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRRR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -781,29 +781,29 @@ decode_rrrw ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_RRRW_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_RRRW_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf0000000) >> 28;
+		  break;
 
-      case FMT_RRRW_S3:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
-	break;
+	  case FMT_RRRW_S3:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f000000) >> 24;
+		  break;
 
-      case FMT_RRRW_W:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
-	break;
+	  case FMT_RRRW_W:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x001f0000) >> 16;
+		  break;
 
-      case FMT_RRRW_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
-	break;
+	  case FMT_RRRW_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0000f000) >> 12;
+		  break;
 
-      case FMT_RRRW_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+	  case FMT_RRRW_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -811,13 +811,13 @@ decode_sys ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SYS_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
-	break;
-      }
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SYS_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x00000f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -825,13 +825,13 @@ decode_sb ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SB_DISP8:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xff00) >> 8;
-	break;
-      }
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SB_DISP8:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xff00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -839,19 +839,20 @@ decode_sbc ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SBC_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SBC_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SBC_DISP4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
-        if (dec_insn.code->args[i] == 'x')
-          dec_insn.cexp[i] += 0x10;
-	break;
-      }
+	  case FMT_SBC_DISP4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  if (dec_insn.code->args[i] == 'x') {
+			  dec_insn.cexp[i] += 0x10;
+		  }
+		  break;
+	  }
+  }
 }
 
 static void
@@ -859,19 +860,20 @@ decode_sbr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SBR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SBR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SBR_DISP4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
-        if (dec_insn.code->args[i] == 'x')
-          dec_insn.cexp[i] += 0x10;
-	break;
-      }
+	  case FMT_SBR_DISP4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  if (dec_insn.code->args[i] == 'x') {
+			  dec_insn.cexp[i] += 0x10;
+		  }
+		  break;
+	  }
+  }
 }
 
 static void
@@ -879,23 +881,22 @@ decode_sbrn ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SBRN_N:
-	if (dec_insn.code->args[i] == '5')
-	  {
-            dec_insn.cexp[i] =  (dec_insn.opcode & 0xf000) >> 12;
-	    dec_insn.cexp[i] |= (dec_insn.opcode & 0x0080) >> 3;
-	  }
-	else  
-          dec_insn.cexp[i] =  (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SBRN_N:
+		  if (dec_insn.code->args[i] == '5') {
+			  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+			  dec_insn.cexp[i] |= (dec_insn.opcode & 0x0080) >> 3;
+		  } else {
+			  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  }
+		  break;
 
-      case FMT_SBRN_DISP4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SBRN_DISP4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -903,13 +904,13 @@ decode_sc ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SC_CONST8:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xff00) >> 8;
-	break;
-      }
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SC_CONST8:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xff00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -917,17 +918,17 @@ decode_slr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SLR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SLR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SLR_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SLR_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -935,17 +936,17 @@ decode_slro ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SLRO_OFF4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SLRO_OFF4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SLRO_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SLRO_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -953,13 +954,13 @@ decode_sr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SR_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SR_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -967,17 +968,17 @@ decode_src ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SRC_CONST4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SRC_CONST4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SRC_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SRC_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -985,17 +986,17 @@ decode_sro ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SRO_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SRO_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SRO_OFF4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SRO_OFF4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -1003,17 +1004,17 @@ decode_srr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SRR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SRR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SRR_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SRR_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -1021,21 +1022,21 @@ decode_srrs ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SRRS_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SRRS_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SRRS_S1_D:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
+	  case FMT_SRRS_S1_D:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
 
-      case FMT_SRRS_N:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0x00c0) >> 6;
-	break;
-      }
+	  case FMT_SRRS_N:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0x00c0) >> 6;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -1043,17 +1044,17 @@ decode_ssr ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SSR_S2:
-        dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SSR_S2:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SSR_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SSR_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 static void
@@ -1061,17 +1062,17 @@ decode_ssro ()
 {
   int i;
 
-  for (i = 0; i < dec_insn.code->nr_operands; ++i)
-    switch (dec_insn.code->fields[i])
-      {
-      case FMT_SSRO_OFF4:
-        dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
-	break;
+  for (i = 0; i < dec_insn.code->nr_operands; ++i) {
+	  switch (dec_insn.code->fields[i]) {
+	  case FMT_SSRO_OFF4:
+		  dec_insn.cexp[i] = (dec_insn.opcode & 0xf000) >> 12;
+		  break;
 
-      case FMT_SSRO_S1:
-        dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
-	break;
-      }
+	  case FMT_SSRO_S1:
+		  dec_insn.regs[i] = (dec_insn.opcode & 0x0f00) >> 8;
+		  break;
+	  }
+  }
 }
 
 /* Initialize the hash tables for instructions and SFRs.  */
@@ -1096,35 +1097,40 @@ init_hash_tables ()
 
   for (i = 0, pop = tricore_opcodes; i < NUMOPCS; ++i, ++pop)
     {
-      if (!MATCHES_ISA (pop->isa))
-        continue;
+	  if (!MATCHES_ISA (pop->isa)) {
+		  continue;
+	  }
 
-      idx = pop->opcode & 0x3f;
-      if (insns[idx])
-	insnlink[i].next = insns[idx];
-      insns[idx] = &insnlink[i];
-      insnlink[i].code = pop;
+	  idx = pop->opcode & 0x3f;
+	  if (insns[idx]) {
+		  insnlink[i].next = insns[idx];
+	  }
+	  insns[idx] = &insnlink[i];
+	  insnlink[i].code = pop;
     }
 
   for (i = 0, ppop = pcp_opcodes; i < NUMPCPOPCS; ++i, ++ppop)
     {
       idx = (ppop->opcode >> 11) & 0x1f;
-      if (pcpinsns[idx])
-        pcplink[i].next = pcpinsns[idx];
+      if (pcpinsns[idx]) {
+	      pcplink[i].next = pcpinsns[idx];
+      }
       pcpinsns[idx] = &pcplink[i];
       pcplink[i].code = ppop;
     }
 
   for (i = 0, psfr = tricore_sfrs; i < NUMSFRS; ++i, ++psfr)
     {
-      if (!MATCHES_ISA (psfr->isa))
-        continue;
+	  if (!MATCHES_ISA (psfr->isa)) {
+		  continue;
+	  }
 
-      idx = psfr->addr & 0xff;
-      if (sfrs[idx])
-        sfrlink[i].next = sfrs[idx];
-      sfrs[idx] = &sfrlink[i];
-      sfrlink[i].sfr = psfr;
+	  idx = psfr->addr & 0xff;
+	  if (sfrs[idx]) {
+		  sfrlink[i].next = sfrs[idx];
+	  }
+	  sfrs[idx] = &sfrlink[i];
+	  sfrlink[i].sfr = psfr;
     }
 }
 
@@ -1137,9 +1143,11 @@ find_core_reg (addr)
   struct sfrlist *psfr;
   int idx = addr & 0xff;
 
-  for (psfr = sfrs[idx]; psfr != NULL; psfr = psfr->next)
-    if ((psfr->sfr->addr == addr) && MATCHES_ISA (psfr->sfr->isa))
-      return psfr->sfr->name;
+  for (psfr = sfrs[idx]; psfr != NULL; psfr = psfr->next) {
+	  if ((psfr->sfr->addr == addr) && MATCHES_ISA (psfr->sfr->isa)) {
+		  return psfr->sfr->name;
+	  }
+  }
 
   return (char *) 0;
 }
@@ -1175,9 +1183,9 @@ print_decoded_insn (memaddr, info)
     {
       DPRINT (DFILE, "not "REGPREFIX"d%d", dec_insn.regs[0]);
       return;
-    }
-  else
-    DPRINT (DFILE, "%s ", insn->name);
+  } else {
+	  DPRINT (DFILE, "%s ", insn->name);
+  }
 
   /* Being a child of the RISC generation, a TriCore-based CPU generally
      must load a 32-bit wide address in two steps, usually by executing
@@ -1193,8 +1201,9 @@ print_decoded_insn (memaddr, info)
      if we can be reasonably sure that it is part of the load sequence
      described above.  Note that "lea" is used here as a generic insn;
      it actually may also be any load or store instruction.  */
-  if (memaddr != next_addr)
-    expect_lea = print_symbolic_address = false;
+  if (memaddr != next_addr) {
+	  expect_lea = print_symbolic_address = false;
+  }
   next_addr = memaddr + (insn->len32 ? 4 : 2);
 
   if (!strcmp (insn->name, "movh.a"))
@@ -1229,39 +1238,36 @@ print_decoded_insn (memaddr, info)
 	      print_symbolic_address = true;
 	    }
 	}
+    } else {
+	    print_symbolic_address = false;
     }
-  else
-    print_symbolic_address = false;
 
-  if (!strncmp(insn->name,"ld.a",4))
-		load_areg[dec_insn.regs[0]] = false;
-  else
-  if (!strncmp(insn->name,"add.a",5) 
-	|| !strncmp(insn->name,"sub.a",5)
-	|| !strcmp(insn->name,"mov.a")
-	|| !strncmp(insn->name,"addsc.a",7))
-		load_areg[dec_insn.regs[0]] = false;
-  else
-  if (!strcmp(insn->name,"mov.aa"))
-	load_areg[dec_insn.regs[0]] = load_areg[dec_insn.regs[1]];
-  else
-  if (!strncmp(insn->name,"call",4)) {
-	int i = 0;
-	for (i = 2; i < 8; i++)
-		load_areg[i] = false;
+    if (!strncmp (insn->name, "ld.a", 4)) {
+	    load_areg[dec_insn.regs[0]] = false;
+    } else if (!strncmp (insn->name, "add.a", 5) || !strncmp (insn->name, "sub.a", 5) || !strcmp (insn->name, "mov.a") || !strncmp (insn->name, "addsc.a", 7)) {
+	    load_areg[dec_insn.regs[0]] = false;
+    } else if (!strcmp (insn->name, "mov.aa")) {
+	    load_areg[dec_insn.regs[0]] = load_areg[dec_insn.regs[1]];
+    } else if (!strncmp (insn->name, "call", 4)) {
+	    int i = 0;
+	    for (i = 2; i < 8; i++) {
+		    load_areg[i] = false;
+	    }
   }
   else
   if (!strncmp(insn->name,"ret",3)) {
 	int i = 0;
-	for (i = 2; i < 8; i++)
+	for (i = 2; i < 8; i++) {
 		load_areg[i] = false;
-	for (i = 10; i < 16; i++)
+	}
+	for (i = 10; i < 16; i++) {
 		load_areg[i] = false;
+	}
   }
 
-
-  if (!strcmp (insn->name, "mfcr") || !strcmp (insn->name, "mtcr"))
-    needs_creg = 1;
+  if (!strcmp (insn->name, "mfcr") || !strcmp (insn->name, "mtcr")) {
+	  needs_creg = 1;
+  }
 
   for (i = 0; i < insn->nr_operands; ++i)
     {
@@ -1308,9 +1314,9 @@ print_decoded_insn (memaddr, info)
 	case 'A':
 	  if (dec_insn.regs[i] == 10) {
 	    DPRINT (DFILE, ""REGPREFIX"sp");
- 	  }
-	  else
-	    DPRINT (DFILE, ""REGPREFIX"a%d", dec_insn.regs[i]);
+	  } else {
+		  DPRINT (DFILE, "" REGPREFIX "a%d", dec_insn.regs[i]);
+	  }
 	  break;
 
 	case 'I':
@@ -1340,44 +1346,47 @@ print_decoded_insn (memaddr, info)
 	  break;
 
 	case '4':
-	  if (dec_insn.cexp[i] & 0x8)
-	    dec_insn.cexp[i] |= ~0xf;
-	  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
-	  break;
+		if (dec_insn.cexp[i] & 0x8) {
+			dec_insn.cexp[i] |= ~0xf;
+		}
+		DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+		break;
 
 	case 'F':
-	  if (dec_insn.cexp[i] & 0x10)
-	    dec_insn.cexp[i] |= ~0x1f;
-	  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
-	  break;
+		if (dec_insn.cexp[i] & 0x10) {
+			dec_insn.cexp[i] |= ~0x1f;
+		}
+		DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+		break;
 
 	case '9':
-	  if (dec_insn.cexp[i] & 0x100)
-	    dec_insn.cexp[i] |= ~0x1ff;
-	  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
-	  break;
+		if (dec_insn.cexp[i] & 0x100) {
+			dec_insn.cexp[i] |= ~0x1ff;
+		}
+		DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+		break;
 
 	case '0':
-	  if (dec_insn.cexp[i] & 0x200)
-	    dec_insn.cexp[i] |= ~0x3ff;
-	  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
-	  if (print_symbolic_address)
-	    {
-	      DPRINT (DFILE, " <");
-	      (*info->print_address_func) (load_addr, info);
-	      DPRINT (DFILE, ">");
+		if (dec_insn.cexp[i] & 0x200) {
+			dec_insn.cexp[i] |= ~0x3ff;
+		}
+		DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+		if (print_symbolic_address) {
+			DPRINT (DFILE, " <");
+			(*info->print_address_func) (load_addr, info);
+			DPRINT (DFILE, ">");
 	    }
 	  break;
 
 	case 'w':
-	  if (dec_insn.cexp[i] & 0x8000)
-	    dec_insn.cexp[i] |= ~0xffff;
-	  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
-	  if (print_symbolic_address)
-	    {
-	      DPRINT (DFILE, " <");
-	      (*info->print_address_func) (load_addr, info);
-	      DPRINT (DFILE, ">");
+		if (dec_insn.cexp[i] & 0x8000) {
+			dec_insn.cexp[i] |= ~0xffff;
+		}
+		DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+		if (print_symbolic_address) {
+			DPRINT (DFILE, " <");
+			(*info->print_address_func) (load_addr, info);
+			DPRINT (DFILE, ">");
 	    }
 	  break;
 
@@ -1394,25 +1403,28 @@ print_decoded_insn (memaddr, info)
 	  break;
 
 	case 'o':
-	  if (dec_insn.cexp[i] & 0x4000)
-	    dec_insn.cexp[i] |= ~0x7fff;
-	  abs = (dec_insn.cexp[i] << 1) + memaddr;
-	  (*info->print_address_func) (abs, info);
-	  break;
+		if (dec_insn.cexp[i] & 0x4000) {
+			dec_insn.cexp[i] |= ~0x7fff;
+		}
+		abs = (dec_insn.cexp[i] << 1) + memaddr;
+		(*info->print_address_func) (abs, info);
+		break;
 
 	case 'O':
-	  if (dec_insn.cexp[i] & 0x800000)
-	    dec_insn.cexp[i] |= ~0xffffff;
-	  abs = (dec_insn.cexp[i] << 1) + memaddr;
-	  (*info->print_address_func) (abs, info);
-	  break;
+		if (dec_insn.cexp[i] & 0x800000) {
+			dec_insn.cexp[i] |= ~0xffffff;
+		}
+		abs = (dec_insn.cexp[i] << 1) + memaddr;
+		(*info->print_address_func) (abs, info);
+		break;
 
 	case 'R':
-	  if (dec_insn.cexp[i] & 0x80)
-	    dec_insn.cexp[i] |= ~0xff;
-	  abs = (dec_insn.cexp[i] << 1) + memaddr;
-	  (*info->print_address_func) (abs, info);
-	  break;
+		if (dec_insn.cexp[i] & 0x80) {
+			dec_insn.cexp[i] |= ~0xff;
+		}
+		abs = (dec_insn.cexp[i] << 1) + memaddr;
+		(*info->print_address_func) (abs, info);
+		break;
 
 	case 'r':
 	  dec_insn.cexp[i] |= ~0xf;
@@ -1430,75 +1442,82 @@ print_decoded_insn (memaddr, info)
 	  if (needs_creg)
 	    {
 	      creg = find_core_reg (dec_insn.cexp[i]);
-	      if (creg)
-	        DPRINT (DFILE, "%s", creg);
-	      else
-	        DPRINT (DFILE, "$0x%04lx (unknown SFR)", dec_insn.cexp[i]);
-	    }
-	  else
-	    DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+	      if (creg) {
+		      DPRINT (DFILE, "%s", creg);
+	      } else {
+		      DPRINT (DFILE, "$0x%04lx (unknown SFR)", dec_insn.cexp[i]);
+	      }
+	  } else {
+		  DPRINT (DFILE, "%ld", dec_insn.cexp[i]);
+	  }
 	  break;
 
 	case '&':
 	  dec_insn.regs[i] = 10;
 	  /* Fall through. */ 
 	case '@':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "["REGPREFIX"sp]");
-	  else
-	    DPRINT (DFILE, "["REGPREFIX"a%d]", dec_insn.regs[i]);
-	  if (need_comma)
-	    {
-	      if ((insn->args[i+1] == 'a') || (insn->args[i+1] == 'd'))
-	        need_comma = 1;
-	      else
-	        need_comma = 0;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[" REGPREFIX "sp]");
+		} else {
+			DPRINT (DFILE, "[" REGPREFIX "a%d]", dec_insn.regs[i]);
+		}
+		if (need_comma) {
+			if ((insn->args[i + 1] == 'a') || (insn->args[i + 1] == 'd')) {
+				need_comma = 1;
+			} else {
+				need_comma = 0;
+			}
 	    }
 	  break;
 
 	case '<':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "[+"REGPREFIX"sp]");
-	  else
-	    DPRINT (DFILE, "[+"REGPREFIX"a%d]", dec_insn.regs[i]);
-	  need_comma = 0;
-	  break;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[+" REGPREFIX "sp]");
+		} else {
+			DPRINT (DFILE, "[+" REGPREFIX "a%d]", dec_insn.regs[i]);
+		}
+		need_comma = 0;
+		break;
 
 	case '>':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "["REGPREFIX"sp+]");
-	  else
-	    DPRINT (DFILE, "["REGPREFIX"a%d+]", dec_insn.regs[i]);
-	  if (need_comma)
-	    {
-	      if ((insn->args[i+1] == 'a') || (insn->args[i+1] == 'd'))
-	        need_comma = 1;
-	      else
-	        need_comma = 0;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[" REGPREFIX "sp+]");
+		} else {
+			DPRINT (DFILE, "[" REGPREFIX "a%d+]", dec_insn.regs[i]);
+		}
+		if (need_comma) {
+			if ((insn->args[i + 1] == 'a') || (insn->args[i + 1] == 'd')) {
+				need_comma = 1;
+			} else {
+				need_comma = 0;
+			}
 	    }
 	  break;
 
 	case '*':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "["REGPREFIX"sp+c]");
-	  else
-	    DPRINT (DFILE, "["REGPREFIX"a%d+c]", dec_insn.regs[i]);
-	  need_comma = 0;
-	  break;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[" REGPREFIX "sp+c]");
+		} else {
+			DPRINT (DFILE, "[" REGPREFIX "a%d+c]", dec_insn.regs[i]);
+		}
+		need_comma = 0;
+		break;
 
 	case '#':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "["REGPREFIX"sp+r]");
-	  else
-	    DPRINT (DFILE, "["REGPREFIX"a%d+r]", dec_insn.regs[i]);
-	  break;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[" REGPREFIX "sp+r]");
+		} else {
+			DPRINT (DFILE, "[" REGPREFIX "a%d+r]", dec_insn.regs[i]);
+		}
+		break;
 
 	case '?':
-	  if (dec_insn.regs[i] == 10)
-	    DPRINT (DFILE, "["REGPREFIX"sp+i]");
-	  else
-	    DPRINT (DFILE, "["REGPREFIX"a%d+i]", dec_insn.regs[i]);
-	  break;
+		if (dec_insn.regs[i] == 10) {
+			DPRINT (DFILE, "[" REGPREFIX "sp+i]");
+		} else {
+			DPRINT (DFILE, "[" REGPREFIX "a%d+i]", dec_insn.regs[i]);
+		}
+		break;
 
 	case 'S':
 	  DPRINT (DFILE, "["REGPREFIX"a15]"); 
@@ -1506,8 +1525,9 @@ print_decoded_insn (memaddr, info)
 	  break;
 	}
 
-      if (need_comma)
-        DPRINT (DFILE, ", ");
+	if (need_comma) {
+		DPRINT (DFILE, ", ");
+	}
     }
 
 #undef DPRINT
@@ -1534,21 +1554,22 @@ decode_tricore_insn (memaddr, insn, len32, info)
   /* Try to find the instruction matching the given opcode.  */
   for (pinsn = insns[idx]; pinsn != NULL; pinsn = pinsn->next)
     {
-      if ((pinsn->code->len32 != len32)
-          || (insn & pinsn->code->lose))
-        continue;
+	  if ((pinsn->code->len32 != len32) || (insn & pinsn->code->lose)) {
+		  continue;
+	  }
 
-      fmt = pinsn->code->format;
-      mask = tricore_opmask[fmt];
-      if ((insn & mask) != pinsn->code->opcode)
-        continue;
+	  fmt = pinsn->code->format;
+	  mask = tricore_opmask[fmt];
+	  if ((insn & mask) != pinsn->code->opcode) {
+		  continue;
+	  }
 
-      /* A valid instruction was found.  Go print it. */
-      dec_insn.code = pinsn->code;
-      dec_insn.opcode = insn;
-      decode[fmt] ();
-      print_decoded_insn (memaddr, info);
-      return len32 ? 4 : 2;
+	  /* A valid instruction was found.  Go print it. */
+	  dec_insn.code = pinsn->code;
+	  dec_insn.opcode = insn;
+	  decode[fmt]();
+	  print_decoded_insn (memaddr, info);
+	  return len32 ? 4 : 2;
     }
 
   /* Oops -- this isn't a valid TriCore insn!  Since we know that
@@ -1590,22 +1611,20 @@ decode_pcp_insn (memaddr, buffer, info)
   idx = (insn >> 11) & 0x1f;
   for (pinsn = pcpinsns[idx]; pinsn != NULL; pinsn = pinsn->next)
     {
-      if (((insn & pinsn->code->opcode) != pinsn->code->opcode)
-          || (insn & pinsn->code->lose))
-        continue;
+	  if (((insn & pinsn->code->opcode) != pinsn->code->opcode) || (insn & pinsn->code->lose)) {
+		  continue;
+	  }
 
-      /* A valid instruction was found.  */
-      pop = pinsn->code;
-      if (pop->len32)
-        {
-	  /* This is a 32-bit insn; try to read 2 more bytes.  */
-          fail = (*info->read_memory_func) (memaddr + 2, &buffer[2], 2, info);
-          if (fail)
-            {
-              DPRINT (DFILE, ".hword 0x%04lx", insn);
-	      return 2;
-	    }
-	  insn2 = bfd_getl16 (buffer + 2);
+	  /* A valid instruction was found.  */
+	  pop = pinsn->code;
+	  if (pop->len32) {
+		  /* This is a 32-bit insn; try to read 2 more bytes.  */
+		  fail = (*info->read_memory_func) (memaddr + 2, &buffer[2], 2, info);
+		  if (fail) {
+			  DPRINT (DFILE, ".hword 0x%04lx", insn);
+			  return 2;
+		  }
+		  insn2 = bfd_getl16 (buffer + 2);
 	}
 
       break;
@@ -1630,26 +1649,28 @@ decode_pcp_insn (memaddr, buffer, info)
 	    {
 	    case 'd':
 	      val = (insn >> 9) & 0x3;
-	      if (val == 0)
-	        DPRINT (DFILE, "dst");
-	      else if (val == 1)
-	        DPRINT (DFILE, "dst+");
-	      else if (val == 2)
-	        DPRINT (DFILE, "dst-");
-	      else
-	        DPRINT (DFILE, "dst *ILLEGAL*");
+	      if (val == 0) {
+		      DPRINT (DFILE, "dst");
+	      } else if (val == 1) {
+		      DPRINT (DFILE, "dst+");
+	      } else if (val == 2) {
+		      DPRINT (DFILE, "dst-");
+	      } else {
+		      DPRINT (DFILE, "dst *ILLEGAL*");
+	      }
 	      break;
 
 	    case 's':
 	      val = (insn >> 7) & 0x3;
-	      if (val == 0)
-	        DPRINT (DFILE, "src");
-	      else if (val == 1)
-	        DPRINT (DFILE, "src+");
-	      else if (val == 2)
-	        DPRINT (DFILE, "src-");
-	      else
-	        DPRINT (DFILE, "src *ILLEGAL*");
+	      if (val == 0) {
+		      DPRINT (DFILE, "src");
+	      } else if (val == 1) {
+		      DPRINT (DFILE, "src+");
+	      } else if (val == 2) {
+		      DPRINT (DFILE, "src-");
+	      } else {
+		      DPRINT (DFILE, "src *ILLEGAL*");
+	      }
 	      break;
 
 	    case 'c':
@@ -1658,15 +1679,15 @@ decode_pcp_insn (memaddr, buffer, info)
 	      break;
 
 	    case 'n':
-	      if (!strcmp (pop->name, "copy"))
-		val = ((insn >> 2) & 0x7) + 1;
-	      else
-	        {
-		  val = (insn >> 2) & 0x3;
-		  if (val == 0)
-		    val = 8;
-		  else if (val == 3)
-		    val = 4;
+		    if (!strcmp (pop->name, "copy")) {
+			    val = ((insn >> 2) & 0x7) + 1;
+		    } else {
+			    val = (insn >> 2) & 0x3;
+			    if (val == 0) {
+				    val = 8;
+			    } else if (val == 3) {
+				    val = 4;
+			    }
 		}
 	      DPRINT (DFILE, "cnt0=%lu", val);
 	      break;
@@ -1706,9 +1727,10 @@ decode_pcp_insn (memaddr, buffer, info)
 	      DPRINT (DFILE, "***UNKNOWN OPERAND `%c'***", pop->args[idx]);
 	      break;
 	    }
-          if (idx < (pop->nr_operands - 1))
-	    DPRINT (DFILE, ", ");
-        }
+	    if (idx < (pop->nr_operands - 1)) {
+		    DPRINT (DFILE, ", ");
+	    }
+	}
       break;
 
     case 1:
@@ -1728,44 +1750,47 @@ decode_pcp_insn (memaddr, buffer, info)
       rb = (insn >> 6) & 0x7;
       ra = (insn >> 3) & 0x7;
       val = insn & 0x7;
-      if (!strcmp (pop->name, "ld.p") || !strcmp (pop->name, "st.p"))
-        DPRINT (DFILE, "cc_%s, r%d, [r%d]", pcp_ccodes[val], rb, ra);
-      else
-        DPRINT (DFILE, "cc_%s, r%d, r%d", pcp_ccodes[val], rb, ra);
+      if (!strcmp (pop->name, "ld.p") || !strcmp (pop->name, "st.p")) {
+	      DPRINT (DFILE, "cc_%s, r%d, [r%d]", pcp_ccodes[val], rb, ra);
+      } else {
+	      DPRINT (DFILE, "cc_%s, r%d, r%d", pcp_ccodes[val], rb, ra);
+      }
       break;
 
     case 4:
       ra = (insn >> 6) & 0x7;
       val = insn & 0x3f;
-      if (!strcmp (pop->name, "chkb"))
-        DPRINT (DFILE, "r%d, %lu, %s", ra, val & 0x1f,
-		(val & 0x20) ? "set" : "clr");
-      else if (!strcmp (pop->name, "ldl.il"))
-        DPRINT (DFILE, "r%d, 0x....%04lx", ra, insn2);
-      else if (!strcmp (pop->name, "ldl.iu"))
-        DPRINT (DFILE, "r%d, 0x%04lx....", ra, insn2);
-      else
-        DPRINT (DFILE, "r%d, %lu", ra, val);
+      if (!strcmp (pop->name, "chkb")) {
+	      DPRINT (DFILE, "r%d, %lu, %s", ra, val & 0x1f,
+		      (val & 0x20) ? "set" : "clr");
+      } else if (!strcmp (pop->name, "ldl.il")) {
+	      DPRINT (DFILE, "r%d, 0x....%04lx", ra, insn2);
+      } else if (!strcmp (pop->name, "ldl.iu")) {
+	      DPRINT (DFILE, "r%d, 0x%04lx....", ra, insn2);
+      } else {
+	      DPRINT (DFILE, "r%d, %lu", ra, val);
+      }
       break;
 
     case 5:
       ra = (insn >> 6) & 0x7;
       val = 8 << (((insn >> 5) & 0x1) | ((insn >> 8) & 0x2));
-      if ((!strcmp (pop->name, "set.f") || !strcmp (pop->name, "clr.f"))
-          && ((insn & 0x1f) >= val))
-        DPRINT (DFILE, "[r%d], %lu ***ILLEGAL VALUE***, size=%lu", ra,
-		insn & 0x1f, val);
-      else
-        DPRINT (DFILE, "[r%d], %lu, size=%lu", ra, insn & 0x1f, val);
+      if ((!strcmp (pop->name, "set.f") || !strcmp (pop->name, "clr.f")) && ((insn & 0x1f) >= val)) {
+	      DPRINT (DFILE, "[r%d], %lu ***ILLEGAL VALUE***, size=%lu", ra,
+		      insn & 0x1f, val);
+      } else {
+	      DPRINT (DFILE, "[r%d], %lu, size=%lu", ra, insn & 0x1f, val);
+      }
       break;
 
     case 6:
       rb = (insn >> 6) & 0x7;
       ra = (insn >> 3) & 0x7;
-      if ((rb == 0) || (ra == 0) || (rb == 7) || (ra == 7) || (rb == ra))
-        DPRINT (DFILE, "r%d, r%d ***ILLEGAL REGISTER USE***", rb, ra);
-      else
-        DPRINT (DFILE, "r%d, r%d", rb, ra);
+      if ((rb == 0) || (ra == 0) || (rb == 7) || (ra == 7) || (rb == ra)) {
+	      DPRINT (DFILE, "r%d, r%d ***ILLEGAL REGISTER USE***", rb, ra);
+      } else {
+	      DPRINT (DFILE, "r%d, r%d", rb, ra);
+      }
       break;
 
     case 7:
@@ -1803,31 +1828,33 @@ decode_pcp_insn (memaddr, buffer, info)
 	      if (!strcmp (pop->name, "jl"))
 	        {
 		  val = insn & 0x3ff;
-		  if (val & 0x200)
-		    val |= ~0x3ff;
-	          (*info->print_address_func) (memaddr + 2 + (val << 1), info);
+		  if (val & 0x200) {
+			  val |= ~0x3ff;
+		  }
+		  (*info->print_address_func) (memaddr + 2 + (val << 1), info);
 		}
 	      else if (!strcmp (pop->name, "jc"))
 	        {
 		  val = insn & 0x3f;
-		  if (val & 0x20)
-		    val |= ~0x3f;
-	          (*info->print_address_func) (memaddr + 2 + (val << 1), info);
+		  if (val & 0x20) {
+			  val |= ~0x3f;
+		  }
+		  (*info->print_address_func) (memaddr + 2 + (val << 1), info);
+		} else if (!strcmp (pop->name, "jc.a")) {
+			/* FIXME: address should be PCODE_BASE + (insn2 << 1).  */
+			(*info->print_address_func) ((memaddr & 0xffff0000) + (insn2 << 1), info);
+		} else {
+			DPRINT (DFILE, "***ILLEGAL expr FOR %s***", pop->name);
 		}
-	      else if (!strcmp (pop->name, "jc.a"))
-	        /* FIXME: address should be PCODE_BASE + (insn2 << 1).  */
-	        (*info->print_address_func)
-		 ((memaddr & 0xffff0000) + (insn2 << 1), info);
-	      else
-	        DPRINT (DFILE, "***ILLEGAL expr FOR %s***", pop->name);
-	      break;
+		break;
 
 	    default:
 	      DPRINT (DFILE, "***UNKNOWN OPERAND `%c'***", pop->args[idx]);
 	      break;
 	    }
-          if (idx < (pop->nr_operands - 1))
-	    DPRINT (DFILE, ", ");
+	    if (idx < (pop->nr_operands - 1)) {
+		    DPRINT (DFILE, ", ");
+	    }
 	}
       break;
 
@@ -1902,30 +1929,30 @@ print_insn_tricore (memaddr, info)
     }
 
   /* Check if we're disassembling .pcp{text,data} sections.  */
-  if (info->section && (info->section->flags & SEC_ARCH_BIT_0))
-    return decode_pcp_insn (memaddr, buffer, info);
-
-  /* Handle TriCore sections.  */
-  if (buffer[0] & 1)
-    {
-      /* Looks like this is a 32-bit insn; try to read 2 more bytes.  */
-      failure = (*info->read_memory_func) (memaddr + 2, &buffer[2], 2, info);
-      if (failure)
-        {
-          insn = bfd_getl16 (buffer);
-          (*info->fprintf_func) (info->stream, ".hword 0x%04lx", insn);
-	  return 2;
-	}
-      else
-        len32 = 1;
+    if (info->section && (info->section->flags & SEC_ARCH_BIT_0)) {
+	    return decode_pcp_insn (memaddr, buffer, info);
     }
 
-  if (len32)
-    insn = bfd_getl32 (buffer);
-  else
-    insn = bfd_getl16 (buffer);
+    /* Handle TriCore sections.  */
+    if (buffer[0] & 1) {
+	    /* Looks like this is a 32-bit insn; try to read 2 more bytes.  */
+	    failure = (*info->read_memory_func) (memaddr + 2, &buffer[2], 2, info);
+	    if (failure) {
+		    insn = bfd_getl16 (buffer);
+		    (*info->fprintf_func) (info->stream, ".hword 0x%04lx", insn);
+		    return 2;
+	    } else {
+		    len32 = 1;
+	    }
+    }
 
-  return decode_tricore_insn (memaddr, insn, len32, info);
+    if (len32) {
+	    insn = bfd_getl32 (buffer);
+    } else {
+	    insn = bfd_getl16 (buffer);
+    }
+
+    return decode_tricore_insn (memaddr, insn, len32, info);
 }
 
 /* End of tricore-dis.c.  */
diff --git a/libr/asm/arch/v810/v810_disas.c b/libr/asm/arch/v810/v810_disas.c
index 049b86ae3a..fd67b8a79f 100644
--- a/libr/asm/arch/v810/v810_disas.c
+++ b/libr/asm/arch/v810/v810_disas.c
@@ -272,8 +272,9 @@ static int decode_bit_op(const ut16 instr, struct v810_cmd *cmd) {
 
 static int decode_extended(const ut16 word1, const ut16 word2, struct v810_cmd *cmd) {
 	ut8 subop = OPCODE(word2);
-	if (subop > 0xC)
+	if (subop > 0xC) {
 		return -1;
+	}
 
 	snprintf (cmd->instr, V810_INSTR_MAXLEN - 1, "%s",
 			ext_instrs[subop]);
@@ -310,8 +311,9 @@ int v810_decode_command(const ut8 *instr, int len, struct v810_cmd *cmd) {
 	ut16 word2 = 0;
 
 	word1 = r_read_le16 (instr);
-	if (len >= 4)
+	if (len >= 4) {
 		word2 = r_read_le16 (instr + 2);
+	}
 
 	switch (OPCODE(word1)) {
 	case V810_MOV:
@@ -389,8 +391,9 @@ int v810_decode_command(const ut8 *instr, int len, struct v810_cmd *cmd) {
 		}
 	}
 
-	if ((ret > 0) && (len < ret))
+	if ((ret > 0) && (len < ret)) {
 		ret = -1;
+	}
 
 	return ret;
 }
diff --git a/libr/asm/arch/vax/vax-dis.c b/libr/asm/arch/vax/vax-dis.c
index 261f7b51c5..73337f905f 100644
--- a/libr/asm/arch/vax/vax-dis.c
+++ b/libr/asm/arch/vax/vax-dis.c
@@ -105,9 +105,9 @@ fetch_data (struct disassemble_info *info, bfd_byte *addr)
     {
       (*info->memory_error_func) (status, start, info);
       longjmp (priv->bailout, 1);
-    }
-  else
-    priv->max_fetched = addr;
+  } else {
+	  priv->max_fetched = addr;
+  }
 
   return 1;
 }
@@ -151,11 +151,12 @@ print_insn_mode (const char *d,
     case 0x10:
     case 0x20:
     case 0x30: /* Literal mode			$number.  */
-      if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h')
-	(*info->fprintf_func) (info->stream, "$0x%x [%c-float]", mode, d[1]);
-      else
-        (*info->fprintf_func) (info->stream, "$0x%x", mode);
-      break;
+	    if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h') {
+		    (*info->fprintf_func) (info->stream, "$0x%x [%c-float]", mode, d[1]);
+	    } else {
+		    (*info->fprintf_func) (info->stream, "$0x%x", mode);
+	    }
+	    break;
     case 0x40: /* Index:			base-addr[Rn] */
       p += print_insn_mode (d, size, p0 + 1, addr + 1, info);
       (*info->fprintf_func) (info->stream, "[%s]", reg_names[reg]);
@@ -189,55 +190,61 @@ print_insn_mode (const char *d,
 		}
 	      else
 		{
-	          for (i = 0; i < size; i++)
-		    (*info->fprintf_func) (info->stream, "%02x",
-		                           p[size - i - 1]);
-	          (*info->fprintf_func) (info->stream, " [%c-float]", d[1]);
+			for (i = 0; i < size; i++) {
+				(*info->fprintf_func) (info->stream, "%02x",
+					p[size - i - 1]);
+			}
+			(*info->fprintf_func) (info->stream, " [%c-float]", d[1]);
 		}
 	    }
 	  else
 	    {
-	      for (i = 0; i < size; i++)
-	        (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]);
+		    for (i = 0; i < size; i++) {
+			    (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]);
+		    }
 	    }
 	  p += size;
-	}
-      else
-	(*info->fprintf_func) (info->stream, "(%s)+", reg_names[reg]);
+      } else {
+	      (*info->fprintf_func) (info->stream, "(%s)+", reg_names[reg]);
+      }
       break;
     case 0x90: /* Autoincrement deferred:	@(Rn)+ */
-      if (reg == 0xF)
-	(*info->fprintf_func) (info->stream, "*0x%x", NEXTLONG (p));
-      else
-	(*info->fprintf_func) (info->stream, "@(%s)+", reg_names[reg]);
-      break;
+	    if (reg == 0xF) {
+		    (*info->fprintf_func) (info->stream, "*0x%x", NEXTLONG (p));
+	    } else {
+		    (*info->fprintf_func) (info->stream, "@(%s)+", reg_names[reg]);
+	    }
+	    break;
     case 0xB0: /* Displacement byte deferred:	*displ(Rn).  */
       (*info->fprintf_func) (info->stream, "*");
     case 0xA0: /* Displacement byte:		displ(Rn).  */
-      if (reg == 0xF)
-	(*info->print_address_func) (addr + 2 + NEXTBYTE (p), info);
-      else
-	(*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTBYTE (p),
-			       reg_names[reg]);
-      break;
+	    if (reg == 0xF) {
+		    (*info->print_address_func) (addr + 2 + NEXTBYTE (p), info);
+	    } else {
+		    (*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTBYTE (p),
+			    reg_names[reg]);
+	    }
+	    break;
     case 0xD0: /* Displacement word deferred:	*displ(Rn).  */
       (*info->fprintf_func) (info->stream, "*");
     case 0xC0: /* Displacement word:		displ(Rn).  */
-      if (reg == 0xF)
-	(*info->print_address_func) (addr + 3 + NEXTWORD (p), info);
-      else
-	(*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTWORD (p),
-			       reg_names[reg]);
-      break;
+	    if (reg == 0xF) {
+		    (*info->print_address_func) (addr + 3 + NEXTWORD (p), info);
+	    } else {
+		    (*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTWORD (p),
+			    reg_names[reg]);
+	    }
+	    break;
     case 0xF0: /* Displacement long deferred:	*displ(Rn).  */
       (*info->fprintf_func) (info->stream, "*");
     case 0xE0: /* Displacement long:		displ(Rn).  */
-      if (reg == 0xF)
-	(*info->print_address_func) (addr + 5 + NEXTLONG (p), info);
-      else
-	(*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTLONG (p),
-			       reg_names[reg]);
-      break;
+	    if (reg == 0xF) {
+		    (*info->print_address_func) (addr + 5 + NEXTLONG (p), info);
+	    } else {
+		    (*info->fprintf_func) (info->stream, "0x%x(%s)", NEXTLONG (p),
+			    reg_names[reg]);
+	    }
+	    break;
     }
 
   return p - p0;
@@ -275,10 +282,11 @@ print_insn_arg (const char *d,
     {
       unsigned char *p = p0;
 
-      if (arg_len == 1)
-	(*info->print_address_func) (addr + 1 + NEXTBYTE (p), info);
-      else
-	(*info->print_address_func) (addr + 2 + NEXTWORD (p), info);
+      if (arg_len == 1) {
+	      (*info->print_address_func) (addr + 1 + NEXTBYTE (p), info);
+      } else {
+	      (*info->print_address_func) (addr + 2 + NEXTWORD (p), info);
+      }
 
       return p - p0;
     }
@@ -303,9 +311,10 @@ print_insn_vax (bfd_vma memaddr, disassemble_info *info)
   priv.max_fetched = priv.the_buffer;
   priv.insn_start = memaddr;
 
-  if (setjmp (priv.bailout) != 0)
-    /* Error return.  */
-    return -1;
+  if (setjmp (priv.bailout) != 0) {
+	  /* Error return.  */
+	  return -1;
+  }
 
   argp = NULL;
   /* Check if the info buffer has more than one byte left since
@@ -348,15 +357,17 @@ print_insn_vax (bfd_vma memaddr, disassemble_info *info)
   FETCH_DATA (info, arg);
 
   (*info->fprintf_func) (info->stream, "%s", votp->name);
-  if (*argp)
-    (*info->fprintf_func) (info->stream, " ");
+  if (*argp) {
+	  (*info->fprintf_func) (info->stream, " ");
+  }
 
   while (*argp)
     {
       arg += print_insn_arg (argp, arg, memaddr + arg - buffer, info);
       argp += 2;
-      if (*argp)
-	(*info->fprintf_func) (info->stream, ", ");
+      if (*argp) {
+	      (*info->fprintf_func) (info->stream, ", ");
+      }
     }
 
   return arg - buffer;
diff --git a/libr/asm/arch/wasm/wasm.c b/libr/asm/arch/wasm/wasm.c
index 5f4f6e5b3f..c3ade060f2 100644
--- a/libr/asm/arch/wasm/wasm.c
+++ b/libr/asm/arch/wasm/wasm.c
@@ -354,7 +354,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			st32 val = 0;
 			size_t n = read_i32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			switch (0x80 - val) {
 			case R_BIN_WASM_VALUETYPE_EMPTY:
 				snprintf (op->txt, R_ASM_BUFSIZE, "%s", opdef->txt);
@@ -384,7 +386,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 val = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d", opdef->txt, val);
 			op->len += n;
 		}
@@ -439,10 +443,14 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 val = 0, reserved = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			op->len += n;
 			n = read_u32_leb128 (buf + op->len, buf + buf_len, &reserved);
-			if (!(n == 1 && op->len + n <= buf_len)) goto err;
+			if (!(n == 1 && op->len + n <= buf_len)) {
+				goto err;
+			}
 			reserved &= 0x1;
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d %d", opdef->txt, val, reserved);
 			op->len += n;
@@ -456,7 +464,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 val = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d", opdef->txt, val);
 			op->len += n;
 		}
@@ -487,10 +497,14 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 flag = 0, offset = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &flag);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			op->len += n;
 			n = read_u32_leb128 (buf + op->len, buf + buf_len, &offset);
-			if (!(n > 0 && op->len + n <= buf_len)) goto err;
+			if (!(n > 0 && op->len + n <= buf_len)) {
+				goto err;
+			}
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d %d", opdef->txt, flag, offset);
 			op->len += n;
 		}
@@ -500,7 +514,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 reserved = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &reserved);
-			if (!(n == 1 && n < buf_len)) goto err;
+			if (!(n == 1 && n < buf_len)) {
+				goto err;
+			}
 			reserved &= 0x1;
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d", opdef->txt, reserved);
 			op->len += n;
@@ -511,7 +527,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			st32 val = 0;
 			size_t n = read_i32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %" PFMT32d, opdef->txt, val);
 			op->len += n;
 		}
@@ -520,7 +538,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			st64 val = 0;
 			size_t n = read_i64_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %" PFMT64d, opdef->txt, val);
 			op->len += n;
 		}
@@ -529,7 +549,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut32 val = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			long double d =  (long double)val;
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %" LDBLFMT, opdef->txt, d);
 			op->len += n;
@@ -539,7 +561,9 @@ int wasm_dis(WasmOp *op, const unsigned char *buf, int buf_len) {
 		{
 			ut64 val = 0;
 			size_t n = read_u64_leb128 (buf + 1, buf + buf_len, &val);
-			if (!(n > 0 && n < buf_len)) goto err;
+			if (!(n > 0 && n < buf_len)) {
+				goto err;
+			}
 			long double d =  (long double)val;
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %" LDBLFMT, opdef->txt, d);
 			op->len += n;
diff --git a/libr/asm/arch/xtensa/gnu/xtensa-dis.c b/libr/asm/arch/xtensa/gnu/xtensa-dis.c
index 94555e80a1..3cd0515775 100644
--- a/libr/asm/arch/xtensa/gnu/xtensa-dis.c
+++ b/libr/asm/arch/xtensa/gnu/xtensa-dis.c
@@ -80,8 +80,9 @@ fetch_data (struct disassemble_info *info, bfd_vma memaddr)
     {
       status = (*info->read_memory_func) (memaddr, priv->byte_buf, length,
 					  info);
-      if (status == 0)
-	return length;
+      if (status == 0) {
+	      return length;
+      }
     }
   (*info->memory_error_func) (status, memaddr, info);
   OPCODES_SIGLONGJMP (priv->bailout, 1);
@@ -102,11 +103,12 @@ print_xtensa_operand (bfd_vma memaddr,
     
   if (show_raw_fields)
     {
-      if (operand_val < 0xa)
-	(*info->fprintf_func) (info->stream, "%u", operand_val);
-      else
-	(*info->fprintf_func) (info->stream, "0x%x", operand_val);
-      return;
+	  if (operand_val < 0xa) {
+		  (*info->fprintf_func) (info->stream, "%u", operand_val);
+	  } else {
+		  (*info->fprintf_func) (info->stream, "0x%x", operand_val);
+	  }
+	  return;
     }
 
   (void) xtensa_operand_decode (isa, opc, opnd, &operand_val);
@@ -123,10 +125,11 @@ print_xtensa_operand (bfd_vma memaddr,
 	}
       else
 	{
-	  if ((signed_operand_val > -256) && (signed_operand_val < 256))
-	    (*info->fprintf_func) (info->stream, "%d", signed_operand_val);
-	  else
-	    (*info->fprintf_func) (info->stream, "0x%x", signed_operand_val);
+		if ((signed_operand_val > -256) && (signed_operand_val < 256)) {
+			(*info->fprintf_func) (info->stream, "%d", signed_operand_val);
+		} else {
+			(*info->fprintf_func) (info->stream, "0x%x", signed_operand_val);
+		}
 	}
     }
   else
@@ -165,8 +168,9 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info)
   static xtensa_insnbuf slot_buffer = NULL;
   int first, first_slot, valid_insn;
 
-  if (!xtensa_default_isa)
-    xtensa_default_isa = xtensa_isa_init (0, 0);
+  if (!xtensa_default_isa) {
+	  xtensa_default_isa = xtensa_isa_init (0, 0);
+  }
 
   info->target = 0;
   maxsize = xtensa_isa_maxlength (xtensa_default_isa);
@@ -214,24 +218,19 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info)
   xtensa_insnbuf_from_chars (isa, insn_buffer, priv.byte_buf, bytes_fetched);
 
   fmt = xtensa_format_decode (isa, insn_buffer);
-  if (fmt == XTENSA_UNDEFINED
-      || ((size = xtensa_format_length (isa, fmt)) > bytes_fetched))
-    valid_insn = 0;
-  else
-    {
-      /* Make sure all the opcodes are valid.  */
-      valid_insn = 1;
-      nslots = xtensa_format_num_slots (isa, fmt);
-      for (n = 0; n < nslots; n++)
-	{
-	  xtensa_format_get_slot (isa, fmt, n, insn_buffer, slot_buffer);
-	  if (xtensa_opcode_decode (isa, fmt, n, slot_buffer)
-	      == XTENSA_UNDEFINED)
-	    {
-	      valid_insn = 0;
-	      break;
-	    }
-	}
+  if (fmt == XTENSA_UNDEFINED || ((size = xtensa_format_length (isa, fmt)) > bytes_fetched)) {
+	  valid_insn = 0;
+  } else {
+	  /* Make sure all the opcodes are valid.  */
+	  valid_insn = 1;
+	  nslots = xtensa_format_num_slots (isa, fmt);
+	  for (n = 0; n < nslots; n++) {
+		  xtensa_format_get_slot (isa, fmt, n, insn_buffer, slot_buffer);
+		  if (xtensa_opcode_decode (isa, fmt, n, slot_buffer) == XTENSA_UNDEFINED) {
+			  valid_insn = 0;
+			  break;
+		  }
+	  }
     }
 
   if (!valid_insn)
@@ -240,49 +239,50 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info)
       return 1;
     }
 
-  if (nslots > 1)
-    (*info->fprintf_func) (info->stream, "{ ");
-
-  first_slot = 1;
-  for (n = 0; n < nslots; n++)
-    {
-      if (first_slot)
-	first_slot = 0;
-      else
-	(*info->fprintf_func) (info->stream, "; ");
-
-      xtensa_format_get_slot (isa, fmt, n, insn_buffer, slot_buffer);
-      opc = xtensa_opcode_decode (isa, fmt, n, slot_buffer);
-      (*info->fprintf_func) (info->stream, "%s",
-			     xtensa_opcode_name (isa, opc));
-
-      /* Print the operands (if any).  */
-      noperands = xtensa_opcode_num_operands (isa, opc);
-      first = 1;
-      for (i = 0; i < noperands; i++)
-	{
-	  if (xtensa_operand_is_visible (isa, opc, i) == 0)
-	    continue;
-	  if (first)
-	    {
-	      (*info->fprintf_func) (info->stream, " ");
-	      first = 0;
-	    }
-	  else
-	    (*info->fprintf_func) (info->stream, ", ");
-	  (void) xtensa_operand_get_field (isa, opc, i, fmt, n,
-					   slot_buffer, &operand_val);
-
-	  print_xtensa_operand (memaddr, info, opc, i, operand_val);
-	}
+    if (nslots > 1) {
+	    (*info->fprintf_func) (info->stream, "{ ");
     }
 
-  if (nslots > 1)
-    (*info->fprintf_func) (info->stream, " }");
+    first_slot = 1;
+    for (n = 0; n < nslots; n++) {
+	    if (first_slot) {
+		    first_slot = 0;
+	    } else {
+		    (*info->fprintf_func) (info->stream, "; ");
+	    }
 
-  info->bytes_per_chunk = size;
-  info->display_endian = info->endian;
+	    xtensa_format_get_slot (isa, fmt, n, insn_buffer, slot_buffer);
+	    opc = xtensa_opcode_decode (isa, fmt, n, slot_buffer);
+	    (*info->fprintf_func) (info->stream, "%s",
+		    xtensa_opcode_name (isa, opc));
 
-  return size;
+	    /* Print the operands (if any).  */
+	    noperands = xtensa_opcode_num_operands (isa, opc);
+	    first = 1;
+	    for (i = 0; i < noperands; i++) {
+		    if (xtensa_operand_is_visible (isa, opc, i) == 0) {
+			    continue;
+		    }
+		    if (first) {
+			    (*info->fprintf_func) (info->stream, " ");
+			    first = 0;
+		    } else {
+			    (*info->fprintf_func) (info->stream, ", ");
+		    }
+		    (void)xtensa_operand_get_field (isa, opc, i, fmt, n,
+			    slot_buffer, &operand_val);
+
+		    print_xtensa_operand (memaddr, info, opc, i, operand_val);
+	    }
+    }
+
+    if (nslots > 1) {
+	    (*info->fprintf_func) (info->stream, " }");
+    }
+
+    info->bytes_per_chunk = size;
+    info->display_endian = info->endian;
+
+    return size;
 }
 
diff --git a/libr/asm/arch/xtensa/gnu/xtensa-isa.c b/libr/asm/arch/xtensa/gnu/xtensa-isa.c
index df04becec8..a1d16cce36 100644
--- a/libr/asm/arch/xtensa/gnu/xtensa-isa.c
+++ b/libr/asm/arch/xtensa/gnu/xtensa-isa.c
@@ -139,8 +139,9 @@ xtensa_insnbuf_to_chars (xtensa_isa isa,
   int fence_post, start, increment, i, byte_count;
   xtensa_format fmt;
 
-  if (num_chars == 0)
-    num_chars = insn_size;
+  if (num_chars == 0) {
+	  num_chars = insn_size;
+  }
 
   if (intisa->is_big_endian)
     {
@@ -156,12 +157,14 @@ xtensa_insnbuf_to_chars (xtensa_isa isa,
   /* Find the instruction format.  Do nothing if the buffer does not contain
      a valid instruction since we need to know how many bytes to copy.  */
   fmt = xtensa_format_decode (isa, insn);
-  if (fmt == XTENSA_UNDEFINED)
-    return XTENSA_UNDEFINED;
+  if (fmt == XTENSA_UNDEFINED) {
+	  return XTENSA_UNDEFINED;
+  }
 
   byte_count = xtensa_format_length (isa, fmt);
-  if (byte_count == XTENSA_UNDEFINED)
-    return XTENSA_UNDEFINED;
+  if (byte_count == XTENSA_UNDEFINED) {
+	  return XTENSA_UNDEFINED;
+  }
 
   if (byte_count > num_chars)
     {
@@ -208,13 +211,13 @@ xtensa_insnbuf_from_chars (xtensa_isa isa,
       insn_size = max_size;
     }
 
-  if (num_chars == 0 || num_chars > insn_size)
-    num_chars = insn_size;
+    if (num_chars == 0 || num_chars > insn_size) {
+	    num_chars = insn_size;
+    }
 
-  if (intisa->is_big_endian)
-    {
-      start = max_size - 1;
-      increment = -1;
+    if (intisa->is_big_endian) {
+	    start = max_size - 1;
+	    increment = -1;
     }
   else
     {
@@ -291,8 +294,9 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p)
       CHECK_ALLOC_FOR_INIT (isa->sysreg_table[is_user], NULL,
 			    errno_p, error_msg_p);
 
-      for (n = 0; n <= isa->max_sysreg_num[is_user]; n++)
-	isa->sysreg_table[is_user][n] = XTENSA_UNDEFINED;
+      for (n = 0; n <= isa->max_sysreg_num[is_user]; n++) {
+	      isa->sysreg_table[is_user][n] = XTENSA_UNDEFINED;
+      }
     }
   for (n = 0; n < isa->num_sysregs; n++)
     {
@@ -422,8 +426,9 @@ xtensa_isa_num_pipe_stages (xtensa_isa isa)
   static int max_stage = XTENSA_UNDEFINED;
 
   /* Only compute the value once.  */
-  if (max_stage != XTENSA_UNDEFINED)
-    return max_stage + 1;
+  if (max_stage != XTENSA_UNDEFINED) {
+	  return max_stage + 1;
+  }
 
   num_opcodes = xtensa_isa_num_opcodes (isa);
   for (opcode = 0; opcode < num_opcodes; opcode++)
@@ -433,8 +438,9 @@ xtensa_isa_num_pipe_stages (xtensa_isa isa)
 	{
 	  use = xtensa_opcode_funcUnit_use (isa, opcode, i);
 	  stage = use->stage;
-	  if (stage > max_stage)
-	    max_stage = stage;
+	  if (stage > max_stage) {
+		  max_stage = stage;
+	  }
 	}
     }
 
@@ -548,8 +554,9 @@ xtensa_format_lookup (xtensa_isa isa, const char *fmtname)
 
   for (fmt = 0; fmt < intisa->num_formats; fmt++)
     {
-      if (r_str_casecmp (fmtname, intisa->formats[fmt].name) == 0)
-	return fmt;
+	  if (r_str_casecmp (fmtname, intisa->formats[fmt].name) == 0) {
+		  return fmt;
+	  }
     }
 
   xtisa_errno = xtensa_isa_bad_format;
@@ -565,8 +572,9 @@ xtensa_format_decode (xtensa_isa isa, const xtensa_insnbuf insn)
   xtensa_format fmt;
 
   fmt = (intisa->format_decode_fn) (insn);
-  if (fmt != XTENSA_UNDEFINED)
-    return fmt;
+  if (fmt != XTENSA_UNDEFINED) {
+	  return fmt;
+  }
 
   xtisa_errno = xtensa_isa_bad_format;
   strcpy (xtisa_error_msg, "cannot decode instruction format");
@@ -709,8 +717,9 @@ xtensa_opcode_decode (xtensa_isa isa, xtensa_format fmt, int slot,
   slot_id = intisa->formats[fmt].slot_id[slot];
 
   opc = (intisa->slots[slot_id].opcode_decode_fn) (slotbuf);
-  if (opc != XTENSA_UNDEFINED)
-    return opc;
+  if (opc != XTENSA_UNDEFINED) {
+	  return opc;
+  }
 
   xtisa_errno = xtensa_isa_bad_opcode;
   strcpy (xtisa_error_msg, "cannot decode opcode");
@@ -759,8 +768,9 @@ xtensa_opcode_is_branch (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
-  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_BRANCH) != 0)
-    return 1;
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_BRANCH) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -770,8 +780,9 @@ xtensa_opcode_is_jump (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
-  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_JUMP) != 0)
-    return 1;
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_JUMP) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -781,8 +792,9 @@ xtensa_opcode_is_loop (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
-  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_LOOP) != 0)
-    return 1;
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_LOOP) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -792,8 +804,9 @@ xtensa_opcode_is_call (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
-  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_CALL) != 0)
-    return 1;
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_CALL) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -899,7 +912,9 @@ xtensa_operand_name (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return NULL;
+  if (!intop) {
+	  return NULL;
+  }
   return intop->name;
 }
 
@@ -918,14 +933,16 @@ xtensa_operand_is_visible (xtensa_isa isa, xtensa_opcode opc, int opnd)
   CHECK_OPERAND (intisa, opc, iclass, opnd, XTENSA_UNDEFINED);
 
   /* Special case for "sout" operands.  */
-  if (iclass->operands[opnd].inout == 's')
-    return 0;
+  if (iclass->operands[opnd].inout == 's') {
+	  return 0;
+  }
 
   operand_id = iclass->operands[opnd].u.operand_id;
   intop = &intisa->operands[operand_id];
 
-  if ((intop->flags & XTENSA_OPERAND_IS_INVISIBLE) == 0)
-    return 1;
+  if ((intop->flags & XTENSA_OPERAND_IS_INVISIBLE) == 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -945,8 +962,9 @@ xtensa_operand_inout (xtensa_isa isa, xtensa_opcode opc, int opnd)
   inout = iclass->operands[opnd].inout;
 
   /* Special case for "sout" operands.  */
-  if (inout == 's')
-    return 'o';
+  if (inout == 's') {
+	  return 'o';
+  }
 
   return inout;
 }
@@ -963,7 +981,9 @@ xtensa_operand_get_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
   xtensa_get_field_fn get_fn;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return -1;
+  if (!intop) {
+	  return -1;
+  }
 
   CHECK_FORMAT (intisa, fmt, -1);
   CHECK_SLOT (intisa, fmt, slot, -1);
@@ -1000,7 +1020,9 @@ xtensa_operand_set_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
   xtensa_set_field_fn set_fn;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return -1;
+  if (!intop) {
+	  return -1;
+  }
 
   CHECK_FORMAT (intisa, fmt, -1);
   CHECK_SLOT (intisa, fmt, slot, -1);
@@ -1035,8 +1057,9 @@ xtensa_operand_encode (xtensa_isa isa, xtensa_opcode opc, int opnd,
   uint32 test_val, orig_val;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop)
-    return -1;
+  if (!intop) {
+	  return -1;
+  }
 
   if (!intop->encode)
     {
@@ -1108,11 +1131,14 @@ xtensa_operand_decode (xtensa_isa isa, xtensa_opcode opc, int opnd,
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return -1;
+  if (!intop) {
+	  return -1;
+  }
 
   /* Use identity function for "default" operands.  */
-  if (!intop->decode)
-    return 0;
+  if (!intop->decode) {
+	  return 0;
+  }
 
   if ((*intop->decode) (valp))
     {
@@ -1131,10 +1157,13 @@ xtensa_operand_is_register (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return XTENSA_UNDEFINED;
+  if (!intop) {
+	  return XTENSA_UNDEFINED;
+  }
 
-  if ((intop->flags & XTENSA_OPERAND_IS_REGISTER) != 0)
-    return 1;
+  if ((intop->flags & XTENSA_OPERAND_IS_REGISTER) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1146,7 +1175,9 @@ xtensa_operand_regfile (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return XTENSA_UNDEFINED;
+  if (!intop) {
+	  return XTENSA_UNDEFINED;
+  }
 
   return intop->regfile;
 }
@@ -1159,7 +1190,9 @@ xtensa_operand_num_regs (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return XTENSA_UNDEFINED;
+  if (!intop) {
+	  return XTENSA_UNDEFINED;
+  }
 
   return intop->num_regs;
 }
@@ -1172,10 +1205,13 @@ xtensa_operand_is_known_reg (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return XTENSA_UNDEFINED;
+  if (!intop) {
+	  return XTENSA_UNDEFINED;
+  }
 
-  if ((intop->flags & XTENSA_OPERAND_IS_UNKNOWN) == 0)
-    return 1;
+  if ((intop->flags & XTENSA_OPERAND_IS_UNKNOWN) == 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1187,10 +1223,13 @@ xtensa_operand_is_PCrelative (xtensa_isa isa, xtensa_opcode opc, int opnd)
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return XTENSA_UNDEFINED;
+  if (!intop) {
+	  return XTENSA_UNDEFINED;
+  }
 
-  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) != 0)
-    return 1;
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1203,10 +1242,13 @@ xtensa_operand_do_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return -1;
+  if (!intop) {
+	  return -1;
+  }
 
-  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
-    return 0;
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0) {
+	  return 0;
+  }
 
   if (!intop->do_reloc)
     {
@@ -1235,10 +1277,13 @@ xtensa_operand_undo_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
   xtensa_operand_internal *intop;
 
   intop = get_operand (intisa, opc, opnd);
-  if (!intop) return -1;
+  if (!intop) {
+	  return -1;
+  }
 
-  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
-    return 0;
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0) {
+	  return 0;
+  }
 
   if (!intop->undo_reloc)
     {
@@ -1371,8 +1416,9 @@ xtensa_regfile_lookup (xtensa_isa isa, const char *name)
   /* The expected number of regfiles is small; use a linear search.  */
   for (n = 0; n < intisa->num_regfiles; n++)
     {
-      if (!filename_cmp (intisa->regfiles[n].name, name))
-	return n;
+	  if (!filename_cmp (intisa->regfiles[n].name, name)) {
+		  return n;
+	  }
     }
 
   xtisa_errno = xtensa_isa_bad_regfile;
@@ -1399,10 +1445,12 @@ xtensa_regfile_lookup_shortname (xtensa_isa isa, const char *shortname)
     {
       /* Ignore regfile views since they always have the same shortnames
 	 as their parents.  */
-      if (intisa->regfiles[n].parent != n)
-	continue;
-      if (!filename_cmp (intisa->regfiles[n].shortname, shortname))
-	return n;
+      if (intisa->regfiles[n].parent != n) {
+	      continue;
+      }
+      if (!filename_cmp (intisa->regfiles[n].shortname, shortname)) {
+	      return n;
+      }
     }
 
   xtisa_errno = xtensa_isa_bad_regfile;
@@ -1526,8 +1574,9 @@ xtensa_state_is_exported (xtensa_isa isa, xtensa_state st)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
-  if ((intisa->states[st].flags & XTENSA_STATE_IS_EXPORTED) != 0)
-    return 1;
+  if ((intisa->states[st].flags & XTENSA_STATE_IS_EXPORTED) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1537,8 +1586,9 @@ xtensa_state_is_shared_or (xtensa_isa isa, xtensa_state st)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
-  if ((intisa->states[st].flags & XTENSA_STATE_IS_SHARED_OR) != 0)
-    return 1;
+  if ((intisa->states[st].flags & XTENSA_STATE_IS_SHARED_OR) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1563,8 +1613,9 @@ xtensa_sysreg_lookup (xtensa_isa isa, int num, int is_user)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
 
-  if (is_user != 0)
-    is_user = 1;
+  if (is_user != 0) {
+	  is_user = 1;
+  }
 
   if (num < 0 || num > intisa->max_sysreg_num[is_user]
       || intisa->sysreg_table[is_user][num] == XTENSA_UNDEFINED)
@@ -1633,8 +1684,9 @@ xtensa_sysreg_is_user (xtensa_isa isa, xtensa_sysreg sysreg)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_SYSREG (intisa, sysreg, XTENSA_UNDEFINED);
-  if (intisa->sysregs[sysreg].is_user)
-    return 1;
+  if (intisa->sysregs[sysreg].is_user) {
+	  return 1;
+  }
   return 0;
 }
 
@@ -1718,8 +1770,9 @@ xtensa_interface_has_side_effect (xtensa_isa isa, xtensa_interface intf)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
   CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
-  if ((intisa->interfaces[intf].flags & XTENSA_INTERFACE_HAS_SIDE_EFFECT) != 0)
-    return 1;
+  if ((intisa->interfaces[intf].flags & XTENSA_INTERFACE_HAS_SIDE_EFFECT) != 0) {
+	  return 1;
+  }
   return 0;
 }
 
diff --git a/libr/asm/arch/xtensa/gnu/xtensa-modules.c b/libr/asm/arch/xtensa/gnu/xtensa-modules.c
index d668f54df0..cd33229ba7 100644
--- a/libr/asm/arch/xtensa/gnu/xtensa-modules.c
+++ b/libr/asm/arch/xtensa/gnu/xtensa-modules.c
@@ -16988,10 +16988,11 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 		  switch (Field_m_Slot_inst_get (insn))
 		    {
 		    case 0:
-		      if (Field_s_Slot_inst_get (insn) == 0 &&
-			  Field_n_Slot_inst_get (insn) == 0)
-			return 79; /* ill */
-		      break;
+			    if (Field_s_Slot_inst_get (insn) == 0 &&
+				    Field_n_Slot_inst_get (insn) == 0) {
+				    return 79; /* ill */
+			    }
+			    break;
 		    case 2:
 		      switch (Field_n_Slot_inst_get (insn))
 			{
@@ -17070,21 +17071,24 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 		  switch (Field_s_Slot_inst_get (insn))
 		    {
 		    case 0:
-		      if (Field_t_Slot_inst_get (insn) == 0)
-			return 3; /* syscall */
-		      break;
+			    if (Field_t_Slot_inst_get (insn) == 0) {
+				    return 3; /* syscall */
+			    }
+			    break;
 		    case 1:
-		      if (Field_t_Slot_inst_get (insn) == 0)
-			return 4; /* simcall */
-		      break;
+			    if (Field_t_Slot_inst_get (insn) == 0) {
+				    return 4; /* simcall */
+			    }
+			    break;
 		    }
 		  break;
 		case 6:
 		  return 120; /* rsil */
 		case 7:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 317; /* waiti */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 317; /* waiti */
+			}
+			break;
 		case 8:
 		  return 367; /* any4 */
 		case 9:
@@ -17105,29 +17109,35 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 	      switch (Field_r_Slot_inst_get (insn))
 		{
 		case 0:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 102; /* ssr */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 102; /* ssr */
+			}
+			break;
 		case 1:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 103; /* ssl */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 103; /* ssl */
+			}
+			break;
 		case 2:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 104; /* ssa8l */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 104; /* ssa8l */
+			}
+			break;
 		case 3:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 105; /* ssa8b */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 105; /* ssa8b */
+			}
+			break;
 		case 4:
-		  if (Field_thi3_Slot_inst_get (insn) == 0)
-		    return 106; /* ssai */
-		  break;
+			if (Field_thi3_Slot_inst_get (insn) == 0) {
+				return 106; /* ssai */
+			}
+			break;
 		case 8:
-		  if (Field_s_Slot_inst_get (insn) == 0)
-		    return 13; /* rotw */
-		  break;
+			if (Field_s_Slot_inst_get (insn) == 0) {
+				return 13; /* rotw */
+			}
+			break;
 		case 14:
 		  return 448; /* nsa */
 		case 15:
@@ -17142,9 +17152,10 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 		case 3:
 		  return 434; /* ritlb0 */
 		case 4:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 432; /* iitlb */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 432; /* iitlb */
+			}
+			break;
 		case 5:
 		  return 433; /* pitlb */
 		case 6:
@@ -17156,9 +17167,10 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 		case 11:
 		  return 429; /* rdtlb0 */
 		case 12:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 427; /* idtlb */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 427; /* idtlb */
+			}
+			break;
 		case 13:
 		  return 428; /* pdtlb */
 		case 14:
@@ -17343,17 +17355,20 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 	    case 8:
 	      return 108; /* src */
 	    case 9:
-	      if (Field_s_Slot_inst_get (insn) == 0)
-		return 109; /* srl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0) {
+			    return 109; /* srl */
+		    }
+		    break;
 	    case 10:
-	      if (Field_t_Slot_inst_get (insn) == 0)
-		return 107; /* sll */
-	      break;
+		    if (Field_t_Slot_inst_get (insn) == 0) {
+			    return 107; /* sll */
+		    }
+		    break;
 	    case 11:
-	      if (Field_s_Slot_inst_get (insn) == 0)
-		return 110; /* sra */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0) {
+			    return 110; /* sra */
+		    }
+		    break;
 	    case 12:
 	      return 296; /* mul16u */
 	    case 13:
@@ -17374,11 +17389,13 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 		case 9:
 		  return 413; /* sdct */
 		case 14:
-		  if (Field_t_Slot_inst_get (insn) == 0)
-		    return 359; /* rfdo */
-		  if (Field_t_Slot_inst_get (insn) == 1)
-		    return 360; /* rfdd */
-		  break;
+			if (Field_t_Slot_inst_get (insn) == 0) {
+				return 359; /* rfdo */
+			}
+			if (Field_t_Slot_inst_get (insn) == 1) {
+				return 360; /* rfdd */
+			}
+			break;
 		case 15:
 		  return 437; /* ldpte */
 		}
@@ -17957,438 +17974,508 @@ Slot_inst_decode (const xtensa_insnbuf insn)
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 8:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 287; /* mula.dd.ll.ldinc */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 287; /* mula.dd.ll.ldinc */
+		    }
+		    break;
 	    case 9:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 289; /* mula.dd.hl.ldinc */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 289; /* mula.dd.hl.ldinc */
+		    }
+		    break;
 	    case 10:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 291; /* mula.dd.lh.ldinc */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 291; /* mula.dd.lh.ldinc */
+		    }
+		    break;
 	    case 11:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 293; /* mula.dd.hh.ldinc */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 293; /* mula.dd.hh.ldinc */
+		    }
+		    break;
 	    }
 	  break;
 	case 1:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 8:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 286; /* mula.dd.ll.lddec */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 286; /* mula.dd.ll.lddec */
+		    }
+		    break;
 	    case 9:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 288; /* mula.dd.hl.lddec */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 288; /* mula.dd.hl.lddec */
+		    }
+		    break;
 	    case 10:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 290; /* mula.dd.lh.lddec */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 290; /* mula.dd.lh.lddec */
+		    }
+		    break;
 	    case 11:
-	      if (Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 292; /* mula.dd.hh.lddec */
-	      break;
+		    if (Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 292; /* mula.dd.hh.lddec */
+		    }
+		    break;
 	    }
 	  break;
 	case 2:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 4:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 242; /* mul.dd.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 242; /* mul.dd.ll */
+		    }
+		    break;
 	    case 5:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 243; /* mul.dd.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 243; /* mul.dd.hl */
+		    }
+		    break;
 	    case 6:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 244; /* mul.dd.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 244; /* mul.dd.lh */
+		    }
+		    break;
 	    case 7:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 245; /* mul.dd.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 245; /* mul.dd.hh */
+		    }
+		    break;
 	    case 8:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 270; /* mula.dd.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 270; /* mula.dd.ll */
+		    }
+		    break;
 	    case 9:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 271; /* mula.dd.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 271; /* mula.dd.hl */
+		    }
+		    break;
 	    case 10:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 272; /* mula.dd.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 272; /* mula.dd.lh */
+		    }
+		    break;
 	    case 11:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 273; /* mula.dd.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 273; /* mula.dd.hh */
+		    }
+		    break;
 	    case 12:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 274; /* muls.dd.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 274; /* muls.dd.ll */
+		    }
+		    break;
 	    case 13:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 275; /* muls.dd.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 275; /* muls.dd.hl */
+		    }
+		    break;
 	    case 14:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 276; /* muls.dd.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 276; /* muls.dd.lh */
+		    }
+		    break;
 	    case 15:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 277; /* muls.dd.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 277; /* muls.dd.hh */
+		    }
+		    break;
 	    }
 	  break;
 	case 3:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 4:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 234; /* mul.ad.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 234; /* mul.ad.ll */
+		    }
+		    break;
 	    case 5:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 235; /* mul.ad.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 235; /* mul.ad.hl */
+		    }
+		    break;
 	    case 6:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 236; /* mul.ad.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 236; /* mul.ad.lh */
+		    }
+		    break;
 	    case 7:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 237; /* mul.ad.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 237; /* mul.ad.hh */
+		    }
+		    break;
 	    case 8:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 254; /* mula.ad.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 254; /* mula.ad.ll */
+		    }
+		    break;
 	    case 9:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 255; /* mula.ad.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 255; /* mula.ad.hl */
+		    }
+		    break;
 	    case 10:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 256; /* mula.ad.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 256; /* mula.ad.lh */
+		    }
+		    break;
 	    case 11:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 257; /* mula.ad.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 257; /* mula.ad.hh */
+		    }
+		    break;
 	    case 12:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 258; /* muls.ad.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 258; /* muls.ad.ll */
+		    }
+		    break;
 	    case 13:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 259; /* muls.ad.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 259; /* muls.ad.hl */
+		    }
+		    break;
 	    case 14:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 260; /* muls.ad.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 260; /* muls.ad.lh */
+		    }
+		    break;
 	    case 15:
-	      if (Field_r_Slot_inst_get (insn) == 0 &&
-		  Field_t3_Slot_inst_get (insn) == 0 &&
-		  Field_tlo_Slot_inst_get (insn) == 0)
-		return 261; /* muls.ad.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0 &&
+			    Field_t3_Slot_inst_get (insn) == 0 &&
+			    Field_tlo_Slot_inst_get (insn) == 0) {
+			    return 261; /* muls.ad.hh */
+		    }
+		    break;
 	    }
 	  break;
 	case 4:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 8:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 279; /* mula.da.ll.ldinc */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 279; /* mula.da.ll.ldinc */
+		    }
+		    break;
 	    case 9:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 281; /* mula.da.hl.ldinc */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 281; /* mula.da.hl.ldinc */
+		    }
+		    break;
 	    case 10:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 283; /* mula.da.lh.ldinc */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 283; /* mula.da.lh.ldinc */
+		    }
+		    break;
 	    case 11:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 285; /* mula.da.hh.ldinc */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 285; /* mula.da.hh.ldinc */
+		    }
+		    break;
 	    }
 	  break;
 	case 5:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 8:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 278; /* mula.da.ll.lddec */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 278; /* mula.da.ll.lddec */
+		    }
+		    break;
 	    case 9:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 280; /* mula.da.hl.lddec */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 280; /* mula.da.hl.lddec */
+		    }
+		    break;
 	    case 10:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 282; /* mula.da.lh.lddec */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 282; /* mula.da.lh.lddec */
+		    }
+		    break;
 	    case 11:
-	      if (Field_r3_Slot_inst_get (insn) == 0)
-		return 284; /* mula.da.hh.lddec */
-	      break;
+		    if (Field_r3_Slot_inst_get (insn) == 0) {
+			    return 284; /* mula.da.hh.lddec */
+		    }
+		    break;
 	    }
 	  break;
 	case 6:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 4:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 238; /* mul.da.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 238; /* mul.da.ll */
+		    }
+		    break;
 	    case 5:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 239; /* mul.da.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 239; /* mul.da.hl */
+		    }
+		    break;
 	    case 6:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 240; /* mul.da.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 240; /* mul.da.lh */
+		    }
+		    break;
 	    case 7:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 241; /* mul.da.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 241; /* mul.da.hh */
+		    }
+		    break;
 	    case 8:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 262; /* mula.da.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 262; /* mula.da.ll */
+		    }
+		    break;
 	    case 9:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 263; /* mula.da.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 263; /* mula.da.hl */
+		    }
+		    break;
 	    case 10:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 264; /* mula.da.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 264; /* mula.da.lh */
+		    }
+		    break;
 	    case 11:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 265; /* mula.da.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 265; /* mula.da.hh */
+		    }
+		    break;
 	    case 12:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 266; /* muls.da.ll */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 266; /* muls.da.ll */
+		    }
+		    break;
 	    case 13:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 267; /* muls.da.hl */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 267; /* muls.da.hl */
+		    }
+		    break;
 	    case 14:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 268; /* muls.da.lh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 268; /* muls.da.lh */
+		    }
+		    break;
 	    case 15:
-	      if (Field_s_Slot_inst_get (insn) == 0 &&
-		  Field_w_Slot_inst_get (insn) == 0 &&
-		  Field_r3_Slot_inst_get (insn) == 0)
-		return 269; /* muls.da.hh */
-	      break;
+		    if (Field_s_Slot_inst_get (insn) == 0 &&
+			    Field_w_Slot_inst_get (insn) == 0 &&
+			    Field_r3_Slot_inst_get (insn) == 0) {
+			    return 269; /* muls.da.hh */
+		    }
+		    break;
 	    }
 	  break;
 	case 7:
 	  switch (Field_op1_Slot_inst_get (insn))
 	    {
 	    case 0:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 230; /* umul.aa.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 230; /* umul.aa.ll */
+		    }
+		    break;
 	    case 1:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 231; /* umul.aa.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 231; /* umul.aa.hl */
+		    }
+		    break;
 	    case 2:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 232; /* umul.aa.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 232; /* umul.aa.lh */
+		    }
+		    break;
 	    case 3:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 233; /* umul.aa.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 233; /* umul.aa.hh */
+		    }
+		    break;
 	    case 4:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 226; /* mul.aa.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 226; /* mul.aa.ll */
+		    }
+		    break;
 	    case 5:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 227; /* mul.aa.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 227; /* mul.aa.hl */
+		    }
+		    break;
 	    case 6:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 228; /* mul.aa.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 228; /* mul.aa.lh */
+		    }
+		    break;
 	    case 7:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 229; /* mul.aa.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 229; /* mul.aa.hh */
+		    }
+		    break;
 	    case 8:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 246; /* mula.aa.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 246; /* mula.aa.ll */
+		    }
+		    break;
 	    case 9:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 247; /* mula.aa.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 247; /* mula.aa.hl */
+		    }
+		    break;
 	    case 10:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 248; /* mula.aa.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 248; /* mula.aa.lh */
+		    }
+		    break;
 	    case 11:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 249; /* mula.aa.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 249; /* mula.aa.hh */
+		    }
+		    break;
 	    case 12:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 250; /* muls.aa.ll */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 250; /* muls.aa.ll */
+		    }
+		    break;
 	    case 13:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 251; /* muls.aa.hl */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 251; /* muls.aa.hl */
+		    }
+		    break;
 	    case 14:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 252; /* muls.aa.lh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 252; /* muls.aa.lh */
+		    }
+		    break;
 	    case 15:
-	      if (Field_r_Slot_inst_get (insn) == 0)
-		return 253; /* muls.aa.hh */
-	      break;
+		    if (Field_r_Slot_inst_get (insn) == 0) {
+			    return 253; /* muls.aa.hh */
+		    }
+		    break;
 	    }
 	  break;
 	case 8:
-	  if (Field_op1_Slot_inst_get (insn) == 0 &&
-	      Field_t_Slot_inst_get (insn) == 0 &&
-	      Field_rhi_Slot_inst_get (insn) == 0)
-	    return 295; /* ldinc */
-	  break;
+		if (Field_op1_Slot_inst_get (insn) == 0 &&
+			Field_t_Slot_inst_get (insn) == 0 &&
+			Field_rhi_Slot_inst_get (insn) == 0) {
+			return 295; /* ldinc */
+		}
+		break;
 	case 9:
-	  if (Field_op1_Slot_inst_get (insn) == 0 &&
-	      Field_t_Slot_inst_get (insn) == 0 &&
-	      Field_rhi_Slot_inst_get (insn) == 0)
-	    return 294; /* lddec */
-	  break;
+		if (Field_op1_Slot_inst_get (insn) == 0 &&
+			Field_t_Slot_inst_get (insn) == 0 &&
+			Field_rhi_Slot_inst_get (insn) == 0) {
+			return 294; /* lddec */
+		}
+		break;
 	}
       break;
     case 5:
@@ -18538,13 +18625,15 @@ Slot_inst16b_decode (const xtensa_insnbuf insn)
 	    case 2:
 	      return 325; /* break.n */
 	    case 3:
-	      if (Field_s_Slot_inst16b_get (insn) == 0)
-		return 34; /* nop.n */
-	      break;
+		    if (Field_s_Slot_inst16b_get (insn) == 0) {
+			    return 34; /* nop.n */
+		    }
+		    break;
 	    case 6:
-	      if (Field_s_Slot_inst16b_get (insn) == 0)
-		return 30; /* ill.n */
-	      break;
+		    if (Field_s_Slot_inst16b_get (insn) == 0) {
+			    return 30; /* ill.n */
+		    }
+		    break;
 	    }
 	  break;
 	}
@@ -18576,60 +18665,78 @@ Slot_xt_flix64_slot2_decode (const xtensa_insnbuf insn)
   switch (Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn))
     {
     case 0:
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1)
-	return 41; /* add */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5)
-	return 42; /* sub */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2)
-	return 43; /* addx2 */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3)
-	return 49; /* and */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4)
-	return 450; /* sext */
-      break;
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1) {
+		    return 41; /* add */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5) {
+		    return 42; /* sub */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2) {
+		    return 43; /* addx2 */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3) {
+		    return 49; /* and */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4) {
+		    return 450; /* sext */
+	    }
+	    break;
     case 1:
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1)
-	return 27; /* addi.n */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2)
-	return 44; /* addx4 */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3)
-	return 50; /* or */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5)
-	return 51; /* xor */
-      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4)
-	return 113; /* srli */
-      break;
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1) {
+		    return 27; /* addi.n */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2) {
+		    return 44; /* addx4 */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3) {
+		    return 50; /* or */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5) {
+		    return 51; /* xor */
+	    }
+	    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4) {
+		    return 113; /* srli */
+	    }
+	    break;
     }
-  if (Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6)
-    return 33; /* movi.n */
-  if (Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 2 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 32; /* mov.n */
-  if (Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 97; /* nop */
-  if (Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 8 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 96; /* abs */
-  if (Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 9 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 95; /* neg */
-  if (Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 5 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 110; /* sra */
-  if (Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
-      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
-      Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
-    return 109; /* srl */
-  if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 7)
-    return 112; /* srai */
-  return 0;
+    if (Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6) {
+	    return 33; /* movi.n */
+    }
+    if (Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 2 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 32; /* mov.n */
+    }
+    if (Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 97; /* nop */
+    }
+    if (Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 8 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 96; /* abs */
+    }
+    if (Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 9 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 95; /* neg */
+    }
+    if (Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 5 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 110; /* sra */
+    }
+    if (Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
+	    Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+	    Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0) {
+	    return 109; /* srl */
+    }
+    if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 7) {
+	    return 112; /* srai */
+    }
+    return 0;
 }
 
 static int
@@ -18638,143 +18745,148 @@ Slot_xt_flix64_slot0_decode (const xtensa_insnbuf insn)
   switch (Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get (insn))
     {
     case 0:
-      if (Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (insn) == 2)
-	return 78; /* extui */
-      switch (Field_op1_Slot_xt_flix64_slot0_get (insn))
-	{
-	case 0:
-	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
-	    {
+	    if (Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (insn) == 2) {
+		    return 78; /* extui */
+	    }
+	    switch (Field_op1_Slot_xt_flix64_slot0_get (insn)) {
 	    case 0:
-	      if (Field_r_Slot_xt_flix64_slot0_get (insn) == 2)
-		{
-		  if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
-		    {
-		      if (Field_t_Slot_xt_flix64_slot0_get (insn) == 15)
-			return 97; /* nop */
+		    switch (Field_op2_Slot_xt_flix64_slot0_get (insn)) {
+		    case 0:
+			    if (Field_r_Slot_xt_flix64_slot0_get (insn) == 2) {
+				    if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 15) {
+						    return 97; /* nop */
+					    }
+				    }
+			    }
+			    break;
+		    case 1:
+			    return 49; /* and */
+		    case 2:
+			    return 50; /* or */
+		    case 3:
+			    return 51; /* xor */
+		    case 4:
+			    switch (Field_r_Slot_xt_flix64_slot0_get (insn)) {
+			    case 0:
+				    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    return 102; /* ssr */
+				    }
+				    break;
+			    case 1:
+				    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    return 103; /* ssl */
+				    }
+				    break;
+			    case 2:
+				    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    return 104; /* ssa8l */
+				    }
+				    break;
+			    case 3:
+				    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    return 105; /* ssa8b */
+				    }
+				    break;
+			    case 4:
+				    if (Field_thi3_Slot_xt_flix64_slot0_get (insn) == 0) {
+					    return 106; /* ssai */
+				    }
+				    break;
+			    case 14:
+				    return 448; /* nsa */
+			    case 15:
+				    return 449; /* nsau */
+			    }
+			    break;
+		    case 6:
+			    switch (Field_s_Slot_xt_flix64_slot0_get (insn)) {
+			    case 0:
+				    return 95; /* neg */
+			    case 1:
+				    return 96; /* abs */
+			    }
+			    break;
+		    case 8:
+			    return 41; /* add */
+		    case 9:
+			    return 43; /* addx2 */
+		    case 10:
+			    return 44; /* addx4 */
+		    case 11:
+			    return 45; /* addx8 */
+		    case 12:
+			    return 42; /* sub */
+		    case 13:
+			    return 46; /* subx2 */
+		    case 14:
+			    return 47; /* subx4 */
+		    case 15:
+			    return 48; /* subx8 */
 		    }
-		}
-	      break;
+		    break;
 	    case 1:
-	      return 49; /* and */
+		    if (Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (insn) == 1) {
+			    return 112; /* srai */
+		    }
+		    if (Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (insn) == 0) {
+			    return 111; /* slli */
+		    }
+		    switch (Field_op2_Slot_xt_flix64_slot0_get (insn)) {
+		    case 4:
+			    return 113; /* srli */
+		    case 8:
+			    return 108; /* src */
+		    case 9:
+			    if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0) {
+				    return 109; /* srl */
+			    }
+			    break;
+		    case 10:
+			    if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0) {
+				    return 107; /* sll */
+			    }
+			    break;
+		    case 11:
+			    if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0) {
+				    return 110; /* sra */
+			    }
+			    break;
+		    case 12:
+			    return 296; /* mul16u */
+		    case 13:
+			    return 297; /* mul16s */
+		    }
+		    break;
 	    case 2:
-	      return 50; /* or */
+		    if (Field_op2_Slot_xt_flix64_slot0_get (insn) == 8) {
+			    return 461; /* mull */
+		    }
+		    break;
 	    case 3:
-	      return 51; /* xor */
-	    case 4:
-	      switch (Field_r_Slot_xt_flix64_slot0_get (insn))
-		{
-		case 0:
-		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
-		    return 102; /* ssr */
-		  break;
-		case 1:
-		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
-		    return 103; /* ssl */
-		  break;
-		case 2:
-		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
-		    return 104; /* ssa8l */
-		  break;
-		case 3:
-		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
-		    return 105; /* ssa8b */
-		  break;
-		case 4:
-		  if (Field_thi3_Slot_xt_flix64_slot0_get (insn) == 0)
-		    return 106; /* ssai */
-		  break;
-		case 14:
-		  return 448; /* nsa */
-		case 15:
-		  return 449; /* nsau */
-		}
-	      break;
-	    case 6:
-	      switch (Field_s_Slot_xt_flix64_slot0_get (insn))
-		{
-		case 0:
-		  return 95; /* neg */
-		case 1:
-		  return 96; /* abs */
-		}
-	      break;
-	    case 8:
-	      return 41; /* add */
-	    case 9:
-	      return 43; /* addx2 */
-	    case 10:
-	      return 44; /* addx4 */
-	    case 11:
-	      return 45; /* addx8 */
-	    case 12:
-	      return 42; /* sub */
-	    case 13:
-	      return 46; /* subx2 */
-	    case 14:
-	      return 47; /* subx4 */
-	    case 15:
-	      return 48; /* subx8 */
-	    }
-	  break;
-	case 1:
-	  if (Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (insn) == 1)
-	    return 112; /* srai */
-	  if (Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (insn) == 0)
-	    return 111; /* slli */
-	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
-	    {
-	    case 4:
-	      return 113; /* srli */
-	    case 8:
-	      return 108; /* src */
-	    case 9:
-	      if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
-		return 109; /* srl */
-	      break;
-	    case 10:
-	      if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
-		return 107; /* sll */
-	      break;
-	    case 11:
-	      if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
-		return 110; /* sra */
-	      break;
-	    case 12:
-	      return 296; /* mul16u */
-	    case 13:
-	      return 297; /* mul16s */
-	    }
-	  break;
-	case 2:
-	  if (Field_op2_Slot_xt_flix64_slot0_get (insn) == 8)
-	    return 461; /* mull */
-	  break;
-	case 3:
-	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
-	    {
-	    case 2:
-	      return 450; /* sext */
-	    case 3:
-	      return 443; /* clamps */
-	    case 4:
-	      return 444; /* min */
-	    case 5:
-	      return 445; /* max */
-	    case 6:
-	      return 446; /* minu */
-	    case 7:
-	      return 447; /* maxu */
-	    case 8:
-	      return 91; /* moveqz */
-	    case 9:
-	      return 92; /* movnez */
-	    case 10:
-	      return 93; /* movltz */
-	    case 11:
-	      return 94; /* movgez */
-	    }
-	  break;
+		    switch (Field_op2_Slot_xt_flix64_slot0_get (insn)) {
+		    case 2:
+			    return 450; /* sext */
+		    case 3:
+			    return 443; /* clamps */
+		    case 4:
+			    return 444; /* min */
+		    case 5:
+			    return 445; /* max */
+		    case 6:
+			    return 446; /* minu */
+		    case 7:
+			    return 447; /* maxu */
+		    case 8:
+			    return 91; /* moveqz */
+		    case 9:
+			    return 92; /* movnez */
+		    case 10:
+			    return 93; /* movltz */
+		    case 11:
+			    return 94; /* movgez */
+		    }
+		    break;
 	}
       break;
     case 2:
@@ -18803,158 +18915,192 @@ Slot_xt_flix64_slot0_decode (const xtensa_insnbuf insn)
 	}
       break;
     }
-  if (Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 1)
-    return 85; /* l32r */
-  if (Field_sae4_Slot_xt_flix64_slot0_get (insn) == 0 &&
-      Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (insn) == 3 &&
-      Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 0 &&
-      Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (insn) == 0)
-    return 32; /* mov.n */
-  return 0;
+    if (Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 1) {
+	    return 85; /* l32r */
+    }
+    if (Field_sae4_Slot_xt_flix64_slot0_get (insn) == 0 &&
+	    Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (insn) == 3 &&
+	    Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 0 &&
+	    Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (insn) == 0) {
+	    return 32; /* mov.n */
+    }
+    return 0;
 }
 
 static int
 Slot_xt_flix64_slot1_decode (const xtensa_insnbuf insn)
 {
-  if (Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
-    return 78; /* extui */
-  switch (Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
-    {
-    case 0:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 90; /* movi */
-      break;
-    case 2:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
-	return 39; /* addi */
-      break;
-    case 3:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
-	return 40; /* addmi */
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-	  Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (insn) == 0)
-	return 51; /* xor */
-      break;
+	if (Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0 &&
+		Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1) {
+		return 78; /* extui */
+	}
+	switch (Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn)) {
+	case 0:
+		if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+			return 90; /* movi */
+		}
+		break;
+	case 2:
+		if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1) {
+			return 39; /* addi */
+		}
+		break;
+	case 3:
+		if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1) {
+			return 40; /* addmi */
+		}
+		if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+			Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (insn) == 0) {
+			return 51; /* xor */
+		}
+		break;
     }
   switch (Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
     {
     case 8:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 111; /* slli */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 111; /* slli */
+	    }
+	    break;
     case 16:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 112; /* srai */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 112; /* srai */
+	    }
+	    break;
     case 19:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-	  Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-	return 107; /* sll */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+		    Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+		    return 107; /* sll */
+	    }
+	    break;
     }
   switch (Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
     {
     case 18:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 41; /* add */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 41; /* add */
+	    }
+	    break;
     case 19:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 45; /* addx8 */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 45; /* addx8 */
+	    }
+	    break;
     case 20:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 43; /* addx2 */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 43; /* addx2 */
+	    }
+	    break;
     case 21:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 49; /* and */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 49; /* and */
+	    }
+	    break;
     case 22:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 91; /* moveqz */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 91; /* moveqz */
+	    }
+	    break;
     case 23:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 94; /* movgez */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 94; /* movgez */
+	    }
+	    break;
     case 24:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 44; /* addx4 */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 44; /* addx4 */
+	    }
+	    break;
     case 25:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 93; /* movltz */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 93; /* movltz */
+	    }
+	    break;
     case 26:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 92; /* movnez */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 92; /* movnez */
+	    }
+	    break;
     case 27:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 296; /* mul16u */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 296; /* mul16u */
+	    }
+	    break;
     case 28:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 297; /* mul16s */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 297; /* mul16s */
+	    }
+	    break;
     case 29:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 461; /* mull */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 461; /* mull */
+	    }
+	    break;
     case 30:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 50; /* or */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 50; /* or */
+	    }
+	    break;
     case 31:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 450; /* sext */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 450; /* sext */
+	    }
+	    break;
     case 34:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 108; /* src */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 108; /* src */
+	    }
+	    break;
     case 36:
-      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
-	return 113; /* srli */
-      break;
+	    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2) {
+		    return 113; /* srli */
+	    }
+	    break;
     }
-  if (Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 280 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 32; /* mov.n */
-  if (Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 281 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 81; /* jx */
-  if (Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 141 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 103; /* ssl */
-  if (Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 71 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 97; /* nop */
-  if (Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 148 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 95; /* neg */
-  if (Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 149 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 110; /* sra */
-  if (Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 75 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 109; /* srl */
-  if (Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 5 &&
-      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
-      Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
-    return 42; /* sub */
-  if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 3)
-    return 80; /* j */
-  return 0;
+    if (Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 280 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 32; /* mov.n */
+    }
+    if (Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 281 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 81; /* jx */
+    }
+    if (Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 141 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 103; /* ssl */
+    }
+    if (Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 71 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 97; /* nop */
+    }
+    if (Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 148 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 95; /* neg */
+    }
+    if (Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 149 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 110; /* sra */
+    }
+    if (Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 75 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 109; /* srl */
+    }
+    if (Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 5 &&
+	    Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	    Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0) {
+	    return 42; /* sub */
+    }
+    if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 3) {
+	    return 80; /* j */
+    }
+    return 0;
 }
 
 static int
@@ -18963,105 +19109,130 @@ Slot_xt_flix64_slot3_decode (const xtensa_insnbuf insn)
   switch (Field_op0_s6_Slot_xt_flix64_slot3_get (insn))
     {
     case 1:
-      if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 516; /* bbci.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 516; /* bbci.w18 */
+	    }
+	    break;
     case 2:
-      if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 517; /* bbsi.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 517; /* bbsi.w18 */
+	    }
+	    break;
     case 3:
-      if (Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 526; /* ball.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 526; /* ball.w18 */
+	    }
+	    break;
     case 4:
-      if (Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 524; /* bany.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 524; /* bany.w18 */
+	    }
+	    break;
     case 5:
-      if (Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 528; /* bbc.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 528; /* bbc.w18 */
+	    }
+	    break;
     case 6:
-      if (Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 529; /* bbs.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 529; /* bbs.w18 */
+	    }
+	    break;
     case 7:
-      if (Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 518; /* beq.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 518; /* beq.w18 */
+	    }
+	    break;
     case 8:
-      if (Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 510; /* beqi.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 510; /* beqi.w18 */
+	    }
+	    break;
     case 9:
-      if (Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 520; /* bge.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 520; /* bge.w18 */
+	    }
+	    break;
     case 10:
-      if (Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 512; /* bgei.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 512; /* bgei.w18 */
+	    }
+	    break;
     case 11:
-      if (Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 522; /* bgeu.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 522; /* bgeu.w18 */
+	    }
+	    break;
     case 12:
-      if (Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 514; /* bgeui.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 514; /* bgeui.w18 */
+	    }
+	    break;
     case 13:
-      if (Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 521; /* blt.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 521; /* blt.w18 */
+	    }
+	    break;
     case 14:
-      if (Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 513; /* blti.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 513; /* blti.w18 */
+	    }
+	    break;
     case 15:
-      if (Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 523; /* bltu.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 523; /* bltu.w18 */
+	    }
+	    break;
     case 16:
-      if (Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 515; /* bltui.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 515; /* bltui.w18 */
+	    }
+	    break;
     case 17:
-      if (Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 527; /* bnall.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 527; /* bnall.w18 */
+	    }
+	    break;
     case 18:
-      if (Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 519; /* bne.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 519; /* bne.w18 */
+	    }
+	    break;
     case 19:
-      if (Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 511; /* bnei.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 511; /* bnei.w18 */
+	    }
+	    break;
     case 20:
-      if (Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 525; /* bnone.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 525; /* bnone.w18 */
+	    }
+	    break;
     case 21:
-      if (Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 506; /* beqz.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 506; /* beqz.w18 */
+	    }
+	    break;
     case 22:
-      if (Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 508; /* bgez.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 508; /* bgez.w18 */
+	    }
+	    break;
     case 23:
-      if (Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 509; /* bltz.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 509; /* bltz.w18 */
+	    }
+	    break;
     case 24:
-      if (Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 507; /* bnez.w18 */
-      break;
+	    if (Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 507; /* bnez.w18 */
+	    }
+	    break;
     case 25:
-      if (Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
-	return 97; /* nop */
-      break;
+	    if (Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0) {
+		    return 97; /* nop */
+	    }
+	    break;
     }
   return 0;
 }
@@ -21235,17 +21406,22 @@ static xtensa_format_internal formats[] = {
 static int
 format_decoder (const xtensa_insnbuf insn)
 {
-  if ((insn[0] & 0x8) == 0 && (insn[1] & 0) == 0)
-    return 0; /* x24 */
-  if ((insn[0] & 0xc) == 0x8 && (insn[1] & 0) == 0)
-    return 1; /* x16a */
-  if ((insn[0] & 0xe) == 0xc && (insn[1] & 0) == 0)
-    return 2; /* x16b */
-  if ((insn[0] & 0xf) == 0xe && (insn[1] & 0) == 0)
-    return 3; /* xt_format1 */
-  if ((insn[0] & 0xf) == 0xf && (insn[1] & 0x80000000) == 0)
-    return 4; /* xt_format2 */
-  return -1;
+	if ((insn[0] & 0x8) == 0 && (insn[1] & 0) == 0) {
+		return 0; /* x24 */
+	}
+	if ((insn[0] & 0xc) == 0x8 && (insn[1] & 0) == 0) {
+		return 1; /* x16a */
+	}
+	if ((insn[0] & 0xe) == 0xc && (insn[1] & 0) == 0) {
+		return 2; /* x16b */
+	}
+	if ((insn[0] & 0xf) == 0xe && (insn[1] & 0) == 0) {
+		return 3; /* xt_format1 */
+	}
+	if ((insn[0] & 0xf) == 0xf && (insn[1] & 0x80000000) == 0) {
+		return 4; /* xt_format2 */
+	}
+	return -1;
 }
 
 static int length_table[16] = {
diff --git a/libr/asm/arch/z80/z80.c b/libr/asm/arch/z80/z80.c
index 204d476ac7..29c40cb89a 100644
--- a/libr/asm/arch/z80/z80.c
+++ b/libr/asm/arch/z80/z80.c
@@ -28,8 +28,9 @@ static ut8 z80_op_24_branch_index_res (ut8 hex) {
 static int z80OpLength (const ut8 *buf, int len) {
 	z80_opcode *op;
 	int type = 0, ret = 0;
-	if (len < 1)
+	if (len < 1) {
 		return 0;
+	}
 	op = z80_op;
 	if (op[buf[0]].type & Z80_OP_UNK) {
 		if (len < 2) {
diff --git a/libr/asm/asm.c b/libr/asm/asm.c
index 46be50b7b2..46d582a7a1 100644
--- a/libr/asm/asm.c
+++ b/libr/asm/asm.c
@@ -224,8 +224,9 @@ R_API int r_asm_filter_input(RAsm *a, const char *f) {
 }
 
 R_API int r_asm_filter_output(RAsm *a, const char *f) {
-	if (!a->ofilter)
+	if (!a->ofilter) {
 		a->ofilter = r_parse_new ();
+	}
 	if (!r_parse_use (a->ofilter, f)) {
 		r_parse_free (a->ofilter);
 		a->ofilter = NULL;
@@ -528,7 +529,9 @@ static char *replace_directives_for(char *str, char *token) {
 	char *q = str;
 	bool changes = false;
 	for (;;) {
-		if (q) p = strstr (q, token);
+		if (q) {
+			p = strstr (q, token);
+		}
 		if (p) {
 			char *nl = strchr (p, '\n');
 			if (nl) {
@@ -542,7 +545,9 @@ static char *replace_directives_for(char *str, char *token) {
 			q = nl;
 			changes = true;
 		} else {
-			if (q) r_strbuf_append (sb, q);
+			if (q) {
+				r_strbuf_append (sb, q);
+			}
 			break;
 		}
 	}
@@ -809,10 +814,16 @@ R_API RAsmCode* r_asm_massemble(RAsm *a, const char *buf) {
 			// XXX TODO remove arch-specific hacks
 			if (!strncmp (a->cur->arch, "avr", 3)) {
 				for (ptr_start = buf_token; *ptr_start &&
-					isavrseparator (*ptr_start); ptr_start++);
+							    isavrseparator (*ptr_start);
+					ptr_start++) {
+					;
+				}
 			} else {
 				for (ptr_start = buf_token; *ptr_start &&
-					IS_SEPARATOR (*ptr_start); ptr_start++);
+							    IS_SEPARATOR (*ptr_start);
+					ptr_start++) {
+					;
+				}
 			}
 			if (!strncmp (ptr_start, "/*", 2)) {
 				if (!strstr (ptr_start + 2, "*/")) {
@@ -895,42 +906,44 @@ R_API RAsmCode* r_asm_massemble(RAsm *a, const char *buf) {
 					r_asm_use (a, "arm");
 					r_asm_set_bits (a, 16);
 					ret = 0;
-				} else if (!strncmp (ptr, ".arch ", 6))
+				} else if (!strncmp (ptr, ".arch ", 6)) {
 					ret = r_asm_pseudo_arch (a, ptr+6);
-				else if (!strncmp (ptr, ".bits ", 6))
+				} else if (!strncmp (ptr, ".bits ", 6)) {
 					ret = r_asm_pseudo_bits (a, ptr+6);
-				else if (!strncmp (ptr, ".fill ", 6))
+				} else if (!strncmp (ptr, ".fill ", 6)) {
 					ret = r_asm_pseudo_fill (&op, ptr+6);
-				else if (!strncmp (ptr, ".kernel ", 8))
+				} else if (!strncmp (ptr, ".kernel ", 8)) {
 					r_syscall_setup (a->syscall, a->cur->arch, a->bits, asmcpu, ptr + 8);
-				else if (!strncmp (ptr, ".cpu ", 5))
+				} else if (!strncmp (ptr, ".cpu ", 5)) {
 					r_asm_set_cpu (a, ptr + 5);
-				else if (!strncmp (ptr, ".os ", 4))
+				} else if (!strncmp (ptr, ".os ", 4)) {
 					r_syscall_setup (a->syscall, a->cur->arch, a->bits, asmcpu, ptr + 4);
-				else if (!strncmp (ptr, ".hex ", 5)) {
+				} else if (!strncmp (ptr, ".hex ", 5)) {
 					ret = r_asm_pseudo_hex (&op, ptr + 5);
-				} else if ((!strncmp (ptr, ".int16 ", 7)) || !strncmp (ptr, ".short ", 7))
+				} else if ((!strncmp (ptr, ".int16 ", 7)) || !strncmp (ptr, ".short ", 7)) {
 					ret = r_asm_pseudo_int16 (a, &op, ptr+7);
-				else if (!strncmp (ptr, ".int32 ", 7))
+				} else if (!strncmp (ptr, ".int32 ", 7)) {
 					ret = r_asm_pseudo_int32 (a, &op, ptr+7);
-				else if (!strncmp (ptr, ".int64 ", 7))
+				} else if (!strncmp (ptr, ".int64 ", 7)) {
 					ret = r_asm_pseudo_int64 (a, &op, ptr+7);
-				else if (!strncmp (ptr, ".size", 5))
+				} else if (!strncmp (ptr, ".size", 5)) {
 					ret = true; // do nothing, ignored
-				else if (!strncmp (ptr, ".section", 8))
+				} else if (!strncmp (ptr, ".section", 8)) {
 					ret = true; // do nothing, ignored
-				else if ((!strncmp (ptr, ".byte ", 6)) || (!strncmp (ptr, ".int8 ", 6)))
+				} else if ((!strncmp (ptr, ".byte ", 6)) || (!strncmp (ptr, ".int8 ", 6))) {
 					ret = r_asm_pseudo_byte (&op, ptr+6);
-				else if (!strncmp (ptr, ".glob", 5)) { // .global .globl
-				//	eprintf (".global directive not yet implemented\n");
+				} else if (!strncmp (ptr, ".glob", 5)) { // .global .globl
+									 //	eprintf (".global directive not yet implemented\n");
 					ret = 0;
 					continue;
 				} else if (!strncmp (ptr, ".equ ", 5)) {
 					ptr2 = strchr (ptr + 5, ',');
-					if (!ptr2)
+					if (!ptr2) {
 						ptr2 = strchr (ptr + 5, '=');
-					if (!ptr2)
+					}
+					if (!ptr2) {
 						ptr2 = strchr (ptr + 5, ' ');
+					}
 					if (ptr2) {
 						*ptr2 = '\0';
 						r_asm_code_set_equ (acode, ptr + 5, ptr2 + 1);
diff --git a/libr/asm/p/asm_avr.c b/libr/asm/p/asm_avr.c
index 08ce2fb7ad..809fff2eaa 100644
--- a/libr/asm/p/asm_avr.c
+++ b/libr/asm/p/asm_avr.c
@@ -60,16 +60,18 @@ static int parse_specialreg(const char *reg) {
 		/* radare tolower instruction in rasm, so we use 'y' instead of 'Y'
 		and so on for other registers */
 		if (found == -1 && reg[1] == '+') {
-			if (reg[0] == 'y' && len > 2)
+			if (reg[0] == 'y' && len > 2) {
 				found = OPERAND_YPQ;
-			else if (reg[0] == 'z' && len > 2)
+			} else if (reg[0] == 'z' && len > 2) {
 				found = OPERAND_ZPQ;
+			}
 		}
 		if (found == -1 && reg[2] == '+') {
-			if (reg[0] == 'y' && len > 2)
+			if (reg[0] == 'y' && len > 2) {
 				found = OPERAND_YPQ;
-			else if (reg[0] == 'z' && len > 2)
+			} else if (reg[0] == 'z' && len > 2) {
 				found = OPERAND_ZPQ;
+			}
 		}
 	}
 	return found;
@@ -106,15 +108,17 @@ static int search_instruction(RAsm *a, char instr[3][MAX_TOKEN_SIZE], int args)
 				// handling (e)lpm instruction with 2 args
 				if (instructionSet[i].opcodeMask >= 0x9004 &&
 					instructionSet[i].opcodeMask <= 0x9007) {
-					if (instructionSet[i].operandTypes[1] == parse_specialreg(instr[2]))
+					if (instructionSet[i].operandTypes[1] == parse_specialreg (instr[2])) {
 						return i;
-				// handling ld & ldd instruction with 2 args
+					}
+					// handling ld & ldd instruction with 2 args
 				} else if (instructionSet[i].mnemonic[0] == 'l'
 					&& instructionSet[i].mnemonic[1] == 'd'
 					&& (instructionSet[i].mnemonic[2] == 'd' || instructionSet[i].mnemonic[2] == '\0')) {
-					if (instructionSet[i].operandTypes[1] == parse_specialreg(instr[2]))
+					if (instructionSet[i].operandTypes[1] == parse_specialreg (instr[2])) {
 						return i;
-				// handling lds command, distinguishing long from 16-bit version
+					}
+					// handling lds command, distinguishing long from 16-bit version
 				} else if (instructionSet[i].mnemonic[0] == 'l'
 					&& instructionSet[i].mnemonic[1] == 'd'
 					&& instructionSet[i].mnemonic[2] == 's'
@@ -131,9 +135,10 @@ static int search_instruction(RAsm *a, char instr[3][MAX_TOKEN_SIZE], int args)
 					&& instructionSet[i].mnemonic[1] == 't'
 					&& (instructionSet[i].mnemonic[2] == 'd' || instructionSet[i].mnemonic[2] == '\0')) {
 
-					if (instructionSet[i].operandTypes[0] == parse_specialreg(instr[1]))
+					if (instructionSet[i].operandTypes[0] == parse_specialreg (instr[1])) {
 						return i;
-				// handling sts long command
+					}
+					// handling sts long command
 				} else if (instructionSet[i].mnemonic[0] == 's'
 					&& instructionSet[i].mnemonic[1] == 't'
 					&& instructionSet[i].mnemonic[2] == 's'
@@ -260,8 +265,9 @@ static int assemble_operand(RAsm *a, const char *operand, int type, uint32_t *re
 			temp -= a->pc + 2;
 		}
 		temp /= 2; // in WORDs
-		if(temp >= -64 && temp <= 63)
+		if (temp >= -64 && temp <= 63) {
 			ret = 0;
+		}
 		*res = temp;
 		break;
 	case OPERAND_IO_REGISTER:
@@ -304,8 +310,9 @@ static int assemble_operand(RAsm *a, const char *operand, int type, uint32_t *re
 		if (strlen(operand) > 1) {
 			// returns register number (r__)
 			*res = getnum(a, operand + 1);
-			if (*res <=32)
+			if (*res <= 32) {
 				ret = 0;
+			}
 		}
 		break;
 	case OPERAND_REGISTER_STARTR16:
diff --git a/libr/asm/p/asm_cris_gnu.c b/libr/asm/p/asm_cris_gnu.c
index 56b5850b69..ffa3810ed6 100644
--- a/libr/asm/p/asm_cris_gnu.c
+++ b/libr/asm/p/asm_cris_gnu.c
@@ -40,8 +40,9 @@ static void memory_error_func(int status, bfd_vma memaddr, struct disassemble_in
 
 static void print_address(bfd_vma address, struct disassemble_info *info) {
 	char tmp[32];
-	if (!buf_global)
+	if (!buf_global) {
 		return;
+	}
 	sprintf(tmp, "0x%08"PFMT64x"", (ut64)address);
 	strcat(buf_global, tmp);
 }
@@ -50,13 +51,16 @@ static int buf_fprintf(void *stream, const char *format, ...) {
 	int flen, glen;
 	va_list ap;
 	char *tmp;
-	if (!buf_global)
+	if (!buf_global) {
 		return 0;
+	}
 	va_start (ap, format);
 		flen = strlen (format);
 		glen = strlen (buf_global);
 		tmp = malloc (flen + glen + 2);
-		if (!tmp) return 0;
+		if (!tmp) {
+			return 0;
+		}
 		memcpy (tmp, buf_global, glen);
 		memcpy (tmp+glen, format, flen);
 		tmp[flen+glen] = 0;
diff --git a/libr/asm/p/asm_lm32.c b/libr/asm/p/asm_lm32.c
index 97cb2cf2e4..0d6175d014 100644
--- a/libr/asm/p/asm_lm32.c
+++ b/libr/asm/p/asm_lm32.c
@@ -21,7 +21,9 @@ static int reg_number_to_string(ut8 reg, char *str) {
 		}
 	}
 	//register number not found in array. this shouldn't happen
-	if (match_idx == 0xff) return -1;
+	if (match_idx == 0xff) {
+		return -1;
+	}
 	strcpy (str, RAsmLm32Regs[match_idx].name);
 	return 0;
 }
@@ -83,7 +85,9 @@ static int csr_number_to_string(ut8 csr, char *str) {
 		}
 	}
 	//csr number not found in array
-	if (match_idx == 0xff) return -1;
+	if (match_idx == 0xff) {
+		return -1;
+	}
 	strcpy (str, RAsmLm32Csrs[match_idx].name);
 	return 0;
 }
@@ -153,7 +157,9 @@ static bool is_pseudo_instr_raise(RAsmLm32Instruction *instr) {
 
 static int r_asm_lm32_decode(RAsmLm32Instruction *instr) {
 	instr->op = extract_opcode (instr->value);
-	if (instr->op >= RAsmLm32OpcodeNumber) return -1;
+	if (instr->op >= RAsmLm32OpcodeNumber) {
+		return -1;
+	}
 	instr->op_decode = RAsmLm32OpcodeList[instr->op];
 
 	switch (instr->op_decode.type) {
@@ -175,23 +181,31 @@ static int r_asm_lm32_decode(RAsmLm32Instruction *instr) {
 		instr->immediate = extract_imm16 (instr->value);
 		break;
 	case reg_imm5:
-		if (is_invalid_imm5_instr (instr)) return -1;
+		if (is_invalid_imm5_instr (instr)) {
+			return -1;
+		}
 		instr->dest_reg = extract_reg_v (instr->value);
 		instr->src0_reg = extract_reg_u (instr->value);
 		instr->immediate = extract_imm5 (instr->value);
 		break;
 	case raise_instr:
-		if (is_invalid_imm5_instr (instr)) return -1;
+		if (is_invalid_imm5_instr (instr)) {
+			return -1;
+		}
 		//might be less bits used, but this shouldn't hurt
 		//invalid parameters are catched in print_pseudo_instruction anyway
 		instr->immediate = extract_imm5 (instr->value);
 		break;
 	case one_reg:
-		if (is_invalid_one_reg_instr (instr)) return -1;
+		if (is_invalid_one_reg_instr (instr)) {
+			return -1;
+		}
 		instr->src0_reg = extract_reg_u (instr->value);
 		break;
 	case two_regs:
-		if (is_invalid_two_reg_instr (instr)) return -1;
+		if (is_invalid_two_reg_instr (instr)) {
+			return -1;
+		}
 		instr->dest_reg = extract_reg_w (instr->value);
 		instr->src0_reg = extract_reg_u (instr->value);
 		break;
@@ -201,13 +215,17 @@ static int r_asm_lm32_decode(RAsmLm32Instruction *instr) {
 		instr->src1_reg = extract_reg_u (instr->value);
 		break;
 	case reg_csr: //wcsr
-		if (is_invalid_wcsr_instr (instr)) return -1;
+		if (is_invalid_wcsr_instr (instr)) {
+			return -1;
+		}
 		instr->src0_reg = extract_reg_v (instr->value);
 		instr->csr = extract_reg_u (instr->value);
 		break;
 	case csr_reg: //rcsr
 		//bitmask is the same as the two register one
-		if (is_invalid_two_reg_instr (instr)) return -1;
+		if (is_invalid_two_reg_instr (instr)) {
+			return -1;
+		}
 		instr->dest_reg = extract_reg_w (instr->value);
 		instr->csr = extract_reg_u (instr->value);
 		break;
@@ -235,24 +253,44 @@ static int write_reg_names_to_struct(RAsmLm32Instruction *instr) {
 	case reg_imm16_zeroextend:
 	case reg_imm5:
 	case two_regs:
-		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) return -1;
-		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) return -1;
+		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) {
+			return -1;
+		}
+		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) {
+			return -1;
+		}
 		break;
 	case one_reg:
-		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) return -1;
+		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) {
+			return -1;
+		}
 		break;
 	case three_regs:
-		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) return -1;
-		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) return -1;
-		if (reg_number_to_string (instr->src1_reg, instr->src1_reg_str)) return -1;
+		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) {
+			return -1;
+		}
+		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) {
+			return -1;
+		}
+		if (reg_number_to_string (instr->src1_reg, instr->src1_reg_str)) {
+			return -1;
+		}
 		break;
 	case reg_csr:
-		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) return -1;
-		if (csr_number_to_string (instr->csr, instr->csr_reg_str)) return -1;
+		if (reg_number_to_string (instr->src0_reg, instr->src0_reg_str)) {
+			return -1;
+		}
+		if (csr_number_to_string (instr->csr, instr->csr_reg_str)) {
+			return -1;
+		}
 		break;
 	case csr_reg:
-		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) return -1;
-		if (csr_number_to_string (instr->csr, instr->csr_reg_str)) return -1;
+		if (reg_number_to_string (instr->dest_reg, instr->dest_reg_str)) {
+			return -1;
+		}
+		if (csr_number_to_string (instr->csr, instr->csr_reg_str)) {
+			return -1;
+		}
 		break;
 	case raise_instr:
 	case imm26:
@@ -314,7 +352,9 @@ static int print_pseudo_instruction(RAsmLm32Instruction *instr, char *str) {
 
 
 static int r_asm_lm32_stringify(RAsmLm32Instruction *instr, char *str) {
-	if (write_reg_names_to_struct (instr)) return -1;
+	if (write_reg_names_to_struct (instr)) {
+		return -1;
+	}
 
 	//pseudo instructions need some special handling
 	if (instr->pseudoInstruction) {
diff --git a/libr/asm/p/asm_m68k_cs.c b/libr/asm/p/asm_m68k_cs.c
index 0c1538a979..27c3bb6e7c 100644
--- a/libr/asm/p/asm_m68k_cs.c
+++ b/libr/asm/p/asm_m68k_cs.c
@@ -35,18 +35,24 @@ static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	}
 
 	// replace this with the asm.features?
-	if (a->cpu && strstr (a->cpu, "68000"))
+	if (a->cpu && strstr (a->cpu, "68000")) {
 		mode |= CS_MODE_M68K_000;
-	if (a->cpu && strstr (a->cpu, "68010"))
+	}
+	if (a->cpu && strstr (a->cpu, "68010")) {
 		mode |= CS_MODE_M68K_010;
-	if (a->cpu && strstr (a->cpu, "68020"))
+	}
+	if (a->cpu && strstr (a->cpu, "68020")) {
 		mode |= CS_MODE_M68K_020;
-	if (a->cpu && strstr (a->cpu, "68030"))
+	}
+	if (a->cpu && strstr (a->cpu, "68030")) {
 		mode |= CS_MODE_M68K_030;
-	if (a->cpu && strstr (a->cpu, "68040"))
+	}
+	if (a->cpu && strstr (a->cpu, "68040")) {
 		mode |= CS_MODE_M68K_040;
-	if (a->cpu && strstr (a->cpu, "68060"))
+	}
+	if (a->cpu && strstr (a->cpu, "68060")) {
 		mode |= CS_MODE_M68K_060;
+	}
 	if (op) {
 		op->size = 4;
 	}
diff --git a/libr/asm/p/asm_mcs96.c b/libr/asm/p/asm_mcs96.c
index 0a31ce0ab7..d7caf0cb58 100644
--- a/libr/asm/p/asm_mcs96.c
+++ b/libr/asm/p/asm_mcs96.c
@@ -7,11 +7,21 @@
 #include "../arch/mcs96/mcs96.h"
 
 static int mcs96_len (const ut8 buf) {
-	if (mcs96_op[buf].type & MCS96_6B) return 6;
-	if (mcs96_op[buf].type & MCS96_5B) return 5;
-	if (mcs96_op[buf].type & MCS96_4B) return 4;
-	if (mcs96_op[buf].type & MCS96_3B) return 3;
-	if (mcs96_op[buf].type & MCS96_2B) return 2;
+	if (mcs96_op[buf].type & MCS96_6B) {
+		return 6;
+	}
+	if (mcs96_op[buf].type & MCS96_5B) {
+		return 5;
+	}
+	if (mcs96_op[buf].type & MCS96_4B) {
+		return 4;
+	}
+	if (mcs96_op[buf].type & MCS96_3B) {
+		return 3;
+	}
+	if (mcs96_op[buf].type & MCS96_2B) {
+		return 2;
+	}
 	return 1;
 }
 
diff --git a/libr/asm/p/asm_mips_gnu.c b/libr/asm/p/asm_mips_gnu.c
index 0a29ec018c..c0e434deb2 100644
--- a/libr/asm/p/asm_mips_gnu.c
+++ b/libr/asm/p/asm_mips_gnu.c
@@ -43,8 +43,9 @@ static void print_address(bfd_vma address, struct disassemble_info *info) {
 static int buf_fprintf(void *stream, const char *format, ...) {
 	va_list ap;
 	char *tmp;
-	if (!buf_global || !format)
+	if (!buf_global || !format) {
 		return false;
+	}
 	va_start (ap, format);
  	tmp = malloc (strlen (format)+strlen (buf_global)+2);
 	if (!tmp) {
diff --git a/libr/asm/p/asm_ppc_gnu.c b/libr/asm/p/asm_ppc_gnu.c
index 3c6faddb34..feae9bcf5a 100644
--- a/libr/asm/p/asm_ppc_gnu.c
+++ b/libr/asm/p/asm_ppc_gnu.c
@@ -41,13 +41,16 @@ static int buf_fprintf(void *stream, const char *format, ...) {
 	int flen, glen;
 	va_list ap;
 	char *tmp;
-	if (!buf_global)
+	if (!buf_global) {
 		return 0;
+	}
 	va_start (ap, format);
 	flen = strlen (format);
 	glen = strlen (buf_global);
 	tmp = malloc (flen + glen + 2);
-	if (!tmp) return 0;
+	if (!tmp) {
+		return 0;
+	}
 	memcpy (tmp, buf_global, glen);
 	memcpy (tmp+glen, format, flen);
 	tmp[flen+glen] = 0;
diff --git a/libr/asm/p/asm_sh.c b/libr/asm/p/asm_sh.c
index 81b57485ef..db8bcdf123 100644
--- a/libr/asm/p/asm_sh.c
+++ b/libr/asm/p/asm_sh.c
@@ -32,8 +32,9 @@ static void memory_error_func(int status, bfd_vma memaddr, struct disassemble_in
 
 static void print_address(bfd_vma address, struct disassemble_info *info) {
 	char tmp[32];
-	if (!buf_global)
+	if (!buf_global) {
 		return;
+	}
 	sprintf (tmp, "0x%08"PFMT64x"", (ut64)address);
 	strcat (buf_global, tmp);
 }
@@ -42,11 +43,13 @@ static int buf_fprintf(void *stream, const char *format, ...) {
 	va_list ap;
 	char *tmp;
 	int ret;
-	if (!buf_global)
+	if (!buf_global) {
 		return 0;
+	}
 	tmp = malloc (strlen (format)+strlen (buf_global)+2);
-	if (!tmp)
+	if (!tmp) {
 		return 0;
+	}
 	va_start (ap, format);
 	sprintf (tmp, "%s%s", buf_global, format);
 	ret = vsprintf (buf_global, tmp, ap);
diff --git a/libr/asm/p/asm_snes.c b/libr/asm/p/asm_snes.c
index d7b19742a3..ebc5d1a467 100644
--- a/libr/asm/p/asm_snes.c
+++ b/libr/asm/p/asm_snes.c
@@ -10,7 +10,9 @@
 static struct snes_asm_flags* snesflags = NULL;
 
 static bool snes_asm_init (void* user) {
-	if (!snesflags) snesflags = malloc(sizeof( struct snes_asm_flags ));
+	if (!snesflags) {
+		snesflags = malloc (sizeof (struct snes_asm_flags));
+	}
 	memset(snesflags,0,sizeof (struct snes_asm_flags));
 	return 0;
 }
@@ -23,14 +25,24 @@ static bool snes_asm_fini (void* user) {
 
 static int dis(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	int dlen = snesDisass (snesflags->M, snesflags->X, a->pc, op, buf, len);
-	if (dlen<0) dlen=0;
+	if (dlen < 0) {
+		dlen = 0;
+	}
 	op->size = dlen;
 	if (buf[0] == 0xc2) { //REP
-		if ( buf[1] & 0x10 ) snesflags->X = 0;
-		if ( buf[1] & 0x20 ) snesflags->M = 0;
+		if (buf[1] & 0x10) {
+			snesflags->X = 0;
+		}
+		if (buf[1] & 0x20) {
+			snesflags->M = 0;
+		}
 	} else if (buf[0] == 0xe2) { //SEP
-		if ( buf[1] & 0x10 ) snesflags->X = 1;
-		if ( buf[1] & 0x20 ) snesflags->M = 1;
+		if (buf[1] & 0x10) {
+			snesflags->X = 1;
+		}
+		if (buf[1] & 0x20) {
+			snesflags->M = 1;
+		}
 	}
 	return dlen;
 }
diff --git a/libr/asm/p/asm_sparc_gnu.c b/libr/asm/p/asm_sparc_gnu.c
index d4907eff53..755fe2063a 100644
--- a/libr/asm/p/asm_sparc_gnu.c
+++ b/libr/asm/p/asm_sparc_gnu.c
@@ -29,8 +29,9 @@ static void memory_error_func(int status, bfd_vma memaddr, struct disassemble_in
 
 static void print_address(bfd_vma address, struct disassemble_info *info) {
 	char tmp[32];
-	if (!buf_global)
+	if (!buf_global) {
 		return;
+	}
 	sprintf (tmp, "0x%08"PFMT64x"", (ut64)address);
 	strcat (buf_global, tmp);
 }
diff --git a/libr/asm/p/asm_spc700.c b/libr/asm/p/asm_spc700.c
index faffe57e93..ebb60286be 100644
--- a/libr/asm/p/asm_spc700.c
+++ b/libr/asm/p/asm_spc700.c
@@ -11,7 +11,9 @@
 
 static int disassemble(RAsm *a, RAsmOp *r_op, const ut8 *buf, int len) {
 	int dlen = spc700Disass(r_op, buf, len);
-	if(dlen < 0) dlen=0;
+	if (dlen < 0) {
+		dlen = 0;
+	}
 	r_op->size = dlen;
 	return dlen;
 }
diff --git a/libr/asm/p/asm_tricore.c b/libr/asm/p/asm_tricore.c
index 3e6da59ff3..13b6a78e04 100644
--- a/libr/asm/p/asm_tricore.c
+++ b/libr/asm/p/asm_tricore.c
@@ -53,7 +53,9 @@ static int buf_fprintf(void *stream, const char *format, ...) {
 	flen = strlen (format);
 	glen = strlen (buf_global);
 	tmp = malloc (flen + glen + 2);
-	if (!tmp) return 0;
+	if (!tmp) {
+		return 0;
+	}
 
 	if (strchr (buf_global, '%')) {
 		char *buf_local = strdup (buf_global);
diff --git a/libr/asm/p/asm_vax.c b/libr/asm/p/asm_vax.c
index 90db378eda..d0d4421666 100644
--- a/libr/asm/p/asm_vax.c
+++ b/libr/asm/p/asm_vax.c
@@ -41,7 +41,9 @@ static void memory_error_func(int status, bfd_vma memaddr, struct disassemble_in
 
 static void print_address(bfd_vma address, struct disassemble_info *info) {
 	char tmp[32];
-	if (!buf_global) return;
+	if (!buf_global) {
+		return;
+	}
 	sprintf (tmp, "0x%08"PFMT64x, (ut64)address);
 	strcat (buf_global, tmp);
 }
@@ -57,7 +59,9 @@ static int buf_fprintf(void *stream, const char *format, ...) {
 	flen = strlen (format);
 	glen = strlen (buf_global);
 	tmp = malloc (flen + glen + 2);
-	if (!tmp) return 0;
+	if (!tmp) {
+		return 0;
+	}
 	memcpy (tmp, buf_global, glen);
 	memcpy (tmp+glen, format, flen);
 	tmp[flen+glen] = 0;
diff --git a/libr/asm/p/asm_x86_as.c b/libr/asm/p/asm_x86_as.c
index 8537b3c7b5..a9cddec6f2 100644
--- a/libr/asm/p/asm_x86_as.c
+++ b/libr/asm/p/asm_x86_as.c
@@ -27,11 +27,13 @@ static int assemble(RAsm *a, RAsmOp *op, const char *buf) {
 		return -1;
 	}
 
-	if (a->syntax == R_ASM_SYNTAX_INTEL)
+	if (a->syntax == R_ASM_SYNTAX_INTEL) {
 		syntaxstr = ".intel_syntax noprefix\n";
+	}
 
-	if (a->syntax == R_ASM_SYNTAX_ATT)
+	if (a->syntax == R_ASM_SYNTAX_ATT) {
 		syntaxstr = ".att_syntax\n";
+	}
 
 	len = snprintf (asm_buf, sizeof (asm_buf),
 			"%s.code%i\n" //.org 0x%"PFMT64x"\n"
diff --git a/libr/asm/p/asm_x86_nasm.c b/libr/asm/p/asm_x86_nasm.c
index 2168f9d78d..e8a7b0897d 100644
--- a/libr/asm/p/asm_x86_nasm.c
+++ b/libr/asm/p/asm_x86_nasm.c
@@ -16,9 +16,10 @@ static int assemble(RAsm *a, RAsmOp *op, const char *buf) {
 	}
 
 	ifd = r_file_mkstemp ("r_nasm", &ipath);
-	if (ifd == -1)
+	if (ifd == -1) {
 		return -1;
-		
+	}
+
 	ofd = r_file_mkstemp ("r_nasm", &opath);
 	if (ofd == -1) {
 		free (ipath);
diff --git a/libr/asm/p/asm_x86_nz.c b/libr/asm/p/asm_x86_nz.c
index 276996768e..ca008ef58c 100644
--- a/libr/asm/p/asm_x86_nz.c
+++ b/libr/asm/p/asm_x86_nz.c
@@ -2001,7 +2001,9 @@ static int opmov(RAsm *a, ut8 *data, const Opcode *op) {
 		}
 
 		if (op->operands[1].type & OT_REGTYPE & OT_SEGMENTREG) {
-			if (op->operands[1].scale[0] == 0) return -1;
+			if (op->operands[1].scale[0] == 0) {
+				return -1;
+			}
 			data[l++] = SEG_REG_PREFIXES[op->operands[1].regs[0]];
 			data[l++] = 0x8b;
 			data[l++] = op->operands[0].reg << 3 | 0x5;
@@ -4343,18 +4345,20 @@ static Register parseReg(RAsm *a, const char *str, size_t *pos, ut32 *type) {
 
 	// General purpose registers
 	if (length == 3 && token[0] == 'e') {
-		for (i = 0; regs[i]; i++)
+		for (i = 0; regs[i]; i++) {
 			if (!r_str_ncasecmp (regs[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_DWORD;
 				return i;
 			}
+		}
 	}
 	if (length == 2 && (token[1] == 'l' || token[1] == 'h')) {
-		for (i = 0; regs8[i]; i++)
+		for (i = 0; regs8[i]; i++) {
 			if (!r_str_ncasecmp (regs8[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_BYTE;
 				return i;
 			}
+		}
 	}
 	if (length == 2) {
 		for (i = 0; regs16[i]; i++) {
@@ -4488,9 +4492,9 @@ static int parseOperand(RAsm *a, const char *str, Operand *op, bool isrepop) {
 		last_type = getToken (str, &pos, &nextpos);
 
 		// Token may indicate size: then skip
-		if (!r_str_ncasecmp (str + pos, "ptr", 3))
+		if (!r_str_ncasecmp (str + pos, "ptr", 3)) {
 			continue;
-		else if (!r_str_ncasecmp (str + pos, "byte", 4)) {
+		} else if (!r_str_ncasecmp (str + pos, "byte", 4)) {
 			op->type |= OT_MEMORY | OT_BYTE;
 			op->dest_size = OT_BYTE;
 			explicit_size = true;
@@ -4736,8 +4740,12 @@ static int parseOpcode(RAsm *a, const char *op, Opcode *out) {
 }
 
 static ut64 getnum(RAsm *a, const char *s) {
-	if (!s) return 0;
-	if (*s == '$') s++;
+	if (!s) {
+		return 0;
+	}
+	if (*s == '$') {
+		s++;
+	}
 	return r_num_math (a->num, s);
 }
 
diff --git a/libr/bin/bin.c b/libr/bin/bin.c
index cf23da997f..867abd86e4 100644
--- a/libr/bin/bin.c
+++ b/libr/bin/bin.c
@@ -963,8 +963,9 @@ R_API int r_bin_is_stripped(RBin *bin) {
 
 R_API int r_bin_is_static(RBin *bin) {
 	RBinObject *o = r_bin_cur_object (bin);
-	if (o && r_list_length (o->libs) > 0)
+	if (o && r_list_length (o->libs) > 0) {
 		return R_BIN_DBG_STATIC & o->info->dbg_info;
+	}
 	return true;
 }
 
diff --git a/libr/bin/bin_write.c b/libr/bin/bin_write.c
index 9340c68b5c..b30c3de669 100644
--- a/libr/bin/bin_write.c
+++ b/libr/bin/bin_write.c
@@ -34,7 +34,9 @@ R_API bool r_bin_wr_rpath_del(RBin *bin) {
 
 R_API bool r_bin_wr_output(RBin *bin, const char *filename) {
 	RBinFile *binfile = r_bin_cur (bin);
-	if (!filename || !binfile || !binfile->buf) return false;
+	if (!filename || !binfile || !binfile->buf) {
+		return false;
+	}
 	return r_file_dump (filename, binfile->buf->buf,
 			binfile->buf->length, 0);
 }
diff --git a/libr/bin/demangle.c b/libr/bin/demangle.c
index 07e653cd27..cf464b89be 100644
--- a/libr/bin/demangle.c
+++ b/libr/bin/demangle.c
@@ -49,10 +49,13 @@ R_API char *r_bin_demangle_java(const char *str) {
 	char *ret;
 
 	ptr = strchr (str, '(');
-	if (!ptr)
+	if (!ptr) {
 		return NULL;
+	}
 	buf = r_buf_new ();
-	if (!buf) return NULL;
+	if (!buf) {
+		return NULL;
+	}
 	r_buf_append_bytes (buf, (const ut8*)str, (int)(size_t)(ptr-str));
 	r_buf_append_bytes (buf, (const ut8*)" (", 2);
 	while (*str) {
@@ -89,8 +92,9 @@ R_API char *r_bin_demangle_java(const char *str) {
 				r_buf_append_bytes (buf, (const ut8*)")", 1);
 				break;
 			} else {
-				if (n++>0)
-					r_buf_append_bytes (buf, (const ut8*)", ", 2);
+				if (n++ > 0) {
+					r_buf_append_bytes (buf, (const ut8 *)", ", 2);
+				}
 				r_buf_append_bytes (buf, (const ut8*)w, wlen);
 			}
 			if (is_array) {
@@ -99,7 +103,9 @@ R_API char *r_bin_demangle_java(const char *str) {
 			}
 		}
 		w = NULL;
-		if (!str) break;
+		if (!str) {
+			break;
+		}
 		str++;
 	}
 	ret = r_buf_to_string (buf);
@@ -112,7 +118,9 @@ R_API char *r_bin_demangle_msvc(const char *str) {
 	SDemangler *mangler = 0;
 
 	create_demangler (&mangler);
-	if (!mangler) return NULL;
+	if (!mangler) {
+		return NULL;
+	}
 	if (init_demangler (mangler, (char *)str) == eDemanglerErrOK) {
 		mangler->demangle (mangler, &out/*demangled_name*/);
 	}
@@ -226,12 +234,17 @@ R_API char *r_bin_demangle_objc(RBinFile *binfile, const char *sym) {
 		} else {
 			name = NULL;
 		}
-		if (binfile) r_bin_class_add_field (binfile, clas, name);
+		if (binfile) {
+			r_bin_class_add_field (binfile, clas, name);
+		}
 	}
 	/* methods */
 	if (sym && sym[0] && sym[1] == '[') { // apple style
-		if (sym[0] == '+') type = "static";
-		else if (sym[0] == '-') type = "public";
+		if (sym[0] == '+') {
+			type = "static";
+		} else if (sym[0] == '-') {
+			type = "public";
+		}
 		if (type) {
 			clas = strdup (sym + 2);
 			name = strchr (clas, ' ');
@@ -443,8 +456,9 @@ R_API int r_bin_lang_type(RBinFile *binfile, const char *def, const char *sym) {
 	}
 	if (def && *def) {
 		type = r_bin_demangle_type (def);
-		if (type != R_BIN_NM_NONE)
+		if (type != R_BIN_NM_NONE) {
 			return type;
+		}
 	}
 	plugin = r_bin_file_cur_plugin (binfile);
 	if (plugin && plugin->demangle_type) {
diff --git a/libr/bin/dwarf.c b/libr/bin/dwarf.c
index 14088b80d9..a41503feff 100644
--- a/libr/bin/dwarf.c
+++ b/libr/bin/dwarf.c
@@ -191,8 +191,9 @@ static const char *dwarf_langs[] = {
 };
 
 static int add_sdb_include_dir(Sdb *s, const char *incl, int idx) {
-	if (!s || !incl)
+	if (!s || !incl) {
 		return false;
+	}
 	return sdb_array_set (s, "includedirs", idx, incl, 0);
 }
 
@@ -217,7 +218,9 @@ static const ut8 *r_bin_dwarf_parse_lnp_header (
 	size_t count;
 	const ut8 *tmp_buf = NULL;
 
-	if (!hdr || !bf || !buf) return NULL;
+	if (!hdr || !bf || !buf) {
+		return NULL;
+	}
 
 	hdr->unit_length.part1 = READ (buf, ut32);
 	if (hdr->unit_length.part1 == DWARF_INIT_LEN_64) {
@@ -262,7 +265,9 @@ static const ut8 *r_bin_dwarf_parse_lnp_header (
 		hdr->std_opcode_lengths = calloc(sizeof(ut8), hdr->opcode_base);
 
 		for (i = 1; i <= hdr->opcode_base - 1; i++) {
-			if (buf+2>buf_end) break;
+			if (buf + 2 > buf_end) {
+				break;
+			}
 			hdr->std_opcode_lengths[i] = READ (buf, ut8);
 			if (f) {
 				fprintf (f, " op %d %d\n", i, hdr->std_opcode_lengths[i]);
@@ -335,8 +340,9 @@ static const ut8 *r_bin_dwarf_parse_lnp_header (
 					}
 				} else {
 					include_dir = pinclude_dir = sdb_get (bf->sdb_addrinfo, "DW_AT_comp_dir", 0);
-					if (!include_dir)
+					if (!include_dir) {
 						include_dir = "./";
+					}
 				}
 
 				namelen = len + (include_dir?strlen (include_dir):0) + 8;
@@ -386,8 +392,9 @@ static inline void add_sdb_addrline(Sdb *s, ut64 addr, const char *file, ut64 li
 	char offset[64];
 	char *offset_ptr;
 
-	if (!s || !file)
+	if (!s || !file) {
 		return;
+	}
 	p = r_str_rchr (file, NULL, '/');
 	if (p) {
 		p++;
@@ -435,7 +442,9 @@ static const ut8* r_bin_dwarf_parse_ext_opcode(const RBin *a, const ut8 *obuf,
 	ut32 addr_size = o && o->info && o->info->bits ? o->info->bits / 8 : 4;
 	const char *filename;
 
-	if (!binfile || !obuf || !hdr || !regs) return NULL;
+	if (!binfile || !obuf || !hdr || !regs) {
+		return NULL;
+	}
 
 	buf = r_leb128 (buf, &op_len);
 	buf_end = buf+len;
@@ -484,8 +493,9 @@ static const ut8* r_bin_dwarf_parse_ext_opcode(const RBin *a, const ut8 *obuf,
 
 		buf += (strlen (filename) + 1);
 		ut64 dir_idx;
-		if (buf+1 < buf_end)
+		if (buf + 1 < buf_end) {
 			buf = r_uleb128 (buf, ST32_MAX, &dir_idx);
+		}
 		break;
 	case DW_LNE_set_discriminator:
 		buf = r_uleb128 (buf, ST32_MAX, &addr);
@@ -774,8 +784,9 @@ R_API int r_bin_dwarf_parse_aranges_raw(const ut8 *obuf, int len, FILE *f) {
 		printf("length 0x%x\n", length);
 	}
 
-	if (idx+12>=len)
+	if (idx + 12 >= len) {
 		return false;
+	}
 
 	READ_BUF (version, ut16);
 	if (f) {
@@ -815,7 +826,9 @@ R_API int r_bin_dwarf_parse_aranges_raw(const ut8 *obuf, int len, FILE *f) {
 		}
 		READ_BUF (adr, ut64);
 		READ_BUF (length, ut64);
-		if (f) printf("length 0x%"PFMT64x" address 0x%"PFMT64x"\n", length, adr);
+		if (f) {
+			printf ("length 0x%" PFMT64x " address 0x%" PFMT64x "\n", length, adr);
+		}
 	}
 
 	return 0;
@@ -1010,7 +1023,9 @@ static void dump_r_bin_dwarf_debug_abbrev(FILE *f, RBinDwarfDebugAbbrev *da) {
 
 R_API void r_bin_dwarf_free_debug_abbrev(RBinDwarfDebugAbbrev *da) {
 	size_t i;
-	if (!da) return;
+	if (!da) {
+		return;
+	}
 	for (i = 0; i < da->length; i++) {
 		R_FREE (da->decls[i].specs);
 	}
@@ -1412,8 +1427,9 @@ R_API int r_bin_dwarf_parse_info_raw(Sdb *s, RBinDwarfDebugAbbrev *da,
 		goto out;
 	}
 	while (buf < buf_end) {
-		if (inf->length >= inf->capacity)
+		if (inf->length >= inf->capacity) {
 			break;
+		}
 
 		if (r_bin_dwarf_init_comp_unit (&inf->comp_units[curr_unit]) < 0) {
 			ret = false;
@@ -1707,7 +1723,9 @@ R_API RBinDwarfDebugAbbrev *r_bin_dwarf_parse_abbrev(RBin *a, int mode) {
 	RBinSection *section = getsection (a, "debug_abbrev");
 	RBinDwarfDebugAbbrev *da = NULL;
 	RBinFile *binfile = a ? a->cur: NULL;
-	if (!section || !binfile) return NULL;
+	if (!section || !binfile) {
+		return NULL;
+	}
 	if (section->size > binfile->size) {
 		return NULL;
 	}
diff --git a/libr/bin/filter.c b/libr/bin/filter.c
index 18ff59c5f9..813871a5e8 100644
--- a/libr/bin/filter.c
+++ b/libr/bin/filter.c
@@ -3,7 +3,9 @@
 #include <r_bin.h>
 
 static void hashify(char *s, ut64 vaddr) {
-	if (!s) return;
+	if (!s) {
+		return;
+	}
 	while (*s) {
 		if (!IS_PRINTABLE (*s)) {
 			if (vaddr && vaddr != UT64_MAX) {
@@ -24,7 +26,9 @@ R_API void r_bin_filter_name(Sdb *db, ut64 vaddr, char *name, int maxlen) {
 	const char *uname;
 	ut32 vhash, hash;
 	int count;
-	if (!db || !name) return;
+	if (!db || !name) {
+		return;
+	}
 	uname = sdb_fmt ("%" PFMT64x ".%s", vaddr, name);
 	vhash = sdb_hash (uname); // vaddr hash - unique
 	hash = sdb_hash (name);   // name hash - if dupped and not in unique hash must insert
@@ -39,7 +43,9 @@ R_API void r_bin_filter_name(Sdb *db, ut64 vaddr, char *name, int maxlen) {
 	}
 	if (count > 1) {
 		int namelen = strlen (name);
-		if (namelen > maxlen) name[maxlen] = 0;
+		if (namelen > maxlen) {
+			name[maxlen] = 0;
+		}
 		strcat (name, sdb_fmt ("_%d", count - 1));
 		// two symbols at different addresses and same name wtf
 		//	eprintf ("Symbol '%s' dupped!\n", sym->name);
@@ -116,7 +122,9 @@ R_API void r_bin_filter_classes(RList *list) {
 	RBinClass *cls;
 	RBinSymbol *sym;
 	r_list_foreach (list, iter, cls) {
-		if (!cls->name) continue;
+		if (!cls->name) {
+			continue;
+		}
 		namepad_len = strlen (cls->name) + 32;
 		namepad = calloc (1, namepad_len + 1);
 		if (namepad) {
@@ -125,10 +133,13 @@ R_API void r_bin_filter_classes(RList *list) {
 			free (cls->name);
 			cls->name = namepad;
 			r_list_foreach (cls->methods, iter2, sym) {
-				if (sym->name)
+				if (sym->name) {
 					r_bin_filter_sym (db, sym->vaddr, sym);
+				}
 			}
-		} else eprintf ("Cannot alloc %d byte(s)\n", namepad_len);
+		} else {
+			eprintf ("Cannot alloc %d byte(s)\n", namepad_len);
+		}
 	}
 	sdb_free (db);
 }
diff --git a/libr/bin/format/coff/coff.c b/libr/bin/format/coff/coff.c
index a700387e1d..4d2d0998bd 100644
--- a/libr/bin/format/coff/coff.c
+++ b/libr/bin/format/coff/coff.c
@@ -79,16 +79,18 @@ RBinAddr *r_coff_get_entry(struct r_bin_coff_obj *obj) {
 	 * or 'main' if present */
 	if (obj->symbols) {
 		for (i = 0; i < obj->hdr.f_nsyms; i++) {
-			if ((!strcmp (obj->symbols[i].n_name, "_start") || 
-				 !strcmp (obj->symbols[i].n_name, "start")) &&
-				 r_coff_rebase_sym (obj, addr, &obj->symbols[i]))
+			if ((!strcmp (obj->symbols[i].n_name, "_start") ||
+				    !strcmp (obj->symbols[i].n_name, "start")) &&
+				r_coff_rebase_sym (obj, addr, &obj->symbols[i])) {
 				return addr;
+			}
 		}
 		for (i = 0; i < obj->hdr.f_nsyms; i++) {
-			if ((!strcmp (obj->symbols[i].n_name, "_main") || 
-				 !strcmp (obj->symbols[i].n_name, "main")) &&
-				 r_coff_rebase_sym (obj, addr, &obj->symbols[i]))
+			if ((!strcmp (obj->symbols[i].n_name, "_main") ||
+				    !strcmp (obj->symbols[i].n_name, "main")) &&
+				r_coff_rebase_sym (obj, addr, &obj->symbols[i])) {
 				return addr;
+			}
 		}
 	}
 	/* Still clueless ? Let's just use the address of .text */
diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
index 3af2a413a4..828b1da9fe 100644
--- a/libr/bin/format/elf/elf.c
+++ b/libr/bin/format/elf/elf.c
@@ -354,9 +354,10 @@ static int init_strtab(ELFOBJ *bin) {
 	}
 	if (bin->ehdr.e_shstrndx != SHN_UNDEF &&
 		(bin->ehdr.e_shstrndx >= bin->ehdr.e_shnum ||
-		(bin->ehdr.e_shstrndx >= SHN_LORESERVE &&
-		bin->ehdr.e_shstrndx < SHN_HIRESERVE)))
+			(bin->ehdr.e_shstrndx >= SHN_LORESERVE &&
+				bin->ehdr.e_shstrndx < SHN_HIRESERVE))) {
 		return false;
+	}
 
 	/* sh_size must be lower than UT32_MAX and not equal to zero, to avoid bugs on malloc() */
 	if (bin->shdr[bin->ehdr.e_shstrndx].sh_size > UT32_MAX) {
@@ -1170,8 +1171,9 @@ static int elf_init(ELFOBJ *bin) {
 			bprintf ("Warning: Cannot initialize dynamic strings\n");
 		}
 		bin->baddr = Elf_(r_bin_elf_get_baddr) (bin);
-		if (!init_dynamic_section (bin) && !Elf_(r_bin_elf_get_static)(bin))
+		if (!init_dynamic_section (bin) && !Elf_ (r_bin_elf_get_static) (bin)) {
 			bprintf ("Warning: Cannot initialize dynamic section\n");
+		}
 	}
 
 	bin->imports_by_ord_size = 0;
@@ -1187,7 +1189,9 @@ static int elf_init(ELFOBJ *bin) {
 
 ut64 Elf_(r_bin_elf_get_section_offset)(ELFOBJ *bin, const char *section_name) {
 	RBinElfSection *section = get_section_by_name (bin, section_name);
-	if (!section) return UT64_MAX;
+	if (!section) {
+		return UT64_MAX;
+	}
 	return section->offset;
 }
 
@@ -1830,7 +1834,9 @@ ut64 Elf_(r_bin_elf_get_main_offset)(ELFOBJ *bin) {
 	/* find sym.main if possible */
 	{
 		ut64 m = getmainsymbol (bin);
-		if (m != UT64_MAX) return m;
+		if (m != UT64_MAX) {
+			return m;
+		}
 	}
 	return UT64_MAX;
 }
@@ -2204,9 +2210,15 @@ char* Elf_(r_bin_elf_get_osabi_name)(ELFOBJ *bin) {
 		}
 	}
 	/* Hack to identify OS */
-	if (needle (bin, "freebsd")) return strdup ("freebsd");
-	if (noodle (bin, "BEOS:APP_VERSION")) return strdup ("beos");
-	if (needle (bin, "GNU")) return strdup ("linux");
+	if (needle (bin, "freebsd")) {
+		return strdup ("freebsd");
+	}
+	if (noodle (bin, "BEOS:APP_VERSION")) {
+		return strdup ("beos");
+	}
+	if (needle (bin, "GNU")) {
+		return strdup ("linux");
+	}
 	return strdup ("linux");
 }
 
@@ -2470,7 +2482,7 @@ RBinElfLib* Elf_(r_bin_elf_get_libs)(ELFOBJ *bin) {
 	if (!bin || !bin->phdr || !bin->dyn_buf || !bin->strtab || *(bin->strtab+1) == '0') {
 		return NULL;
 	}
-	for (j = 0, k = 0; j < bin->dyn_entries; j++)
+	for (j = 0, k = 0; j < bin->dyn_entries; j++) {
 		if (bin->dyn_buf[j].d_tag == DT_NEEDED) {
 			RBinElfLib *r = realloc (ret, (k + 1) * sizeof (RBinElfLib));
 			if (!r) {
@@ -2490,6 +2502,7 @@ RBinElfLib* Elf_(r_bin_elf_get_libs)(ELFOBJ *bin) {
 				k++;
 			}
 		}
+	}
 	RBinElfLib *r = realloc (ret, (k + 1) * sizeof (RBinElfLib));
 	if (!r) {
 		perror ("realloc (libs)");
@@ -3083,8 +3096,9 @@ static RBinElfSymbol* Elf_(_r_bin_elf_get_symbols_imports)(ELFOBJ *bin, int type
 					continue;
 				}
 				if (bin->ehdr.e_type == ET_REL) {
-					if (sym[k].st_shndx < bin->ehdr.e_shnum)
+					if (sym[k].st_shndx < bin->ehdr.e_shnum) {
 						ret[ret_ctr].offset = sym[k].st_value + bin->shdr[sym[k].st_shndx].sh_offset;
+					}
 				} else {
 					ret[ret_ctr].offset = Elf_(r_bin_elf_v2p) (bin, toffset);
 				}
@@ -3283,7 +3297,9 @@ static int is_in_vphdr (Elf_(Phdr) *p, ut64 addr) {
 ut64 Elf_(r_bin_elf_p2v) (ELFOBJ *bin, ut64 paddr) {
 	int i;
 
-	if (!bin) return 0;
+	if (!bin) {
+		return 0;
+	}
 
 	if (!bin->phdr) {
 		if (bin->ehdr.e_type == ET_REL) {
diff --git a/libr/bin/format/elf/elf_write.c b/libr/bin/format/elf/elf_write.c
index 94aa0ae4a2..f0fb5267ad 100644
--- a/libr/bin/format/elf/elf_write.c
+++ b/libr/bin/format/elf/elf_write.c
@@ -134,12 +134,17 @@ ut64 Elf_(r_bin_elf_resize_section)(struct Elf_(r_bin_elf_obj_t) *bin, const cha
 #endif 
 		if (phdrp->p_offset >= rsz_offset + rsz_osize) {
 			phdrp->p_offset += delta;
-			if (phdrp->p_vaddr) phdrp->p_vaddr += delta;
-			if (phdrp->p_paddr) phdrp->p_paddr += delta;
+			if (phdrp->p_vaddr) {
+				phdrp->p_vaddr += delta;
+			}
+			if (phdrp->p_paddr) {
+				phdrp->p_paddr += delta;
+			}
 		}
 		off = ehdr->e_phoff + i * sizeof (Elf_(Phdr));
-		if (r_buf_write_at (bin->b, off, (ut8*)phdrp, sizeof (Elf_(Phdr))) == -1)
+		if (r_buf_write_at (bin->b, off, (ut8 *)phdrp, sizeof (Elf_ (Phdr))) == -1) {
 			perror ("write (phdr)");
+		}
 		printf ("-> program header (0x%08"PFMT64x")\n", (ut64) phdrp->p_offset);
 	}
 
diff --git a/libr/bin/format/mach0/dyldcache.c b/libr/bin/format/mach0/dyldcache.c
index 3125498f87..b19dbc656a 100644
--- a/libr/bin/format/mach0/dyldcache.c
+++ b/libr/bin/format/mach0/dyldcache.c
@@ -34,8 +34,9 @@ struct r_bin_dyldcache_lib_t *r_bin_dyldcache_extract(struct r_bin_dyldcache_obj
 	RBuffer* dbuf;
 	char *libname;
 
-	if (!bin)
-	    	return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	if (bin->size < 1) {
 		eprintf ("Empty file? (%s)\n", bin->file? bin->file: "(null)");
 		return NULL;
@@ -79,8 +80,9 @@ struct r_bin_dyldcache_lib_t *r_bin_dyldcache_extract(struct r_bin_dyldcache_obj
 	mh = (struct mach_header *)data;
 	/* Check it is mach-o */
 	if (mh->magic != MH_MAGIC && mh->magic != MH_MAGIC_64) {
-	    	if (mh->magic == 0xbebafeca) //FAT binary
-		    	eprintf ("FAT Binary\n");
+		if (mh->magic == 0xbebafeca) { //FAT binary
+			eprintf ("FAT Binary\n");
+		}
 		eprintf ("Not mach-o\n");
 		free (ret);
 		return NULL;
@@ -122,8 +124,9 @@ struct r_bin_dyldcache_lib_t *r_bin_dyldcache_extract(struct r_bin_dyldcache_obj
 			/* Patch section offsets */
 			int sect_offset = seg->fileoff - libsz;
 			libsz = dbuf->length;
-			if (!strcmp(seg->segname, "__LINKEDIT"))
+			if (!strcmp (seg->segname, "__LINKEDIT")) {
 				linkedit_offset = sect_offset;
+			}
 			if (seg->nsects > 0) {
 				struct section *sects = (struct section *)((ut8 *)seg + sizeof(struct segment_command));
 				int nsect;
@@ -201,8 +204,9 @@ void r_bin_dydlcache_get_libname(struct r_bin_dyldcache_lib_t *lib, char **libna
 struct r_bin_dyldcache_obj_t* r_bin_dyldcache_new(const char* file) {
 	struct r_bin_dyldcache_obj_t *bin;
 	ut8 *buf;
-	if (!(bin = R_NEW0 (struct r_bin_dyldcache_obj_t)))
+	if (!(bin = R_NEW0 (struct r_bin_dyldcache_obj_t))) {
 		return NULL;
+	}
 	bin->file = file;
 	if (!(buf = (ut8*)r_file_slurp (file, &bin->size))) {
 		return r_bin_dyldcache_free (bin);
@@ -213,23 +217,28 @@ struct r_bin_dyldcache_obj_t* r_bin_dyldcache_new(const char* file) {
 		return r_bin_dyldcache_free (bin);
 	}
 	free (buf);
-	if (!r_bin_dyldcache_init (bin))
+	if (!r_bin_dyldcache_init (bin)) {
 		return r_bin_dyldcache_free (bin);
+	}
 	return bin;
 }
 
 struct r_bin_dyldcache_obj_t* r_bin_dyldcache_from_bytes_new(const ut8* buf, ut64 size) {
 	struct r_bin_dyldcache_obj_t *bin;
-	if (!(bin = malloc (sizeof (struct r_bin_dyldcache_obj_t))))
+	if (!(bin = malloc (sizeof (struct r_bin_dyldcache_obj_t)))) {
 		return NULL;
+	}
 	memset (bin, 0, sizeof (struct r_bin_dyldcache_obj_t));
-	if (!buf)
+	if (!buf) {
 		return r_bin_dyldcache_free (bin);
+	}
 	bin->b = r_buf_new();
-	if (!r_buf_set_bytes (bin->b, buf, size))
+	if (!r_buf_set_bytes (bin->b, buf, size)) {
 		return r_bin_dyldcache_free (bin);
-	if (!r_bin_dyldcache_init (bin))
+	}
+	if (!r_bin_dyldcache_init (bin)) {
 		return r_bin_dyldcache_free (bin);
+	}
 	bin->size = size;
 	return bin;
 }
diff --git a/libr/bin/format/mach0/fatmach0.c b/libr/bin/format/mach0/fatmach0.c
index f67b3bfaf6..70706d9757 100644
--- a/libr/bin/format/mach0/fatmach0.c
+++ b/libr/bin/format/mach0/fatmach0.c
@@ -57,9 +57,10 @@ struct r_bin_fatmach0_arch_t *r_bin_fatmach0_extract(struct r_bin_fatmach0_obj_t
 	if (!bin || (idx < 0) || (idx > bin->nfat_arch)) {
 		return NULL;
 	}
-	if (bin->archs[idx].offset > bin->size || \
-	  bin->archs[idx].offset + bin->archs[idx].size > bin->size)
+	if (bin->archs[idx].offset > bin->size ||
+		bin->archs[idx].offset + bin->archs[idx].size > bin->size) {
 		return NULL;
+	}
 
 	if (narch) {
 		*narch = bin->nfat_arch;
diff --git a/libr/bin/format/mach0/mach0.c b/libr/bin/format/mach0/mach0.c
index 583f632da3..1c55da82f3 100644
--- a/libr/bin/format/mach0/mach0.c
+++ b/libr/bin/format/mach0/mach0.c
@@ -828,8 +828,9 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 	ut8 thc[sizeof (struct thread_command)] = {0};
 	ut8 tmp[4];
 
-	if (off > bin->size || off + sizeof (struct thread_command) > bin->size)
+	if (off > bin->size || off + sizeof (struct thread_command) > bin->size) {
 		return false;
+	}
 
 	len = r_buf_read_at (bin->b, off, thc, 8);
 	if (len < 1) {
@@ -841,12 +842,14 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 		goto wrong_read;
 	}
 	flavor = r_read_ble32 (tmp, bin->big_endian);
-	if (len == -1)
+	if (len == -1) {
 		goto wrong_read;
+	}
 
-	if (off + sizeof (struct thread_command) + sizeof (flavor) > bin->size || \
-	  off + sizeof (struct thread_command) + sizeof (flavor) + sizeof (ut32) > bin->size)
+	if (off + sizeof (struct thread_command) + sizeof (flavor) > bin->size ||
+		off + sizeof (struct thread_command) + sizeof (flavor) + sizeof (ut32) > bin->size) {
 		return false;
+	}
 
 	// TODO: use count for checks
 	if (r_buf_read_at (bin->b, off + sizeof (struct thread_command) + sizeof (flavor), tmp, 4) < 4) {
@@ -855,16 +858,18 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 	count = r_read_ble32 (tmp, bin->big_endian);
 	ptr_thread = off + sizeof (struct thread_command) + sizeof (flavor) + sizeof (count);
 
-	if (ptr_thread > bin->size)
+	if (ptr_thread > bin->size) {
 		return false;
+	}
 
 	switch (bin->hdr.cputype) {
 	case CPU_TYPE_I386:
 	case CPU_TYPE_X86_64:
 		switch (flavor) {
 		case X86_THREAD_STATE32:
-			if (ptr_thread + sizeof (struct x86_thread_state32) > bin->size)
+			if (ptr_thread + sizeof (struct x86_thread_state32) > bin->size) {
 				return false;
+			}
 			if ((len = r_buf_fread_at (bin->b, ptr_thread,
 				(ut8*)&bin->thread_state.x86_32, "16i", 1)) == -1) {
 				bprintf ("Error: read (thread state x86_32)\n");
@@ -876,8 +881,9 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 			arw_sz = sizeof (struct x86_thread_state32);
 			break;
 		case X86_THREAD_STATE64:
-			if (ptr_thread + sizeof (struct x86_thread_state64) > bin->size)
+			if (ptr_thread + sizeof (struct x86_thread_state64) > bin->size) {
 				return false;
+			}
 			if ((len = r_buf_fread_at (bin->b, ptr_thread,
 				(ut8*)&bin->thread_state.x86_64, "32l", 1)) == -1) {
 				bprintf ("Error: read (thread state x86_64)\n");
@@ -894,8 +900,9 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 	case CPU_TYPE_POWERPC:
 	case CPU_TYPE_POWERPC64:
 		if (flavor == X86_THREAD_STATE32) {
-			if (ptr_thread + sizeof (struct ppc_thread_state32) > bin->size)
+			if (ptr_thread + sizeof (struct ppc_thread_state32) > bin->size) {
 				return false;
+			}
 			if ((len = r_buf_fread_at (bin->b, ptr_thread,
 				(ut8*)&bin->thread_state.ppc_32, bin->big_endian?"40I":"40i", 1)) == -1) {
 				bprintf ("Error: read (thread state ppc_32)\n");
@@ -906,8 +913,9 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 			arw_ptr = (ut8 *)&bin->thread_state.ppc_32;
 			arw_sz = sizeof (struct ppc_thread_state32);
 		} else if (flavor == X86_THREAD_STATE64) {
-			if (ptr_thread + sizeof (struct ppc_thread_state64) > bin->size)
+			if (ptr_thread + sizeof (struct ppc_thread_state64) > bin->size) {
 				return false;
+			}
 			if ((len = r_buf_fread_at (bin->b, ptr_thread,
 				(ut8*)&bin->thread_state.ppc_64, bin->big_endian?"34LI3LI":"34li3li", 1)) == -1) {
 				bprintf ("Error: read (thread state ppc_64)\n");
@@ -920,8 +928,9 @@ static int parse_thread(struct MACH0_(obj_t)* bin, struct load_command *lc, ut64
 		}
 		break;
 	case CPU_TYPE_ARM:
-		if (ptr_thread + sizeof (struct arm_thread_state32) > bin->size)
+		if (ptr_thread + sizeof (struct arm_thread_state32) > bin->size) {
 			return false;
+		}
 		if ((len = r_buf_fread_at (bin->b, ptr_thread,
 				(ut8*)&bin->thread_state.arm_32, bin->big_endian?"17I":"17i", 1)) == -1) {
 			bprintf ("Error: read (thread state arm)\n");
@@ -1531,9 +1540,15 @@ struct MACH0_(obj_t)* MACH0_(new_buf)(RBuffer *buf, struct MACH0_(opts_t) *optio
 // perm: r = 4, w = 2, x = 1
 static int prot2perm (int x) {
 	int r = 0;
-	if (x&1) r |= 4;
-	if (x&2) r |= 2;
-	if (x&4) r |= 1;
+	if (x & 1) {
+		r |= 4;
+	}
+	if (x & 2) {
+		r |= 2;
+	}
+	if (x & 4) {
+		r |= 1;
+	}
 	return r;
 }
 
@@ -2080,21 +2095,24 @@ struct reloc_t* MACH0_(get_relocs)(struct MACH0_(obj_t)* bin) {
 					/* empty loop */
 				}
 				sym_ord = -1;
-				if (bin->symtab && bin->dysymtab.nundefsym < 0xffff)
-				for (j = 0; j < bin->dysymtab.nundefsym; j++) {
-					int stridx = 0;
-					int iundefsym = bin->dysymtab.iundefsym;
-					if (iundefsym>=0 && iundefsym < bin->nsymtab) {
-						int sidx = iundefsym +j;
-						if (sidx<0 || sidx>= bin->nsymtab)
-							continue;
-						stridx = bin->symtab[sidx].n_strx;
-						if (stridx < 0 || stridx >= bin->symstrlen)
-							continue;
-					}
-					if (!strcmp ((char *)bin->symstr + stridx, sym_name)) {
-						sym_ord = j;
-						break;
+				if (bin->symtab && bin->dysymtab.nundefsym < 0xffff) {
+					for (j = 0; j < bin->dysymtab.nundefsym; j++) {
+						int stridx = 0;
+						int iundefsym = bin->dysymtab.iundefsym;
+						if (iundefsym >= 0 && iundefsym < bin->nsymtab) {
+							int sidx = iundefsym + j;
+							if (sidx < 0 || sidx >= bin->nsymtab) {
+								continue;
+							}
+							stridx = bin->symtab[sidx].n_strx;
+							if (stridx < 0 || stridx >= bin->symstrlen) {
+								continue;
+							}
+						}
+						if (!strcmp ((char *)bin->symstr + stridx, sym_name)) {
+							sym_ord = j;
+							break;
+						}
 					}
 				}
 				break;
@@ -2326,12 +2344,13 @@ const char* MACH0_(get_intrp)(struct MACH0_(obj_t)* bin) {
 }
 
 const char* MACH0_(get_os)(struct MACH0_(obj_t)* bin) {
-	if (bin)
-	switch (bin->os) {
-	case 1: return "macos";
-	case 2: return "ios";
-	case 3: return "watchos";
-	case 4: return "tvos";
+	if (bin) {
+		switch (bin->os) {
+		case 1: return "macos";
+		case 2: return "ios";
+		case 3: return "watchos";
+		case 4: return "tvos";
+		}
 	}
 	return "darwin";
 }
diff --git a/libr/bin/format/mdmp/mdmp.c b/libr/bin/format/mdmp/mdmp.c
index 774da4e08b..faa62cc6cd 100644
--- a/libr/bin/format/mdmp/mdmp.c
+++ b/libr/bin/format/mdmp/mdmp.c
@@ -27,7 +27,9 @@ struct minidump_memory_info *r_bin_mdmp_get_mem_info(struct r_bin_mdmp_obj *obj,
 	struct minidump_memory_info *mem_info;
 	RListIter *it;
 
-	if (!obj) return NULL;
+	if (!obj) {
+		return NULL;
+	}
 
 	r_list_foreach (obj->streams.memory_infos, it, mem_info) {
 		if (mem_info->allocation_base && vaddr == mem_info->base_address) {
@@ -88,7 +90,9 @@ static void r_bin_mdmp_free_pe64_bin(void *pe_bin_) {
 }
 
 void r_bin_mdmp_free(struct r_bin_mdmp_obj *obj) {
-	if (!obj) return;
+	if (!obj) {
+		return;
+	}
 
 	r_list_free (obj->streams.ex_threads);
 	r_list_free (obj->streams.memories);
diff --git a/libr/bin/format/mz/mz.c b/libr/bin/format/mz/mz.c
index f4535e8607..0c0862c7f9 100644
--- a/libr/bin/format/mz/mz.c
+++ b/libr/bin/format/mz/mz.c
@@ -156,7 +156,9 @@ struct r_bin_mz_reloc_t *r_bin_mz_get_relocs(const struct r_bin_mz_obj_t *bin) {
 			r_bin_mz_seg_to_paddr (bin, rel_entry[i].segment) +
 			rel_entry[i].offset;
 		/* Add only relocations which resides inside dos executable */
-		if (relocs[j].paddr < bin->dos_file_size) j++;
+		if (relocs[j].paddr < bin->dos_file_size) {
+			j++;
+		}
 	}
 	relocs[j].last = 1;
 
diff --git a/libr/bin/format/objc/mach0_classes.c b/libr/bin/format/objc/mach0_classes.c
index 11774c5a5a..c72efb8590 100644
--- a/libr/bin/format/objc/mach0_classes.c
+++ b/libr/bin/format/objc/mach0_classes.c
@@ -785,7 +785,9 @@ static void get_protocol_list_t(mach0_ut p, RBinFile *bf, RBinClass *klass) {
 }
 
 static const char *skipnum(const char *s) {
-	while (IS_DIGIT (*s)) s++;
+	while (IS_DIGIT (*s)) {
+		s++;
+	}
 	return s;
 }
 
diff --git a/libr/bin/format/omf/omf.c b/libr/bin/format/omf/omf.c
index af79edfc62..5b352c8edb 100644
--- a/libr/bin/format/omf/omf.c
+++ b/libr/bin/format/omf/omf.c
@@ -89,7 +89,9 @@ static int load_omf_lnames(OMF_record *record, const ut8 *buf, ut64 buf_size) {
 		int next;
 		ret->nb_elem++;
 		next = buf[3 + tmp_size] + 1;
-		if (next<1) break;
+		if (next < 1) {
+			break;
+		}
 		tmp_size += next;
 	}
 	if (!(ret->elems = R_NEWS0 (char *, ret->nb_elem + 1))) {
@@ -338,8 +340,9 @@ static int load_omf_data(const ut8 *buf, int buf_size, OMF_record *record, ut64
 		offset = r_read_le16 (buf + ct);
 		ct += 2;
 	}
-	if (!(ret = R_NEW0 (OMF_data)))
+	if (!(ret = R_NEW0 (OMF_data))) {
 		return false;
+	}
 	record->content = ret;
 
 	ret->size = record->size - 1 - (ct - 3);
@@ -433,8 +436,9 @@ static ut32 count_omf_record_type(r_bin_omf_obj *obj, ut8 type) {
 	ut32 ct = 0;
 
 	while (tmp) {
-		if (((OMF_record *)tmp)->type == type)
+		if (((OMF_record *)tmp)->type == type) {
 			ct++;
+		}
 		tmp = tmp->next;
 	}
 	return ct;
@@ -445,8 +449,9 @@ static ut32 count_omf_multi_record_type(r_bin_omf_obj *obj, ut8 type) {
 	ut32 ct = 0;
 
 	while (tmp) {
-		if (((OMF_record *)tmp)->type == type)
-			ct += ((OMF_multi_datas*)((OMF_record *)tmp)->content)->nb_elem;
+		if (((OMF_record *)tmp)->type == type) {
+			ct += ((OMF_multi_datas *)((OMF_record *)tmp)->content)->nb_elem;
+		}
 		tmp = tmp->next;
 	}
 	return ct;
@@ -454,8 +459,9 @@ static ut32 count_omf_multi_record_type(r_bin_omf_obj *obj, ut8 type) {
 
 static OMF_record_handler *get_next_omf_record_type(OMF_record_handler *tmp, ut8 type) {
 	while (tmp) {
-		if (((OMF_record *)tmp)->type == type)
+		if (((OMF_record *)tmp)->type == type) {
 			return (tmp);
+		}
 		tmp = tmp->next;
 	}
 	return NULL;
@@ -513,8 +519,9 @@ static int get_omf_symbol_info(r_bin_omf_obj *obj) {
 
 		ct_rec = -1;
 		while (++ct_rec < symbols->nb_elem) {
-			if(!(obj->symbols[ct_obj] = R_NEW0(OMF_symbol)))
+			if (!(obj->symbols[ct_obj] = R_NEW0 (OMF_symbol))) {
 				return false;
+			}
 			memcpy(obj->symbols[ct_obj], ((OMF_symbol *)symbols->elems) + ct_rec, sizeof(*(obj->symbols[ct_obj])));
 			obj->symbols[ct_obj]->name = strdup(((OMF_symbol *)symbols->elems)[ct_rec].name);
 			ct_obj++;
@@ -535,8 +542,9 @@ static int get_omf_data_info(r_bin_omf_obj *obj) {
 		}
 		OMF_segment *os = obj->sections[((OMF_data *)((OMF_record *)tmp)->content)->seg_idx - 1];
 		if (os && (tmp_data = os->data)) {
-			while (tmp_data->next)
+			while (tmp_data->next) {
 				tmp_data = tmp_data->next;
+			}
 			tmp_data->next = ((OMF_record *)tmp)->content;
 		} else {
 			obj->sections[((OMF_data *)((OMF_record *)tmp)->content)->seg_idx - 1]->data = ((OMF_record *)tmp)->content;
@@ -561,8 +569,9 @@ static int get_omf_infos(r_bin_omf_obj *obj) {
 	// get all sections (segdef record)
 	obj->nb_section = count_omf_record_type (obj, OMF_SEGDEF);
 	if (obj->nb_section>0) {
-		if (!(obj->sections = R_NEWS0 (OMF_segment *, obj->nb_section)))
+		if (!(obj->sections = R_NEWS0 (OMF_segment *, obj->nb_section))) {
 			return false;
+		}
 		get_omf_section_info (obj);
 	}
 	// get all data (ledata record)
diff --git a/libr/bin/format/p9/p9bin.c b/libr/bin/format/p9/p9bin.c
index 962a714027..b76015b583 100644
--- a/libr/bin/format/p9/p9bin.c
+++ b/libr/bin/format/p9/p9bin.c
@@ -5,21 +5,31 @@
 
 int r_bin_p9_get_arch(const ut8 *b, int *bits, int *big_endian) {
 	st32 a = (st32) r_read_be32 (b);
-	if (bits) *bits = 32;
-	if (big_endian) *big_endian = 0;
+	if (bits) {
+		*bits = 32;
+	}
+	if (big_endian) {
+		*big_endian = 0;
+	}
 	switch (a) {
 	case I_MAGIC:
 		return R_ASM_ARCH_X86;
 	case T_MAGIC:
-		if (bits) *bits = 64;
+		if (bits) {
+			*bits = 64;
+		}
 		return R_ASM_ARCH_PPC;
 	case S_MAGIC:
-		if (bits) *bits = 64;
+		if (bits) {
+			*bits = 64;
+		}
 		return R_ASM_ARCH_X86;
 	case K_MAGIC:
 		return R_ASM_ARCH_SPARC;
 	case U_MAGIC:
-		if (bits) *bits = 64;
+		if (bits) {
+			*bits = 64;
+		}
 		return R_ASM_ARCH_SPARC;
 	case V_MAGIC:
 	case M_MAGIC:
diff --git a/libr/bin/format/te/te.c b/libr/bin/format/te/te.c
index 941eeaa9b5..0cd2de995e 100644
--- a/libr/bin/format/te/te.c
+++ b/libr/bin/format/te/te.c
@@ -9,14 +9,16 @@
 #include "te.h"
 
 ut64 r_bin_te_get_stripped_delta(struct r_bin_te_obj_t *bin) {
-	if (bin && bin->header)
-		return bin->header->StrippedSize - sizeof(TE_image_file_header);
+	if (bin && bin->header) {
+		return bin->header->StrippedSize - sizeof (TE_image_file_header);
+	}
 	return 0LL;
 }
 
 static int r_bin_te_init_hdr(struct r_bin_te_obj_t *bin) {
-	if (!bin)
+	if (!bin) {
 		return false;
+	}
 	if (!(bin->header = malloc (sizeof(TE_image_file_header)))) {
 		r_sys_perror ("malloc (header)");
 		return false;
@@ -56,8 +58,9 @@ static int r_bin_te_init_hdr(struct r_bin_te_obj_t *bin) {
 	sdb_set (bin->kv, "te_directory2_header.format", "xx"
 		" VirtualAddress Size", 0);
 
-	if (strncmp ((char*)&bin->header->Signature, "VZ", 2))
-			return false;
+	if (strncmp ((char *)&bin->header->Signature, "VZ", 2)) {
+		return false;
+	}
 	return true;
 }
 
@@ -93,8 +96,9 @@ static TE_DWord r_bin_te_vaddr_to_paddr(struct r_bin_te_obj_t* bin, TE_DWord vad
 	for (i = 0; i < bin->header->NumberOfSections; i++) {
 		section_base = bin->section_header[i].VirtualAddress;
 		section_size = bin->section_header[i].VirtualSize;
-		if (vaddr >= section_base && vaddr < section_base + section_size)
+		if (vaddr >= section_base && vaddr < section_base + section_size) {
 			return bin->section_header[i].PointerToRawData + (vaddr - section_base);
+		}
 	}
 	return 0;
 }
@@ -134,7 +138,9 @@ static int r_bin_te_init(struct r_bin_te_obj_t* bin) {
 
 char* r_bin_te_get_arch(struct r_bin_te_obj_t* bin) {
 	char *arch;
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	switch (bin->header->Machine) {
 	case TE_IMAGE_FILE_MACHINE_ALPHA:
 	case TE_IMAGE_FILE_MACHINE_ALPHA64:
@@ -171,29 +177,34 @@ int r_bin_te_get_bits(struct r_bin_te_obj_t* bin) {
 RBinAddr* r_bin_te_get_entrypoint(struct r_bin_te_obj_t* bin) {
 	RBinAddr *entry = NULL;
 
-	if (!bin || !bin->header)
+	if (!bin || !bin->header) {
 		return NULL;
+	}
 	if (!(entry = malloc (sizeof (RBinAddr)))) {
 		perror("malloc (entrypoint)");
 		return NULL;
 	}
 	entry->vaddr = bin->header->AddressOfEntryPoint - r_bin_te_get_stripped_delta (bin);
-	if (entry->vaddr == 0) // in TE if EP = 0 then EP = baddr
+	if (entry->vaddr == 0) { // in TE if EP = 0 then EP = baddr
 		entry->vaddr = bin->header->ImageBase;
+	}
 	entry->paddr = r_bin_te_vaddr_to_paddr (bin, entry->vaddr);
 	return entry;
 }
 
 ut64 r_bin_te_get_image_base(struct r_bin_te_obj_t* bin)
 {
-	if (bin && bin->header)
+	if (bin && bin->header) {
 		return (ut64)bin->header->ImageBase;
+	}
 	return 0LL;
 }
 
 char* r_bin_te_get_machine(struct r_bin_te_obj_t* bin) {
 	char *machine;
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	switch (bin->header->Machine) {
 	case TE_IMAGE_FILE_MACHINE_ALPHA:
 		machine = strdup ("Alpha");
@@ -287,7 +298,9 @@ char* r_bin_te_get_machine(struct r_bin_te_obj_t* bin) {
 
 char* r_bin_te_get_os(struct r_bin_te_obj_t* bin) {
 	char *os;
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 
 	switch (bin->header->Subsystem) {
 	case TE_IMAGE_SUBSYSTEM_NATIVE:
@@ -321,7 +334,9 @@ struct r_bin_te_section_t* r_bin_te_get_sections(struct r_bin_te_obj_t* bin) {
 	struct r_bin_te_section_t *sections = NULL;
 	TE_image_section_header *shdr;
 	int i, sections_count;
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	shdr = bin->section_header;
 	sections_count = bin->header->NumberOfSections;
 
@@ -347,7 +362,9 @@ struct r_bin_te_section_t* r_bin_te_get_sections(struct r_bin_te_obj_t* bin) {
 char* r_bin_te_get_subsystem(struct r_bin_te_obj_t* bin) {
 	char *subsystem;
 
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	switch (bin->header->Subsystem) {
 	case TE_IMAGE_SUBSYSTEM_NATIVE:
 		subsystem = strdup ("Native");
@@ -386,7 +403,9 @@ char* r_bin_te_get_subsystem(struct r_bin_te_obj_t* bin) {
 }
 
 void* r_bin_te_free(struct r_bin_te_obj_t* bin) {
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	free (bin->header);
 	free (bin->section_header);
 	r_buf_free (bin->b);
@@ -397,31 +416,38 @@ void* r_bin_te_free(struct r_bin_te_obj_t* bin) {
 struct r_bin_te_obj_t* r_bin_te_new(const char* file) {
 	ut8 *buf;
 	struct r_bin_te_obj_t *bin = R_NEW0 (struct r_bin_te_obj_t);
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	bin->file = file;
-	if (!(buf = (ut8*)r_file_slurp (file, &bin->size)))
+	if (!(buf = (ut8 *)r_file_slurp (file, &bin->size))) {
 		return r_bin_te_free (bin);
+	}
 	bin->b = r_buf_new ();
 	if (!r_buf_set_bytes (bin->b, buf, bin->size)) {
 		free (buf);
 		return r_bin_te_free (bin);
 	}
 	free (buf);
-	if (!r_bin_te_init (bin))
+	if (!r_bin_te_init (bin)) {
 		return r_bin_te_free (bin);
+	}
 	return bin;
 }
 
 struct r_bin_te_obj_t* r_bin_te_new_buf(struct r_buf_t *buf) {
 	struct r_bin_te_obj_t *bin = R_NEW0 (struct r_bin_te_obj_t);
-	if (!bin) return NULL;
+	if (!bin) {
+		return NULL;
+	}
 	bin->kv = sdb_new0 ();
 	bin->b = r_buf_new ();
 	bin->size = buf->length;
 	if (!r_buf_set_bytes (bin->b, buf->buf, bin->size)){
 		return r_bin_te_free (bin);
 	}
-	if (!r_bin_te_init (bin))
+	if (!r_bin_te_init (bin)) {
 		return r_bin_te_free (bin);
+	}
 	return bin;
 }
diff --git a/libr/bin/format/wasm/wasm.c b/libr/bin/format/wasm/wasm.c
index 086cb420a9..32dd0ee055 100644
--- a/libr/bin/format/wasm/wasm.c
+++ b/libr/bin/format/wasm/wasm.c
@@ -145,7 +145,9 @@ static size_t consume_locals_r (RBuffer *b, ut64 max, RBinWasmCodeEntry *out) {
 		}
 		j++;
 	}
-	if (j != count) goto beach;
+	if (j != count) {
+		goto beach;
+	}
 	return j;
 beach:
 	free (out->locals);
diff --git a/libr/bin/mangling/cxx.c b/libr/bin/mangling/cxx.c
index d1b917701f..ea8455f1dd 100644
--- a/libr/bin/mangling/cxx.c
+++ b/libr/bin/mangling/cxx.c
@@ -3,10 +3,12 @@
 #include <r_bin.h>
 
 static bool is_cxx_symbol (const char *name) {
-	if (!strncmp (name, "_Z", 2)) 
+	if (!strncmp (name, "_Z", 2)) {
 		return true;
-	if (!strncmp (name, "__Z", 3))
+	}
+	if (!strncmp (name, "__Z", 3)) {
 		return true;
+	}
 	return false;
 }
 
@@ -18,8 +20,9 @@ R_API bool r_bin_lang_cxx(RBinFile *binfile) {
 	bool hascxx = false;
 	const char *lib;
 
-	if (!info)
+	if (!info) {
 		return false;
+	}
 	r_list_foreach (o->libs, iter, lib) {
 		if (strstr (lib, "stdc++")) {
 			hascxx = true;
@@ -34,7 +37,8 @@ R_API bool r_bin_lang_cxx(RBinFile *binfile) {
 			}
 		}
 	}
-	if (hascxx)
+	if (hascxx) {
 		info->lang = "cxx";
+	}
 	return hascxx;
 }
diff --git a/libr/bin/mangling/cxx/cp-demangle.c b/libr/bin/mangling/cxx/cp-demangle.c
index a3a37e8886..3c72715f55 100644
--- a/libr/bin/mangling/cxx/cp-demangle.c
+++ b/libr/bin/mangling/cxx/cp-demangle.c
@@ -734,12 +734,13 @@ CP_STATIC_IF_GLIBCPP_V3
 int
 cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
 {
-  if (!p || !s || len == 0)
-    return 0;
-  p->type = DEMANGLE_COMPONENT_NAME;
-  p->u.s_name.s = s;
-  p->u.s_name.len = len;
-  return 1;
+	if (!p || !s || len == 0) {
+		return 0;
+	}
+	p->type = DEMANGLE_COMPONENT_NAME;
+	p->u.s_name.s = s;
+	p->u.s_name.len = len;
+	return 1;
 }
 
 /* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR.  */
@@ -749,12 +750,13 @@ int
 cplus_demangle_fill_extended_operator (struct demangle_component *p, int args,
                                        struct demangle_component *name)
 {
-  if (!p || args < 0 || !name)
-    return 0;
-  p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR;
-  p->u.s_extended_operator.args = args;
-  p->u.s_extended_operator.name = name;
-  return 1;
+	if (!p || args < 0 || !name) {
+		return 0;
+	}
+	p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR;
+	p->u.s_extended_operator.args = args;
+	p->u.s_extended_operator.name = name;
+	return 1;
 }
 
 /* Fill in a DEMANGLE_COMPONENT_CTOR.  */
@@ -765,15 +767,13 @@ cplus_demangle_fill_ctor (struct demangle_component *p,
                           enum gnu_v3_ctor_kinds kind,
                           struct demangle_component *name)
 {
-  if (!p
-      || !name
-      || (int) kind < gnu_v3_complete_object_ctor
-      || (int) kind > gnu_v3_object_ctor_group)
-    return 0;
-  p->type = DEMANGLE_COMPONENT_CTOR;
-  p->u.s_ctor.kind = kind;
-  p->u.s_ctor.name = name;
-  return 1;
+	if (!p || !name || (int)kind < gnu_v3_complete_object_ctor || (int)kind > gnu_v3_object_ctor_group) {
+		return 0;
+	}
+	p->type = DEMANGLE_COMPONENT_CTOR;
+	p->u.s_ctor.kind = kind;
+	p->u.s_ctor.name = name;
+	return 1;
 }
 
 /* Fill in a DEMANGLE_COMPONENT_DTOR.  */
@@ -784,15 +784,13 @@ cplus_demangle_fill_dtor (struct demangle_component *p,
                           enum gnu_v3_dtor_kinds kind,
                           struct demangle_component *name)
 {
-  if (!p
-      || !name
-      || (int) kind < gnu_v3_deleting_dtor
-      || (int) kind > gnu_v3_object_dtor_group)
-    return 0;
-  p->type = DEMANGLE_COMPONENT_DTOR;
-  p->u.s_dtor.kind = kind;
-  p->u.s_dtor.name = name;
-  return 1;
+	if (!p || !name || (int)kind < gnu_v3_deleting_dtor || (int)kind > gnu_v3_object_dtor_group) {
+		return 0;
+	}
+	p->type = DEMANGLE_COMPONENT_DTOR;
+	p->u.s_dtor.kind = kind;
+	p->u.s_dtor.name = name;
+	return 1;
 }
 
 /* Add a new component.  */
@@ -802,8 +800,9 @@ d_make_empty (struct d_info *di)
 {
   struct demangle_component *p;
 
-  if (di->next_comp >= di->num_comps)
-    return NULL;
+  if (di->next_comp >= di->num_comps) {
+	  return NULL;
+  }
   p = &di->comps[di->next_comp];
   ++di->next_comp;
   return p;
@@ -842,11 +841,12 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
     case DEMANGLE_COMPONENT_COMPOUND_NAME:
     case DEMANGLE_COMPONENT_VECTOR_TYPE:
     case DEMANGLE_COMPONENT_CLONE:
-      if (!left || !right)
-	return NULL;
-      break;
+	    if (!left || !right) {
+		    return NULL;
+	    }
+	    break;
 
-      /* These types only require one parameter.  */
+	    /* These types only require one parameter.  */
     case DEMANGLE_COMPONENT_VTABLE:
     case DEMANGLE_COMPONENT_VTT:
     case DEMANGLE_COMPONENT_TYPEINFO:
@@ -877,19 +877,21 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
     case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
     case DEMANGLE_COMPONENT_NULLARY:
     case DEMANGLE_COMPONENT_TRINARY_ARG2:
-      if (!left)
-	return NULL;
-      break;
+	    if (!left) {
+		    return NULL;
+	    }
+	    break;
 
-      /* This needs a right parameter, but the left parameter can be
+	    /* This needs a right parameter, but the left parameter can be
 	 empty.  */
     case DEMANGLE_COMPONENT_ARRAY_TYPE:
     case DEMANGLE_COMPONENT_INITIALIZER_LIST:
-      if (!right)
-	return NULL;
-      break;
+	    if (!right) {
+		    return NULL;
+	    }
+	    break;
 
-      /* These are allowed to have no parameters--in some cases they
+	    /* These are allowed to have no parameters--in some cases they
 	 will be filled in later.  */
     case DEMANGLE_COMPONENT_FUNCTION_TYPE:
     case DEMANGLE_COMPONENT_RESTRICT:
@@ -924,10 +926,11 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
 static struct demangle_component *
 d_make_demangle_mangled_name (struct d_info *di, const char *s)
 {
-  if (d_peek_char (di) != '_' || d_peek_next_char (di) != 'Z')
-    return d_make_name (di, s, strlen (s));
-  d_advance (di, 2);
-  return d_encoding (di, 0);
+	if (d_peek_char (di) != '_' || d_peek_next_char (di) != 'Z') {
+		return d_make_name (di, s, strlen (s));
+	}
+	d_advance (di, 2);
+	return d_encoding (di, 0);
 }
 
 /* Add a new name component.  */
@@ -938,8 +941,9 @@ d_make_name (struct d_info *di, const char *s, int len)
   struct demangle_component *p;
 
   p = d_make_empty (di);
-  if (! cplus_demangle_fill_name (p, s, len))
-    return NULL;
+  if (!cplus_demangle_fill_name (p, s, len)) {
+	  return NULL;
+  }
   return p;
 }
 
@@ -951,8 +955,9 @@ d_make_builtin_type (struct d_info *di,
 {
   struct demangle_component *p;
 
-  if (!type)
-    return NULL;
+  if (!type) {
+	  return NULL;
+  }
   p = d_make_empty (di);
   if (p != NULL)
     {
@@ -987,8 +992,9 @@ d_make_extended_operator (struct d_info *di, int args,
   struct demangle_component *p;
 
   p = d_make_empty (di);
-  if (! cplus_demangle_fill_extended_operator (p, args, name))
-    return NULL;
+  if (!cplus_demangle_fill_extended_operator (p, args, name)) {
+	  return NULL;
+  }
   return p;
 }
 
@@ -1015,8 +1021,9 @@ d_make_ctor (struct d_info *di, enum gnu_v3_ctor_kinds kind,
   struct demangle_component *p;
 
   p = d_make_empty (di);
-  if (! cplus_demangle_fill_ctor (p, kind, name))
-    return NULL;
+  if (!cplus_demangle_fill_ctor (p, kind, name)) {
+	  return NULL;
+  }
   return p;
 }
 
@@ -1029,8 +1036,9 @@ d_make_dtor (struct d_info *di, enum gnu_v3_dtor_kinds kind,
   struct demangle_component *p;
 
   p = d_make_empty (di);
-  if (! cplus_demangle_fill_dtor (p, kind, name))
-    return NULL;
+  if (!cplus_demangle_fill_dtor (p, kind, name)) {
+	  return NULL;
+  }
   return p;
 }
 
@@ -1093,24 +1101,25 @@ cplus_demangle_mangled_name (struct d_info *di, int top_level)
 {
   struct demangle_component *p;
 
-  if (! d_check_char (di, '_')
-      /* Allow missing _ if not at toplevel to work around a
+  if (!d_check_char (di, '_')
+	  /* Allow missing _ if not at toplevel to work around a
 	 bug in G++ abi-version=2 mangling; see the comment in
 	 write_template_arg.  */
-      && top_level)
-    return NULL;
-  if (! d_check_char (di, 'Z'))
-    return NULL;
+	  && top_level) {
+	  return NULL;
+  }
+  if (!d_check_char (di, 'Z')) {
+	  return NULL;
+  }
   p = d_encoding (di, top_level);
 
   /* If at top level and parsing parameters, check for a clone
      suffix.  */
-  if (top_level && (di->options & DMGL_PARAMS) != 0)
-    while (d_peek_char (di) == '.'
-	   && (IS_LOWER (d_peek_next_char (di))
-	       || d_peek_next_char (di) == '_'
-	       || IS_DIGIT (d_peek_next_char (di))))
-      p = d_clone_suffix (di, p);
+  if (top_level && (di->options & DMGL_PARAMS) != 0) {
+	  while (d_peek_char (di) == '.' && (IS_LOWER (d_peek_next_char (di)) || d_peek_next_char (di) == '_' || IS_DIGIT (d_peek_next_char (di)))) {
+		  p = d_clone_suffix (di, p);
+	  }
+  }
 
   return p;
 }
@@ -1127,20 +1136,20 @@ cplus_demangle_mangled_name (struct d_info *di, int top_level)
 static int
 has_return_type (struct demangle_component *dc)
 {
-  if (!dc)
-    return 0;
-  switch (dc->type)
-    {
-    default:
-      return 0;
-    case DEMANGLE_COMPONENT_TEMPLATE:
-      return ! is_ctor_dtor_or_conversion (d_left (dc));
-    case DEMANGLE_COMPONENT_RESTRICT_THIS:
-    case DEMANGLE_COMPONENT_VOLATILE_THIS:
-    case DEMANGLE_COMPONENT_CONST_THIS:
-    case DEMANGLE_COMPONENT_REFERENCE_THIS:
-    case DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS:
-      return has_return_type (d_left (dc));
+	if (!dc) {
+		return 0;
+	}
+	switch (dc->type) {
+	default:
+		return 0;
+	case DEMANGLE_COMPONENT_TEMPLATE:
+		return !is_ctor_dtor_or_conversion (d_left (dc));
+	case DEMANGLE_COMPONENT_RESTRICT_THIS:
+	case DEMANGLE_COMPONENT_VOLATILE_THIS:
+	case DEMANGLE_COMPONENT_CONST_THIS:
+	case DEMANGLE_COMPONENT_REFERENCE_THIS:
+	case DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS:
+		return has_return_type (d_left (dc));
     }
 }
 
@@ -1150,19 +1159,19 @@ has_return_type (struct demangle_component *dc)
 static int
 is_ctor_dtor_or_conversion (struct demangle_component *dc)
 {
-  if (!dc)
-    return 0;
-  switch (dc->type)
-    {
-    default:
-      return 0;
-    case DEMANGLE_COMPONENT_QUAL_NAME:
-    case DEMANGLE_COMPONENT_LOCAL_NAME:
-      return is_ctor_dtor_or_conversion (d_right (dc));
-    case DEMANGLE_COMPONENT_CTOR:
-    case DEMANGLE_COMPONENT_DTOR:
-    case DEMANGLE_COMPONENT_CAST:
-      return 1;
+	if (!dc) {
+		return 0;
+	}
+	switch (dc->type) {
+	default:
+		return 0;
+	case DEMANGLE_COMPONENT_QUAL_NAME:
+	case DEMANGLE_COMPONENT_LOCAL_NAME:
+		return is_ctor_dtor_or_conversion (d_right (dc));
+	case DEMANGLE_COMPONENT_CTOR:
+	case DEMANGLE_COMPONENT_DTOR:
+	case DEMANGLE_COMPONENT_CAST:
+		return 1;
     }
 }
 
@@ -1180,52 +1189,44 @@ d_encoding (struct d_info *di, int top_level)
 {
   char peek = d_peek_char (di);
 
-  if (peek == 'G' || peek == 'T')
-    return d_special_name (di);
-  else
-    {
-      struct demangle_component *dc;
+  if (peek == 'G' || peek == 'T') {
+	  return d_special_name (di);
+  } else {
+	  struct demangle_component *dc;
 
-      dc = d_name (di);
+	  dc = d_name (di);
 
-      if (dc != NULL && top_level && (di->options & DMGL_PARAMS) == 0)
-	{
-	  /* Strip off any initial CV-qualifiers, as they really apply
+	  if (dc != NULL && top_level && (di->options & DMGL_PARAMS) == 0) {
+		  /* Strip off any initial CV-qualifiers, as they really apply
 	     to the `this' parameter, and they were not output by the
 	     v2 demangler without DMGL_PARAMS.  */
-	  while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS
-		 || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS
-		 || dc->type == DEMANGLE_COMPONENT_CONST_THIS
-		 || dc->type == DEMANGLE_COMPONENT_REFERENCE_THIS
-		 || dc->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS)
-	    dc = d_left (dc);
+		  while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS || dc->type == DEMANGLE_COMPONENT_CONST_THIS || dc->type == DEMANGLE_COMPONENT_REFERENCE_THIS || dc->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS) {
+			  dc = d_left (dc);
+		  }
 
-	  /* If the top level is a DEMANGLE_COMPONENT_LOCAL_NAME, then
+		  /* If the top level is a DEMANGLE_COMPONENT_LOCAL_NAME, then
 	     there may be CV-qualifiers on its right argument which
 	     really apply here; this happens when parsing a class
 	     which is local to a function.  */
-	  if (dc->type == DEMANGLE_COMPONENT_LOCAL_NAME)
-	    {
-	      struct demangle_component *dcr;
+		  if (dc->type == DEMANGLE_COMPONENT_LOCAL_NAME) {
+			  struct demangle_component *dcr;
 
-	      dcr = d_right (dc);
-	      while (dcr->type == DEMANGLE_COMPONENT_RESTRICT_THIS
-		     || dcr->type == DEMANGLE_COMPONENT_VOLATILE_THIS
-		     || dcr->type == DEMANGLE_COMPONENT_CONST_THIS
-		     || dcr->type == DEMANGLE_COMPONENT_REFERENCE_THIS
-		     || dcr->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS)
-		dcr = d_left (dcr);
-	      dc->u.s_binary.right = dcr;
-	    }
+			  dcr = d_right (dc);
+			  while (dcr->type == DEMANGLE_COMPONENT_RESTRICT_THIS || dcr->type == DEMANGLE_COMPONENT_VOLATILE_THIS || dcr->type == DEMANGLE_COMPONENT_CONST_THIS || dcr->type == DEMANGLE_COMPONENT_REFERENCE_THIS || dcr->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS) {
+				  dcr = d_left (dcr);
+			  }
+			  dc->u.s_binary.right = dcr;
+		  }
 
-	  return dc;
-	}
+		  return dc;
+	  }
 
-      peek = d_peek_char (di);
-      if (!dc || peek == '\0' || peek == 'E')
-	return dc;
-      return d_make_comp (di, DEMANGLE_COMPONENT_TYPED_NAME, dc,
-			  d_bare_function_type (di, has_return_type (dc)));
+	  peek = d_peek_char (di);
+	  if (!dc || peek == '\0' || peek == 'E') {
+		  return dc;
+	  }
+	  return d_make_comp (di, DEMANGLE_COMPONENT_TYPED_NAME, dc,
+		  d_bare_function_type (di, has_return_type (dc)));
     }
 }
 
@@ -1308,8 +1309,9 @@ d_name (struct d_info *di)
 	       substitution.  */
 	    if (! subst)
 	      {
-		if (! d_add_substitution (di, dc))
-		  return NULL;
+		    if (!d_add_substitution (di, dc)) {
+			    return NULL;
+		    }
 	      }
 	    dc = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, dc,
 			      d_template_args (di));
@@ -1326,8 +1328,9 @@ d_name (struct d_info *di)
 	  /* This is <template-args>, which means that we just saw
 	     <unscoped-template-name>, which is a substitution
 	     candidate.  */
-	  if (! d_add_substitution (di, dc))
-	    return NULL;
+	  if (!d_add_substitution (di, dc)) {
+		  return NULL;
+	  }
 	  dc = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, dc,
 			    d_template_args (di));
 	}
@@ -1346,20 +1349,23 @@ d_nested_name (struct d_info *di)
   struct demangle_component **pret;
   struct demangle_component *rqual;
 
-  if (! d_check_char (di, 'N'))
-    return NULL;
+  if (!d_check_char (di, 'N')) {
+	  return NULL;
+  }
 
   pret = d_cv_qualifiers (di, &ret, 1);
-  if (!pret)
-    return NULL;
+  if (!pret) {
+	  return NULL;
+  }
 
   /* Parse the ref-qualifier now and then attach it
      once we have something to attach it to.  */
   rqual = d_ref_qualifier (di, NULL);
 
   *pret = d_prefix (di);
-  if (!*pret)
-    return NULL;
+  if (!*pret) {
+	  return NULL;
+  }
 
   if (rqual)
     {
@@ -1367,10 +1373,11 @@ d_nested_name (struct d_info *di)
       ret = rqual;
     }
 
-  if (! d_check_char (di, 'E'))
-    return NULL;
+    if (!d_check_char (di, 'E')) {
+	    return NULL;
+    }
 
-  return ret;
+    return ret;
 }
 
 /* <prefix> ::= <prefix> <unqualified-name>
@@ -1397,8 +1404,9 @@ d_prefix (struct d_info *di)
       struct demangle_component *dc;
 
       peek = d_peek_char (di);
-      if (peek == '\0')
-	return NULL;
+      if (peek == '\0') {
+	      return NULL;
+      }
 
       /* The older code accepts a <local-name> here, but I don't see
 	 that in the grammar.  The older code does not accept a
@@ -1408,54 +1416,51 @@ d_prefix (struct d_info *di)
       if (peek == 'D')
 	{
 	  char peek2 = d_peek_next_char (di);
-	  if (peek2 == 'T' || peek2 == 't')
-	    /* Decltype.  */
-	    dc = cplus_demangle_type (di);
-	  else
-	    /* Destructor name.  */
-	    dc = d_unqualified_name (di);
-	}
-      else if (IS_DIGIT (peek)
-	  || IS_LOWER (peek)
-	  || peek == 'C'
-	  || peek == 'U'
-	  || peek == 'L')
-	dc = d_unqualified_name (di);
-      else if (peek == 'S')
-	dc = d_substitution (di, 1);
-      else if (peek == 'I')
-	{
-	  if (!ret)
-	    return NULL;
-	  comb_type = DEMANGLE_COMPONENT_TEMPLATE;
-	  dc = d_template_args (di);
-	}
-      else if (peek == 'T')
-	dc = d_template_param (di);
-      else if (peek == 'E')
-	return ret;
-      else if (peek == 'M')
-	{
-	  /* Initializer scope for a lambda.  We don't need to represent
+	  if (peek2 == 'T' || peek2 == 't') {
+		  /* Decltype.  */
+		  dc = cplus_demangle_type (di);
+	  } else {
+		  /* Destructor name.  */
+		  dc = d_unqualified_name (di);
+	  }
+      } else if (IS_DIGIT (peek) || IS_LOWER (peek) || peek == 'C' || peek == 'U' || peek == 'L') {
+	      dc = d_unqualified_name (di);
+      } else if (peek == 'S') {
+	      dc = d_substitution (di, 1);
+      } else if (peek == 'I') {
+	      if (!ret) {
+		      return NULL;
+	      }
+	      comb_type = DEMANGLE_COMPONENT_TEMPLATE;
+	      dc = d_template_args (di);
+      } else if (peek == 'T') {
+	      dc = d_template_param (di);
+      } else if (peek == 'E') {
+	      return ret;
+      } else if (peek == 'M') {
+	      /* Initializer scope for a lambda.  We don't need to represent
 	     this; the normal code will just treat the variable as a type
 	     scope, which gives appropriate output.  */
-	  if (!ret)
-	    return NULL;
-	  d_advance (di, 1);
-	  continue;
-	}
-      else
-	return NULL;
+	      if (!ret) {
+		      return NULL;
+	      }
+	      d_advance (di, 1);
+	      continue;
+      } else {
+	      return NULL;
+      }
 
-      if (!ret)
-	ret = dc;
-      else
-	ret = d_make_comp (di, comb_type, ret, dc);
+      if (!ret) {
+	      ret = dc;
+      } else {
+	      ret = d_make_comp (di, comb_type, ret, dc);
+      }
 
       if (peek != 'S' && d_peek_char (di) != 'E')
 	{
-	  if (! d_add_substitution (di, ret))
-	    return NULL;
+	      if (!d_add_substitution (di, ret)) {
+		      return NULL;
+	      }
 	}
     }
 }
@@ -1478,30 +1483,29 @@ d_unqualified_name (struct d_info *di)
   if (!peek) {
     return NULL;
   }
-  if (IS_DIGIT (peek))
-    ret = d_source_name (di);
-  else if (IS_LOWER (peek))
-    {
-      ret = d_operator_name (di);
-      if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR)
-	{
-	  di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
-	  if (!strcmp (ret->u.s_operator.op->code, "li"))
-	    ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret,
-			       d_source_name (di));
-	}
-    }
-  else if (peek == 'C' || peek == 'D')
-    ret = d_ctor_dtor_name (di);
-  else if (peek == 'L')
-    {
-      d_advance (di, 1);
+  if (IS_DIGIT (peek)) {
+	  ret = d_source_name (di);
+  } else if (IS_LOWER (peek)) {
+	  ret = d_operator_name (di);
+	  if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR) {
+		  di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
+		  if (!strcmp (ret->u.s_operator.op->code, "li")) {
+			  ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret,
+				  d_source_name (di));
+		  }
+	  }
+  } else if (peek == 'C' || peek == 'D') {
+	  ret = d_ctor_dtor_name (di);
+  } else if (peek == 'L') {
+	  d_advance (di, 1);
 
-      ret = d_source_name (di);
-      if (!ret)
-	return NULL;
-      if (! d_discriminator (di))
-	return NULL;
+	  ret = d_source_name (di);
+	  if (!ret) {
+		  return NULL;
+	  }
+	  if (!d_discriminator (di)) {
+		  return NULL;
+	  }
     }
   else if (peek == 'U')
     {
@@ -1516,13 +1520,13 @@ d_unqualified_name (struct d_info *di)
 	default:
 	  return NULL;
 	}
+    } else {
+	    return NULL;
     }
-  else
-    return NULL;
 
-  peek = d_peek_char (di);
-  if (peek == 'B') {
-    ret = d_abi_tags (di, ret);
+    peek = d_peek_char (di);
+    if (peek == 'B') {
+	    ret = d_abi_tags (di, ret);
   }
   return ret;
 }
@@ -1536,8 +1540,9 @@ d_source_name (struct d_info *di)
   struct demangle_component *ret;
 
   len = d_number (di);
-  if (len <= 0)
-    return NULL;
+  if (len <= 0) {
+	  return NULL;
+  }
   ret = d_identifier (di, len);
   di->last_name = ret;
   return ret;
@@ -1569,9 +1574,10 @@ d_number (struct d_info *di)
     {
       if (! IS_DIGIT (peek))
 	{
-	  if (negative)
-	    ret = - ret;
-	  return ret;
+	      if (negative) {
+		      ret = -ret;
+	      }
+	      return ret;
 	}
       ret = ret * 10 + peek - '0';
       d_advance (di, 1);
@@ -1602,8 +1608,9 @@ d_identifier (struct d_info *di, int len)
 
   name = d_str (di);
 
-  if (di->send - name < len || len < 1)
-    return NULL;
+  if (di->send - name < len || len < 1) {
+	  return NULL;
+  }
 
   d_advance (di, len);
 
@@ -1720,39 +1727,38 @@ d_operator_name (struct d_info *di)
 
   c1 = d_next_char (di);
   c2 = d_next_char (di);
-  if (c1 == 'v' && IS_DIGIT (c2))
-    return d_make_extended_operator (di, c2 - '0', d_source_name (di));
-  else if (c1 == 'c' && c2 == 'v')
-    return d_make_comp (di, DEMANGLE_COMPONENT_CAST,
-			cplus_demangle_type (di), NULL);
-  else
-    {
-      /* LOW is the inclusive lower bound.  */
-      int low = 0;
-      /* HIGH is the exclusive upper bound.  We subtract one to ignore
+  if (c1 == 'v' && IS_DIGIT (c2)) {
+	  return d_make_extended_operator (di, c2 - '0', d_source_name (di));
+  } else if (c1 == 'c' && c2 == 'v') {
+	  return d_make_comp (di, DEMANGLE_COMPONENT_CAST,
+		  cplus_demangle_type (di), NULL);
+  } else {
+	  /* LOW is the inclusive lower bound.  */
+	  int low = 0;
+	  /* HIGH is the exclusive upper bound.  We subtract one to ignore
 	 the sentinel at the end of the array.  */
-      int high = ((sizeof (cplus_demangle_operators)
-		   / sizeof (cplus_demangle_operators[0]))
-		  - 1);
+	  int high = ((sizeof (cplus_demangle_operators) / sizeof (cplus_demangle_operators[0])) - 1);
 
-      while (1)
-	{
-	  int i;
-	  const struct demangle_operator_info *p;
+	  while (1) {
+		  int i;
+		  const struct demangle_operator_info *p;
 
-	  i = low + (high - low) / 2;
-	  p = cplus_demangle_operators + i;
+		  i = low + (high - low) / 2;
+		  p = cplus_demangle_operators + i;
 
-	  if (c1 == p->code[0] && c2 == p->code[1])
-	    return d_make_operator (di, p);
+		  if (c1 == p->code[0] && c2 == p->code[1]) {
+			  return d_make_operator (di, p);
+		  }
 
-	  if (c1 < p->code[0] || (c1 == p->code[0] && c2 < p->code[1]))
-	    high = i;
-	  else
-	    low = i + 1;
-	  if (low == high)
-	    return NULL;
-	}
+		  if (c1 < p->code[0] || (c1 == p->code[0] && c2 < p->code[1])) {
+			  high = i;
+		  } else {
+			  low = i + 1;
+		  }
+		  if (low == high) {
+			  return NULL;
+		  }
+	  }
     }
 }
 
@@ -1779,12 +1785,14 @@ d_java_resource (struct d_info *di)
   const char *str;
 
   len = d_number (di);
-  if (len <= 1)
-    return NULL;
+  if (len <= 1) {
+	  return NULL;
+  }
 
   /* Eat the leading '_'.  */
-  if (d_next_char (di) != '_')
-    return NULL;
+  if (d_next_char (di) != '_') {
+	  return NULL;
+  }
   len--;
 
   str = d_str (di);
@@ -1793,8 +1801,9 @@ d_java_resource (struct d_info *di)
   while (len > 0)
     {
       c = str[i];
-      if (!c)
-	return NULL;
+      if (!c) {
+	      return NULL;
+      }
 
       /* Each chunk is either a '$' escape...  */
       if (c == '$')
@@ -1819,31 +1828,34 @@ d_java_resource (struct d_info *di)
 	  str = d_str (di);
 	  len -= i;
 	  i = 0;
-	  if (!next)
-	    return NULL;
+	  if (!next) {
+		  return NULL;
+	  }
 	}
       /* ... or a sequence of characters.  */
       else
 	{
-	  while (i < len && str[i] && str[i] != '$')
-	    i++;
+		while (i < len && str[i] && str[i] != '$') {
+			i++;
+		}
 
-	  next = d_make_name (di, str, i);
-	  d_advance (di, i);
-	  str = d_str (di);
-	  len -= i;
-	  i = 0;
-	  if (!next)
-	    return NULL;
+		next = d_make_name (di, str, i);
+		d_advance (di, i);
+		str = d_str (di);
+		len -= i;
+		i = 0;
+		if (!next) {
+			return NULL;
+		}
 	}
 
-      if (!p)
-	p = next;
-      else
-	{
-	  p = d_make_comp (di, DEMANGLE_COMPONENT_COMPOUND_NAME, p, next);
-	  if (!p)
-	    return NULL;
+	if (!p) {
+		p = next;
+	} else {
+		p = d_make_comp (di, DEMANGLE_COMPONENT_COMPOUND_NAME, p, next);
+		if (!p) {
+			return NULL;
+		}
 	}
     }
 
@@ -1894,24 +1906,28 @@ d_special_name (struct d_info *di)
 			      cplus_demangle_type (di), NULL);
 
 	case 'h':
-	  if (! d_call_offset (di, 'h'))
-	    return NULL;
-	  return d_make_comp (di, DEMANGLE_COMPONENT_THUNK,
-			      d_encoding (di, 0), NULL);
+		if (!d_call_offset (di, 'h')) {
+			return NULL;
+		}
+		return d_make_comp (di, DEMANGLE_COMPONENT_THUNK,
+			d_encoding (di, 0), NULL);
 
 	case 'v':
-	  if (! d_call_offset (di, 'v'))
-	    return NULL;
-	  return d_make_comp (di, DEMANGLE_COMPONENT_VIRTUAL_THUNK,
-			      d_encoding (di, 0), NULL);
+		if (!d_call_offset (di, 'v')) {
+			return NULL;
+		}
+		return d_make_comp (di, DEMANGLE_COMPONENT_VIRTUAL_THUNK,
+			d_encoding (di, 0), NULL);
 
 	case 'c':
-	  if (! d_call_offset (di, '\0'))
-	    return NULL;
-	  if (! d_call_offset (di, '\0'))
-	    return NULL;
-	  return d_make_comp (di, DEMANGLE_COMPONENT_COVARIANT_THUNK,
-			      d_encoding (di, 0), NULL);
+		if (!d_call_offset (di, '\0')) {
+			return NULL;
+		}
+		if (!d_call_offset (di, '\0')) {
+			return NULL;
+		}
+		return d_make_comp (di, DEMANGLE_COMPONENT_COVARIANT_THUNK,
+			d_encoding (di, 0), NULL);
 
 	case 'C':
 	  {
@@ -1921,10 +1937,12 @@ d_special_name (struct d_info *di)
 
 	    derived_type = cplus_demangle_type (di);
 	    offset = d_number (di);
-	    if (offset < 0)
-	      return NULL;
-	    if (! d_check_char (di, '_'))
-	      return NULL;
+	    if (offset < 0) {
+		    return NULL;
+	    }
+	    if (!d_check_char (di, '_')) {
+		    return NULL;
+	    }
 	    base_type = cplus_demangle_type (di);
 	    /* We don't display the offset.  FIXME: We should display
 	       it in verbose mode.  */
@@ -1993,9 +2011,9 @@ d_special_name (struct d_info *di)
 	default:
 	  return NULL;
 	}
+    } else {
+	    return NULL;
     }
-  else
-    return NULL;
 }
 
 /* <call-offset> ::= h <nv-offset> _
@@ -2014,25 +2032,27 @@ d_special_name (struct d_info *di)
 static int
 d_call_offset (struct d_info *di, int c)
 {
-  if (c == '\0')
-    c = d_next_char (di);
+	if (c == '\0') {
+		c = d_next_char (di);
+	}
 
-  if (c == 'h')
-    d_number (di);
-  else if (c == 'v')
-    {
-      d_number (di);
-      if (! d_check_char (di, '_'))
-	return 0;
-      d_number (di);
-    }
-  else
-    return 0;
+	if (c == 'h') {
+		d_number (di);
+	} else if (c == 'v') {
+		d_number (di);
+		if (!d_check_char (di, '_')) {
+			return 0;
+		}
+		d_number (di);
+	} else {
+		return 0;
+	}
 
-  if (! d_check_char (di, '_'))
-    return 0;
+	if (!d_check_char (di, '_')) {
+		return 0;
+	}
 
-  return 1;
+	return 1;
 }
 
 /* <ctor-dtor-name> ::= C1
@@ -2048,10 +2068,11 @@ d_ctor_dtor_name (struct d_info *di)
 {
   if (di->last_name != NULL)
     {
-      if (di->last_name->type == DEMANGLE_COMPONENT_NAME)
-	di->expansion += di->last_name->u.s_name.len;
-      else if (di->last_name->type == DEMANGLE_COMPONENT_SUB_STD)
-	di->expansion += di->last_name->u.s_string.len;
+	  if (di->last_name->type == DEMANGLE_COMPONENT_NAME) {
+		  di->expansion += di->last_name->u.s_name.len;
+	  } else if (di->last_name->type == DEMANGLE_COMPONENT_SUB_STD) {
+		  di->expansion += di->last_name->u.s_string.len;
+	  }
     }
   switch (d_peek_char (di))
     {
@@ -2201,19 +2222,21 @@ cplus_demangle_type (struct d_info *di)
       struct demangle_component **pret;
 
       pret = d_cv_qualifiers (di, &ret, 0);
-      if (!pret)
-	return NULL;
+      if (!pret) {
+	      return NULL;
+      }
       if (d_peek_char (di) == 'F')
 	{
 	  /* cv-qualifiers before a function type apply to 'this',
 	     so avoid adding the unqualified function type to
 	     the substitution list.  */
 	  *pret = d_function_type (di);
-	}
-      else
-	*pret = cplus_demangle_type (di);
-      if (!*pret)
-	return NULL;
+      } else {
+	      *pret = cplus_demangle_type (di);
+      }
+      if (!*pret) {
+	      return NULL;
+      }
       if ((*pret)->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS
 	  || (*pret)->type == DEMANGLE_COMPONENT_REFERENCE_THIS)
 	{
@@ -2224,9 +2247,10 @@ cplus_demangle_type (struct d_info *di)
 	  ret = *pret;
 	  *pret = fn;
 	}
-      if (! d_add_substitution (di, ret))
-	return NULL;
-      return ret;
+	if (!d_add_substitution (di, ret)) {
+		return NULL;
+	}
+	return ret;
     }
 
   can_subst = 1;
@@ -2276,8 +2300,9 @@ cplus_demangle_type (struct d_info *di)
 	  /* This is <template-template-param> <template-args>.  The
 	     <template-template-param> part is a substitution
 	     candidate.  */
-	  if (! d_add_substitution (di, ret))
-	    return NULL;
+	  if (!d_add_substitution (di, ret)) {
+		  return NULL;
+	  }
 	  ret = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, ret,
 			     d_template_args (di));
 	}
@@ -2297,11 +2322,12 @@ cplus_demangle_type (struct d_info *di)
 	    ret = d_substitution (di, 0);
 	    /* The substituted name may have been a template name and
 	       may be followed by tepmlate args.  */
-	    if (d_peek_char (di) == 'I')
-	      ret = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, ret,
-				 d_template_args (di));
-	    else
-	      can_subst = 0;
+	    if (d_peek_char (di) == 'I') {
+		    ret = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, ret,
+			    d_template_args (di));
+	    } else {
+		    can_subst = 0;
+	    }
 	  }
 	else
 	  {
@@ -2310,8 +2336,9 @@ cplus_demangle_type (struct d_info *di)
 	       a new substitution candidate.  However, if the
 	       substitution was followed by template arguments, then
 	       the whole thing is a substitution candidate.  */
-	    if (ret != NULL && ret->type == DEMANGLE_COMPONENT_SUB_STD)
-	      can_subst = 0;
+	    if (ret != NULL && ret->type == DEMANGLE_COMPONENT_SUB_STD) {
+		    can_subst = 0;
+	    }
 	  }
       }
       break;
@@ -2364,8 +2391,9 @@ cplus_demangle_type (struct d_info *di)
 	  /* decltype (expression) */
 	  ret = d_make_comp (di, DEMANGLE_COMPONENT_DECLTYPE,
 			     d_expression (di), NULL);
-	  if (ret && d_next_char (di) != 'E')
-	    ret = NULL;
+	  if (ret && d_next_char (di) != 'E') {
+		  ret = NULL;
+	  }
 	  can_subst = 1;
 	  break;
 	  
@@ -2416,12 +2444,14 @@ cplus_demangle_type (struct d_info *di)
 	  /* Fixed point types. DF<int bits><length><fract bits><sat>  */
 	  ret = d_make_empty (di);
 	  ret->type = DEMANGLE_COMPONENT_FIXED_TYPE;
-	  if ((ret->u.s_fixed.accum = IS_DIGIT (d_peek_char (di))))
-	    /* For demangling we don't care about the bits.  */
-	    d_number (di);
+	  if ((ret->u.s_fixed.accum = IS_DIGIT (d_peek_char (di)))) {
+		  /* For demangling we don't care about the bits.  */
+		  d_number (di);
+	  }
 	  ret->u.s_fixed.length = cplus_demangle_type (di);
-	  if (!ret->u.s_fixed.length)
-	    return NULL;
+	  if (!ret->u.s_fixed.length) {
+		  return NULL;
+	  }
 	  d_number (di);
 	  peek = d_next_char (di);
 	  ret->u.s_fixed.sat = (peek == 's');
@@ -2449,8 +2479,9 @@ cplus_demangle_type (struct d_info *di)
 
   if (can_subst)
     {
-      if (! d_add_substitution (di, ret))
-	return NULL;
+	  if (!d_add_substitution (di, ret)) {
+		  return NULL;
+	  }
     }
 
   return ret;
@@ -2495,8 +2526,9 @@ d_cv_qualifiers (struct d_info *di,
 	}
 
       *pret = d_make_comp (di, t, NULL, NULL);
-      if (!*pret)
-	return NULL;
+      if (!*pret) {
+	      return NULL;
+      }
       pret = &d_left (*pret);
 
       peek = d_peek_char (di);
@@ -2565,8 +2597,9 @@ d_function_type (struct d_info *di)
 {
   struct demangle_component *ret;
 
-  if (! d_check_char (di, 'F'))
-    return NULL;
+  if (!d_check_char (di, 'F')) {
+	  return NULL;
+  }
   if (d_peek_char (di) == 'Y')
     {
       /* Function has C linkage.  We don't print this information.
@@ -2576,8 +2609,9 @@ d_function_type (struct d_info *di)
   ret = d_bare_function_type (di, 1);
   ret = d_ref_qualifier (di, ret);
 
-  if (! d_check_char (di, 'E'))
-    return NULL;
+  if (!d_check_char (di, 'E')) {
+	  return NULL;
+  }
   return ret;
 }
 
@@ -2596,34 +2630,35 @@ d_parmlist (struct d_info *di)
       struct demangle_component *type;
 
       char peek = d_peek_char (di);
-      if (peek == '\0' || peek == 'E' || peek == '.')
-	break;
-      if ((peek == 'R' || peek == 'O')
-	  && d_peek_next_char (di) == 'E')
-	/* Function ref-qualifier, not a ref prefix for a parameter type.  */
-	break;
+      if (peek == '\0' || peek == 'E' || peek == '.') {
+	      break;
+      }
+      if ((peek == 'R' || peek == 'O') && d_peek_next_char (di) == 'E') {
+	      /* Function ref-qualifier, not a ref prefix for a parameter type.  */
+	      break;
+      }
       type = cplus_demangle_type (di);
-      if (!type)
-	return NULL;
+      if (!type) {
+	      return NULL;
+      }
       *ptl = d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, type, NULL);
-      if (!*ptl)
-	return NULL;
+      if (!*ptl) {
+	      return NULL;
+      }
       ptl = &d_right (*ptl);
     }
 
   /* There should be at least one parameter type besides the optional
      return type.  A function which takes no arguments will have a
      single parameter type void.  */
-  if (!tl)
-    return NULL;
+    if (!tl) {
+	    return NULL;
+    }
 
-  /* If we have a single parameter type void, omit it.  */
-  if (!d_right (tl)
-      && d_left (tl)->type == DEMANGLE_COMPONENT_BUILTIN_TYPE
-      && d_left (tl)->u.s_builtin.type->print == D_PRINT_VOID)
-    {
-      di->expansion -= d_left (tl)->u.s_builtin.type->len;
-      d_left (tl) = NULL;
+    /* If we have a single parameter type void, omit it.  */
+    if (!d_right (tl) && d_left (tl)->type == DEMANGLE_COMPONENT_BUILTIN_TYPE && d_left (tl)->u.s_builtin.type->print == D_PRINT_VOID) {
+	    di->expansion -= d_left (tl)->u.s_builtin.type->len;
+	    d_left (tl) = NULL;
     }
 
   return tl;
@@ -2650,15 +2685,17 @@ d_bare_function_type (struct d_info *di, int has_return_type)
   if (has_return_type)
     {
       return_type = cplus_demangle_type (di);
-      if (!return_type)
-	return NULL;
-    }
-  else
-    return_type = NULL;
+      if (!return_type) {
+	      return NULL;
+      }
+  } else {
+	  return_type = NULL;
+  }
 
   tl = d_parmlist (di);
-  if (!tl)
-    return NULL;
+  if (!tl) {
+	  return NULL;
+  }
 
   return d_make_comp (di, DEMANGLE_COMPONENT_FUNCTION_TYPE,
 		      return_type, tl);
@@ -2682,39 +2719,40 @@ d_array_type (struct d_info *di)
   char peek;
   struct demangle_component *dim;
 
-  if (! d_check_char (di, 'A'))
-    return NULL;
+  if (!d_check_char (di, 'A')) {
+	  return NULL;
+  }
 
   peek = d_peek_char (di);
-  if (peek == '_')
-    dim = NULL;
-  else if (IS_DIGIT (peek))
-    {
-      const char *s;
+  if (peek == '_') {
+	  dim = NULL;
+  } else if (IS_DIGIT (peek)) {
+	  const char *s;
 
-      s = d_str (di);
-      do
-	{
-	  d_advance (di, 1);
-	  peek = d_peek_char (di);
-	}
-      while (IS_DIGIT (peek));
-      dim = d_make_name (di, s, d_str (di) - s);
-      if (!dim)
-	return NULL;
+	  s = d_str (di);
+	  do {
+		  d_advance (di, 1);
+		  peek = d_peek_char (di);
+	  } while (IS_DIGIT (peek));
+	  dim = d_make_name (di, s, d_str (di) - s);
+	  if (!dim) {
+		  return NULL;
+	  }
     }
   else
     {
       dim = d_expression (di);
-      if (!dim)
-	return NULL;
+      if (!dim) {
+	      return NULL;
+      }
     }
 
-  if (! d_check_char (di, '_'))
-    return NULL;
+    if (!d_check_char (di, '_')) {
+	    return NULL;
+    }
 
-  return d_make_comp (di, DEMANGLE_COMPONENT_ARRAY_TYPE, dim,
-		      cplus_demangle_type (di));
+    return d_make_comp (di, DEMANGLE_COMPONENT_ARRAY_TYPE, dim,
+	    cplus_demangle_type (di));
 }
 
 /* <vector-type> ::= Dv <number> _ <type>
@@ -2731,15 +2769,17 @@ d_vector_type (struct d_info *di)
     {
       d_advance (di, 1);
       dim = d_expression (di);
-    }
-  else
-    dim = d_number_component (di);
+  } else {
+	  dim = d_number_component (di);
+  }
 
-  if (!dim)
-    return NULL;
+  if (!dim) {
+	  return NULL;
+  }
 
-  if (! d_check_char (di, '_'))
-    return NULL;
+  if (!d_check_char (di, '_')) {
+	  return NULL;
+  }
 
   return d_make_comp (di, DEMANGLE_COMPONENT_VECTOR_TYPE, dim,
 		      cplus_demangle_type (di));
@@ -2753,12 +2793,14 @@ d_pointer_to_member_type (struct d_info *di)
   struct demangle_component *cl;
   struct demangle_component *mem;
 
-  if (! d_check_char (di, 'M'))
-    return NULL;
+  if (!d_check_char (di, 'M')) {
+	  return NULL;
+  }
 
   cl = cplus_demangle_type (di);
-  if (!cl)
-    return NULL;
+  if (!cl) {
+	  return NULL;
+  }
 
   /* The ABI says, "The type of a non-static member function is considered
      to be different, for the purposes of substitution, from the type of a
@@ -2776,8 +2818,9 @@ d_pointer_to_member_type (struct d_info *di)
      wrong type in the substitution table is harmless.  */
 
   mem = cplus_demangle_type (di);
-  if (!mem)
-    return NULL;
+  if (!mem) {
+	  return NULL;
+  }
 
   return d_make_comp (di, DEMANGLE_COMPONENT_PTRMEM_TYPE, cl, mem);
 }
@@ -2788,15 +2831,17 @@ static long
 d_compact_number (struct d_info *di)
 {
   long num;
-  if (d_peek_char (di) == '_')
-    num = 0;
-  else if (d_peek_char (di) == 'n')
-    return -1;
-  else
-    num = d_number (di) + 1;
+  if (d_peek_char (di) == '_') {
+	  num = 0;
+  } else if (d_peek_char (di) == 'n') {
+	  return -1;
+  } else {
+	  num = d_number (di) + 1;
+  }
 
-  if (! d_check_char (di, '_'))
-    return -1;
+  if (!d_check_char (di, '_')) {
+	  return -1;
+  }
   return num;
 }
 
@@ -2809,12 +2854,14 @@ d_template_param (struct d_info *di)
 {
   long param;
 
-  if (! d_check_char (di, 'T'))
-    return NULL;
+  if (!d_check_char (di, 'T')) {
+	  return NULL;
+  }
 
   param = d_compact_number (di);
-  if (param < 0)
-    return NULL;
+  if (param < 0) {
+	  return NULL;
+  }
 
   ++di->did_subs;
 
@@ -2835,9 +2882,9 @@ d_template_args (struct d_info *di)
      constructor or destructor.  */
   hold_last_name = di->last_name;
 
-  if (d_peek_char (di) != 'I'
-      && d_peek_char (di) != 'J')
-    return NULL;
+  if (d_peek_char (di) != 'I' && d_peek_char (di) != 'J') {
+	  return NULL;
+  }
   d_advance (di, 1);
 
   if (d_peek_char (di) == 'E')
@@ -2854,12 +2901,14 @@ d_template_args (struct d_info *di)
       struct demangle_component *a;
 
       a = d_template_arg (di);
-      if (!a)
-	return NULL;
+      if (!a) {
+	      return NULL;
+      }
 
       *pal = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE_ARGLIST, a, NULL);
-      if (!*pal)
-	return NULL;
+      if (!*pal) {
+	      return NULL;
+      }
       pal = &d_right (*pal);
 
       if (d_peek_char (di) == 'E')
@@ -2889,8 +2938,9 @@ d_template_arg (struct d_info *di)
     case 'X':
       d_advance (di, 1);
       ret = d_expression (di);
-      if (! d_check_char (di, 'E'))
-	return NULL;
+      if (!d_check_char (di, 'E')) {
+	      return NULL;
+      }
       return ret;
 
     case 'L':
@@ -2924,12 +2974,14 @@ d_exprlist (struct d_info *di, char terminator)
   while (1)
     {
       struct demangle_component *arg = d_expression (di);
-      if (!arg)
-	return NULL;
+      if (!arg) {
+	      return NULL;
+      }
 
       *p = d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, arg, NULL);
-      if (!*p)
-	return NULL;
+      if (!*p) {
+	      return NULL;
+      }
       p = &d_right (*p);
 
       if (d_peek_char (di) == terminator)
@@ -2971,24 +3023,24 @@ d_expression (struct d_info *di)
   char peek;
 
   peek = d_peek_char (di);
-  if (peek == 'L')
-    return d_expr_primary (di);
-  else if (peek == 'T')
-    return d_template_param (di);
-  else if (peek == 's' && d_peek_next_char (di) == 'r')
-    {
-      struct demangle_component *type;
-      struct demangle_component *name;
+  if (peek == 'L') {
+	  return d_expr_primary (di);
+  } else if (peek == 'T') {
+	  return d_template_param (di);
+  } else if (peek == 's' && d_peek_next_char (di) == 'r') {
+	  struct demangle_component *type;
+	  struct demangle_component *name;
 
-      d_advance (di, 2);
-      type = cplus_demangle_type (di);
-      name = d_unqualified_name (di);
-      if (d_peek_char (di) != 'I')
-	return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type, name);
-      else
-	return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type,
-			    d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
-					 d_template_args (di)));
+	  d_advance (di, 2);
+	  type = cplus_demangle_type (di);
+	  name = d_unqualified_name (di);
+	  if (d_peek_char (di) != 'I') {
+		  return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type, name);
+	  } else {
+		  return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type,
+			  d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
+				  d_template_args (di)));
+	  }
     }
   else if (peek == 's' && d_peek_next_char (di) == 'p')
     {
@@ -3010,8 +3062,9 @@ d_expression (struct d_info *di)
       else
 	{
 	  index = d_compact_number (di) + 1;
-	  if (index == 0)
-	    return NULL;
+	  if (index == 0) {
+		  return NULL;
+	  }
 	}
       return d_make_function_param (di, index);
     }
@@ -3022,26 +3075,30 @@ d_expression (struct d_info *di)
          a dependent function call, i.e. decltype(f(t)).  */
       struct demangle_component *name;
 
-      if (peek == 'o')
-	/* operator-function-id, i.e. operator+(t).  */
-	d_advance (di, 2);
+      if (peek == 'o') {
+	      /* operator-function-id, i.e. operator+(t).  */
+	      d_advance (di, 2);
+      }
 
       name = d_unqualified_name (di);
-      if (!name)
-	return NULL;
-      if (d_peek_char (di) == 'I')
-	return d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
-			    d_template_args (di));
-      else
-	return name;
+      if (!name) {
+	      return NULL;
+      }
+      if (d_peek_char (di) == 'I') {
+	      return d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
+		      d_template_args (di));
+      } else {
+	      return name;
+      }
     }
   else if ((peek == 'i' || peek == 't')
 	   && d_peek_next_char (di) == 'l')
     {
       /* Brace-enclosed initializer list, untyped or typed.  */
       struct demangle_component *type = NULL;
-      if (peek == 't')
-	type = cplus_demangle_type (di);
+      if (peek == 't') {
+	      type = cplus_demangle_type (di);
+      }
       d_advance (di, 2);
       return d_make_comp (di, DEMANGLE_COMPONENT_INITIALIZER_LIST,
 			  type, d_exprlist (di, 'E'));
@@ -3053,16 +3110,18 @@ d_expression (struct d_info *di)
       int args;
 
       op = d_operator_name (di);
-      if (!op)
-	return NULL;
+      if (!op) {
+	      return NULL;
+      }
 
       if (op->type == DEMANGLE_COMPONENT_OPERATOR)
 	{
 	  code = op->u.s_operator.op->code;
 	  di->expansion += op->u.s_operator.op->len - 2;
-	  if (strcmp (code, "st") == 0)
-	    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				cplus_demangle_type (di));
+	  if (strcmp (code, "st") == 0) {
+		  return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+			  cplus_demangle_type (di));
+	  }
 	}
 
       switch (op->type)
@@ -3090,47 +3149,49 @@ d_expression (struct d_info *di)
 	    struct demangle_component *operand;
 	    int suffix = 0;
 
-	    if (code && (code[0] == 'p' || code[0] == 'm')
-		&& code[1] == code[0])
-	      /* pp_ and mm_ are the prefix variants.  */
-	      suffix = !d_check_char (di, '_');
+	    if (code && (code[0] == 'p' || code[0] == 'm') && code[1] == code[0]) {
+		    /* pp_ and mm_ are the prefix variants.  */
+		    suffix = !d_check_char (di, '_');
+	    }
 
-	    if (op->type == DEMANGLE_COMPONENT_CAST
-		&& d_check_char (di, '_'))
-	      operand = d_exprlist (di, 'E');
-	    else
-	      operand = d_expression (di);
+	    if (op->type == DEMANGLE_COMPONENT_CAST && d_check_char (di, '_')) {
+		    operand = d_exprlist (di, 'E');
+	    } else {
+		    operand = d_expression (di);
+	    }
 
-	    if (suffix)
-	      /* Indicate the suffix variant for d_print_comp.  */
-	      return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				  d_make_comp (di,
-					       DEMANGLE_COMPONENT_BINARY_ARGS,
-					       operand, operand));
-	    else
-	      return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				  operand);
+	    if (suffix) {
+		    /* Indicate the suffix variant for d_print_comp.  */
+		    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+			    d_make_comp (di,
+				    DEMANGLE_COMPONENT_BINARY_ARGS,
+				    operand, operand));
+	    } else {
+		    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+			    operand);
+	    }
 	  }
 	case 2:
 	  {
 	    struct demangle_component *left;
 	    struct demangle_component *right;
 
-	    if (op_is_new_cast (op))
-	      left = cplus_demangle_type (di);
-	    else
-	      left = d_expression (di);
-	    if (code && !strcmp (code, "cl"))
-	      right = d_exprlist (di, 'E');
-	    else if (code && (!strcmp (code, "dt") || !strcmp (code, "pt")))
-	      {
-		right = d_unqualified_name (di);
-		if (d_peek_char (di) == 'I')
-		  right = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE,
-				       right, d_template_args (di));
-	      }
-	    else
-	      right = d_expression (di);
+	    if (op_is_new_cast (op)) {
+		    left = cplus_demangle_type (di);
+	    } else {
+		    left = d_expression (di);
+	    }
+	    if (code && !strcmp (code, "cl")) {
+		    right = d_exprlist (di, 'E');
+	    } else if (code && (!strcmp (code, "dt") || !strcmp (code, "pt"))) {
+		    right = d_unqualified_name (di);
+		    if (d_peek_char (di) == 'I') {
+			    right = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE,
+				    right, d_template_args (di));
+		    }
+	    } else {
+		    right = d_expression (di);
+	    }
 
 	    return d_make_comp (di, DEMANGLE_COMPONENT_BINARY, op,
 				d_make_comp (di,
@@ -3153,8 +3214,9 @@ d_expression (struct d_info *di)
 	    else if (code && code[0] == 'n')
 	      {
 		/* new-expression.  */
-		if (code[1] != 'w' && code[1] != 'a')
-		  return NULL;
+		if (code[1] != 'w' && code[1] != 'a') {
+			return NULL;
+		}
 		first = d_exprlist (di, '_');
 		second = cplus_demangle_type (di);
 		if (d_peek_char (di) == 'E')
@@ -3168,23 +3230,22 @@ d_expression (struct d_info *di)
 		    /* Parenthesized initializer.  */
 		    d_advance (di, 2);
 		    third = d_exprlist (di, 'E');
+		  } else if (d_peek_char (di) == 'i' && d_peek_next_char (di) == 'l') {
+			  /* initializer-list.  */
+			  third = d_expression (di);
+		  } else {
+			  return NULL;
 		  }
-		else if (d_peek_char (di) == 'i'
-			 && d_peek_next_char (di) == 'l')
-		  /* initializer-list.  */
-		  third = d_expression (di);
-		else
-		  return NULL;
+	      } else {
+		      return NULL;
 	      }
-	    else
-	      return NULL;
-	    return d_make_comp (di, DEMANGLE_COMPONENT_TRINARY, op,
-				d_make_comp (di,
-					     DEMANGLE_COMPONENT_TRINARY_ARG1,
-					     first,
-					     d_make_comp (di,
-							  DEMANGLE_COMPONENT_TRINARY_ARG2,
-							  second, third)));
+	      return d_make_comp (di, DEMANGLE_COMPONENT_TRINARY, op,
+		      d_make_comp (di,
+			      DEMANGLE_COMPONENT_TRINARY_ARG1,
+			      first,
+			      d_make_comp (di,
+				      DEMANGLE_COMPONENT_TRINARY_ARG2,
+				      second, third)));
 	  }
 	default:
 	  return NULL;
@@ -3202,29 +3263,30 @@ d_expr_primary (struct d_info *di)
 {
   struct demangle_component *ret;
 
-  if (! d_check_char (di, 'L'))
-    return NULL;
+  if (!d_check_char (di, 'L')) {
+	  return NULL;
+  }
   if (d_peek_char (di) == '_'
-      /* Workaround for G++ bug; see comment in write_template_arg.  */
-      || d_peek_char (di) == 'Z')
-    ret = cplus_demangle_mangled_name (di, 0);
-  else
-    {
-      struct demangle_component *type;
-      enum demangle_component_type t;
-      const char *s;
+	  /* Workaround for G++ bug; see comment in write_template_arg.  */
+	  || d_peek_char (di) == 'Z') {
+	  ret = cplus_demangle_mangled_name (di, 0);
+  } else {
+	  struct demangle_component *type;
+	  enum demangle_component_type t;
+	  const char *s;
 
-      type = cplus_demangle_type (di);
-      if (!type)
-	return NULL;
+	  type = cplus_demangle_type (di);
+	  if (!type) {
+		  return NULL;
+	  }
 
-      /* If we have a type we know how to print, we aren't going to
+	  /* If we have a type we know how to print, we aren't going to
 	 print the type name itself.  */
-      if (type->type == DEMANGLE_COMPONENT_BUILTIN_TYPE
-	  && type->u.s_builtin.type->print != D_PRINT_DEFAULT)
-	di->expansion -= type->u.s_builtin.type->len;
+	  if (type->type == DEMANGLE_COMPONENT_BUILTIN_TYPE && type->u.s_builtin.type->print != D_PRINT_DEFAULT) {
+		  di->expansion -= type->u.s_builtin.type->len;
+	  }
 
-      /* Rather than try to interpret the literal value, we just
+	  /* Rather than try to interpret the literal value, we just
 	 collect it as a string.  Note that it's possible to have a
 	 floating point literal here.  The ABI specifies that the
 	 format of such literals is machine independent.  That's fine,
@@ -3235,24 +3297,24 @@ d_expr_primary (struct d_info *di)
 	 constant in any readable form anyhow.  We don't attempt to
 	 handle these cases.  */
 
-      t = DEMANGLE_COMPONENT_LITERAL;
-      if (d_peek_char (di) == 'n')
-	{
-	  t = DEMANGLE_COMPONENT_LITERAL_NEG;
-	  d_advance (di, 1);
-	}
-      s = d_str (di);
-      while (d_peek_char (di) != 'E')
-	{
-	  if (d_peek_char (di) == '\0')
-	    return NULL;
-	  d_advance (di, 1);
-	}
-      ret = d_make_comp (di, t, type, d_make_name (di, s, d_str (di) - s));
+	  t = DEMANGLE_COMPONENT_LITERAL;
+	  if (d_peek_char (di) == 'n') {
+		  t = DEMANGLE_COMPONENT_LITERAL_NEG;
+		  d_advance (di, 1);
+	  }
+	  s = d_str (di);
+	  while (d_peek_char (di) != 'E') {
+		  if (d_peek_char (di) == '\0') {
+			  return NULL;
+		  }
+		  d_advance (di, 1);
+	  }
+	  ret = d_make_comp (di, t, type, d_make_name (di, s, d_str (di) - s));
     }
-  if (! d_check_char (di, 'E'))
-    return NULL;
-  return ret;
+    if (!d_check_char (di, 'E')) {
+	    return NULL;
+    }
+    return ret;
 }
 
 /* <local-name> ::= Z <(function) encoding> E <(entity) name> [<discriminator>]
@@ -3265,19 +3327,22 @@ d_local_name (struct d_info *di)
 {
   struct demangle_component *function;
 
-  if (! d_check_char (di, 'Z'))
-    return NULL;
+  if (!d_check_char (di, 'Z')) {
+	  return NULL;
+  }
 
   function = d_encoding (di, 0);
 
-  if (! d_check_char (di, 'E'))
-    return NULL;
+  if (!d_check_char (di, 'E')) {
+	  return NULL;
+  }
 
   if (d_peek_char (di) == 's')
     {
       d_advance (di, 1);
-      if (! d_discriminator (di))
-	return NULL;
+      if (!d_discriminator (di)) {
+	      return NULL;
+      }
       return d_make_comp (di, DEMANGLE_COMPONENT_LOCAL_NAME, function,
 			  d_make_name (di, "string literal",
 				       sizeof "string literal" - 1));
@@ -3292,24 +3357,27 @@ d_local_name (struct d_info *di)
 	  /* Default argument scope: d <number> _.  */
 	  d_advance (di, 1);
 	  num = d_compact_number (di);
-	  if (num < 0)
-	    return NULL;
+	  if (num < 0) {
+		  return NULL;
+	  }
 	}
 
       name = d_name (di);
-      if (name)
-	switch (name->type)
-	  {
-	    /* Lambdas and unnamed types have internal discriminators.  */
-	  case DEMANGLE_COMPONENT_LAMBDA:
-	  case DEMANGLE_COMPONENT_UNNAMED_TYPE:
-	    break;
-	  default:
-	    if (! d_discriminator (di))
-	      return NULL;
-	  }
-      if (num >= 0)
-	name = d_make_default_arg (di, num, name);
+      if (name) {
+	      switch (name->type) {
+		      /* Lambdas and unnamed types have internal discriminators.  */
+	      case DEMANGLE_COMPONENT_LAMBDA:
+	      case DEMANGLE_COMPONENT_UNNAMED_TYPE:
+		      break;
+	      default:
+		      if (!d_discriminator (di)) {
+			      return NULL;
+		      }
+	      }
+      }
+      if (num >= 0) {
+	      name = d_make_default_arg (di, num, name);
+      }
       return d_make_comp (di, DEMANGLE_COMPONENT_LOCAL_NAME, function, name);
     }
 }
@@ -3324,12 +3392,14 @@ d_discriminator (struct d_info *di)
 {
   long discrim;
 
-  if (d_peek_char (di) != '_')
-    return 1;
+  if (d_peek_char (di) != '_') {
+	  return 1;
+  }
   d_advance (di, 1);
   discrim = d_number (di);
-  if (discrim < 0)
-    return 0;
+  if (discrim < 0) {
+	  return 0;
+  }
   return 1;
 }
 
@@ -3342,21 +3412,26 @@ d_lambda (struct d_info *di)
   struct demangle_component *ret;
   int num;
 
-  if (! d_check_char (di, 'U'))
-    return NULL;
-  if (! d_check_char (di, 'l'))
-    return NULL;
+  if (!d_check_char (di, 'U')) {
+	  return NULL;
+  }
+  if (!d_check_char (di, 'l')) {
+	  return NULL;
+  }
 
   tl = d_parmlist (di);
-  if (!tl)
-    return NULL;
+  if (!tl) {
+	  return NULL;
+  }
 
-  if (! d_check_char (di, 'E'))
-    return NULL;
+  if (!d_check_char (di, 'E')) {
+	  return NULL;
+  }
 
   num = d_compact_number (di);
-  if (num < 0)
-    return NULL;
+  if (num < 0) {
+	  return NULL;
+  }
 
   ret = d_make_empty (di);
   if (ret)
@@ -3366,10 +3441,11 @@ d_lambda (struct d_info *di)
       ret->u.s_unary_num.num = num;
     }
 
-  if (! d_add_substitution (di, ret))
-    return NULL;
+    if (!d_add_substitution (di, ret)) {
+	    return NULL;
+    }
 
-  return ret;
+    return ret;
 }
 
 /* <unnamed-type-name> ::= Ut [ <nonnegative number> ] _ */
@@ -3380,14 +3456,17 @@ d_unnamed_type (struct d_info *di)
   struct demangle_component *ret;
   long num;
 
-  if (! d_check_char (di, 'U'))
-    return NULL;
-  if (! d_check_char (di, 't'))
-    return NULL;
+  if (!d_check_char (di, 'U')) {
+	  return NULL;
+  }
+  if (!d_check_char (di, 't')) {
+	  return NULL;
+  }
 
   num = d_compact_number (di);
-  if (num < 0)
-    return NULL;
+  if (num < 0) {
+	  return NULL;
+  }
 
   ret = d_make_empty (di);
   if (ret)
@@ -3396,10 +3475,11 @@ d_unnamed_type (struct d_info *di)
       ret->u.s_number.number = num;
     }
 
-  if (! d_add_substitution (di, ret))
-    return NULL;
+    if (!d_add_substitution (di, ret)) {
+	    return NULL;
+    }
 
-  return ret;
+    return ret;
 }
 
 /* <clone-suffix> ::= [ . <clone-type-identifier> ] [ . <nonnegative number> ]*
@@ -3415,14 +3495,16 @@ d_clone_suffix (struct d_info *di, struct demangle_component *encoding)
   if (*pend == '.' && (IS_LOWER (pend[1]) || pend[1] == '_'))
     {
       pend += 2;
-      while (IS_LOWER (*pend) || *pend == '_')
-	++pend;
+      while (IS_LOWER (*pend) || *pend == '_') {
+	      ++pend;
+      }
     }
   while (*pend == '.' && IS_DIGIT (pend[1]))
     {
       pend += 2;
-      while (IS_DIGIT (*pend))
-	++pend;
+      while (IS_DIGIT (*pend)) {
+	      ++pend;
+      }
     }
   d_advance (di, pend - suffix);
   n = d_make_name (di, suffix, pend - suffix);
@@ -3434,13 +3516,15 @@ d_clone_suffix (struct d_info *di, struct demangle_component *encoding)
 static int
 d_add_substitution (struct d_info *di, struct demangle_component *dc)
 {
-  if (!dc)
-    return 0;
-  if (di->next_sub >= di->num_subs)
-    return 0;
-  di->subs[di->next_sub] = dc;
-  ++di->next_sub;
-  return 1;
+	if (!dc) {
+		return 0;
+	}
+	if (di->next_sub >= di->num_subs) {
+		return 0;
+	}
+	di->subs[di->next_sub] = dc;
+	++di->next_sub;
+	return 1;
 }
 
 /* <substitution> ::= S <seq-id> _
@@ -3492,8 +3576,9 @@ d_substitution (struct d_info *di, int prefix)
 {
   char c;
 
-  if (! d_check_char (di, 'S'))
-    return NULL;
+  if (!d_check_char (di, 'S')) {
+	  return NULL;
+  }
 
   c = d_next_char (di);
   if (c == '_' || IS_DIGIT (c) || IS_UPPER (c))
@@ -3507,14 +3592,16 @@ d_substitution (struct d_info *di, int prefix)
 	    {
 	      unsigned int new_id;
 
-	      if (IS_DIGIT (c))
-		new_id = id * 36 + c - '0';
-	      else if (IS_UPPER (c))
-		new_id = id * 36 + c - 'A' + 10;
-	      else
-		return NULL;
-	      if (new_id < id)
-		return NULL;
+	      if (IS_DIGIT (c)) {
+		      new_id = id * 36 + c - '0';
+	      } else if (IS_UPPER (c)) {
+		      new_id = id * 36 + c - 'A' + 10;
+	      } else {
+		      return NULL;
+	      }
+	      if (new_id < id) {
+		      return NULL;
+	      }
 	      id = new_id;
 	      c = d_next_char (di);
 	    }
@@ -3523,12 +3610,13 @@ d_substitution (struct d_info *di, int prefix)
 	  ++id;
 	}
 
-      if (id >= (unsigned int) di->next_sub)
-	return NULL;
+	if (id >= (unsigned int)di->next_sub) {
+		return NULL;
+	}
 
-      ++di->did_subs;
+	++di->did_subs;
 
-      return di->subs[id];
+	return di->subs[id];
     }
   else
     {
@@ -3542,8 +3630,9 @@ d_substitution (struct d_info *di, int prefix)
 	  char peek;
 
 	  peek = d_peek_char (di);
-	  if (peek == 'C' || peek == 'D')
-	    verbose = 1;
+	  if (peek == 'C' || peek == 'D') {
+		  verbose = 1;
+	  }
 	}
 
       pend = (&standard_subs[0]
@@ -3555,9 +3644,10 @@ d_substitution (struct d_info *di, int prefix)
 	      const char *s;
 	      int len;
 
-	      if (p->set_last_name != NULL)
-		di->last_name = d_make_sub (di, p->set_last_name,
-					    p->set_last_name_len);
+	      if (p->set_last_name != NULL) {
+		      di->last_name = d_make_sub (di, p->set_last_name,
+			      p->set_last_name_len);
+	      }
 	      if (verbose)
 		{
 		  s = p->full_expansion;
@@ -3587,8 +3677,9 @@ d_growable_string_init (struct d_growable_string *dgs, size_t estimate)
   dgs->alc = 0;
   dgs->allocation_failure = 0;
 
-  if (estimate > 0)
-    d_growable_string_resize (dgs, estimate);
+  if (estimate > 0) {
+	  d_growable_string_resize (dgs, estimate);
+  }
 }
 
 /* Grow a growable string to a given size.  */
@@ -3599,15 +3690,17 @@ d_growable_string_resize (struct d_growable_string *dgs, size_t need)
   size_t newalc;
   char *newbuf;
 
-  if (dgs->allocation_failure)
-    return;
+  if (dgs->allocation_failure) {
+	  return;
+  }
 
   /* Start allocation at two bytes to avoid any possibility of confusion
      with the special value of 1 used as a return in *palc to indicate
      allocation failures.  */
   newalc = dgs->alc > 0 ? dgs->alc : 2;
-  while (newalc < need)
-    newalc <<= 1;
+  while (newalc < need) {
+	  newalc <<= 1;
+  }
 
   newbuf = (char *) realloc (dgs->buf, newalc);
   if (!newbuf)
@@ -3632,11 +3725,13 @@ d_growable_string_append_buffer (struct d_growable_string *dgs,
   size_t need;
 
   need = dgs->len + l + 1;
-  if (need > dgs->alc)
-    d_growable_string_resize (dgs, need);
+  if (need > dgs->alc) {
+	  d_growable_string_resize (dgs, need);
+  }
 
-  if (dgs->allocation_failure)
-    return;
+  if (dgs->allocation_failure) {
+	  return;
+  }
 
   memcpy (dgs->buf + dgs->len, s, l);
   dgs->buf[dgs->len + l] = '\0';
@@ -3726,11 +3821,12 @@ d_print_flush (struct d_print_info *dpi)
 static inline void
 d_append_char (struct d_print_info *dpi, char c)
 {
-  if (dpi->len == sizeof (dpi->buf) - 1)
-    d_print_flush (dpi);
+	if (dpi->len == sizeof (dpi->buf) - 1) {
+		d_print_flush (dpi);
+	}
 
-  dpi->buf[dpi->len++] = c;
-  dpi->last_char = c;
+	dpi->buf[dpi->len++] = c;
+	dpi->last_char = c;
 }
 
 static inline void
@@ -3738,8 +3834,9 @@ d_append_buffer (struct d_print_info *dpi, const char *s, size_t l)
 {
   size_t i;
 
-  for (i = 0; i < l; i++)
-    d_append_char (dpi, s[i]);
+  for (i = 0; i < l; i++) {
+	  d_append_char (dpi, s[i]);
+  }
 }
 
 static inline void
@@ -3833,16 +3930,19 @@ d_index_template_argument (struct demangle_component *args, int i)
        a != NULL;
        a = d_right (a))
     {
-      if (a->type != DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
-	return NULL;
-      if (i <= 0)
-	break;
-      --i;
+	  if (a->type != DEMANGLE_COMPONENT_TEMPLATE_ARGLIST) {
+		  return NULL;
+	  }
+	  if (i <= 0) {
+		  break;
+	  }
+	  --i;
+    }
+    if (i != 0 || !a) {
+	    return NULL;
     }
-  if (i != 0 || !a)
-    return NULL;
 
-  return d_left (a);
+    return d_left (a);
 }
 
 /* Returns the template argument from the current context indicated by DC,
@@ -3870,15 +3970,17 @@ d_find_pack (struct d_print_info *dpi,
 	     const struct demangle_component *dc)
 {
   struct demangle_component *a;
-  if (!dc)
-    return NULL;
+  if (!dc) {
+	  return NULL;
+  }
 
   switch (dc->type)
     {
     case DEMANGLE_COMPONENT_TEMPLATE_PARAM:
       a = d_lookup_template_argument (dpi, dc);
-      if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
-	return a;
+      if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST) {
+	      return a;
+      }
       return NULL;
 
     case DEMANGLE_COMPONENT_PACK_EXPANSION:
@@ -3904,8 +4006,9 @@ d_find_pack (struct d_print_info *dpi,
 
     default:
       a = d_find_pack (dpi, d_left (dc));
-      if (a)
-	return a;
+      if (a) {
+	      return a;
+      }
       return d_find_pack (dpi, d_right (dc));
     }
 }
@@ -3933,16 +4036,16 @@ d_print_subexpr (struct d_print_info *dpi, int options,
 		 const struct demangle_component *dc)
 {
   int simple = 0;
-  if (dc->type == DEMANGLE_COMPONENT_NAME
-      || dc->type == DEMANGLE_COMPONENT_QUAL_NAME
-      || dc->type == DEMANGLE_COMPONENT_INITIALIZER_LIST
-      || dc->type == DEMANGLE_COMPONENT_FUNCTION_PARAM)
-    simple = 1;
-  if (!simple)
-    d_append_char (dpi, '(');
+  if (dc->type == DEMANGLE_COMPONENT_NAME || dc->type == DEMANGLE_COMPONENT_QUAL_NAME || dc->type == DEMANGLE_COMPONENT_INITIALIZER_LIST || dc->type == DEMANGLE_COMPONENT_FUNCTION_PARAM) {
+	  simple = 1;
+  }
+  if (!simple) {
+	  d_append_char (dpi, '(');
+  }
   d_print_comp (dpi, options, dc);
-  if (!simple)
-    d_append_char (dpi, ')');
+  if (!simple) {
+	  d_append_char (dpi, ')');
+  }
 }
 
 /* Return a shallow copy of the current list of templates.
@@ -3997,17 +4100,18 @@ d_print_comp (struct d_print_info *dpi, int options,
       d_print_error (dpi);
       return;
     }
-  if (d_print_saw_error (dpi))
-    return;
+    if (d_print_saw_error (dpi)) {
+	    return;
+    }
 
-  switch (dc->type)
-    {
+    switch (dc->type) {
     case DEMANGLE_COMPONENT_NAME:
-      if ((options & DMGL_JAVA) == 0)
-	d_append_buffer (dpi, dc->u.s_name.s, dc->u.s_name.len);
-      else
-	d_print_java_identifier (dpi, dc->u.s_name.s, dc->u.s_name.len);
-      return;
+	    if ((options & DMGL_JAVA) == 0) {
+		    d_append_buffer (dpi, dc->u.s_name.s, dc->u.s_name.len);
+	    } else {
+		    d_print_java_identifier (dpi, dc->u.s_name.s, dc->u.s_name.len);
+	    }
+	    return;
 
     case DEMANGLE_COMPONENT_TAGGED_NAME:
       d_print_comp (dpi, options, d_left (dc));
@@ -4019,10 +4123,11 @@ d_print_comp (struct d_print_info *dpi, int options,
     case DEMANGLE_COMPONENT_QUAL_NAME:
     case DEMANGLE_COMPONENT_LOCAL_NAME:
       d_print_comp (dpi, options, d_left (dc));
-      if ((options & DMGL_JAVA) == 0)
-	d_append_string (dpi, "::");
-      else
-	d_append_char (dpi, '.');
+      if ((options & DMGL_JAVA) == 0) {
+	      d_append_string (dpi, "::");
+      } else {
+	      d_append_char (dpi, '.');
+      }
       {
 	struct demangle_component *local_name = d_right (dc);
 	if (local_name->type == DEMANGLE_COMPONENT_DEFAULT_ARG)
@@ -4066,12 +4171,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	    adpm[i].templates = dpi->templates;
 	    ++i;
 
-	    if (typed_name->type != DEMANGLE_COMPONENT_RESTRICT_THIS
-		&& typed_name->type != DEMANGLE_COMPONENT_VOLATILE_THIS
-		&& typed_name->type != DEMANGLE_COMPONENT_CONST_THIS
-		&& typed_name->type != DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS
-		&& typed_name->type != DEMANGLE_COMPONENT_REFERENCE_THIS)
-	      break;
+	    if (typed_name->type != DEMANGLE_COMPONENT_RESTRICT_THIS && typed_name->type != DEMANGLE_COMPONENT_VOLATILE_THIS && typed_name->type != DEMANGLE_COMPONENT_CONST_THIS && typed_name->type != DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS && typed_name->type != DEMANGLE_COMPONENT_REFERENCE_THIS) {
+		    break;
+	    }
 
 	    typed_name = d_left (typed_name);
 	  }
@@ -4100,8 +4202,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	    struct demangle_component *local_name;
 
 	    local_name = d_right (typed_name);
-	    if (local_name->type == DEMANGLE_COMPONENT_DEFAULT_ARG)
-	      local_name = local_name->u.s_unary_num.sub;
+	    if (local_name->type == DEMANGLE_COMPONENT_DEFAULT_ARG) {
+		    local_name = local_name->u.s_unary_num.sub;
+	    }
 	    while (local_name->type == DEMANGLE_COMPONENT_RESTRICT_THIS
 		   || local_name->type == DEMANGLE_COMPONENT_VOLATILE_THIS
 		   || local_name->type == DEMANGLE_COMPONENT_CONST_THIS
@@ -4130,8 +4233,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 
 	d_print_comp (dpi, options, d_right (dc));
 
-	if (typed_name->type == DEMANGLE_COMPONENT_TEMPLATE)
-	  dpi->templates = dpt.next;
+	if (typed_name->type == DEMANGLE_COMPONENT_TEMPLATE) {
+		dpi->templates = dpt.next;
+	}
 
 	/* If the modifiers didn't get printed by the type, print them
 	   now.  */
@@ -4178,14 +4282,16 @@ d_print_comp (struct d_print_info *dpi, int options,
         else
           {
 	    d_print_comp (dpi, options, dcl);
-	    if (d_last_char (dpi) == '<')
-	      d_append_char (dpi, ' ');
+	    if (d_last_char (dpi) == '<') {
+		    d_append_char (dpi, ' ');
+	    }
 	    d_append_char (dpi, '<');
 	    d_print_comp (dpi, options, d_right (dc));
 	    /* Avoid generating two consecutive '>' characters, to avoid
 	       the C++ syntactic ambiguity.  */
-	    if (d_last_char (dpi) == '>')
-	      d_append_char (dpi, ' ');
+	    if (d_last_char (dpi) == '>') {
+		    d_append_char (dpi, ' ');
+	    }
 	    d_append_char (dpi, '>');
           }
 
@@ -4199,8 +4305,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	struct d_print_template *hold_dpt;
 	struct demangle_component *a = d_lookup_template_argument (dpi, dc);
 
-	if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
-	  a = d_index_template_argument (a, dpi->pack_index);
+	if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST) {
+		a = d_index_template_argument (a, dpi->pack_index);
+	}
 
 	if (!a)
 	  {
@@ -4339,14 +4446,12 @@ d_print_comp (struct d_print_info *dpi, int options,
 	  {
 	    if (! pdpm->printed)
 	      {
-		if (pdpm->mod->type != DEMANGLE_COMPONENT_RESTRICT
-		    && pdpm->mod->type != DEMANGLE_COMPONENT_VOLATILE
-		    && pdpm->mod->type != DEMANGLE_COMPONENT_CONST)
-		  break;
-		if (pdpm->mod->type == dc->type)
-		  {
-		    d_print_comp (dpi, options, d_left (dc));
-		    return;
+		    if (pdpm->mod->type != DEMANGLE_COMPONENT_RESTRICT && pdpm->mod->type != DEMANGLE_COMPONENT_VOLATILE && pdpm->mod->type != DEMANGLE_COMPONENT_CONST) {
+			    break;
+		    }
+		    if (pdpm->mod->type == dc->type) {
+			    d_print_comp (dpi, options, d_left (dc));
+			    return;
 		  }
 	      }
 	  }
@@ -4364,9 +4469,11 @@ d_print_comp (struct d_print_info *dpi, int options,
 	    struct d_saved_scope *scope = NULL, *scopes;
 	    int i;
 
-	    for (i = 0; i < dpi->num_saved_scopes; i++)
-	      if (dpi->saved_scopes[i].container == sub)
-		scope = &dpi->saved_scopes[i];
+	    for (i = 0; i < dpi->num_saved_scopes; i++) {
+		    if (dpi->saved_scopes[i].container == sub) {
+			    scope = &dpi->saved_scopes[i];
+		    }
+	    }
 
 	    if (!scope)
 	      {
@@ -4391,8 +4498,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 
 		scope->container = sub;
 		scope->templates = d_copy_templates (dpi);
-		if (d_print_saw_error (dpi))
-		  return;
+		if (d_print_saw_error (dpi)) {
+			return;
+		}
 	      }
 	    else
 	      {
@@ -4404,26 +4512,28 @@ d_print_comp (struct d_print_info *dpi, int options,
 	      }
 
 	    a = d_lookup_template_argument (dpi, sub);
-	    if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
-	      a = d_index_template_argument (a, dpi->pack_index);
+	    if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST) {
+		    a = d_index_template_argument (a, dpi->pack_index);
+	    }
 
 	    if (!a)
 	      {
-		if (need_template_restore)
-		  dpi->templates = saved_templates;
+		    if (need_template_restore) {
+			    dpi->templates = saved_templates;
+		    }
 
-		d_print_error (dpi);
-		return;
+		    d_print_error (dpi);
+		    return;
 	      }
 
 	    sub = a;
 	  }
 
-	if (sub->type == DEMANGLE_COMPONENT_REFERENCE
-	    || sub->type == dc->type)
-	  dc = sub;
-	else if (sub->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE)
-	  mod_inner = d_left (sub);
+	  if (sub->type == DEMANGLE_COMPONENT_REFERENCE || sub->type == dc->type) {
+		  dc = sub;
+	  } else if (sub->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE) {
+		  mod_inner = d_left (sub);
+	  }
       }
       /* Fall through.  */
 
@@ -4447,32 +4557,36 @@ d_print_comp (struct d_print_info *dpi, int options,
 	dpm.printed = 0;
 	dpm.templates = dpi->templates;
 
-	if (!mod_inner)
-	  mod_inner = d_left (dc);
+	if (!mod_inner) {
+		mod_inner = d_left (dc);
+	}
 
 	d_print_comp (dpi, options, mod_inner);
 
 	/* If the modifier didn't get printed by the type, print it
 	   now.  */
-	if (! dpm.printed)
-	  d_print_mod (dpi, options, dc);
+	if (!dpm.printed) {
+		d_print_mod (dpi, options, dc);
+	}
 
 	dpi->modifiers = dpm.next;
 
-	if (need_template_restore)
-	  dpi->templates = saved_templates;
+	if (need_template_restore) {
+		dpi->templates = saved_templates;
+	}
 
 	return;
       }
 
     case DEMANGLE_COMPONENT_BUILTIN_TYPE:
-      if ((options & DMGL_JAVA) == 0)
-	d_append_buffer (dpi, dc->u.s_builtin.type->name,
-			 dc->u.s_builtin.type->len);
-      else
-	d_append_buffer (dpi, dc->u.s_builtin.type->java_name,
-			 dc->u.s_builtin.type->java_len);
-      return;
+	    if ((options & DMGL_JAVA) == 0) {
+		    d_append_buffer (dpi, dc->u.s_builtin.type->name,
+			    dc->u.s_builtin.type->len);
+	    } else {
+		    d_append_buffer (dpi, dc->u.s_builtin.type->java_name,
+			    dc->u.s_builtin.type->java_len);
+	    }
+	    return;
 
     case DEMANGLE_COMPONENT_VENDOR_TYPE:
       d_print_comp (dpi, options, d_left (dc));
@@ -4480,47 +4594,50 @@ d_print_comp (struct d_print_info *dpi, int options,
 
     case DEMANGLE_COMPONENT_FUNCTION_TYPE:
       {
-	if ((options & DMGL_RET_POSTFIX) != 0)
-	  d_print_function_type (dpi,
-				 options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
-				 dc, dpi->modifiers);
+	    if ((options & DMGL_RET_POSTFIX) != 0) {
+		    d_print_function_type (dpi,
+			    options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			    dc, dpi->modifiers);
+	    }
 
-	/* Print return type if present */
-	if (d_left (dc) != NULL && (options & DMGL_RET_POSTFIX) != 0)
-	  d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
-			d_left (dc));
-	else if (d_left (dc) != NULL && (options & DMGL_RET_DROP) == 0)
-	  {
-	    struct d_print_mod dpm;
+	    /* Print return type if present */
+	    if (d_left (dc) != NULL && (options & DMGL_RET_POSTFIX) != 0) {
+		    d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			    d_left (dc));
+	    } else if (d_left (dc) != NULL && (options & DMGL_RET_DROP) == 0) {
+		    struct d_print_mod dpm;
 
-	    /* We must pass this type down as a modifier in order to
+		    /* We must pass this type down as a modifier in order to
 	       print it in the right location.  */
-	    dpm.next = dpi->modifiers;
-	    dpi->modifiers = &dpm;
-	    dpm.mod = dc;
-	    dpm.printed = 0;
-	    dpm.templates = dpi->templates;
+		    dpm.next = dpi->modifiers;
+		    dpi->modifiers = &dpm;
+		    dpm.mod = dc;
+		    dpm.printed = 0;
+		    dpm.templates = dpi->templates;
 
-	    d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
-			  d_left (dc));
+		    d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			    d_left (dc));
 
-	    dpi->modifiers = dpm.next;
+		    dpi->modifiers = dpm.next;
 
-	    if (dpm.printed)
-	      return;
+		    if (dpm.printed) {
+			    return;
+		    }
 
-	    /* In standard prefix notation, there is a space between the
+		    /* In standard prefix notation, there is a space between the
 	       return type and the function signature.  */
-	    if ((options & DMGL_RET_POSTFIX) == 0)
-	      d_append_char (dpi, ' ');
+		    if ((options & DMGL_RET_POSTFIX) == 0) {
+			    d_append_char (dpi, ' ');
+		    }
 	  }
 
-	if ((options & DMGL_RET_POSTFIX) == 0)
-	  d_print_function_type (dpi,
-				 options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
-				 dc, dpi->modifiers);
+	  if ((options & DMGL_RET_POSTFIX) == 0) {
+		  d_print_function_type (dpi,
+			  options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			  dc, dpi->modifiers);
+	  }
 
-	return;
+	  return;
       }
 
     case DEMANGLE_COMPONENT_ARRAY_TYPE:
@@ -4575,8 +4692,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 
 	dpi->modifiers = hold_modifiers;
 
-	if (adpm[0].printed)
-	  return;
+	if (adpm[0].printed) {
+		return;
+	}
 
 	while (i > 1)
 	  {
@@ -4604,8 +4722,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 
 	/* If the modifier didn't get printed by the type, print it
 	   now.  */
-	if (! dpm.printed)
-	  d_print_mod (dpi, options, dc);
+	if (!dpm.printed) {
+		d_print_mod (dpi, options, dc);
+	}
 
 	dpi->modifiers = dpm.next;
 
@@ -4613,41 +4732,43 @@ d_print_comp (struct d_print_info *dpi, int options,
       }
 
     case DEMANGLE_COMPONENT_FIXED_TYPE:
-      if (dc->u.s_fixed.sat)
-	d_append_string (dpi, "_Sat ");
-      /* Don't print "int _Accum".  */
-      if (dc->u.s_fixed.length->u.s_builtin.type
-	  != &cplus_demangle_builtin_types['i'-'a'])
-	{
-	  d_print_comp (dpi, options, dc->u.s_fixed.length);
-	  d_append_char (dpi, ' ');
+	    if (dc->u.s_fixed.sat) {
+		    d_append_string (dpi, "_Sat ");
+	    }
+	    /* Don't print "int _Accum".  */
+	    if (dc->u.s_fixed.length->u.s_builtin.type != &cplus_demangle_builtin_types['i' - 'a']) {
+		    d_print_comp (dpi, options, dc->u.s_fixed.length);
+		    d_append_char (dpi, ' ');
 	}
-      if (dc->u.s_fixed.accum)
-	d_append_string (dpi, "_Accum");
-      else
-	d_append_string (dpi, "_Fract");
-      return;
+	if (dc->u.s_fixed.accum) {
+		d_append_string (dpi, "_Accum");
+	} else {
+		d_append_string (dpi, "_Fract");
+	}
+	return;
 
     case DEMANGLE_COMPONENT_ARGLIST:
     case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
-      if (d_left (dc) != NULL)
-	d_print_comp (dpi, options, d_left (dc));
-      if (d_right (dc) != NULL)
-	{
-	  size_t len;
-	  unsigned long int flush_count;
-	  /* Make sure ", " isn't flushed by d_append_string, otherwise
+	    if (d_left (dc) != NULL) {
+		    d_print_comp (dpi, options, d_left (dc));
+	    }
+	    if (d_right (dc) != NULL) {
+		    size_t len;
+		    unsigned long int flush_count;
+		    /* Make sure ", " isn't flushed by d_append_string, otherwise
 	     dpi->len -= 2 wouldn't work.  */
-	  if (dpi->len >= sizeof (dpi->buf) - 2)
-	    d_print_flush (dpi);
-	  d_append_string (dpi, ", ");
-	  len = dpi->len;
-	  flush_count = dpi->flush_count;
-	  d_print_comp (dpi, options, d_right (dc));
-	  /* If that didn't print anything (which can happen with empty
+		    if (dpi->len >= sizeof (dpi->buf) - 2) {
+			    d_print_flush (dpi);
+		    }
+		    d_append_string (dpi, ", ");
+		    len = dpi->len;
+		    flush_count = dpi->flush_count;
+		    d_print_comp (dpi, options, d_right (dc));
+		    /* If that didn't print anything (which can happen with empty
 	     template argument packs), remove the comma and space.  */
-	  if (dpi->flush_count == flush_count && dpi->len == len)
-	    dpi->len -= 2;
+		    if (dpi->flush_count == flush_count && dpi->len == len) {
+			    dpi->len -= 2;
+		    }
 	}
       return;
 
@@ -4656,8 +4777,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	struct demangle_component *type = d_left (dc);
 	struct demangle_component *list = d_right (dc);
 
-	if (type)
-	  d_print_comp (dpi, options, type);
+	if (type) {
+		d_print_comp (dpi, options, type);
+	}
 	d_append_char (dpi, '{');
 	d_print_comp (dpi, options, list);
 	d_append_char (dpi, '}');
@@ -4671,11 +4793,13 @@ d_print_comp (struct d_print_info *dpi, int options,
 
 	d_append_string (dpi, "operator");
 	/* Add a space before new/delete.  */
-	if (IS_LOWER (op->name[0]))
-	  d_append_char (dpi, ' ');
+	if (IS_LOWER (op->name[0])) {
+		d_append_char (dpi, ' ');
+	}
 	/* Omit a trailing space.  */
-	if (op->name[len-1] == ' ')
-	  --len;
+	if (op->name[len - 1] == ' ') {
+		--len;
+	}
 	d_append_buffer (dpi, op->name, len);
 	return;
       }
@@ -4707,10 +4831,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	      {
 		/* Don't print the argument list for the address of a
 		   function.  */
-		if (operand->type == DEMANGLE_COMPONENT_TYPED_NAME
-		    && d_left (operand)->type == DEMANGLE_COMPONENT_QUAL_NAME
-		    && d_right (operand)->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
-		  operand = d_left (operand);
+		if (operand->type == DEMANGLE_COMPONENT_TYPED_NAME && d_left (operand)->type == DEMANGLE_COMPONENT_QUAL_NAME && d_right (operand)->type == DEMANGLE_COMPONENT_FUNCTION_TYPE) {
+			operand = d_left (operand);
+		}
 	      }
 	    if (operand->type == DEMANGLE_COMPONENT_BINARY_ARGS)
 	      {
@@ -4722,26 +4845,25 @@ d_print_comp (struct d_print_info *dpi, int options,
 	      }
 	  }
 
-	if (op->type != DEMANGLE_COMPONENT_CAST)
-	  d_print_expr_op (dpi, options, op);
-	else
-	  {
-	    d_append_char (dpi, '(');
-	    d_print_cast (dpi, options, op);
-	    d_append_char (dpi, ')');
+	  if (op->type != DEMANGLE_COMPONENT_CAST) {
+		  d_print_expr_op (dpi, options, op);
+	  } else {
+		  d_append_char (dpi, '(');
+		  d_print_cast (dpi, options, op);
+		  d_append_char (dpi, ')');
 	  }
-	if (code && !strcmp (code, "gs"))
-	  /* Avoid parens after '::'.  */
-	  d_print_comp (dpi, options, operand);
-	else if (code && !strcmp (code, "st"))
+	  if (code && !strcmp (code, "gs")) {
+		  /* Avoid parens after '::'.  */
+		  d_print_comp (dpi, options, operand);
+	  } else if (code && !strcmp (code, "st"))
 	  /* Always print parens for sizeof (type).  */
 	  {
-	    d_append_char (dpi, '(');
-	    d_print_comp (dpi, options, operand);
-	    d_append_char (dpi, ')');
+		  d_append_char (dpi, '(');
+		  d_print_comp (dpi, options, operand);
+		  d_append_char (dpi, ')');
+	  } else {
+		  d_print_subexpr (dpi, options, operand);
 	  }
-	else
-	  d_print_subexpr (dpi, options, operand);
       }
       return;
 
@@ -4766,45 +4888,42 @@ d_print_comp (struct d_print_info *dpi, int options,
       /* We wrap an expression which uses the greater-than operator in
 	 an extra layer of parens so that it does not get confused
 	 with the '>' which ends the template parameters.  */
-      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
-	  && d_left (dc)->u.s_operator.op->len == 1
-	  && d_left (dc)->u.s_operator.op->name[0] == '>')
-	d_append_char (dpi, '(');
+	if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR && d_left (dc)->u.s_operator.op->len == 1 && d_left (dc)->u.s_operator.op->name[0] == '>') {
+		d_append_char (dpi, '(');
+	}
 
-      if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") == 0
-          && d_left (d_right (dc))->type == DEMANGLE_COMPONENT_TYPED_NAME)
-	{
-	  /* Function call used in an expression should not have printed types
+	if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") == 0 && d_left (d_right (dc))->type == DEMANGLE_COMPONENT_TYPED_NAME) {
+		/* Function call used in an expression should not have printed types
 	     of the function arguments.  Values of the function arguments still
 	     get printed below.  */
 
-	  const struct demangle_component *func = d_left (d_right (dc));
+		const struct demangle_component *func = d_left (d_right (dc));
 
-	  if (d_right (func)->type != DEMANGLE_COMPONENT_FUNCTION_TYPE)
-	    d_print_error (dpi);
-	  d_print_subexpr (dpi, options, d_left (func));
+		if (d_right (func)->type != DEMANGLE_COMPONENT_FUNCTION_TYPE) {
+			d_print_error (dpi);
+		}
+		d_print_subexpr (dpi, options, d_left (func));
+	} else {
+		d_print_subexpr (dpi, options, d_left (d_right (dc)));
 	}
-      else
-	d_print_subexpr (dpi, options, d_left (d_right (dc)));
-      if (strcmp (d_left (dc)->u.s_operator.op->code, "ix") == 0)
-	{
-	  d_append_char (dpi, '[');
-	  d_print_comp (dpi, options, d_right (d_right (dc)));
-	  d_append_char (dpi, ']');
+	if (strcmp (d_left (dc)->u.s_operator.op->code, "ix") == 0) {
+		d_append_char (dpi, '[');
+		d_print_comp (dpi, options, d_right (d_right (dc)));
+		d_append_char (dpi, ']');
 	}
       else
 	{
-	  if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") != 0)
-	    d_print_expr_op (dpi, options, d_left (dc));
-	  d_print_subexpr (dpi, options, d_right (d_right (dc)));
+		if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") != 0) {
+			d_print_expr_op (dpi, options, d_left (dc));
+		}
+		d_print_subexpr (dpi, options, d_right (d_right (dc)));
 	}
 
-      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
-	  && d_left (dc)->u.s_operator.op->len == 1
-	  && d_left (dc)->u.s_operator.op->name[0] == '>')
-	d_append_char (dpi, ')');
+	if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR && d_left (dc)->u.s_operator.op->len == 1 && d_left (dc)->u.s_operator.op->name[0] == '>') {
+		d_append_char (dpi, ')');
+	}
 
-      return;
+	return;
 
     case DEMANGLE_COMPONENT_BINARY_ARGS:
       /* We should only see this as part of DEMANGLE_COMPONENT_BINARY.  */
@@ -4841,8 +4960,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 		d_append_char (dpi, ' ');
 	      }
 	    d_print_comp (dpi, options, second);
-	    if (third)
-	      d_print_subexpr (dpi, options, third);
+	    if (third) {
+		    d_print_subexpr (dpi, options, third);
+	    }
 	  }
       }
       return;
@@ -4873,28 +4993,28 @@ d_print_comp (struct d_print_info *dpi, int options,
 	      case D_PRINT_UNSIGNED_LONG_LONG:
 		if (d_right (dc)->type == DEMANGLE_COMPONENT_NAME)
 		  {
-		    if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG)
-		      d_append_char (dpi, '-');
-		    d_print_comp (dpi, options, d_right (dc));
-		    switch (tp)
-		      {
-		      default:
-			break;
-		      case D_PRINT_UNSIGNED:
-			d_append_char (dpi, 'u');
-			break;
-		      case D_PRINT_LONG:
-			d_append_char (dpi, 'l');
-			break;
-		      case D_PRINT_UNSIGNED_LONG:
-			d_append_string (dpi, "ul");
-			break;
-		      case D_PRINT_LONG_LONG:
-			d_append_string (dpi, "ll");
-			break;
-		      case D_PRINT_UNSIGNED_LONG_LONG:
-			d_append_string (dpi, "ull");
-			break;
+			if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG) {
+				d_append_char (dpi, '-');
+			}
+			d_print_comp (dpi, options, d_right (dc));
+			switch (tp) {
+			default:
+				break;
+			case D_PRINT_UNSIGNED:
+				d_append_char (dpi, 'u');
+				break;
+			case D_PRINT_LONG:
+				d_append_char (dpi, 'l');
+				break;
+			case D_PRINT_UNSIGNED_LONG:
+				d_append_string (dpi, "ul");
+				break;
+			case D_PRINT_LONG_LONG:
+				d_append_string (dpi, "ll");
+				break;
+			case D_PRINT_UNSIGNED_LONG_LONG:
+				d_append_string (dpi, "ull");
+				break;
 		      }
 		    return;
 		  }
@@ -4927,13 +5047,16 @@ d_print_comp (struct d_print_info *dpi, int options,
 	d_append_char (dpi, '(');
 	d_print_comp (dpi, options, d_left (dc));
 	d_append_char (dpi, ')');
-	if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG)
-	  d_append_char (dpi, '-');
-	if (tp == D_PRINT_FLOAT)
-	  d_append_char (dpi, '[');
+	if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG) {
+		d_append_char (dpi, '-');
+	}
+	if (tp == D_PRINT_FLOAT) {
+		d_append_char (dpi, '[');
+	}
 	d_print_comp (dpi, options, d_right (dc));
-	if (tp == D_PRINT_FLOAT)
-	  d_append_char (dpi, ']');
+	if (tp == D_PRINT_FLOAT) {
+		d_append_char (dpi, ']');
+	}
       }
       return;
 
@@ -4982,8 +5105,9 @@ d_print_comp (struct d_print_info *dpi, int options,
 	  {
 	    dpi->pack_index = i;
 	    d_print_comp (dpi, options, dc);
-	    if (i < len-1)
-	      d_append_string (dpi, ", ");
+	    if (i < len - 1) {
+		    d_append_string (dpi, ", ");
+	    }
 	  }
       }
       return;
@@ -4991,13 +5115,12 @@ d_print_comp (struct d_print_info *dpi, int options,
     case DEMANGLE_COMPONENT_FUNCTION_PARAM:
       {
 	long num = dc->u.s_number.number;
-	if (num == 0)
-	  d_append_string (dpi, "this");
-	else
-	  {
-	    d_append_string (dpi, "{parm#");
-	    d_append_num (dpi, num);
-	    d_append_char (dpi, '}');
+	if (num == 0) {
+		d_append_string (dpi, "this");
+	} else {
+		d_append_string (dpi, "{parm#");
+		d_append_num (dpi, num);
+		d_append_char (dpi, '}');
 	  }
       }
       return;
@@ -5066,14 +5189,15 @@ d_print_java_identifier (struct d_print_info *dpi, const char *name, int len)
 	    {
 	      int dig;
 
-	      if (IS_DIGIT (*q))
-		dig = *q - '0';
-	      else if (*q >= 'A' && *q <= 'F')
-		dig = *q - 'A' + 10;
-	      else if (*q >= 'a' && *q <= 'f')
-		dig = *q - 'a' + 10;
-	      else
-		break;
+	      if (IS_DIGIT (*q)) {
+		      dig = *q - '0';
+	      } else if (*q >= 'A' && *q <= 'F') {
+		      dig = *q - 'A' + 10;
+	      } else if (*q >= 'a' && *q <= 'f') {
+		      dig = *q - 'a' + 10;
+	      } else {
+		      break;
+	      }
 
 	      c = c * 16 + dig;
 	    }
@@ -5100,8 +5224,9 @@ d_print_mod_list (struct d_print_info *dpi, int options,
 {
   struct d_print_template *hold_dpt;
 
-  if (!mods || d_print_saw_error (dpi))
-    return;
+  if (!mods || d_print_saw_error (dpi)) {
+	  return;
+  }
 
   if (mods->printed
       || (! suffix
@@ -5148,10 +5273,11 @@ d_print_mod_list (struct d_print_info *dpi, int options,
       d_print_comp (dpi, options, d_left (mods->mod));
       dpi->modifiers = hold_modifiers;
 
-      if ((options & DMGL_JAVA) == 0)
-	d_append_string (dpi, "::");
-      else
-	d_append_char (dpi, '.');
+      if ((options & DMGL_JAVA) == 0) {
+	      d_append_string (dpi, "::");
+      } else {
+	      d_append_char (dpi, '.');
+      }
 
       dc = d_right (mods->mod);
 
@@ -5163,17 +5289,14 @@ d_print_mod_list (struct d_print_info *dpi, int options,
 	  dc = dc->u.s_unary_num.sub;
 	}
 
-      while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS
-	     || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS
-	     || dc->type == DEMANGLE_COMPONENT_CONST_THIS
-	     || dc->type == DEMANGLE_COMPONENT_REFERENCE_THIS
-	     || dc->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS)
-	dc = d_left (dc);
+	while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS || dc->type == DEMANGLE_COMPONENT_CONST_THIS || dc->type == DEMANGLE_COMPONENT_REFERENCE_THIS || dc->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS) {
+		dc = d_left (dc);
+	}
 
-      d_print_comp (dpi, options, dc);
+	d_print_comp (dpi, options, dc);
 
-      dpi->templates = hold_dpt;
-      return;
+	dpi->templates = hold_dpt;
+	return;
     }
 
   d_print_mod (dpi, options, mods->mod);
@@ -5209,8 +5332,9 @@ d_print_mod (struct d_print_info *dpi, int options,
       return;
     case DEMANGLE_COMPONENT_POINTER:
       /* There is no pointer symbol in Java.  */
-      if ((options & DMGL_JAVA) == 0)
-	d_append_char (dpi, '*');
+      if ((options & DMGL_JAVA) == 0) {
+	      d_append_char (dpi, '*');
+      }
       return;
     case DEMANGLE_COMPONENT_REFERENCE_THIS:
       /* For the ref-qualifier, put a space before the &.  */
@@ -5230,11 +5354,12 @@ d_print_mod (struct d_print_info *dpi, int options,
       d_append_string (dpi, "imaginary ");
       return;
     case DEMANGLE_COMPONENT_PTRMEM_TYPE:
-      if (d_last_char (dpi) != '(')
-	d_append_char (dpi, ' ');
-      d_print_comp (dpi, options, d_left (mod));
-      d_append_string (dpi, "::*");
-      return;
+	    if (d_last_char (dpi) != '(') {
+		    d_append_char (dpi, ' ');
+	    }
+	    d_print_comp (dpi, options, d_left (mod));
+	    d_append_string (dpi, "::*");
+	    return;
     case DEMANGLE_COMPONENT_TYPED_NAME:
       d_print_comp (dpi, options, d_left (mod));
       return;
@@ -5268,50 +5393,52 @@ d_print_function_type (struct d_print_info *dpi, int options,
   need_space = 0;
   for (p = mods; p != NULL; p = p->next)
     {
-      if (p->printed)
-	break;
+	  if (p->printed) {
+		  break;
+	  }
 
-      switch (p->mod->type)
-	{
-	case DEMANGLE_COMPONENT_POINTER:
-	case DEMANGLE_COMPONENT_REFERENCE:
-	case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
-	  need_paren = 1;
-	  break;
-	case DEMANGLE_COMPONENT_RESTRICT:
-	case DEMANGLE_COMPONENT_VOLATILE:
-	case DEMANGLE_COMPONENT_CONST:
-	case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
-	case DEMANGLE_COMPONENT_COMPLEX:
-	case DEMANGLE_COMPONENT_IMAGINARY:
-	case DEMANGLE_COMPONENT_PTRMEM_TYPE:
-	  need_space = 1;
-	  need_paren = 1;
-	  break;
-	case DEMANGLE_COMPONENT_RESTRICT_THIS:
-	case DEMANGLE_COMPONENT_VOLATILE_THIS:
-	case DEMANGLE_COMPONENT_CONST_THIS:
-	case DEMANGLE_COMPONENT_REFERENCE_THIS:
-	case DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS:
-	  break;
-	default:
-	  break;
+	  switch (p->mod->type) {
+	  case DEMANGLE_COMPONENT_POINTER:
+	  case DEMANGLE_COMPONENT_REFERENCE:
+	  case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+		  need_paren = 1;
+		  break;
+	  case DEMANGLE_COMPONENT_RESTRICT:
+	  case DEMANGLE_COMPONENT_VOLATILE:
+	  case DEMANGLE_COMPONENT_CONST:
+	  case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+	  case DEMANGLE_COMPONENT_COMPLEX:
+	  case DEMANGLE_COMPONENT_IMAGINARY:
+	  case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+		  need_space = 1;
+		  need_paren = 1;
+		  break;
+	  case DEMANGLE_COMPONENT_RESTRICT_THIS:
+	  case DEMANGLE_COMPONENT_VOLATILE_THIS:
+	  case DEMANGLE_COMPONENT_CONST_THIS:
+	  case DEMANGLE_COMPONENT_REFERENCE_THIS:
+	  case DEMANGLE_COMPONENT_RVALUE_REFERENCE_THIS:
+		  break;
+	  default:
+		  break;
+	}
+	if (need_paren) {
+		break;
 	}
-      if (need_paren)
-	break;
     }
 
   if (need_paren)
     {
       if (! need_space)
 	{
-	  if (d_last_char (dpi) != '('
-	      && d_last_char (dpi) != '*')
-	    need_space = 1;
+	      if (d_last_char (dpi) != '(' && d_last_char (dpi) != '*') {
+		      need_space = 1;
+	      }
 	}
-      if (need_space && d_last_char (dpi) != ' ')
-	d_append_char (dpi, ' ');
-      d_append_char (dpi, '(');
+	if (need_space && d_last_char (dpi) != ' ') {
+		d_append_char (dpi, ' ');
+	}
+	d_append_char (dpi, '(');
     }
 
   hold_modifiers = dpi->modifiers;
@@ -5319,13 +5446,15 @@ d_print_function_type (struct d_print_info *dpi, int options,
 
   d_print_mod_list (dpi, options, mods, 0);
 
-  if (need_paren)
-    d_append_char (dpi, ')');
+  if (need_paren) {
+	  d_append_char (dpi, ')');
+  }
 
   d_append_char (dpi, '(');
 
-  if (d_right (dc) != NULL)
-    d_print_comp (dpi, options, d_right (dc));
+  if (d_right (dc) != NULL) {
+	  d_print_comp (dpi, options, d_right (dc));
+  }
 
   d_append_char (dpi, ')');
 
@@ -5368,24 +5497,28 @@ d_print_array_type (struct d_print_info *dpi, int options,
 	    }
 	}
 
-      if (need_paren)
-	d_append_string (dpi, " (");
+	if (need_paren) {
+		d_append_string (dpi, " (");
+	}
 
-      d_print_mod_list (dpi, options, mods, 0);
+	d_print_mod_list (dpi, options, mods, 0);
 
-      if (need_paren)
-	d_append_char (dpi, ')');
+	if (need_paren) {
+		d_append_char (dpi, ')');
+	}
     }
 
-  if (need_space)
-    d_append_char (dpi, ' ');
+    if (need_space) {
+	    d_append_char (dpi, ' ');
+    }
 
-  d_append_char (dpi, '[');
+    d_append_char (dpi, '[');
 
-  if (d_left (dc) != NULL)
-    d_print_comp (dpi, options, d_left (dc));
+    if (d_left (dc) != NULL) {
+	    d_print_comp (dpi, options, d_left (dc));
+    }
 
-  d_append_char (dpi, ']');
+    d_append_char (dpi, ']');
 }
 
 /* Print an operator in an expression.  */
@@ -5394,11 +5527,12 @@ static void
 d_print_expr_op (struct d_print_info *dpi, int options,
                  const struct demangle_component *dc)
 {
-  if (dc->type == DEMANGLE_COMPONENT_OPERATOR)
-    d_append_buffer (dpi, dc->u.s_operator.op->name,
-		     dc->u.s_operator.op->len);
-  else
-    d_print_comp (dpi, options, dc);
+	if (dc->type == DEMANGLE_COMPONENT_OPERATOR) {
+		d_append_buffer (dpi, dc->u.s_operator.op->name,
+			dc->u.s_operator.op->len);
+	} else {
+		d_print_comp (dpi, options, dc);
+	}
 }
 
 /* Print a cast.  */
@@ -5407,40 +5541,41 @@ static void
 d_print_cast (struct d_print_info *dpi, int options,
               const struct demangle_component *dc)
 {
-  if (d_left (dc)->type != DEMANGLE_COMPONENT_TEMPLATE)
-    d_print_comp (dpi, options, d_left (dc));
-  else
-    {
-      struct d_print_mod *hold_dpm;
-      struct d_print_template dpt;
+	if (d_left (dc)->type != DEMANGLE_COMPONENT_TEMPLATE) {
+		d_print_comp (dpi, options, d_left (dc));
+	} else {
+		struct d_print_mod *hold_dpm;
+		struct d_print_template dpt;
 
-      /* It appears that for a templated cast operator, we need to put
+		/* It appears that for a templated cast operator, we need to put
 	 the template parameters in scope for the operator name, but
 	 not for the parameters.  The effect is that we need to handle
 	 the template printing here.  */
 
-      hold_dpm = dpi->modifiers;
-      dpi->modifiers = NULL;
+		hold_dpm = dpi->modifiers;
+		dpi->modifiers = NULL;
 
-      dpt.next = dpi->templates;
-      dpi->templates = &dpt;
-      dpt.template_decl = d_left (dc);
+		dpt.next = dpi->templates;
+		dpi->templates = &dpt;
+		dpt.template_decl = d_left (dc);
 
-      d_print_comp (dpi, options, d_left (d_left (dc)));
+		d_print_comp (dpi, options, d_left (d_left (dc)));
 
-      dpi->templates = dpt.next;
+		dpi->templates = dpt.next;
 
-      if (d_last_char (dpi) == '<')
-	d_append_char (dpi, ' ');
-      d_append_char (dpi, '<');
-      d_print_comp (dpi, options, d_right (d_left (dc)));
-      /* Avoid generating two consecutive '>' characters, to avoid
+		if (d_last_char (dpi) == '<') {
+			d_append_char (dpi, ' ');
+		}
+		d_append_char (dpi, '<');
+		d_print_comp (dpi, options, d_right (d_left (dc)));
+		/* Avoid generating two consecutive '>' characters, to avoid
 	 the C++ syntactic ambiguity.  */
-      if (d_last_char (dpi) == '>')
-	d_append_char (dpi, ' ');
-      d_append_char (dpi, '>');
+		if (d_last_char (dpi) == '>') {
+			d_append_char (dpi, ' ');
+		}
+		d_append_char (dpi, '>');
 
-      dpi->modifiers = hold_dpm;
+		dpi->modifiers = hold_dpm;
     }
 }
 
@@ -5496,18 +5631,15 @@ d_demangle_callback (const char *mangled, int options,
   struct demangle_component *dc;
   int status;
 
-  if (mangled[0] == '_' && mangled[1] == 'Z')
-    type = DCT_MANGLED;
-  else if (strncmp (mangled, "_GLOBAL_", 8) == 0
-	   && (mangled[8] == '.' || mangled[8] == '_' || mangled[8] == '$')
-	   && (mangled[9] == 'D' || mangled[9] == 'I')
-	   && mangled[10] == '_')
-    type = mangled[9] == 'I' ? DCT_GLOBAL_CTORS : DCT_GLOBAL_DTORS;
-  else
-    {
-      if ((options & DMGL_TYPES) == 0)
-	return 0;
-      type = DCT_TYPE;
+  if (mangled[0] == '_' && mangled[1] == 'Z') {
+	  type = DCT_MANGLED;
+  } else if (strncmp (mangled, "_GLOBAL_", 8) == 0 && (mangled[8] == '.' || mangled[8] == '_' || mangled[8] == '$') && (mangled[9] == 'D' || mangled[9] == 'I') && mangled[10] == '_') {
+	  type = mangled[9] == 'I' ? DCT_GLOBAL_CTORS : DCT_GLOBAL_DTORS;
+  } else {
+	  if ((options & DMGL_TYPES) == 0) {
+		  return 0;
+	  }
+	  type = DCT_TYPE;
     }
 
   cplus_demangle_init_info (mangled, options, strlen (mangled), &di);
@@ -5554,8 +5686,9 @@ d_demangle_callback (const char *mangled, int options,
        mangled string, then we didn't successfully demangle it.  If
        DMGL_PARAMS is not set, we didn't look at the trailing
        parameters.  */
-    if (((options & DMGL_PARAMS) != 0) && d_peek_char (&di) != '\0')
-      dc = NULL;
+      if (((options & DMGL_PARAMS) != 0) && d_peek_char (&di) != '\0') {
+	      dc = NULL;
+      }
 
 #ifdef CP_DEMANGLE_DEBUG
     d_dump (dc, 0);
@@ -5866,8 +5999,9 @@ is_gnu_v3_mangled_ctor (const char *name)
   enum gnu_v3_ctor_kinds ctor_kind;
   enum gnu_v3_dtor_kinds dtor_kind;
 
-  if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
-    return (enum gnu_v3_ctor_kinds) 0;
+  if (!is_ctor_or_dtor (name, &ctor_kind, &dtor_kind)) {
+	  return (enum gnu_v3_ctor_kinds)0;
+  }
   return ctor_kind;
 }
 
@@ -5881,8 +6015,9 @@ is_gnu_v3_mangled_dtor (const char *name)
   enum gnu_v3_ctor_kinds ctor_kind;
   enum gnu_v3_dtor_kinds dtor_kind;
 
-  if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
-    return (enum gnu_v3_dtor_kinds) 0;
+  if (!is_ctor_or_dtor (name, &ctor_kind, &dtor_kind)) {
+	  return (enum gnu_v3_dtor_kinds)0;
+  }
   return dtor_kind;
 }
 
diff --git a/libr/bin/mangling/dlang.c b/libr/bin/mangling/dlang.c
index 21ee95a596..f976b6661d 100644
--- a/libr/bin/mangling/dlang.c
+++ b/libr/bin/mangling/dlang.c
@@ -5,10 +5,12 @@
 // The dlang-demangler is written in D and available at radare2-extras
 
 static int is_dlang_symbol (const char *name) {
-	if (!strncmp (name, "_D2", 3)) 
+	if (!strncmp (name, "_D2", 3)) {
 		return 1;
-	if (!strncmp (name, "_D4", 3))
+	}
+	if (!strncmp (name, "_D4", 3)) {
 		return 1;
+	}
 	return 0;
 }
 
@@ -20,8 +22,9 @@ R_API bool r_bin_lang_dlang(RBinFile *binfile) {
 	RListIter *iter;
 	const char *lib;
 
-	if (!info)
+	if (!info) {
 		return false;
+	}
 	r_list_foreach (o->libs, iter, lib) {
 		if (strstr (lib, "phobos")) {
 			hasdlang = true;
@@ -36,7 +39,8 @@ R_API bool r_bin_lang_dlang(RBinFile *binfile) {
 			}
 		}
 	}
-	if (hasdlang)
+	if (hasdlang) {
 		info->lang = "dlang";
+	}
 	return hasdlang;
 }
diff --git a/libr/bin/mangling/microsoft_demangle.c b/libr/bin/mangling/microsoft_demangle.c
index 0d84a3cca2..13c1c9f3f5 100644
--- a/libr/bin/mangling/microsoft_demangle.c
+++ b/libr/bin/mangling/microsoft_demangle.c
@@ -299,7 +299,9 @@ int get_namespace_and_name(	char *buf, STypeCodeStr *type_code_str,
 		{
 			int i = 0;
 			str_info = (SStrInfo *) malloc (sizeof(SStrInfo));
-			if (!str_info) break;
+			if (!str_info) {
+				break;
+			}
 			i = get_template (buf + 1, str_info);
 			if (!i) {
 				R_FREE (str_info);
@@ -664,8 +666,9 @@ char* get_num(SStateInfo *state)
 			state->amount_of_read_chars++;
 		}
 
-		if (*state->buff_for_parsing != '@')
+		if (*state->buff_for_parsing != '@') {
 			return ptr;
+		}
 
 		ptr = (char *)malloc (16);
 		sprintf (ptr, "%u", ret);
@@ -1350,8 +1353,9 @@ static EDemanglerErr parse_microsoft_mangled_name(char *sym, char **demangled_na
 		}
 	}
 
-	while (*curr_pos == '@')
+	while (*curr_pos == '@') {
 		curr_pos++;
+	}
 
 	if (*curr_pos != 'Z') {
 		err = eDemanglerErrUncorrectMangledSymbol;
diff --git a/libr/bin/mangling/msvc.c b/libr/bin/mangling/msvc.c
index 7aaaa72ddb..4e41276b5a 100644
--- a/libr/bin/mangling/msvc.c
+++ b/libr/bin/mangling/msvc.c
@@ -19,8 +19,9 @@ R_API bool r_bin_lang_msvc(RBinFile *binfile) {
 				break;
 			}
 		}
-		if (hascxx)
+		if (hascxx) {
 			info->lang = "msvc";
+		}
 	}
 	return hascxx;
 }
diff --git a/libr/bin/mangling/objc.c b/libr/bin/mangling/objc.c
index 2804c56a90..9c3774d0ea 100644
--- a/libr/bin/mangling/objc.c
+++ b/libr/bin/mangling/objc.c
@@ -11,10 +11,13 @@ R_API bool r_bin_lang_objc(RBinFile *binfile) {
 	const char *ft;
 	char *dsym;
 
-	if (!info) return false;
-	ft = info->rclass;
-	if (!ft || (!strstr (ft, "mach") && !strstr (ft, "elf")))
+	if (!info) {
 		return false;
+	}
+	ft = info->rclass;
+	if (!ft || (!strstr (ft, "mach") && !strstr (ft, "elf"))) {
+		return false;
+	}
 	r_list_foreach (o->symbols, iter, sym) {
 		if (!hasobjc && !strncmp (sym->name, "_OBJC_", 6)) {
 			hasobjc = true;
@@ -26,8 +29,9 @@ R_API bool r_bin_lang_objc(RBinFile *binfile) {
 			free (dsym);
 		}
 	}
-	if (hasobjc)
+	if (hasobjc) {
 		info->lang = "objc";
+	}
 	// create class members and set method names
 	// iterate on symbols to conscruct class/methods
 	return hasobjc;
diff --git a/libr/bin/mangling/swift-sd.c b/libr/bin/mangling/swift-sd.c
index 95babc5647..dde420ef94 100644
--- a/libr/bin/mangling/swift-sd.c
+++ b/libr/bin/mangling/swift-sd.c
@@ -84,7 +84,9 @@ static const char *getnum(const char* n, int *num) {
 }
 
 static const char *numpos(const char* n) {
-	while (*n && (*n<'0' || *n>'9')) n++;
+	while (*n && (*n < '0' || *n > '9')) {
+		n++;
+	}
 	return n;
 }
 
@@ -105,7 +107,9 @@ static const char *resolve(struct Type *t, const char *foo, const char **bar) {
 	for (; t[0].code; t++) {
 		int len = strlen (t[0].code);
 		if (!strncmp (foo, t[0].code, len)) {
-			if (bar) *bar = t[0].name;
+			if (bar) {
+				*bar = t[0].name;
+			}
 			return foo + len;
 		}
 	}
@@ -158,14 +162,20 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 	int is_first = 1;
 	int is_last = 0;
 	int retmode = 0;
-	if (!strncmp (s, "imp.", 4)) s = s + 4;
-	if (!strncmp (s, "reloc.", 6)) s = s + 6;
+	if (!strncmp (s, "imp.", 4)) {
+		s = s + 4;
+	}
+	if (!strncmp (s, "reloc.", 6)) {
+		s = s + 6;
+	}
 
 	if (*s != 'T' && strncmp (s, "_T", 2) && strncmp (s, "__T", 3)) {
 		return NULL;
 	}
 
-	if (!strncmp (s, "__", 2)) s = s + 2;
+	if (!strncmp (s, "__", 2)) {
+		s = s + 2;
+	}
 #if 0
 	const char *element[] = {
 		"module", "class", "method", NULL
@@ -274,8 +284,9 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 				q++;
 			}
 			q = getnum (q, &len);
-			if (!len)
+			if (!len) {
 				break;
+			}
 			const char *str = getstring (q, len);
 			if (len == 2 && !strcmp (str, "ee")) {
 				strcat (out, "Swift");
@@ -285,7 +296,9 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 						len, getstring (q, len));
 #endif
 				// push string
-				if (i && *out) strcat (out, ".");
+				if (i && *out) {
+					strcat (out, ".");
+				}
 				STRCAT_BOUNDS (len);
 				len = R_MIN (len, strlen (q));
 				strcat (out, getstring (q, len));
@@ -380,7 +393,9 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 					}
 					break;
 				case 'S': // "S0"
-					if (q[1]=='1') q++;
+					if (q[1] == '1') {
+						q++;
+					}
 					switch (q[1]) {
 					case '0':
 						strcat (out, " (self) -> ()");
@@ -536,8 +551,9 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 		//printf ("Unsupported type: %c\n", *p);
 	}
 	if (*out) {
-		if (tail)
+		if (tail) {
 			strcat (out, tail);
+		}
 #if 1
 		char *p, *outstr = strdup (out);
 		p = outstr;
@@ -547,7 +563,9 @@ R_API char *r_bin_demangle_swift(const char *s, int syscmd) {
 				p[0] = '_';
 				p[1] = '_';
 				p+=2;
-			} else break;
+			} else {
+				break;
+			}
 		}
 		return outstr;
 #endif
diff --git a/libr/bin/p/bin_avr.c b/libr/bin/p/bin_avr.c
index b95772b259..44eaaff173 100644
--- a/libr/bin/p/bin_avr.c
+++ b/libr/bin/p/bin_avr.c
@@ -111,7 +111,9 @@ static RList* entries(RBinFile *bf) {
 
 static void addsym(RList *ret, const char *name, ut64 addr) {
 	RBinSymbol *ptr = R_NEW0 (RBinSymbol);
-	if (!ptr) return;
+	if (!ptr) {
+		return;
+	}
 	ptr->name = strdup (name? name: "");
 	ptr->paddr = ptr->vaddr = addr;
 	ptr->size = 0;
diff --git a/libr/bin/p/bin_dex.c b/libr/bin/p/bin_dex.c
index 51c3614631..596ea98e5d 100644
--- a/libr/bin/p/bin_dex.c
+++ b/libr/bin/p/bin_dex.c
@@ -1859,7 +1859,9 @@ static int getoffset(RBinFile *bf, int type, int idx) {
 		break;
 	case 's': // strings
 		if (dex->header.strings_size > idx) {
-			if (dex->strings) return dex->strings[idx];
+			if (dex->strings) {
+				return dex->strings[idx];
+			}
 		}
 		break;
 	case 't': // type
diff --git a/libr/bin/p/bin_dyldcache.c b/libr/bin/p/bin_dyldcache.c
index f9ec48639f..f1a707b7bf 100644
--- a/libr/bin/p/bin_dyldcache.c
+++ b/libr/bin/p/bin_dyldcache.c
@@ -176,9 +176,15 @@ static struct MACH0_(obj_t) *bin_to_mach0(RBinFile *bf, RDyldBinImage *bin) {
 
 static int prot2perm(int x) {
 	int r = 0;
-	if (x&1) r |= 4;
-	if (x&2) r |= 2;
-	if (x&4) r |= 1;
+	if (x & 1) {
+		r |= 4;
+	}
+	if (x & 2) {
+		r |= 2;
+	}
+	if (x & 4) {
+		r |= 1;
+	}
 	return r;
 }
 
diff --git a/libr/bin/p/bin_mach0.c b/libr/bin/p/bin_mach0.c
index e23368caba..99380aaa1e 100644
--- a/libr/bin/p/bin_mach0.c
+++ b/libr/bin/p/bin_mach0.c
@@ -500,16 +500,19 @@ static RBinInfo* info(RBinFile *bf) {
 	char *str;
 	RBinInfo *ret;
 
-	if (!bf || !bf->o)
+	if (!bf || !bf->o) {
 		return NULL;
+	}
 
 	ret = R_NEW0 (RBinInfo);
-	if (!ret)
+	if (!ret) {
 		return NULL;
+	}
 
 	bin = bf->o->bin_obj;
-	if (bf->file)
+	if (bf->file) {
 		ret->file = strdup (bf->file);
+	}
 	if ((str = MACH0_(get_class) (bf->o->bin_obj))) {
 		ret->bclass = str;
 	}
@@ -543,8 +546,9 @@ static RBinInfo* info(RBinFile *bf) {
 static bool check_bytes(const ut8 *buf, ut64 length) {
 	if (buf && length >= 4) {
 		if (!memcmp (buf, "\xce\xfa\xed\xfe", 4) ||
-			!memcmp (buf, "\xfe\xed\xfa\xce", 4))
+			!memcmp (buf, "\xfe\xed\xfa\xce", 4)) {
 			return true;
+		}
 	}
 	return false;
 }
diff --git a/libr/bin/p/bin_mach064.c b/libr/bin/p/bin_mach064.c
index a10ce2ac93..13e0e36bb6 100644
--- a/libr/bin/p/bin_mach064.c
+++ b/libr/bin/p/bin_mach064.c
@@ -6,10 +6,12 @@
 #include "objc/mach064_classes.h"
 
 static bool check_bytes(const ut8 *buf, ut64 length) {
-	if (buf && length > 4)
+	if (buf && length > 4) {
 		if (!memcmp (buf, "\xfe\xed\xfa\xcf", 4) ||
-			!memcmp (buf, "\xcf\xfa\xed\xfe", 4))
+			!memcmp (buf, "\xcf\xfa\xed\xfe", 4)) {
 			return true;
+		}
+	}
 	return false;
 }
 
@@ -263,8 +265,9 @@ static RBinAddr* binsym(RBinFile *bf, int sym) {
 	switch (sym) {
 	case R_BIN_SYM_MAIN:
 		addr = MACH0_(get_main) (bf->o->bin_obj);
-		if (!addr || !(ret = R_NEW0 (RBinAddr)))
+		if (!addr || !(ret = R_NEW0 (RBinAddr))) {
 			return NULL;
+		}
 		ret->paddr = ret->vaddr = addr;
 		break;
 	}
diff --git a/libr/bin/p/bin_mbn.c b/libr/bin/p/bin_mbn.c
index 38b1448c4b..65bb260c8d 100644
--- a/libr/bin/p/bin_mbn.c
+++ b/libr/bin/p/bin_mbn.c
@@ -38,11 +38,21 @@ static bool check_bytes(const ut8 *buf, ut64 bufsz) {
 		if (sb.vaddr < 0x100 || sb.psize > bufsz) { // NAND
 			return false;
 		}
-		if (sb.cert_va < sb.vaddr) return false;
-		if (sb.cert_sz >= 0xf0000) return false;
-		if (sb.sign_va < sb.vaddr) return false;
-		if (sb.sign_sz >= 0xf0000) return false;
-		if (sb.load_index < 1 || sb.load_index > 0x40) return false; // should be 0x19 ?
+		if (sb.cert_va < sb.vaddr) {
+			return false;
+		}
+		if (sb.cert_sz >= 0xf0000) {
+			return false;
+		}
+		if (sb.sign_va < sb.vaddr) {
+			return false;
+		}
+		if (sb.sign_sz >= 0xf0000) {
+			return false;
+		}
+		if (sb.load_index < 1 || sb.load_index > 0x40) {
+			return false; // should be 0x19 ?
+		}
 #if 0
 		eprintf ("V=%d\n", sb.version);
 		eprintf ("PA=0x%08x sz=0x%x\n", sb.paddr, sb.psize);
diff --git a/libr/bin/p/bin_nes.c b/libr/bin/p/bin_nes.c
index fca63269b3..73de534c84 100644
--- a/libr/bin/p/bin_nes.c
+++ b/libr/bin/p/bin_nes.c
@@ -40,7 +40,9 @@ static RBinInfo* info(RBinFile *bf) {
 
 static void addsym(RList *ret, const char *name, ut64 addr, ut32 size) {
 	RBinSymbol *ptr = R_NEW0 (RBinSymbol);
-	if (!ptr) return;
+	if (!ptr) {
+		return;
+	}
 	ptr->name = strdup (name? name: "");
 	ptr->paddr = ptr->vaddr = addr;
 	ptr->size = size;
diff --git a/libr/bin/p/bin_ningb.c b/libr/bin/p/bin_ningb.c
index 9452f9bf47..b99e5d3ba0 100644
--- a/libr/bin/p/bin_ningb.c
+++ b/libr/bin/p/bin_ningb.c
@@ -45,7 +45,9 @@ static RBinAddr* binsym(RBinFile *bf, int type) {
 	if (type == R_BIN_SYM_MAIN && bf && bf->buf) {
 		ut8 init_jmp[4];
 		RBinAddr *ret = R_NEW0 (RBinAddr);
-		if (!ret) return NULL;
+		if (!ret) {
+			return NULL;
+		}
 		r_buf_read_at (bf->buf, 0x100, init_jmp, 4);
 		if (init_jmp[1] == 0xc3) {
 			ret->paddr = ret->vaddr = init_jmp[3]*0x100 + init_jmp[2];
@@ -61,11 +63,13 @@ static RList* entries(RBinFile *bf) {
 	RBinAddr *ptr = NULL;
 
 	if (bf && bf->buf != NULL) {
-		if (!ret)
+		if (!ret) {
 			return NULL;
+		}
 		ret->free = free;
-		if (!(ptr = R_NEW0 (RBinAddr)))
+		if (!(ptr = R_NEW0 (RBinAddr))) {
 			return ret;
+		}
 		ptr->paddr = ptr->vaddr = ptr->hpaddr = 0x100;
 		r_list_append (ret, ptr);
 	}
@@ -77,12 +81,14 @@ static RList* sections(RBinFile *bf){
 	int i;
 	RList *ret;
 
-	if (!bf)
+	if (!bf) {
 		return NULL;
+	}
 
 	ret = r_list_new();
-	if (!ret )
+	if (!ret) {
 		return NULL;
+	}
 
 	r_buf_read_at (bf->buf, 0x148, &bank, 1);
 	bank = gb_get_rombanks(bank);
@@ -133,8 +139,9 @@ static RList* symbols(RBinFile *bf) {
 	RList *ret = NULL;
 	RBinSymbol *ptr[13];
 	int i;
-	if (!(ret = r_list_new()))
+	if (!(ret = r_list_new ())) {
 		return NULL;
+	}
 	ret->free = free;
 
 	for (i = 0; i < 8; i++) {
@@ -149,8 +156,9 @@ static RList* symbols(RBinFile *bf) {
 		r_list_append (ret, ptr[i]);
 	}
 
-	if (!(ptr[8] = R_NEW0 (RBinSymbol)))
+	if (!(ptr[8] = R_NEW0 (RBinSymbol))) {
 		return ret;
+	}
 
 	ptr[8]->name = strdup ("Interrupt_Vblank");
 	ptr[8]->paddr = ptr[8]->vaddr = 64;
@@ -158,8 +166,9 @@ static RList* symbols(RBinFile *bf) {
 	ptr[8]->ordinal = 8;
 	r_list_append (ret, ptr[8]);
 
-	if (!(ptr[9] = R_NEW0 (RBinSymbol)))
+	if (!(ptr[9] = R_NEW0 (RBinSymbol))) {
 		return ret;
+	}
 
 	ptr[9]->name = strdup ("Interrupt_LCDC-Status");
 	ptr[9]->paddr = ptr[9]->vaddr = 72;
@@ -167,8 +176,9 @@ static RList* symbols(RBinFile *bf) {
 	ptr[9]->ordinal = 9;
 	r_list_append (ret, ptr[9]);
 
-	if (!(ptr[10] = R_NEW0 (RBinSymbol)))
+	if (!(ptr[10] = R_NEW0 (RBinSymbol))) {
 		return ret;
+	}
 
 	ptr[10]->name = strdup ("Interrupt_Timer-Overflow");
 	ptr[10]->paddr = ptr[10]->vaddr = 80;
@@ -176,8 +186,9 @@ static RList* symbols(RBinFile *bf) {
 	ptr[10]->ordinal = 10;
 	r_list_append (ret, ptr[10]);
 
-	if (!(ptr[11] = R_NEW0 (RBinSymbol)))
+	if (!(ptr[11] = R_NEW0 (RBinSymbol))) {
 		return ret;
+	}
 
 	ptr[11]->name = strdup ("Interrupt_Serial-Transfere");
 	ptr[11]->paddr = ptr[11]->vaddr = 88;
@@ -185,8 +196,9 @@ static RList* symbols(RBinFile *bf) {
 	ptr[11]->ordinal = 11;
 	r_list_append (ret, ptr[11]);
 
-	if (!(ptr[12] = R_NEW0 (RBinSymbol)))
+	if (!(ptr[12] = R_NEW0 (RBinSymbol))) {
 		return ret;
+	}
 
 	ptr[12]->name = strdup ("Interrupt_Joypad");
 	ptr[12]->paddr = ptr[12]->vaddr = 96;
@@ -224,8 +236,9 @@ static RBinInfo* info(RBinFile *bf) {
 RList *mem (RBinFile *bf) {
 	RList *ret;
 	RBinMem *m, *n;
-	if (!(ret = r_list_new()))
+	if (!(ret = r_list_new ())) {
 		return NULL;
+	}
 	ret->free = free;
 	if (!(m = R_NEW0 (RBinMem))) {
 		r_list_free (ret);
@@ -237,39 +250,44 @@ RList *mem (RBinFile *bf) {
 	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
 
-	if (!(m = R_NEW0 (RBinMem)))
+	if (!(m = R_NEW0 (RBinMem))) {
 		return ret;
+	}
 	m->name = strdup ("ioports");
 	m->addr = 0xff00LL;
 	m->size = 0x4c;
 	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
 
-	if (!(m = R_NEW0 (RBinMem)))
+	if (!(m = R_NEW0 (RBinMem))) {
 		return ret;
+	}
 	m->name = strdup ("oam");
 	m->addr = 0xfe00LL;
 	m->size = 0xa0;
 	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
 
-	if (!(m = R_NEW0 (RBinMem)))
+	if (!(m = R_NEW0 (RBinMem))) {
 		return ret;
+	}
 	m->name = strdup ("videoram");
 	m->addr = 0x8000LL;
 	m->size = 0x2000;
 	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
 
-	if (!(m = R_NEW0 (RBinMem)))
+	if (!(m = R_NEW0 (RBinMem))) {
 		return ret;
+	}
 	m->name = strdup ("iram");
 	m->addr = 0xc000LL;
 	m->size = 0x2000;
 	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
-	if (!(m->mirrors = r_list_new()))
+	if (!(m->mirrors = r_list_new ())) {
 		return ret;
+	}
 	if (!(n = R_NEW0 (RBinMem))) {
 		r_list_free (m->mirrors);
 		m->mirrors = NULL;
diff --git a/libr/bin/p/bin_pe64.c b/libr/bin/p/bin_pe64.c
index 1c3dc21bfb..129e3d7490 100644
--- a/libr/bin/p/bin_pe64.c
+++ b/libr/bin/p/bin_pe64.c
@@ -8,10 +8,12 @@ static bool check_bytes(const ut8 *buf, ut64 length) {
 		return false;
 	}
 	idx = buf[0x3c] | (buf[0x3d] << 8);
-	if (length >= idx + 0x20)
+	if (length >= idx + 0x20) {
 		if (!memcmp (buf, "MZ", 2) && !memcmp (buf + idx, "PE", 2) &&
-		    !memcmp (buf + idx + 0x18, "\x0b\x02", 2))
+			!memcmp (buf + idx + 0x18, "\x0b\x02", 2)) {
 			ret = true;
+		}
+	}
 	return ret;
 }
 
diff --git a/libr/bin/p/bin_pebble.c b/libr/bin/p/bin_pebble.c
index 3d58561fb8..200d408e3f 100644
--- a/libr/bin/p/bin_pebble.c
+++ b/libr/bin/p/bin_pebble.c
@@ -74,8 +74,9 @@ static RBinInfo* info(RBinFile *bf) {
 		eprintf ("Truncated Header\n");
 		return NULL;
 	}
-	if (!(ret = R_NEW0 (RBinInfo)))
+	if (!(ret = R_NEW0 (RBinInfo))) {
 		return NULL;
+	}
 	ret->lang = NULL;
 	ret->file = strdup (bf->file);
 	ret->type = strdup ("pebble");
@@ -102,35 +103,41 @@ static RList* sections(RBinFile *bf) {
 		eprintf ("Truncated Header\n");
 		return NULL;
 	}
-	if (!(ret = r_list_new ()))
+	if (!(ret = r_list_new ())) {
 		return NULL;
+	}
 	ret->free = free;
 	// TODO: load all relocs
-	if (!(ptr = R_NEW0 (RBinSection)))
+	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
+	}
 	strcpy (ptr->name, "relocs");
 	ptr->vsize = ptr->size = pai.num_reloc_entries * sizeof (ut32);
 	ptr->vaddr = ptr->paddr = pai.reloc_list_start;
 	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
-	if (ptr->vaddr<textsize)
+	if (ptr->vaddr < textsize) {
 		textsize = ptr->vaddr;
+	}
 
 	// imho this must be a symbol
-	if (!(ptr = R_NEW0 (RBinSection)))
+	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
+	}
 	strcpy (ptr->name, "symtab");
 	ptr->vsize = ptr->size = 0;
 	ptr->vaddr = ptr->paddr = pai.sym_table_addr;
 	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
-	if (ptr->vaddr<textsize)
+	if (ptr->vaddr < textsize) {
 		textsize = ptr->vaddr;
+	}
 
-	if (!(ptr = R_NEW0 (RBinSection)))
+	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
+	}
 	strcpy (ptr->name, "text");
 	ptr->vaddr = ptr->paddr = 0x80;
 	ptr->vsize = ptr->size = textsize - ptr->paddr;
@@ -139,8 +146,9 @@ static RList* sections(RBinFile *bf) {
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
-	if (!(ptr = R_NEW0 (RBinSection)))
+	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
+	}
 	strcpy (ptr->name, "header");
 	ptr->vsize = ptr->size = sizeof (PebbleAppInfo);
 	ptr->vaddr = ptr->paddr = 0;
@@ -173,11 +181,13 @@ static RList* entries(RBinFile *bf) {
 		eprintf ("Truncated Header\n");
 		return NULL;
 	}
-	if (!(ret = r_list_new ()))
+	if (!(ret = r_list_new ())) {
 		return NULL;
+	}
 	ret->free = free;
-	if (!(ptr = R_NEW0 (RBinAddr)))
+	if (!(ptr = R_NEW0 (RBinAddr))) {
 		return ret;
+	}
 	ptr->paddr = pai.offset;
 	ptr->vaddr = pai.offset;
 	r_list_append (ret, ptr);
diff --git a/libr/bin/p/bin_psxexe.c b/libr/bin/p/bin_psxexe.c
index b6796e4b2d..f241cf48e0 100644
--- a/libr/bin/p/bin_psxexe.c
+++ b/libr/bin/p/bin_psxexe.c
@@ -83,8 +83,9 @@ static RList* entries(RBinFile* bf) {
 	RBinAddr* addr = NULL;
 	psxexe_header psxheader;
 
-	if (!(ret = r_list_new ()))
+	if (!(ret = r_list_new ())) {
 		return NULL;
+	}
 
 	if (!(addr = R_NEW0 (RBinAddr))) {
 		r_list_free (ret);
diff --git a/libr/bin/p/bin_vsf.c b/libr/bin/p/bin_vsf.c
index bfa3164877..38c2df8963 100644
--- a/libr/bin/p/bin_vsf.c
+++ b/libr/bin/p/bin_vsf.c
@@ -479,7 +479,9 @@ static RList* symbols(RBinFile *bf) {
 	};
 	static const int SYMBOLS_MAX = sizeof(_symbols) / sizeof(_symbols[0]);
 	struct r_bin_vsf_obj* vsf_obj = (struct r_bin_vsf_obj*) bf->o->bin_obj;
-	if (!vsf_obj) return NULL;
+	if (!vsf_obj) {
+		return NULL;
+	}
 	const int m_idx = vsf_obj->machine_idx;
 	int offset = _machines[m_idx].offset_mem;
 	RList *ret = NULL;
@@ -492,7 +494,9 @@ static RList* symbols(RBinFile *bf) {
 	int i;
 	for (i = 0; i < SYMBOLS_MAX; i++)
 	{
-		if (!(ptr = R_NEW0 (RBinSymbol))) return ret;
+		if (!(ptr = R_NEW0 (RBinSymbol))) {
+			return ret;
+		}
 		if (!ptr->name) {
 			ptr->name = calloc(1, R_BIN_SIZEOF_STRINGS);
 		}
@@ -515,7 +519,9 @@ static int destroy(RBinFile *bf) {
 
 static RList* entries(RBinFile *bf) {
 	struct r_bin_vsf_obj* vsf_obj = (struct r_bin_vsf_obj*) bf->o->bin_obj;
-	if (!vsf_obj) return NULL;
+	if (!vsf_obj) {
+		return NULL;
+	}
 	const int m_idx = vsf_obj->machine_idx;
 
 	RList *ret;
diff --git a/libr/bin/pdb/dbi.c b/libr/bin/pdb/dbi.c
index 87882be3ef..968fb279e8 100644
--- a/libr/bin/pdb/dbi.c
+++ b/libr/bin/pdb/dbi.c
@@ -139,14 +139,18 @@ void parse_dbi_stream(void *parsed_pdb_stream, R_STREAM_FILE *stream_file)
 
 	size = dbi_stream->dbi_header.module_size;
 	dbiexhdr_data = (char *) malloc(size);
-	if (!dbiexhdr_data) return;
+	if (!dbiexhdr_data) {
+		return;
+	}
 	stream_file_read (stream_file, size, dbiexhdr_data);
 
 	dbi_stream->dbiexhdrs = r_list_new();
 	p_tmp = dbiexhdr_data;
 	while (i < size) {
 		dbi_ex_header = (SDBIExHeader *) malloc (sizeof(SDBIExHeader));
-		if (!dbi_ex_header) break;
+		if (!dbi_ex_header) {
+			break;
+		}
 		// TODO: rewrite for signature where can to do chech CAN_READ true?
 		sz = parse_dbi_ex_header (p_tmp, size, dbi_ex_header);
 		if ((sz % _ALIGN)) {
diff --git a/libr/bin/pdb/fpo.c b/libr/bin/pdb/fpo.c
index ae580c2b7e..0ca659d03e 100644
--- a/libr/bin/pdb/fpo.c
+++ b/libr/bin/pdb/fpo.c
@@ -103,7 +103,9 @@ void parse_fpo_new_stream(void *stream, R_STREAM_FILE *stream_file)
 
 	stream_file_get_size (stream_file, &data_size);
 	data = (char *) malloc (data_size);
-	if (!data) return;
+	if (!data) {
+		return;
+	}
 	stream_file_get_data (stream_file, data);
 
 	fpo_stream = (SFPONewStream *) stream;
diff --git a/libr/bin/pdb/gdata.c b/libr/bin/pdb/gdata.c
index 8115792979..40ee5406e6 100644
--- a/libr/bin/pdb/gdata.c
+++ b/libr/bin/pdb/gdata.c
@@ -31,10 +31,13 @@ void parse_gdata_stream(void *stream, R_STREAM_FILE *stream_file) {
 	data_stream->globals_list = r_list_new();
 	while (1) {
 		stream_file_read(stream_file, 2, (char *)&len);
-		if (len == 0)
+		if (len == 0) {
 			break;
+		}
 		data = (char *) malloc(len);
-		if (!data) return;
+		if (!data) {
+			return;
+		}
 		stream_file_read(stream_file, len, data);
 
 		leaf_type = *(unsigned short *) (data);
@@ -73,8 +76,9 @@ void free_gdata_stream(void *stream)
 	it = r_list_iterator(data_stream->globals_list);
 	while (r_list_iter_next(it)) {
 		global = (SGlobal *) r_list_iter_get(it);
-		if (global->name.name)
-			free(global->name.name);
+		if (global->name.name) {
+			free (global->name.name);
+		}
 		free(global);
 	}
 	r_list_free(data_stream->globals_list);
diff --git a/libr/bin/pdb/omap.c b/libr/bin/pdb/omap.c
index 1830dd7f88..0e956cd4c1 100644
--- a/libr/bin/pdb/omap.c
+++ b/libr/bin/pdb/omap.c
@@ -20,7 +20,9 @@ void parse_omap_stream(void *stream, R_STREAM_FILE *stream_file) {
 
 	stream_file_get_size (stream_file, &data_size);
 	data = (char *) malloc (data_size);
-	if (!data) return;
+	if (!data) {
+		return;
+	}
 	stream_file_get_data (stream_file, data);
 
 	omap_stream = (SOmapStream *) stream;
@@ -29,7 +31,9 @@ void parse_omap_stream(void *stream, R_STREAM_FILE *stream_file) {
 	ptmp = data;
 	while (read_bytes < data_size) {
 		omap_entry = (SOmapEntry *) malloc (sizeof(SOmapEntry));
-		if (!omap_entry) break;
+		if (!omap_entry) {
+			break;
+		}
 		curr_read_bytes = parse_omap_entry (ptmp, data_size, &read_bytes, omap_entry);
 		if (!curr_read_bytes) {
 			free (omap_entry);
diff --git a/libr/bin/pdb/stream_file.c b/libr/bin/pdb/stream_file.c
index c4a4f2909a..743dc13896 100644
--- a/libr/bin/pdb/stream_file.c
+++ b/libr/bin/pdb/stream_file.c
@@ -41,8 +41,9 @@ static void stream_file_read_pages(R_STREAM_FILE *stream_file, int start_indx, i
 	for (i = start_indx; i < end_indx; i++) {
 //		tmp = stream_file->pages[i];
 		page_offset = stream_file->pages[i] * stream_file->page_size;
-		if (page_offset<1)
+		if (page_offset < 1) {
 			return;
+		}
 		stream_file->buf->cur = page_offset;
 		r_buf_read_at (stream_file->buf, page_offset,
 			(ut8*)res, stream_file->page_size);
@@ -75,8 +76,9 @@ void stream_file_read(R_STREAM_FILE *stream_file, int size, char *res)
 		GET_PAGE(pn_end, off_end, stream_file->pos + size, stream_file->page_size);
 		(void)off_end; // hack to remove unused warning
 		pdata = (char *) calloc(stream_file->page_size * (pn_end + 1 - pn_start), 1);
-		if (!pdata)
+		if (!pdata) {
 			return;
+		}
 		tmp = pdata;
 		stream_file_read_pages(stream_file, pn_start, pn_end + 1, tmp);
 		stream_file->pos += size;
@@ -102,8 +104,12 @@ void stream_file_seek(R_STREAM_FILE *stream_file, int offset, int whence)
 		break;
 	}
 
-	if (stream_file->pos < 0) stream_file->pos = 0;
-	if (stream_file->pos > stream_file->end) stream_file->pos = stream_file->end;
+	if (stream_file->pos < 0) {
+		stream_file->pos = 0;
+	}
+	if (stream_file->pos > stream_file->end) {
+		stream_file->pos = stream_file->end;
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libr/bin/pdb/tpi.c b/libr/bin/pdb/tpi.c
index 594426246e..fb5812fe82 100644
--- a/libr/bin/pdb/tpi.c
+++ b/libr/bin/pdb/tpi.c
@@ -911,8 +911,9 @@ static void free_lf_fieldlist(void *type) {
 	it = r_list_iterator(lf_fieldlist->substructs);
 	while (r_list_iter_next(it)) {
 		type_info = (STypeInfo *) r_list_iter_get(it);
-		if (type_info->free_)
-			type_info->free_(type_info);
+		if (type_info->free_) {
+			type_info->free_ (type_info);
+		}
 		if (type_info->type_info) {
 			free(type_info->type_info);
 		}
@@ -1010,8 +1011,9 @@ static void get_array_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("array: ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
 	if (!(*name)) {
 		if (need_to_free) {
@@ -1107,7 +1109,9 @@ static void get_modifier_print_type(void *type, char **name) {
 static void get_procedure_print_type(void *type, char **name) {
 	const int name_len = strlen ("proc ");
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, "proc ");
 }
@@ -1131,12 +1135,15 @@ static void get_bitfield_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("bitfield ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	name_len += 4;
 	*name = (char *) malloc (name_len + 1 + 1);
 	if (!(*name)) {
-		if (need_to_free) free (tmp_name);
+		if (need_to_free) {
+			free (tmp_name);
+		}
 		return;
 	}
 
@@ -1157,7 +1164,9 @@ static void get_fieldlist_print_type(void *type, char **name) {
 
 	name_len = strlen ("fieldlist ");
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, "fieldlist ");
 }
@@ -1180,20 +1189,25 @@ static void get_enum_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("enum ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
 	if (!(*name)) {
-		if (need_to_free) free (tmp_name);
+		if (need_to_free) {
+			free (tmp_name);
+		}
 		return;
 	}
 	// name[name_len] = '\0';
 	strcpy (*name, "enum ");
-	if (tmp_name)
-		strcat( *name, tmp_name);
+	if (tmp_name) {
+		strcat (*name, tmp_name);
+	}
 
-	if (need_to_free)
+	if (need_to_free) {
 		free (tmp_name);
+	}
 }
 
 static void get_class_struct_print_type(void *type, char **name) {
@@ -1211,19 +1225,23 @@ static void get_class_struct_print_type(void *type, char **name) {
 		tmp1 = "struct ";
 	}
 	name_len = strlen(tmp1);
-	if (tmp_name)
-		name_len += strlen(tmp_name);
+	if (tmp_name) {
+		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc(name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy(*name, tmp1);
-	if (tmp_name)
-		strcat(*name, tmp_name);
+	if (tmp_name) {
+		strcat (*name, tmp_name);
+	}
 
-//	if (need_to_free) {
-//		free(tmp_name);
-//		tmp_name = 0;
-//	}
+	//	if (need_to_free) {
+	//		free(tmp_name);
+	//		tmp_name = 0;
+	//	}
 }
 
 static void get_arglist_print_type(void *type, char **name) {
@@ -1232,7 +1250,9 @@ static void get_arglist_print_type(void *type, char **name) {
 
 	name_len = strlen ("arg_list");
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, "arg_list");
 //	STypeInfo *ti = (STypeInfo *) type;
@@ -1267,7 +1287,9 @@ static void get_mfunction_print_type(void *type, char **name) {
 
 	name_len = strlen("mfunction ");
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, "mfunction ");
 }
@@ -1284,19 +1306,23 @@ static void get_union_print_type(void *type, char **name) {
 
 	tmp1 = "union ";
 	name_len = strlen (tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
-//	if (need_to_free) {
-//		free(tmp_name);
-//		tmp_name = 0;
-//	}
+	//	if (need_to_free) {
+	//		free(tmp_name);
+	//		tmp_name = 0;
+	//	}
 }
 
 static void get_vtshape_print_type(void *type, char **name) {
@@ -1304,7 +1330,9 @@ static void get_vtshape_print_type(void *type, char **name) {
 
 	name_len = strlen ("vtshape");
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, "vthape");
 }
@@ -1318,17 +1346,21 @@ static void get_enumerate_print_type(void *type, char **name) {
 
 	tmp1 = "enumerate ";
 	name_len = strlen (tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
-//	if (need_to_free)
-//		free(tmp_name);
+	//	if (need_to_free)
+	//		free(tmp_name);
 }
 
 static void get_nesttype_print_type(void *type, char **name) {
@@ -1357,20 +1389,25 @@ static void get_nesttype_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("nesttype ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
 	if (!(*name)) {
-		if (need_to_free) free (tmp_name);
+		if (need_to_free) {
+			free (tmp_name);
+		}
 		return;
 	}
 	// name[name_len] = '\0';
 	strcpy (*name, "nesttype ");
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
-	if (need_to_free)
+	if (need_to_free) {
 		free (tmp_name);
+	}
 }
 
 static void get_method_print_type(void *type, char **name) {
@@ -1382,17 +1419,21 @@ static void get_method_print_type(void *type, char **name) {
 
 	tmp1 = "method ";
 	name_len = strlen (tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
-	if (!(*name)) return;
+	if (!(*name)) {
+		return;
+	}
 	// name[name_len] = '\0';
 	strcpy (*name, tmp1);
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
-//	if (need_to_free)
-//		free(tmp_name);
+	//	if (need_to_free)
+	//		free(tmp_name);
 }
 
 static void get_member_print_type(void *type, char **name) {
@@ -1413,8 +1454,9 @@ static void get_member_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("(member) ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
 	if (!(*name)) {
 		if (need_to_free) R_FREE (tmp_name);
@@ -1422,8 +1464,9 @@ static void get_member_print_type(void *type, char **name) {
 	}
 	// name[name_len] = '\0';
 	strcpy(*name, "(member) ");
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
 	if (need_to_free) {
 		R_FREE (tmp_name);
@@ -1448,20 +1491,25 @@ static void get_onemethod_print_type(void *type, char **name) {
 	}
 
 	name_len = strlen ("onemethod ");
-	if (tmp_name)
+	if (tmp_name) {
 		name_len += strlen (tmp_name);
+	}
 	*name = (char *) malloc (name_len + 1);
 	if (!(*name)) {
-		if (need_to_free) free (tmp_name);
+		if (need_to_free) {
+			free (tmp_name);
+		}
 		return;
 	}
 	// name[name_len] = '\0';
 	strcpy (*name, "onemethod ");
-	if (tmp_name)
+	if (tmp_name) {
 		strcat (*name, tmp_name);
+	}
 
-	if (need_to_free)
+	if (need_to_free) {
 		free (tmp_name);
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1469,7 +1517,9 @@ void init_scstring(SCString *cstr, unsigned int size, char *name)
 {
 	cstr->size = size;
 	cstr->name = (char *) malloc (size);
-	if (!cstr->name) return;
+	if (!cstr->name) {
+		return;
+	}
 	strcpy (cstr->name, name);
 }
 
@@ -1508,7 +1558,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 
 	if (val->value_or_type < eLF_CHAR) {
 		SCString *sctr = (SCString *) malloc (sizeof (SCString));
-		if (!sctr) return 0;
+		if (!sctr) {
+			return 0;
+		}
 		parse_sctring (sctr, leaf_data, read_bytes, len);
 		val->name_or_val = sctr;
 	} else {
@@ -1519,7 +1571,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 		    READ8(*read_bytes, len, lf_uqword.value, leaf_data, st64);
 		    parse_sctring(&lf_uqword.name, leaf_data, read_bytes, len);
 		    val->name_or_val = malloc(sizeof(SVal_LF_UQUADWORD));
-		    if (!val->name_or_val) break;
+		    if (!val->name_or_val) {
+			    break;
+		    }
 		    memcpy(val->name_or_val, &lf_uqword, sizeof(SVal_LF_UQUADWORD));
 		    break;
 		}
@@ -1529,7 +1583,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ8(*read_bytes, len, lf_qword.value, leaf_data, st64);
 			parse_sctring (&lf_qword.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof (SVal_LF_QUADWORD));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy (val->name_or_val, &lf_qword, sizeof (SVal_LF_QUADWORD));
 			break;
 		}
@@ -1539,7 +1595,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ2(*read_bytes, len, lf_char.value, leaf_data, st16);
 			parse_sctring (&lf_char.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof (SVal_LF_CHAR));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy (val->name_or_val, &lf_char, sizeof (SVal_LF_CHAR));
 			break;
 		}
@@ -1553,7 +1611,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ4(*read_bytes, len, lf_long.value, leaf_data, st32);
 			parse_sctring (&lf_long.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof (SVal_LF_LONG));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy (val->name_or_val, &lf_long, sizeof (SVal_LF_LONG));
 			break;
 		}
@@ -1567,7 +1627,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ4(*read_bytes, len, lf_ulong.value, leaf_data, ut32);
 			parse_sctring (&lf_ulong.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof (SVal_LF_ULONG));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy(val->name_or_val, &lf_ulong, sizeof (SVal_LF_ULONG));
 			break;
 		}
@@ -1577,7 +1639,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ2(*read_bytes, len, lf_short.value, leaf_data, st16);
 			parse_sctring (&lf_short.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof (SVal_LF_SHORT));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy (val->name_or_val, &lf_short, sizeof (SVal_LF_SHORT));
 			break;
 		}
@@ -1587,7 +1651,9 @@ static int parse_sval(SVal *val, unsigned char *leaf_data, unsigned int *read_by
 			READ2(*read_bytes, len, lf_ushort.value, leaf_data, ut16);
 			parse_sctring (&lf_ushort.name, leaf_data, read_bytes, len);
 			val->name_or_val = malloc (sizeof(SVal_LF_USHORT));
-			if (!val->name_or_val) break;
+			if (!val->name_or_val) {
+				break;
+			}
 			memcpy(val->name_or_val, &lf_ushort, sizeof (SVal_LF_USHORT));
 			break;
 		}
@@ -1927,7 +1993,9 @@ static int parse_lf_fieldlist(SLF_FIELDLIST *lf_fieldlist,  unsigned char *leaf_
 
 		if (curr_read_bytes != 0) {
 			p += curr_read_bytes;
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 	return 0;
 }
@@ -2081,7 +2149,9 @@ static int parse_lf_arglist(SLF_ARGLIST *lf_arglist, unsigned char *leaf_data, u
 	READ4(*read_bytes, len, lf_arglist->count, leaf_data, ut32);
 
 	lf_arglist->arg_type = (unsigned int *) malloc (lf_arglist->count * 4);
-	if (!lf_arglist->arg_type) return 0;
+	if (!lf_arglist->arg_type) {
+		return 0;
+	}
 	memcpy (lf_arglist->arg_type, leaf_data, lf_arglist->count * 4);
 	leaf_data += (lf_arglist->count * 4);
 	*read_bytes += (lf_arglist->count * 4);
@@ -2174,7 +2244,9 @@ static int parse_lf_vtshape(SLF_VTSHAPE *lf_vtshape, unsigned char *leaf_data, u
 
 	size = (4 * lf_vtshape->count + (lf_vtshape->count % 2) * 4) / 8;
 	lf_vtshape->vt_descriptors = (char *) malloc (size);
-	if (!lf_vtshape->vt_descriptors) return 0;
+	if (!lf_vtshape->vt_descriptors) {
+		return 0;
+	}
 	memcpy (lf_vtshape->vt_descriptors, leaf_data, size);
 	leaf_data += size;
 	*read_bytes += size;
@@ -2199,10 +2271,13 @@ static int parse_tpi_stypes(R_STREAM_FILE *stream, SType *type) {
 	unsigned int read_bytes = 0;
 
 	stream_file_read(stream, 2, (char *)&type->length);
-	if (type->length<1)
+	if (type->length < 1) {
 		return 0;
+	}
 	leaf_data = (unsigned char *) malloc(type->length);
-	if (!leaf_data) return 0;
+	if (!leaf_data) {
+		return 0;
+	}
 	stream_file_read (stream, type->length, (char *)leaf_data);
 	type->type_data.leaf_type = *(unsigned short *)leaf_data;
 	read_bytes += 2;
@@ -2295,7 +2370,9 @@ int parse_tpi_stream(void *parsed_pdb_stream, R_STREAM_FILE *stream) {
 
 	for (i = tpi_stream->header.ti_min; i < tpi_stream->header.ti_max; i++) {
 		type = (SType *) malloc (sizeof (SType));
-		if (!type) return 0;
+		if (!type) {
+			return 0;
+		}
 		type->tpi_idx = i;
 		type->type_data.type_info = 0;
 		type->type_data.leaf_type = eLF_MAX;
diff --git a/libr/bp/bp_traptrace.c b/libr/bp/bp_traptrace.c
index 5f94e9c842..2c62da58e6 100644
--- a/libr/bp/bp_traptrace.c
+++ b/libr/bp/bp_traptrace.c
@@ -14,7 +14,9 @@ R_API void r_bp_traptrace_free(void *ptr) {
 
 R_API RList *r_bp_traptrace_new() {
 	RList *list = r_list_new();
-	if (!list) return NULL;
+	if (!list) {
+		return NULL;
+	}
 	list->free = &r_bp_traptrace_free;
 	return list;
 }
@@ -36,7 +38,9 @@ R_API void r_bp_traptrace_reset(RBreakpoint *bp, int hard) {
 			r_bp_traptrace_free (trace);
 			// XXX: This segfaults
 			//r_list_delete (bp->traces, r_list_iter_cur (iter));
-		} else memset (trace->bits, 0x00, trace->bitlen);
+		} else {
+			memset (trace->bits, 0x00, trace->bitlen);
+		}
 	}
 	if (hard) {
 		// XXX: traces not freed correctly (memleak)
@@ -54,8 +58,9 @@ R_API ut64 r_bp_traptrace_next(RBreakpoint *bp, ut64 addr) {
 		if (addr>=trace->addr && addr<=trace->addr_end) {
 			delta = (int)(addr-trace->addr);
 			for (i=delta; i<trace->length; i++) {
-				if (R_BIT_CHK (trace->bits, i))
-					return addr+i;
+				if (R_BIT_CHK (trace->bits, i)) {
+					return addr + i;
+				}
 			}
 		}
 	}
@@ -68,16 +73,20 @@ R_API int r_bp_traptrace_add(RBreakpoint *bp, ut64 from, ut64 to) {
 	ut64 len;
 	int bitlen;
 	/* cannot map addr 0 */
-	if (from == 0LL)
+	if (from == 0LL) {
 		return false;
-	if (from>to)
+	}
+	if (from > to) {
 		return false;
+	}
 	len = to-from;
-	if (len >= ST32_MAX)
+	if (len >= ST32_MAX) {
 		return false;
+	}
 	buf = (ut8*) malloc ((int)len);
-	if (!buf)
+	if (!buf) {
 		return false;
+	}
 	trap = (ut8*) malloc ((int)len+4);
 	if (!trap) {
 		free (buf);
@@ -141,8 +150,9 @@ R_API void r_bp_traptrace_list(RBreakpoint *bp) {
 	RBreakpointTrace *trace;
 	r_list_foreach (bp->traces, iter, trace) {
 		for (i = 0; i < trace->bitlen; i++) {
-			if (R_BIT_CHK (trace->bits, i))
-				eprintf ("  - 0x%08"PFMT64x"\n", trace->addr + (i<<4));
+			if (R_BIT_CHK (trace->bits, i)) {
+				eprintf ("  - 0x%08" PFMT64x "\n", trace->addr + (i << 4));
+			}
 		}
 	}
 }
@@ -155,9 +165,11 @@ R_API int r_bp_traptrace_at(RBreakpoint *bp, ut64 from, int len) {
 	// TODO: do we really need len?
 		if (from>=trace->addr && from+len<=trace->addr_end) {
 			delta = (int) (from-trace->addr);
-			if (R_BIT_CHK (trace->bits, delta))
-			if (trace->traps[delta]==0x00)
-				return false; // already traced..debugger should stop
+			if (R_BIT_CHK (trace->bits, delta)) {
+				if (trace->traps[delta] == 0x00) {
+					return false; // already traced..debugger should stop
+				}
+			}
 			R_BIT_SET (trace->bits, delta);
 			return true;
 		}
diff --git a/libr/cons/2048.c b/libr/cons/2048.c
index 959064e453..3c0eaeb1a0 100644
--- a/libr/cons/2048.c
+++ b/libr/cons/2048.c
@@ -9,9 +9,11 @@ static int moves = 0;
 static void twok_init() {
 	int i, j;
 	score = 0;
-	for (i = 0; i < 4; i++)
-		for (j = 0; j < 4; j++)
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
 			twok_buf[i][j] = 0;
+		}
+	}
 }
 
 static void twok_add() {
@@ -28,18 +30,27 @@ static void twok_add() {
 
 static bool twok_fin() {
 	int i, j;
-	for (i = 0; i < 4; i++)
-		for (j = 0; j < 4; j++)
-			if (!twok_buf[i][j])
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
+			if (!twok_buf[i][j]) {
 				return true;
-	for (i = 0; i < 4; i++)
-		for (j = 0; j < 3; j++)
-			if (twok_buf[i][j] == twok_buf[i][j + 1])
+			}
+		}
+	}
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			if (twok_buf[i][j] == twok_buf[i][j + 1]) {
 				return true;
-	for (i = 0; i < 3; i++)
-		for (j = 0; j < 4; j++)
-			if (twok_buf[i][j] == twok_buf[i + 1][j])
+			}
+		}
+	}
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 4; j++) {
+			if (twok_buf[i][j] == twok_buf[i + 1][j]) {
 				return true;
+			}
+		}
+	}
 	return false;
 }
 
@@ -49,9 +60,12 @@ static void twok_move(int u, int v) {
 	int moved = 0;
 	for (k = 0; k < 4; ++k) {
 		for (i = 0; i < 4; ++i) {
-			for (j = i + 1; j < 4 && !twok_buf[nKJ = u? k: v? j: 3 - j][nJK = !u? k: v? j: 3 - j]; ++j)
+			for (j = i + 1; j < 4 && !twok_buf[nKJ = u ? k : v ? j : 3 - j][nJK = !u ? k : v ? j : 3 - j]; ++j) {
 				;
-			if (j == 4) continue;
+			}
+			if (j == 4) {
+				continue;
+			}
 			nKI = u? k: v? i: 3 - i;
 			nIK = !u? k: v? i: 3 - i;
 			if (!twok_buf[nKI][nIK]) {
@@ -164,7 +178,9 @@ R_API void r_cons_2048(bool color) {
 			twok_move (1, 0);
 			break;
 		}
-		if (ch < 1 || ch == 'q') break;
+		if (ch < 1 || ch == 'q') {
+			break;
+		}
 	}
 	r_cons_clear00 ();
 	r_cons_printf ("[r2048] score: %d\n", score);
diff --git a/libr/cons/cons.c b/libr/cons/cons.c
index b36860976c..aa1ba6eb5f 100644
--- a/libr/cons/cons.c
+++ b/libr/cons/cons.c
@@ -221,7 +221,9 @@ R_API void r_cons_context_break_push(RConsContext *context, RConsBreak cb, void
 
 	//if we don't have any element in the stack start the signal
 	RConsBreakStack *b = R_NEW0 (RConsBreakStack);
-	if (!b) return;
+	if (!b) {
+		return;
+	}
 	if (r_stack_is_empty (context->break_stack)) {
 #if __UNIX__ || __CYGWIN__
 		if (sig && r_cons_context_is_main ()) {
@@ -1019,10 +1021,13 @@ R_API int r_cons_get_cursor(int *rows) {
 			if (ch2 == '\\') {
 				i++;
 			} else if (ch2 == ']') {
-				if (!strncmp (str + 2 + 5, "rgb:", 4))
+				if (!strncmp (str + 2 + 5, "rgb:", 4)) {
 					i += 18;
+				}
 			} else if (ch2 == '[') {
-				for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
+				for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++) {
+					;
+				}
 			}
 		} else if (I.context->buffer[i] == '\n') {
 			row++;
diff --git a/libr/cons/editor.c b/libr/cons/editor.c
index f60601e74c..29f8898317 100644
--- a/libr/cons/editor.c
+++ b/libr/cons/editor.c
@@ -21,7 +21,9 @@ static void setnewline(int old) {
 
 static void saveline(int n, const char *str) {
 	char *out;
-	if (!str) return;
+	if (!str) {
+		return;
+	}
 	out = r_str_word_get0set (lines, bytes, _n, str, &bytes);
 	free (lines);
 	lines = out;
@@ -29,7 +31,9 @@ static void saveline(int n, const char *str) {
 
 static int up(void *n) {
 	int old = _n;
-	if (_n > 0) _n--;
+	if (_n > 0) {
+		_n--;
+	}
 	setnewline (old);
 	return -1;
 }
diff --git a/libr/cons/input.c b/libr/cons/input.c
index ef12ffa997..65b9e21305 100644
--- a/libr/cons/input.c
+++ b/libr/cons/input.c
@@ -232,8 +232,9 @@ R_API int r_cons_fgets(char *buf, int len, int argc, const char **argv) {
 	if (color) {
 		const char *p = cons->pal.input;
 		int len = p? strlen (p): 0;
-		if (len>0)
+		if (len > 0) {
 			fwrite (p, len, 1, stdout);
+		}
 		fflush (stdout);
 	}
 	if (!fgets (buf, len, cons->fdin)) {
@@ -250,7 +251,9 @@ R_API int r_cons_fgets(char *buf, int len, int argc, const char **argv) {
 		RETURN (-2);
 	}
 	buf[strlen (buf)-1] = '\0';
-	if (color) printf (Color_RESET);
+	if (color) {
+		printf (Color_RESET);
+	}
 	ret = strlen (buf);
 beach:
 #if __UNIX__
diff --git a/libr/cons/less.c b/libr/cons/less.c
index 84d378fac0..28a7757e24 100644
--- a/libr/cons/less.c
+++ b/libr/cons/less.c
@@ -30,7 +30,9 @@ static void color_line(const char *line, RStrpool *p, RList *ml){
 		if (m_addr) {
 			/* in case there's a CSI in the middle of this match*/
 			m_len = r_str_ansi_filter (m_addr, NULL, NULL, m_len);
-			if (m_len<0) m_len = 0;
+			if (m_len < 0) {
+				m_len = 0;
+			}
 			r_strpool_memcat (p, m_addr, m_len);
 			r_strpool_memcat (p, inv[1], linv[1]);
 			offset = m->rm_eo;
@@ -138,7 +140,9 @@ static int all_matches(const char *s, RRegex *rx, RList **mla, int *lines, int l
 		m.rm_so = 0;
 		const char *loff = s + lines[l]; /* current line offset */
 		char *clean = strdup (loff);
-		if (!clean) return 0;
+		if (!clean) {
+			return 0;
+		}
 		int *cpos = NULL;
 		int ncpos = r_str_ansi_filter (clean, NULL, &cpos, -1);
 		m.rm_eo = slen = strlen (clean);
@@ -261,7 +265,11 @@ R_API int r_cons_less_str(const char *str, const char *exitkeys) {
 		case '\n':
 		case 'j': from++; break;
 		case 'J': from+=h; break;
-		case 'k': if (from>0) from--; break;
+		case 'k':
+			if (from > 0) {
+				from--;
+			}
+			break;
 		case 'K': from = (from>=h)? from-h: 0;
 			break;
 		case '/': 	/* search */
@@ -271,16 +279,21 @@ R_API int r_cons_less_str(const char *str, const char *exitkeys) {
 			from = R_MIN(lines_count - 1, from);
 			/* repeat last search if empty string is provided */
 			if (sreg[0]) { /* prepare for a new search */
-				if (rx) r_regex_free(rx);
+				if (rx) {
+					r_regex_free (rx);
+				}
 				rx = r_regex_new(sreg, "");
 			} else { /* we got an empty string */
 				from = next_match(from, mla, lines_count);
 				break;
 			}
-			if (!rx) break;
+			if (!rx) {
+				break;
+			}
 			/* find all occurences */
-			if (all_matches (p, rx, mla, lines, lines_count))
-				from = next_match(from, mla, lines_count);
+			if (all_matches (p, rx, mla, lines, lines_count)) {
+				from = next_match (from, mla, lines_count);
+			}
 			break;
 		case 'n': 	/* next match */
 			/* search already performed */
diff --git a/libr/cons/pal.c b/libr/cons/pal.c
index 0929eae84e..0836134bfd 100644
--- a/libr/cons/pal.c
+++ b/libr/cons/pal.c
@@ -365,8 +365,11 @@ static void r_cons_pal_show_gs() {
 		rcolor.g = i;
 		rcolor.b = i;
 
-		if (i < 0x76) strcpy (fg, Color_WHITE);
-		else strcpy (fg, Color_BLACK);
+		if (i < 0x76) {
+			strcpy (fg, Color_WHITE);
+		} else {
+			strcpy (fg, Color_BLACK);
+		}
 		r_cons_rgb_str (bg, sizeof (bg), &rcolor);
 		r_cons_printf ("%s%s rgb:%02x%02x%02x "Color_RESET,
 			fg, bg, i, i, i);
diff --git a/libr/cons/pipe.c b/libr/cons/pipe.c
index dad807943e..e7e8511936 100644
--- a/libr/cons/pipe.c
+++ b/libr/cons/pipe.c
@@ -39,7 +39,9 @@ R_API int r_cons_pipe_open(const char *file, int fdn, int append) {
 	if (_dup2 (fdn, backup_fd) == -1) {
 #else
 	backup_fd = sysconf (_SC_OPEN_MAX)-(fd-2); // portable getdtablesize()
-	if (backup_fd <2) backup_fd = 2002-(fd-2); // fallback
+	if (backup_fd < 2) {
+		backup_fd = 2002 - (fd - 2); // fallback
+	}
 	if (dup2 (fdn, backup_fd) == -1) {
 #endif
 		eprintf ("Cannot dup stdout to %d\n", backup_fd);
@@ -53,8 +55,9 @@ R_API int r_cons_pipe_open(const char *file, int fdn, int append) {
 }
 
 R_API void r_cons_pipe_close(int fd) {
-	if (fd == -1)
+	if (fd == -1) {
 		return;
+	}
 	close (fd);
 	if (backup_fd != -1) {
 		dup2 (backup_fd, backup_fdn);
diff --git a/libr/cons/rgb.c b/libr/cons/rgb.c
index 374c6b8754..613e3dc8a7 100644
--- a/libr/cons/rgb.c
+++ b/libr/cons/rgb.c
@@ -111,9 +111,15 @@ R_API void r_cons_rgb_init(void) {
 R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, ut8 *a) {
 	const char *q = 0;
 	ut8 isbg = 0, bold = 127;
-	if (!p) return 0;
-	if (*p == 0x1b) p++;
-	if (*p != '[') p--;
+	if (!p) {
+		return 0;
+	}
+	if (*p == 0x1b) {
+		p++;
+	}
+	if (*p != '[') {
+		p--;
+	}
 	switch (p[1]) {
 	case '1': bold = 255; p += 2; break;
 	case '3': isbg = 0; break;
@@ -129,18 +135,30 @@ R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, ut8 *a) {
 		} else { // 16M colors (truecolor)
 			/* complex rgb */
 			p += 6;
-			if (r) *r = atoi (p);
+			if (r) {
+				*r = atoi (p);
+			}
 			q = strchr (p, ';');
-			if (!q) return 0;
-			if (g) *g = atoi (q + 1);
+			if (!q) {
+				return 0;
+			}
+			if (g) {
+				*g = atoi (q + 1);
+			}
 			q = strchr (q + 1, ';');
-			if (!q) return 0;
-			if (b) *b = atoi (q + 1);
+			if (!q) {
+				return 0;
+			}
+			if (b) {
+				*b = atoi (q + 1);
+			}
 		}
 		return 1;
 	} else {
 		/* plain ansi escape codes */
-		if (a) *a = isbg;
+		if (a) {
+			*a = isbg;
+		}
 		switch (p[2]) {
 		case '0': SETRGB (0, 0, 0); break;
 		case '1': SETRGB (bold, 0, 0); break;
@@ -252,13 +270,29 @@ R_API char *r_cons_rgb_str(char *outstr, size_t sz, RColor *rcolor) {
 
 R_API char *r_cons_rgb_tostring(ut8 r, ut8 g, ut8 b) {
 	const char *str = NULL;
-	if (r == 0x00 && g == b && g == 0) str = "black";
-	if (r == 0xff && g == b && g == 0xff) str = "white";
-	if (r == 0xff && g == b && g == 0) str = "red";
-	if (g == 0xff && r == b && r == 0) str = "green";
-	if (b == 0xff && r == g && r == 0) str = "blue";
-	if (r == 0xff && g == 0xff && b == 0x00) str = "yellow";
-	if (r == 0x00 && g == 0xff && b == 0xff) str = "cyan";
-	if (r == 0xff && g == 0x00 && b == 0xff) str = "magenta";
+	if (r == 0x00 && g == b && g == 0) {
+		str = "black";
+	}
+	if (r == 0xff && g == b && g == 0xff) {
+		str = "white";
+	}
+	if (r == 0xff && g == b && g == 0) {
+		str = "red";
+	}
+	if (g == 0xff && r == b && r == 0) {
+		str = "green";
+	}
+	if (b == 0xff && r == g && r == 0) {
+		str = "blue";
+	}
+	if (r == 0xff && g == 0xff && b == 0x00) {
+		str = "yellow";
+	}
+	if (r == 0x00 && g == 0xff && b == 0xff) {
+		str = "cyan";
+	}
+	if (r == 0xff && g == 0x00 && b == 0xff) {
+		str = "magenta";
+	}
 	return str? strdup (str) : r_str_newf ("#%02x%02x%02x", r, g, b);
 }
diff --git a/libr/cons/utf8.c b/libr/cons/utf8.c
index e5cdc6efeb..2d58bddec0 100644
--- a/libr/cons/utf8.c
+++ b/libr/cons/utf8.c
@@ -88,8 +88,9 @@ int current_tty(void) {
 	do {
 		fd = open (dev, O_RDWR | O_NOCTTY);
 	} while (fd == -1 && errno == EINTR);
-	if (fd == -1)
+	if (fd == -1) {
 		return -1;
+	}
 	return fd;
 #endif
 }
@@ -217,8 +218,9 @@ R_API int r_cons_is_utf8() {
 	char *sval = r_sys_getenv ("LC_CTYPE");
 	if (sval) {
 		r_str_case (sval, 0);
-		if (!strcmp (sval, "utf-8"))
+		if (!strcmp (sval, "utf-8")) {
 			ret = 1;
+		}
 		free (sval);
 	}
 #endif
diff --git a/libr/core/asm.c b/libr/core/asm.c
index 723fd46642..185ce008c6 100644
--- a/libr/core/asm.c
+++ b/libr/core/asm.c
@@ -25,7 +25,9 @@ static int rcoreasm_address_comparator(RCoreAsmHit *a, RCoreAsmHit *b){
 
 R_API RCoreAsmHit *r_core_asm_hit_new() {
 	RCoreAsmHit *hit = R_NEW0 (RCoreAsmHit);
-	if (!hit) return NULL;
+	if (!hit) {
+		return NULL;
+	}
 	hit->addr = -1;
 	hit->valid = false;
 	return hit;
@@ -98,7 +100,9 @@ R_API RList *r_core_asm_strsearch(RCore *core, const char *input, ut64 from, ut6
 	tokens[0] = NULL;
 	for (tokcount = 0; tokcount < R_ARRAY_SIZE (tokens) - 1; tokcount++) {
 		tok = strtok (tokcount? NULL: ptr, ";");
-		if (!tok) break;
+		if (!tok) {
+			break;
+		}
 		tokens[tokcount] = r_str_trim_head_tail (tok);
 	}
 	tokens[tokcount] = NULL;
@@ -300,8 +304,9 @@ static int handle_forward_disassemble(RCore* core, RList *hits, ut8* buf, ut64 l
 	ut8 is_valid = false;
 	RAsmOp op;
 
-	if (end_addr < current_instr_addr)
+	if (end_addr < current_instr_addr) {
 		return end_addr;
+	}
 
 	r_asm_set_pc (core->assembler, current_instr_addr);
 	while (tmp_current_buf_pos < len && temp_instr_addr < end_addr) {
@@ -312,7 +317,9 @@ static int handle_forward_disassemble(RCore* core, RList *hits, ut8* buf, ut64 l
 		if (temp_instr_len == 0){
 			is_valid = false;
 			temp_instr_len = 1;
-		} else is_valid = true;
+		} else {
+			is_valid = true;
+		}
 
 		// check to see if addr exits
 		found_addr = find_addr(hits, temp_instr_addr);
@@ -371,32 +378,35 @@ static int is_addr_in_range(ut64 start, ut64 end, ut64 start_range, ut64 end_ran
 	// (long long) start_range < 0 < end_range
 	} else if (start_range > end_range) {
 		if (start < end) {
-			if (start < end_range)
+			if (start < end_range) {
 				result = true;
-			else if (end <= end_range)
+			} else if (end <= end_range) {
 				result = true;
-			else if (start_range <= start)
+			} else if (start_range <= start) {
 				result = true;
-			else if (start_range < end)
+			} else if (start_range < end) {
 				result = true;
-		// (long long) start < 0 < end
+			}
+			// (long long) start < 0 < end
 		} else {
-			if (end < end_range)
+			if (end < end_range) {
 				result = true;
-			else if (end <= end_range)
+			} else if (end <= end_range) {
 				result = true;
-			else if (start_range <= start)
+			} else if (start_range <= start) {
 				result = true;
+			}
 		}
 	// XXX - these cases need to be tested
 	// (long long) start < 0 < end
 	} else if (start_range < end_range) {
-		if ( start < end_range)
+		if (start < end_range) {
 			result = true;
-		else if ( start <= start_range )
+		} else if (start <= start_range) {
 			result = true;
-		else if ( start_range < end)
+		} else if (start_range < end) {
 			result = true;
+		}
 	}
 	return result;
 }
@@ -421,7 +431,9 @@ R_API RList *r_core_asm_bwdisassemble(RCore *core, ut64 addr, int n, int len) {
 	const int addrbytes = core->io->addrbytes;
 	RAsmCode *c;
 	RList *hits = r_core_asm_hit_list_new();
-	if (!hits) return NULL;
+	if (!hits) {
+		return NULL;
+	}
 
 	len = R_MIN (len - len % addrbytes, addrbytes * addr);
 	if (len < 1) {
@@ -455,7 +467,9 @@ R_API RList *r_core_asm_bwdisassemble(RCore *core, ut64 addr, int n, int len) {
 		numinstr = 0;
 		asmlen = strlen (c->buf_asm);
 		for(ii = 0; ii < asmlen; ++ii) {
-			if (c->buf_asm[ii] == '\n') ++numinstr;
+			if (c->buf_asm[ii] == '\n') {
+				++numinstr;
+			}
 		}
 		r_asm_code_free(c);
 		if (numinstr >= n || idx > 16 * n) { // assume average instruction length <= 16
@@ -643,8 +657,11 @@ static RList *r_core_asm_back_disassemble (RCore *core, ut64 addr, int len, ut64
 			purge_results =  prune_hits_in_addr_range(hits, current_instr_addr, current_instr_len, /* is_valid */ true);
 			add_hit_to_sorted_hits(hits, current_instr_addr, current_instr_len, is_valid);
 
-			if (hit_count < purge_results ) hit_count = 0; // WTF??
-			else hit_count -= purge_results;
+			if (hit_count < purge_results) {
+				hit_count = 0; // WTF??
+			} else {
+				hit_count -= purge_results;
+			}
 
 			next_buf_pos = current_buf_pos;
 			handle_forward_disassemble(core, hits, buf, len - extra_padding, current_buf_pos+current_instr_len, current_instr_addr+current_instr_len, addr);
@@ -665,9 +682,10 @@ static RList *r_core_asm_back_disassemble (RCore *core, ut64 addr, int len, ut64
 		current_instr_addr -= 1;
 		current_buf_pos -= 1;
 
-		if ( hit_count >= max_hit_count &&
-			 (last_num_invalid >= max_invalid_b4_exit || last_num_invalid == 0))
+		if (hit_count >= max_hit_count &&
+			(last_num_invalid >= max_invalid_b4_exit || last_num_invalid == 0)) {
 			break;
+		}
 	} while (((int) current_buf_pos >= 0) && (int)(len - current_buf_pos) >= 0);
 
 	r_asm_set_pc (core->assembler, addr);
diff --git a/libr/core/canal.c b/libr/core/canal.c
index c5c0c1c740..02c4c12c53 100644
--- a/libr/core/canal.c
+++ b/libr/core/canal.c
@@ -1098,7 +1098,9 @@ static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
 		r_cons_printf (",\"stack\":%d", fcn->maxstack);
 		r_cons_printf (",\"type\":\"%s\"", r_anal_fcn_type_tostring (fcn->type));
 		//r_cons_printf (",\"cc\":%d", fcn->call); // TODO: calling convention
-		if (fcn->dsc) r_cons_printf (",\"signature\":\"%s\"", fcn->dsc);
+		if (fcn->dsc) {
+			r_cons_printf (",\"signature\":\"%s\"", fcn->dsc);
+		}
 		r_cons_printf (",\"blocks\":[");
 	}
 	r_list_foreach (fcn->bbs, iter, bbi) {
@@ -1304,7 +1306,9 @@ static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
 						"_0x%08"PFMT64x"\">\n%s</p>\n",
 						top, left, bbi->addr, str);
 					left = left? 0: 600;
-					if (!left) top += 250;
+					if (!left) {
+						top += 250;
+					}
 				} else if (!is_json && !is_keva) {
 					bool current = r_anal_bb_is_in_offset (bbi, core->offset);
 					const char *label_color = bbi->traced
@@ -1560,8 +1564,9 @@ R_API int r_core_anal_fcn_clean(RCore *core, ut64 addr) {
 	if (!addr) {
 		r_list_purge (core->anal->fcns);
 		core->anal->fcn_tree = NULL;
-		if (!(core->anal->fcns = r_anal_fcn_list_new ()))
+		if (!(core->anal->fcns = r_anal_fcn_list_new ())) {
 			return false;
+		}
 	} else {
 		r_list_foreach_safe (core->anal->fcns, iter, iter_tmp, fcni) {
 			if (r_anal_fcn_in (fcni, addr)) {
diff --git a/libr/core/cbin.c b/libr/core/cbin.c
index 37a353217c..927d98f2f0 100644
--- a/libr/core/cbin.c
+++ b/libr/core/cbin.c
@@ -2018,8 +2018,9 @@ static int bin_symbols_internal(RCore *r, int mode, ut64 laddr, int va, ut64 at,
 			char *name = strdup (sn.demname? sn.demname: symbol->name);
 			r_name_filter (name, -1);
 			if (!strncmp (name, "imp.", 4)) {
-				if (lastfs != 'i')
+				if (lastfs != 'i') {
 					r_cons_printf ("fs imports\n");
+				}
 				lastfs = 'i';
 			} else {
 				if (lastfs != 's') {
@@ -2155,7 +2156,9 @@ static char *build_hash_string(int mode, const char *chksum, ut8 *data, ut32 dat
 		ret = r_str_append (ret, aux);
 		free (chkstr);
 		free (aux);
-		if (*ptr && *ptr == ',') ptr++;
+		if (*ptr && *ptr == ',') {
+			ptr++;
+		}
 	} while (*ptr);
 
 	return ret;
@@ -2228,10 +2231,18 @@ static int bin_sections(RCore *r, int mode, ut64 laddr, int va, ut64 at, const c
 			continue;
 		}
 
-		if (section->srwx & R_BIN_SCN_SHAREABLE) perms[0] = 's';
-		if (section->srwx & R_BIN_SCN_READABLE) perms[1] = 'r';
-		if (section->srwx & R_BIN_SCN_WRITABLE) perms[2] = 'w';
-		if (section->srwx & R_BIN_SCN_EXECUTABLE) perms[3] = 'x';
+		if (section->srwx & R_BIN_SCN_SHAREABLE) {
+			perms[0] = 's';
+		}
+		if (section->srwx & R_BIN_SCN_READABLE) {
+			perms[1] = 'r';
+		}
+		if (section->srwx & R_BIN_SCN_WRITABLE) {
+			perms[2] = 'w';
+		}
+		if (section->srwx & R_BIN_SCN_EXECUTABLE) {
+			perms[3] = 'x';
+		}
 
 		if (IS_MODE_SET (mode)) {
 #if LOAD_BSS_MALLOC
@@ -2378,8 +2389,12 @@ static int bin_sections(RCore *r, int mode, ut64 laddr, int va, ut64 at, const c
 				const char *arch = section->arch;
 				int bits = section->bits;
 				if (info) {
-					if (!arch) arch = info->arch;
-					if (!bits) bits = info->bits;
+					if (!arch) {
+						arch = info->arch;
+					}
+					if (!bits) {
+						bits = info->bits;
+					}
 				}
 				if (!arch) {
 					arch = r_config_get (r->config, "asm.arch");
@@ -2872,7 +2887,9 @@ static void bin_mem_print(RList *mems, int perms, int depth, int mode) {
 
 static int bin_mem(RCore *r, int mode) {
 	RList *mem = NULL;
-	if (!r)	return false;
+	if (!r) {
+		return false;
+	}
 	if (!IS_MODE_JSON (mode)) {
 		if (!(IS_MODE_RAD (mode) || IS_MODE_SET (mode))) {
 			r_cons_println ("[Memory]\n");
@@ -3408,30 +3425,74 @@ R_API int r_core_bin_info(RCore *core, int action, int mode, int va, RCoreBinFil
 		r_core_cmd0 (core, "aar");
 	}
 #endif
-	if ((action & R_CORE_BIN_ACC_STRINGS)) ret &= bin_strings (core, mode, va);
-	if ((action & R_CORE_BIN_ACC_RAW_STRINGS)) ret &= bin_raw_strings (core, mode, va);
-	if ((action & R_CORE_BIN_ACC_INFO)) ret &= bin_info (core, mode);
-	if ((action & R_CORE_BIN_ACC_MAIN)) ret &= bin_main (core, mode, va);
-	if ((action & R_CORE_BIN_ACC_DWARF)) ret &= bin_dwarf (core, mode);
-	if ((action & R_CORE_BIN_ACC_PDB)) ret &= bin_pdb (core, mode);
-	if ((action & R_CORE_BIN_ACC_SOURCE)) ret &= bin_source (core, mode);
-	if ((action & R_CORE_BIN_ACC_ENTRIES)) ret &= bin_entry (core, mode, loadaddr, va, false);
-	if ((action & R_CORE_BIN_ACC_INITFINI)) ret &= bin_entry (core, mode, loadaddr, va, true);
-	if ((action & R_CORE_BIN_ACC_SECTIONS)) ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, false);
-	if ((action & R_CORE_BIN_ACC_SEGMENTS)) ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, true);
-	if (r_config_get_i (core->config, "bin.relocs")) {
-		if ((action & R_CORE_BIN_ACC_RELOCS)) ret &= bin_relocs (core, mode, va);
+	if ((action & R_CORE_BIN_ACC_STRINGS)) {
+		ret &= bin_strings (core, mode, va);
+	}
+	if ((action & R_CORE_BIN_ACC_RAW_STRINGS)) {
+		ret &= bin_raw_strings (core, mode, va);
+	}
+	if ((action & R_CORE_BIN_ACC_INFO)) {
+		ret &= bin_info (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_MAIN)) {
+		ret &= bin_main (core, mode, va);
+	}
+	if ((action & R_CORE_BIN_ACC_DWARF)) {
+		ret &= bin_dwarf (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_PDB)) {
+		ret &= bin_pdb (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_SOURCE)) {
+		ret &= bin_source (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_ENTRIES)) {
+		ret &= bin_entry (core, mode, loadaddr, va, false);
+	}
+	if ((action & R_CORE_BIN_ACC_INITFINI)) {
+		ret &= bin_entry (core, mode, loadaddr, va, true);
+	}
+	if ((action & R_CORE_BIN_ACC_SECTIONS)) {
+		ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, false);
+	}
+	if ((action & R_CORE_BIN_ACC_SEGMENTS)) {
+		ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, true);
+	}
+	if (r_config_get_i (core->config, "bin.relocs")) {
+		if ((action & R_CORE_BIN_ACC_RELOCS)) {
+			ret &= bin_relocs (core, mode, va);
+		}
+	}
+	if ((action & R_CORE_BIN_ACC_IMPORTS)) {
+		ret &= bin_imports (core, mode, va, name); // 6s
+	}
+	if ((action & R_CORE_BIN_ACC_EXPORTS)) {
+		ret &= bin_exports (core, mode, loadaddr, va, at, name, chksum);
+	}
+	if ((action & R_CORE_BIN_ACC_SYMBOLS)) {
+		ret &= bin_symbols (core, mode, loadaddr, va, at, name, chksum); // 6s
+	}
+	if ((action & R_CORE_BIN_ACC_LIBS)) {
+		ret &= bin_libs (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_CLASSES)) {
+		ret &= bin_classes (core, mode); // 3s
+	}
+	if ((action & R_CORE_BIN_ACC_SIZE)) {
+		ret &= bin_size (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_MEM)) {
+		ret &= bin_mem (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_VERSIONINFO)) {
+		ret &= bin_versioninfo (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_RESOURCES)) {
+		ret &= bin_resources (core, mode);
+	}
+	if ((action & R_CORE_BIN_ACC_SIGNATURE)) {
+		ret &= bin_signature (core, mode);
 	}
- 	if ((action & R_CORE_BIN_ACC_IMPORTS)) ret &= bin_imports (core, mode, va, name); // 6s
-	if ((action & R_CORE_BIN_ACC_EXPORTS)) ret &= bin_exports (core, mode, loadaddr, va, at, name, chksum);
-	if ((action & R_CORE_BIN_ACC_SYMBOLS)) ret &= bin_symbols (core, mode, loadaddr, va, at, name, chksum); // 6s
-	if ((action & R_CORE_BIN_ACC_LIBS)) ret &= bin_libs (core, mode);
-	if ((action & R_CORE_BIN_ACC_CLASSES)) ret &= bin_classes (core, mode); // 3s
-	if ((action & R_CORE_BIN_ACC_SIZE)) ret &= bin_size (core, mode);
-	if ((action & R_CORE_BIN_ACC_MEM)) ret &= bin_mem (core, mode);
-	if ((action & R_CORE_BIN_ACC_VERSIONINFO)) ret &= bin_versioninfo (core, mode);
-	if ((action & R_CORE_BIN_ACC_RESOURCES)) ret &= bin_resources (core, mode);
-	if ((action & R_CORE_BIN_ACC_SIGNATURE)) ret &= bin_signature (core, mode);
 	if ((action & R_CORE_BIN_ACC_FIELDS)) {
 		if (IS_MODE_SIMPLE (mode)) {
 			if ((action & R_CORE_BIN_ACC_HEADER) || action & R_CORE_BIN_ACC_FIELDS) {
diff --git a/libr/core/cconfig.c b/libr/core/cconfig.c
index 3fe40e3d25..961f76540d 100644
--- a/libr/core/cconfig.c
+++ b/libr/core/cconfig.c
@@ -136,15 +136,31 @@ static void rasm2_list(RCore *core, const char *arch, int fmt) {
 			bits[0] = 0;
 			/* The underscore makes it easier to distinguish the
 			 * columns */
-			if (h->bits&8) strcat (bits, "_8");
-			if (h->bits&16) strcat (bits, "_16");
-			if (h->bits&32) strcat (bits, "_32");
-			if (h->bits&64) strcat (bits, "_64");
-			if (!*bits) strcat (bits, "_0");
+			if (h->bits & 8) {
+				strcat (bits, "_8");
+			}
+			if (h->bits & 16) {
+				strcat (bits, "_16");
+			}
+			if (h->bits & 32) {
+				strcat (bits, "_32");
+			}
+			if (h->bits & 64) {
+				strcat (bits, "_64");
+			}
+			if (!*bits) {
+				strcat (bits, "_0");
+			}
 			feat = "__";
-			if (h->assemble && h->disassemble)  feat = "ad";
-			if (h->assemble && !h->disassemble) feat = "a_";
-			if (!h->assemble && h->disassemble) feat = "_d";
+			if (h->assemble && h->disassemble) {
+				feat = "ad";
+			}
+			if (h->assemble && !h->disassemble) {
+				feat = "a_";
+			}
+			if (!h->assemble && h->disassemble) {
+				feat = "_d";
+			}
 			feat2 = has_esil (core, h->name);
 			if (fmt == 'q') {
 				r_cons_println (h->name);
@@ -1998,7 +2014,9 @@ static int cb_binmaxstr(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
 	if (core->bin) {
 		int v = node->i_value;
-		if (v<1) v = 4; // HACK
+		if (v < 1) {
+			v = 4; // HACK
+		}
 		core->bin->maxstrlen = v;
 	// TODO: Do not refresh if nothing changed (minstrlen ?)
 		r_core_bin_refresh_strings (core);
@@ -2012,7 +2030,9 @@ static int cb_binminstr(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
 	if (core->bin) {
 		int v = node->i_value;
-		if (v<1) v = 4; // HACK
+		if (v < 1) {
+			v = 4; // HACK
+		}
 		core->bin->minstrlen = v;
 	// TODO: Do not refresh if nothing changed (minstrlen ?)
 		r_core_bin_refresh_strings (core);
diff --git a/libr/core/cfile.c b/libr/core/cfile.c
index 70c110969e..b1b135c99b 100644
--- a/libr/core/cfile.c
+++ b/libr/core/cfile.c
@@ -1153,8 +1153,9 @@ R_API RCoreFile *r_core_file_find_by_name(RCore *core, const char *name) {
 	RCoreFile *cf = NULL;
 	RIODesc *desc;
 
-	if (!core)
+	if (!core) {
 		return NULL;
+	}
 
 	r_list_foreach (core->files, iter, cf) {
 		desc = r_io_desc_get (core->io, cf->fd);
diff --git a/libr/core/cio.c b/libr/core/cio.c
index 3503f48a61..e60290037a 100644
--- a/libr/core/cio.c
+++ b/libr/core/cio.c
@@ -76,8 +76,9 @@ R_API bool r_core_dump(RCore *core, const char *file, ut64 addr, ut64 size, int
 		return false;
 	}
 	/* some io backends seems to be buggy in those cases */
-	if (bs > 4096)
+	if (bs > 4096) {
 		bs = 4096;
+	}
 	buf = malloc (bs);
 	if (!buf) {
 		eprintf ("Cannot alloc %d byte(s)\n", bs);
@@ -122,8 +123,9 @@ R_API int r_core_write_op(RCore *core, const char *arg, char op) {
 			// r_hex_str2bin() is guaranteed to output maximum half the
 			// input size, or 1 byte if there is just a single nibble.
 			str = (char *)malloc (strlen (arg) / 2 + 1);
-			if (!str)
+			if (!str) {
 				goto beach;
+			}
 			len = r_hex_str2bin (arg, (ut8 *)str);
 			// Output is invalid if there was just a single nibble,
 			// but in that case, len is negative (-1).
@@ -138,10 +140,13 @@ R_API int r_core_write_op(RCore *core, const char *arg, char op) {
 				goto beach;
 			}
 			str = r_mem_dup (core->yank_buf->buf, len);
-			if (!str)
+			if (!str) {
 				goto beach;
+			}
 		}
-	} else len = 0;
+	} else {
+		len = 0;
+	}
 
 	// execute the operand
 	if (op=='e') {
@@ -243,7 +248,10 @@ R_API int r_core_write_op(RCore *core, const char *arg, char op) {
 			case 'o': buf[i] |= str[j]; break;
 			case 'A': buf[i] &= str[j]; break;
 			}
-			j++; if (j>=len) j=0; /* cyclic key */
+			j++;
+			if (j >= len) {
+				j = 0; /* cyclic key */
+			}
 		}
 	}
 
diff --git a/libr/core/cmd.c b/libr/core/cmd.c
index 5d11942e6c..e5725e5387 100644
--- a/libr/core/cmd.c
+++ b/libr/core/cmd.c
@@ -284,10 +284,11 @@ static void recursive_help_go(RCore *core, int detail, RCmdDescriptor *desc) {
 			r_core_cmd_help (core, desc->help_detail2);
 		}
 	}
-	for (i = 32; i < R_ARRAY_SIZE (desc->sub); i++)
+	for (i = 32; i < R_ARRAY_SIZE (desc->sub); i++) {
 		if (desc->sub[i]) {
 			recursive_help_go (core, detail, desc->sub[i]);
 		}
+	}
 }
 
 static void recursive_help(RCore *core, int detail, const char *cmd_prefix) {
@@ -442,8 +443,11 @@ static int cmd_alias(void *data, const char *input) {
 			def++;
 		}
 		if (!q || (q && q>def)) {
-			if (*def) r_cmd_alias_set (core->rcmd, buf, def, 0);
-			else r_cmd_alias_del (core->rcmd, buf);
+			if (*def) {
+				r_cmd_alias_set (core->rcmd, buf, def, 0);
+			} else {
+				r_cmd_alias_del (core->rcmd, buf);
+			}
 		}
 	/* Show command for alias */
 	} else if (desc && !q) {
@@ -1022,12 +1026,16 @@ static int cmd_kuery(void *data, const char *input) {
 			// TODO: slash split here? or inside sdb_ns ?
 			for (n = o = p; n; o = n) {
 				n = strchr (o, '/'); // SDB_NS_SEPARATOR NAMESPACE
-				if (n) *n++ = 0;
+				if (n) {
+					*n++ = 0;
+				}
 				s = sdb_ns (s, o, 1);
 			}
 			free (p);
 		}
-		if (!s) s = core->sdb;
+		if (!s) {
+			s = core->sdb;
+		}
 		RLine *line = core->cons->line;
 		if (!line->sdbshell_hist) {
 			line->sdbshell_hist = r_list_newf (free);
@@ -1080,9 +1088,15 @@ static int cmd_kuery(void *data, const char *input) {
 						} else {
 							eprintf ("Cannot open sdb '%s'\n", fn);
 						}
-					} else eprintf ("Cannot find sdb '%s'\n", ns);
-				} else eprintf ("Cannot open file\n");
-			} else eprintf ("Missing sdb namespace\n");
+					} else {
+						eprintf ("Cannot find sdb '%s'\n", ns);
+					}
+				} else {
+					eprintf ("Cannot open file\n");
+				}
+			} else {
+				eprintf ("Missing sdb namespace\n");
+			}
 			free (fn);
 		} else {
 			eprintf ("Usage: ko [file] [namespace]\n");
@@ -1102,8 +1116,12 @@ static int cmd_kuery(void *data, const char *input) {
 				if (db) {
 					sdb_file (db, fn);
 					sdb_sync (db);
-				} else eprintf ("Cannot find sdb '%s'\n", ns);
-			} else eprintf ("Missing sdb namespace\n");
+				} else {
+					eprintf ("Cannot find sdb '%s'\n", ns);
+				}
+			} else {
+				eprintf ("Missing sdb namespace\n");
+			}
 			free (fn);
 		} else {
 			eprintf ("Usage: kd [file] [namespace]\n");
@@ -1143,8 +1161,11 @@ static int cmd_bsize(void *data, const char *input) {
 	switch (input[0]) {
 	case 'm': // "bm"
 		n = r_num_math (core->num, input + 1);
-		if (n > 1) core->blocksize_max = n;
-		else r_cons_printf ("0x%x\n", (ut32)core->blocksize_max);
+		if (n > 1) {
+			core->blocksize_max = n;
+		} else {
+			r_cons_printf ("0x%x\n", (ut32)core->blocksize_max);
+		}
 		break;
 	case '+': // "b+"
 		n = r_num_math (core->num, input + 1);
@@ -1643,7 +1664,9 @@ static int cmd_system(void *data, const char *input) {
 		n = atoi (input);
 		if (*input == '0' || n > 0) {
 			const char *cmd = r_line_hist_get (n);
-			if (cmd) r_core_cmd0 (core, cmd);
+			if (cmd) {
+				r_core_cmd0 (core, cmd);
+			}
 			//else eprintf ("Error setting up system environment\n");
 		} else {
 			char *cmd = r_core_sysenv_begin (core, input);
@@ -1651,7 +1674,9 @@ static int cmd_system(void *data, const char *input) {
 				ret = r_sys_cmd (cmd);
 				r_core_sysenv_end (core, input);
 				free (cmd);
-			} else eprintf ("Error setting up system environment\n");
+			} else {
+				eprintf ("Error setting up system environment\n");
+			}
 		}
 		break;
 	}
@@ -1958,7 +1983,9 @@ static int r_core_cmd_subst(RCore *core, char *cmd) {
 		core->print->cur_enabled = ocur_enabled;
 	}
 	if (colon && colon[1]) {
-		for (++colon; *colon == ';'; colon++);
+		for (++colon; *colon == ';'; colon++) {
+			;
+		}
 		r_core_cmd_subst (core, colon);
 	} else {
 		if (!*icmd) {
@@ -2291,7 +2318,9 @@ escape_pipe:
 			r_list_free (tmpenvs);
 			return ret;
 		}
-		for (cmd = ptr + 2; cmd && *cmd == ' '; cmd++);
+		for (cmd = ptr + 2; cmd && *cmd == ' '; cmd++) {
+			;
+		}
 		ptr = strchr (cmd, '&');
 	}
 
@@ -2820,7 +2849,9 @@ next_arroba:
 		if (ptr[1] == '@') {
 			if (ptr[2] == '@') {
 				char *rule = ptr + 3;
-				while (*rule && *rule == ' ') rule++;
+				while (*rule && *rule == ' ') {
+					rule++;
+				}
 				ret = r_core_cmd_foreach3 (core, cmd, rule);
 			} else {
 				ret = r_core_cmd_foreach (core, cmd, ptr + 2);
@@ -2948,7 +2979,9 @@ static int foreach_comment(void *user, const char *k, const char *v) {
 	const char *cmd = ui->user;
 	if (!strncmp (k, "meta.C.", 7)) {
 		char *cmt = (char *)sdb_decode (v, 0);
-		if (!cmt) cmt = strdup ("");
+		if (!cmt) {
+			cmt = strdup ("");
+		}
 		//eprintf ("--> %s = %s\n", k + 7, cmt);
 		r_core_cmdf (core, "s %s", k + 7);
 		r_core_cmd0 (core, cmd);
@@ -3001,8 +3034,9 @@ R_API int r_core_cmd_foreach3(RCore *core, const char *cmd, char *each) { // "@@
 			int origpid = dbg->pid;
 			RDebugPid *p;
 			list = dbg->h->threads (dbg, dbg->pid);
-			if (!list)
+			if (!list) {
 				return false;
+			}
 			r_list_foreach (list, iter, p) {
 				r_core_cmdf (core, "dp %d", p->pid);
 				r_cons_printf ("PID %d\n", p->pid);
@@ -3168,7 +3202,9 @@ static void foreachOffset (RCore *core, const char *_cmd, const char *each) {
 		// space separated numbers
 		while (each && *each) {
 			// find spaces
-			while (*each== ' ') each++;
+			while (*each == ' ') {
+				each++;
+			}
 			str = strchr (each, ' ');
 			if (str) {
 				*str = '\0';
@@ -3200,7 +3236,9 @@ R_API int r_core_cmd_foreach(RCore *core, const char *cmd, char *each) {
 	RFlagItem *flag;
 	ut64 oseek, addr;
 
-	for (; *cmd == ' '; cmd++);
+	for (; *cmd == ' '; cmd++) {
+		;
+	}
 
 	oseek = core->offset;
 	ostr = str = strdup (each);
@@ -3395,7 +3433,9 @@ R_API int r_core_cmd_foreach(RCore *core, const char *cmd, char *each) {
 		if (out) {
 			each = out;
 			do {
-				while (*each == ' ') each++;
+				while (*each == ' ') {
+					each++;
+				}
 				if (!*each) {
 					break;
 				}
@@ -3463,12 +3503,18 @@ R_API int r_core_cmd_foreach(RCore *core, const char *cmd, char *each) {
 		break;
 	default:
 		core->rcmd->macro.counter = 0;
-		for (; *each == ' '; each++);
+		for (; *each == ' '; each++) {
+			;
+		}
 		i = 0;
 		while (str[i]) {
 			j = i;
-			for (; str[j] && str[j] == ' '; j++); // skip spaces
-			for (i = j; str[i] && str[i] != ' '; i++); // find EOS
+			for (; str[j] && str[j] == ' '; j++) {
+				; // skip spaces
+			}
+			for (i = j; str[i] && str[i] != ' '; i++) {
+				; // find EOS
+			}
 			ch = str[i];
 			str[i] = '\0';
 			word = strdup (str + j);
@@ -3761,7 +3807,9 @@ R_API char *r_core_disassemble_bytes(RCore *core, ut64 addr, int b) {
 
 R_API int r_core_cmd_buffer(void *user, const char *buf) {
 	char *ptr, *optr, *str = strdup (buf);
-	if (!str) return false;
+	if (!str) {
+		return false;
+	}
 	optr = str;
 	ptr = strchr (str, '\n');
 	while (ptr) {
diff --git a/libr/core/cmd_api.c b/libr/core/cmd_api.c
index 099f3cda6d..08a32b8fe6 100644
--- a/libr/core/cmd_api.c
+++ b/libr/core/cmd_api.c
@@ -37,7 +37,9 @@ R_API RCmd *r_cmd_new () {
 
 R_API RCmd *r_cmd_free(RCmd *cmd) {
 	int i;
-	if (!cmd) return NULL;
+	if (!cmd) {
+		return NULL;
+	}
 	r_cmd_alias_free (cmd);
 	r_cmd_macro_free (&cmd->macro);
 	// dinitialize plugin commands
@@ -356,8 +358,9 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
 	macro->code = (char *)malloc (macro->codelen);
 	*macro->code = '\0';
 	macro->nargs = 0;
-	if (!args)
+	if (!args) {
 		args = "";
+	}
 	macro->args = strdup (args);
 	ptr = strchr (macro->name, ' ');
 	if (ptr != NULL) {
@@ -369,11 +372,11 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
 	if (pbody) {
 #endif
 		for (lidx=0; pbody[lidx]; lidx++) {
-			if (pbody[lidx]==',')
+			if (pbody[lidx] == ',') {
 				pbody[lidx]='\n';
-			else
-			if (pbody[lidx]==')' && pbody[lidx-1]=='\n')
-				pbody[lidx]='\0';
+			} else if (pbody[lidx] == ')' && pbody[lidx - 1] == '\n') {
+				pbody[lidx] = '\0';
+			}
 		}
 		strncpy (macro->code, pbody, macro->codelen);
 		macro->code[macro->codelen-1] = 0;
@@ -422,9 +425,13 @@ R_API int r_cmd_macro_rm(RCmdMacro *mac, const char *_name) {
 	RListIter *iter;
 	RCmdMacroItem *m;
 	char *name = strdup (_name);
-	if (!name) return false;
+	if (!name) {
+		return false;
+	}
 	char *ptr = strchr (name, ')');
-	if (ptr) *ptr = '\0';
+	if (ptr) {
+		*ptr = '\0';
+	}
 	r_list_foreach (mac->macros, iter, m) {
 		if (!strcmp (m->name, name)) {
 			r_list_delete (mac->macros, iter);
@@ -448,9 +455,11 @@ R_API void r_cmd_macro_list(RCmdMacro *mac) {
 	r_list_foreach (mac->macros, iter, m) {
 		mac->cb_printf ("%d (%s %s, ", idx, m->name, m->args);
 		for (j=0; m->code[j]; j++) {
-			if (m->code[j]=='\n')
+			if (m->code[j] == '\n') {
 				mac->cb_printf (", ");
-			else mac->cb_printf ("%c", m->code[j]);
+			} else {
+				mac->cb_printf ("%c", m->code[j]);
+			}
 		}
 		mac->cb_printf (")\n");
 		idx++;
@@ -465,9 +474,11 @@ R_API void r_cmd_macro_meta(RCmdMacro *mac) {
 	r_list_foreach (mac->macros, iter, m) {
 		mac->cb_printf ("(%s %s, ", m->name, m->args);
 		for (j=0; m->code[j]; j++) {
-			if (m->code[j]=='\n')
+			if (m->code[j] == '\n') {
 				mac->cb_printf (", ");
-			else mac->cb_printf ("%c", m->code[j]);
+			} else {
+				mac->cb_printf ("%c", m->code[j]);
+			}
 		}
 		mac->cb_printf (")\n");
 	}
@@ -499,20 +510,24 @@ R_API int r_cmd_macro_cmd_args(RCmdMacro *mac, const char *ptr, const char *args
 				const char *word = r_str_word_get0 (arg, w);
 				if (word && *word) {
 					wordlen = strlen (word);
-					if ((i+wordlen+1) >= sizeof (cmd))
+					if ((i + wordlen + 1) >= sizeof (cmd)) {
 						return -1;
+					}
 					memcpy (cmd+i, word, wordlen+1);
 					i += wordlen-1;
 					j++;
-				} else eprintf ("Undefined argument %d\n", w);
+				} else {
+					eprintf ("Undefined argument %d\n", w);
+				}
 			} else
 			if (ptr[j+1]=='@') {
 				char off[32];
 				int offlen;
 				offlen = snprintf (off, sizeof (off), "%d",
 					mac->counter);
-				if ((i+offlen+1) >= sizeof (cmd))
+				if ((i + offlen + 1) >= sizeof (cmd)) {
 					return -1;
+				}
 				memcpy (cmd+i, off, offlen+1);
 				i += offlen-1;
 				j++;
@@ -525,7 +540,9 @@ R_API int r_cmd_macro_cmd_args(RCmdMacro *mac, const char *ptr, const char *args
 			cmd[i+1] = '\0';
 		}
 	}
-	for (pcmd = cmd; *pcmd && (*pcmd==' ' || *pcmd == '\t'); pcmd++);
+	for (pcmd = cmd; *pcmd && (*pcmd == ' ' || *pcmd == '\t'); pcmd++) {
+		;
+	}
 	//eprintf ("-pre %d\n", (int)mac->num->value);
 	int xx = (*pcmd==')')? 0: mac->cmd (mac->user, pcmd);
 	//eprintf ("-pos %p %d\n", mac->num, (int)mac->num->value);
@@ -534,7 +551,9 @@ R_API int r_cmd_macro_cmd_args(RCmdMacro *mac, const char *ptr, const char *args
 
 R_API char *r_cmd_macro_label_process(RCmdMacro *mac, RCmdMacroLabel *labels, int *labels_n, char *ptr) {
 	int i;
-	for (; *ptr==' '; ptr++);
+	for (; *ptr == ' '; ptr++) {
+		;
+	}
 	if (ptr[strlen (ptr)-1]==':' && !strchr (ptr, ' ')) {
 		/* label detected */
 		if (ptr[0]=='.') {
@@ -552,12 +571,15 @@ R_API char *r_cmd_macro_label_process(RCmdMacro *mac, RCmdMacroLabel *labels, in
 		if (ptr[0]=='?' && ptr[1]=='!' && ptr[2] != '?') {
 			if (mac->num && mac->num->value != 0) {
 				char *label = ptr + 3;
-				for (; *label==' '||*label=='.'; label++);
-		//		eprintf("===> GOTO %s\n", label);
+				for (; *label == ' ' || *label == '.'; label++) {
+					;
+				}
+				//		eprintf("===> GOTO %s\n", label);
 				/* goto label ptr+3 */
 				for (i=0;i<*labels_n;i++) {
-					if (!strcmp (label, labels[i].name))
+					if (!strcmp (label, labels[i].name)) {
 						return labels[i].ptr;
+					}
 				}
 				return NULL;
 			}
@@ -566,12 +588,15 @@ R_API char *r_cmd_macro_label_process(RCmdMacro *mac, RCmdMacroLabel *labels, in
 		if (ptr[0]=='?' && ptr[1]=='?' && ptr[2] != '?') {
 			if (mac->num->value == 0) {
 				char *label = ptr + 3;
-				for (;label[0]==' '||label[0]=='.'; label++);
-		//		eprintf("===> GOTO %s\n", label);
+				for (; label[0] == ' ' || label[0] == '.'; label++) {
+					;
+				}
+				//		eprintf("===> GOTO %s\n", label);
 				/* goto label ptr+3 */
 				for (i=0; i<*labels_n; i++) {
-					if (!strcmp (label, labels[i].name))
+					if (!strcmp (label, labels[i].name)) {
 						return labels[i].ptr;
+					}
 				}
 				return NULL;
 			}
@@ -618,7 +643,9 @@ R_API int r_cmd_macro_call(RCmdMacro *mac, const char *name) {
 		eprintf ("Missing end ')' parenthesis.\n");
 		free (str);
 		return false;
-	} else *ptr='\0';
+	} else {
+		*ptr = '\0';
+	}
 
 	args = strchr (str, ' ');
 	if (args) {
@@ -635,7 +662,9 @@ R_API int r_cmd_macro_call(RCmdMacro *mac, const char *name) {
 		return 0;
 	}
 	ptr = strchr (str, ',');
-	if (ptr) *ptr =0;
+	if (ptr) {
+		*ptr = 0;
+	}
 
 	r_cons_break_push (NULL, NULL);
 	r_list_foreach (mac->macros, iter, m) {
@@ -651,7 +680,9 @@ R_API int r_cmd_macro_call(RCmdMacro *mac, const char *name) {
 			}
 			mac->brk = 0;
 			do {
-				if (end) *end = '\0';
+				if (end) {
+					*end = '\0';
+				}
 				if (r_cons_is_breaked ()) {
 					eprintf ("Interrupted at (%s)\n", ptr);
 					if (end) {
@@ -669,7 +700,9 @@ R_API int r_cmd_macro_call(RCmdMacro *mac, const char *name) {
 					break;
 				} else if (ptr != ptr2) {
 					ptr = ptr2;
-					if (end) *end ='\n';
+					if (end) {
+						*end = '\n';
+					}
 					end = strchr (ptr, '\n');
 					continue;
 				}
@@ -717,7 +750,8 @@ R_API int r_cmd_macro_break(RCmdMacro *mac, const char *value) {
 	mac->brk = 1;
 	mac->brk_value = NULL;
 	mac->_brk_value = (ut64)r_num_math (mac->num, value);
-	if (value && *value)
+	if (value && *value) {
 		mac->brk_value = &mac->_brk_value;
+	}
 	return 0;
 }
diff --git a/libr/core/core.c b/libr/core/core.c
index 73b835bfba..dd85070ae7 100644
--- a/libr/core/core.c
+++ b/libr/core/core.c
@@ -494,7 +494,9 @@ static ut64 num_callback(RNum *userptr, const char *str, int *ok) {
 			return 0;
 		}
 		// pop state
-		if (ok) *ok = 1;
+		if (ok) {
+			*ok = 1;
+		}
 		ut8 buf[sizeof (ut64)] = R_EMPTY;
 		(void)r_io_read_at (core->io, n, buf, R_MIN (sizeof (buf), refsz));
 		switch (refsz) {
@@ -709,7 +711,9 @@ static ut64 num_callback(RNum *userptr, const char *str, int *ok) {
 			// NOTE: functions override flags
 			RAnalFunction *fcn = r_anal_fcn_find_name (core->anal, str);
 			if (fcn) {
-				if (ok) *ok = true;
+				if (ok) {
+					*ok = true;
+				}
 				return fcn->addr;
 			}
 #if 0
@@ -722,7 +726,9 @@ static ut64 num_callback(RNum *userptr, const char *str, int *ok) {
 #endif
 			if ((flag = r_flag_get (core->flags, str))) {
 				ret = flag->offset;
-				if (ok) *ok = true;
+				if (ok) {
+					*ok = true;
+				}
 				return ret;
 			}
 
@@ -734,14 +740,18 @@ static ut64 num_callback(RNum *userptr, const char *str, int *ok) {
 					const char *alias = r_reg_get_name (core->dbg->reg, role);
 					r = r_reg_get (core->dbg->reg, alias, -1);
 					if (r) {
-						if (ok) *ok = true;
+						if (ok) {
+							*ok = true;
+						}
 						ret = r_reg_get_value (core->dbg->reg, r);
 						return ret;
 					}
 				}
 			}
 			else {
-				if (ok) *ok = true;
+				if (ok) {
+					*ok = true;
+				}
 				ret = r_reg_get_value (core->dbg->reg, r);
 				return ret;
 			}
@@ -1557,7 +1567,9 @@ static int autocomplete(RLine *line) {
 					}
 				}
 			}
-			if (j > 0) tmp_argv_heap = true;
+			if (j > 0) {
+				tmp_argv_heap = true;
+			}
 			tmp_argv[j] = NULL;
 			line->completion.argc = j;
 			line->completion.argv = tmp_argv;
@@ -1604,7 +1616,9 @@ static int autocomplete(RLine *line) {
 					}
 				}
 			}
-			if (i > 0) tmp_argv_heap = true;
+			if (i > 0) {
+				tmp_argv_heap = true;
+			}
 			tmp_argv[i] = NULL;
 			ls_free (l);
 			line->completion.argc = i;
@@ -1623,7 +1637,9 @@ static int autocomplete(RLine *line) {
 					}
 				}
 			}
-			if (i > 0) tmp_argv_heap = true;
+			if (i > 0) {
+				tmp_argv_heap = true;
+			}
 			tmp_argv[i] = NULL;
 			ls_free (l);
 			line->completion.argc = i;
@@ -1648,7 +1664,9 @@ static int autocomplete(RLine *line) {
 					}
 				}
 			}
-			if (i > 0) tmp_argv_heap = true;
+			if (i > 0) {
+				tmp_argv_heap = true;
+			}
 			tmp_argv[i] = NULL;
 			ls_free (l);
 			line->completion.argc = i;
@@ -1820,29 +1838,41 @@ static char *r_core_anal_hasrefs_to_depth(RCore *core, ut64 value, int depth) {
 			R_FREE (mapname);
 		}
 	}
-	if (fi) r_strbuf_appendf (s, " %s", fi->name);
-	if (fcn) r_strbuf_appendf (s, " %s", fcn->name);
+	if (fi) {
+		r_strbuf_appendf (s, " %s", fi->name);
+	}
+	if (fcn) {
+		r_strbuf_appendf (s, " %s", fcn->name);
+	}
 	if (type) {
 		const char *c = r_core_anal_optype_colorfor (core, value, true);
 		const char *cend = (c && *c) ? Color_RESET: "";
-		if (!c) c = "";
+		if (!c) {
+			c = "";
+		}
 		if (type & R_ANAL_ADDR_TYPE_HEAP) {
 			r_strbuf_appendf (s, " %sheap%s", c, cend);
 		} else if (type & R_ANAL_ADDR_TYPE_STACK) {
 			r_strbuf_appendf (s, " %sstack%s", c, cend);
 		}
-		if (type & R_ANAL_ADDR_TYPE_PROGRAM)
+		if (type & R_ANAL_ADDR_TYPE_PROGRAM) {
 			r_strbuf_appendf (s, " %sprogram%s", c, cend);
-		if (type & R_ANAL_ADDR_TYPE_LIBRARY)
+		}
+		if (type & R_ANAL_ADDR_TYPE_LIBRARY) {
 			r_strbuf_appendf (s, " %slibrary%s", c, cend);
-		if (type & R_ANAL_ADDR_TYPE_ASCII)
+		}
+		if (type & R_ANAL_ADDR_TYPE_ASCII) {
 			r_strbuf_appendf (s, " %sascii%s", c, cend);
-		if (type & R_ANAL_ADDR_TYPE_SEQUENCE)
+		}
+		if (type & R_ANAL_ADDR_TYPE_SEQUENCE) {
 			r_strbuf_appendf (s, " %ssequence%s", c, cend);
-		if (type & R_ANAL_ADDR_TYPE_READ)
+		}
+		if (type & R_ANAL_ADDR_TYPE_READ) {
 			r_strbuf_appendf (s, " %sR%s", c, cend);
-		if (type & R_ANAL_ADDR_TYPE_WRITE)
+		}
+		if (type & R_ANAL_ADDR_TYPE_WRITE) {
 			r_strbuf_appendf (s, " %sW%s", c, cend);
+		}
 		if (type & R_ANAL_ADDR_TYPE_EXEC) {
 			RAsmOp op;
 			ut8 buf[32];
@@ -2437,7 +2467,9 @@ R_API void r_core_prompt_loop(RCore *r) {
 static int prompt_flag (RCore *r, char *s, size_t maxlen) {
 	const char DOTS[] = "...";
 	const RFlagItem *f = r_flag_get_at (r->flags, r->offset, false);
-	if (!f) return false;
+	if (!f) {
+		return false;
+	}
 
 	if (f->offset < r->offset) {
 		snprintf (s, maxlen, "%s + %" PFMT64u, f->name, r->offset - f->offset);
@@ -2487,8 +2519,9 @@ static void set_prompt (RCore *r) {
 	const char *END = "";
 	const char *remote = "";
 
-	if (cmdprompt && *cmdprompt)
+	if (cmdprompt && *cmdprompt) {
 		r_core_cmd (r, cmdprompt, 0);
+	}
 
 	if (r_config_get_i (r->config, "scr.prompt.file")) {
 		free (filename);
diff --git a/libr/core/disasm.c b/libr/core/disasm.c
index f6bb8b6a89..13fe30ae0c 100644
--- a/libr/core/disasm.c
+++ b/libr/core/disasm.c
@@ -2261,7 +2261,9 @@ static void ds_print_lines_right(RDisasmState *ds){
 
 static void printCol(RDisasmState *ds, char *sect, int cols, const char *color) {
 	int pre, post;
-	if (cols < 8) cols = 8;
+	if (cols < 8) {
+		cols = 8;
+	}
 	int outsz = cols + 32;
 	char *out = malloc (outsz);
 	if (!out) {
@@ -2902,7 +2904,9 @@ static void ds_print_show_bytes(RDisasmState *ds) {
 		str = flagstr;
 		if (ds->nb > 0) {
 			k = ds->nb - strlen (flagstr) - 1;
-			if (k < 0 || k > sizeof(pad)) k = 0;
+			if (k < 0 || k > sizeof (pad)) {
+				k = 0;
+			}
 			for (j = 0; j < k; j++) {
 				pad[j] = ' ';
 			}
@@ -4470,15 +4474,23 @@ static char *_find_next_number(char *op) {
 	if (p) {
 		while (*p) {
 			// look for start of next separator or ANSI sequence
-			while (*p && !IS_SEPARATOR (*p) && *p != 0x1b) p++;
+			while (*p && !IS_SEPARATOR (*p) && *p != 0x1b) {
+				p++;
+			}
 			if (*p == 0x1b) {
 				// skip to end of ANSI sequence (lower or uppercase char)
-				while (*p && !(*p >= 'A' && *p <= 'Z') && !(*p >= 'a' && *p <= 'z')) p++;
-				if (*p) p++;
+				while (*p && !(*p >= 'A' && *p <= 'Z') && !(*p >= 'a' && *p <= 'z')) {
+					p++;
+				}
+				if (*p) {
+					p++;
+				}
 			}
 			if (IS_SEPARATOR (*p)) {
 				// skip to end of separator
-				while (*p && IS_SEPARATOR (*p)) p++;
+				while (*p && IS_SEPARATOR (*p)) {
+					p++;
+				}
 			}
 			if (IS_DIGIT (*p)) {
 				// we found the start of the next number
diff --git a/libr/core/hack.c b/libr/core/hack.c
index c367987331..2a61672fe6 100644
--- a/libr/core/hack.c
+++ b/libr/core/hack.c
@@ -149,20 +149,23 @@ R_API bool r_core_hack_arm(RCore *core, const char *op, const RAnalOp *analop) {
 		eprintf ("TODO: use jnz or jz\n");
 		return false;
 	} else if (!strcmp (op, "ret1")) {
-		if (bits == 16)
+		if (bits == 16) {
 			r_core_cmd0 (core, "wx 01207047 @@ $$+1\n"); // mov r0, 1; bx lr
-		else
+		} else {
 			r_core_cmd0 (core, "wx 0100b0e31eff2fe1 @@ $$+1\n"); // movs r0, 1; bx lr
+		}
 	} else if (!strcmp (op, "ret0")) {
-		if (bits == 16)
+		if (bits == 16) {
 			r_core_cmd0 (core, "wx 00207047 @@ $$+1\n"); // mov r0, 0; bx lr
-		else
+		} else {
 			r_core_cmd0 (core, "wx 0000a0e31eff2fe1 @@ $$+1\n"); // movs r0, 0; bx lr
+		}
 	} else if (!strcmp (op, "retn")) {
-		if (bits == 16)
+		if (bits == 16) {
 			r_core_cmd0 (core, "wx ff207047 @@ $$+1\n"); // mov r0, -1; bx lr
-		else
+		} else {
 			r_core_cmd0 (core, "wx ff00a0e31eff2fe1 @@ $$+1\n"); // movs r0, -1; bx lr
+		}
 	} else {
 		eprintf ("Invalid operation\n");
 		return false;
@@ -174,13 +177,16 @@ R_API bool r_core_hack_x86(RCore *core, const char *op, const RAnalOp *analop) {
 	const ut8 *b = core->block;
 	int i, size = analop->size;
 	if (!strcmp (op, "nop")) {
-		if (size * 2 + 1 < size) return false;
+		if (size * 2 + 1 < size) {
+			return false;
+		}
 		char *str = malloc (size * 2 + 1);
 		if (!str) {
 			return false;
 		}
-		for (i = 0; i < size; i++)
+		for (i = 0; i < size; i++) {
 			memcpy (str + (i * 2), "90", 2);
+		}
 		str[size*2] = '\0';
 		r_core_cmdf (core, "wx %s\n", str);
 		free (str);
diff --git a/libr/core/p/core_java.c b/libr/core/p/core_java.c
index fe9b27c67f..95ea2bc9b5 100644
--- a/libr/core/p/core_java.c
+++ b/libr/core/p/core_java.c
@@ -290,10 +290,18 @@ enum {
 };
 
 static ut8 _(r_cmd_java_obj_ref)(const char *name, const char *class_name, ut32 len) {
-	if (!name || !class_name) return false;
-	if (strncmp (class_name, name, len)) return false;
-	if (*(name-1) == 'L' && *(name+len) == ';') return true;
-	if (!strncmp (class_name, name, len) && !*(name+len)) return true;
+	if (!name || !class_name) {
+		return false;
+	}
+	if (strncmp (class_name, name, len)) {
+		return false;
+	}
+	if (*(name - 1) == 'L' && *(name + len) == ';') {
+		return true;
+	}
+	if (!strncmp (class_name, name, len) && !*(name + len)) {
+		return true;
+	}
 	return false;
 }
 
@@ -304,7 +312,9 @@ static const char * r_cmd_get_next_classname_str (const char * str, const char *
 		result = str;
 		while (result && *result && (result - str < len)) {
 			result = strstr (result, match_me);
-			if (result ) break;
+			if (result) {
+				break;
+			}
 		}
 	}
 	return result;
@@ -315,7 +325,9 @@ static ut32 r_cmd_get_num_classname_str_occ (const char * str, const char *match
 	ut32 len = match_me && *match_me ? strlen (match_me) : 0;
 	ut32 occ = 0;
 
-	if (len == 0 || !str || !*str ) return 0;
+	if (len == 0 || !str || !*str) {
+		return 0;
+	}
 	result = str;
 	while (result && *result && (result - str < len)) {
 		result = strstr (result, match_me);
@@ -331,8 +343,12 @@ static ut32 r_cmd_get_num_classname_str_occ (const char * str, const char *match
 static const char * r_cmd_java_consumetok (const char *str1, const char b, size_t len) {
 	const char *p = str1;
 	size_t i = 0;
-	if (!p) return p;
-	if (len == -1) len = strlen (str1);
+	if (!p) {
+		return p;
+	}
+	if (len == -1) {
+		len = strlen (str1);
+	}
 	for ( ; i < len; i++,p++) {
 		if (*p != b) {
 			break;
@@ -344,8 +360,12 @@ static const char * r_cmd_java_consumetok (const char *str1, const char b, size_
 static const char * r_cmd_java_strtok (const char *str1, const char b, size_t len) {
 	const char *p = str1;
 	size_t i = 0;
-	if (!p || !*p) return p;
-	if (len == -1) len = strlen (str1);
+	if (!p || !*p) {
+		return p;
+	}
+	if (len == -1) {
+		len = strlen (str1);
+	}
 	IFDBG r_cons_printf ("Looking for char (%c) in (%s) up to %d\n", b, p, len);
 	for ( ; i < len; i++,p++) {
 		if (*p == b) {
@@ -353,7 +373,9 @@ static const char * r_cmd_java_strtok (const char *str1, const char b, size_t le
 			break;
 		}
 	}
-	if (i == len) p = NULL;
+	if (i == len) {
+		p = NULL;
+	}
 	IFDBG r_cons_printf ("Found? for char (%c) @ %d: (%s)\n", b, len, p);
 	return p;
 }
@@ -433,30 +455,40 @@ static int _(r_cmd_java_check_op_idx) (const ut8 *op_bytes, ut16 idx) {
 /* Find stuff in the constant pool */
 static RList * cpfind_double (RCore *core, RBinJavaObj *obj, const char *cmd) {
 	double value = cmd && *cmd ? strtod (cmd, NULL) : 0.0;
-	if (value == 0.0 && !(cmd && cmd[0] == '0' && cmd[1] == '.' && cmd[2] == '0') ) return r_list_new();
+	if (value == 0.0 && !(cmd && cmd[0] == '0' && cmd[1] == '.' && cmd[2] == '0')) {
+		return r_list_new ();
+	}
 	return r_bin_java_find_cp_const_by_val ( obj, (const ut8 *) &value, 8, R_BIN_JAVA_CP_DOUBLE);
 }
 
 static RList * cpfind_float (RCore *core, RBinJavaObj *obj, const char *cmd) {
 	float value = cmd && *cmd ? atof (cmd) : 0.0;
-	if (value == 0.0 && !(cmd && cmd[0] == '0' && cmd[1] == '.' && cmd[2] == '0') ) return r_list_new();
+	if (value == 0.0 && !(cmd && cmd[0] == '0' && cmd[1] == '.' && cmd[2] == '0')) {
+		return r_list_new ();
+	}
 	return r_bin_java_find_cp_const_by_val ( obj, (const ut8 *) &value, 4, R_BIN_JAVA_CP_FLOAT);
 }
 
 static RList * cpfind_long (RCore *core, RBinJavaObj *obj, const char *cmd) {
 	ut64 value = r_cmd_java_get_input_num_value (core, cmd);
-	if ( !r_cmd_java_is_valid_input_num_value (core, cmd) ) return r_list_new ();
+	if (!r_cmd_java_is_valid_input_num_value (core, cmd)) {
+		return r_list_new ();
+	}
 	return r_bin_java_find_cp_const_by_val ( obj, (const ut8 *) &value, 8, R_BIN_JAVA_CP_LONG);
 }
 
 static RList * cpfind_int (RCore *core, RBinJavaObj *obj, const char *cmd) {
 	ut32 value = (ut32) r_cmd_java_get_input_num_value (core, cmd);
-	if ( !r_cmd_java_is_valid_input_num_value (core, cmd) ) return r_list_new ();
+	if (!r_cmd_java_is_valid_input_num_value (core, cmd)) {
+		return r_list_new ();
+	}
 	return r_bin_java_find_cp_const_by_val ( obj, (const ut8 *) &value, 4, R_BIN_JAVA_CP_INTEGER);
 }
 
 static RList * cpfind_str (RCore *core, RBinJavaObj *obj, const char *cmd) {
-	if (!cmd) return r_list_new();
+	if (!cmd) {
+		return r_list_new ();
+	}
 	IFDBG r_cons_printf ("Looking for str: %s (%d)\n", cmd, strlen (cmd));
 	return r_bin_java_find_cp_const_by_val ( obj, (const ut8 *) cmd, strlen (cmd), R_BIN_JAVA_CP_UTF8);
 }
@@ -500,7 +532,9 @@ static int cpfind (RCore *core, const char *cmd) {
 }
 
 static int r_cmd_java_reload_bin_from_buf (RCore *core, RBinJavaObj *obj, ut8* buffer, ut64 len) {
-	if (!buffer || len < 10) return false;
+	if (!buffer || len < 10) {
+		return false;
+	}
 	int res = r_bin_java_load_bin (obj, buffer, len);
 
 	if (res == true) {
@@ -528,7 +562,9 @@ static int r_cmd_java_get_cp_bytes_and_write (RCore *core, RBinJavaObj *obj, ut1
 	ut32 n_sz = 0, c_sz = obj ? r_bin_java_cp_get_size (obj, idx): -1;
 	ut8 * bytes = NULL;
 
-	if (c_sz == -1) return res;
+	if (c_sz == -1) {
+		return res;
+	}
 
 	bytes = r_bin_java_cp_get_bytes (cp_obj->tag, &n_sz, buf, len);
 
@@ -567,7 +603,9 @@ static int r_cmd_java_get_cp_bytes_and_write (RCore *core, RBinJavaObj *obj, ut1
 			if (res == true) {
 				res = r_cmd_java_reload_bin_from_buf (
 					core, obj, bin_buffer, n_file_sz);
-			} else eprintf ("[X] r_cmd_java_get_cp_bytes_and_write: Failed to read the file in aborted, bin reload.\n");
+			} else {
+				eprintf ("[X] r_cmd_java_get_cp_bytes_and_write: Failed to read the file in aborted, bin reload.\n");
+			}
 			free (bin_buffer);
 		}
 	}
@@ -730,8 +768,9 @@ static char * r_cmd_replace_name (const char *s_new, ut32 replace_len, const cha
 		}
 		IFDBG r_cons_printf ("Found last occurrence of: \"%s\", remaining: %s\n", s_old, buffer+consumed);
 		IFDBG r_cons_printf ("result is: \"%s\"\n", result);
-		for (; consumed < buf_len; consumed++, p_result++, (*res_len)++)
-			*p_result = *(buffer+consumed);
+		for (; consumed < buf_len; consumed++, p_result++, (*res_len)++) {
+			*p_result = *(buffer + consumed);
+		}
 		IFDBG r_cons_printf ("Old: %s\nNew: %s\n", buffer, result);
 	}
 	return result;
@@ -744,9 +783,13 @@ static int r_cmd_java_get_class_names_from_input (const char *input, char **clas
 	ut32 cmd_sz = input && *input ? strlen (input) : 0;
 	int res = false;
 
-	if (!class_name || *class_name) return res;
-	else if (!new_class_name || *new_class_name) return res;
-	else if (!new_class_name_len || !class_name_len) return res;
+	if (!class_name || *class_name) {
+		return res;
+	} else if (!new_class_name || *new_class_name) {
+		return res;
+	} else if (!new_class_name_len || !class_name_len) {
+		return res;
+	}
 
 	*new_class_name = NULL;
 	*class_name_len = 0;
@@ -767,7 +810,9 @@ static int r_cmd_java_get_class_names_from_input (const char *input, char **clas
 			p = r_cmd_java_consumetok (end+1, ' ', cmd_sz);
 			end = p && *p ? r_cmd_java_strtok (p, ' ', -1) : NULL;
 
-			if (!end && p && *p) end = p + cmd_sz;
+			if (!end && p && *p) {
+				end = p + cmd_sz;
+			}
 
 			if (p && end && p != end) {
 				*new_class_name_len = end - p + 1;
@@ -819,7 +864,9 @@ static int r_cmd_java_handle_replace_classname_value (RCore *core, const char *c
 			ut64 addr = cp_obj->file_offset + cp_obj->loadaddr;
 			buffer = r_bin_java_cp_get_idx_bytes (obj, idx, &buffer_sz);
 
-			if (!buffer) continue;
+			if (!buffer) {
+				continue;
+			}
 			len = R_BIN_JAVA_USHORT ( buffer, 1);
 			name = malloc (len+3);
 			memcpy (name, buffer+3, len);
@@ -879,7 +926,9 @@ static int r_cmd_java_handle_reload_bin (RCore *core, const char *cmd) {
 	}
 
 	addr = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
-	if (*cmd == ' ') p = r_cmd_java_consumetok (p, ' ', -1);
+	if (*cmd == ' ') {
+		p = r_cmd_java_consumetok (p, ' ', -1);
+	}
 	buf_size = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
 
 	// XXX this may cause problems cause the file we are looking at may not be the bin we want.
@@ -908,8 +957,11 @@ static int r_cmd_java_handle_find_cp_const (RCore *core, const char *cmd) {
 	ut16 idx = -1;
 	RList *find_list;
 
-	if (p && *p == 'a') idx = -1;
-	else idx = r_cmd_java_get_input_num_value (core, p);
+	if (p && *p == 'a') {
+		idx = -1;
+	} else {
+		idx = r_cmd_java_get_input_num_value (core, p);
+	}
 
 	IFDBG r_cons_printf ("Function call made: %s\n", cmd);
 
@@ -937,13 +989,17 @@ static int r_cmd_java_handle_find_cp_const (RCore *core, const char *cmd) {
 				case 0x12:
 					cp_res = (idx == (ut16) -1) || (bb->op_bytes[1] == idx) ?
 								R_NEW0(RCmdJavaCPResult) : NULL;
-					if (cp_res) cp_res->idx = bb->op_bytes[1];
+					if (cp_res) {
+						cp_res->idx = bb->op_bytes[1];
+					}
 					break;
 				case 0x13:
 				case 0x14:
 					cp_res = (idx == (ut16) -1) || (R_BIN_JAVA_USHORT (bb->op_bytes, 1) == idx) ?
 								R_NEW0(RCmdJavaCPResult) : NULL;
-					if (cp_res) cp_res->idx = R_BIN_JAVA_USHORT (bb->op_bytes, 1);
+					if (cp_res) {
+						cp_res->idx = R_BIN_JAVA_USHORT (bb->op_bytes, 1);
+					}
 					break;
 			}
 
@@ -1051,7 +1107,9 @@ static int r_cmd_java_handle_calc_class_sz (RCore *core, const char *cmd) {
 			buf = realloc (buf, sz);
 			ut64 r_sz = r_io_read_at (core->io, addr, buf, sz) ? sz : 0LL;
 			// check the return read on the read
-			if (r_sz == 0) break;
+			if (r_sz == 0) {
+				break;
+			}
 			res_size = r_bin_java_calc_class_size (buf, sz);
 			// if the data buffer contains a class starting
 			// at address, then the res_size will be the size
@@ -1067,8 +1125,11 @@ static int r_cmd_java_handle_calc_class_sz (RCore *core, const char *cmd) {
 				sz += (1 << 16);
 			}
 		}
-		if (res) r_cons_printf ("%"PFMT64d, res_size);
-		else r_cons_printf ("-1\n");
+		if (res) {
+			r_cons_printf ("%" PFMT64d, res_size);
+		} else {
+			r_cons_printf ("-1\n");
+		}
 
 		//snprintf (cmd_buf, 50, fmt, num_acc_flag, addr);
 		//res = r_core_cmd0(core, y);
@@ -1098,7 +1159,9 @@ static int r_cmd_java_handle_isvalid (RCore *core, const char *cmd) {
 			buf = realloc (buf, sz);
 			ut64 r_sz = r_io_read_at (core->io, addr, buf, sz) ? sz : 0LL;
 			// check the return read on the read
-			if (r_sz == 0) break;
+			if (r_sz == 0) {
+				break;
+			}
 			res_size = r_bin_java_calc_class_size (buf, sz);
 			// if the data buffer contains a class starting
 			// at address, then the res_size will be the size
@@ -1114,10 +1177,14 @@ static int r_cmd_java_handle_isvalid (RCore *core, const char *cmd) {
 				sz <<= 1;
 			}
 		}
-		if (res) r_cons_printf ("True\n");
-		else r_cons_printf ("False\n");
-	} else
-		r_cmd_java_print_cmd_help (JAVA_CMDS+ISVALID_IDX);
+		if (res) {
+			r_cons_printf ("True\n");
+		} else {
+			r_cons_printf ("False\n");
+		}
+	} else {
+		r_cmd_java_print_cmd_help (JAVA_CMDS + ISVALID_IDX);
+	}
 	return true;
 }
 
@@ -1233,8 +1300,9 @@ static int r_cmd_java_handle_flags_str (RCore *core, const char *cmd) {
 	char * flags_str = NULL;
 
 	IFDBG r_cons_printf ("r_cmd_java_handle_flags_str: ftype = %c, idx = %s\n", f_type, p);
-	if (p)
-		flag_value = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
+	if (p) {
+		flag_value = r_cmd_java_is_valid_input_num_value (core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
+	}
 
 	if (p && f_type) {
 		switch (f_type) {
@@ -1279,7 +1347,9 @@ static int r_cmd_java_handle_flags_str_at (RCore *core, const char *cmd) {
 		flag_value_addr = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
 		r_io_read_at (core->io, flag_value_addr, (ut8 *) &flag_value, 2);
 		IFDBG r_cons_printf ("r_cmd_java_handle_flags_str_at: read = 0x%04x\n", flag_value);
-		if (cur_offset != core->offset) r_core_seek (core, cur_offset-2, 1);
+		if (cur_offset != core->offset) {
+			r_core_seek (core, cur_offset - 2, 1);
+		}
 		flag_value = R_BIN_JAVA_USHORT (((ut8 *) &flag_value), 0);
 	}
 
@@ -1344,9 +1414,12 @@ static int r_cmd_java_handle_set_flags (RCore * core, const char * input) {
 	}
 	IFDBG r_cons_printf ("Converting %s to flags\n",p);
 
-	if (p) p+=2;
-	if (flag_value == -1)
-		flag_value = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
+	if (p) {
+		p += 2;
+	}
+	if (flag_value == -1) {
+		flag_value = r_cmd_java_is_valid_input_num_value (core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
+	}
 
 	if (!input) {
 		eprintf ("[-] r_cmd_java: no address provided .\n");
@@ -1408,7 +1481,9 @@ static int r_cmd_java_call(void *user, const char *input) {
 			strncmp (input+5, JAVA_CMDS[i].name, JAVA_CMDS[i].name_len));
 		if (!strncmp (input + 5, JAVA_CMDS[i].name, JAVA_CMDS[i].name_len)) {
 			const char *cmd = input + 5 + JAVA_CMDS[i].name_len;
-			if (*cmd && *cmd == ' ') cmd++;
+			if (*cmd && *cmd == ' ') {
+				cmd++;
+			}
 			//IFDBG r_cons_printf ("Executing cmd: %s (%s)\n", JAVA_CMDS[i].name, cmd+5+JAVA_CMDS[i].name_len );
 			res =  JAVA_CMDS[i].handler (core, cmd);
 			break;
@@ -1473,7 +1548,9 @@ static int r_cmd_java_print_all_definitions( RAnal *anal ) {
 	RListIter *iter;
 	RBinJavaObj *obj;
 
-	if (!obj_list) return 1;
+	if (!obj_list) {
+		return 1;
+	}
 	r_list_foreach (obj_list, iter, obj) {
 		r_cmd_java_print_class_definitions (obj);
 	}
@@ -1551,11 +1628,13 @@ static RBinJavaObj * r_cmd_java_get_bin_obj(RAnal *anal) {
 	RBin *b;
 	int is_java;
 	RBinPlugin *plugin;
-	if (!anal || !anal->binb.bin)
+	if (!anal || !anal->binb.bin) {
 		return NULL;
+	}
 	b = anal->binb.bin;
-	if (!b->cur || !b->cur->o)
+	if (!b->cur || !b->cur->o) {
 		return NULL;
+	}
 	plugin = b->cur->o->plugin;
 	is_java = (plugin  && strcmp (plugin->name, "java") == 0) ? 1 : 0;
 	return is_java ? b->cur->o->bin_obj : NULL;
@@ -1591,10 +1670,11 @@ static int r_cmd_java_resolve_cp_idx_b64 (RBinJavaObj *obj, ut16 idx) {
 static int r_cmd_java_resolve_cp_address (RBinJavaObj *obj, ut16 idx) {
 	if (obj && idx){
 		ut64 addr = r_bin_java_resolve_cp_idx_address (obj, idx) ;
-		if (addr == -1)
+		if (addr == -1) {
 			r_cons_printf ("Unable to resolve CP Object @ index: 0x%04x\n", idx);
-		else
-			r_cons_printf ("0x%"PFMT64x"\n", addr);
+		} else {
+			r_cons_printf ("0x%" PFMT64x "\n", addr);
+		}
 	}
 	return true;
 }
@@ -1758,7 +1838,9 @@ static char * r_cmd_java_get_descriptor (RCore *core, RBinJavaObj *bin, ut16 idx
 		fullname = malloc (fn_len);
 		snprintf (fullname, fn_len, "%s.%s", class_name, name);
 	}
-	if (fullname) prototype = r_bin_java_unmangle_without_flags (fullname, descriptor);
+	if (fullname) {
+		prototype = r_bin_java_unmangle_without_flags (fullname, descriptor);
+	}
 	free (class_name);
 	free (name);
 	free (descriptor);
@@ -1790,14 +1872,18 @@ static int r_cmd_java_handle_list_code_references (RCore *core, const char *inpu
 
 	r_list_foreach (anal->fcns, fcn_iter, fcn) {
 		ut8 do_this_one = func_addr == -1 || r_anal_fcn_is_in_offset (fcn, func_addr);
-		if (!do_this_one) continue;
+		if (!do_this_one) {
+			continue;
+		}
 		r_list_foreach (fcn->bbs, bb_iter, bb) {
 			char *operation = NULL, *type = NULL;
 			ut64 addr = -1;
 			ut16 cp_ref_idx = -1;
 			char *full_bird = NULL;
 			// if bb_type is a call
-			if (bb->op_bytes[0] == 0x01) continue;
+			if (bb->op_bytes[0] == 0x01) {
+				continue;
+			}
 			if (bb->op_bytes[0] == 0x12) {
 				// loading a constant
 				addr = bb->addr;
@@ -1886,18 +1972,23 @@ static int r_cmd_java_handle_yara_code_extraction_refs (RCore *core, const char
 	ut64 addr = -1, count = -1;
 	int res = false;
 
-	if (!bin) return res;
-	else if (!anal || !anal->fcns || r_list_length (anal->fcns) == 0) {
+	if (!bin) {
+		return res;
+	} else if (!anal || !anal->fcns || r_list_length (anal->fcns) == 0) {
 		eprintf ("Unable to access the current analysis, perform 'af' for function analysis.\n");
 		return true;
 	}
 
-	if (!p) return res;
+	if (!p) {
+		return res;
+	}
 
 	n = *p ? r_cmd_java_strtok (p, ' ', -1) : NULL;
 	name = n && p && p != n ? malloc (n - p + 2) : NULL;
 
-	if (!name) return res;
+	if (!name) {
+		return res;
+	}
 
 	memset (name, 0, n-p);
 	memcpy (name, p, n-p);
@@ -1940,12 +2031,16 @@ static int r_cmd_java_handle_insert_method_ref (RCore *core, const char *input)
 		eprintf ("Unable to access the current analysis, perform 'af' for function analysis.\n");
 		return true;
 	}
-	if (!p) return res;
+	if (!p) {
+		return res;
+	}
 
 	n = p && *p ? r_cmd_java_strtok (p, ' ', -1) : NULL;
 	classname = n && p && p != n ? malloc (n-p+1) : NULL;
 	cn_sz = n && p ? n-p +1 : 0;
-	if (!classname) return res;
+	if (!classname) {
+		return res;
+	}
 
 	snprintf (classname, cn_sz, "%s", p);
 	//memset (classname, 0, cn_sz);
@@ -2000,14 +2095,18 @@ static int r_cmd_java_handle_print_exceptions (RCore *core, const char *input) {
 	const char *p = input? r_cmd_java_consumetok (input, ' ', -1): NULL;
 	func_addr = p && *p && r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
 
-	if (!bin) return false;
+	if (!bin) {
+		return false;
+	}
 
 	r_list_foreach (bin->methods_list, methods_iter, method) {
 		ut64 start = r_bin_java_get_method_start(bin, method),
 			end = r_bin_java_get_method_end(bin, method);
 		ut8 do_this_one = start <= func_addr && func_addr <= end;	RList * exc_table = NULL;
 		do_this_one = func_addr == -1 ? 1 : do_this_one;
-		if (!do_this_one) continue;
+		if (!do_this_one) {
+			continue;
+		}
 		exc_table = r_bin_java_get_method_exception_table_with_addr (bin, start);
 
 		if (r_list_length (exc_table) == 0){
diff --git a/libr/core/patch.c b/libr/core/patch.c
index d122a0acdb..db86b93fca 100644
--- a/libr/core/patch.c
+++ b/libr/core/patch.c
@@ -9,12 +9,16 @@ R_API int r_core_patch_line (RCore *core, char *str) {
 		return 0;
 	}
 	*p = 0;
-	for (++p; *p == ' '; p++); // XXX: skipsspaces here
+	for (++p; *p == ' '; p++) {
+		; // XXX: skipsspaces here
+	}
 
 	switch (*p) {
 	case '"':
 		  q = strchr (p + 1,'"');
-		  if (q) *q = 0;
+		  if (q) {
+			  *q = 0;
+		  }
 		  r_core_cmdf (core, "s %s", str);
 		  r_core_cmdf (core, "\"w %s\"", p+1);
 		  break;
@@ -26,7 +30,9 @@ R_API int r_core_patch_line (RCore *core, char *str) {
 		q = strchr (p + 1,' ');
 		if (q) {
 			*q = 0;
-			for (++q; *q == ' '; q++); // XXX: skipsspaces here
+			for (++q; *q == ' '; q++) {
+				; // XXX: skipsspaces here
+			}
 		} else {
 			return 0;
 		}
@@ -60,8 +66,9 @@ static int __core_patch_bracket(RCore *core, const char *str, ut64 *noff) {
 			p++;
 			continue;
 		}
-		if (*str == '}')
+		if (*str == '}') {
 			break;
+		}
 		if ((q = strstr (str, "${"))) {
 			char *end = strchr (q+2,'}');
 			if (end) {
diff --git a/libr/core/rtr.c b/libr/core/rtr.c
index e7cca26738..2cb19adfce 100644
--- a/libr/core/rtr.c
+++ b/libr/core/rtr.c
@@ -329,8 +329,16 @@ TODO:
 			case '*': free (rtrcmd (T, "b+16")); break;
 			case '-': free (rtrcmd (T, "b-1")); break;
 			case '/': free (rtrcmd (T, "b-16")); break;
-			case 'p': cmdidx++; if (!cmds[cmdidx]) cmdidx = 0; break;
-			case 'P': cmdidx--; if (cmdidx<0) cmdidx = 2; break;
+			case 'p': cmdidx++;
+				if (!cmds[cmdidx]) {
+					cmdidx = 0;
+				}
+				break;
+			case 'P': cmdidx--;
+				if (cmdidx < 0) {
+					cmdidx = 2;
+				}
+				break;
 			case 'q': return false;
 			}
 		}
@@ -368,7 +376,9 @@ static char *rtr_dir_files (const char *path) {
 	RList *files = r_sys_dir (path);
 	eprintf ("Listing directory %s\n", path);
 	r_list_foreach (files, iter, file) {
-		if (file[0] == '.') continue;
+		if (file[0] == '.') {
+			continue;
+		}
 		ptr = r_str_appendf (ptr, "<a href=\"%s%s\">%s</a><br />\n",
 			path, file, file);
 	}
@@ -1374,8 +1384,9 @@ R_API void r_core_rtr_pushout(RCore *core, const char *input) {
 R_API void r_core_rtr_list(RCore *core) {
 	int i;
 	for (i = 0; i < RTR_MAX_HOSTS; i++) {
-		if (!rtr_host[i].fd)
+		if (!rtr_host[i].fd) {
 			continue;
+		}
 		r_cons_printf ("%i - ", rtr_host[i].fd->fd);
 		switch (rtr_host[i].proto) {
 		case RTR_PROT_HTTP: r_cons_printf ( "http://"); break;
@@ -1413,8 +1424,9 @@ R_API void r_core_rtr_add(RCore *core, const char *_input) {
 		proto = RTR_PROT_RAP;
 		host = input;
 	}
-	while (*host && IS_WHITECHAR (*host))
+	while (*host && IS_WHITECHAR (*host)) {
 		host++;
+	}
 
 	if (!(ptr = strchr (host, ':'))) {
 		ptr = host;
@@ -1466,8 +1478,12 @@ R_API void r_core_rtr_add(RCore *core, const char *_input) {
 				for (;;) {
 					r_line_set_prompt (prompt);
 					res = r_line_readline ();
-					if (!res || !*res) break;
-					if (*res == 'q') break;
+					if (!res || !*res) {
+						break;
+					}
+					if (*res == 'q') {
+						break;
+					}
 					if (!strcmp (res, "!sh")) {
 						for (;;) {
 							r_line_set_prompt (prompt2);
@@ -1481,7 +1497,9 @@ R_API void r_core_rtr_add(RCore *core, const char *_input) {
 							if (str) {
 								str[len] = 0;
 								res = strstr (str, "\n\n");
-								if (res) res = strstr (res+1, "\n\n");
+								if (res) {
+									res = strstr (res + 1, "\n\n");
+								}
 								res = res? res + 2: str;
 								const char *tail = (res[strlen (res) - 1] == '\n')? "": "\n";
 								printf ("%s%s", res, tail);
@@ -1501,15 +1519,25 @@ R_API void r_core_rtr_add(RCore *core, const char *_input) {
 						rtr_textlog_chat (core, T);
 					} else {
 						ptr = r_str_uri_encode (res);
-						if (ptr) res = ptr;
+						if (ptr) {
+							res = ptr;
+						}
 						char *uri = r_str_newf ("http://%s:%s/%s%s", host, port, file, res);
-						if (ptr == res) free (ptr);
+						if (ptr == res) {
+							free (ptr);
+						}
 						str = r_socket_http_get (uri, NULL, &len);
 						if (str && len > 0) {
 							str[len] = 0;
 							res = strstr (str, "\n\n");
-							if (res) res = strstr (res+1, "\n\n");
-							if (res) res += 2; else res = str;
+							if (res) {
+								res = strstr (res + 1, "\n\n");
+							}
+							if (res) {
+								res += 2;
+							} else {
+								res = str;
+							}
 							printf ("%s%s", res, (*res && res[strlen (res)-1] == '\n') ? "" : "\n");
 							r_line_hist_add (str);
 						}
@@ -1523,10 +1551,14 @@ R_API void r_core_rtr_add(RCore *core, const char *_input) {
 				if (str) {
 					str[len] = 0;
 					res = strstr (str, "\n\n");
-					if (res) res = strstr (res + 1, "\n\n");
+					if (res) {
+						res = strstr (res + 1, "\n\n");
+					}
 					printf ("%s", res? res + 2: str);
 					free (str);
-				} else eprintf ("HTTP connection has failed\n");
+				} else {
+					eprintf ("HTTP connection has failed\n");
+				}
 				free (http_uri);
 			}
 			r_socket_free (fd);
@@ -1602,15 +1634,17 @@ R_API void r_core_rtr_remove(RCore *core, const char *input) {
 
 	if (IS_DIGIT(input[0])) {
 		fd = r_num_math (core->num, input);
-		for (i = 0; i < RTR_MAX_HOSTS; i++)
+		for (i = 0; i < RTR_MAX_HOSTS; i++) {
 			if (rtr_host[i].fd && rtr_host[i].fd->fd == fd) {
 				r_socket_free (rtr_host[i].fd);
 				rtr_host[i].fd = NULL;
 				if (rtr_n == i) {
-					for (rtr_n = 0; !rtr_host[rtr_n].fd \
-						&& rtr_n < RTR_MAX_HOSTS - 1; rtr_n++);
+					for (rtr_n = 0; !rtr_host[rtr_n].fd && rtr_n < RTR_MAX_HOSTS - 1; rtr_n++) {
+						;
+					}
 				}
 				break;
+			}
 		}
 	} else {
 		for (i = 0; i < RTR_MAX_HOSTS; i++) {
@@ -1631,9 +1665,9 @@ R_API void r_core_rtr_session(RCore *core, const char *input) {
 	prompt[0] = 0;
 	if (IS_DIGIT (input[0])) {
 		fd = r_num_math (core->num, input);
-		for (rtr_n = 0; rtr_host[rtr_n].fd \
-			&& rtr_host[rtr_n].fd->fd != fd \
-			&& rtr_n < RTR_MAX_HOSTS - 1; rtr_n++);
+		for (rtr_n = 0; rtr_host[rtr_n].fd && rtr_host[rtr_n].fd->fd != fd && rtr_n < RTR_MAX_HOSTS - 1; rtr_n++) {
+			;
+		}
 	}
 
 	while (!r_cons_is_breaked ()) {
@@ -1836,7 +1870,9 @@ R_API char *r_core_rtr_cmds_query (RCore *core, const char *host, const char *po
 		//r_socket_write (s, "px\n", 3);
 		for (;;) {
 			int ret = r_socket_read (s, buf, sizeof (buf));
-			if (ret < 1) break;
+			if (ret < 1) {
+				break;
+			}
 			buf[ret] = 0;
 			rbuf = r_str_append (rbuf, (const char *)buf);
 		}
diff --git a/libr/core/vmenus.c b/libr/core/vmenus.c
index 95eeaafd0f..072e8bc960 100644
--- a/libr/core/vmenus.c
+++ b/libr/core/vmenus.c
@@ -494,12 +494,13 @@ static int sdbforcb (void *p, const char *k, const char *v) {
 					vt->curfmt = strdup (v);
 					pre = ">";
 				}
-				if (use_color && *pre=='>')
+				if (use_color && *pre == '>') {
 					r_cons_printf ("%s %s %s  %s\n", color_sel,
 						Color_RESET, pre, k+strlen (s), v);
-				else
+				} else {
 					r_cons_printf (" %s %s  %s\n",
-						pre, k+strlen (s), v);
+						pre, k + strlen (s), v);
+				}
 				vt->t_ctr ++;
 			}
 			free (s);
@@ -871,7 +872,9 @@ static bool r_core_visual_config_hud(RCore *core) {
 	RListIter *iter;
 	RConfigNode *bt;
 	RList *list = r_list_new ();
-	if (!list) return false;
+	if (!list) {
+		return false;
+	}
 	char *res;
 	list->free = free;
 	r_list_foreach (core->config->nodes, iter, bt) {
@@ -882,15 +885,18 @@ static bool r_core_visual_config_hud(RCore *core) {
 		const char *oldvalue = NULL;
 		char cmd[512];
 		char *p = strchr (res, ' ');
-		if (p) *p = 0;
+		if (p) {
+			*p = 0;
+		}
 		oldvalue = r_config_get (core->config, res);
 		r_cons_show_cursor (true);
 		r_cons_set_raw (0);
 		cmd[0] = '\0';
 		eprintf ("set new value for %s (old=%s)\n", res, oldvalue);
 		r_line_set_prompt (":> ");
-		if (r_cons_fgets (cmd, sizeof (cmd) - 1, 0, NULL) < 0)
-			cmd[0]='\0';
+		if (r_cons_fgets (cmd, sizeof (cmd) - 1, 0, NULL) < 0) {
+			cmd[0] = '\0';
+		}
 		r_config_set (core->config, res, cmd);
 		r_cons_set_raw (1);
 		r_cons_show_cursor (false);
@@ -1246,7 +1252,9 @@ R_API int r_core_visual_trackflags(RCore *core) {
 				case 3: strcpy (cmd, "f="); break;
 				default: format = 0; continue;
 				}
-				if (*cmd) r_core_cmd (core, cmd, 0);
+				if (*cmd) {
+					r_core_cmd (core, cmd, 0);
+				}
 			} else {
 				r_cons_printf ("(no flags)\n");
 			}
@@ -1303,8 +1311,16 @@ R_API int r_core_visual_trackflags(RCore *core) {
 		case 'o': r_flag_sort (core->flags, 0); break;
 		case 'n': r_flag_sort (core->flags, 1); break;
 		case 'j': option++; break;
-		case 'k': if (--option<0) option = 0; break;
-		case 'K': option-=10; if (option<0) option = 0; break;
+		case 'k':
+			if (--option < 0) {
+				option = 0;
+			}
+			break;
+		case 'K': option-=10;
+			if (option < 0) {
+				option = 0;
+			}
+			break;
 		case 'h':
 		case 'b': // back
 		case 'Q':
@@ -1366,9 +1382,11 @@ R_API int r_core_visual_trackflags(RCore *core) {
 			r_core_block_size (core, core->blocksize-16);
 			break;
 		case '+':
-			if (menu==1)
+			if (menu == 1) {
 				r_core_cmdf (core, "f %s=%s+1", fs2, fs2);
-			else r_core_block_size (core, core->blocksize+1);
+			} else {
+				r_core_block_size (core, core->blocksize + 1);
+			}
 			break;
 		case '-':
 			if (menu == 1) {
@@ -1411,8 +1429,12 @@ R_API int r_core_visual_trackflags(RCore *core) {
 				r_cons_show_cursor (false);
 			}
 			break;
-		case 'P': if (--format<0) format = MAX_FORMAT; break;
-// = (format<=0)? MAX_FORMAT: format-1; break;
+		case 'P':
+			if (--format < 0) {
+				format = MAX_FORMAT;
+			}
+			break;
+			// = (format<=0)? MAX_FORMAT: format-1; break;
 		case 'p': format++; break;
 		case 'l':
 		case ' ':
@@ -1739,10 +1761,11 @@ R_API void r_core_visual_config(RCore *core) {
 				option = i-1;
 				continue;
 			}
-			if (fs2 != NULL)
+			if (fs2 != NULL) {
 				// TODO: Break long lines.
 				r_cons_printf ("\n Selected: %s (%s)\n\n",
-						fs2, desc);
+					fs2, desc);
+			}
 		}
 
 		if (fs && !strncmp (fs, "asm.", 4)) {
@@ -1750,8 +1773,9 @@ R_API void r_core_visual_config(RCore *core) {
 		}
 		r_cons_visual_flush ();
 		ch = r_cons_readchar ();
-		if (ch==4 || ch==-1)
+		if (ch == 4 || ch == -1) {
 			return;
+		}
 		ch = r_cons_arrow_to_hjkl (ch); // get ESC+char, return 'hjkl' char
 
 		switch (ch) {
@@ -1860,9 +1884,11 @@ R_API void r_core_visual_mounts(RCore *core) {
 			if (list) {
 				r_list_foreach (list, iter, part) {
 					if ((option-delta <= i) && (i <= option+delta)) {
-						if (option == i)
+						if (option == i) {
 							r_cons_printf (" > ");
-						else r_cons_printf ("   ");
+						} else {
+							r_cons_printf ("   ");
+						}
 						r_cons_printf ("%d %02x 0x%010"PFMT64x" 0x%010"PFMT64x"\n",
 								part->number, part->type,
 								part->start, part->start+part->length);
@@ -1871,12 +1897,16 @@ R_API void r_core_visual_mounts(RCore *core) {
 				}
 				r_list_free (list);
 				list = NULL;
-			} else r_cons_printf ("Cannot read partition\n");
+			} else {
+				r_cons_printf ("Cannot read partition\n");
+			}
 		} else if (mode == 1) {
 			r_cons_printf ("Types:\n\n");
 			for (i=0;;i++) {
 				n = r_fs_partition_type_get (i);
-				if (!n) break;
+				if (!n) {
+					break;
+				}
 				r_cons_printf ("%s%s\n", (i==partition)?" > ":"   ", n);
 			}
 		} else if (mode == 3) {
@@ -1905,8 +1935,12 @@ R_API void r_core_visual_mounts(RCore *core) {
 					r_cons_printf ("\n");
 					r_list_free (list);
 					list = NULL;
-				} else r_cons_printf ("Cannot open '%s' directory\n", root);
-			} else r_cons_printf ("Root undefined\n");
+				} else {
+					r_cons_printf ("Cannot open '%s' directory\n", root);
+				}
+			} else {
+				r_cons_printf ("Root undefined\n");
+			}
 		}
 		if (mode==2) {
 			r_str_trim_path (path);
@@ -1914,8 +1948,9 @@ R_API void r_core_visual_mounts(RCore *core) {
 			strncat (path, "/", sizeof (path)-strlen (path)-1);
 			list = r_fs_dir (core->fs, path);
 			file = r_list_get_n (list, dir);
-			if (file && file->type != 'd')
-				r_core_cmdf (core, "px @ 0x%"PFMT64x"!64", file->off);
+			if (file && file->type != 'd') {
+				r_core_cmdf (core, "px @ 0x%" PFMT64x "!64", file->off);
+			}
 			r_list_free (list);
 			list = NULL;
 			*str='\0';
@@ -1984,8 +2019,9 @@ R_API void r_core_visual_mounts(RCore *core) {
 						if (file->type == 'd') {
 							strncat (path, file->name, sizeof (path)-strlen (path)-1);
 							r_str_trim_path (path);
-							if (root && strncmp (root, path, strlen (root)-1))
-								strncpy (path, root, sizeof (path)-1);
+							if (root && strncmp (root, path, strlen (root) - 1)) {
+								strncpy (path, root, sizeof (path) - 1);
+							}
 						} else {
 							r_core_cmdf (core, "s 0x%"PFMT64x, file->off);
 							r_fs_umount (core->fs, root);
@@ -2010,32 +2046,39 @@ R_API void r_core_visual_mounts(RCore *core) {
 				break;
 			case 'k':
 				if (mode == 0 || mode == 3) {
-					if (option > 0)
+					if (option > 0) {
 						option--;
+					}
 				} else if (mode == 1) {
-					if (partition > 0)
+					if (partition > 0) {
 						partition--;
+					}
 				} else {
-					if (dir>0)
+					if (dir > 0) {
 						dir--;
+					}
 				}
 				break;
 			case 'j':
 				if (mode == 0) {
 					n = r_fs_partition_type_get (partition);
 					list = r_fs_partitions (core->fs, n, 0);
-					if (option < r_list_length (list)-1)
+					if (option < r_list_length (list) - 1) {
 						option++;
+					}
 				} else if (mode == 1) {
-					if (partition < r_fs_partition_get_size ()-1)
+					if (partition < r_fs_partition_get_size () - 1) {
 						partition++;
+					}
 				} else if (mode == 3) {
-					if (option < r_list_length (core->fs->roots)-1)
+					if (option < r_list_length (core->fs->roots) - 1) {
 						option++;
+					}
 				} else {
 					list = r_fs_dir (core->fs, path);
-					if (dir < r_list_length (list)-1)
+					if (dir < r_list_length (list) - 1) {
 						dir++;
+					}
 				}
 				break;
 			case 't':
@@ -2078,8 +2121,9 @@ R_API void r_core_visual_mounts(RCore *core) {
 					if (file && root) {
 						strncat (path, file->name, sizeof (path)-strlen (path)-1);
 						r_str_trim_path (path);
-						if (strncmp (root, path, strlen (root)-1))
-							strncpy (path, root, sizeof (path)-1);
+						if (strncmp (root, path, strlen (root) - 1)) {
+							strncpy (path, root, sizeof (path) - 1);
+						}
 						file = r_fs_open (core->fs, path);
 						if (file) {
 							r_fs_read (core->fs, file, 0, file->size);
@@ -2092,8 +2136,12 @@ R_API void r_core_visual_mounts(RCore *core) {
 							r_file_dump (buf, file->data, file->size, 0);
 							r_fs_close (core->fs, file);
 							r_cons_printf ("Done\n");
-						} else r_cons_printf ("Cannot dump file\n");
-					} else r_cons_printf ("Cannot dump file\n");
+						} else {
+							r_cons_printf ("Cannot dump file\n");
+						}
+					} else {
+						r_cons_printf ("Cannot dump file\n");
+					}
 					r_cons_flush ();
 					r_cons_any_key (NULL);
 					*str='\0';
@@ -2582,7 +2630,9 @@ R_API void r_core_visual_anal(RCore *core) {
 					break;
 				default:
 					option++;
-					if (option >= nfcns) --option;
+					if (option >= nfcns) {
+						--option;
+					}
 					break;
 				}
 			}
@@ -2718,27 +2768,32 @@ R_API void r_core_seek_previous (RCore *core, const char *type) {
 	if (strstr (type, "fun")) {
 		RAnalFunction *fcni;
 		r_list_foreach (core->anal->fcns, iter, fcni) {
-			if (fcni->addr > next && fcni->addr < core->offset)
+			if (fcni->addr > next && fcni->addr < core->offset) {
 				next = fcni->addr;
+			}
 		}
 	} else
 	if (strstr (type, "hit")) {
 		RFlagItem *flag;
 		const char *pfx = r_config_get (core->config, "search.prefix");
 		r_list_foreach (core->flags->flags, iter, flag) {
-			if (!strncmp (flag->name, pfx, strlen (pfx)))
-				if (flag->offset > next && flag->offset< core->offset)
+			if (!strncmp (flag->name, pfx, strlen (pfx))) {
+				if (flag->offset > next && flag->offset < core->offset) {
 					next = flag->offset;
+				}
+			}
 		}
 	} else { // flags
 		RFlagItem *flag;
 		r_list_foreach (core->flags->flags, iter, flag) {
-			if (flag->offset > next && flag->offset < core->offset)
+			if (flag->offset > next && flag->offset < core->offset) {
 				next = flag->offset;
+			}
 		}
 	}
-	if (next!=0)
+	if (next != 0) {
 		r_core_seek (core, next, 1);
+	}
 }
 
 //define the data at offset according to the type (byte, word...) n times
@@ -2923,15 +2978,18 @@ repeat:
 					RFlagItem *item = r_flag_get_i (core->flags, op->jump);
 					if (item) {
 						const char *ptr = r_str_lchr (item->name, '.');
-						if (ptr)
-							man = strdup (ptr+1);
+						if (ptr) {
+							man = strdup (ptr + 1);
+						}
 					}
 				}
 				r_anal_op_free (op);
 			}
 			if (man) {
 				char *p = strstr (man, "INODE");
-				if (p) *p = 0;
+				if (p) {
+					*p = 0;
+				}
 				r_cons_clear ();
 				r_cons_flush ();
 				r_sys_cmdf ("man %s", man);
@@ -3080,7 +3138,9 @@ repeat:
 		do {
 			n = r_str_nlen_w ((const char *)p + ntotal,
 					plen - ntotal) + 1;
-			if (n < 2) break;
+			if (n < 2) {
+				break;
+			}
 			name = malloc (n + 10);
 			strcpy (name, "str.");
 			for (i = 0, j = 0; i < n; i++, j++) {
diff --git a/libr/crypto/p/crypto_aes_algo.c b/libr/crypto/p/crypto_aes_algo.c
index 6c91995e06..3c16ca9929 100644
--- a/libr/crypto/p/crypto_aes_algo.c
+++ b/libr/crypto/p/crypto_aes_algo.c
@@ -85,17 +85,20 @@ void aes_expkey (const struct aes_state *st, ut32 expkey[2][Nr_AES256 + 1][Nb])
 			Sbox[(ut8)tt] << 8 ^ Sbox[(ut8)(tt >> 24)] ^ Rcon[idx++] << 24;
 
 		if (st->columns != 8) {
-			for (i = 1, j = 0; i < st->columns;)
+			for (i = 1, j = 0; i < st->columns;) {
 				tk[i++] ^= tk[j++];
+			}
 		} else {
-			for (i = 1, j = 0; i < st->columns / 2;)
+			for (i = 1, j = 0; i < st->columns / 2;) {
 				tk[i++] ^= tk[j++];
+			}
 			tt = tk[st->columns / 2 - 1];
 			tk[st->columns / 2] ^= Sbox[(ut8)tt] ^ Sbox[(ut8)(tt >> 8)] << 8 ^
 				Sbox[(ut8)(tt >> 16)] << 16 ^
 				Sbox[(ut8)(tt >> 24)] << 24;
-			for (j = st->columns / 2, i = j + 1; i < st->columns;)
+			for (j = st->columns / 2, i = j + 1; i < st->columns;) {
 				tk[i++] ^= tk[j++];
+			}
 		}
 
 		// Copy values into round key arrays
diff --git a/libr/crypto/p/crypto_aes_cbc.c b/libr/crypto/p/crypto_aes_cbc.c
index 0f279303e5..65632d687b 100644
--- a/libr/crypto/p/crypto_aes_cbc.c
+++ b/libr/crypto/p/crypto_aes_cbc.c
@@ -49,7 +49,9 @@ static bool update(RCrypto *cry, const ut8 *buf, int len) {
 	const int blocks = size / BLOCK_SIZE;
 
 	ut8 *const obuf = calloc (1, size);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 
 	ut8 *const ibuf = calloc (1, size);
 	if (!ibuf) {
diff --git a/libr/crypto/p/crypto_blowfish.c b/libr/crypto/p/crypto_blowfish.c
index c62b2b5fe6..a17a13e15b 100644
--- a/libr/crypto/p/crypto_blowfish.c
+++ b/libr/crypto/p/crypto_blowfish.c
@@ -177,7 +177,9 @@ static void blowfish_crypt(struct blowfish_state *const state, const ut8 *inbuf,
 
 	if (!state || !inbuf || !outbuf || buflen < 0 || buflen%8 != 0) {
 		//let user deal with padding
-		if (buflen%8 != 0) eprintf("Invalid input length %d. Expected length is multiple of 8 bytes.\n", buflen);
+		if (buflen % 8 != 0) {
+			eprintf ("Invalid input length %d. Expected length is multiple of 8 bytes.\n", buflen);
+		}
 		return;
 	}
 	
diff --git a/libr/crypto/p/crypto_cps2.c b/libr/crypto/p/crypto_cps2.c
index 7bcd40d145..2ee60c84ab 100644
--- a/libr/crypto/p/crypto_cps2.c
+++ b/libr/crypto/p/crypto_cps2.c
@@ -478,8 +478,9 @@ static void expand_1st_key(ut32 *dstkey, const ut32 *srckey) {
 	dstkey[2] = 0;
 	dstkey[3] = 0;
 
-	for (i = 0; i < 96; ++i)
-		dstkey[i / 24] |= BIT(srckey[bits[i] / 32], bits[i] % 32) << (i % 24);
+	for (i = 0; i < 96; ++i) {
+		dstkey[i / 24] |= BIT (srckey[bits[i] / 32], bits[i] % 32) << (i % 24);
+	}
 }
 
 // srckey is the 64-bit master key (2x32 bits) XORed with the subkey
diff --git a/libr/crypto/p/crypto_des.c b/libr/crypto/p/crypto_des.c
index c0ed287e96..c8922ff67f 100644
--- a/libr/crypto/p/crypto_des.c
+++ b/libr/crypto/p/crypto_des.c
@@ -57,7 +57,9 @@ static int des_encrypt (struct des_state *st, const ut8 *input, ut8 *output) {
 }
 
 static int des_decrypt (struct des_state *st, const ut8 *input, ut8 *output) {
-	if (!st || !input || !output) return false;
+	if (!st || !input || !output) {
+		return false;
+	}
 	st->buflo = be32 (input + 0);
 	st->bufhi = be32 (input + 4);
 	//first permutation
diff --git a/libr/crypto/p/crypto_rc2.c b/libr/crypto/p/crypto_rc2.c
index 388dcb8332..7190ef8603 100644
--- a/libr/crypto/p/crypto_rc2.c
+++ b/libr/crypto/p/crypto_rc2.c
@@ -34,7 +34,9 @@ struct rc2_state {
 static bool rc2_expandKey(struct rc2_state *state, const ut8 *key, int key_len) {
 	int i;
 
-	if (key_len < 1 || key_len > 128) return false;
+	if (key_len < 1 || key_len > 128) {
+		return false;
+	}
 	memcpy(state->ekey, key, key_len);
 
 	// first loop
@@ -184,7 +186,9 @@ static void rc2_crypt(struct rc2_state *state, const ut8 *inbuf, ut8 *outbuf, in
 	}
 
 	if (idx % 8) {
-		while(idx % 8) data_block[idx++] = 0;
+		while (idx % 8) {
+			data_block[idx++] = 0;
+		}
 		rc2_crypt8(state, (const ut8 *) data_block, (ut8 *) crypted_block);
 		strncpy(ptr, crypted_block, 8);
 	}
@@ -211,7 +215,9 @@ static bool rc2_use(const char *algo) {
 
 static bool update(RCrypto *cry, const ut8 *buf, int len) {
 	ut8 *obuf = calloc (1, len);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 	if (flag == 0) {
 		rc2_crypt (&state, buf, obuf, len);
 	} else if (flag == 1) {
diff --git a/libr/crypto/p/crypto_rc4.c b/libr/crypto/p/crypto_rc4.c
index 8a475be4ba..4f1f1f0790 100644
--- a/libr/crypto/p/crypto_rc4.c
+++ b/libr/crypto/p/crypto_rc4.c
@@ -33,8 +33,9 @@ static bool rc4_init(struct rc4_state *const state, const ut8 *key, int keylen)
 	}
 	state->key_size = keylen;
 	/* Initialize state with identity permutation */
-	for (i = 0; i < 256; i++)
-		state->perm[i] = (ut8)i; 
+	for (i = 0; i < 256; i++) {
+		state->perm[i] = (ut8)i;
+	}
 	state->index1 = 0;
 	state->index2 = 0;
   
diff --git a/libr/crypto/p/crypto_rc6.c b/libr/crypto/p/crypto_rc6.c
index 62d3d4b6e3..444f9d5f70 100644
--- a/libr/crypto/p/crypto_rc6.c
+++ b/libr/crypto/p/crypto_rc6.c
@@ -177,7 +177,9 @@ static bool update(RCrypto *cry, const ut8 *buf, int len) {
 	const int blocks = len / BLOCK_SIZE;
 
 	ut8 *obuf = calloc (1, len);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 
 	int i;
 	if (flag) {
diff --git a/libr/crypto/p/crypto_rol.c b/libr/crypto/p/crypto_rol.c
index 5acfe84ca1..de7ee25363 100644
--- a/libr/crypto/p/crypto_rol.c
+++ b/libr/crypto/p/crypto_rol.c
@@ -51,7 +51,9 @@ static bool update(RCrypto *cry, const ut8 *buf, int len) {
 		return false;
 	}
 	ut8 *obuf = calloc (1, len);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 	rol_crypt (&st, buf, obuf, len);
 	r_crypto_append (cry, obuf, len);
 	free (obuf);
diff --git a/libr/crypto/p/crypto_rot.c b/libr/crypto/p/crypto_rot.c
index deda2c140c..70fd45dd23 100644
--- a/libr/crypto/p/crypto_rot.c
+++ b/libr/crypto/p/crypto_rot.c
@@ -71,7 +71,9 @@ static bool rot_use(const char *algo) {
 
 static bool update(RCrypto *cry, const ut8 *buf, int len) {
 	ut8 *obuf = calloc (1, len);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 	if (flag == 0) {
 		rot_crypt (rot_key, buf, obuf, len);
 	} else if (flag == 1) {
diff --git a/libr/debug/ddesc.c b/libr/debug/ddesc.c
index dc26aef54b..3c4c3194e1 100644
--- a/libr/debug/ddesc.c
+++ b/libr/debug/ddesc.c
@@ -18,45 +18,52 @@ R_API RDebugDesc *r_debug_desc_new (int fd, char* path, int perm, int type, int
 
 R_API void r_debug_desc_free (RDebugDesc *p) {
 	if (p) {
-		if (p->path)
+		if (p->path) {
 			free (p->path);
+		}
 		free (p);
 	}
 }
 
 R_API int r_debug_desc_open(RDebug *dbg, const char *path) {
-	if (dbg && dbg->h && dbg->h->desc.open)
+	if (dbg && dbg->h && dbg->h->desc.open) {
 		return dbg->h->desc.open (path);
+	}
 	return false;
 }
 
 R_API int r_debug_desc_close(RDebug *dbg, int fd) {
-	if (dbg && dbg->h && dbg->h->desc.close)
+	if (dbg && dbg->h && dbg->h->desc.close) {
 		return dbg->h->desc.close (fd);
+	}
 	return false;
 }
 
 R_API int r_debug_desc_dup(RDebug *dbg, int fd, int newfd) {
-	if (dbg && dbg->h && dbg->h->desc.dup)
+	if (dbg && dbg->h && dbg->h->desc.dup) {
 		return dbg->h->desc.dup (fd, newfd);
+	}
 	return false;
 }
 
 R_API int r_debug_desc_read(RDebug *dbg, int fd, ut64 addr, int len) {
-	if (dbg && dbg->h && dbg->h->desc.read)
+	if (dbg && dbg->h && dbg->h->desc.read) {
 		return dbg->h->desc.read (fd, addr, len);
+	}
 	return false;
 }
 
 R_API int r_debug_desc_seek(RDebug *dbg, int fd, ut64 addr) {
-	if (dbg && dbg->h && dbg->h->desc.seek)
+	if (dbg && dbg->h && dbg->h->desc.seek) {
 		return dbg->h->desc.seek (fd, addr);
+	}
 	return false;
 }
 
 R_API int r_debug_desc_write(RDebug *dbg, int fd, ut64 addr, int len) {
-	if (dbg && dbg->h && dbg->h->desc.write)
+	if (dbg && dbg->h && dbg->h->desc.write) {
 		return dbg->h->desc.write (fd, addr, len);
+	}
 	return false;
 }
 
@@ -67,8 +74,9 @@ R_API int r_debug_desc_list(RDebug *dbg, int rad) {
 	RDebugDesc *p;
 
 	if (rad) {
-		if (dbg && dbg->cb_printf)
+		if (dbg && dbg->cb_printf) {
 			dbg->cb_printf ("TODO \n");
+		}
 	} else {
 		if (dbg && dbg->h && dbg->h->desc.list) {
 			list = dbg->h->desc.list (dbg->pid);
diff --git a/libr/debug/debug.c b/libr/debug/debug.c
index c711d74c98..03778a0edc 100644
--- a/libr/debug/debug.c
+++ b/libr/debug/debug.c
@@ -276,7 +276,9 @@ R_API RBreakpointItem *r_debug_bp_add(RDebug *dbg, ut64 addr, int hw, bool watch
 		} else {
 			//module holds the address
 			addr = (ut64)r_num_math (dbg->num, module);
-			if (!addr) return NULL;
+			if (!addr) {
+				return NULL;
+			}
 			detect_module = true;
 		}
 		r_debug_map_sync (dbg);
@@ -543,7 +545,9 @@ R_API ut64 r_debug_execute(RDebug *dbg, const ut8 *buf, int len, int restore) {
 		free (backup);
 		free (orig);
 		eprintf ("ra0=0x%08"PFMT64x"\n", ra0);
-	} else eprintf ("r_debug_execute: Cannot get program counter\n");
+	} else {
+		eprintf ("r_debug_execute: Cannot get program counter\n");
+	}
 	return (ra0);
 }
 
@@ -585,8 +589,9 @@ R_API bool r_debug_select(RDebug *dbg, int pid, int tid) {
 		return false;
 	}
 
-	if (dbg->h && dbg->h->select && !dbg->h->select (pid, tid))
+	if (dbg->h && dbg->h->select && !dbg->h->select (pid, tid)) {
 		return false;
+	}
 
 	r_io_system (dbg->iob.io, sdb_fmt ("pid %d", pid));
 
@@ -925,14 +930,17 @@ R_API int r_debug_step_over(RDebug *dbg, int steps) {
 	}
 
 	if (dbg->h && dbg->h->step_over) {
-		for (; steps_taken < steps; steps_taken++)
-			if (!dbg->h->step_over (dbg))
+		for (; steps_taken < steps; steps_taken++) {
+			if (!dbg->h->step_over (dbg)) {
 				return steps_taken;
+			}
+		}
 		return steps_taken;
 	}
 
-	if (!dbg->anal || !dbg->reg)
+	if (!dbg->anal || !dbg->reg) {
 		return steps_taken;
+	}
 
 	// Initial refill
 	buf_pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
@@ -1266,8 +1274,9 @@ R_API int r_debug_continue_until_optype(RDebug *dbg, int type, int over) {
 
 	// step first, we dont want to check current optype
 	for (;;) {
-		if (!r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false))
+		if (!r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false)) {
 			break;
+		}
 
 		pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
 		// Try to keep the buffer full
@@ -1280,8 +1289,9 @@ R_API int r_debug_continue_until_optype(RDebug *dbg, int type, int over) {
 			eprintf ("Decode error at %"PFMT64x"\n", pc);
 			return false;
 		}
-		if (op.type == type)
+		if (op.type == type) {
 			break;
+		}
 		// Step over and repeat
 		ret = over
 			? r_debug_step_over (dbg, 1)
@@ -1466,8 +1476,9 @@ R_API int r_debug_continue_syscalls(RDebug *dbg, int *sc, int n_sc) {
 	for (;;) {
 		RDebugReasonType reason;
 
-		if (r_cons_singleton ()->context->breaked)
+		if (r_cons_singleton ()->context->breaked) {
 			break;
+		}
 #if __linux__
 		// step is needed to avoid dupped contsc results
 		/* XXX(jjd): actually one stop is before the syscall, the other is
diff --git a/libr/debug/dreg.c b/libr/debug/dreg.c
index ee2a53168e..746b170e5f 100644
--- a/libr/debug/dreg.c
+++ b/libr/debug/dreg.c
@@ -242,7 +242,9 @@ R_API int r_debug_reg_list(RDebug *dbg, int type, int size, int rad, const char
 						snprintf (content, sizeof (content),
 							fmt2, "", item->name, "", strvalue, "");
 						len = colwidth - strlen (content);
-						if (len < 0) len = 0;
+						if (len < 0) {
+							len = 0;
+						}
 						memset (whites, ' ', sizeof (whites));
 						whites[len] = 0;
 						dbg->cb_printf (fmt2, a, item->name, b, strvalue,
@@ -314,9 +316,13 @@ R_API ut64 r_debug_reg_get_err(RDebug *dbg, const char *name, int *err, utX *val
 	ut64 ret = 0LL;
 	int role = r_reg_get_name_idx (name);
 	const char *pname = name;
-	if (err) *err = 0;
+	if (err) {
+		*err = 0;
+	}
 	if (!dbg || !dbg->reg) {
-		if (err) *err = 1;
+		if (err) {
+			*err = 1;
+		}
 		return UT64_MAX;
 	}
 	if (role != -1) {
diff --git a/libr/debug/esil.c b/libr/debug/esil.c
index 460ea7e1cd..e1db26a363 100644
--- a/libr/debug/esil.c
+++ b/libr/debug/esil.c
@@ -36,7 +36,9 @@ RList *esil_watchpoints = NULL;
 
 static int exprmatch (RDebug *dbg, ut64 addr, const char *expr) {
 	char *e = strdup (expr);
-	if (!e) return 0;
+	if (!e) {
+		return 0;
+	}
 	char *p = strstr (e, "..");
 	ut64 a,b;
 	int ret = 0;
@@ -46,16 +48,19 @@ static int exprmatch (RDebug *dbg, ut64 addr, const char *expr) {
 		a = r_num_math (dbg->num, e);
 		b = r_num_math (dbg->num, p);
 		if (a<b) {
-			if (addr >=a && addr <= b)
+			if (addr >= a && addr <= b) {
 				ret = 1;
+			}
 		} else {
-			if (addr >=b && addr <= a)
+			if (addr >= b && addr <= a) {
 				ret = 1;
+			}
 		}
 	} else {
 		a = r_num_math (dbg->num, e);
-		if (addr == a)
+		if (addr == a) {
 			ret = 1;
+		}
 	}
 	has_match = ret;
 	free (e);
@@ -65,12 +70,14 @@ static int exprmatch (RDebug *dbg, ut64 addr, const char *expr) {
 static int esilbreak_check_pc (RDebug *dbg, ut64 pc) {
 	EsilBreak *ew;
 	RListIter *iter;
-	if (!pc)
-	pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
+	if (!pc) {
+		pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
+	}
 	r_list_foreach (EWPS, iter, ew) {
 		if (ew->rwx & R_IO_EXEC) {
-			if (exprmatch (dbg, pc, ew->expr))
+			if (exprmatch (dbg, pc, ew->expr)) {
 				return 1;
+			}
 		}
 	}
 	return 0;
@@ -309,7 +316,9 @@ R_API int r_debug_esil_watch_empty(RDebug *dbg) {
 R_API void r_debug_esil_watch(RDebug *dbg, int rwx, int dev, const char *expr) {
 	if (!EWPS) {
 		EWPS = r_list_new ();
-		if (!EWPS) return;
+		if (!EWPS) {
+			return;
+		}
 		EWPS->free = (RListFree)ewps_free;
 	}
 	EsilBreak *ew = R_NEW0 (EsilBreak);
diff --git a/libr/debug/p/bfvm.c b/libr/debug/p/bfvm.c
index 9e44fd4f28..3f0ea2ac85 100644
--- a/libr/debug/p/bfvm.c
+++ b/libr/debug/p/bfvm.c
@@ -8,8 +8,9 @@
 static ut8 bfvm_op(BfvmCPU *c) {
 	// XXX: this is slow :(
 	ut8 buf[4] = {0};
-	if (c && c->iob.read_at && !c->iob.read_at (c->iob.io, c->eip, buf, 4))
+	if (c && c->iob.read_at && !c->iob.read_at (c->iob.io, c->eip, buf, 4)) {
 		return 0xff;
+	}
 	return buf[0];
 }
 
@@ -42,8 +43,9 @@ R_API int bfvm_init(BfvmCPU *c, ut32 size, int circular) {
 
 	/* data */
 	c->mem = (ut8 *)malloc (size);
-	if (!c->mem)
+	if (!c->mem) {
 		return 0;
+	}
 	memset (c->mem, '\0', size);
 
 	/* setup */
@@ -101,26 +103,30 @@ R_API ut8 bfvm_get(BfvmCPU *c) {
 
 R_API void bfvm_inc(BfvmCPU *c) {
 	ut8 *mem = bfvm_get_ptr (c);
-	if (mem != NULL)
+	if (mem != NULL) {
 		mem[0]++;
+	}
 }
 
 R_API void bfvm_dec(BfvmCPU *c) {
 	ut8 *mem = bfvm_get_ptr (c);
-	if (mem != NULL)
+	if (mem != NULL) {
 		mem[0]--;
+	}
 }
 
 R_API int bfvm_reg_set(BfvmCPU *c, const char *str) {
 	char *ptr = strchr (str, ' ');
-	if (!ptr)
+	if (!ptr) {
 		return 0;
-	if (strstr (str, "eip"))
+	}
+	if (strstr (str, "eip")) {
 		c->eip = r_num_math (NULL, ptr+1);
-	else if (strstr (str, "esp"))
+	} else if (strstr (str, "esp")) {
 		c->esp = r_num_math (NULL, ptr+1);
-	else if (strstr (str, "ptr"))
-		c->ptr = r_num_math (NULL, ptr+1);
+	} else if (strstr (str, "ptr")) {
+		c->ptr = r_num_math (NULL, ptr + 1);
+	}
 	return 1;
 }
 
@@ -129,8 +135,9 @@ R_API void bfvm_peek(BfvmCPU *c) {
 	int idx = c->input_idx;
 	ut8 *ptr = bfvm_get_ptr (c);
 
-	if (idx >= c->input_size)
+	if (idx >= c->input_size) {
 		idx = 0;
+	}
 
 	if (ptr) {
 		*ptr = c->input_buf[idx];
@@ -161,8 +168,9 @@ R_API int bfvm_trace_op(BfvmCPU *c, ut8 op) {
 	case ']':
 		g = bfvm_get (c);
 		eprintf ("%c  ; [ptr] = %d\n", op, g);
-		if (g!= 0)
+		if (g != 0) {
 			eprintf ("[");
+		}
 		break;
 	}
 	return 0;
diff --git a/libr/debug/p/debug_bf.c b/libr/debug/p/debug_bf.c
index 9ea4ed20d8..bfb95a4847 100644
--- a/libr/debug/p/debug_bf.c
+++ b/libr/debug/p/debug_bf.c
@@ -29,9 +29,11 @@ static struct bfvm_regs r;
 
 static int is_io_bf(RDebug *dbg) {
 	RIODesc *d = dbg->iob.io->desc;
-	if (d && d->plugin && d->plugin->name)
-		if (!strcmp ("bdescbg", d->plugin->name))
+	if (d && d->plugin && d->plugin->name) {
+		if (!strcmp ("bdescbg", d->plugin->name)) {
 			return true;
+		}
+	}
 	return false;
 }
 
@@ -40,10 +42,12 @@ static int r_debug_bf_step_over(RDebug *dbg) {
 	int op, oop = 0;
 	for (;;) {
 		op = bfvm_op (o->bfvm);
-		if (oop != 0 && op != oop)
+		if (oop != 0 && op != oop) {
 			break;
-		if (bfvm_in_trap (o->bfvm))
+		}
+		if (bfvm_in_trap (o->bfvm)) {
 			break;
+		}
 		bfvm_step (o->bfvm, 0);
 		oop = op;
 	}
@@ -58,12 +62,15 @@ static int r_debug_bf_step(RDebug *dbg) {
 
 static int r_debug_bf_reg_read(RDebug *dbg, int type, ut8 *buf, int size) {
 	RIOBdescbg *o;
-	if (!dbg)
+	if (!dbg) {
 		return false;
-	if (!is_io_bf (dbg))
+	}
+	if (!is_io_bf (dbg)) {
 		return 0;
-	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data))
+	}
+	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data)) {
 		return 0;
+	}
 	o = dbg->iob.io->desc->data;
 	r.pc = o->bfvm->eip;
 	r.ptr = o->bfvm->ptr;
@@ -81,12 +88,15 @@ static int r_debug_bf_reg_read(RDebug *dbg, int type, ut8 *buf, int size) {
 
 static int r_debug_bf_reg_write(RDebug *dbg, int type, const ut8 *buf, int size) {
 	RIOBdescbg *o;
-	if (!dbg)
+	if (!dbg) {
 		return false;
-	if (!is_io_bf (dbg))
+	}
+	if (!is_io_bf (dbg)) {
 		return 0;
-	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data))
+	}
+	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data)) {
 		return 0;
+	}
 	o = dbg->iob.io->desc->data;
 	memcpy (&r, buf, sizeof (r));
 	o->bfvm->eip = r.pc;
@@ -119,8 +129,9 @@ static int r_debug_bf_wait(RDebug *dbg, int pid) {
 }
 
 static int r_debug_bf_attach(RDebug *dbg, int pid) {
-	if (!is_io_bf (dbg))
+	if (!is_io_bf (dbg)) {
 		return false;
+	}
 #if 0
 	RIOBdescbg *o;
 	o = dbg->iob.io->desc->data;
@@ -168,7 +179,9 @@ static RList *r_debug_native_map_get(RDebug *dbg) {
 	RIOBdescbg *o = dbg->iob.io->desc->data;
 	BfvmCPU *c = o->bfvm;
 	RList *list = r_list_newf ((RListFree)r_debug_map_free);
-	if (!list) return NULL;
+	if (!list) {
+		return NULL;
+	}
 	r_list_append (list, r_debug_map_new (
 		"code", 0, 4096, 6, 0));
 	r_list_append (list, r_debug_map_new (
diff --git a/libr/debug/p/debug_bochs.c b/libr/debug/p/debug_bochs.c
index 203cc43b22..d0e93a23d7 100644
--- a/libr/debug/p/debug_bochs.c
+++ b/libr/debug/p/debug_bochs.c
@@ -110,7 +110,9 @@ static int r_debug_bochs_reg_read(RDebug *dbg, int type, ut8 *buf, int size) {
 				}
 				pos+= 8;
 
-			} else i++;
+			} else {
+				i++;
+			}
 		}
 
 		bochs_send_cmd (desc, "info cpu", true);
@@ -123,8 +125,10 @@ static int r_debug_bochs_reg_read(RDebug *dbg, int type, ut8 *buf, int size) {
 		} else if (strstr (desc->data,"PC_64")) {
 			bAjusta = false;
 			//eprintf("[modo PC_64]\n");
-		} else eprintf ("[unknown mode]\n%s\n",desc->data);
-		  /*
+		} else {
+			eprintf ("[unknown mode]\n%s\n", desc->data);
+		}
+		/*
 		   es:0x0000, dh=0x00009300, dl=0x0000ffff, valid=7
 		   Data segment, base=0x00000000, limit=0x0000ffff, Read/Write, Accessed
 		   cs:0xf000, dh=0xff0093ff, dl=0x0000ffff, valid=7
@@ -205,7 +209,9 @@ static RList *r_debug_bochs_map_get(RDebug* dbg) { //TODO
 	//eprintf("bochs_map_getdebug:\n");
 	RDebugMap *mr;
 	RList *list = r_list_newf ((RListFree)map_free);
-	if (!list) return NULL;
+	if (!list) {
+		return NULL;
+	}
 	mr = R_NEW0 (RDebugMap);
 	if (!mr) {
 		r_list_free (list);
diff --git a/libr/debug/p/debug_gdb.c b/libr/debug/p/debug_gdb.c
index 74e824e4f0..c44229e065 100644
--- a/libr/debug/p/debug_gdb.c
+++ b/libr/debug/p/debug_gdb.c
@@ -274,8 +274,9 @@ static int r_debug_gdb_reg_write(RDebug *dbg, int type, const ut8 *buf, int size
 	const char *pcname = r_reg_get_name (dbg->anal->reg, R_REG_NAME_PC);
 	RRegItem *reg = r_reg_get (dbg->anal->reg, pcname, 0);
 	if (reg) {
-		if (dbg->anal->bits != reg->size)
+		if (dbg->anal->bits != reg->size) {
 			bits = reg->size;
+		}
 	}
 	free (r_reg_get_bytes (dbg->reg, type, &buflen));
 	// some implementations of the gdb protocol are acting weird.
@@ -296,7 +297,9 @@ static int r_debug_gdb_reg_write(RDebug *dbg, int type, const ut8 *buf, int size
 	RRegItem* current = NULL;
 	for (;;) {
 		current = r_reg_next_diff (dbg->reg, type, reg_buf, buflen, current, bits);
-		if (!current) break;
+		if (!current) {
+			break;
+		}
 		ut64 val = r_reg_get_value (dbg->reg, current);
 		int bytes = bits / 8;
 		gdbr_write_reg (desc, current->name, (char*)&val, bytes);
@@ -980,36 +983,38 @@ static int r_debug_gdb_breakpoint (RBreakpoint *bp, RBreakpointItem *b, bool set
         // TODO handle conditions
 	switch (b->rwx){
 	case R_BP_PROT_EXEC : {
-		if (set)
+		if (set) {
 			ret = b->hw?
 					gdbr_set_hwbp (desc, b->addr, "", bpsize):
 					gdbr_set_bp (desc, b->addr, "", bpsize);
-		else
-			ret = b->hw?
-					gdbr_remove_hwbp (desc, b->addr, bpsize):
-					gdbr_remove_bp (desc, b->addr, bpsize);
+		} else {
+			ret = b->hw ? gdbr_remove_hwbp (desc, b->addr, bpsize) : gdbr_remove_bp (desc, b->addr, bpsize);
+		}
 		break;
 	}
 	// TODO handle size (area of watch in upper layer and then bpsize. For the moment watches are set on exact on byte
 	case R_BP_PROT_WRITE : {
-		if (set)
+		if (set) {
 			gdbr_set_hww (desc, b->addr, "", 1);
-		else
+		} else {
 			gdbr_remove_hww (desc, b->addr, 1);
+		}
 		break;
 	}
 	case R_BP_PROT_READ : {
-		if (set)
+		if (set) {
 			gdbr_set_hwr (desc, b->addr, "", 1);
-		else
+		} else {
 			gdbr_remove_hwr (desc, b->addr, 1);
+		}
 		break;
 	}
 	case R_BP_PROT_ACCESS : {
-		if (set)
+		if (set) {
 			gdbr_set_hwa (desc, b->addr, "", 1);
-		else
+		} else {
 			gdbr_remove_hwa (desc, b->addr, 1);
+		}
 		break;
 	}
 	}
diff --git a/libr/debug/p/debug_native.c b/libr/debug/p/debug_native.c
index 1a23320836..b1bd6b1773 100644
--- a/libr/debug/p/debug_native.c
+++ b/libr/debug/p/debug_native.c
@@ -1123,7 +1123,9 @@ static int r_debug_native_map_dealloc (RDebug *dbg, ut64 addr, int size) {
 
 #if !__WINDOWS__ && !__APPLE__
 static void _map_free(RDebugMap *map) {
-	if (!map) return;
+	if (!map) {
+		return;
+	}
 	free (map->name);
 	free (map->file);
 	free (map);
@@ -1331,7 +1333,9 @@ static RList *r_debug_native_modules_get (RDebug *dbg) {
 
 static bool r_debug_native_kill (RDebug *dbg, int pid, int tid, int sig) {
 	bool ret = false;
-	if (pid == 0) pid = dbg->pid;
+	if (pid == 0) {
+		pid = dbg->pid;
+	}
 #if __WINDOWS__ && !__CYGWIN__
 	if (sig==0)
 		ret = true;
diff --git a/libr/debug/p/debug_qnx.c b/libr/debug/p/debug_qnx.c
index a8561106af..fcff84a136 100644
--- a/libr/debug/p/debug_qnx.c
+++ b/libr/debug/p/debug_qnx.c
@@ -7,7 +7,9 @@
 /* HACK_FOR_PLUGIN_LINKAGE */
 R_API RDebugPid *__r_debug_pid_new(const char *path, int pid, char status, ut64 pc) {
 	RDebugPid *p = R_NEW0 (RDebugPid);
-	if (!p) return NULL;
+	if (!p) {
+		return NULL;
+	}
 	p->path = strdup (path);
 	p->pid = pid;
 	p->status = status;
@@ -47,7 +49,9 @@ static RList *r_debug_qnx_tids (RDebug *dbg, int pid) {
 
 static RList *r_debug_qnx_pids (RDebug *dbg, int pid) {
 	RList *list = r_list_new ();
-	if (!list) return NULL;
+	if (!list) {
+		return NULL;
+	}
 	list->free = (RListFree)&__r_debug_pid_free;
 
 	/* TODO */
@@ -67,7 +71,9 @@ static int r_debug_qnx_reg_read (RDebug *dbg, int type, ut8 *buf, int size) {
 		return -1;
 	}
 	int len = qnxr_read_registers (desc);
-	if (len <= 0) return -1;
+	if (len <= 0) {
+		return -1;
+	}
 	// read the len of the current area
 	free (r_reg_get_bytes (dbg->reg, type, &buflen));
 	if (size < len) {
@@ -79,16 +85,18 @@ static int r_debug_qnx_reg_read (RDebug *dbg, int type, ut8 *buf, int size) {
 	if (reg_buf) {
 		if (buf_size < copy_size) {
 			ut8 *new_buf = realloc (reg_buf, copy_size);
-			if (!new_buf)
+			if (!new_buf) {
 				return -1;
+			}
 			reg_buf = new_buf;
 			buflen = copy_size;
 			buf_size = len;
 		}
 	} else {
 		reg_buf = calloc (buflen, 1);
-		if (!reg_buf)
+		if (!reg_buf) {
 			return -1;
+		}
 		buf_size = buflen;
 	}
 	memset ((void *)(volatile void *) buf, 0, size);
@@ -113,8 +121,9 @@ static int r_debug_qnx_reg_write (RDebug *dbg, int type, const ut8 *buf, int siz
 		return -1;
 	}
 	if (reg) {
-		if (dbg->anal->bits != reg->size)
+		if (dbg->anal->bits != reg->size) {
 			bits = reg->size;
+		}
 	}
 	free (r_reg_get_bytes (dbg->reg, type, &buflen));
 	// some implementations of the gdb protocol are acting weird.
@@ -135,7 +144,9 @@ static int r_debug_qnx_reg_write (RDebug *dbg, int type, const ut8 *buf, int siz
 	RRegItem *current = NULL;
 	for (;;) {
 		current = r_reg_next_diff (dbg->reg, type, reg_buf, buflen, current, bits);
-		if (!current) break;
+		if (!current) {
+			break;
+		}
 		ut64 val = r_reg_get_value (dbg->reg, current);
 		int bytes = bits / 8;
 		qnxr_write_reg (desc, current->name, (char *)&val, bytes);
@@ -176,7 +187,7 @@ static int r_debug_qnx_attach (RDebug *dbg, int pid) {
 			RIOQnx *g = d->data;
 			int arch = r_sys_arch_id (dbg->arch);
 			int bits = dbg->anal->bits;
-			if ((desc = &g->desc))
+			if ((desc = &g->desc)) {
 				switch (arch) {
 				case R_SYS_ARCH_X86:
 					if (bits == 16 || bits == 32) {
@@ -195,8 +206,10 @@ static int r_debug_qnx_attach (RDebug *dbg, int pid) {
 					}
 					break;
 				}
-			if (pid)
+			}
+			if (pid) {
 				qnxr_attach (desc, pid);
+			}
 		} else {
 			eprintf ("%s: error: underlying IO descriptor isn't a QNX one\n", __func__);
 			return false;
@@ -246,7 +259,7 @@ static const char *r_debug_qnx_reg_profile (RDebug *dbg) {
 #endif
 			);
 	case R_SYS_ARCH_ARM:
-		if (bits == 32)
+		if (bits == 32) {
 			return strdup (
 				"=PC	r15\n"
 				"=SP	r14\n" // XXX
@@ -307,7 +320,8 @@ static const char *r_debug_qnx_reg_profile (RDebug *dbg) {
 				"mmx	d30	.64	308	0\n" // neon
 				"mmx	d31	.64	316	0\n" // neon
 				"mmx	fpscr	.32	324	0\n" // neon
-				);
+			);
+		}
 	}
 	return NULL;
 }
diff --git a/libr/debug/p/debug_windbg.c b/libr/debug/p/debug_windbg.c
index 0d004f18b2..720d92f265 100644
--- a/libr/debug/p/debug_windbg.c
+++ b/libr/debug/p/debug_windbg.c
@@ -134,8 +134,12 @@ static int r_debug_windbg_detach(RDebug *dbg, int pid) {
 }
 
 static char *r_debug_windbg_reg_profile(RDebug *dbg) {
-	if (!dbg) return NULL;
-	if (dbg->arch && strcmp (dbg->arch, "x86")) return NULL;
+	if (!dbg) {
+		return NULL;
+	}
+	if (dbg->arch && strcmp (dbg->arch, "x86")) {
+		return NULL;
+	}
 	if (dbg->bits == R_SYS_BITS_32) {
 #include "native/reg/windows-x86.h"
 	} else if (dbg->bits == R_SYS_BITS_64) {
@@ -146,7 +150,9 @@ static char *r_debug_windbg_reg_profile(RDebug *dbg) {
 
 static int r_debug_windbg_breakpoint(RBreakpoint *bp, RBreakpointItem *b, bool set) {
 	int *tag;
-	if (!b) return false;
+	if (!b) {
+		return false;
+	}
 	// Use a 32 bit word here to keep this compatible with 32 bit hosts
 	tag = (int *)&b->data;
 	return windbg_bkpt (wctx, b->addr, set, b->hw, tag);
diff --git a/libr/debug/p/native/linux/linux_debug.c b/libr/debug/p/native/linux/linux_debug.c
index 93ab4a4e11..715618bf54 100644
--- a/libr/debug/p/native/linux/linux_debug.c
+++ b/libr/debug/p/native/linux/linux_debug.c
@@ -637,8 +637,9 @@ RList *linux_thread_list(int pid, RList *list) {
 				int tgid = atoi (ptr + 5);
 
 				/* if it is not in our thread group, we don't want it */
-				if (tgid != pid)
+				if (tgid != pid) {
 					continue;
+				}
 
 				if (procfs_pid_slurp (i, "comm", buf, sizeof(buf)) == -1) {
 					/* fall back to auto-id */
@@ -780,7 +781,9 @@ int linux_reg_read (RDebug *dbg, int type, ut8 *buf, int size) {
 	{
 		int i;
 		for (i = 0; i < 8; i++) { //DR0-DR7
-			if (i == 4 || i == 5) continue;
+			if (i == 4 || i == 5) {
+				continue;
+			}
 			long ret = ptrace (PTRACE_PEEKUSER, pid,
 					r_offsetof (struct user, u_debugreg[i]), 0);
 			if ((i+1) * sizeof (ret) > size) {
@@ -811,9 +814,15 @@ int linux_reg_read (RDebug *dbg, int type, ut8 *buf, int size) {
 #if __x86_64__
 #if !__ANDROID__
 			ret1 = ptrace (PTRACE_GETFPREGS, pid, NULL, &fpregs);
-			if (showfpu) print_fpu ((void *)&fpregs, 0);
-			if (ret1 != 0) return false;
-			if (sizeof(fpregs) < size) size = sizeof(fpregs);
+			if (showfpu) {
+				print_fpu ((void *)&fpregs, 0);
+			}
+			if (ret1 != 0) {
+				return false;
+			}
+			if (sizeof (fpregs) < size) {
+				size = sizeof (fpregs);
+			}
 			memcpy (buf, &fpregs, size);
 			return sizeof(fpregs);
 #else
@@ -883,8 +892,12 @@ int linux_reg_read (RDebug *dbg, int type, ut8 *buf, int size) {
 			 * to 'wait'. and the process is not yet available to accept
 			 * more ptrace queries.
 			 */
-			if (ret != 0) return false;
-			if (sizeof (regs) < size) size = sizeof(regs);
+			if (ret != 0) {
+				return false;
+			}
+			if (sizeof (regs) < size) {
+				size = sizeof (regs);
+			}
 			memcpy (buf, &regs, size);
 			return sizeof (regs);
 		}
@@ -900,7 +913,9 @@ int linux_reg_write (RDebug *dbg, int type, const ut8 *buf, int size) {
 		int i;
 		long *val = (long*)buf;
 		for (i = 0; i < 8; i++) { // DR0-DR7
-			if (i == 4 || i == 5) continue;
+			if (i == 4 || i == 5) {
+				continue;
+			}
 			if (ptrace (PTRACE_POKEUSER, dbg->pid, r_offsetof (
 					struct user, u_debugreg[i]), val[i])) {
 				eprintf ("ptrace error for dr %d\n", i);
@@ -956,7 +971,9 @@ RList *linux_desc_list (int pid) {
 	}
 	ret->free = (RListFree)r_debug_desc_free;
 	while ((de = (struct dirent *)readdir(dd))) {
-		if (de->d_name[0] == '.') continue;
+		if (de->d_name[0] == '.') {
+			continue;
+		}
 		len = strlen (path);
 		len2 = strlen (de->d_name);
 		if (len + len2 + 1 >= sizeof(file)) {
@@ -979,12 +996,18 @@ RList *linux_desc_list (int pid) {
 				st.st_mode & S_IFCHR  ? 'C':'-';
 		}
 		if (lstat(path, &st) != -1) {
-			if (st.st_mode & S_IRUSR) perm |= R_IO_READ;
-			if (st.st_mode & S_IWUSR) perm |= R_IO_WRITE;
+			if (st.st_mode & S_IRUSR) {
+				perm |= R_IO_READ;
+			}
+			if (st.st_mode & S_IWUSR) {
+				perm |= R_IO_WRITE;
+			}
 		}
 		//TODO: Offset
 		desc = r_debug_desc_new (atoi (de->d_name), buf, perm, type, 0);
-		if (!desc) break;
+		if (!desc) {
+			break;
+		}
 		r_list_append (ret, desc);
 	}
 	closedir (dd);
diff --git a/libr/debug/pid.c b/libr/debug/pid.c
index 21df585a63..428f729569 100644
--- a/libr/debug/pid.c
+++ b/libr/debug/pid.c
@@ -76,7 +76,9 @@ R_API int r_debug_thread_list(RDebug *dbg, int pid) {
 	}
 	if (dbg && dbg->h && dbg->h->threads) {
 		list = dbg->h->threads (dbg, pid);
-		if (!list) return false;
+		if (!list) {
+			return false;
+		}
 		if (pid == -'j') {
 			dbg->cb_printf ("[");
 			r_list_foreach (list, iter, p) {
diff --git a/libr/debug/signal.c b/libr/debug/signal.c
index 6df38282fd..7a9e7f8134 100644
--- a/libr/debug/signal.c
+++ b/libr/debug/signal.c
@@ -69,10 +69,12 @@ static int siglistcb (void *p, const char *k, const char *v) {
 		opt = sdb_num_get (DB, key, 0);
 		if (opt) {
 			r_cons_printf ("%s %s", k, v);
-			if (opt & R_DBG_SIGNAL_CONT)
+			if (opt & R_DBG_SIGNAL_CONT) {
 				r_cons_strcat (" cont");
-			if (opt & R_DBG_SIGNAL_SKIP)
+			}
+			if (opt & R_DBG_SIGNAL_SKIP) {
 				r_cons_strcat (" skip");
+			}
 			r_cons_newline ();
 		} else {
 			if (mode == 0) {
@@ -147,8 +149,9 @@ R_API int r_debug_signal_set(RDebug *dbg, int num, ut64 addr) {
 
 /* TODO rename to _kill_ -> _signal_ */
 R_API RList *r_debug_kill_list(RDebug *dbg) {
-	if (dbg->h->kill_list)
+	if (dbg->h->kill_list) {
 		return dbg->h->kill_list (dbg);
+	}
 	return NULL;
 }
 
diff --git a/libr/debug/trace.c b/libr/debug/trace.c
index 8bed98ad5a..7d026b1a47 100644
--- a/libr/debug/trace.c
+++ b/libr/debug/trace.c
@@ -8,7 +8,9 @@
 
 R_API RDebugTrace *r_debug_trace_new () {
 	RDebugTrace *t = R_NEW0 (RDebugTrace);
-	if (!t) return NULL;
+	if (!t) {
+		return NULL;
+	}
 	t->tag = 1; // UT32_MAX;
 	t->addresses = NULL;
 	t->enabled = false;
@@ -27,7 +29,9 @@ R_API RDebugTrace *r_debug_trace_new () {
 }
 
 R_API void r_debug_trace_free (RDebugTrace *trace) {
-	if (!trace) return;
+	if (!trace) {
+		return;
+	}
 	r_list_purge (trace->traces);
 	free (trace->traces);
 	sdb_free (trace->db);
@@ -120,8 +124,9 @@ static int r_debug_trace_is_traceable(RDebug *dbg, ut64 addr) {
 	if (dbg->trace->addresses) {
 		char addr_str[32];
 		snprintf (addr_str, sizeof (addr_str), "0x%08"PFMT64x, addr);
-		if (!strstr (dbg->trace->addresses, addr_str))
+		if (!strstr (dbg->trace->addresses, addr_str)) {
 			return false;
+		}
 	}
 	return true;
 }
@@ -129,13 +134,16 @@ static int r_debug_trace_is_traceable(RDebug *dbg, ut64 addr) {
 R_API RDebugTracepoint *r_debug_trace_add (RDebug *dbg, ut64 addr, int size) {
 	RDebugTracepoint *tp;
 	int tag = dbg->trace->tag;
-	if (!r_debug_trace_is_traceable (dbg, addr))
+	if (!r_debug_trace_is_traceable (dbg, addr)) {
 		return NULL;
+	}
 	r_anal_trace_bb (dbg->anal, addr);
 	tp = r_debug_trace_get (dbg, addr);
 	if (!tp) {
 		tp = R_NEW0 (RDebugTracepoint);
-		if (!tp) return NULL;
+		if (!tp) {
+			return NULL;
+		}
 		tp->stamp = r_sys_now ();
 		tp->addr = addr;
 		tp->tags = tag;
diff --git a/libr/egg/egg.c b/libr/egg/egg.c
index 640aa5c0ff..f793a5af06 100644
--- a/libr/egg/egg.c
+++ b/libr/egg/egg.c
@@ -21,22 +21,36 @@ R_API REgg *r_egg_new () {
 		return NULL;
 	}
 	egg->src = r_buf_new ();
-	if (!egg->src) goto beach;
+	if (!egg->src) {
+		goto beach;
+	}
 	egg->buf = r_buf_new ();
-	if (!egg->buf) goto beach;
+	if (!egg->buf) {
+		goto beach;
+	}
 	egg->bin = r_buf_new ();
-	if (!egg->bin) goto beach;
+	if (!egg->bin) {
+		goto beach;
+	}
 	egg->remit = &emit_x86;
 	egg->syscall = r_syscall_new ();
-	if (!egg->syscall) goto beach;
+	if (!egg->syscall) {
+		goto beach;
+	}
 	egg->rasm = r_asm_new ();
-	if (!egg->rasm) goto beach;
+	if (!egg->rasm) {
+		goto beach;
+	}
 	egg->bits = 0;
 	egg->endian = 0;
 	egg->db = sdb_new (NULL, NULL, 0);
-	if (!egg->db) goto beach;
+	if (!egg->db) {
+		goto beach;
+	}
 	egg->patches = r_list_new ();
-	if (!egg->patches) goto beach;
+	if (!egg->patches) {
+		goto beach;
+	}
 	egg->patches->free = (RListFree)r_buf_free;
 	egg->plugins = r_list_new ();
 	for (i=0; egg_static_plugins[i]; i++) {
@@ -143,9 +157,10 @@ R_API int r_egg_setup(REgg *egg, const char *arch, int bits, int endian, const c
 R_API int r_egg_include(REgg *egg, const char *file, int format) {
 	int sz;
 	const ut8 *foo = (const ut8*)r_file_slurp (file, &sz);
-	if (!foo)
+	if (!foo) {
 		return 0;
-// XXX: format breaks compiler layers
+	}
+	// XXX: format breaks compiler layers
 	switch (format) {
 	case 'r': // raw
 		r_egg_raw (egg, foo, sz);
@@ -177,8 +192,9 @@ R_API void r_egg_syscall(REgg *egg, const char *arg, ...) {
 	if (!strcmp (arg, "close")) {
 		//egg->remit->syscall_args ();
 	}
-	if (!item)
+	if (!item) {
 		return;
+	}
 	egg->remit->syscall (egg, item->num);
 }
 
@@ -199,7 +215,9 @@ R_API int r_egg_raw(REgg *egg, const ut8 *b, int len) {
 	char *out;
 	int outlen = len*2; // two hexadecimal digits per byte
 	out = malloc (outlen+1);
-	if (!out) return false;
+	if (!out) {
+		return false;
+	}
 	r_hex_bin2str (b, len, out);
 	r_buf_append_bytes (egg->buf, (const ut8*)".hex ", 5);
 	r_buf_append_bytes (egg->buf, (const ut8*)out, outlen);
@@ -212,7 +230,9 @@ static int r_egg_raw_prepend(REgg *egg, const ut8 *b, int len) {
 	char *out;
 	int outlen = len*2; // two hexadecimal digits per byte
 	out = malloc (outlen+1);
-	if (!out) return false;
+	if (!out) {
+		return false;
+	}
 	r_hex_bin2str (b, len, out);
 	r_buf_prepend_bytes (egg->buf, (const ut8*)"\n", 1);
 	r_buf_prepend_bytes (egg->buf, (const ut8*)out, outlen);
@@ -232,11 +252,13 @@ static int r_egg_prepend_bytes(REgg *egg, const ut8 *b, int len) {
 }
 
 static int r_egg_append_bytes(REgg *egg, const ut8 *b, int len) {
-	if (!r_egg_raw(egg, b, len))
+	if (!r_egg_raw (egg, b, len)) {
 		return false;
+	}
 
-	if (!r_buf_append_bytes (egg->bin, b, len))
+	if (!r_buf_append_bytes (egg->bin, b, len)) {
 		return false;
+	}
 
 	return true;
 }
@@ -364,7 +386,9 @@ R_API int r_egg_run(REgg *egg) {
 #define R_EGG_FILL_TYPE_SEQ
 
 static inline char *eon(char *n) {
-	while (*n && (*n>='0' && *n<='9')) n++;
+	while (*n && (*n >= '0' && *n <= '9')) {
+		n++;
+	}
 	return n;
 }
 
@@ -459,7 +483,9 @@ R_API int r_egg_encode(REgg *egg, const char *name) {
 	r_list_foreach (egg->plugins, iter, p) {
 		if (p->type == R_EGG_PLUGIN_ENCODER && !strcmp (name, p->name)) {
 			b = p->build (egg);
-			if (!b) return false;
+			if (!b) {
+				return false;
+			}
 			r_buf_free (egg->bin);
 			egg->bin = b;
 			return true;
@@ -470,7 +496,9 @@ R_API int r_egg_encode(REgg *egg, const char *name) {
 
 R_API int r_egg_patch(REgg *egg, int off, const ut8 *buf, int len) {
 	RBuffer *b = r_buf_new ();
-	if (!b) return false;
+	if (!b) {
+		return false;
+	}
 	if (!r_buf_set_bytes (b, buf, len)) {
 		r_buf_free (b);
 		return false;
@@ -505,5 +533,7 @@ R_API void r_egg_pattern(REgg *egg, int size) {
 	if (ret) {
 		r_egg_prepend_bytes (egg, (const ut8*)ret, strlen(ret));
 		free (ret);
-	} else eprintf ("Invalid debruijn pattern length.\n");
+	} else {
+		eprintf ("Invalid debruijn pattern length.\n");
+	}
 }
diff --git a/libr/egg/egg_lang.c b/libr/egg/egg_lang.c
index 45b24c81d3..0cbe715ed2 100644
--- a/libr/egg/egg_lang.c
+++ b/libr/egg/egg_lang.c
@@ -37,7 +37,9 @@ static inline int is_op(char x) {
 }
 
 static inline int get_op(char **pos){
-	while (**pos && !(is_op (**pos) && !is_var (*pos))) (*pos)++;
+	while (**pos && !(is_op (**pos) && !is_var (*pos))) {
+		(*pos)++;
+	}
 	return (**pos)? ((is_op (**pos)) + 1): 0;
 }
 
@@ -223,7 +225,9 @@ static const char *find_alias(REgg *egg, const char *str) {
 		return strdup (str);
 	}
 	// strings could not means aliases
-	while (*p && !is_space (*p)) p++;
+	while (*p && !is_space (*p)) {
+		p++;
+	}
 	*p = '\x00';
 	for (i = 0; i < egg->lang.nalias; i++) {
 		if (!strcmp (str, egg->lang.aliases[i].name)) {
@@ -243,7 +247,9 @@ static void rcc_internal_mathop(REgg *egg, const char *ptr, char *ep, char op) {
 		*q = '\x00';
 	}
 	REggEmit *e = egg->remit;
-	while (*p && is_space (*p)) p++;
+	while (*p && is_space (*p)) {
+		p++;
+	}
 	if (is_var (p)) {
 		p = r_egg_mkvar (egg, buf, p, 0);
 		if (egg->lang.varxs == '*') {
@@ -281,7 +287,9 @@ static void rcc_mathop(REgg *egg, char **pos, int level) {
 	int op_ret = level;
 	char op, *next_pos;
 
-	while (**pos && is_space (**pos)) (*pos)++;
+	while (**pos && is_space (**pos)) {
+		(*pos)++;
+	}
 	next_pos = *pos + 1;
 
 	do {
@@ -664,7 +672,9 @@ static void rcc_fun(REgg *egg, const char *str) {
 			} else if (strstr (ptr, "alias")) {
 				egg->lang.mode = ALIAS;
 				ptr2 = egg->lang.dstvar = strdup (skipspaces (str));
-				while (*ptr2 && !is_space (*ptr2)) ptr2++;
+				while (*ptr2 && !is_space (*ptr2)) {
+					ptr2++;
+				}
 				*ptr2 = '\x00';
 				// for aliases must be valid and accurate strings
 			} else if (strstr (ptr, "data")) {
@@ -1397,7 +1407,9 @@ R_API int r_egg_lang_parsechar(REgg *egg, char c) {
 			if (egg->lang.elem_n) {
 				ptr = egg->lang.elem;
 				egg->lang.elem[egg->lang.elem_n] = '\0';
-				while (is_space (*ptr)) ptr++;
+				while (is_space (*ptr)) {
+					ptr++;
+				}
 				rcc_fun (egg, ptr);
 			}
 			egg->lang.elem_n = 0;
diff --git a/libr/egg/emit_trace.c b/libr/egg/emit_trace.c
index 15c59c9e8d..b90a652cce 100644
--- a/libr/egg/emit_trace.c
+++ b/libr/egg/emit_trace.c
@@ -57,13 +57,19 @@ static void emit_set_string(REgg *egg, const char *dstvar, const char *str, int
 }
 
 static void emit_call(REgg *egg, const char *str, int atr) {
-	if (atr) r_egg_printf (egg, "call ([%s])\n", str);
-	else r_egg_printf (egg, "call (%s)\n", str);
+	if (atr) {
+		r_egg_printf (egg, "call ([%s])\n", str);
+	} else {
+		r_egg_printf (egg, "call (%s)\n", str);
+	}
 }
 
 static void emit_jmp(REgg *egg, const char *str, int atr) {
-	if (atr) r_egg_printf (egg, "goto ([%s])\n", str);
-	else r_egg_printf (egg, "goto (%s)\n", str);
+	if (atr) {
+		r_egg_printf (egg, "goto ([%s])\n", str);
+	} else {
+		r_egg_printf (egg, "goto (%s)\n", str);
+	}
 }
 
 static void emit_arg (REgg *egg, int xs, int num, const char *str) {
@@ -131,7 +137,9 @@ static void emit_branch(REgg *egg, char *b, char *g, char *e, char *n, int sz, c
 		}
 	}
 
-	if (*arg=='=') arg++; /* for <=, >=, ... */
+	if (*arg == '=') {
+		arg++; /* for <=, >=, ... */
+	}
 	p = r_egg_mkvar (egg, str, arg, 0);
 	r_egg_printf (egg, "%s (%s) => (%s)\n", op, p, dst);
 	free (p);
@@ -154,17 +162,23 @@ static void emit_mathop(REgg *egg, int ch, int vs, int type, const char *eq, con
 	case '/': op = "div"; break;
 	default:  op = "mov"; break;
 	}
-	if (!eq) eq = R_AX;
-	if (!p) p = R_AX;
+	if (!eq) {
+		eq = R_AX;
+	}
+	if (!p) {
+		p = R_AX;
+	}
 #if 0
 	// TODO:
 	eprintf ("TYPE = %c\n", type);
 	eprintf ("  %s%c %c%s, %s\n", op, vs, type, eq, p);
 	eprintf ("  %s %s, [%s]\n", op, p, eq);
 #endif
-	if (type == '*')
+	if (type == '*') {
 		r_egg_printf (egg, "%s (%s, [%s])\n", op, p, eq);
-	else r_egg_printf (egg, "%s (%s, %s)\n", op, p, eq);
+	} else {
+		r_egg_printf (egg, "%s (%s, %s)\n", op, p, eq);
+	}
 }
 
 static const char* emit_regs(REgg *egg, int idx) {
diff --git a/libr/egg/emit_x86.c b/libr/egg/emit_x86.c
index 4db85bca72..364a326c00 100644
--- a/libr/egg/emit_x86.c
+++ b/libr/egg/emit_x86.c
@@ -34,14 +34,18 @@ static char *regs[] = { "eax", "ebx", "ecx", "edx", "esi", "edi", "ebp" };
 
 static void emit_init (REgg *egg) {
 // TODO: add 'andb rsp, 0xf0'
-	if (attsyntax) r_egg_printf (egg, "mov %%"R_SP", %%"R_BP"\n");
-	else r_egg_printf (egg, "mov "R_BP", "R_SP"\n");
+if (attsyntax) {
+	r_egg_printf (egg, "mov %%" R_SP ", %%" R_BP "\n");
+} else {
+	r_egg_printf (egg, "mov " R_BP ", " R_SP "\n");
+}
 }
 
 static char *emit_syscall (REgg *egg, int nargs) {
 	char p[512];
-	if (attsyntax)
-		return strdup (": mov $`.arg`, %"R_AX"\n: "SYSCALL_ATT"\n");
+	if (attsyntax) {
+		return strdup (": mov $`.arg`, %" R_AX "\n: " SYSCALL_ATT "\n");
+	}
 	switch (egg->os) {
 	case R_EGG_OS_LINUX:
 		strcpy (p, "\n : mov "R_AX", `.arg`\n : "SYSCALL_INTEL "\n");
@@ -69,17 +73,21 @@ static char *emit_syscall (REgg *egg, int nargs) {
 }
 
 static void emit_frame (REgg *egg, int sz) {
-	if (sz<1)
+	if (sz < 1) {
 		return;
-	if (attsyntax)
+	}
+	if (attsyntax) {
 		r_egg_printf (egg,
 		"  push %%"R_BP"\n"
 		"  mov %%"R_SP", %%"R_BP"\n"
 		"  sub $%d, %%"R_SP"\n", sz);
-	else r_egg_printf (egg,
-		"  push "R_BP"\n"
-		"  mov "R_BP", "R_SP"\n"
-		"  sub "R_SP", %d\n", sz);
+	} else {
+		r_egg_printf (egg,
+			"  push " R_BP "\n"
+			"  mov " R_BP ", " R_SP "\n"
+			"  sub " R_SP ", %d\n",
+			sz);
+	}
 }
 
 static void emit_frame_end (REgg *egg, int sz, int ctx) {
@@ -92,8 +100,9 @@ static void emit_frame_end (REgg *egg, int sz, int ctx) {
 			r_egg_printf (egg, "  pop "R_BP"\n");
 		}
 	}
-	if (ctx>0)
+	if (ctx > 0) {
 		r_egg_printf (egg, "  ret\n");
+	}
 }
 
 static void emit_comment(REgg *egg, const char *fmt, ...) {
@@ -101,8 +110,11 @@ static void emit_comment(REgg *egg, const char *fmt, ...) {
 	char buf[1024];
 	va_start (ap, fmt);
 	vsnprintf (buf, sizeof (buf), fmt, ap);
-	if (attsyntax) r_egg_printf (egg, "  /* %s */\n", buf);
-	else r_egg_printf (egg, "# %s\n", buf);
+	if (attsyntax) {
+		r_egg_printf (egg, "  /* %s */\n", buf);
+	} else {
+		r_egg_printf (egg, "# %s\n", buf);
+	}
 	va_end (ap);
 }
 
@@ -160,8 +172,11 @@ static void emit_string(REgg *egg, const char *dstvar, const char *str, int j) {
 		/* XXX endian issues (non-portable asm) */
 		ut32 *n = (ut32 *)(s+i-4);
 		p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
-		if (attsyntax) r_egg_printf (egg, "  movl $0x%x, %s\n", M32(*n), p);
-		else r_egg_printf (egg, "  mov dword %s, 0x%x\n", p, M32(*n));
+		if (attsyntax) {
+			r_egg_printf (egg, "  movl $0x%x, %s\n", M32 (*n), p);
+		} else {
+			r_egg_printf (egg, "  mov dword %s, 0x%x\n", p, M32 (*n));
+		}
 		free (p);
 		j -= 4;
 	}
@@ -169,19 +184,28 @@ static void emit_string(REgg *egg, const char *dstvar, const char *str, int j) {
 
 	/* zero */
 	p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
-	if (attsyntax) r_egg_printf (egg, "  movl $0, %s\n", p);
-	else r_egg_printf (egg, "  mov dword %s, 0\n", p);
+	if (attsyntax) {
+		r_egg_printf (egg, "  movl $0, %s\n", p);
+	} else {
+		r_egg_printf (egg, "  mov dword %s, 0\n", p);
+	}
 	free (p);
 
 	/* store pointer */
 	p = r_egg_mkvar (egg, str2, dstvar, j+4+BPOFF);
-	if (attsyntax) r_egg_printf (egg, "  lea %s, %%"R_AX"\n", p);
-	else r_egg_printf (egg, "  lea "R_AX", %s\n", p);
+	if (attsyntax) {
+		r_egg_printf (egg, "  lea %s, %%" R_AX "\n", p);
+	} else {
+		r_egg_printf (egg, "  lea " R_AX ", %s\n", p);
+	}
 	free (p);
 
 	p = r_egg_mkvar (egg, str2, dstvar, 0);
-	if (attsyntax) r_egg_printf (egg, "  mov %%"R_AX", %s\n", p);
-	else r_egg_printf (egg, "  mov %s, "R_AX"\n", p);
+	if (attsyntax) {
+		r_egg_printf (egg, "  mov %%" R_AX ", %s\n", p);
+	} else {
+		r_egg_printf (egg, "  mov %s, " R_AX "\n", p);
+	}
 	free (p);
 
 #undef BPOFF
@@ -208,16 +232,24 @@ static void emit_string(REgg *egg, const char *dstvar, const char *str, int j) {
 
 static void emit_call(REgg *egg, const char *str, int atr) {
 	if (atr) {
-		if (attsyntax) r_egg_printf (egg, "  call *%s\n", str);
-		else r_egg_printf (egg, "  call [%s]\n", str);
-	} else r_egg_printf (egg, "  call %s\n", str);
+		if (attsyntax) {
+			r_egg_printf (egg, "  call *%s\n", str);
+		} else {
+			r_egg_printf (egg, "  call [%s]\n", str);
+		}
+	} else {
+		r_egg_printf (egg, "  call %s\n", str);
+	}
 }
 
 static void emit_jmp(REgg *egg, const char *str, int atr) {
 	if (str) {
 		if (atr) {
-			if (attsyntax) r_egg_printf (egg, "  jmp *%s\n", str);
-			else r_egg_printf (egg, "  jmp [%s]\n", str);
+			if (attsyntax) {
+				r_egg_printf (egg, "  jmp *%s\n", str);
+			} else {
+				r_egg_printf (egg, "  jmp [%s]\n", str);
+			}
 		} else {
 			r_egg_printf (egg, "  jmp %s\n", str);
 		}
@@ -228,8 +260,9 @@ static void emit_jmp(REgg *egg, const char *str, int atr) {
 
 static void emit_arg (REgg *egg, int xs, int num, const char *str) {
 	int d = atoi (str);
-	if (!attsyntax && (*str=='$'))
-		str = str +1;
+	if (!attsyntax && (*str == '$')) {
+		str = str + 1;
+	}
 	switch (xs) {
 	case 0:
 #ifdef ARCH_X86_64
@@ -249,31 +282,48 @@ static void emit_arg (REgg *egg, int xs, int num, const char *str) {
 #endif
 		break;
 	case '*':
-		if (attsyntax) r_egg_printf (egg, "  push (%s)\n", str);
-		else r_egg_printf (egg, "  push [%s]\n", str);
+		if (attsyntax) {
+			r_egg_printf (egg, "  push (%s)\n", str);
+		} else {
+			r_egg_printf (egg, "  push [%s]\n", str);
+		}
 		break;
 	case '&':
 		if (attsyntax) {
-			if (d != 0) r_egg_printf (egg, "  addl $%d, %%"R_BP"\n", d);
+			if (d != 0) {
+				r_egg_printf (egg, "  addl $%d, %%" R_BP "\n", d);
+			}
 			r_egg_printf (egg, "  pushl %%"R_BP"\n");
-			if (d != 0) r_egg_printf (egg, "  subl $%d, %%"R_BP"\n", d);
+			if (d != 0) {
+				r_egg_printf (egg, "  subl $%d, %%" R_BP "\n", d);
+			}
 		} else {
-			if (d != 0) r_egg_printf (egg, "  add "R_BP", %d\n", d);
+			if (d != 0) {
+				r_egg_printf (egg, "  add " R_BP ", %d\n", d);
+			}
 			r_egg_printf (egg, "  push "R_BP"\n");
-			if (d != 0) r_egg_printf (egg, "  sub "R_BP", %d\n", d);
+			if (d != 0) {
+				r_egg_printf (egg, "  sub " R_BP ", %d\n", d);
+			}
 		}
 		break;
 	}
 }
 
 static void emit_get_result(REgg *egg, const char *ocn) {
-	if (attsyntax) r_egg_printf (egg, "  mov %%"R_AX", %s\n", ocn);
-	else r_egg_printf (egg, "  mov %s, "R_AX"\n", ocn);
+	if (attsyntax) {
+		r_egg_printf (egg, "  mov %%" R_AX ", %s\n", ocn);
+	} else {
+		r_egg_printf (egg, "  mov %s, " R_AX "\n", ocn);
+	}
 }
 
 static void emit_restore_stack (REgg *egg, int size) {
-	if (attsyntax) r_egg_printf (egg, "  add $%d, %%"R_SP" /* args */\n", size);
-	else r_egg_printf (egg, "  add "R_SP", %d\n", size);
+	if (attsyntax) {
+		r_egg_printf (egg, "  add $%d, %%" R_SP " /* args */\n", size);
+	} else {
+		r_egg_printf (egg, "  add " R_SP ", %d\n", size);
+	}
 }
 
 static void emit_get_while_end (REgg *egg, char *str, const char *ctxpush, const char *label) {
@@ -298,22 +348,34 @@ static void emit_while_end (REgg *egg, const char *labelback) {
 static void emit_get_var (REgg *egg, int type, char *out, int idx) {
 	switch (type) {
 	case 0:  /* variable */
-		if (idx>0) sprintf (out, "["R_BP"+%d]", idx);
-		else if (idx<0) sprintf (out, "["R_BP"%d]", idx);
-		else strcpy (out, "["R_BP"]");
+		if (idx > 0) {
+			sprintf (out, "[" R_BP "+%d]", idx);
+		} else if (idx < 0) {
+			sprintf (out, "[" R_BP "%d]", idx);
+		} else {
+			strcpy (out, "[" R_BP "]");
+		}
 		break;
 	case 1: /* argument */
 // OMG WE CANT stuff found in relative address in stack in the stack
 		eprintf ("WARNING: Using stack vars in naked functions\n");
 		idx = 8; // HACK to make arg0, arg4, ... work
-		if (idx>0) sprintf (out, "["R_SP"+%d]", idx);
-		else if (idx<0) sprintf (out, "["R_SP"%d]", idx);
-		else strcpy (out, "["R_SP"]");
+		if (idx > 0) {
+			sprintf (out, "[" R_SP "+%d]", idx);
+		} else if (idx < 0) {
+			sprintf (out, "[" R_SP "%d]", idx);
+		} else {
+			strcpy (out, "[" R_SP "]");
+		}
 		break;
 	case 2:
-		if (idx>0) sprintf (out, "["R_BP"+%d]", idx);
-		else if (idx<0) sprintf (out, "["R_BP"%d]", idx);
-		else strcpy (out, "["R_BP"]");
+		if (idx > 0) {
+			sprintf (out, "[" R_BP "+%d]", idx);
+		} else if (idx < 0) {
+			sprintf (out, "[" R_BP "%d]", idx);
+		} else {
+			strcpy (out, "[" R_BP "]");
+		}
 		break;
 	}
 }
@@ -326,7 +388,9 @@ static void emit_load_ptr(REgg *egg, const char *dst) {
 	int d = atoi (dst);
 	if (d == 0) { // hack to handle stackvarptrz
 		char *p = strchr (dst, '+');
-		if (p) d = atoi (p+1);
+		if (p) {
+			d = atoi (p + 1);
+		}
 	}
 	//eprintf ("emit_load_ptr: HACK\n");
 	// XXX: 32/64bit care
@@ -370,12 +434,17 @@ static void emit_branch(REgg *egg, char *b, char *g, char *e, char *n, int sz, c
 			op = "jne";
 		} else {
 			arg = attsyntax? "$0": "0";
-			if (n) op = "jnz";
-			else op ="jz";
+			if (n) {
+				op = "jnz";
+			} else {
+				op = "jz";
+			}
 		}
 	}
 
-	if (*arg=='=') arg++; /* for <=, >=, ... */
+	if (*arg == '=') {
+		arg++; /* for <=, >=, ... */
+	}
 	p = r_egg_mkvar (egg, str, arg, 0);
 	if (attsyntax) {
 		r_egg_printf (egg, "  pop %%"R_AX"\n"); /* TODO: add support for more than one arg get arg0 */
@@ -436,20 +505,31 @@ static void emit_mathop(REgg *egg, int ch, int vs, int type, const char *eq, con
 	default:  op = "mov"; break;
 	}
 	if (attsyntax) {
-		if (!eq) eq = "%"R_AX;
-		if (!p) p = "%"R_AX;
+		if (!eq) {
+			eq = "%" R_AX;
+		}
+		if (!p) {
+			p = "%" R_AX;
+		}
 		r_egg_printf (egg, "  %s%c %c%s, %s\n", op, vs, type, eq, p);
 	} else {
-		if (!eq) eq = R_AX;
-		if (!p) p = R_AX;
-	// TODO:
+		if (!eq) {
+			eq = R_AX;
+		}
+		if (!p) {
+			p = R_AX;
+		}
+		// TODO:
 #if 0
 		eprintf ("TYPE = %c\n", type);
 		eprintf ("  %s%c %c%s, %s\n", op, vs, type, eq, p);
 		eprintf ("  %s %s, [%s]\n", op, p, eq);
 #endif
-		if (type == '*') r_egg_printf (egg, "  %s %s, [%s]\n", op, p, eq);
-		else r_egg_printf (egg, "  %s %s, %s\n", op, p, eq);
+		if (type == '*') {
+			r_egg_printf (egg, "  %s %s, [%s]\n", op, p, eq);
+		} else {
+			r_egg_printf (egg, "  %s %s, %s\n", op, p, eq);
+		}
 	}
 }
 
@@ -460,7 +540,9 @@ static const char* emit_regs(REgg *egg, int idx) {
 static void emit_get_ar (REgg *egg, char *out, int idx) {
 	const char *reg = emit_regs (egg, R_REG_AR_OFF + idx);
 
-	if (reg) strcpy (out, reg);
+	if (reg) {
+		strcpy (out, reg);
+	}
 }
 
 REggEmit EMIT_NAME = {
diff --git a/libr/egg/p/egg_exec.c b/libr/egg/p/egg_exec.c
index 95cbe94f5c..a45580511b 100644
--- a/libr/egg/p/egg_exec.c
+++ b/libr/egg/p/egg_exec.c
@@ -84,7 +84,9 @@ static RBuffer *build (REgg *egg) {
 		}
 		break;
 	case R_EGG_OS_LINUX:
-		if (suid) eprintf ("no suid for this platform\n");
+		if (suid) {
+			eprintf ("no suid for this platform\n");
+		}
 		suid = 0;
 		switch (egg->arch) {
 		case R_SYS_ARCH_X86:
@@ -121,8 +123,11 @@ static RBuffer *build (REgg *egg) {
 	if (sc) {
 		r_buf_set_bytes (buf, sc, strlen ((const char *)sc));
 		if (shell && *shell) {
-			if (cd) r_buf_write_at (buf, cd, (const ut8*)shell, strlen (shell)+1);
-			else eprintf ("Cannot set shell\n");
+			if (cd) {
+				r_buf_write_at (buf, cd, (const ut8 *)shell, strlen (shell) + 1);
+			} else {
+				eprintf ("Cannot set shell\n");
+			}
 		}
 	}
 	free (suid);
diff --git a/libr/flag/flag.c b/libr/flag/flag.c
index 94f078deef..9f68863a94 100644
--- a/libr/flag/flag.c
+++ b/libr/flag/flag.c
@@ -117,7 +117,9 @@ static int set_name(RFlagItem *item, const char *name) {
 R_API RFlag * r_flag_new() {
 	int i;
 	RFlag *f = R_NEW0 (RFlag);
-	if (!f) return NULL;
+	if (!f) {
+		return NULL;
+	}
 	f->num = r_num_new (&num_callback, &str_callback, f);
 	if (!f->num) {
 		r_flag_free (f);
@@ -263,9 +265,11 @@ R_API void r_flag_list(RFlag *f, int rad, const char *pfx) {
 			} else {
 				f->cb_printf ("\"offset\":%"PFMT64d, flag->offset);
 			}
-			if (flag->comment)
+			if (flag->comment) {
 				f->cb_printf (",\"comment\":\"}");
-			else f->cb_printf ("}");
+			} else {
+				f->cb_printf ("}");
+			}
 			first = 0;
 		}
 		f->cb_printf ("]\n");
@@ -284,15 +288,17 @@ R_API void r_flag_list(RFlag *f, int rad, const char *pfx) {
 				const char *flagspace;
 				fs = flag->space;
 				flagspace = r_flag_space_get_i (f, fs);
-				if (!flagspace || !*flagspace)
+				if (!flagspace || !*flagspace) {
 					flagspace = "*";
+				}
 				f->cb_printf ("fs %s\n", flagspace);
 			}
 			if (flag->alias) {
 				f->cb_printf ("fa %s %s\n", flag->name, flag->alias);
-				if (flag->comment && *flag->comment)
+				if (flag->comment && *flag->comment) {
 					f->cb_printf ("\"fC %s %s\"\n",
 						flag->name, flag->comment);
+				}
 			} else {
 				f->cb_printf ("f %s %"PFMT64d" 0x%08"PFMT64x"%s%s %s\n",
 					flag->name, flag->size, flag->offset,
@@ -420,7 +426,9 @@ R_API RFlagItem *r_flag_get_i2(RFlag *f, ut64 off) {
 			break;
 		}
 		oitem = item;
-		if (strlen (item->name) < 5 || item->name[3]!='.') continue;
+		if (strlen (item->name) < 5 || item->name[3] != '.') {
+			continue;
+		}
 		oitem = item;
 	}
 	return evalFlag (f, oitem);
@@ -736,8 +744,12 @@ int main () {
 #endif
 
 R_API const char *r_flag_color(RFlag *f, RFlagItem *it, const char *color) {
-	if (!f || !it) return NULL;
-	if (!color) return it->color;
+	if (!f || !it) {
+		return NULL;
+	}
+	if (!color) {
+		return it->color;
+	}
 	free (it->color);
 	it->color = *color ? strdup (color) : NULL;
 	return it->color;
@@ -759,8 +771,9 @@ R_API int r_flag_count(RFlag *f, const char *glob) {
 	RFlagItem *flag;
 	RListIter *iter;
 	r_list_foreach (f->flags, iter, flag) {
-		if (r_str_glob (flag->name, glob))
-			count ++;
+		if (r_str_glob (flag->name, glob)) {
+			count++;
+		}
 	}
 	return count;
 }
diff --git a/libr/flag/sort.c b/libr/flag/sort.c
index faae4f9af4..529df4b0e6 100644
--- a/libr/flag/sort.c
+++ b/libr/flag/sort.c
@@ -13,8 +13,11 @@ static int ncmp(const void *a, const void *b) {
 static int cmp(const void *a, const void *b) {
 	RFlagItem *fa = (RFlagItem *)a;
 	RFlagItem *fb = (RFlagItem *)b;
-	if (fa->offset > fb->offset) return 1;
-	else if (fa->offset < fb->offset) return -1;
+	if (fa->offset > fb->offset) {
+		return 1;
+	} else if (fa->offset < fb->offset) {
+		return -1;
+	}
 	return 0;
 }
 
diff --git a/libr/flag/spaces.c b/libr/flag/spaces.c
index d6ec044ab4..43d8af87aa 100644
--- a/libr/flag/spaces.c
+++ b/libr/flag/spaces.c
@@ -149,7 +149,9 @@ R_API int r_flag_space_list(RFlag *f, int mode) {
 					(allSelected || i == f->space_idx)? "true":"false");
 		} else if (mode=='*') {
 			f->cb_printf ("fs %s\n", f->spaces[i]);
-			if (i==f->space_idx) defspace = f->spaces[i];
+			if (i == f->space_idx) {
+				defspace = f->spaces[i];
+			}
 		} else {
 			#define INDENT 5
 			char num0[64], num1[64], spaces[32];
@@ -188,8 +190,12 @@ R_API int r_flag_space_rename (RFlag *f, const char *oname, const char *nname) {
 	if (!nname) {
 		return false;
 	}
-	while (*oname==' ') oname++;
-	while (*nname==' ') nname++;
+	while (*oname == ' ') {
+		oname++;
+	}
+	while (*nname == ' ') {
+		nname++;
+	}
 	for (i = 0; i < R_FLAG_SPACES_MAX; i++) {
 		if (f->spaces[i]  && !strcmp (oname, f->spaces[i])) {
 			free (f->spaces[i]);
diff --git a/libr/fs/p/fs_posix.c b/libr/fs/p/fs_posix.c
index 9f94ad4b01..bb6d6f7940 100644
--- a/libr/fs/p/fs_posix.c
+++ b/libr/fs/p/fs_posix.c
@@ -11,7 +11,9 @@
 static RFSFile* fs_posix_open(RFSRoot *root, const char *path) {
 	FILE *fd;
 	RFSFile *file = r_fs_file_new (root, path);
-	if (!file) return NULL;
+	if (!file) {
+		return NULL;
+	}
 	file->ptr = NULL;
 	file->p = root->p;
 	fd = r_sandbox_fopen (path, "r");
diff --git a/libr/fs/shell.c b/libr/fs/shell.c
index 1e1931a1b0..a0aa0425e4 100644
--- a/libr/fs/shell.c
+++ b/libr/fs/shell.c
@@ -157,8 +157,9 @@ R_API int r_fs_shell_prompt(RFSShell* shell, RFS* fs, const char* root) {
 			}
 		} else if (!memcmp (buf, "cat ", 4)) {
 			input = buf + 3;
-			while (input[0] == ' ')
+			while (input[0] == ' ') {
 				input++;
+			}
 			if (input[0] == '/') {
 				if (root) {
 					strncpy (str, root, sizeof (str) - 1);
@@ -187,8 +188,9 @@ R_API int r_fs_shell_prompt(RFSShell* shell, RFS* fs, const char* root) {
 		} else if (!memcmp (buf, "get ", 4)) {
 			char* s = 0;
 			input = buf + 3;
-			while (input[0] == ' ')
+			while (input[0] == ' ') {
 				input++;
+			}
 			if (input[0] == '/') {
 				if (root) {
 					s = malloc (strlen (root) + strlen (input) + 2);
diff --git a/libr/io/p/io_bfdbg.c b/libr/io/p/io_bfdbg.c
index 1bcbd8c38a..a34200a8a8 100644
--- a/libr/io/p/io_bfdbg.c
+++ b/libr/io/p/io_bfdbg.c
@@ -36,39 +36,45 @@ static inline int is_in_base(ut64 off, BfvmCPU *c) {
 static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	RIOBfdbg *riom;
 	int sz;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	riom = fd->data;
 	/* data base buffer */
 	if (is_in_base (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->base;
-		if (n>count)
+		if (n > count) {
 			count = n;
+		}
 		memcpy (riom->bfvm->mem+n, buf, count);
 		return count;
 	}
 	/* screen buffer */
 	if (is_in_screen (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->screen;
-		if (n>count)
-			count = riom->bfvm->screen_size-n;
+		if (n > count) {
+			count = riom->bfvm->screen_size - n;
+		}
 		memcpy (riom->bfvm->screen_buf+n, buf, count);
 		return count;
 	}
 	/* input buffer */
 	if (is_in_input (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->input;
-		if (n>count)
-			count = riom->bfvm->input_size-n;
+		if (n > count) {
+			count = riom->bfvm->input_size - n;
+		}
 		memcpy (riom->bfvm->input_buf+n, buf, count);
 		return count;
 	}
 	/* read from file */
 	sz = RIOBFDBG_SZ (fd);
-	if (io->off+count >= sz)
-		count = sz-io->off;
-	if (io->off >= sz)
+	if (io->off + count >= sz) {
+		count = sz - io->off;
+	}
+	if (io->off >= sz) {
 		return -1;
+	}
 	memcpy (RIOBFDBG_BUF (fd)+io->off, buf, count);
 	return count;
 }
@@ -76,47 +82,54 @@ static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	RIOBfdbg *riom;
 	int sz;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	riom = fd->data;
 	/* data base buffer */
 	if (is_in_base (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->base;
-		if (n>count)
+		if (n > count) {
 			count = n;
+		}
 		memcpy (buf, riom->bfvm->mem+n, count);
 		return count;
 	}
 	/* screen buffer */
 	if (is_in_screen (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->screen;
-		if (n>count)
-			count = riom->bfvm->screen_size-n;
+		if (n > count) {
+			count = riom->bfvm->screen_size - n;
+		}
 		memcpy (buf, riom->bfvm->screen_buf+n, count);
 		return count;
 	}
 	/* input buffer */
 	if (is_in_input (io->off, riom->bfvm)) {
 		int n = io->off-riom->bfvm->input;
-		if (n>count)
-			count = riom->bfvm->input_size-n;
+		if (n > count) {
+			count = riom->bfvm->input_size - n;
+		}
 		memcpy (buf, riom->bfvm->input_buf+n, count);
 		return count;
 	}
 	/* read from file */
 	sz = RIOBFDBG_SZ (fd);
-	if (io->off+count >= sz)
-		count = sz-io->off;
-	if (io->off >= sz)
+	if (io->off + count >= sz) {
+		count = sz - io->off;
+	}
+	if (io->off >= sz) {
 		return -1;
+	}
 	memcpy (buf, RIOBFDBG_BUF (fd)+io->off, count);
 	return count;
 }
 
 static int __close(RIODesc *fd) {
 	RIOBfdbg *riom;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	riom = fd->data;
 	bfvm_free (riom->bfvm);
 	free (riom->buf);
@@ -149,7 +162,9 @@ static RIODesc *__open(RIO *io, const char *pathname, int rw, int mode) {
 	if (__plugin_open (io, pathname, 0)) {
 		RIOBind iob;
 		RIOBfdbg *mal = R_NEW0 (RIOBfdbg);
-		if (!mal) return NULL;
+		if (!mal) {
+			return NULL;
+		}
 		r_io_bind (io, &iob);
 		mal->fd = getmalfd (mal);
 		mal->bfvm = bfvm_new (&iob);
diff --git a/libr/io/p/io_bochs.c b/libr/io/p/io_bochs.c
index 64eb87d3ff..ac540acdb7 100644
--- a/libr/io/p/io_bochs.c
+++ b/libr/io/p/io_bochs.c
@@ -77,9 +77,10 @@ static ut64 __lseek(RIO *io, RIODesc *fd, ut64 offset, int whence) {
 static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	memset (buf, 0xff, count);
 	ut64 addr = io->off;
-	if (!desc || !desc->data) 
+	if (!desc || !desc->data) {
 		return -1;
-        lprintf ("io_read ofs= %016"PFMT64x" count= %x\n", io->off, count);
+	}
+	lprintf ("io_read ofs= %016"PFMT64x" count= %x\n", io->off, count);
 	bochs_read (desc,addr,count,buf);
 	return count;
 }
diff --git a/libr/io/p/io_debug.c b/libr/io/p/io_debug.c
index aa0623a6e1..cbbd131e1e 100644
--- a/libr/io/p/io_debug.c
+++ b/libr/io/p/io_debug.c
@@ -529,7 +529,9 @@ static int fork_and_ptraceme(RIO *io, int bits, const char *cmd) {
 		/* XXX: clean this dirty code */
 		do {
 			ret = wait (&status);
-			if (ret == -1) return -1;
+			if (ret == -1) {
+				return -1;
+			}
 			if (ret != child_pid) {
 				eprintf ("Wait event received by "
 					"different pid %d\n", ret);
diff --git a/libr/io/p/io_default.c b/libr/io/p/io_default.c
index 665214d917..253d34dabc 100644
--- a/libr/io/p/io_default.c
+++ b/libr/io/p/io_default.c
@@ -288,7 +288,9 @@ static int r_io_def_mmap_write(RIO *io, RIODesc *fd, const ut8 *buf, int count)
 	}
 
 	if (mmo && mmo->buf) {
-		if (!(mmo->flags & R_IO_WRITE)) return -1;
+		if (!(mmo->flags & R_IO_WRITE)) {
+			return -1;
+		}
 		if ( (count + addr > mmo->buf->length) || mmo->buf->empty) {
 			ut64 sz = count + addr;
 			r_file_truncate (mmo->filename, sz);
diff --git a/libr/io/p/io_gprobe.c b/libr/io/p/io_gprobe.c
index 26657a76aa..3bb6504395 100644
--- a/libr/io/p/io_gprobe.c
+++ b/libr/io/p/io_gprobe.c
@@ -80,8 +80,9 @@ static ut8 gprobe_checksum_i2c (const ut8 *p, unsigned int size, ut8 initial) {
 	ut8 res = initial;
 	unsigned int k;
 
-	for (k = 0; k < size; ++k)
+	for (k = 0; k < size; ++k) {
 		res ^= p[k];
+	}
 
 	return res;
 }
diff --git a/libr/io/p/io_http.c b/libr/io/p/io_http.c
index e54c0bfcf6..c4797094a7 100644
--- a/libr/io/p/io_http.c
+++ b/libr/io/p/io_http.c
@@ -80,7 +80,9 @@ static RIODesc *__open(RIO *io, const char *pathname, int rw, int mode) {
 		out = r_socket_http_get (pathname, &code, &rlen);
 		if (out && rlen>0) {
 			RIOMalloc *mal = R_NEW0 (RIOMalloc);
-			if (!mal) return NULL;
+			if (!mal) {
+				return NULL;
+			}
 			mal->size = rlen;
 			mal->buf = malloc (mal->size+1);
 			if (!mal->buf) {
diff --git a/libr/io/p/io_ihex.c b/libr/io/p/io_ihex.c
index 55b4525717..f88f2bf146 100644
--- a/libr/io/p/io_ihex.c
+++ b/libr/io/p/io_ihex.c
@@ -123,8 +123,9 @@ static int fwblock(FILE *fd, ut8 *b, ut32 start_addr, ut16 size) {
 	int j;
 	ut32 i;	//has to be bigger than size !
 
-	if (size <1 || !fd || !b)
+	if (size < 1 || !fd || !b) {
 		return -1;
+	}
 
 	for (i = 0; (i + 0x10) < size; i += 0x10) {
 		cks = 0x10;
@@ -135,16 +136,19 @@ static int fwblock(FILE *fd, ut8 *b, ut32 start_addr, ut16 size) {
 		}
 		cks = 0 - cks;
 		if (fprintf (fd, ":10%04x00%02x%02x%02x%02x%02x%02x%02x"
-			"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-			(i+start_addr)&0xffff, b[0], b[1], b[2], b[3], b[4], b[5], b[6],
-			b[7], b[8], b[9], b[10], b[11], b[12], b[13],
-			b[14], b[15], cks) < 0) return -1;
+				 "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+			    (i + start_addr) & 0xffff, b[0], b[1], b[2], b[3], b[4], b[5], b[6],
+			    b[7], b[8], b[9], b[10], b[11], b[12], b[13],
+			    b[14], b[15], cks) < 0) {
+			return -1;
+		}
 		start_addr += 0x10;
 		b += 0x10;
 		if ((start_addr & 0xffff) < 0x10) {
 			//addr rollover: write ext address record
-			if (fw04b (fd, start_addr >> 16) < 0)
+			if (fw04b (fd, start_addr >> 16) < 0) {
 				return -1;
+			}
 		}
 	}
 	if (i == size) {
@@ -160,8 +164,9 @@ static int fwblock(FILE *fd, ut8 *b, ut32 start_addr, ut16 size) {
 	}
 	cks -= j;
 
-	if (fprintf (fd, ":%02X%04X00%.*s%02X\n", j, last_addr, 2*j, linebuf,cks) < 0)
+	if (fprintf (fd, ":%02X%04X00%.*s%02X\n", j, last_addr, 2 * j, linebuf, cks) < 0) {
 		return -1;
+	}
 	return 0;
 }
 
@@ -314,7 +319,9 @@ static bool ihex_parse(RBuffer *rbuf, char *str) {
 			sec_size = 0;
 
 			eol = strchr (str + 1, ':');
-			if (eol) *eol = 0;
+			if (eol) {
+				*eol = 0;
+			}
 			cksum = bc;
 			cksum += addr_tmp>>8;
 			cksum += addr_tmp;
@@ -342,7 +349,9 @@ static bool ihex_parse(RBuffer *rbuf, char *str) {
 			if (eol) {
 				// checksum
 				byte=0;	//break checksum if sscanf failed
-				if (sscanf (str+9+ 4, "%02x", &byte) !=1) cksum=1;
+				if (sscanf (str + 9 + 4, "%02x", &byte) != 1) {
+					cksum = 1;
+				}
 				cksum += byte;
 				if (cksum != 0) {
 					ut8 fixedcksum = 0-(cksum-byte);
diff --git a/libr/io/p/io_ptrace.c b/libr/io/p/io_ptrace.c
index 8b7c723f44..9c743a7b1e 100644
--- a/libr/io/p/io_ptrace.c
+++ b/libr/io/p/io_ptrace.c
@@ -59,10 +59,12 @@ static int debug_os_read_at(int pid, ut32 *buf, int sz, ut64 addr) {
 	ut32 words = sz / sizeof (ut32);
 	ut32 last = sz % sizeof (ut32);
 	ut32 x, lr, *at = (ut32*)(size_t)addr;
-	if (sz<1 || addr==UT64_MAX)
+	if (sz < 1 || addr == UT64_MAX) {
 		return -1;
-	for (x=0; x<words; x++)
-		buf[x] = (ut32)debug_read_raw (pid, (void*)(at++));
+	}
+	for (x = 0; x < words; x++) {
+		buf[x] = (ut32)debug_read_raw (pid, (void *)(at++));
+	}
 	if (last) {
 		lr = (ut32)debug_read_raw (pid, at);
 		memcpy (buf+x, &lr, last) ;
@@ -75,8 +77,9 @@ static int __read(RIO *io, RIODesc *desc, ut8 *buf, int len) {
 	int ret, fd;
 #endif
 	ut64 addr = io->off;
-	if (!desc || !desc->data)
+	if (!desc || !desc->data) {
 		return -1;
+	}
 	memset (buf, '\xff', len); // TODO: only memset the non-readed bytes
 	/* reopen procpidmem if necessary */
 #if USE_PROC_PID_MEM
@@ -173,9 +176,9 @@ static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
 	if (__plugin_open (io, file,0)) {
 		int pid = atoi (file+9);
 		ret = ptrace (PTRACE_ATTACH, pid, 0, 0);
-		if (file[0] == 'p')  //ptrace
+		if (file[0] == 'p') { //ptrace
 			ret = 0;
-		else if (ret == -1) {
+		} else if (ret == -1) {
 #ifdef __ANDROID__
 			eprintf ("ptrace_attach: Operation not permitted\n");
 #else
@@ -192,7 +195,9 @@ static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
 #endif
 		} else if (__waitpid (pid)) {
 			ret = pid;
-		} else eprintf ("Error in waitpid\n");
+		} else {
+			eprintf ("Error in waitpid\n");
+		}
 		if (ret != -1) {
 			RIOPtrace *riop = R_NEW0 (RIOPtrace);
 			if (!riop) {
diff --git a/libr/io/p/io_qnx.c b/libr/io/p/io_qnx.c
index 82ec446fff..d36a8988ea 100644
--- a/libr/io/p/io_qnx.c
+++ b/libr/io/p/io_qnx.c
@@ -34,7 +34,9 @@ static int debug_qnx_read_at (ut8 *buf, int sz, ut64 addr) {
 		memcpy (buf, c_buff, sz);
 		return sz;
 	}
-	if (sz < 1 || addr >= UT64_MAX) return -1;
+	if (sz < 1 || addr >= UT64_MAX) {
+		return -1;
+	}
 	for (x = 0; x < packets; x++) {
 		qnxr_read_memory (desc, addr + x * size_max, (buf + x * size_max), size_max);
 	}
@@ -78,8 +80,9 @@ static RIODesc *__open (RIO *io, const char *file, int rw, int mode) {
 	RIOQnx *rioq;
 	char host[128], *port, *p;
 
-	if (!__plugin_open (io, file, 0))
+	if (!__plugin_open (io, file, 0)) {
 		return NULL;
+	}
 	if (rioqnx) {
 		// FIX: Don't allocate more than one RIODesc
 		return rioqnx;
@@ -94,7 +97,9 @@ static RIODesc *__open (RIO *io, const char *file, int rw, int mode) {
 	*port = '\0';
 	port++;
 	p = strchr (port, '/');
-	if (p) *p = 0;
+	if (p) {
+		*p = 0;
+	}
 
 	if (r_sandbox_enable (0)) {
 		eprintf ("sandbox: Cannot use network\n");
@@ -115,7 +120,9 @@ static RIODesc *__open (RIO *io, const char *file, int rw, int mode) {
 
 static int __write (RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	ut64 addr = io->off;
-	if (!desc) return -1;
+	if (!desc) {
+		return -1;
+	}
 	return debug_qnx_write_at (buf, count, addr);
 }
 
@@ -126,7 +133,9 @@ static ut64 __lseek (RIO *io, RIODesc *fd, ut64 offset, int whence) {
 static int __read (RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	memset (buf, 0xff, count);
 	ut64 addr = io->off;
-	if (!desc) return -1;
+	if (!desc) {
+		return -1;
+	}
 	return debug_qnx_read_at (buf, count, addr);
 }
 
diff --git a/libr/io/p/io_r2pipe.c b/libr/io/p/io_r2pipe.c
index 903c03976b..2739cb2c70 100644
--- a/libr/io/p/io_r2pipe.c
+++ b/libr/io/p/io_r2pipe.c
@@ -17,8 +17,9 @@ static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	char *bufn, bufnum[4096];
 	int i, rv, rescount = -1;
 	char *res, *r;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	bufn = bufnum;
 	*bufn = 0;
 	for (i=0; i<count; i++) {
@@ -116,8 +117,9 @@ beach:
 }
 
 static int __close(RIODesc *fd) {
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	r2p_free (fd->data);
 	fd->data = NULL;
 	return 0;
diff --git a/libr/io/p/io_r2web.c b/libr/io/p/io_r2web.c
index dcd6454231..85742abfad 100644
--- a/libr/io/p/io_r2web.c
+++ b/libr/io/p/io_r2web.c
@@ -17,11 +17,16 @@ typedef struct {
 static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	int code, rlen;
 	char *out, *url, *hexbuf;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
-	if (count * 3 < count) return -1;
+	}
+	if (count * 3 < count) {
+		return -1;
+	}
 	hexbuf = malloc (count * 3);
-	if (!hexbuf) return -1;
+	if (!hexbuf) {
+		return -1;
+	}
 	hexbuf[0] = 0;
 	r_hex_bin2str (buf, count, hexbuf);
 	url = r_str_newf ("%s/wx%%20%s@%"PFMT64d,
@@ -37,18 +42,23 @@ static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	int code, rlen;
 	char *out, *url;
 	int ret = 0;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	url = r_str_newf ("%s/p8%%20%d@%"PFMT64d,
 		rURL(fd), count, io->off);
 	out = r_socket_http_get (url, &code, &rlen);
 	if (out && rlen>0) {
 		ut8 *tmp = malloc (rlen+1);
-		if (!tmp) goto beach;
+		if (!tmp) {
+			goto beach;
+		}
 		ret = r_hex_str2bin (out, tmp);
 		memcpy (buf, tmp, R_MIN (count, rlen));
 		free (tmp);
-		if (ret<0) ret = -ret;
+		if (ret < 0) {
+			ret = -ret;
+		}
 	}
 
 beach:
@@ -59,8 +69,9 @@ beach:
 
 static int __close(RIODesc *fd) {
 	RIOR2Web *riom;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	riom = fd->data;
 	free (riom->url);
 	riom->url = NULL;
@@ -92,7 +103,9 @@ static RIODesc *__open(RIO *io, const char *pathname, int rw, int mode) {
 	int rlen, code;
 	if (__plugin_open (io, pathname, 0)) {
 		RIOR2Web *mal = R_NEW0 (RIOR2Web);
-		if (!mal) return NULL;
+		if (!mal) {
+			return NULL;
+		}
 		char *url = r_str_newf ("http://%s/?V", pathname+8);
 		//eprintf  ("URL:(%s)\n", url);
 		out = r_socket_http_get (url, &code, &rlen);
diff --git a/libr/io/p/io_rap.c b/libr/io/p/io_rap.c
index d60bcebc57..fac1dd0a10 100644
--- a/libr/io/p/io_rap.c
+++ b/libr/io/p/io_rap.c
@@ -97,7 +97,9 @@ static int rap__close(RIODesc *fd) {
 			free (fd->data);
 			fd->data = NULL;
 		}
-	} else eprintf ("rap__close: fdesc is not a r_io_rap plugin\n");
+	} else {
+		eprintf ("rap__close: fdesc is not a r_io_rap plugin\n");
+	}
 	return ret;
 }
 
@@ -334,7 +336,9 @@ static char *rap__system(RIO *io, RIODesc *fd, const char *command) {
 		int ir, tr = 0;
 		do {
 			ir = r_socket_read_block (s, (ut8*)ptr + tr, i - tr);
-			if (ir < 1) break;
+			if (ir < 1) {
+				break;
+			}
 			tr += ir;
 		} while (tr < i);
 		// TODO: use io->cb_printf() with support for \x00
diff --git a/libr/io/p/io_self.c b/libr/io/p/io_self.c
index 3337723230..49e6adadad 100644
--- a/libr/io/p/io_self.c
+++ b/libr/io/p/io_self.c
@@ -73,8 +73,9 @@ static int update_self_regions(RIO *io, int pid) {
 	char region[100], region2[100], perms[5];
 	snprintf (path, sizeof (path) - 1, "/proc/%d/maps", pid);
 	FILE *fd = fopen (path, "r");
-	if (!fd)
+	if (!fd) {
 		return false;
+	}
 
 	while (!feof (fd)) {
 		line[0]='\0';
@@ -129,8 +130,9 @@ static bool __plugin_open(RIO *io, const char *file, bool many) {
 
 static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
 	int ret, pid = getpid ();
-	if (r_sandbox_enable (0))
+	if (r_sandbox_enable (0)) {
 		return NULL;
+	}
 	io->va = true; // nop
 	ret = update_self_regions (io, pid);
 	if (ret) {
diff --git a/libr/io/p/io_shm.c b/libr/io/p/io_shm.c
index 1f5fa1f808..252f921e22 100644
--- a/libr/io/p/io_shm.c
+++ b/libr/io/p/io_shm.c
@@ -25,8 +25,9 @@ typedef struct {
 
 static int shm__write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	RIOShm *shm;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	shm = fd->data;
 	if (shm->buf != NULL) {
 		(void)memcpy (shm->buf+io->off, buf, count);
@@ -37,24 +38,28 @@ static int shm__write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 
 static int shm__read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	RIOShm *shm;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	shm = fd->data;
 	if (io->off+count >= shm->size) {
-		if (io->off > shm->size)
+		if (io->off > shm->size) {
 			return -1;
+		}
 		count = shm->size - io->off;
 	}
-	if (count>32)
+	if (count > 32) {
 		count = 32;
+	}
 	memcpy (buf, shm->buf+io->off , count);
 	return count;
 }
 
 static int shm__close(RIODesc *fd) {
 	int ret;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	ret = shmdt (((RIOShm*)(fd->data))->buf);
 	free (fd->data);
 	fd->data = NULL;
@@ -63,15 +68,17 @@ static int shm__close(RIODesc *fd) {
 
 static ut64 shm__lseek(RIO *io, RIODesc *fd, ut64 offset, int whence) {
 	RIOShm *shm;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	shm = fd->data;
 	switch (whence) {
 	case SEEK_SET:
 		return offset;
 	case SEEK_CUR:
-		if (io->off+offset>shm->size)
+		if (io->off + offset > shm->size) {
 			return shm->size;
+		}
 		return io->off + offset;
 	case SEEK_END:
 		return 0xffffffff;
@@ -94,7 +101,9 @@ static inline int getshmfd (RIOShm *shm) {
 static RIODesc *shm__open(RIO *io, const char *pathname, int rw, int mode) {
 	if (!strncmp (pathname, "shm://", 6)) {
 		RIOShm *shm = R_NEW0 (RIOShm);
-		if (!shm) return NULL;
+		if (!shm) {
+			return NULL;
+		}
 		const char *ptr = pathname+6;
 		shm->id = getshmid (ptr);
 		shm->buf = shmat (shm->id, 0, 0);
diff --git a/libr/io/p/io_sparse.c b/libr/io/p/io_sparse.c
index ea1a3a986c..2ef61917d6 100644
--- a/libr/io/p/io_sparse.c
+++ b/libr/io/p/io_sparse.c
@@ -20,8 +20,9 @@ typedef struct {
 static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	ut64 o;
 	RBuffer *b;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	b = RIOSPARSE_BUF(fd);
 	o = RIOSPARSE_OFF(fd);
 	return r_buf_write_at (b, o, buf, count);
@@ -30,8 +31,9 @@ static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	ut64 o;
 	RBuffer *b;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	b = RIOSPARSE_BUF(fd);
 	o = RIOSPARSE_OFF(fd);
 	(void)r_buf_read_at (b, o, buf, count);
@@ -40,8 +42,9 @@ static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 
 static int __close(RIODesc *fd) {
 	RIOSparse *riom;
-	if (!fd || !fd->data)
+	if (!fd || !fd->data) {
 		return -1;
+	}
 	riom = fd->data;
 	free (riom->buf);
 	riom->buf = NULL;
@@ -53,8 +56,9 @@ static int __close(RIODesc *fd) {
 static ut64 __lseek(RIO* io, RIODesc *fd, ut64 offset, int whence) {
 	RBuffer *b;
 	ut64 r_offset = offset;
-	if (!fd->data)
+	if (!fd->data) {
 		return offset;
+	}
 	b = RIOSPARSE_BUF(fd);
 	r_offset = r_buf_seek (b, offset, whence);
 	//if (r_offset != UT64_MAX)
diff --git a/libr/io/p/io_windbg.c b/libr/io/p/io_windbg.c
index 176c473c65..8b6dd86fd9 100644
--- a/libr/io/p/io_windbg.c
+++ b/libr/io/p/io_windbg.c
@@ -83,8 +83,9 @@ static int __read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 
 	if (windbg_get_target (fd->data)) {
 		ut64 va;
-		if (!windbg_va_to_pa (fd->data, io->off, &va))
+		if (!windbg_va_to_pa (fd->data, io->off, &va)) {
 			return -1;
+		}
 		return windbg_read_at_phys (fd->data, buf, va, count);
 	}
 
diff --git a/libr/io/p/io_zip.c b/libr/io/p/io_zip.c
index d4a5c52b8c..9317829abb 100644
--- a/libr/io/p/io_zip.c
+++ b/libr/io/p/io_zip.c
@@ -186,12 +186,15 @@ int r_io_zip_flush_file(RIOZipFileObj *zfo) {
 	int res = false;
 	struct zip * zipArch;
 
-	if (!zfo) return res;
+	if (!zfo) {
+		return res;
+	}
 
 	zipArch = r_io_zip_open_archive (
 		zfo->archivename, zfo->flags, zfo->mode, zfo->rw);
-	if (!zipArch)
+	if (!zipArch) {
 		return res;
+	}
 
 	struct zip_source *s = zip_source_buffer (zipArch, zfo->b->buf, zfo->b->length, 0);
 	if (s && zfo->entry != -1) {
@@ -206,12 +209,16 @@ int r_io_zip_flush_file(RIOZipFileObj *zfo) {
 	}
 	// s (zip_source) is freed when the archive is closed, i think - dso
 	zip_close (zipArch);
-	if (s) zip_source_free (s);
+	if (s) {
+		zip_source_free (s);
+	}
 	return res;
 }
 
 static void r_io_zip_free_zipfileobj(RIOZipFileObj *zfo) {
-	if (!zfo) return;
+	if (!zfo) {
+		return;
+	}
 	if (zfo->modified) {
 		r_io_zip_flush_file (zfo);
 	}
@@ -242,7 +249,9 @@ RIOZipFileObj* r_io_zip_alloc_zipfileobj(const char *archivename, const char *fi
 	ut64 i, num_entries;
 	struct zip_stat sb;
 	struct zip *zipArch = r_io_zip_open_archive (archivename, flags, mode, rw);
-	if (!zipArch) return NULL;
+	if (!zipArch) {
+		return NULL;
+	}
 	num_entries = zip_get_num_files (zipArch);
 
 	for (i = 0; i < num_entries; i++) {
@@ -280,7 +289,9 @@ static RList *r_io_zip_open_many(RIO *io, const char *file, int rw, int mode) {
 	}
 
 	zip_uri = strdup (file);
-	if (!zip_uri) return NULL;
+	if (!zip_uri) {
+		return NULL;
+	}
 	// 1) Tokenize to the '//' and find the base file directory ('/')
 	zip_filename = strstr(zip_uri, "//");
 	if (zip_filename && zip_filename[2]) {
@@ -305,14 +316,16 @@ static RList *r_io_zip_open_many(RIO *io, const char *file, int rw, int mode) {
 	r_list_foreach (filenames, iter, filename_in_zipfile) {
 		size_t v = strlen (filename_in_zipfile);
 
-		if (filename_in_zipfile[v-1] == '/') continue;
+		if (filename_in_zipfile[v - 1] == '/') {
+			continue;
+		}
 
 		zfo = r_io_zip_alloc_zipfileobj (zip_filename,
 			filename_in_zipfile, ZIP_CREATE, mode, rw);
 
-
-		if (zfo && zfo->entry == -1)
+		if (zfo && zfo->entry == -1) {
 			eprintf ("Warning: File did not exist, creating a new one.\n");
+		}
 
 		if (zfo) {
 			zfo->io_backref = io;
@@ -532,11 +545,13 @@ static ut64 r_io_zip_lseek(RIO *io, RIODesc *fd, ut64 offset, int whence) {
 
 static int r_io_zip_read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
 	RIOZipFileObj *zfo = NULL;
-	if (!fd || !fd->data || !buf)
+	if (!fd || !fd->data || !buf) {
 		return -1;
+	}
 	zfo = fd->data;
-	if (zfo->b->length < io->off)
+	if (zfo->b->length < io->off) {
 		io->off = zfo->b->length;
+	}
 	return r_buf_read_at (zfo->b, io->off, buf, count);
 }
 
diff --git a/libr/io/undo.c b/libr/io/undo.c
index 5e5ef43908..1b8c95c8a3 100644
--- a/libr/io/undo.c
+++ b/libr/io/undo.c
@@ -194,8 +194,9 @@ R_API RList *r_io_sundo_list(RIO *io, int mode) {
 
 R_API void r_io_wundo_new(RIO *io, ut64 off, const ut8 *data, int len) {
 	RIOUndoWrite *uw;
-	if (!io->undo.w_enable)
+	if (!io->undo.w_enable) {
 		return;
+	}
 	/* undo write changes */
 	uw = R_NEW0 (RIOUndoWrite);
 	if (!uw) {
@@ -237,17 +238,26 @@ R_API void r_io_wundo_list(RIO *io) {
 	RIOUndoWrite *u;
 	int i = 0, j, len;
 
-	if (io->undo.w_init)
-	r_list_foreach (io->undo.w_list, iter, u) {
-		io->cb_printf ("%02d %c %d %08"PFMT64x": ", i, u->set?'+':'-', u->len, u->off);
-		len = (u->len>BW)?BW:u->len;
-		for (j=0;j<len;j++) io->cb_printf ("%02x ", u->o[j]);
-		if (len == BW) io->cb_printf (".. ");
-		io->cb_printf ("=> ");
-		for (j=0;j<len;j++) io->cb_printf ("%02x ", u->n[j]);
-		if (len == BW) io->cb_printf (".. ");
-		io->cb_printf ("\n");
-		i++;
+	if (io->undo.w_init) {
+		r_list_foreach (io->undo.w_list, iter, u) {
+			io->cb_printf ("%02d %c %d %08" PFMT64x ": ", i, u->set ? '+' : '-', u->len, u->off);
+			len = (u->len > BW) ? BW : u->len;
+			for (j = 0; j < len; j++) {
+				io->cb_printf ("%02x ", u->o[j]);
+			}
+			if (len == BW) {
+				io->cb_printf (".. ");
+			}
+			io->cb_printf ("=> ");
+			for (j = 0; j < len; j++) {
+				io->cb_printf ("%02x ", u->n[j]);
+			}
+			if (len == BW) {
+				io->cb_printf (".. ");
+			}
+			io->cb_printf ("\n");
+			i++;
+		}
 	}
 }
 
diff --git a/libr/lang/lang.c b/libr/lang/lang.c
index 7379fe069b..26a8268af2 100644
--- a/libr/lang/lang.c
+++ b/libr/lang/lang.c
@@ -157,7 +157,9 @@ R_API RLangPlugin *r_lang_get_by_extension (RLang *lang, const char *ext) {
 	RListIter *iter;
 	RLangPlugin *h;
 	const char *p = r_str_lchr (ext, '.');
-	if (p) ext = p + 1;
+	if (p) {
+		ext = p + 1;
+	}
 	r_list_foreach (lang->langs, iter, h) {
 		if (!r_str_casecmp (h->ext, ext)) {
 			return h;
@@ -301,14 +303,18 @@ R_API int r_lang_prompt(RLang *lang) {
 				"  . file   - interpret file\n"
 				"  q        - quit prompt\n");
 			eprintf ("%s example:\n", lang->cur->name);
-			if (lang->cur->help)
+			if (lang->cur->help) {
 				eprintf ("%s", *lang->cur->help);
-			if (!r_list_empty (lang->defs))
+			}
+			if (!r_list_empty (lang->defs)) {
 				eprintf ("variables:\n");
+			}
 			r_list_foreach (lang->defs, iter, def) {
 				eprintf ("  %s %s\n", def->type, def->name);
 			}
-		} else r_lang_run (lang, buf, strlen (buf));
+		} else {
+			r_lang_run (lang, buf, strlen (buf));
+		}
 	}
 	// XXX: leaking history
 	r_line_set_prompt (prompt);
diff --git a/libr/magic/apprentice.c b/libr/magic/apprentice.c
index 9ebe8666dd..da7ed84558 100644
--- a/libr/magic/apprentice.c
+++ b/libr/magic/apprentice.c
@@ -153,7 +153,9 @@ static int get_type(const char *l, const char **t) {
 
 	for (p = type_tbl; p->len; p++) {
 		if (strncmp (l, p->name, p->len) == 0) {
-			if (t) *t = l + p->len;
+			if (t) {
+				*t = l + p->len;
+			}
 			break;
 		}
 	}
@@ -186,7 +188,9 @@ static int apprentice_1(RMagic *ms, const char *fn, int action, struct mlist *ml
 	int rv = -1;
 	int mapped;
 
-	if (!ms) return -1;
+	if (!ms) {
+		return -1;
+	}
 	ms->haderr = 0;
 	if (magicsize != FILE_MAGICSIZE) {
 		file_error(ms, 0, "magic element size %lu != %lu",
@@ -198,8 +202,9 @@ static int apprentice_1(RMagic *ms, const char *fn, int action, struct mlist *ml
 	ms->file = fn; // fix use of ms->file before being initialized
 	if (action == FILE_COMPILE) {
 		rv = apprentice_load (ms, &magic, &nmagic, fn, action);
-		if (rv != 0)
+		if (rv != 0) {
 			return -1;
+		}
 		rv = apprentice_compile (ms, &magic, &nmagic, fn);
 		free (magic);
 		return rv;
@@ -209,8 +214,9 @@ static int apprentice_1(RMagic *ms, const char *fn, int action, struct mlist *ml
 		//if (ms->flags & R_MAGIC_CHECK)
 		//	file_magwarn(ms, "using regular magic file `%s'", fn);
 		rv = apprentice_load (ms, &magic, &nmagic, fn, action);
-		if (rv != 0)
+		if (rv != 0) {
 			return -1;
+		}
 	}
 
 	mapped = rv;
@@ -238,8 +244,8 @@ static int apprentice_1(RMagic *ms, const char *fn, int action, struct mlist *ml
 }
 
 void file_delmagic(struct r_magic *p, int type, size_t entries) {
-	if (p)
-	switch (type) {
+	if (p) {
+		switch (type) {
 #ifdef QUICK
 	case 2:
 		p--;
@@ -256,6 +262,7 @@ void file_delmagic(struct r_magic *p, int type, size_t entries) {
 	default:
 		abort ();
 	}
+	}
 }
 
 /* const char *fn: list of magic files and directories */
@@ -266,8 +273,12 @@ struct mlist * file_apprentice(RMagic *ms, const char *fn, int action) {
 
 	init_file_tables ();
 
-	if (!fn) fn = getenv ("MAGIC");
-	if (!fn) fn = MAGICFILE;
+	if (!fn) {
+		fn = getenv ("MAGIC");
+	}
+	if (!fn) {
+		fn = MAGICFILE;
+	}
 
 	if (!(mfn = strdup (fn))) {
 		file_oomem (ms, strlen (fn));
@@ -284,8 +295,12 @@ struct mlist * file_apprentice(RMagic *ms, const char *fn, int action) {
 
 	while (fn) {
 		p = strchr (fn, PATHSEP);
-		if (p) *p++ = '\0';
-		if (*fn == '\0') break;
+		if (p) {
+			*p++ = '\0';
+		}
+		if (*fn == '\0') {
+			break;
+		}
 		file_err = apprentice_1 (ms, fn, action, mlist);
 		errs = R_MAX (errs, file_err);
 		fn = p;
@@ -401,8 +416,12 @@ static int apprentice_sort(const void *a, const void *b) {
 	const struct r_magic_entry *mb = b;
 	size_t sa = apprentice_r_magic_strength (ma->mp);
 	size_t sb = apprentice_r_magic_strength (mb->mp);
-	if (sa == sb) return 0;
-	if (sa > sb) return -1;
+	if (sa == sb) {
+		return 0;
+	}
+	if (sa > sb) {
+		return -1;
+	}
 	return 1;
 }
 
@@ -449,8 +468,9 @@ static void set_test_type(struct r_magic *mstart, struct r_magic *m) {
 	case FILE_REGEX:
 	case FILE_SEARCH:
 		/* binary test if pattern is not text */
-		if (file_looks_utf8 ((const ut8 *)m->value.s, m->vallen, NULL, NULL) == 0)
+		if (file_looks_utf8 ((const ut8 *)m->value.s, m->vallen, NULL, NULL) == 0) {
 			mstart->flag |= BINTEST;
+		}
 		break;
 	case FILE_DEFAULT:
 		/* can't deduce anything; we shouldn't see this at the
@@ -471,33 +491,39 @@ static void load_1(RMagic *ms, int action, const char *file, int *errs, struct r
 	size_t lineno = 0;
 	FILE *f = r_sandbox_fopen (ms->file = file, "r");
 	if (!f) {
-		if (errno != ENOENT)
+		if (errno != ENOENT) {
 			file_error (ms, errno, "cannot read magic file `%s'", file);
+		}
 		(*errs)++;
 	} else {
 		/* read and parse this file */
 		for (ms->line = 1; fgets (line, sizeof (line), f) != NULL; ms->line++) {
 			size_t len = strlen (line);
-			if (len == 0) /* null line, garbage, etc */
+			if (len == 0) { /* null line, garbage, etc */
 				continue;
+			}
 			if (line[len - 1] == '\n') {
 				lineno++;
 				line[len - 1] = '\0'; /* delete newline */
 			}
-			if (line[0] == '\0')	/* empty, do not parse */
+			if (line[0] == '\0') { /* empty, do not parse */
 				continue;
-			if (line[0] == '#')	/* comment, do not parse */
+			}
+			if (line[0] == '#') { /* comment, do not parse */
 				continue;
+			}
 			if (len > mime_marker_len &&
 			    memcmp (line, mime_marker, mime_marker_len) == 0) {
 				/* MIME type */
 				if (parse_mime (ms, marray, marraycount,
-					       line + mime_marker_len) != 0)
+					    line + mime_marker_len) != 0) {
 					(*errs)++;
+				}
 				continue;
 			}
-			if (parse (ms, marray, marraycount, line, lineno, action) != 0)
+			if (parse (ms, marray, marraycount, line, lineno, action) != 0) {
 				(*errs)++;
+			}
 		}
 		fclose (f);
 	}
@@ -534,8 +560,9 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 	marraycount = 0;
 
 	/* print silly verbose header for USG compat. */
-	if (action == FILE_CHECK)
+	if (action == FILE_CHECK) {
 		eprintf ("%s\n", usg_hdr);
+	}
 
 	/* load directory or file */
 	if (stat (fn, &st) == 0 && S_ISDIR (st.st_mode)) {
@@ -568,10 +595,13 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 		dir = opendir (fn);
 		if (dir) {
 			while ((d = readdir (dir))) {
-				if (*d->d_name=='.') continue;
+				if (*d->d_name == '.') {
+					continue;
+				}
 				snprintf (subfn, sizeof (subfn), "%s/%s", fn, d->d_name);
-				if (stat (subfn, &st) == 0 && S_ISREG (st.st_mode))
+				if (stat (subfn, &st) == 0 && S_ISREG (st.st_mode)) {
 					load_1 (ms, action, subfn, &errs, &marray, &marraycount);
+				}
 				//else perror (subfn);
 			}
 			closedir (dir);
@@ -579,9 +609,12 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 			errs++;
 		}
 #endif
-	} else load_1 (ms, action, fn, &errs, &marray, &marraycount);
-	if (errs)
+	} else {
+		load_1 (ms, action, fn, &errs, &marray, &marraycount);
+	}
+	if (errs) {
 		goto out;
+	}
 
 	/* Set types of tests */
 	for (i = 0; i < marraycount; ) {
@@ -624,9 +657,11 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 	for (i = 0; i < marraycount; i++) {
 		if (marray[i].mp->cont_level == 0 &&
 		    marray[i].mp->type == FILE_DEFAULT) {
-			while (++i < marraycount)
-				if (marray[i].mp->cont_level == 0)
+			while (++i < marraycount) {
+				if (marray[i].mp->cont_level == 0) {
 					break;
+				}
+			}
 			if (i != marraycount) {
 				ms->line = marray[i].mp->lineno; /* XXX - Ugh! */
 				file_magwarn (ms, "level 0 \"default\" did not sort last");
@@ -635,8 +670,9 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 		}
 	}
 
-	for (i = 0; i < marraycount; i++)
+	for (i = 0; i < marraycount; i++) {
 		mentrycount += marray[i].cont_count;
+	}
 
 	if (!(*magicp = malloc (1 + (sizeof (**magicp) * mentrycount)))) {
 		file_oomem (ms, sizeof (**magicp) * mentrycount);
@@ -651,8 +687,9 @@ static int apprentice_load(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, c
 		mentrycount += marray[i].cont_count;
 	}
 out:
-	for (i = 0; i < marraycount; i++)
-		free(marray[i].mp);
+	for (i = 0; i < marraycount; i++) {
+		free (marray[i].mp);
+	}
 	free (marray);
 	if (errs) {
 		*magicp = NULL;
@@ -722,9 +759,10 @@ ut64 file_signextend(RMagic *ms, struct r_magic *m, ut64 v) {
 		case FILE_DEFAULT:
 			break;
 		default:
-			if (ms->flags & R_MAGIC_CHECK)
-			    file_magwarn(ms, "cannot happen: m->type=%d\n",
-				    m->type);
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "cannot happen: m->type=%d\n",
+					m->type);
+			}
 			return ~0U;
 		}
 	}
@@ -732,8 +770,9 @@ ut64 file_signextend(RMagic *ms, struct r_magic *m, ut64 v) {
 }
 
 static int string_modifier_check(RMagic *ms, struct r_magic *m) {
-	if ((ms->flags & R_MAGIC_CHECK) == 0)
+	if ((ms->flags & R_MAGIC_CHECK) == 0) {
 		return 0;
+	}
 
 	switch (m->type) {
 	case FILE_BESTRING16:
@@ -812,7 +851,9 @@ static int get_cond(const char *l, const char **t) {
 	for (p = cond_tbl; p->len; p++) {
 		if (strncmp (l, p->name, p->len) == 0 &&
 				isspace ((ut8)l[p->len])) {
-			if (t) *t = l + p->len;
+			if (t) {
+				*t = l + p->len;
+			}
 			break;
 		}
 	}
@@ -826,24 +867,27 @@ static int check_cond(RMagic *ms, int cond, ut32 cont_level) {
 	switch (cond) {
 	case COND_IF:
 		if (last_cond != COND_NONE && last_cond != COND_ELIF) {
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms, "syntax error: `if'");
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "syntax error: `if'");
+			}
 			return -1;
 		}
 		last_cond = COND_IF;
 		break;
 	case COND_ELIF:
 		if (last_cond != COND_IF && last_cond != COND_ELIF) {
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms, "syntax error: `elif'");
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "syntax error: `elif'");
+			}
 			return -1;
 		}
 		last_cond = COND_ELIF;
 		break;
 	case COND_ELSE:
 		if (last_cond != COND_IF && last_cond != COND_ELIF) {
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms, "syntax error: `else'");
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "syntax error: `else'");
+			}
 			return -1;
 		}
 		last_cond = COND_NONE;
@@ -870,10 +914,14 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 	int op;
 	ut32 cont_level = 0;
 
-	for (; *l == '>'; l++, cont_level++);
-	if (cont_level == 0 || cont_level > last_cont_level)
-		if (file_check_mem (ms, cont_level) == -1)
+	for (; *l == '>'; l++, cont_level++) {
+		;
+	}
+	if (cont_level == 0 || cont_level > last_cont_level) {
+		if (file_check_mem (ms, cont_level) == -1) {
 			return -1;
+		}
+	}
 	last_cont_level = cont_level;
 #define ALLOC_CHUNK	(size_t)10
 #define ALLOC_INCR	(size_t)200
@@ -917,8 +965,9 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 			}
 			me->mp = m;
 			me->max_count = ALLOC_CHUNK;
-		} else
+		} else {
 			m = me->mp;
+		}
 		(void)memset(m, 0, sizeof (*m));
 		m->cont_level = 0;
 		me->cont_count = 1;
@@ -932,8 +981,9 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 	if (*l == '(') {
 		++l;		/* step over */
 		m->flag |= INDIR;
-		if (m->flag & OFFADD)
+		if (m->flag & OFFADD) {
 			m->flag = (m->flag & ~OFFADD) | INDIROFFADD;
+		}
 
 		if (*l == '&') {  /* m->cont_level == 0 checked below */
 			++l;            /* step over */
@@ -941,15 +991,18 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 		}
 	}
 	/* Indirect offsets are not valid at level 0. */
-	if (m->cont_level == 0 && (m->flag & (OFFADD | INDIROFFADD)))
-		if (ms->flags & R_MAGIC_CHECK)
-			file_magwarn(ms, "relative offset at level 0");
+	if (m->cont_level == 0 && (m->flag & (OFFADD | INDIROFFADD))) {
+		if (ms->flags & R_MAGIC_CHECK) {
+			file_magwarn (ms, "relative offset at level 0");
+		}
+	}
 
 	/* get offset, then skip over it */
 	m->offset = (ut32)strtoul(l, &t, 0);
-        if ((l == t) && (ms->flags & R_MAGIC_CHECK))
-		file_magwarn(ms, "offset `%s' invalid", l);
-        l = t;
+	if ((l == t) && (ms->flags & R_MAGIC_CHECK)) {
+		file_magwarn (ms, "offset `%s' invalid", l);
+	}
+	l = t;
 
 	if (m->flag & INDIR) {
 		m->in_type = FILE_LONG;
@@ -994,10 +1047,11 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 				m->in_type = FILE_BEDOUBLE;
 				break;
 			default:
-				if (ms->flags & R_MAGIC_CHECK)
-					file_magwarn(ms,
-					    "indirect offset type `%c' invalid",
-					    *l);
+				if (ms->flags & R_MAGIC_CHECK) {
+					file_magwarn (ms,
+						"indirect offset type `%c' invalid",
+						*l);
+				}
 				break;
 			}
 			l++;
@@ -1018,23 +1072,28 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 		}
 		if (isdigit((ut8)*l) || *l == '-') {
 			m->in_offset = (int32_t)strtol(l, &t, 0);
-			if (l == t)
-				if (ms->flags & R_MAGIC_CHECK)
-					file_magwarn(ms,
-					    "in_offset `%s' invalid", l);
+			if (l == t) {
+				if (ms->flags & R_MAGIC_CHECK) {
+					file_magwarn (ms,
+						"in_offset `%s' invalid", l);
+				}
+			}
 			l = t;
 		}
 		if (*l++ != ')' ||
-		    ((m->in_op & FILE_OPINDIRECT) && *l++ != ')'))
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms,
-				    "missing ')' in indirect offset");
+			((m->in_op & FILE_OPINDIRECT) && *l++ != ')')) {
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms,
+					"missing ')' in indirect offset");
+			}
+		}
 	}
 	EATAB;
 
 	m->cond = get_cond(l, &l);
-	if (check_cond(ms, m->cond, cont_level) == -1)
+	if (check_cond (ms, m->cond, cont_level) == -1) {
 		return -1;
+	}
 	EATAB;
 
 	if (*l == 'u') {
@@ -1044,8 +1103,9 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 
 	m->type = get_type(l, &l);
 	if (m->type == FILE_INVALID) {
-		if (ms->flags & R_MAGIC_CHECK)
-			file_magwarn(ms, "type `%s' invalid", l);
+		if (ms->flags & R_MAGIC_CHECK) {
+			file_magwarn (ms, "type `%s' invalid", l);
+		}
 		return -1;
 	}
 
@@ -1054,10 +1114,11 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 
 	m->mask_op = 0;
 	if (*l == '~') {
-		if (!MAGIC_IS_STRING (m->type))
+		if (!MAGIC_IS_STRING (m->type)) {
 			m->mask_op |= FILE_OPINVERSE;
-		else if (ms->flags & R_MAGIC_CHECK)
+		} else if (ms->flags & R_MAGIC_CHECK) {
 			file_magwarn (ms, "'~' invalid for string types");
+		}
 		++l;
 	}
 	m->str_range = 0;
@@ -1082,14 +1143,16 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 				case '6':  case '7':  case '8':
 				case '9':
 					if (have_range &&
-					    (ms->flags & R_MAGIC_CHECK))
-						file_magwarn(ms,
-						    "multiple ranges");
+						(ms->flags & R_MAGIC_CHECK)) {
+						file_magwarn (ms,
+							"multiple ranges");
+					}
 					have_range = 1;
 					m->str_range = strtoul(l, &t, 0);
-					if (m->str_range == 0)
-						file_magwarn(ms,
-						    "zero range");
+					if (m->str_range == 0) {
+						file_magwarn (ms,
+							"zero range");
+					}
 					l = t - 1;
 					break;
 				case CHAR_COMPACT_BLANK:
@@ -1109,21 +1172,25 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 					m->str_flags |= REGEX_OFFSET_START;
 					break;
 				default:
-					if (ms->flags & R_MAGIC_CHECK)
-						file_magwarn(ms,
-						"string extension `%c' invalid",
-						*l);
+					if (ms->flags & R_MAGIC_CHECK) {
+						file_magwarn (ms,
+							"string extension `%c' invalid",
+							*l);
+					}
 					return -1;
 				}
 				/* allow multiple '/' for readability */
-				if (l[1] == '/' && !isspace ((ut8)l[2]))
+				if (l[1] == '/' && !isspace ((ut8)l[2])) {
 					l++;
+				}
 			}
-			if (string_modifier_check(ms, m) == -1)
+			if (string_modifier_check (ms, m) == -1) {
 				return -1;
+			}
 		} else {
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms, "invalid string op: %c", *t);
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "invalid string op: %c", *t);
+			}
 			return -1;
 		}
 	}
@@ -1163,8 +1230,9 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 	/*
 	 * Grab the value part, except for an 'x' reln.
 	 */
-	if (m->reln != 'x' && getvalue (ms, m, &l, action))
+	if (m->reln != 'x' && getvalue (ms, m, &l, action)) {
 		return -1;
+	}
 
 	/*
 	 * TODO finish this macro and start using it!
@@ -1184,26 +1252,32 @@ static int parse(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp, con
 		++l;
 		m->flag |= NOSPACE;
 	}
-	for (i = 0; (m->desc[i++] = *l++) != '\0' && i < sizeof (m->desc); )
+	for (i = 0; (m->desc[i++] = *l++) != '\0' && i < sizeof (m->desc);) {
 		continue;
+	}
 	if (i == sizeof (m->desc)) {
 		m->desc[sizeof (m->desc) - 1] = '\0';
-		if (ms->flags & R_MAGIC_CHECK)
-			file_magwarn(ms, "description `%s' truncated", m->desc);
+		if (ms->flags & R_MAGIC_CHECK) {
+			file_magwarn (ms, "description `%s' truncated", m->desc);
+		}
 	}
 
         /*
 	 * We only do this check while compiling, or if any of the magic
 	 * files were not compiled.
          */
-        if (ms->flags & R_MAGIC_CHECK)
-		if (check_format (ms, m) == -1)
+	if (ms->flags & R_MAGIC_CHECK) {
+		if (check_format (ms, m) == -1) {
 			return -1;
-	if (action == FILE_CHECK)
+		}
+	}
+	if (action == FILE_CHECK) {
 		file_mdump (m);
+	}
 	m->mimetype[0] = '\0';		/* initialise MIME type to none */
-	if (m->cont_level == 0)
-		++(*nmentryp);		/* make room for next */
+	if (m->cont_level == 0) {
+		++(*nmentryp); /* make room for next */
+	}
 	return 0;
 }
 
@@ -1233,16 +1307,19 @@ static int parse_mime(RMagic *ms, struct r_magic_entry **mentryp, ut32 *nmentryp
 
 	EATAB;
 	for (i = 0;
-	     *l && ((isascii((ut8)*l) && isalnum((ut8)*l))
-	     || strchr("-+/.", *l)) && i < sizeof (m->mimetype);
-	     m->mimetype[i++] = *l++)
+		*l && ((isascii ((ut8)*l) && isalnum ((ut8)*l)) || strchr ("-+/.", *l)) && i < sizeof (m->mimetype);
+		m->mimetype[i++] = *l++) {
 		continue;
+	}
 	if (i == sizeof (m->mimetype)) {
 		m->desc[sizeof (m->mimetype) - 1] = '\0';
-		if (ms->flags & R_MAGIC_CHECK)
-			file_magwarn(ms, "MIME type `%s' truncated %zu",
-			    m->mimetype, i);
-	} else m->mimetype[i] = '\0';
+		if (ms->flags & R_MAGIC_CHECK) {
+			file_magwarn (ms, "MIME type `%s' truncated %zu",
+				m->mimetype, i);
+		}
+	} else {
+		m->mimetype[i] = '\0';
+	}
 
 	return (i>0)? 0: -1;
 }
@@ -1259,17 +1336,28 @@ static int check_format_type(const char *ptr, int type) {
 		quad = 1;
 		/*FALLTHROUGH*/
 	case FILE_FMT_NUM:
-		if (*ptr == '-')
+		if (*ptr == '-') {
 			ptr++;
-		if (*ptr == '.')
+		}
+		if (*ptr == '.') {
 			ptr++;
-		while (isdigit((ut8)*ptr)) ptr++;
-		if (*ptr == '.')
+		}
+		while (isdigit ((ut8)*ptr)) {
 			ptr++;
-		while (isdigit((ut8)*ptr)) ptr++;
+		}
+		if (*ptr == '.') {
+			ptr++;
+		}
+		while (isdigit ((ut8)*ptr)) {
+			ptr++;
+		}
 		if (quad) {
-			if (*ptr++ != 'l') return -1;
-			if (*ptr++ != 'l') return -1;
+			if (*ptr++ != 'l') {
+				return -1;
+			}
+			if (*ptr++ != 'l') {
+				return -1;
+			}
 		}
 		switch (*ptr++) {
 		case 'l':
@@ -1313,14 +1401,21 @@ static int check_format_type(const char *ptr, int type) {
 		}
 	case FILE_FMT_FLOAT:
 	case FILE_FMT_DOUBLE:
-		if (*ptr == '-')
+		if (*ptr == '-') {
 			ptr++;
-		if (*ptr == '.')
+		}
+		if (*ptr == '.') {
 			ptr++;
-		while (isdigit ((ut8)*ptr)) ptr++;
-		if (*ptr == '.')
+		}
+		while (isdigit ((ut8)*ptr)) {
 			ptr++;
-		while (isdigit ((ut8)*ptr)) ptr++;
+		}
+		if (*ptr == '.') {
+			ptr++;
+		}
+		while (isdigit ((ut8)*ptr)) {
+			ptr++;
+		}
 
 		switch (*ptr++) {
 		case 'e':
@@ -1335,18 +1430,22 @@ static int check_format_type(const char *ptr, int type) {
 			return -1;
 		}
 	case FILE_FMT_STR:
-		if (*ptr == '-')
+		if (*ptr == '-') {
 			ptr++;
-		while (isdigit ((ut8 )*ptr))
+		}
+		while (isdigit ((ut8)*ptr)) {
 			ptr++;
+		}
 		if (*ptr == '.') {
 			ptr++;
-			while (isdigit ((ut8 )*ptr))
+			while (isdigit ((ut8)*ptr)) {
 				ptr++;
+			}
 		}
 
-		if (*ptr++=='s')
+		if (*ptr++ == 's') {
 			return 0;
+		}
 		return -1;
 	default:
 		/* internal error */
@@ -1363,9 +1462,11 @@ static int check_format_type(const char *ptr, int type) {
 static int check_format(RMagic *ms, struct r_magic *m) {
 	char *ptr;
 
-	for (ptr = m->desc; *ptr; ptr++)
-		if (*ptr == '%')
+	for (ptr = m->desc; *ptr; ptr++) {
+		if (*ptr == '%') {
 			break;
+		}
+	}
 	if (*ptr == '\0') {
 		/* No format string; ok */
 		return 1;
@@ -1428,14 +1529,16 @@ static int getvalue(RMagic *ms, struct r_magic *m, const char **p, int action) {
 	case FILE_SEARCH:
 		*p = getstr(ms, *p, m->value.s, sizeof (m->value.s), &slen, action);
 		if (!*p) {
-			if (ms->flags & R_MAGIC_CHECK)
-				file_magwarn(ms, "cannot get string from `%s'",
-				    m->value.s);
+			if (ms->flags & R_MAGIC_CHECK) {
+				file_magwarn (ms, "cannot get string from `%s'",
+					m->value.s);
+			}
 			return -1;
 		}
 		m->vallen = slen;
-		if (m->type == FILE_PSTRING)
+		if (m->type == FILE_PSTRING) {
 			m->vallen++;
+		}
 		return 0;
 	case FILE_FLOAT:
 	case FILE_BEFLOAT:
@@ -1484,8 +1587,9 @@ static const char * getstr(RMagic *ms, const char *s, char *p, int plen, int *sl
 	int c, val;
 
 	while ((c = *s++) != '\0') {
-		if (isspace ((ut8) c))
+		if (isspace ((ut8)c)) {
 			break;
+		}
 		if (p >= pmax) {
 			file_error(ms, 0, "string too long: `%s'", origs);
 			return NULL;
@@ -1493,8 +1597,9 @@ static const char * getstr(RMagic *ms, const char *s, char *p, int plen, int *sl
 		if (c == '\\') {
 			switch ((c = *s++)) {
 			case '\0':
-				if (action == FILE_COMPILE)
-					file_magwarn(ms, "incomplete escape");
+				if (action == FILE_COMPILE) {
+					file_magwarn (ms, "incomplete escape");
+				}
 				goto out;
 			case '\t':
 				if (action == FILE_COMPILE) {
@@ -1505,12 +1610,13 @@ static const char * getstr(RMagic *ms, const char *s, char *p, int plen, int *sl
 				/*FALLTHROUGH*/
 			default:
 				if (action == FILE_COMPILE) {
-					if (isprint((ut8)c))
-					    file_magwarn(ms,
-						"no need to escape `%c'", c);
-					else
-					    file_magwarn(ms,
-						"unknown escape sequence: \\%03o", c);
+					if (isprint ((ut8)c)) {
+						file_magwarn (ms,
+							"no need to escape `%c'", c);
+					} else {
+						file_magwarn (ms,
+							"unknown escape sequence: \\%03o", c);
+					}
 				}
 				/*FALLTHROUGH*/
 			/* space, perhaps force people to use \040? */
@@ -1556,10 +1662,14 @@ static const char * getstr(RMagic *ms, const char *s, char *p, int plen, int *sl
 				if (c >= '0' && c <= '7') {
 					val = (val << 3) | (c - '0');
 					c = *s++;  /* try for 3 */
-					if (c >= '0' && c <= '7')
+					if (c >= '0' && c <= '7') {
 						val = (val << 3) | (c-'0');
-					else --s;
-				} else --s;
+					} else {
+						--s;
+					}
+				} else {
+					--s;
+				}
 				*p++ = (char)val;
 				break;
 
@@ -1570,14 +1680,20 @@ static const char * getstr(RMagic *ms, const char *s, char *p, int plen, int *sl
 				if (c >= 0) {
 					val = c;
 					c = hextoint(*s++);
-					if (c >= 0)
+					if (c >= 0) {
 						val = (val << 4) + c;
-					else --s;
-				} else --s;
+					} else {
+						--s;
+					}
+				} else {
+					--s;
+				}
 				*p++ = (char)val;
 				break;
 			}
-		} else *p++ = (char)c;
+		} else {
+			*p++ = (char)c;
+		}
 	}
 out:
 	*p = '\0';
@@ -1588,14 +1704,18 @@ out:
 
 /* Single hex char to int; -1 if not a hex char. */
 static int hextoint(int c) {
-	if (!isascii ((ut8) c))
+	if (!isascii ((ut8)c)) {
 		return -1;
-	if (isdigit ((ut8) c))
+	}
+	if (isdigit ((ut8)c)) {
 		return c - '0';
-	if ((c >= 'a') && (c <= 'f'))
+	}
+	if ((c >= 'a') && (c <= 'f')) {
 		return c + 10 - 'a';
-	if (( c>= 'A') && (c <= 'F'))
+	}
+	if ((c >= 'A') && (c <= 'F')) {
 		return c + 10 - 'A';
+	}
 	return -1;
 }
 
@@ -1607,15 +1727,17 @@ void file_showstr(FILE *fp, const char *s, size_t len) {
 	for (;;) {
 		char c = *s++;
 		if (len == ~0U) {
-			if (c == '\0')
+			if (c == '\0') {
 				break;
+			}
 		} else {
-			if (len-- == 0)
+			if (len-- == 0) {
 				break;
+			}
 		}
-		if (c >= 040 && c <= 0176)	/* TODO isprint && !iscntrl */
+		if (c >= 040 && c <= 0176) { /* TODO isprint && !iscntrl */
 			fputc (c, fp);
-		else {
+		} else {
 			fputc ('\\', fp);
 			switch (c) {
 			case '\a': fputc('a', fp); break;
@@ -1637,8 +1759,9 @@ void file_showstr(FILE *fp, const char *s, size_t len) {
 static void eatsize(const char **p) {
 	const char *l = *p;
 
-	if (LOWCASE (*l) == 'u')
+	if (LOWCASE (*l) == 'u') {
 		l++;
+	}
 
 	switch (LOWCASE (*l)) {
 	case 'l':    /* long */
@@ -1668,11 +1791,13 @@ static int apprentice_map(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, co
 	void *mm = NULL;
 
 	dbname = mkdbname (fn, 0);
-	if (!dbname)
+	if (!dbname) {
 		goto error2;
+	}
 
-	if ((fd = r_sandbox_open (dbname, O_RDONLY|O_BINARY, 0)) == -1)
+	if ((fd = r_sandbox_open (dbname, O_RDONLY | O_BINARY, 0)) == -1) {
 		goto error2;
+	}
 
 	if (fstat(fd, &st) == -1) {
 		file_error (ms, errno, "cannot stat `%s'", dbname);
@@ -1713,7 +1838,9 @@ static int apprentice_map(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, co
 			goto error1;
 		}
 		needsbyteswap = 1;
-	} else needsbyteswap = 0;
+	} else {
+		needsbyteswap = 0;
+	}
 
 	version = needsbyteswap? swap4(ptr[1]): ptr[1];
 	if (version != VERSIONNO) {
@@ -1723,17 +1850,20 @@ static int apprentice_map(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp, co
 		goto error1;
 	}
 	*nmagicp = (ut32)(st.st_size / sizeof (struct r_magic));
-	if (*nmagicp > 0)
+	if (*nmagicp > 0) {
 		(*nmagicp)--;
+	}
 	(*magicp)++;
-	if (needsbyteswap)
+	if (needsbyteswap) {
 		byteswap (*magicp, *nmagicp);
+	}
 	free (dbname);
 	return RET;
 
 error1:
-	if (fd != -1)
+	if (fd != -1) {
 		(void)close (fd);
+	}
 	if (mm) {
 #ifdef QUICK
 		(void)munmap((void *)mm, (size_t)st.st_size);
@@ -1763,8 +1893,9 @@ static int apprentice_compile(RMagic *ms, struct r_magic **magicp, ut32 *nmagicp
 
 	dbname = mkdbname(fn, 1);
 
-	if (!dbname) 
+	if (!dbname) {
 		goto out;
+	}
 
 	if ((fd = r_sandbox_open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) {
 		file_error(ms, errno, "cannot open `%s'", dbname);
@@ -1805,8 +1936,9 @@ static char *mkdbname(const char *fn, int strip) {
 	int fnlen, extlen;
 	if (strip) {
 		const char *p;
-		if ((p = strrchr(fn, '/')) != NULL)
+		if ((p = strrchr (fn, '/')) != NULL) {
 			fn = ++p;
+		}
 	}
 	fnlen = strlen (fn);
 	extlen = strlen (ext);
@@ -1827,8 +1959,9 @@ static char *mkdbname(const char *fn, int strip) {
  */
 static void byteswap(struct r_magic *magic, ut32 nmagic) {
 	ut32 i;
-	for (i = 0; i < nmagic; i++)
+	for (i = 0; i < nmagic; i++) {
 		bs1 (&magic[i]);
+	}
 }
 
 /*
diff --git a/libr/magic/ascmagic.c b/libr/magic/ascmagic.c
index 6f27192c69..f8be96dc1c 100644
--- a/libr/magic/ascmagic.c
+++ b/libr/magic/ascmagic.c
@@ -98,13 +98,16 @@ return 0;
 	 * Undo the NUL-termination kindly provided by process()
 	 * but leave at least one byte to look at
 	 */
-	while (nbytes > 1 && buf[nbytes - 1] == '\0')
+	while (nbytes > 1 && buf[nbytes - 1] == '\0') {
 		nbytes--;
+	}
 
-	if (!(nbuf = calloc(1, (nbytes + 1) * sizeof(nbuf[0]))))
+	if (!(nbuf = calloc (1, (nbytes + 1) * sizeof (nbuf[0])))) {
 		goto done;
-	if (!(ubuf = calloc(1, (nbytes + 1) * sizeof(ubuf[0]))))
+	}
+	if (!(ubuf = calloc (1, (nbytes + 1) * sizeof (ubuf[0])))) {
 		goto done;
+	}
 
 	/*
 	 * Then try to determine whether it's any character code we can
@@ -125,10 +128,11 @@ return 0;
 		code_mime = "utf-8";
 		type = "text";
 	} else if ((i = looks_ucs16(buf, nbytes, ubuf, &ulen)) != 0) {
-		if (i == 1)
+		if (i == 1) {
 			code = "Little-endian UTF-16 Unicode";
-		else
+		} else {
 			code = "Big-endian UTF-16 Unicode";
+		}
 
 		type = "character data";
 		code_mime = "utf-16";    /* is this defined? */
@@ -177,31 +181,37 @@ return 0;
 		file_oomem(ms, mlen);
 		goto done;
 	}
-	if (!(utf8_end = encode_utf8(utf8_buf, mlen, ubuf, ulen)))
+	if (!(utf8_end = encode_utf8 (utf8_buf, mlen, ubuf, ulen))) {
 		goto done;
+	}
 	if (file_softmagic(ms, utf8_buf, utf8_end - utf8_buf, TEXTTEST) != 0) {
 		rv = 1;
 		goto done;
 	}
 
 	/* look for tokens from names.h - this is expensive! */
-	if ((ms->flags & R_MAGIC_NO_CHECK_TOKENS) != 0)
+	if ((ms->flags & R_MAGIC_NO_CHECK_TOKENS) != 0) {
 		goto subtype_identified;
+	}
 
 	i = 0;
 	while (i < ulen) {
 		size_t end;
 
 		/* skip past any leading space */
-		while (i < ulen && ISSPC(ubuf[i]))
+		while (i < ulen && ISSPC (ubuf[i])) {
 			i++;
-		if (i >= ulen)
+		}
+		if (i >= ulen) {
 			break;
+		}
 
 		/* find the next whitespace */
-		for (end = i + 1; end < nbytes; end++)
-			if (ISSPC(ubuf[end]))
+		for (end = i + 1; end < nbytes; end++) {
+			if (ISSPC (ubuf[end])) {
 				break;
+			}
+		}
 
 		/* compare the word thus isolated against the token list */
 		for (p = names; p < names + NNAMES; p++) {
@@ -221,82 +231,101 @@ subtype_identified:
 	/* Now try to discover other details about the file. */
 	for (i = 0; i < ulen; i++) {
 		if (ubuf[i] == '\n') {
-			if (seen_cr)
+			if (seen_cr) {
 				n_crlf++;
-			else
+			} else {
 				n_lf++;
+			}
 			last_line_end = i;
-		} else if (seen_cr)
+		} else if (seen_cr) {
 			n_cr++;
+		}
 
 		seen_cr = (ubuf[i] == '\r');
-		if (seen_cr)
+		if (seen_cr) {
 			last_line_end = i;
+		}
 
 		if (ubuf[i] == 0x85) { /* X3.64/ECMA-43 "next line" character */
 			n_nel++;
 			last_line_end = i;
 		}
 		/* If this line is _longer_ than MAXLINELEN, remember it. */
-		if (i > last_line_end + MAXLINELEN)
+		if (i > last_line_end + MAXLINELEN) {
 			has_long_lines = 1;
+		}
 
-		if (ubuf[i] == '\033')
+		if (ubuf[i] == '\033') {
 			has_escapes = 1;
-		if (ubuf[i] == '\b')
+		}
+		if (ubuf[i] == '\b') {
 			has_backspace = 1;
+		}
 	}
 
 	/* Beware, if the data has been truncated, the final CR could have
 	   been followed by a LF.  If we have HOWMANY bytes, it indicates
 	   that the data might have been truncated, probably even before
 	   this function was called. */
-	if (seen_cr && nbytes < HOWMANY)
+	if (seen_cr && nbytes < HOWMANY) {
 		n_cr++;
+	}
 
 	if (mime) {
 		if (mime & R_MAGIC_MIME_TYPE) {
 			if (subtype_mime) {
-				if (file_printf(ms, subtype_mime) == -1)
+				if (file_printf (ms, subtype_mime) == -1) {
 					goto done;
+				}
 			} else {
-				if (file_printf(ms, "text/plain") == -1)
+				if (file_printf (ms, "text/plain") == -1) {
 					goto done;
+				}
 			}
 		}
 
 		if ((mime == 0 || mime == R_MAGIC_MIME) && code_mime) {
 			if ((mime & R_MAGIC_MIME_TYPE) &&
-			    file_printf(ms, " charset=") == -1)
+				file_printf (ms, " charset=") == -1) {
 				goto done;
-			if (file_printf(ms, code_mime) == -1)
+			}
+			if (file_printf (ms, code_mime) == -1) {
 				goto done;
+			}
 		}
 
-		if (mime == R_MAGIC_MIME_ENCODING)
-		    if (file_printf(ms, "binary") == -1){
-                rv = 1;
-                goto done;
-            }
+		if (mime == R_MAGIC_MIME_ENCODING) {
+			if (file_printf (ms, "binary") == -1) {
+				rv = 1;
+				goto done;
+			}
+		}
 	} else {
-		if (file_printf(ms, code) == -1)
+		if (file_printf (ms, code) == -1) {
 			goto done;
+		}
 
 		if (subtype) {
-			if (file_printf(ms, " ") == -1)
+			if (file_printf (ms, " ") == -1) {
 				goto done;
-			if (file_printf(ms, subtype) == -1)
+			}
+			if (file_printf (ms, subtype) == -1) {
 				goto done;
+			}
 		}
 
-		if (file_printf(ms, " ") == -1)
+		if (file_printf (ms, " ") == -1) {
 			goto done;
-		if (file_printf(ms, type) == -1)
+		}
+		if (file_printf (ms, type) == -1) {
 			goto done;
+		}
 
-		if (has_long_lines)
-			if (file_printf(ms, ", with very long lines") == -1)
+		if (has_long_lines) {
+			if (file_printf (ms, ", with very long lines") == -1) {
 				goto done;
+			}
+		}
 
 		/*
 		 * Only report line terminators if we find one other than LF,
@@ -304,49 +333,67 @@ subtype_identified:
 		 */
 		if ((n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) ||
 		    (n_crlf != 0 || n_cr != 0 || n_nel != 0)) {
-			if (file_printf(ms, ", with") == -1)
+			if (file_printf (ms, ", with") == -1) {
 				goto done;
-
-			if (n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0)			{
-				if (file_printf(ms, " no") == -1)
-					goto done;
-			} else {
-				if (n_crlf) {
-					if (file_printf(ms, " CRLF") == -1)
-						goto done;
-					if (n_cr || n_lf || n_nel)
-						if (file_printf(ms, ",") == -1)
-							goto done;
-				}
-				if (n_cr) {
-					if (file_printf(ms, " CR") == -1)
-						goto done;
-					if (n_lf || n_nel)
-						if (file_printf(ms, ",") == -1)
-							goto done;
-				}
-				if (n_lf) {
-					if (file_printf(ms, " LF") == -1)
-						goto done;
-					if (n_nel)
-						if (file_printf(ms, ",") == -1)
-							goto done;
-				}
-				if (n_nel)
-					if (file_printf(ms, " NEL") == -1)
-						goto done;
 			}
 
-			if (file_printf(ms, " line terminators") == -1)
+			if (n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0)			{
+				if (file_printf (ms, " no") == -1) {
+					goto done;
+				}
+			} else {
+				if (n_crlf) {
+					if (file_printf (ms, " CRLF") == -1) {
+						goto done;
+					}
+					if (n_cr || n_lf || n_nel) {
+						if (file_printf (ms, ",") == -1) {
+							goto done;
+						}
+					}
+				}
+				if (n_cr) {
+					if (file_printf (ms, " CR") == -1) {
+						goto done;
+					}
+					if (n_lf || n_nel) {
+						if (file_printf (ms, ",") == -1) {
+							goto done;
+						}
+					}
+				}
+				if (n_lf) {
+					if (file_printf (ms, " LF") == -1) {
+						goto done;
+					}
+					if (n_nel) {
+						if (file_printf (ms, ",") == -1) {
+							goto done;
+						}
+					}
+				}
+				if (n_nel) {
+					if (file_printf (ms, " NEL") == -1) {
+						goto done;
+					}
+				}
+			}
+
+			if (file_printf (ms, " line terminators") == -1) {
 				goto done;
+			}
 		}
 
-		if (has_escapes)
-			if (file_printf(ms, ", with escape sequences") == -1)
+		if (has_escapes) {
+			if (file_printf (ms, ", with escape sequences") == -1) {
 				goto done;
-		if (has_backspace)
-			if (file_printf(ms, ", with overstriking") == -1)
+			}
+		}
+		if (has_backspace) {
+			if (file_printf (ms, ", with overstriking") == -1) {
 				goto done;
+			}
+		}
 	}
 	rv = 1;
 done:
@@ -359,8 +406,9 @@ done:
 static int ascmatch(const ut8 *s, const unichar *us, size_t ulen) {
 	size_t i;
 	for (i = 0; i < ulen; i++) {
-		if (s[i] != us[i])
+		if (s[i] != us[i]) {
 			return 0;
+		}
 	}
 	return s[i]? 0: 1;
 }
@@ -449,8 +497,9 @@ static int looks_ascii(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ule
 	*ulen = 0;
 	for (i = 0; i < nbytes; i++) {
 		int t = text_chars[buf[i]];
-		if (t != T)
+		if (t != T) {
 			return 0;
+		}
 		ubuf[(*ulen)++] = buf[i];
 	}
 	return 1;
@@ -462,8 +511,9 @@ static int looks_latin1(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ul
 
 	for (i = 0; i < nbytes; i++) {
 		int t = text_chars[buf[i]];
-		if (t != T && t != I)
+		if (t != T && t != I) {
 			return 0;
+		}
 		ubuf[(*ulen)++] = buf[i];
 	}
 	return 1;
@@ -474,8 +524,9 @@ static int looks_extended(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *
 	*ulen = 0;
 	for (i = 0; i < nbytes; i++) {
 		int t = text_chars[buf[i]];
-		if (t != T && t != I && t != X)
+		if (t != T && t != I && t != X) {
 			return 0;
+		}
 		ubuf[(*ulen)++] = buf[i];
 	}
 	return 1;
@@ -493,46 +544,53 @@ encode_utf8(ut8 *buf, size_t len, unichar *ubuf, size_t ulen)
 
 	for (i = 0; i < ulen; i++) {
 		if (ubuf[i] <= 0x7f) {
-			if (end - buf < 1)
+			if (end - buf < 1) {
 				return NULL;
+			}
 			*buf++ = (ut8)ubuf[i];
 		} else if (ubuf[i] <= 0x7ff) {
-			if (end - buf < 2)
+			if (end - buf < 2) {
 				return NULL;
+			}
 			*buf++ = (ut8)((ubuf[i] >> 6) + 0xc0);
 			*buf++ = (ut8)((ubuf[i] & 0x3f) + 0x80);
 		} else if (ubuf[i] <= 0xffff) {
-			if (end - buf < 3)
+			if (end - buf < 3) {
 				return NULL;
+			}
 			*buf++ = (ut8)((ubuf[i] >> 12) + 0xe0);
 			*buf++ = (ut8)(((ubuf[i] >> 6) & 0x3f) + 0x80);
 			*buf++ = (ut8)((ubuf[i] & 0x3f) + 0x80);
 		} else if (ubuf[i] <= 0x1fffff) {
-			if (end - buf < 4)
+			if (end - buf < 4) {
 				return NULL;
+			}
 			*buf++ = (ut8)((ubuf[i] >> 18) + 0xf0);
 			*buf++ = (ut8)(((ubuf[i] >> 12) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >>  6) & 0x3f) + 0x80);
 			*buf++ = (ut8)((ubuf[i] & 0x3f) + 0x80);
 		} else if (ubuf[i] <= 0x3ffffff) {
-			if (end - buf < 5)
+			if (end - buf < 5) {
 				return NULL;
+			}
 			*buf++ = (ut8)((ubuf[i] >> 24) + 0xf8);
 			*buf++ = (ut8)(((ubuf[i] >> 18) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >> 12) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >>  6) & 0x3f) + 0x80);
 			*buf++ = (ut8)((ubuf[i] & 0x3f) + 0x80);
 		} else if (ubuf[i] <= 0x7fffffff) {
-			if (end - buf < 6)
+			if (end - buf < 6) {
 				return NULL;
+			}
 			*buf++ = (ut8)((ubuf[i] >> 30) + 0xfc);
 			*buf++ = (ut8)(((ubuf[i] >> 24) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >> 18) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >> 12) & 0x3f) + 0x80);
 			*buf++ = (ut8)(((ubuf[i] >>  6) & 0x3f) + 0x80);
 			*buf++ = (ut8)((ubuf[i] & 0x3f) + 0x80);
-		} else /* Invalid character */
+		} else { /* Invalid character */
 			return NULL;
+		}
 	}
 
 	return buf;
@@ -555,8 +613,9 @@ int file_looks_utf8(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ulen)
 	unichar c;
 	int gotone = 0, ctrl = 0;
 
-	if (ubuf)
+	if (ubuf) {
 		*ulen = 0;
+	}
 
 	for (i = 0; i < nbytes; i++) {
 		if ((buf[i] & 0x80) == 0) {	   /* 0xxxxxxx is plain ASCII */
@@ -565,11 +624,13 @@ int file_looks_utf8(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ulen)
 			 * still reject it if it uses weird control characters.
 			 */
 
-			if (text_chars[buf[i]] != T)
+			if (text_chars[buf[i]] != T) {
 				ctrl = 1;
+			}
 
-			if (ubuf)
+			if (ubuf) {
 				ubuf[(*ulen)++] = buf[i];
+			}
 		} else if ((buf[i] & 0x40) == 0) { /* 10xxxxxx never 1st byte */
 			return -1;
 		} else {			   /* 11xxxxxx begins UTF-8 */
@@ -590,22 +651,26 @@ int file_looks_utf8(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ulen)
 			} else if ((buf[i] & 0x02) == 0) {	/* 1111110x */
 				c = buf[i] & 0x01;
 				following = 5;
-			} else
+			} else {
 				return -1;
+			}
 
 			for (n = 0; n < following; n++) {
 				i++;
-				if (i >= nbytes)
+				if (i >= nbytes) {
 					goto done;
+				}
 
-				if ((buf[i] & 0x80) == 0 || (buf[i] & 0x40))
+				if ((buf[i] & 0x80) == 0 || (buf[i] & 0x40)) {
 					return -1;
+				}
 
 				c = (c << 6) + (buf[i] & 0x3f);
 			}
 
-			if (ubuf)
+			if (ubuf) {
 				ubuf[(*ulen)++] = c;
+			}
 			gotone = 1;
 		}
 	}
@@ -619,8 +684,9 @@ done:
  * rest of the text.
  */
 static int looks_utf8_with_BOM(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ulen) {
-	if (nbytes > 3 && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf)
-		return file_looks_utf8(buf + 3, nbytes - 3, ubuf, ulen);
+	if (nbytes > 3 && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf) {
+		return file_looks_utf8 (buf + 3, nbytes - 3, ubuf, ulen);
+	}
 	return -1;
 }
 
@@ -628,28 +694,35 @@ static int looks_ucs16(const ut8 *buf, size_t nbytes, unichar *ubuf, size_t *ule
 	int bigend;
 	size_t i;
 
-	if (nbytes < 2)
+	if (nbytes < 2) {
 		return 0;
+	}
 
-	if (buf[0] == 0xff && buf[1] == 0xfe)
+	if (buf[0] == 0xff && buf[1] == 0xfe) {
 		bigend = 0;
-	else if (buf[0] == 0xfe && buf[1] == 0xff)
+	} else if (buf[0] == 0xfe && buf[1] == 0xff) {
 		bigend = 1;
-	else return 0;
+	} else {
+		return 0;
+	}
 
 	*ulen = 0;
 
 	for (i = 2; i + 1 < nbytes; i += 2) {
 		/* XXX fix to properly handle chars > 65536 */
 
-		if (bigend)
+		if (bigend) {
 			ubuf[(*ulen)++] = buf[i + 1] + 256 * buf[i];
-		else ubuf[(*ulen)++] = buf[i] + 256 * buf[i + 1];
+		} else {
+			ubuf[(*ulen)++] = buf[i] + 256 * buf[i + 1];
+		}
 
-		if (ubuf[*ulen - 1] == 0xfffe)
+		if (ubuf[*ulen - 1] == 0xfffe) {
 			return 0;
-		if (ubuf[*ulen - 1] < 128 && text_chars[(size_t)ubuf[*ulen - 1]] != T)
+		}
+		if (ubuf[*ulen - 1] < 128 && text_chars[(size_t)ubuf[*ulen - 1]] != T) {
 			return 0;
+		}
 	}
 	return 1 + bigend;
 }
@@ -740,7 +813,8 @@ static ut8 ebcdic_1047_to_8859[] = {
  */
 static void from_ebcdic(const ut8 *buf, size_t nbytes, ut8 *out) {
 	size_t i;
-	for (i = 0; i < nbytes; i++)
+	for (i = 0; i < nbytes; i++) {
 		out[i] = ebcdic_to_ascii[buf[i]];
+	}
 }
 #endif
diff --git a/libr/magic/funcs.c b/libr/magic/funcs.c
index 4ff37471c8..d477067842 100644
--- a/libr/magic/funcs.c
+++ b/libr/magic/funcs.c
@@ -64,10 +64,14 @@ int file_vprintf(RMagic *ms, const char *fmt, va_list ap) {
 	va_copy (ap2, ap);
 	len = vsnprintf (cbuf, sizeof (cbuf), fmt, ap2);
 	va_end (ap2);
-	if (len < 0) goto out;
+	if (len < 0) {
+		goto out;
+	}
 	cbuf[len] = 0;
 	buf = strdup (cbuf);
-	if (!buf) return -1;
+	if (!buf) {
+		return -1;
+	}
 
 	buflen = len;
 	if (ms->o.buf != NULL) {
@@ -83,8 +87,9 @@ int file_vprintf(RMagic *ms, const char *fmt, va_list ap) {
 		memcpy (newstr, ms->o.buf, obuflen);
 		memcpy (newstr+obuflen, buf, buflen);
 		free (buf);
-		if (len < 0)
+		if (len < 0) {
 			goto out;
+		}
 		free (ms->o.buf);
 		buf = newstr;
 	}
@@ -101,8 +106,9 @@ out:
 /*VARARGS*/
 static void file_error_core(RMagic *ms, int error, const char *f, va_list va, ut32 lineno) {
 	/* Only the first error is ok */
-	if (!ms || ms->haderr)
+	if (!ms || ms->haderr) {
 		return;
+	}
 	if (lineno != 0) {
 		free(ms->o.buf);
 		ms->o.buf = NULL;
@@ -110,8 +116,9 @@ static void file_error_core(RMagic *ms, int error, const char *f, va_list va, ut
 	}
 	// OPENBSDBUG
         file_vprintf (ms, f, va);
-	if (error > 0)
-		(void)file_printf (ms, " (%s)", strerror(error));
+	if (error > 0) {
+		(void)file_printf (ms, " (%s)", strerror (error));
+	}
 	ms->haderr++;
 	ms->error = error;
 }
@@ -149,19 +156,21 @@ void file_badread(RMagic *ms) {
 
 int file_buffer(RMagic *ms, int fd, const char *inname, const void *buf, size_t nb) {
 	int mime, m = 0;
-	if (!ms)
+	if (!ms) {
 		return -1;
+	}
 	mime = ms->flags & R_MAGIC_MIME;
 	if (nb == 0) {
 		if ((!mime || (mime & R_MAGIC_MIME_TYPE)) &&
-		    file_printf(ms, mime ? "application/x-empty" : "empty") == -1)
+			file_printf (ms, mime ? "application/x-empty" : "empty") == -1) {
 			return -1;
+		}
 		return 1;
 	} else if (nb == 1) {
 		if ((!mime || (mime & R_MAGIC_MIME_TYPE)) &&
-		    file_printf(ms, mime ? "application/octet-stream" :
-		    "very short file (no magic)") == -1)
+			file_printf (ms, mime ? "application/octet-stream" : "very short file (no magic)") == -1) {
 			return -1;
+		}
 		return 1;
 	}
 
@@ -196,8 +205,9 @@ int file_buffer(RMagic *ms, int fd, const char *inname, const void *buf, size_t
 }
 
 int file_reset(RMagic *ms) {
-	if (!ms)
+	if (!ms) {
 		return 0;
+	}
 	free (ms->o.buf);
 	ms->o.buf = NULL;
 	ms->haderr = 0;
@@ -221,11 +231,13 @@ const char *file_getbuffer(RMagic *ms) {
 	char *pbuf, *op, *np;
 	size_t psize, len;
 
-	if (ms->haderr)
+	if (ms->haderr) {
 		return NULL;
+	}
 
-	if (ms->flags & R_MAGIC_RAW)
+	if (ms->flags & R_MAGIC_RAW) {
 		return ms->o.buf;
+	}
 
 	if (!ms->o.buf) {
 		eprintf ("ms->o.buf = NULL\n");
@@ -273,15 +285,17 @@ const char *file_getbuffer(RMagic *ms) {
 				op += bytesconsumed;
 				np += bytesconsumed;
 			} else {
-				while (bytesconsumed-- > 0)
-					OCTALIFY(np, op);
+				while (bytesconsumed-- > 0) {
+					OCTALIFY (np, op);
+				}
 			}
 		}
 		*np = '\0';
 
 		/* Parsing succeeded as a multi-byte sequence */
-		if (mb_conv != 0)
+		if (mb_conv != 0) {
 			return ms->o.pbuf;
+		}
 	}
 #endif
 	for (np = ms->o.pbuf, op = ms->o.buf; *op; op++) {
diff --git a/libr/magic/is_tar.c b/libr/magic/is_tar.c
index 0ff02ed0ca..27fef8cf03 100644
--- a/libr/magic/is_tar.c
+++ b/libr/magic/is_tar.c
@@ -63,15 +63,17 @@ static int from_oct(int digs, const char *where) {
 	int value = 0;
 	while (isspace ((ut8)*where)) {	/* Skip spaces */
 		where++;
-		if (--digs <= 0)
-			return -1;		/* All blank field */
+		if (--digs <= 0) {
+			return -1; /* All blank field */
+		}
 	}
 	while (digs > 0 && isodigit(*where)) {	/* Scan til nonoctal */
 		value = (value << 3) | (*where++ - '0');
 		--digs;
 	}
-	if (digs > 0 && *where && !isspace((ut8)*where))
-		return -1;			/* Ended on non-space/nul */
+	if (digs > 0 && *where && !isspace ((ut8)*where)) {
+		return -1; /* Ended on non-space/nul */
+	}
 	return value;
 }
 
@@ -87,8 +89,9 @@ static int is_tar(const ut8 *buf, size_t nbytes) {
 	int i, sum, recsum;
 	const char *p;
 
-	if (nbytes < sizeof(union record))
+	if (nbytes < sizeof (union record)) {
 		return 0;
+	}
 
 	recsum = from_oct (8, header->header.chksum);
 
@@ -103,14 +106,19 @@ static int is_tar(const ut8 *buf, size_t nbytes) {
 	}
 
 	/* Adjust checksum to count the "chksum" field as blanks. */
-	for (i = sizeof header->header.chksum; --i >= 0;)
+	for (i = sizeof header->header.chksum; --i >= 0;) {
 		sum -= 0xFF & header->header.chksum[i];
-	sum += ' ' * sizeof header->header.chksum;	
-	if (sum != recsum) return 0;	/* Not a tar archive */
-	if (strcmp (header->header.magic, GNUTMAGIC) == 0) 
-		return 3;		/* GNU Unix Standard tar archive */
-	if (strcmp (header->header.magic, TMAGIC) == 0) 
-		return 2;		/* Unix Standard tar archive */
+	}
+	sum += ' ' * sizeof header->header.chksum;
+	if (sum != recsum) {
+		return 0; /* Not a tar archive */
+	}
+	if (strcmp (header->header.magic, GNUTMAGIC) == 0) {
+		return 3; /* GNU Unix Standard tar archive */
+	}
+	if (strcmp (header->header.magic, TMAGIC) == 0) {
+		return 2; /* Unix Standard tar archive */
+	}
 	return 1;			/* Old fashioned tar archive */
 }
 
@@ -122,13 +130,15 @@ int file_is_tar(RMagic *ms, const ut8 *buf, size_t nbytes) {
 	int tar = is_tar(buf, nbytes);
 	int mime = ms->flags & R_MAGIC_MIME;
 
-	if (tar < 1 || tar > 3)
+	if (tar < 1 || tar > 3) {
 		return 0;
-	if (mime == R_MAGIC_MIME_ENCODING)
+	}
+	if (mime == R_MAGIC_MIME_ENCODING) {
 		return 0;
-	if (file_printf (ms, mime ? "application/x-tar" :
-	    tartype[tar - 1]) == -1)
+	}
+	if (file_printf (ms, mime ? "application/x-tar" : tartype[tar - 1]) == -1) {
 		return -1;
+	}
 	return 1;
 }
 #endif
diff --git a/libr/magic/magic.c b/libr/magic/magic.c
index 60d2498d12..5e82e9ed17 100644
--- a/libr/magic/magic.c
+++ b/libr/magic/magic.c
@@ -137,8 +137,9 @@ R_API int r_magic_errno(RMagic* m) {
 
 static void free_mlist(struct mlist *mlist) {
 	struct mlist *ml;
-	if (!mlist)
+	if (!mlist) {
 		return;
+	}
 	for (ml = mlist->next; ml != mlist;) {
 		struct mlist *next = ml->next;
 		struct r_magic *mg = ml->magic;
@@ -151,23 +152,31 @@ static void free_mlist(struct mlist *mlist) {
 
 static int info_from_stat(RMagic *ms, unsigned short md) {
 	/* We cannot open it, but we were able to stat it. */
-	if (md & 0222)
-		if (file_printf (ms, "writable, ") == -1)
+	if (md & 0222) {
+		if (file_printf (ms, "writable, ") == -1) {
 			return -1;
-	if (md & 0111)
-		if (file_printf (ms, "executable, ") == -1)
+		}
+	}
+	if (md & 0111) {
+		if (file_printf (ms, "executable, ") == -1) {
 			return -1;
-	if (S_ISREG (md))
-		if (file_printf (ms, "regular file, ") == -1)
+		}
+	}
+	if (S_ISREG (md)) {
+		if (file_printf (ms, "regular file, ") == -1) {
 			return -1;
-	if (file_printf (ms, "no read permission") == -1)
+		}
+	}
+	if (file_printf (ms, "no read permission") == -1) {
 		return -1;
+	}
 	return 0;
 }
 
 static void close_and_restore (const RMagic *ms, const char *name, int fd, const struct stat *sb) {
-	if (fd>0)
+	if (fd > 0) {
 		close (fd);
+	}
 }
 
 static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
@@ -181,11 +190,13 @@ static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
 	 * some overlapping space for matches near EOF
 	 */
 #define SLOP (1 + sizeof(union VALUETYPE))
-	if (!(buf = malloc (HOWMANY + SLOP)))
+	if (!(buf = malloc (HOWMANY + SLOP))) {
 		return NULL;
+	}
 
-	if (file_reset (ms) == -1)
+	if (file_reset (ms) == -1) {
 		goto done;
+	}
 
 	switch (file_fsmagic (ms, inname, &sb)) {
 	case -1: goto done;		/* error */
@@ -194,8 +205,9 @@ static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
 	}
 
 	if (!inname) {
-		if (fstat (fd, &sb) == 0 && S_ISFIFO (sb.st_mode))
+		if (fstat (fd, &sb) == 0 && S_ISFIFO (sb.st_mode)) {
 			ispipe = 1;
+		}
 	} else {
 		int flags = O_RDONLY|O_BINARY;
 
@@ -208,8 +220,9 @@ static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
 		errno = 0;
 		if ((fd = open (inname, flags)) < 0) {
 			eprintf ("couldn't open file\n");
-			if (info_from_stat (ms, sb.st_mode) == -1)
+			if (info_from_stat (ms, sb.st_mode) == -1) {
 				goto done;
+			}
 			rv = 0;
 			goto done;
 		}
@@ -232,13 +245,16 @@ static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
 		while ((r = read(fd, (void *)&buf[nbytes],
 		    (size_t)(HOWMANY - nbytes))) > 0) {
 			nbytes += r;
-			if (r < PIPE_BUF) break;
+			if (r < PIPE_BUF) {
+				break;
+			}
 		}
 
 		if (nbytes == 0) {
 			/* We can not read it, but we were able to stat it. */
-			if (info_from_stat(ms, sb.st_mode) == -1)
+			if (info_from_stat (ms, sb.st_mode) == -1) {
 				goto done;
+			}
 			rv = 0;
 			goto done;
 		}
@@ -253,8 +269,9 @@ static const char *file_or_fd(RMagic *ms, const char *inname, int fd) {
 #endif
 
 	(void)memset (buf + nbytes, 0, SLOP); /* NUL terminate */
-	if (file_buffer (ms, fd, inname, buf, (size_t)nbytes) == -1)
+	if (file_buffer (ms, fd, inname, buf, (size_t)nbytes) == -1) {
 		goto done;
+	}
 	rv = 0;
 done:
 	free (buf);
@@ -267,7 +284,9 @@ done:
 // TODO: reinitialize all the time
 R_API RMagic* r_magic_new(int flags) {
 	RMagic *ms = R_NEW0 (RMagic);
-	if (!ms) return NULL;
+	if (!ms) {
+		return NULL;
+	}
 	r_magic_setflags (ms, flags);
 	ms->o.buf = ms->o.pbuf = NULL;
 	ms->c.li = malloc ((ms->c.len = 10) * sizeof (*ms->c.li));
@@ -283,7 +302,9 @@ R_API RMagic* r_magic_new(int flags) {
 }
 
 R_API void r_magic_free(RMagic *ms) {
-	if (!ms) return;
+	if (!ms) {
+		return;
+	}
 	free_mlist (ms->mlist);
 	free (ms->o.pbuf);
 	free (ms->o.buf);
@@ -322,28 +343,36 @@ R_API const char * r_magic_file(RMagic *ms, const char *inname) {
 }
 
 R_API const char * r_magic_buffer(RMagic *ms, const void *buf, size_t nb) {
-	if (file_reset (ms) == -1)
+	if (file_reset (ms) == -1) {
 		return NULL;
+	}
 	/*
 	 * The main work is done here!
 	 * We have the file name and/or the data buffer to be identified. 
 	 */
-	if (file_buffer (ms, -1, NULL, buf, nb) == -1)
+	if (file_buffer (ms, -1, NULL, buf, nb) == -1) {
 		return NULL;
+	}
 	return file_getbuffer (ms);
 }
 
 R_API const char * r_magic_error(RMagic *ms) {
-	if (!ms) return 0;
+	if (!ms) {
+		return 0;
+	}
 	return ms->haderr ? ms->o.buf : NULL;
 }
 
 R_API int r_magic_errno(RMagic *ms) {
-	if (!ms) return 0;
+	if (!ms) {
+		return 0;
+	}
 	return ms->haderr ? ms->error : 0;
 }
 
 R_API void r_magic_setflags(RMagic *ms, int flags) {
-	if (ms) ms->flags = flags;
+	if (ms) {
+		ms->flags = flags;
+	}
 }
 #endif
diff --git a/libr/magic/softmagic.c b/libr/magic/softmagic.c
index 4887f9c128..e965496be0 100644
--- a/libr/magic/softmagic.c
+++ b/libr/magic/softmagic.c
@@ -164,12 +164,14 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 		if (*R_MAGIC_DESC) {
 			need_separator = 1;
 			printed_something = 1;
-			if (print_sep(ms, firstline) == -1)
+			if (print_sep (ms, firstline) == -1) {
 				return -1;
+			}
 		}
 
-		if ((ms->c.li[cont_level].off = mprint(ms, m)) == -1)
+		if ((ms->c.li[cont_level].off = mprint (ms, m)) == -1) {
 			return -1;
+		}
 
 		/* and any continuations that match */
 		if (file_check_mem(ms, ++cont_level) == -1) {
@@ -191,16 +193,19 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 				cont_level = m->cont_level;
 			}
 			ms->offset = m->offset;
-			if (m->flag & OFFADD)
+			if (m->flag & OFFADD) {
 				ms->offset += ms->c.li[cont_level - 1].off;
+			}
 
 			if (m->cond == COND_ELSE || m->cond == COND_ELIF) {
-				if (ms->c.li[cont_level].last_match == 1)
+				if (ms->c.li[cont_level].last_match == 1) {
 					continue;
+				}
 			}
 			flush = !mget(ms, s, m, nbytes, cont_level);
-			if (flush && m->reln != '!')
+			if (flush && m->reln != '!') {
 				continue;
+			}
 
 			switch (flush ? 1 : magiccheck(ms, m)) {
 			case -1:
@@ -210,9 +215,9 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 				break;
 			default:
 				ms->c.li[cont_level].last_match = 1;
-				if (m->type != FILE_DEFAULT)
+				if (m->type != FILE_DEFAULT) {
 					ms->c.li[cont_level].got_match = 1;
-				else if (ms->c.li[cont_level].got_match) {
+				} else if (ms->c.li[cont_level].got_match) {
 					ms->c.li[cont_level].got_match = 0;
 					break;
 				}
@@ -222,8 +227,9 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 				 */
 				if (*R_MAGIC_DESC) {
 					printed_something = 1;
-					if (print_sep(ms, firstline) == -1)
+					if (print_sep (ms, firstline) == -1) {
 						return -1;
+					}
 				}
 				/*
 				 * This continuation matched.  Print
@@ -235,22 +241,26 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 				if (need_separator
 				    && ((m->flag & NOSPACE) == 0)
 				    && *R_MAGIC_DESC) {
-					if (file_printf (ms, " ") == -1)
+					if (file_printf (ms, " ") == -1) {
 						return -1;
+					}
 					need_separator = 0;
 				}
-				if ((ms->c.li[cont_level].off = mprint(ms, m)) == -1)
+				if ((ms->c.li[cont_level].off = mprint (ms, m)) == -1) {
 					return -1;
-				if (*R_MAGIC_DESC)
+				}
+				if (*R_MAGIC_DESC) {
 					need_separator = 1;
+				}
 
 				/*
 				 * If we see any continuations
 				 * at a higher level,
 				 * process them.
 				 */
-				if (file_check_mem(ms, ++cont_level) == -1)
+				if (file_check_mem (ms, ++cont_level) == -1) {
 					return -1;
+				}
 				break;
 			}
 		}
@@ -258,8 +268,9 @@ static int match(RMagic *ms, struct r_magic *magic, ut32 nmagic, const ut8 *s, s
 			firstline = 0;
 			returnval = 1;
 		}
-		if ((ms->flags & R_MAGIC_CONTINUE) == 0 && printed_something)
+		if ((ms->flags & R_MAGIC_CONTINUE) == 0 && printed_something) {
 			return 1; /* don't keep searching */
+		}
 	}
 	return returnval;  /* This is hit if -k is set or there is no match */
 }
@@ -268,8 +279,9 @@ static int check_fmt(RMagic *ms, struct r_magic *m) {
 	RRegex rx;
 	int rc;
 
-	if (!strchr (R_MAGIC_DESC, '%'))
+	if (!strchr (R_MAGIC_DESC, '%')) {
 		return 0;
+	}
 
 	rc = r_regex_comp (&rx, "%[-0-9\\.]*s", R_REGEX_EXTENDED|R_REGEX_NOSUB);
 	if (rc) {
@@ -288,10 +300,12 @@ char * strdupn(const char *str, size_t n) {
 	size_t len;
 	char *copy;
 
-	for (len = 0; len < n && str[len]; len++)
+	for (len = 0; len < n && str[len]; len++) {
 		continue;
-	if (!(copy = malloc (len + 1)))
+	}
+	if (!(copy = malloc (len + 1))) {
 		return NULL;
+	}
 	(void)memcpy (copy, str, len);
 	copy[len] = '\0';
 	return copy;
@@ -323,8 +337,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 			}
 			break;
 		default:
-			if (file_printf(ms, R_MAGIC_DESC, (ut8) v) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, (ut8)v) == -1) {
 				return -1;
+			}
 			break;
 		}
 		t = ms->offset + sizeof(char);
@@ -348,8 +363,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 			}
 			break;
 		default:
-			if (file_printf(ms, R_MAGIC_DESC, (unsigned short) v) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, (unsigned short)v) == -1) {
 				return -1;
+			}
 			break;
 		}
 		t = ms->offset + sizeof(short);
@@ -374,8 +390,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 			}
 			break;
 		default:
-			if (file_printf(ms, R_MAGIC_DESC, (ut32) v) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, (ut32)v) == -1) {
 				return -1;
+			}
 			break;
 		}
 		t = ms->offset + sizeof(st32);
@@ -384,8 +401,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
   	case FILE_BEQUAD:
   	case FILE_LEQUAD:
 		v = file_signextend(ms, m, p->q);
-		if (file_printf(ms, R_MAGIC_DESC, (ut64) v) == -1)
+		if (file_printf (ms, R_MAGIC_DESC, (ut64)v) == -1) {
 			return -1;
+		}
 		t = ms->offset + sizeof(ut64);
   		break;
 
@@ -394,50 +412,56 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
   	case FILE_BESTRING16:
   	case FILE_LESTRING16:
 		if (m->reln == '=' || m->reln == '!') {
-			if (file_printf (ms, R_MAGIC_DESC, m->value.s) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, m->value.s) == -1) {
 				return -1;
+			}
 			t = ms->offset + m->vallen;
 		}
 		else {
-			if (*m->value.s == '\0')
+			if (*m->value.s == '\0') {
 				p->s[strcspn (p->s, "\n")] = '\0';
-			if (file_printf (ms, R_MAGIC_DESC, p->s) == -1)
+			}
+			if (file_printf (ms, R_MAGIC_DESC, p->s) == -1) {
 				return -1;
+			}
 			t = ms->offset + strlen (p->s);
-			if (m->type == FILE_PSTRING)
+			if (m->type == FILE_PSTRING) {
 				t++;
+			}
 		}
 		break;
 	case FILE_DATE:
 	case FILE_BEDATE:
 	case FILE_LEDATE:
 	case FILE_MEDATE:
-		if (file_printf(ms, R_MAGIC_DESC, file_fmttime(p->l, 1)) == -1)
+		if (file_printf (ms, R_MAGIC_DESC, file_fmttime (p->l, 1)) == -1) {
 			return -1;
+		}
 		t = ms->offset + sizeof(time_t);
 		break;
 	case FILE_LDATE:
 	case FILE_BELDATE:
 	case FILE_LELDATE:
 	case FILE_MELDATE:
-		if (file_printf(ms, R_MAGIC_DESC, file_fmttime(p->l, 0)) == -1)
+		if (file_printf (ms, R_MAGIC_DESC, file_fmttime (p->l, 0)) == -1) {
 			return -1;
+		}
 		t = ms->offset + sizeof(time_t);
 		break;
 	case FILE_QDATE:
 	case FILE_BEQDATE:
 	case FILE_LEQDATE:
-		if (file_printf(ms, R_MAGIC_DESC, file_fmttime((ut32)p->q, 1))
-		    == -1)
+		if (file_printf (ms, R_MAGIC_DESC, file_fmttime ((ut32)p->q, 1)) == -1) {
 			return -1;
+		}
 		t = ms->offset + sizeof(ut64);
 		break;
 	case FILE_QLDATE:
 	case FILE_BEQLDATE:
 	case FILE_LEQLDATE:
-		if (file_printf(ms, R_MAGIC_DESC, file_fmttime((ut32)p->q, 0))
-		    == -1)
+		if (file_printf (ms, R_MAGIC_DESC, file_fmttime ((ut32)p->q, 0)) == -1) {
 			return -1;
+		}
 		t = ms->offset + sizeof(ut64);
 		break;
   	case FILE_FLOAT:
@@ -459,8 +483,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 			}
 			break;
 		default:
-			if (file_printf(ms, R_MAGIC_DESC, vf) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, vf) == -1) {
 				return -1;
+			}
 			break;
 		}
 		t = ms->offset + sizeof(float);
@@ -484,8 +509,9 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 			}
 			break;
 		default:
-			if (file_printf(ms, R_MAGIC_DESC, vd) == -1)
+			if (file_printf (ms, R_MAGIC_DESC, vd) == -1) {
 				return -1;
+			}
 			break;
 		}
 		t = ms->offset + sizeof(double);
@@ -502,26 +528,32 @@ static st32 mprint(RMagic *ms, struct r_magic *m) {
 		rval = file_printf(ms, R_MAGIC_DESC, cp);
 		free(cp);
 
-		if (rval == -1)
+		if (rval == -1) {
 			return -1;
+		}
 
-		if ((m->str_flags & REGEX_OFFSET_START))
+		if ((m->str_flags & REGEX_OFFSET_START)) {
 			t = ms->search.offset;
-		else
+		} else {
 			t = ms->search.offset + ms->search.rm_len;
+		}
 		break;
 	}
 
 	case FILE_SEARCH:
-	  	if (file_printf(ms, R_MAGIC_DESC, m->value.s) == -1)
+		if (file_printf (ms, R_MAGIC_DESC, m->value.s) == -1) {
 			return -1;
-		if ((m->str_flags & REGEX_OFFSET_START))
+		}
+		if ((m->str_flags & REGEX_OFFSET_START)) {
 			t = ms->search.offset;
-		else t = ms->search.offset + m->vallen;
+		} else {
+			t = ms->search.offset + m->vallen;
+		}
 		break;
 	case FILE_DEFAULT:
-	  	if (file_printf(ms, R_MAGIC_DESC, m->value.s) == -1)
+		if (file_printf (ms, R_MAGIC_DESC, m->value.s) == -1) {
 			return -1;
+		}
 		t = ms->offset;
 		break;
 	default:
@@ -637,21 +669,25 @@ static int mconvert(RMagic *ms, struct r_magic *m) {
 		/* Null terminate and eat *trailing* return */
 		p->s[sizeof(p->s) - 1] = '\0';
 		len = strlen(p->s);
-		if (len-- && p->s[len] == '\n')
+		if (len-- && p->s[len] == '\n') {
 			p->s[len] = '\0';
+		}
 		return 1;
 	}
 	case FILE_PSTRING: {
 		char *ptr1 = p->s, *ptr2 = ptr1 + 1;
 		size_t len = *p->s;
-		if (len >= sizeof(p->s))
-			len = sizeof(p->s) - 1;
-		while (len--)
+		if (len >= sizeof (p->s)) {
+			len = sizeof (p->s) - 1;
+		}
+		while (len--) {
 			*ptr1++ = *ptr2++;
+		}
 		*ptr1 = '\0';
 		len = strlen(p->s);
-		if (len-- && p->s[len] == '\n')
+		if (len-- && p->s[len] == '\n') {
 			p->s[len] = '\0';
+		}
 		return 1;
 	}
 	case FILE_BESHORT:
@@ -780,11 +816,13 @@ static int mcopy(RMagic *ms, union VALUETYPE *p, int type, int indir, const ut8
 			     lines && ((b = strchr(c = b, '\n')) || (b = strchr(c, '\r')));
 			     lines--, b++) {
 				last = b;
-				if (b[0] == '\r' && b[1] == '\n')
+				if (b[0] == '\r' && b[1] == '\n') {
 					b++;
+				}
 			}
-			if (lines)
+			if (lines) {
 				last = (const char *)s + nbytes;
+			}
 
 			ms->search.s = buf;
 			ms->search.s_len = last - buf;
@@ -799,8 +837,9 @@ static int mcopy(RMagic *ms, union VALUETYPE *p, int type, int indir, const ut8
 			char *dst = p->s;
 			char *edst = &p->s[sizeof(p->s) - 1];
 
-			if (type == FILE_BESTRING16)
+			if (type == FILE_BESTRING16) {
 				src++;
+			}
 
 			/* check for pointer overflow */
 			if (src < s) {
@@ -809,15 +848,15 @@ static int mcopy(RMagic *ms, union VALUETYPE *p, int type, int indir, const ut8
 				return -1;
 			}
 			for (/*EMPTY*/; src < esrc; src += 2, dst++) {
-				if (dst < edst)
+				if (dst < edst) {
 					*dst = *src;
-				else
+				} else {
 					break;
+				}
 				if (*dst == '\0') {
-					if (type == FILE_BESTRING16 ?
-					    *(src - 1) != '\0' :
-					    *(src + 1) != '\0')
+					if (type == FILE_BESTRING16 ? *(src - 1) != '\0' : *(src + 1) != '\0') {
 						*dst = ' ';
+					}
 				}
 			}
 			*edst = '\0';
@@ -843,9 +882,10 @@ static int mcopy(RMagic *ms, union VALUETYPE *p, int type, int indir, const ut8
 	 * the usefulness of padding with zeroes eludes me, it
 	 * might even cause problems
 	 */
-	if (nbytes < sizeof(*p))
-		(void)memset(((char *)(void *)p) + nbytes, '\0',
-		    sizeof(*p) - nbytes);
+	if (nbytes < sizeof (*p)) {
+		(void)memset (((char *)(void *)p) + nbytes, '\0',
+			sizeof (*p) - nbytes);
+	}
 	return 0;
 }
 
@@ -854,8 +894,9 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 	ut32 count = m->str_range;
 	union VALUETYPE *p = &ms->ms_value;
 
-	if (mcopy(ms, p, m->type, m->flag & INDIR, s, offset, nbytes, count) == -1)
+	if (mcopy (ms, p, m->type, m->flag & INDIR, s, offset, nbytes, count) == -1) {
 		return -1;
+	}
 
 	if ((ms->flags & R_MAGIC_DEBUG) != 0) {
 		mdebug(offset, (char *)(void *)p, sizeof(union VALUETYPE));
@@ -896,8 +937,9 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 		}
 		switch (m->in_type) {
 		case FILE_BYTE:
-			if (nbytes < (offset + 1))
+			if (nbytes < (offset + 1)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND: offset = p->b & off; break;
@@ -909,14 +951,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 				case FILE_OPDIVIDE: offset = p->b / off; break;
 				case FILE_OPMODULO: offset = p->b % off; break;
 				}
-			} else
+			} else {
 				offset = p->b;
-			if (m->in_op & FILE_OPINVERSE)
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_BESHORT:
-			if (nbytes < (offset + 2))
+			if (nbytes < (offset + 2)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND: offset = (short)((p->hs[0]<<8)| (p->hs[1])) & off; break;
@@ -928,15 +973,18 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 				case FILE_OPDIVIDE: offset = (short)((p->hs[0]<<8)| (p->hs[1])) / off; break;
 				case FILE_OPMODULO: offset = (short)((p->hs[0]<<8)| (p->hs[1])) % off; break;
 				}
-			} else
-				offset = (short)((p->hs[0]<<8)|
+			} else {
+				offset = (short)((p->hs[0] << 8) |
 						 (p->hs[1]));
-			if (m->in_op & FILE_OPINVERSE)
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_LESHORT:
-			if (nbytes < (offset + 2))
+			if (nbytes < (offset + 2)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND: offset = (short)((p->hs[1]<<8)| (p->hs[0])) & off; break;
@@ -948,13 +996,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 				case FILE_OPDIVIDE: offset = (short)((p->hs[1]<<8)| (p->hs[0])) / off; break;
 				case FILE_OPMODULO: offset = (short)((p->hs[1]<<8)| (p->hs[0])) % off; break;
 				}
-			} else offset = (short)((p->hs[1]<<8)| (p->hs[0]));
-			if (m->in_op & FILE_OPINVERSE)
+			} else {
+				offset = (short)((p->hs[1] << 8) | (p->hs[0]));
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_SHORT:
-			if (nbytes < (offset + 2))
+			if (nbytes < (offset + 2)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND: offset = p->h & off; break;
@@ -966,13 +1018,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 				case FILE_OPDIVIDE: offset = p->h / off; break;
 				case FILE_OPMODULO: offset = p->h % off; break;
 				}
-			} else offset = p->h;
-			if (m->in_op & FILE_OPINVERSE)
+			} else {
+				offset = p->h;
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_BELONG:
-			if (nbytes < (offset + 4))
+			if (nbytes < (offset + 4)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
@@ -1000,13 +1056,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 					offset = (st32)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) % off;
 					break;
 				}
-			} else offset = (st32)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3]));
-			if (m->in_op & FILE_OPINVERSE)
+			} else {
+				offset = (st32) ((p->hl[0] << 24) | (p->hl[1] << 16) | (p->hl[2] << 8) | (p->hl[3]));
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_LELONG:
-			if (nbytes < (offset + 4))
+			if (nbytes < (offset + 4)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
@@ -1034,13 +1094,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 					offset = (st32)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) % off;
 					break;
 				}
-			} else offset = (st32)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0]));
-			if (m->in_op & FILE_OPINVERSE)
+			} else {
+				offset = (st32) ((p->hl[3] << 24) | (p->hl[2] << 16) | (p->hl[1] << 8) | (p->hl[0]));
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_MELONG:
-			if (nbytes < (offset + 4))
+			if (nbytes < (offset + 4)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
@@ -1068,13 +1132,17 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 					offset = (st32)((p->hl[1]<<24)| (p->hl[0]<<16)| (p->hl[3]<<8)| (p->hl[2])) % off;
 					break;
 				}
-			} else offset = (st32)((p->hl[1]<<24)| (p->hl[0]<<16)| (p->hl[3]<<8)| (p->hl[2]));
-			if (m->in_op & FILE_OPINVERSE)
+			} else {
+				offset = (st32) ((p->hl[1] << 24) | (p->hl[0] << 16) | (p->hl[3] << 8) | (p->hl[2]));
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		case FILE_LONG:
-			if (nbytes < (offset + 4))
+			if (nbytes < (offset + 4)) {
 				return 0;
+			}
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND: offset = p->l & off; break;
@@ -1086,17 +1154,21 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 				case FILE_OPDIVIDE: offset = p->l / off; break;
 				case FILE_OPMODULO: offset = p->l % off; break;
 				}
-			} else
+			} else {
 				offset = p->l;
-			if (m->in_op & FILE_OPINVERSE)
+			}
+			if (m->in_op & FILE_OPINVERSE) {
 				offset = ~offset;
+			}
 			break;
 		}
 
-		if (m->flag & INDIROFFADD)
-			offset += ms->c.li[cont_level-1].off;
-		if (mcopy (ms, p, m->type, 0, s, offset, nbytes, count) == -1)
+		if (m->flag & INDIROFFADD) {
+			offset += ms->c.li[cont_level - 1].off;
+		}
+		if (mcopy (ms, p, m->type, 0, s, offset, nbytes, count) == -1) {
 			return -1;
+		}
 		ms->offset = offset;
 
 		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
@@ -1109,14 +1181,16 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should alway be true */
+		if (nbytes < (offset + 1)) { /* should alway be true */
 			return 0;
+		}
 		break;
 	case FILE_SHORT:
 	case FILE_BESHORT:
 	case FILE_LESHORT:
-		if (nbytes < (offset + 2))
+		if (nbytes < (offset + 2)) {
 			return 0;
+		}
 		break;
 	case FILE_LONG:
 	case FILE_BELONG:
@@ -1133,24 +1207,28 @@ static int mget(RMagic *ms, const ut8 *s, struct r_magic *m, size_t nbytes, unsi
 	case FILE_FLOAT:
 	case FILE_BEFLOAT:
 	case FILE_LEFLOAT:
-		if (nbytes < (offset + 4))
+		if (nbytes < (offset + 4)) {
 			return 0;
+		}
 		break;
 	case FILE_DOUBLE:
 	case FILE_BEDOUBLE:
 	case FILE_LEDOUBLE:
-		if (nbytes < (offset + 8))
+		if (nbytes < (offset + 8)) {
 			return 0;
+		}
 		break;
 	case FILE_STRING:
 	case FILE_PSTRING:
 	case FILE_SEARCH:
-		if (nbytes < (offset + m->vallen))
+		if (nbytes < (offset + m->vallen)) {
 			return 0;
+		}
 		break;
 	case FILE_REGEX:
-		if (nbytes < offset)
+		if (nbytes < offset) {
 			return 0;
+		}
 		break;
 	case FILE_DEFAULT:	/* nothing to check */
 	default:
@@ -1176,34 +1254,41 @@ static ut64 file_strncmp(const char *s1, const char *s2, size_t len, ut32 flags)
 	 */
 	v = 0;
 	if (0L == flags) { /* normal string: do it fast */
-		while (len-- > 0)
-			if ((v = *b++ - *a++) != '\0')
+		while (len-- > 0) {
+			if ((v = *b++ - *a++) != '\0') {
 				break;
+			}
+		}
 	} else { /* combine the others */
 		while (len-- > 0) {
 			if ((flags & STRING_IGNORE_LOWERCASE) &&
 			    islower(*a)) {
-				if ((v = tolower(*b++) - *a++) != '\0')
+				if ((v = tolower (*b++) - *a++) != '\0') {
 					break;
+				}
 			} else if ((flags & STRING_IGNORE_UPPERCASE) && isupper(*a)) {
-				if ((v = toupper(*b++) - *a++) != '\0')
+				if ((v = toupper (*b++) - *a++) != '\0') {
 					break;
+				}
 			} else if ((flags & STRING_COMPACT_BLANK) && isspace(*a)) {
 				a++;
 				if (isspace(*b++)) {
-					while (isspace(*b))
+					while (isspace (*b)) {
 						b++;
+					}
 				} else {
 					v = 1;
 					break;
 				}
 			} else if ((flags & STRING_COMPACT_OPTIONAL_BLANK) && isspace(*a)) {
 				a++;
-				while (isspace(*b))
+				while (isspace (*b)) {
 					b++;
+				}
 			} else {
-				if ((v = *b++ - *a++) != '\0')
+				if ((v = *b++ - *a++) != '\0') {
 					break;
+				}
 			}
 		}
 	}
@@ -1313,18 +1398,21 @@ static int magiccheck(RMagic *ms, struct r_magic *m) {
 	case FILE_SEARCH: { /* search ms->search.s for the string m->value.s */
 		size_t slen, idx;
 
-		if (!ms->search.s)
+		if (!ms->search.s) {
 			return 0;
+		}
 
 		slen = R_MIN (m->vallen, sizeof (m->value.s));
 		l = 0;
 		v = 0;
 
 		for (idx = 0; m->str_range == 0 || idx < m->str_range; idx++) {
-			if ((int)ms->search.offset < 0)
+			if ((int)ms->search.offset < 0) {
 				break;
-			if (slen + idx > ms->search.s_len)
+			}
+			if (slen + idx > ms->search.s_len) {
 				break;
+			}
 			v = file_strncmp (m->value.s, ms->search.s + idx, slen, m->str_flags);
 			if (v == 0) {	/* found match */
 				ms->search.offset += idx;
@@ -1338,8 +1426,9 @@ static int magiccheck(RMagic *ms, struct r_magic *m) {
 		RRegex rx;
 		char errmsg[512];
 
-		if (!ms->search.s)
+		if (!ms->search.s) {
 			return 0;
+		}
 
 		l = 0;
 		rc = r_regex_comp (&rx, m->value.s,
@@ -1383,8 +1472,9 @@ static int magiccheck(RMagic *ms, struct r_magic *m) {
 			}
 			r_regex_fini (&rx);
 		}
-		if (v == (ut64)-1)
+		if (v == (ut64)-1) {
 			return -1;
+		}
 		break;
 	}
 	default:
@@ -1395,51 +1485,60 @@ static int magiccheck(RMagic *ms, struct r_magic *m) {
 	v = file_signextend (ms, m, v);
 	switch (m->reln) {
 	case 'x':
-		if ((ms->flags & R_MAGIC_DEBUG) != 0)
-			(void) fprintf(stderr, "%"PFMT64u" == *any* = 1\n", (ut64)v);
+		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+			(void)fprintf (stderr, "%" PFMT64u " == *any* = 1\n", (ut64)v);
+		}
 		matched = 1;
 		break;
 	case '!':
 		matched = v != l;
-		if ((ms->flags & R_MAGIC_DEBUG) != 0)
-			fprintf(stderr, "%"PFMT64u" != %"PFMT64u" = %d\n", (ut64)v, (ut64)l, matched);
+		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+			fprintf (stderr, "%" PFMT64u " != %" PFMT64u " = %d\n", (ut64)v, (ut64)l, matched);
+		}
 		break;
 	case '=':
 		matched = v == l;
-		if ((ms->flags & R_MAGIC_DEBUG) != 0)
-			eprintf ("%"PFMT64u" == %"PFMT64u" = %d\n", (ut64)v, (ut64)l, matched);
+		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+			eprintf ("%" PFMT64u " == %" PFMT64u " = %d\n", (ut64)v, (ut64)l, matched);
+		}
 		break;
 	case '>':
 		if (m->flag & UNSIGNED) {
 			matched = v > l;
-			if ((ms->flags & R_MAGIC_DEBUG) != 0)
-				eprintf ("%"PFMT64u" > %"PFMT64u" = %d\n", (ut64)v, (ut64)l, matched);
+			if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+				eprintf ("%" PFMT64u " > %" PFMT64u " = %d\n", (ut64)v, (ut64)l, matched);
+			}
 		} else {
 			matched = (ut64) v > (ut64) l;
-			if ((ms->flags & R_MAGIC_DEBUG) != 0)
-				eprintf ("%"PFMT64u" > %"PFMT64u" = %d\n", (st64)v, (st64)l, matched);
+			if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+				eprintf ("%" PFMT64u " > %" PFMT64u " = %d\n", (st64)v, (st64)l, matched);
+			}
 		}
 		break;
 	case '<':
 		if (m->flag & UNSIGNED) {
 			matched = v < l;
-			if ((ms->flags & R_MAGIC_DEBUG) != 0)
-				eprintf ("%"PFMT64u" < %"PFMT64u" = %d\n", (ut64)v, (ut64)l, matched);
+			if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+				eprintf ("%" PFMT64u " < %" PFMT64u " = %d\n", (ut64)v, (ut64)l, matched);
+			}
 		} else {
 			matched = (ut64) v < (ut64) l;
-			if ((ms->flags & R_MAGIC_DEBUG) != 0)
-				eprintf ("%"PFMT64d" < %"PFMT64d" = %d\n", (st64)v, (st64)l, matched);
+			if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+				eprintf ("%" PFMT64d " < %" PFMT64d " = %d\n", (st64)v, (st64)l, matched);
+			}
 		}
 		break;
 	case '&':
 		matched = (v & l) == l;
-		if ((ms->flags & R_MAGIC_DEBUG) != 0)
-			eprintf("((%"PFMT64x" & %"PFMT64x") == %"PFMT64x") = %d\n", (ut64)v, (ut64)l, (ut64)l, matched);
+		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+			eprintf ("((%" PFMT64x " & %" PFMT64x ") == %" PFMT64x ") = %d\n", (ut64)v, (ut64)l, (ut64)l, matched);
+		}
 		break;
 	case '^':
 		matched = (v & l) != l;
-		if ((ms->flags & R_MAGIC_DEBUG) != 0)
-			eprintf ("((%"PFMT64x" & %"PFMT64x") != %"PFMT64x") = %d\n", (ut64)v, (ut64)l, (ut64)l, matched);
+		if ((ms->flags & R_MAGIC_DEBUG) != 0) {
+			eprintf ("((%" PFMT64x " & %" PFMT64x ") != %" PFMT64x ") = %d\n", (ut64)v, (ut64)l, (ut64)l, matched);
+		}
 		break;
 	default:
 		matched = 0;
diff --git a/libr/parse/code.c b/libr/parse/code.c
index d895f41d44..52aaa5c308 100644
--- a/libr/parse/code.c
+++ b/libr/parse/code.c
@@ -12,7 +12,9 @@ static void appendstring(const char *msg, char **s) {
 		printf ("%s\n", msg);
 	} else if (*s) {
 		char *p = malloc (strlen (msg) + strlen (*s) + 1);
-		if (!p) return;
+		if (!p) {
+			return;
+		}
 		strcpy (p, *s);
 		free (*s);
 		*s = p;
@@ -76,7 +78,9 @@ static int typeload(void *p, const char *k, const char *v) {
 R_API char *r_parse_c_file(RAnal *anal, const char *path) {
 	char *str = NULL;
 	TCCState *T = tcc_new (anal->cpu, anal->bits, anal->os);
-	if (!T) return NULL;
+	if (!T) {
+		return NULL;
+	}
 	tcc_set_callback (T, &appendstring, &str);
 	sdb_foreach (anal->sdb_types, typeload, anal);
 	if (tcc_add_file (T, path) == -1) {
@@ -90,7 +94,9 @@ R_API char *r_parse_c_file(RAnal *anal, const char *path) {
 R_API char *r_parse_c_string(RAnal *anal, const char *code) {
 	char *str = NULL;
 	TCCState *T = tcc_new (anal->cpu, anal->bits, anal->os);
-	if (!T) return NULL;
+	if (!T) {
+		return NULL;
+	}
 	tcc_set_callback (T, &appendstring, &str);
 	sdb_foreach (anal->sdb_types, typeload, NULL);
 	if (tcc_compile_string (T, code) != 0) {
diff --git a/libr/parse/p/parse_6502_pseudo.c b/libr/parse/p/parse_6502_pseudo.c
index f341ae2d0a..899cbeb1f9 100644
--- a/libr/parse/p/parse_6502_pseudo.c
+++ b/libr/parse/p/parse_6502_pseudo.c
@@ -70,11 +70,15 @@ static int replace(int argc, const char *argv[], char *newstr, ADDR_TYPE type) {
 		{0, "sei", "set_interrupt"},
 		{1, "jsr", "1()"},
 		{0, NULL}};
-	if (!newstr) return false;
+	if (!newstr) {
+		return false;
+	}
 
 	for (i = 0; ops[i].op != NULL; i++) {
 		if (ops[i].narg) {
-			if (argc - 1 != ops[i].narg) continue;
+			if (argc - 1 != ops[i].narg) {
+				continue;
+			}
 		}
 		if (!strcmp(ops[i].op, argv[0])) {
 			for (j = k = 0; ops[i].str[j] != '\0'; j++, k++) {
@@ -109,7 +113,9 @@ static int replace(int argc, const char *argv[], char *newstr, ADDR_TYPE type) {
 static ADDR_TYPE addr_type(const char *str) {
 	if (strchr(str, '(')) {
 		char *e = strchr (str, ')');
-		if (!e) return NORM;
+		if (!e) {
+			return NORM;
+		}
 		char *o = strchr (e, ',');
 		return (o) ? IND_IDX : IDX_IND;
 	}
@@ -122,7 +128,9 @@ static int parse(RParse *p, const char *data, char *str) {
 	char *buf, *ptr, *optr;
 	ADDR_TYPE atype;
 
-	if (len >= sizeof(w0)) return false;
+	if (len >= sizeof (w0)) {
+		return false;
+	}
 	// malloc can be slow here :?
 	if (!(buf = malloc (len + 1))) {
 		return false;
@@ -135,19 +143,23 @@ static int parse(RParse *p, const char *data, char *str) {
 		r_str_replace_char (buf, ')', ' ');
 		*w0 = *w1 = *w2 = '\0';
 		ptr = strchr (buf, ' ');
-		if (!ptr) ptr = strchr (buf, '\t');
+		if (!ptr) {
+			ptr = strchr (buf, '\t');
+		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr == ' '; ptr++)
+			for (++ptr; *ptr == ' '; ptr++) {
 				;
+			}
 			strncpy (w0, buf, sizeof(w0) - 1);
 			strncpy (w1, ptr, sizeof(w1) - 1);
 			optr = ptr;
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr == ' '; ptr++)
+				for (++ptr; *ptr == ' '; ptr++) {
 					;
+				}
 				strncpy (w1, optr, sizeof(w1) - 1);
 				strncpy (w2, ptr, sizeof(w2) - 1);
 			}
@@ -158,7 +170,9 @@ static int parse(RParse *p, const char *data, char *str) {
 		const char *wa[] = {w0, w1, w2};
 		int nw = 0;
 		for (i = 0; i < 3; i++) {
-			if (wa[i][0]) nw++;
+			if (wa[i][0]) {
+				nw++;
+			}
 		}
 		replace (nw, wa, str, atype);
 	}
diff --git a/libr/parse/p/parse_arm_pseudo.c b/libr/parse/p/parse_arm_pseudo.c
index f41c7ee9c3..474d6f5e26 100644
--- a/libr/parse/p/parse_arm_pseudo.c
+++ b/libr/parse/p/parse_arm_pseudo.c
@@ -192,7 +192,9 @@ static int parse(RParse *p, const char *data, char *str) {
 		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr==' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			strncpy (w0, buf, sizeof (w0) - 1);
 			strncpy (w1, ptr, sizeof (w1) - 1);
 
@@ -214,14 +216,18 @@ static int parse(RParse *p, const char *data, char *str) {
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr==' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				strncpy (w1, optr, sizeof (w1) - 1);
 				strncpy (w2, ptr, sizeof (w2) - 1);
 				optr = ptr;
 				ptr = strchr (ptr, ',');
 				if (ptr) {
 					*ptr = '\0';
-					for (++ptr; *ptr==' '; ptr++);
+					for (++ptr; *ptr == ' '; ptr++) {
+						;
+					}
 					strncpy (w2, optr, sizeof (w2) - 1);
 					strncpy (w3, ptr, sizeof (w3) - 1);
 				}
diff --git a/libr/parse/p/parse_att2intel.c b/libr/parse/p/parse_att2intel.c
index be6180e1c2..07d34ea71e 100644
--- a/libr/parse/p/parse_att2intel.c
+++ b/libr/parse/p/parse_att2intel.c
@@ -45,7 +45,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy(newstr+k, w);
 							k += strlen(w)-1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k]='\0';
 			}
@@ -75,7 +77,9 @@ static int parse(RParse *p, const char *data, char *str) {
 
 	// malloc can be slow here :?
 	buf = strdup (data);
-	if (!buf) return false;
+	if (!buf) {
+		return false;
+	}
 	r_str_trim_head (buf);
 
 	ptr = strchr (buf, '#');
@@ -97,8 +101,9 @@ static int parse(RParse *p, const char *data, char *str) {
 	if (ptr) {
 		*ptr = 0;
 		num = (char*)r_str_lchr (buf, ' ');
-		if (!num)
-			num = (char*)r_str_lchr (buf, ',');
+		if (!num) {
+			num = (char *)r_str_lchr (buf, ',');
+		}
 		if (num) {
 			n = atoi (num+1);
 			*ptr = '[';
@@ -106,21 +111,29 @@ static int parse(RParse *p, const char *data, char *str) {
 			ptr = (char*)r_str_lchr (buf, ']');
 			if (n && ptr) {
 				char *rest = strdup (ptr+1);
-				if(n>0) sprintf (ptr, "+%d]%s", n, rest);
-				else sprintf (ptr, "%d]%s", n, rest);
+				if (n > 0) {
+					sprintf (ptr, "+%d]%s", n, rest);
+				} else {
+					sprintf (ptr, "%d]%s", n, rest);
+				}
 				free (rest);
 			}
-		} else *ptr = '[';
+		} else {
+			*ptr = '[';
+		}
 	}
 
 	if (*buf) {
 		*w0 = *w1 = *w2 = *w3 = 0;
 		ptr = strchr (buf, ' ');
-		if (!ptr)
+		if (!ptr) {
 			ptr = strchr (buf, '\t');
+		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr==' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			strncpy (w0, buf, sizeof(w0) - 1);
 			strncpy (w1, ptr, sizeof(w1) - 1);
 
@@ -128,13 +141,17 @@ static int parse(RParse *p, const char *data, char *str) {
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr==' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				strncpy (w1, optr, sizeof(w1)-1);
 				strncpy (w2, ptr, sizeof(w2)-1);
 				ptr = strchr (ptr, ',');
 				if (ptr) {
 					*ptr = '\0';
-					for (++ptr; *ptr==' '; ptr++);
+					for (++ptr; *ptr == ' '; ptr++) {
+						;
+					}
 					strncpy (w2, optr, sizeof(w2)-1);
 					strncpy (w3, ptr, sizeof(w3)-1);
 				}
@@ -144,8 +161,9 @@ static int parse(RParse *p, const char *data, char *str) {
 			const char *wa[] = { w0, w1, w2, w3 };
 			int nw = 0;
 			for (i=0; i<4; i++) {
-				if (wa[i][0] != '\0')
-				nw++;
+				if (wa[i][0] != '\0') {
+					nw++;
+				}
 			}
 			replace (nw, wa, str);
 		}
diff --git a/libr/parse/p/parse_avr_pseudo.c b/libr/parse/p/parse_avr_pseudo.c
index 30215562e2..11b792d8e5 100644
--- a/libr/parse/p/parse_avr_pseudo.c
+++ b/libr/parse/p/parse_avr_pseudo.c
@@ -110,7 +110,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy (newstr + k, w);
 							k += strlen(w) - 1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k] = '\0';
 			}
diff --git a/libr/parse/p/parse_dalvik_pseudo.c b/libr/parse/p/parse_dalvik_pseudo.c
index 9c6c4ba05a..35c330c142 100644
--- a/libr/parse/p/parse_dalvik_pseudo.c
+++ b/libr/parse/p/parse_dalvik_pseudo.c
@@ -203,7 +203,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy (newstr+k, w);
 							k += strlen(w)-1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k]='\0';
 			}
@@ -240,8 +242,9 @@ static int parse(RParse *p, const char *data, char *str) {
 	}
 
 	// malloc can be slow here :?
-	if (!(buf = malloc (len+1)))
+	if (!(buf = malloc (len + 1))) {
 		return false;
+	}
 	memcpy (buf, data, len+1);
 
 	r_str_trim (buf);
@@ -253,11 +256,14 @@ static int parse(RParse *p, const char *data, char *str) {
 		w3[0]='\0';
 		w4[0]='\0';
 		ptr = strchr (buf, ' ');
-		if (!ptr)
+		if (!ptr) {
 			ptr = strchr (buf, '\t');
+		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr==' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			strncpy (w0, buf, sizeof (w0) - 1);
 			w0[sizeof(w0)-1] = '\0';
 			strncpy (w1, ptr, sizeof (w1) - 1);
@@ -265,11 +271,15 @@ static int parse(RParse *p, const char *data, char *str) {
 
 			optr=ptr;
 			ptr2 = strchr (ptr, '}');
-			if (ptr2) ptr = ptr2+1;
+			if (ptr2) {
+				ptr = ptr2 + 1;
+			}
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr==' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				strncpy (w1, optr, sizeof (w1) - 1);
 				w1[sizeof(w1)-1] = '\0';
 				strncpy (w2, ptr, sizeof (w2) - 1);
@@ -278,7 +288,9 @@ static int parse(RParse *p, const char *data, char *str) {
 				ptr = strchr (ptr, ',');
 				if (ptr) {
 					*ptr = '\0';
-					for (++ptr; *ptr==' '; ptr++);
+					for (++ptr; *ptr == ' '; ptr++) {
+						;
+					}
 					strncpy (w2, optr, sizeof (w2) - 1);
 					w2[sizeof(w2)-1] = '\0';
 					strncpy (w3, ptr, sizeof (w3) - 1);
@@ -288,7 +300,9 @@ static int parse(RParse *p, const char *data, char *str) {
 					ptr = strchr (ptr, ',');
 					if (ptr) {
 						*ptr = '\0';
-						for (++ptr; *ptr==' '; ptr++);
+						for (++ptr; *ptr == ' '; ptr++) {
+							;
+						}
 						strncpy (w3, optr, sizeof (w3) - 1);
 						w3[sizeof(w3)-1] = '\0';
 						strncpy (w4, ptr, sizeof (w4) - 1);
@@ -301,8 +315,9 @@ static int parse(RParse *p, const char *data, char *str) {
 			const char *wa[] = { w0, w1, w2, w3, w4 };
 			int nw = 0;
 			for (i=0; i<4; i++) {
-				if (wa[i][0] != '\0')
-				nw++;
+				if (wa[i][0] != '\0') {
+					nw++;
+				}
 			}
 			replace (nw, wa, str);
 {
diff --git a/libr/parse/p/parse_m68k_pseudo.c b/libr/parse/p/parse_m68k_pseudo.c
index 3b577d5571..93d3672857 100644
--- a/libr/parse/p/parse_m68k_pseudo.c
+++ b/libr/parse/p/parse_m68k_pseudo.c
@@ -132,11 +132,14 @@ static int parse(RParse *p, const char *data, char *str) {
 		w3[0]='\0';
 		w4[0]='\0';
 		ptr = strchr (buf, ' ');
-		if (!ptr)
+		if (!ptr) {
 			ptr = strchr (buf, '\t');
+		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr==' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			strncpy (w0, buf, WSZ - 1);
 			strncpy (w1, ptr, WSZ - 1);
 
@@ -144,14 +147,18 @@ static int parse(RParse *p, const char *data, char *str) {
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr==' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				strncpy (w1, optr, WSZ - 1);
 				strncpy (w2, ptr, WSZ - 1);
 				optr=ptr;
 				ptr = strchr (ptr, ',');
 				if (ptr) {
 					*ptr = '\0';
-					for (++ptr; *ptr==' '; ptr++);
+					for (++ptr; *ptr == ' '; ptr++) {
+						;
+					}
 					strncpy (w2, optr, WSZ - 1);
 					strncpy (w3, ptr, WSZ - 1);
 					optr=ptr;
@@ -159,7 +166,9 @@ static int parse(RParse *p, const char *data, char *str) {
 					ptr = strchr (ptr, ',');
 					if (ptr) {
 						*ptr = '\0';
-						for (++ptr; *ptr==' '; ptr++);
+						for (++ptr; *ptr == ' '; ptr++) {
+							;
+						}
 						strncpy (w3, optr, WSZ - 1);
 						strncpy (w4, ptr, WSZ - 1);
 					}
diff --git a/libr/parse/p/parse_mips_pseudo.c b/libr/parse/p/parse_mips_pseudo.c
index 46abc4f9e1..87f423e3f9 100644
--- a/libr/parse/p/parse_mips_pseudo.c
+++ b/libr/parse/p/parse_mips_pseudo.c
@@ -103,7 +103,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy (newstr+k, w);
 							k += strlen (w) - 1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k]='\0';
 			}
@@ -139,8 +141,9 @@ static int parse(RParse *p, const char *data, char *str) {
 	}
 
 	// malloc can be slow here :?
-	if (!(buf = malloc (len+1)))
+	if (!(buf = malloc (len + 1))) {
 		return false;
+	}
 	memcpy (buf, data, len+1);
 
 	r_str_replace_char (buf, '(', ',');
@@ -154,11 +157,14 @@ static int parse(RParse *p, const char *data, char *str) {
 		w3[0]='\0';
 		w4[0]='\0';
 		ptr = strchr (buf, ' ');
-		if (!ptr)
+		if (!ptr) {
 			ptr = strchr (buf, '\t');
+		}
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr==' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			strncpy (w0, buf, WSZ - 1);
 			strncpy (w1, ptr, WSZ - 1);
 
@@ -166,14 +172,18 @@ static int parse(RParse *p, const char *data, char *str) {
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr==' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				strncpy (w1, optr, WSZ - 1);
 				strncpy (w2, ptr, WSZ - 1);
 				optr=ptr;
 				ptr = strchr (ptr, ',');
 				if (ptr) {
 					*ptr = '\0';
-					for (++ptr; *ptr==' '; ptr++);
+					for (++ptr; *ptr == ' '; ptr++) {
+						;
+					}
 					strncpy (w2, optr, WSZ - 1);
 					strncpy (w3, ptr, WSZ - 1);
 					optr=ptr;
@@ -181,7 +191,9 @@ static int parse(RParse *p, const char *data, char *str) {
 					ptr = strchr (ptr, ',');
 					if (ptr) {
 						*ptr = '\0';
-						for (++ptr; *ptr==' '; ptr++);
+						for (++ptr; *ptr == ' '; ptr++) {
+							;
+						}
 						strncpy (w3, optr, WSZ - 1);
 						strncpy (w4, ptr, WSZ - 1);
 					}
@@ -194,8 +206,9 @@ static int parse(RParse *p, const char *data, char *str) {
 			const char *wa[] = { w0, w1, w2, w3, w4 };
 			int nw = 0;
 			for (i=0; i<4; i++) {
-				if (wa[i][0] != '\0')
-				nw++;
+				if (wa[i][0] != '\0') {
+					nw++;
+				}
 			}
 			replace (nw, wa, str);
 {
@@ -272,14 +285,17 @@ static bool varsub(RParse *p, RAnalFunction *f, ut64 addr, int oplen, char *data
 	}
 	/* iterate over arguments */
 	r_list_foreach (args, argiter, arg) {
-		if (arg->delta < 10) snprintf (oldstr, sizeof (oldstr)-1,
-			"[%s + %d]",
-			p->anal->reg->name[R_REG_NAME_BP],
-			arg->delta);
-		else snprintf (oldstr, sizeof (oldstr)-1,
-			"[%s + 0x%x]",
-			p->anal->reg->name[R_REG_NAME_BP],
-			arg->delta);
+		if (arg->delta < 10) {
+			snprintf (oldstr, sizeof (oldstr) - 1,
+				"[%s + %d]",
+				p->anal->reg->name[R_REG_NAME_BP],
+				arg->delta);
+		} else {
+			snprintf (oldstr, sizeof (oldstr) - 1,
+				"[%s + 0x%x]",
+				p->anal->reg->name[R_REG_NAME_BP],
+				arg->delta);
+		}
 		snprintf (newstr, sizeof (newstr)-1, "[%s + %s]",
 			p->anal->reg->name[R_REG_NAME_BP],
 			arg->name);
@@ -315,8 +331,11 @@ static bool varsub(RParse *p, RAnalFunction *f, ut64 addr, int oplen, char *data
 	}
 
 	r_list_foreach (vars, variter, var) {
-		if (var->delta < 10) snprintf (oldstr, sizeof (oldstr)-1, "[%s - %d]", bp, var->delta);
-		else snprintf (oldstr, sizeof (oldstr)-1, "[%s - 0x%x]", bp, var->delta);
+		if (var->delta < 10) {
+			snprintf (oldstr, sizeof (oldstr) - 1, "[%s - %d]", bp, var->delta);
+		} else {
+			snprintf (oldstr, sizeof (oldstr) - 1, "[%s - 0x%x]", bp, var->delta);
+		}
 		snprintf (newstr, sizeof (newstr)-1, "[%s - %s]", bp, var->name);
 		if (strstr (tstr, oldstr) != NULL) {
 			tstr = r_str_replace (tstr, oldstr, newstr, 1);
diff --git a/libr/parse/p/parse_mreplace.c b/libr/parse/p/parse_mreplace.c
index 9a4a07a75f..b3b1fb95a5 100644
--- a/libr/parse/p/parse_mreplace.c
+++ b/libr/parse/p/parse_mreplace.c
@@ -29,7 +29,9 @@ static int assemble(RParse *p, char *data, char *str) {
 	if (ptr) {
 		*ptr = '\0';
 		sprintf (data, "mov %s, %s", str, ptr+1);
-	} else strcpy (data, str);
+	} else {
+		strcpy (data, str);
+	}
 	return true;
 }
 
diff --git a/libr/parse/p/parse_mreplace/mmemory.c b/libr/parse/p/parse_mreplace/mmemory.c
index 878b484f3d..1373a6c044 100644
--- a/libr/parse/p/parse_mreplace/mmemory.c
+++ b/libr/parse/p/parse_mreplace/mmemory.c
@@ -30,13 +30,17 @@ void memFree(memChunk *chunk) {
 }
 void memInit() {
 	mInfo = (memInfo*) malloc (sizeof (memInfo));
-	if (!mInfo) return;
+	if (!mInfo) {
+		return;
+	}
 	memset (mInfo, 0, sizeof (memInfo));
 	mInfo->state = MEM_STATE_OK;
 	mInfo->allocated += sizeof (memInfo);
 }
 void memCheckState() {
-	if (!mInfo) memInit();
+	if (!mInfo) {
+		memInit ();
+	}
 	if (mInfo->state != MEM_STATE_OK){
 		fprintf (stderr,"\rMemory not initialized :p\n");
 		exit (0);
@@ -81,7 +85,9 @@ memChunk *memString(char *string) {
 void memCopy(memChunk *dest,memChunk *source) {
 	long nbytes;
 	memCheckState ();
-	if ((!source->address) || (!dest->address)) return;
+	if ((!source->address) || (!dest->address)) {
+		return;
+	}
 	nbytes=dest->size > source->size ? source->size : dest->size;
 	#if DEBUG3
 	eprintf ("Copying %d byte(s) to dest (size %d)\n", nbytes, dest->address, dest->size);
diff --git a/libr/parse/p/parse_mreplace/mreplace.c b/libr/parse/p/parse_mreplace/mreplace.c
index 9ddb5b41a0..9df20500ca 100644
--- a/libr/parse/p/parse_mreplace/mreplace.c
+++ b/libr/parse/p/parse_mreplace/mreplace.c
@@ -30,7 +30,9 @@
 int matchs(const char *string, char *pattern) {
 	int status = 0;
 	RRegex *re = r_regex_new (pattern, "");
-	if (!re) return status;
+	if (!re) {
+		return status;
+	}
 	if (r_regex_comp (re, pattern, R_REGEX_EXTENDED|R_REGEX_NOSUB) == 0) {
 		status = r_regex_exec (re, string, (size_t) 0, NULL, 0)? 1: 0;
 	}
@@ -42,7 +44,9 @@ void sreplace(char *s,char *orig,char *rep,char multi,long dsize){
 	char *p;
 	memChunk *buffer,*string,*result;
 
-	if(!(p = strstr (s, orig))) return;
+	if (!(p = strstr (s, orig))) {
+		return;
+	}
 
 	buffer = memReserve (dsize);
 	string = memString (s);
@@ -74,9 +78,15 @@ char *mreplace(char *string, char *se,char *rep) {
 	int status, i;
 	RRegex *re;
 
-	if (!string) return "";
-	if (!strlen (se)) return string;
-	if (!strcmp (se,rep)) return string;
+	if (!string) {
+		return "";
+	}
+	if (!strlen (se)) {
+		return string;
+	}
+	if (!strcmp (se, rep)) {
+		return string;
+	}
 
 	temp = memStringReserve (string,INPUTLINE_BUFFER_REPLACE_SIZE);
 	search = memStringReserve (se,INPUTLINE_BUFFER_REPLACE_SIZE);
@@ -91,11 +101,14 @@ char *mreplace(char *string, char *se,char *rep) {
 #endif
 	re = r_regex_new ("", 0);
 
-	if (r_regex_comp (re, search->address, R_REGEX_EXTENDED) != 0)
-		if(r_regex_comp (re, search->address, R_REGEX_EXTENDED<<1))
+	if (r_regex_comp (re, search->address, R_REGEX_EXTENDED) != 0) {
+		if (r_regex_comp (re, search->address, R_REGEX_EXTENDED << 1)) {
 			noMatch = 1;
-	if ((status = r_regex_exec (re, string, nmatch, pm, 0)))
+		}
+	}
+	if ((status = r_regex_exec (re, string, nmatch, pm, 0))) {
 		noMatch = 1;
+	}
 	if (noMatch) {
 		memFree (temp);
 		memFree (search);
@@ -160,7 +173,9 @@ char *treplace(char *data,char *search,char *replace){
 	memChunk *result,*line;
 	//ulong resultAllocSize;
 
-	if (!strlen(search)) return data;
+	if (!strlen (search)) {
+		return data;
+	}
 
 #if MDEBUG2
 	DBG ("treplace(string,se,re)","string  : %s",data);
@@ -173,12 +188,17 @@ char *treplace(char *data,char *search,char *replace){
 
 	p=data;
 	while (sscanf (p, "%[^\n]", line->address) == 1){
-		if (p - data > strlen (data)) break;
+		if (p - data > strlen (data)) {
+			break;
+		}
 		newline = mreplace (line->address, search, replace);
 
 		memStrCat (result, newline);
-		if (line->address && *(p + strlen (line->address))) memStrCat (result, "\n");
-		else break;
+		if (line->address && *(p + strlen (line->address))) {
+			memStrCat (result, "\n");
+		} else {
+			break;
+		}
 
 		p += strlen (line->address) + 1;
 	}
diff --git a/libr/parse/p/parse_ppc_pseudo.c b/libr/parse/p/parse_ppc_pseudo.c
index 8818b55728..1504fab762 100644
--- a/libr/parse/p/parse_ppc_pseudo.c
+++ b/libr/parse/p/parse_ppc_pseudo.c
@@ -122,9 +122,13 @@ static int can_replace(const char *str, int idx, int max_operands) {
 static const char* getspr(const char *reg) {
 	static char cspr[16];
 	ut32 spr = 0;
-	if (!reg) return NULL;
+	if (!reg) {
+		return NULL;
+	}
 	spr = strtol(reg, NULL, 16);
-	if(spr > 9999) return NULL; //just to avoid overflows..
+	if (spr > 9999) {
+		return NULL; //just to avoid overflows..
+	}
 
 	switch (spr) {
 		case SPR_MQ:
diff --git a/libr/parse/p/parse_sh_pseudo.c b/libr/parse/p/parse_sh_pseudo.c
index 9bb3003c85..d7db975acd 100644
--- a/libr/parse/p/parse_sh_pseudo.c
+++ b/libr/parse/p/parse_sh_pseudo.c
@@ -132,7 +132,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy (newstr + k, w);
 							k += strlen(w) - 1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k] = '\0';
 			}
diff --git a/libr/parse/p/parse_x86_pseudo.c b/libr/parse/p/parse_x86_pseudo.c
index 3167e8a48a..095cb68400 100644
--- a/libr/parse/p/parse_x86_pseudo.c
+++ b/libr/parse/p/parse_x86_pseudo.c
@@ -181,21 +181,29 @@ static int parse (RParse *p, const char *data, char *str) {
 			ptr = end;
 		}
 		*ptr = '\0';
-		if (ptr != end) for (++ptr; *ptr == ' '; ptr++);
+		if (ptr != end) {
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
+		}
 		r_str_ncpy (w0, buf, sizeof (w0));
 		r_str_ncpy (w1, ptr, sizeof (w1));
 		optr = ptr;
 		ptr = strchr (ptr, ',');
 		if (ptr) {
 			*ptr = '\0';
-			for (++ptr; *ptr == ' '; ptr++);
+			for (++ptr; *ptr == ' '; ptr++) {
+				;
+			}
 			r_str_ncpy (w1, optr, sizeof (w1));
 			r_str_ncpy (w2, ptr, sizeof (w2));
 			optr = ptr;
 			ptr = strchr (ptr, ',');
 			if (ptr) {
 				*ptr = '\0';
-				for (++ptr; *ptr == ' '; ptr++);
+				for (++ptr; *ptr == ' '; ptr++) {
+					;
+				}
 				r_str_ncpy (w2, optr, sizeof (w2));
 				r_str_ncpy (w3, ptr, sizeof (w3));
 			}
diff --git a/libr/parse/p/parse_z80_pseudo.c b/libr/parse/p/parse_z80_pseudo.c
index 6b1ebecbf3..a962ba65c4 100644
--- a/libr/parse/p/parse_z80_pseudo.c
+++ b/libr/parse/p/parse_z80_pseudo.c
@@ -52,7 +52,9 @@ static int replace(int argc, const char *argv[], char *newstr) {
 							strcpy (newstr+k, w);
 							k += strlen(w)-1;
 						}
-					} else newstr[k] = ops[i].str[j];
+					} else {
+						newstr[k] = ops[i].str[j];
+					}
 				}
 				newstr[k]='\0';
 			}
diff --git a/libr/parse/parse.c b/libr/parse/parse.c
index 84008ffdef..88c13a6975 100644
--- a/libr/parse/parse.c
+++ b/libr/parse/parse.c
@@ -125,13 +125,17 @@ static char *findNextNumber(char *op) {
 			if (p[0] && p[1] == ';') {
 				// "\x1b[%d;2;%d;%d;%dm", fgbg, r, g, b
 				// "\x1b[%d;5;%dm", fgbg, rgb (r, g, b)
-				for (; p[0] && p[1] && p[0] != 0x1b && p[1] != '\\'; p++);
+				for (; p[0] && p[1] && p[0] != 0x1b && p[1] != '\\'; p++) {
+					;
+				}
 				if (p[0] && p[1] == '\\') {
 					p++;
 				}
 			} else {
 				// "\x1b[%dm", 30 + k
-				for (; *p && *p != 'J' && *p != 'm' && *p != 'H'; p++);
+				for (; *p && *p != 'J' && *p != 'm' && *p != 'H'; p++) {
+					;
+				}
 				if (*p) {
 					p++;
 					if (!*p) {
@@ -156,7 +160,9 @@ static char *findNextNumber(char *op) {
 				}
 				if (!IS_DIGIT (*p)) {
 					char *t = p;
-					for (; *t && *t != ']'; t++);
+					for (; *t && *t != ']'; t++) {
+						;
+					}
 					if (*t == ']') {
 						continue;
 					}
@@ -183,8 +189,12 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
 	bool x86 = false;
 	bool computed = false;
 	if (p && p->cur && p->cur->name) {
-		if (strstr (p->cur->name, "x86")) x86 = true;
-		if (strstr (p->cur->name, "m68k")) x86 = true;
+		if (strstr (p->cur->name, "x86")) {
+			x86 = true;
+		}
+		if (strstr (p->cur->name, "m68k")) {
+			x86 = true;
+		}
 	}
 	if (!data || !p) {
 		return 0;
@@ -218,7 +228,9 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
 		//		eprintf ("(%s) (%c)\n", optr, *ptr2);
 			}
 		} else {
-			for (ptr2 = ptr; *ptr2 && (*ptr2 != ']' && (*ptr2 != '\x1b') && !IS_SEPARATOR (*ptr2)); ptr2++);
+			for (ptr2 = ptr; *ptr2 && (*ptr2 != ']' && (*ptr2 != '\x1b') && !IS_SEPARATOR (*ptr2)); ptr2++) {
+				;
+			}
 		}
 		off = r_num_math (NULL, ptr);
 		if (off >= p->minval) {
@@ -269,7 +281,9 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
 					if (computed && ptr != ptr2 && *ptr) {
 						if (*ptr2 == ']') {
 							ptr2++;
-							for (ptr--; ptr > data && *ptr != '['; ptr--);
+							for (ptr--; ptr > data && *ptr != '['; ptr--) {
+								;
+							}
 							if (ptr == data) {
 								ptr = ptr_backup;
 							}
@@ -297,7 +311,9 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
 						}
 						while (*ptr_right) {
 							if (*ptr_right == 0x1b) {
-								while (*ptr_right && *ptr_right != 'm') ptr_right++;
+								while (*ptr_right && *ptr_right != 'm') {
+									ptr_right++;
+								}
 								if (*ptr_right) {
 									ptr_right++;
 								}
@@ -316,7 +332,9 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
 								if (ptr_left < str) {
 									break;
 								}
-								for (; ptr_esc >= str && *ptr_esc != 0x1b; ptr_esc--);
+								for (; ptr_esc >= str && *ptr_esc != 0x1b; ptr_esc--) {
+									;
+								}
 								if (ptr_esc < str) {
 									ptr_esc = ptr_end - flag_len + 1;
 								}
diff --git a/libr/reg/cond.c b/libr/reg/cond.c
index 473c30f6c0..cb0ae1c965 100644
--- a/libr/reg/cond.c
+++ b/libr/reg/cond.c
@@ -32,8 +32,9 @@ R_API RRegItem *r_reg_cond_get(RReg *reg, const char *name) {
 	RRegItem *r;
 	if (name) {
 		r_list_foreach (reg->regset[i].regs, iter, r) {
-			if (r->flags && !strcmp (name, r->flags))
+			if (r->flags && !strcmp (name, r->flags)) {
 				return r;
+			}
 		}
 	}
 	return NULL;
@@ -47,25 +48,52 @@ R_API const char *r_reg_cond_to_string(int n) {
 	const char *cs[] = {
 		"eq", "ne", "cf", "neg", "of", "hi", "he",
 		"lo", "loe", "ge", "gt", "lt", "le"};
-	if (n < 0 || (n > (sizeof (cs) / sizeof (*cs)) - 1))
+	if (n < 0 || (n > (sizeof (cs) / sizeof (*cs)) - 1)) {
 		return NULL;
+	}
 	return cs[n];
 }
 
 R_API int r_reg_cond_from_string(const char *str) {
-	if (!strcmp (str, "eq")) return R_REG_COND_EQ;
-	if (!strcmp (str, "ne")) return R_REG_COND_NE;
-	if (!strcmp (str, "cf")) return R_REG_COND_CF;
-	if (!strcmp (str, "neg")) return R_REG_COND_NEG;
-	if (!strcmp (str, "of")) return R_REG_COND_OF;
-	if (!strcmp (str, "hi")) return R_REG_COND_HI;
-	if (!strcmp (str, "he")) return R_REG_COND_HE;
-	if (!strcmp (str, "lo")) return R_REG_COND_LO;
-	if (!strcmp (str, "loe")) return R_REG_COND_LOE;
-	if (!strcmp (str, "ge")) return R_REG_COND_GE;
-	if (!strcmp (str, "gt")) return R_REG_COND_GT;
-	if (!strcmp (str, "lt")) return R_REG_COND_LT;
-	if (!strcmp (str, "le")) return R_REG_COND_LE;
+	if (!strcmp (str, "eq")) {
+		return R_REG_COND_EQ;
+	}
+	if (!strcmp (str, "ne")) {
+		return R_REG_COND_NE;
+	}
+	if (!strcmp (str, "cf")) {
+		return R_REG_COND_CF;
+	}
+	if (!strcmp (str, "neg")) {
+		return R_REG_COND_NEG;
+	}
+	if (!strcmp (str, "of")) {
+		return R_REG_COND_OF;
+	}
+	if (!strcmp (str, "hi")) {
+		return R_REG_COND_HI;
+	}
+	if (!strcmp (str, "he")) {
+		return R_REG_COND_HE;
+	}
+	if (!strcmp (str, "lo")) {
+		return R_REG_COND_LO;
+	}
+	if (!strcmp (str, "loe")) {
+		return R_REG_COND_LOE;
+	}
+	if (!strcmp (str, "ge")) {
+		return R_REG_COND_GE;
+	}
+	if (!strcmp (str, "gt")) {
+		return R_REG_COND_GT;
+	}
+	if (!strcmp (str, "lt")) {
+		return R_REG_COND_LT;
+	}
+	if (!strcmp (str, "le")) {
+		return R_REG_COND_LE;
+	}
 	eprintf ("| Usage: drc [condition]\n"
 		"| eq    equal\n"
 		"| ne    not equal\n"
@@ -115,8 +143,12 @@ R_API int r_reg_cond(RReg *r, int type) {
 }
 
 R_API RRegFlags *r_reg_cond_retrieve(RReg *r, RRegFlags *f) {
-	if (!f) f = R_NEW0 (RRegFlags);
-	if (!f) return NULL;
+	if (!f) {
+		f = R_NEW0 (RRegFlags);
+	}
+	if (!f) {
+		return NULL;
+	}
 	f->s = r_reg_cond_get_value (r, "sign");     // sign, negate flag, less than zero
 	f->z = r_reg_cond_get_value (r, "zero");     // zero flag
 	f->c = r_reg_cond_get_value (r, "carry");    // carry flag
diff --git a/libr/search/aes-find.c b/libr/search/aes-find.c
index 5c752e0a22..8e39d6dbce 100644
--- a/libr/search/aes-find.c
+++ b/libr/search/aes-find.c
@@ -39,10 +39,12 @@ static int aes_key_test(const unsigned char *buf) {
 
 R_API int r_search_aes_update(RSearch *s, ut64 from, const ut8 *buf, int len) {
 	int i, last = len-31;
-	if (last>0)
-	for (i=0; i<last; i++) {
-		if (aes_key_test (buf+i))
-			return i;
+	if (last > 0) {
+		for (i = 0; i < last; i++) {
+			if (aes_key_test (buf + i)) {
+				return i;
+			}
+		}
 	}
 	return -1;
 }
diff --git a/libr/search/bytepat.c b/libr/search/bytepat.c
index 6dbf803b5d..706b31be8d 100644
--- a/libr/search/bytepat.c
+++ b/libr/search/bytepat.c
@@ -19,7 +19,9 @@ typedef struct _fnditem {
 static fnditem* init_fi() {
 	fnditem* n;
 	n = (fnditem*) malloc (sizeof (fnditem));
-	if (!n) return NULL;
+	if (!n) {
+		return NULL;
+	}
 	n->next = NULL;
 	return n;
 }
@@ -38,7 +40,9 @@ static void fini_fi(fnditem* fi) {
 
 static void add_fi (fnditem* n, unsigned char* blk, int patlen) {
 	fnditem* p;
-	for (p=n; p->next!=NULL; p=p->next);
+	for (p = n; p->next != NULL; p = p->next) {
+		;
+	}
 	p->next = (fnditem*) malloc (sizeof (fnditem));
 	p = p->next;
 	memcpy (p->str, blk, patlen);
@@ -47,9 +51,11 @@ static void add_fi (fnditem* n, unsigned char* blk, int patlen) {
 
 static int is_fi_present(fnditem* n, unsigned char* blk , int patlen) {
 	fnditem* p;
-	for (p=n; p->next!=NULL; p=p->next)
-		if (!memcmp (blk, p->str, patlen))
+	for (p = n; p->next != NULL; p = p->next) {
+		if (!memcmp (blk, p->str, patlen)) {
 			return true;
+		}
+	}
 	return false;
 }
 
@@ -108,8 +114,9 @@ R_API int r_search_pattern(RSearch *s, ut64 from, ut64 to) {
 						add_fi (root, sblk, patlen);
 						pcnt++;
 						eprintf ("\nbytes: %d: ", pcnt);
-						for (k = 0; k<patlen; k++)
+						for (k = 0; k < patlen; k++) {
 							eprintf ("%02x", sblk[k]);
+						}
 						eprintf ("\nfound: %d: 0x%08"PFMT64x" ", pcnt, intaddr);
 					}
 					moar++;
@@ -117,8 +124,9 @@ R_API int r_search_pattern(RSearch *s, ut64 from, ut64 to) {
 					eprintf ("0x%08"PFMT64x" ", bproc+i);
 				}
 			}
-			if (moar>0)
-				eprintf ("\ncount: %d: %d\n", pcnt, moar+1);
+			if (moar > 0) {
+				eprintf ("\ncount: %d: %d\n", pcnt, moar + 1);
+			}
 			bproc += rb;
 		}
 		bact += (moar > 0)? patlen: 1;
diff --git a/libr/search/keyword.c b/libr/search/keyword.c
index 0e3fa9c6e5..82408c1b30 100644
--- a/libr/search/keyword.c
+++ b/libr/search/keyword.c
@@ -5,18 +5,22 @@
 static int ignoreMask(const ut8 *bm, int len) {
 	int i;
 	for (i=0; i<len; i++) {
-		if (bm[i] != 0xff)
+		if (bm[i] != 0xff) {
 			return 0;
+		}
 	}
 	return 1;
 }
 
 R_API RSearchKeyword* r_search_keyword_new(const ut8 *kwbuf, int kwlen, const ut8 *bmbuf, int bmlen, const char *data) {
 	RSearchKeyword *kw;
-	if (kwlen < 1 || bmlen < 0)
+	if (kwlen < 1 || bmlen < 0) {
 		return NULL;
+	}
 	kw = R_NEW0 (RSearchKeyword);
-	if (!kw) return NULL;
+	if (!kw) {
+		return NULL;
+	}
 	kw->type = R_SEARCH_KEYWORD_TYPE_BINARY;
 	kw->data = (void *) data;
 	kw->keyword_length = kwlen;
@@ -57,7 +61,9 @@ R_API RSearchKeyword* r_search_keyword_new_str(const char *kwbuf, const char *bm
 
 	if (bmstr) {
 		bmbuf = malloc (strlen (bmstr)+1);
-		if (!bmbuf) return NULL;
+		if (!bmbuf) {
+			return NULL;
+		}
 		bmlen = r_hex_str2bin (bmstr, bmbuf);
 		if (bmlen < 1) {
 			free (bmbuf);
@@ -83,7 +89,9 @@ R_API RSearchKeyword* r_search_keyword_new_wide(const char *kwbuf, const char *b
 
 	if (bmstr) {
 		bmbuf = malloc (strlen (bmstr)+1);
-		if (!bmbuf) return NULL;
+		if (!bmbuf) {
+			return NULL;
+		}
 		bmlen = r_hex_str2bin (bmstr, bmbuf);
 		if (bmlen < 1) {
 			free(bmbuf);
@@ -94,10 +102,11 @@ R_API RSearchKeyword* r_search_keyword_new_wide(const char *kwbuf, const char *b
 	len = strlen(kwbuf);
 	str = malloc((len+1)*2);
 	for (p2=kwbuf, p=str; *p2; p+=2, p2++) {
-		if (ignore_case)
+		if (ignore_case) {
 			p[0] = tolower((const unsigned char)*p2);
-		else
+		} else {
 			p[0] = *p2;
+		}
 		p[1] = 0;
 	}
 
@@ -115,12 +124,14 @@ R_API RSearchKeyword* r_search_keyword_new_hex(const char *kwstr, const char *bm
 	ut8 *kwbuf, *bmbuf;
 	int kwlen, bmlen = 0;
 
-	if (!kwstr)
+	if (!kwstr) {
 		return NULL;
+	}
 
 	kwbuf = malloc (strlen (kwstr)+1);
-	if (!kwbuf)
+	if (!kwbuf) {
 		return NULL;
+	}
 
 	kwlen = r_hex_str2bin (kwstr, kwbuf);
 	if (kwlen < 1) {
@@ -159,10 +170,12 @@ R_API RSearchKeyword* r_search_keyword_new_hexmask(const char *kwstr, const char
 		bm = malloc (len + 4);
 		if (kw != NULL && bm != NULL) {
 			len = r_hex_str2binmask (kwstr, (ut8*)kw, (ut8*)bm);
-			if (len<0)
-				len = -len -1;
-			if (len>0)
+			if (len < 0) {
+				len = -len - 1;
+			}
+			if (len > 0) {
 				ks = r_search_keyword_new (kw, len, bm, len, data);
+			}
 		}
 		free (kw);
 		free (bm);
@@ -175,28 +188,34 @@ R_API RSearchKeyword *r_search_keyword_new_regexp (const char *str, const char *
 	RSearchKeyword *kw;
 	int i = 0, start, length;
 
-	while (isspace((const unsigned char)str[i]))
+	while (isspace ((const unsigned char)str[i])) {
 		i++;
+	}
 
-	if (str[i++] != '/')
+	if (str[i++] != '/') {
 		return NULL;
+	}
 
 	/* Find the fist non backslash-escaped slash */
 	for (start = i; str[i]; i++) {
-		if (str[i] == '/' && str[i-1] != '\\')
+		if (str[i] == '/' && str[i - 1] != '\\') {
 			break;
+		}
 	}
 
-	if (str[i++] != '/')
+	if (str[i++] != '/') {
 		return NULL;
+	}
 
 	length = i - start - 1;
-	if ((length > 128) || (length < 1))
+	if ((length > 128) || (length < 1)) {
 		return NULL;
+	}
 
 	kw = R_NEW0(RSearchKeyword);
-	if (!kw)
+	if (!kw) {
 		return NULL;
+	}
 
 	kw->bin_keyword = malloc (length+1);
 	if (!kw->bin_keyword) {
diff --git a/libr/search/regexp.c b/libr/search/regexp.c
index ac98df1d52..595be71543 100644
--- a/libr/search/regexp.c
+++ b/libr/search/regexp.c
@@ -14,8 +14,9 @@ R_API int r_search_regexp_update(RSearch *s, ut64 from, const ut8 *buf, int len)
 	r_list_foreach (s->kws, iter, kw) {
 		int reflags = R_REGEX_EXTENDED;
 
-		if (kw->icase)
+		if (kw->icase) {
 			reflags |= R_REGEX_ICASE;
+		}
 
 		if (r_regex_comp (&compiled, (char *)kw->bin_keyword, reflags)) {
 			eprintf ("Cannot compile '%s' regexp\n", kw->bin_keyword);
diff --git a/libr/search/rsa-find.c b/libr/search/rsa-find.c
index b8fd7aef10..d0bbbe28aa 100644
--- a/libr/search/rsa-find.c
+++ b/libr/search/rsa-find.c
@@ -22,8 +22,9 @@ static const ut8* parse_next_rsa_field(const ut8* start, ut32 *len) {
 	} else {
 		int i;
 		const int lensize = start[1] & 127;
-		for (i=0; i < lensize; i++)
-			*len = (*len << 8) | start[2+i];
+		for (i = 0; i < lensize; i++) {
+			*len = (*len << 8) | start[2 + i];
+		}
 		return start + 2 + lensize;
 	}
 }
@@ -36,11 +37,14 @@ static int check_rsa_fields(const ut8* start) {
 	// skip sequence field
 	ut8 const* ptr = parse_next_rsa_field (start, &len);
 
-	if (!len || len > 1024)
+	if (!len || len > 1024) {
 		return false;
-	for (i = 0; i < NB_PRIV_FIELDS; i++)
-		if (!(ptr = parse_next_rsa_field (ptr, &len)))
+	}
+	for (i = 0; i < NB_PRIV_FIELDS; i++) {
+		if (!(ptr = parse_next_rsa_field (ptr, &len))) {
 			return false;
+		}
+	}
 	return true;
 }
 
@@ -54,8 +58,9 @@ R_API int r_search_rsa_update(RSearch* s, ut64 from, const ut8 *buf, int len) {
 	}
 
 	for (i = 0; i < len - sizeof (versionmarker); i++) {
-		if (memcmp (&buf[i], versionmarker, sizeof (versionmarker)))
+		if (memcmp (&buf[i], versionmarker, sizeof (versionmarker))) {
 			continue;
+		}
 
 		index = 0;
 		for (k=i; k != 0 && k > i - 20; k--) {
@@ -65,11 +70,13 @@ R_API int r_search_rsa_update(RSearch* s, ut64 from, const ut8 *buf, int len) {
 			}
 		}
 
-		if (!index)
+		if (!index) {
 			continue;
+		}
 
-		if (check_rsa_fields(buf + index))
+		if (check_rsa_fields (buf + index)) {
 			return i;
+		}
 	}
 	return -1;
 }
diff --git a/libr/search/search.c b/libr/search/search.c
index 5da690edbb..15655cc89e 100644
--- a/libr/search/search.c
+++ b/libr/search/search.c
@@ -17,7 +17,9 @@ typedef struct {
 
 R_API RSearch *r_search_new(int mode) {
 	RSearch *s = R_NEW0 (RSearch);
-	if (!s) return NULL;
+	if (!s) {
+		return NULL;
+	}
 	if (!r_search_set_mode (s, mode)) {
 		free (s);
 		eprintf ("Cannot init search for mode %d\n", mode);
@@ -60,8 +62,9 @@ R_API RSearch *r_search_free(RSearch *s) {
 }
 
 R_API int r_search_set_string_limits(RSearch *s, ut32 min, ut32 max) {
-	if (max < min)
+	if (max < min) {
 		return false;
+	}
 	s->string_min = min;
 	s->string_max = max;
 	return true;
@@ -336,7 +339,9 @@ static bool brute_force_match(RSearch *s, RSearchKeyword *kw, const ut8 *buf, in
 				a = tolower (a);
 				b = tolower (b);
 			}
-			if ((a & kw->bin_binmask[k]) != (b & kw->bin_binmask[k])) break;
+			if ((a & kw->bin_binmask[k]) != (b & kw->bin_binmask[k])) {
+				break;
+			}
 		}
 	} else if (kw->icase) {
 		while (j < kw->keyword_length &&
diff --git a/libr/socket/http.c b/libr/socket/http.c
index 6fc8081226..53510ebc5e 100644
--- a/libr/socket/http.c
+++ b/libr/socket/http.c
@@ -7,25 +7,34 @@ static char *r_socket_http_answer (RSocket *s, int *code, int *rlen) {
 	const char *p;
 	int ret, olen, len = 0, bufsz = 32768, delta = 0;
 	char *dn, *res, *buf = malloc (bufsz + 32); // XXX: use r_buffer here
-	if (!buf) return NULL;
+	if (!buf) {
+		return NULL;
+	}
 
 	r_socket_block_time (s, 1, 5);
 	res = NULL;
 	olen = r_socket_read_block (s, (unsigned char*) buf, bufsz);
-	if (olen < 1) goto fail;
+	if (olen < 1) {
+		goto fail;
+	}
 	buf[olen] = 0;
 	if ((dn = (char*)r_str_casestr (buf, "\n\n"))) {
 		delta += 2;
 	} else if ((dn = (char*)r_str_casestr (buf, "\r\n\r\n"))) {
 		delta += 4;
-	} else goto fail;
+	} else {
+		goto fail;
+	}
 
 	olen -= delta;
 	*dn = 0; // chop headers
 	/* Parse Len */
 	p = r_str_casestr (buf, "Content-Length: ");
-	if (p) len = atoi (p+16);
-	else len = olen - (dn - buf);
+	if (p) {
+		len = atoi (p + 16);
+	} else {
+		len = olen - (dn - buf);
+	}
 
 	if (len >0) {
 		if (len > olen) {
@@ -34,8 +43,9 @@ static char *r_socket_http_answer (RSocket *s, int *code, int *rlen) {
 			do {
 				ret = r_socket_read_block (s,
 					(ut8*) res+olen, len-olen);
-				if (ret < 1)
+				if (ret < 1) {
 					break;
+				}
 				olen += ret;
 			} while (olen<len);
 			res[len] = 0;
@@ -46,12 +56,16 @@ static char *r_socket_http_answer (RSocket *s, int *code, int *rlen) {
 				res[len] = 0;
 			}
 		}
-	} else res = NULL;
+	} else {
+		res = NULL;
+	}
 fail:
 	free (buf);
 // is 's' free'd? isnt this going to cause a double free?
 	r_socket_close (s);
-	if (rlen) *rlen = len;
+	if (rlen) {
+		*rlen = len;
+	}
 	return res;
 }
 
@@ -60,10 +74,16 @@ R_API char *r_socket_http_get (const char *url, int *code, int *rlen) {
 	int ssl = !memcmp (url, "https://", 8);
 	char *response, *host, *path, *port = "80";
 	char *uri = strdup (url);
-	if (!uri) return NULL;
+	if (!uri) {
+		return NULL;
+	}
 
-	if (code) *code = 0;
-	if (rlen) *rlen = 0;
+	if (code) {
+		*code = 0;
+	}
+	if (rlen) {
+		*rlen = 0;
+	}
 	host = strstr (uri, "://");
 	if (!host) {
 		free (uri);
@@ -80,8 +100,11 @@ R_API char *r_socket_http_get (const char *url, int *code, int *rlen) {
 		path = port;
 	}
 	path = strchr (path, '/');
-	if (!path) path = "";
-	else *path++ = 0;
+	if (!path) {
+		path = "";
+	} else {
+		*path++ = 0;
+	}
 	s = r_socket_new (ssl);
 	if (!s) {
 		eprintf ("r_socket_http_get: Cannot create socket\n");
@@ -110,7 +133,9 @@ R_API char *r_socket_http_post (const char *url, const char *data, int *code, in
 	int ssl = !memcmp (url, "https://", 8);
 	char *response, *host, *path, *port = "80";
 	char *uri = strdup (url);
-	if (!uri) return NULL;
+	if (!uri) {
+		return NULL;
+	}
 
 	host = strstr (uri, "://");
 	if (!host) {
@@ -120,15 +145,17 @@ R_API char *r_socket_http_post (const char *url, const char *data, int *code, in
 	}
 	host += 3;
 	port = strchr (host, ':');
-	if (!port)
+	if (!port) {
 		port = (ssl)?"443":"80";
-	else
+	} else {
 		*port++ = 0;
+	}
 	path = strchr (host, '/');
-	if (!path)
+	if (!path) {
 		path = "";
-	else
+	} else {
 		*path++ = 0;
+	}
 	s = r_socket_new (ssl);
 	if (!s) {
 		printf ("Cannot create socket\n");
diff --git a/libr/socket/http_server.c b/libr/socket/http_server.c
index 8538750e32..5acda14258 100644
--- a/libr/socket/http_server.c
+++ b/libr/socket/http_server.c
@@ -13,7 +13,9 @@ R_API RSocketHTTPRequest *r_socket_http_accept (RSocket *s, int accept_timeout,
 	int pxx = 1, first = 0;
 	char buf[1500], *p, *q;
 	RSocketHTTPRequest *hr = R_NEW0 (RSocketHTTPRequest);
-	if (!hr) return NULL;
+	if (!hr) {
+		return NULL;
+	}
 	if (accept_timeout > 0) {
 		hr->s = r_socket_accept_timeout (s, 1);
 	} else {
@@ -23,8 +25,9 @@ R_API RSocketHTTPRequest *r_socket_http_accept (RSocket *s, int accept_timeout,
 		free (hr);
 		return NULL;
 	}
-	if (timeout>0)
+	if (timeout > 0) {
 		r_socket_block_time (hr->s, 1, timeout);
+	}
 	for (;;) {
 #if __WINDOWS__
 		if (breaked)
@@ -46,11 +49,15 @@ R_API RSocketHTTPRequest *r_socket_http_accept (RSocket *s, int accept_timeout,
 				return NULL;
 			}
 			p = strchr (buf, ' ');
-			if (p) *p = 0;
+			if (p) {
+				*p = 0;
+			}
 			hr->method = strdup (buf);
 			if (p) {
 				q = strstr (p+1, " HTTP"); //strchr (p+1, ' ');
-				if (q) *q = 0;
+				if (q) {
+					*q = 0;
+				}
 				hr->path = strdup (p+1);
 			}
 		} else {
@@ -85,41 +92,60 @@ R_API void r_socket_http_response (RSocketHTTPRequest *rs, int code, const char
 		code==302?"Found":
 		code==404?"not found":
 		"UNKNOWN";
-	if (len<1) len = out? strlen (out): 0;
-	if (!headers) headers = "";
+	if (len < 1) {
+		len = out ? strlen (out) : 0;
+	}
+	if (!headers) {
+		headers = "";
+	}
 	r_socket_printf (rs->s, "HTTP/1.0 %d %s\r\n%s"
 		"Connection: close\r\nContent-Length: %d\r\n\r\n",
 		code, strcode, headers, len);
-	if (out && len>0) r_socket_write (rs->s, (void*)out, len);
+	if (out && len > 0) {
+		r_socket_write (rs->s, (void *)out, len);
+	}
 }
 
 R_API ut8 *r_socket_http_handle_upload(const ut8 *str, int len, int *retlen) {
-	if (retlen)
+	if (retlen) {
 		*retlen = 0;
+	}
 	if (!strncmp ((const char *)str, "------------------------------", 10)) {
 		int datalen;
 		char *ret;
 		const char *data, *token = (const char *)str+10;
 		const char *end = strchr (token, '\n');
-		if (!end)
+		if (!end) {
 			return NULL;
+		}
 		data = strstr (end, "Content-Disposition: form-data; ");
 		if (data) {
 			data = strchr (data, '\n');
-			if (data) data = strchr (data+1, '\n');
+			if (data) {
+				data = strchr (data + 1, '\n');
+			}
 		}
 		if (data) {
-			while (*data==10 || *data==13) data++;
+			while (*data == 10 || *data == 13) {
+				data++;
+			}
 			end = (const char *)str+len-40;
-			while (*end=='-') end--;
-			if (*end==10 || *end==13) end--;
+			while (*end == '-') {
+				end--;
+			}
+			if (*end == 10 || *end == 13) {
+				end--;
+			}
 			datalen = (size_t)(end-data);
 			ret = malloc (datalen+1);
-			if (!ret) return NULL;
+			if (!ret) {
+				return NULL;
+			}
 			memcpy (ret, data, datalen);
 			ret[datalen] = 0;
-			if (retlen)
+			if (retlen) {
 				*retlen = datalen;
+			}
 			return (ut8*)ret;
 		}
 	}
diff --git a/libr/socket/proc.c b/libr/socket/proc.c
index 082363c902..bf6692136b 100644
--- a/libr/socket/proc.c
+++ b/libr/socket/proc.c
@@ -22,26 +22,31 @@ R_API struct r_socket_proc_t *r_socket_proc_open(char* const argv[]) {
 	const int flags = 0; //O_NONBLOCK|O_CLOEXEC;
 #endif
 
-	if (!sp)
+	if (!sp) {
 		return NULL;
+	}
 
 	if (pipe (sp->fd0)==-1) {
 		perror ("pipe");
 		goto error;
 	}
-	if (fcntl (sp->fd0[0], flags) < 0)
+	if (fcntl (sp->fd0[0], flags) < 0) {
 		goto error;
-	if (fcntl (sp->fd0[1], flags) < 0)
+	}
+	if (fcntl (sp->fd0[1], flags) < 0) {
 		goto error;
+	}
 
 	if (pipe (sp->fd1)==-1) {
 		perror ("pipe");
 		goto error;
 	}
-	if (fcntl (sp->fd1[0], flags) < 0)
+	if (fcntl (sp->fd1[0], flags) < 0) {
 		goto error;
-	if (fcntl (sp->fd1[1], flags) < 0)
+	}
+	if (fcntl (sp->fd1[1], flags) < 0) {
 		goto error;
+	}
 
 	sp->pid = r_sys_fork ();
 	switch (sp->pid) {
diff --git a/libr/socket/r2pipe.c b/libr/socket/r2pipe.c
index 7ddcf9d037..7d7c6887ff 100644
--- a/libr/socket/r2pipe.c
+++ b/libr/socket/r2pipe.c
@@ -18,7 +18,9 @@ static void env(const char *s, int f) {
 #endif
 
 R_API int r2p_close(R2Pipe *r2p) {
-	if (!r2p) return 0;
+	if (!r2p) {
+		return 0;
+	}
 #if __WINDOWS__ && !defined(__CYGWIN__)
 	if (r2p->pipe) {
 		CloseHandle (r2p->pipe);
@@ -231,10 +233,14 @@ R_API int r2p_write(R2Pipe *r2p, const char *str) {
 R_API char *r2p_read(R2Pipe *r2p) {
 	int bufsz = 0;
 	char *buf = NULL;
-	if (!r2p) return NULL;
+	if (!r2p) {
+		return NULL;
+	}
 	bufsz = 4096;
 	buf = calloc (1, bufsz);
-	if (!buf) return NULL;
+	if (!buf) {
+		return NULL;
+	}
 #if __WINDOWS__ && !defined(__CYGWIN__)
 	BOOL bSuccess = FALSE;
 	DWORD dwRead = 0;
diff --git a/libr/socket/run.c b/libr/socket/run.c
index f505a70671..ca312f0046 100644
--- a/libr/socket/run.c
+++ b/libr/socket/run.c
@@ -247,9 +247,10 @@ static void setASLR(RRunProfile *r, int enabled) {
 		setRVA ("0\n");
 #else
 #if HAVE_DECL_ADDR_NO_RANDOMIZE
-		if (personality (ADDR_NO_RANDOMIZE) == -1)
+		if (personality (ADDR_NO_RANDOMIZE) == -1) {
 #endif
 			setRVA ("0\n");
+		}
 #endif
 	}
 #elif __APPLE__
@@ -451,17 +452,27 @@ R_API bool r_run_parseline(RRunProfile *p, char *b) {
 	if (!e) {
 		return 0;
 	}
-	if (!strcmp (b, "program")) p->_args[0] = p->_program = strdup (e);
-	else if (!strcmp (b, "system")) p->_system = strdup (e);
-	else if (!strcmp (b, "runlib")) p->_runlib = strdup (e);
-	else if (!strcmp (b, "runlib.fcn")) p->_runlib_fcn = strdup (e);
-	else if (!strcmp (b, "aslr")) p->_aslr = parseBool (e);
-	else if (!strcmp (b, "pid")) p->_pid = atoi (e);
-	else if (!strcmp (b, "pidfile")) p->_pidfile = strdup (e);
-	else if (!strcmp (b, "connect")) p->_connect = strdup (e);
-	else if (!strcmp (b, "listen")) p->_listen = strdup (e);
-	else if (!strcmp (b, "pty")) p->_pty = parseBool (e);
-	else if (!strcmp (b, "stdio")) {
+	if (!strcmp (b, "program")) {
+		p->_args[0] = p->_program = strdup (e);
+	} else if (!strcmp (b, "system")) {
+		p->_system = strdup (e);
+	} else if (!strcmp (b, "runlib")) {
+		p->_runlib = strdup (e);
+	} else if (!strcmp (b, "runlib.fcn")) {
+		p->_runlib_fcn = strdup (e);
+	} else if (!strcmp (b, "aslr")) {
+		p->_aslr = parseBool (e);
+	} else if (!strcmp (b, "pid")) {
+		p->_pid = atoi (e);
+	} else if (!strcmp (b, "pidfile")) {
+		p->_pidfile = strdup (e);
+	} else if (!strcmp (b, "connect")) {
+		p->_connect = strdup (e);
+	} else if (!strcmp (b, "listen")) {
+		p->_listen = strdup (e);
+	} else if (!strcmp (b, "pty")) {
+		p->_pty = parseBool (e);
+	} else if (!strcmp (b, "stdio")) {
 		if (e[0] == '!') {
 			p->_stdio = strdup (e);
 		} else {
@@ -469,32 +480,55 @@ R_API bool r_run_parseline(RRunProfile *p, char *b) {
 			p->_stderr = strdup (e);
 			p->_stdin = strdup (e);
 		}
-	}
-	else if (!strcmp (b, "stdout")) p->_stdout = strdup (e);
-	else if (!strcmp (b, "stdin")) p->_stdin = strdup (e);
-	else if (!strcmp (b, "stderr")) p->_stderr = strdup (e);
-	else if (!strcmp (b, "input")) p->_input = strdup (e);
-	else if (!strcmp (b, "chdir")) p->_chgdir = strdup (e);
-	else if (!strcmp (b, "core")) p->_docore = parseBool (e);
-	else if (!strcmp (b, "fork")) p->_dofork = parseBool (e);
-	else if (!strcmp (b, "sleep")) p->_r2sleep = atoi (e);
-	else if (!strcmp (b, "maxstack")) p->_maxstack = atoi (e);
-	else if (!strcmp (b, "maxproc")) p->_maxproc = atoi (e);
-	else if (!strcmp (b, "maxfd")) p->_maxfd = atoi (e);
-	else if (!strcmp (b, "bits")) p->_bits = atoi (e);
-	else if (!strcmp (b, "chroot")) p->_chroot = strdup (e);
-	else if (!strcmp (b, "libpath")) p->_libpath = strdup (e);
-	else if (!strcmp (b, "preload")) p->_preload = strdup (e);
-	else if (!strcmp (b, "r2preload")) p->_r2preload = parseBool (e);
-	else if (!strcmp (b, "r2preweb")) r_sys_setenv ("RARUN2_WEB", "yes");
-	else if (!strcmp (b, "setuid")) p->_setuid = strdup (e);
-	else if (!strcmp (b, "seteuid")) p->_seteuid = strdup (e);
-	else if (!strcmp (b, "setgid")) p->_setgid = strdup (e);
-	else if (!strcmp (b, "setegid")) p->_setegid = strdup (e);
-	else if (!strcmp (b, "nice")) p->_nice = atoi (e);
-	else if (!strcmp (b, "timeout")) p->_timeout = atoi (e);
-	else if (!strcmp (b, "timeoutsig")) p->_timeout_sig = r_signal_from_string (e);
-	else if (!memcmp (b, "arg", 3)) {
+	} else if (!strcmp (b, "stdout")) {
+		p->_stdout = strdup (e);
+	} else if (!strcmp (b, "stdin")) {
+		p->_stdin = strdup (e);
+	} else if (!strcmp (b, "stderr")) {
+		p->_stderr = strdup (e);
+	} else if (!strcmp (b, "input")) {
+		p->_input = strdup (e);
+	} else if (!strcmp (b, "chdir")) {
+		p->_chgdir = strdup (e);
+	} else if (!strcmp (b, "core")) {
+		p->_docore = parseBool (e);
+	} else if (!strcmp (b, "fork")) {
+		p->_dofork = parseBool (e);
+	} else if (!strcmp (b, "sleep")) {
+		p->_r2sleep = atoi (e);
+	} else if (!strcmp (b, "maxstack")) {
+		p->_maxstack = atoi (e);
+	} else if (!strcmp (b, "maxproc")) {
+		p->_maxproc = atoi (e);
+	} else if (!strcmp (b, "maxfd")) {
+		p->_maxfd = atoi (e);
+	} else if (!strcmp (b, "bits")) {
+		p->_bits = atoi (e);
+	} else if (!strcmp (b, "chroot")) {
+		p->_chroot = strdup (e);
+	} else if (!strcmp (b, "libpath")) {
+		p->_libpath = strdup (e);
+	} else if (!strcmp (b, "preload")) {
+		p->_preload = strdup (e);
+	} else if (!strcmp (b, "r2preload")) {
+		p->_r2preload = parseBool (e);
+	} else if (!strcmp (b, "r2preweb")) {
+		r_sys_setenv ("RARUN2_WEB", "yes");
+	} else if (!strcmp (b, "setuid")) {
+		p->_setuid = strdup (e);
+	} else if (!strcmp (b, "seteuid")) {
+		p->_seteuid = strdup (e);
+	} else if (!strcmp (b, "setgid")) {
+		p->_setgid = strdup (e);
+	} else if (!strcmp (b, "setegid")) {
+		p->_setegid = strdup (e);
+	} else if (!strcmp (b, "nice")) {
+		p->_nice = atoi (e);
+	} else if (!strcmp (b, "timeout")) {
+		p->_timeout = atoi (e);
+	} else if (!strcmp (b, "timeoutsig")) {
+		p->_timeout_sig = r_signal_from_string (e);
+	} else if (!memcmp (b, "arg", 3)) {
 		int n = atoi (b + 3);
 		if (n >= 0 && n < R_RUN_PROFILE_NARGS) {
 			p->_args[n] = getstr (e);
@@ -522,8 +556,12 @@ R_API bool r_run_parseline(RRunProfile *p, char *b) {
 			if (p) {
 				*p++ = 0;
 				len = strlen(p);
-				if (p[len-1] == '\n') p[len-1] = 0;
-				if (p[len-2] == '\r') p[len-2] = 0;
+				if (p[len - 1] == '\n') {
+					p[len - 1] = 0;
+				}
+				if (p[len - 2] == '\r') {
+					p[len - 2] = 0;
+				}
 				r_sys_setenv (buf, p);
 			}
 		}
@@ -734,18 +772,22 @@ R_API int r_run_config_env(RRunProfile *p) {
 	if (handle_redirection (p->_stderr, false, false, true) != 0) {
 		return 1;
 	}
-	if (p->_aslr != -1)
+	if (p->_aslr != -1) {
 		setASLR (p, p->_aslr);
+	}
 #if __UNIX__
 	set_limit (p->_docore, RLIMIT_CORE, RLIM_INFINITY);
-	if (p->_maxfd)
+	if (p->_maxfd) {
 		set_limit (p->_maxfd, RLIMIT_NOFILE, p->_maxfd);
+	}
 #ifdef RLIMIT_NPROC
-	if (p->_maxproc)
+	if (p->_maxproc) {
 		set_limit (p->_maxproc, RLIMIT_NPROC, p->_maxproc);
+	}
 #endif
-	if (p->_maxstack)
+	if (p->_maxstack) {
 		set_limit (p->_maxstack, RLIMIT_STACK, p->_maxstack);
+	}
 #else
 	if (p->_docore || p->_maxfd || p->_maxproc || p->_maxstack)
 		eprintf ("Warning: setrlimits not supported for this platform\n");
@@ -1033,12 +1075,17 @@ R_API int r_run_start(RRunProfile *p) {
 		}
 #if __UNIX__
 		// XXX HACK close all non-tty fds
-		{ int i; for (i=3; i<10; i++) close (i); }
+		{ int i;
+			for (i = 3; i < 10; i++) {
+				close (i);
+			}
+		}
 		// TODO: use posix_spawn
 		if (p->_setgid) {
 			int ret = setgid (atoi (p->_setgid));
-			if (ret < 0)
+			if (ret < 0) {
 				return 1;
+			}
 		}
 		if (p->_pid) {
 			eprintf ("PID: %d\n", getpid ());
diff --git a/libr/socket/socket.c b/libr/socket/socket.c
index a066a3fbae..ec047447e7 100644
--- a/libr/socket/socket.c
+++ b/libr/socket/socket.c
@@ -182,7 +182,9 @@ R_API int r_socket_unix_listen (RSocket *s, const char *file) {
 
 R_API RSocket *r_socket_new (int is_ssl) {
 	RSocket *s = R_NEW0 (RSocket);
-	if (!s) return NULL;
+	if (!s) {
+		return NULL;
+	}
 	s->is_ssl = is_ssl;
 	s->port = 0;
 #if __UNIX_
@@ -434,7 +436,9 @@ R_API int r_socket_close_fd (RSocket *s) {
 /* shutdown the socket and close the file descriptor */
 R_API int r_socket_close (RSocket *s) {
 	int ret = false;
-	if (!s) return false;
+	if (!s) {
+		return false;
+	}
 	if (s->fd != -1) {
 #if __UNIX__ || defined(__CYGWIN__)
 		shutdown (s->fd, SHUT_RDWR);
@@ -465,10 +469,12 @@ R_API int r_socket_free (RSocket *s) {
 	int res = r_socket_close (s);
 #if HAVE_LIB_SSL
 	if (s->is_ssl) {
-		if (s->sfd)
+		if (s->sfd) {
 			SSL_free (s->sfd);
-		if (s->ctx)
+		}
+		if (s->ctx) {
 			SSL_CTX_free (s->ctx);
+		}
 	}
 #endif
 	free (s);
@@ -477,8 +483,9 @@ R_API int r_socket_free (RSocket *s) {
 
 R_API int r_socket_port_by_name(const char *name) {
 	struct servent *p = getservbyname (name, "tcp");
-	if (p && p->s_port)
+	if (p && p->s_port) {
 		return ntohs (p->s_port);
+	}
 	return r_num_get (NULL, name);
 }
 
@@ -498,8 +505,9 @@ R_API bool r_socket_listen (RSocket *s, const char *port, const char *certfile)
 		return false;
 	}
 #endif
-	if ((s->fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP))<0)
+	if ((s->fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
 		return false;
+	}
 #if __UNIX__ || defined(__CYGWIN__)
 	linger.l_onoff = 1;
 	linger.l_linger = 1;
@@ -510,12 +518,14 @@ R_API bool r_socket_listen (RSocket *s, const char *port, const char *certfile)
 	{ // fix close after write bug //
 	int x = 1500; // FORCE MTU
 	ret = setsockopt (s->fd, SOL_SOCKET, SO_SNDBUF, (void*)&x, sizeof (int));
-	if (ret < 0)
+	if (ret < 0) {
 		return false;
 	}
+	}
 	ret = setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof optval);
-	if (ret < 0)
+	if (ret < 0) {
 		return false;
+	}
 #endif
 	memset (&s->sa, 0, sizeof (s->sa));
 	s->sa.sin_family = AF_INET;
@@ -638,16 +648,20 @@ R_API int r_socket_block_time (RSocket *s, int block, int sec) {
 #if __UNIX__ || defined(__CYGWIN__)
 	int ret, flags;
 #endif
-	if (!s) return false;
+	if (!s) {
+		return false;
+	}
 #if __UNIX__ || defined(__CYGWIN__)
 	flags = fcntl (s->fd, F_GETFL, 0);
-	if (flags < 0)
+	if (flags < 0) {
 		return false;
+	}
 	ret = fcntl (s->fd, F_SETFL, block?
 			(flags & ~O_NONBLOCK):
 			(flags | O_NONBLOCK));
-	if (ret < 0)
+	if (ret < 0) {
 		return false;
+	}
 #elif __WINDOWS__ && !defined(__CYGWIN__) //&& !defined(__MINGW64__)
 	// HACK: nonblocking io on w32 behaves strange
 	return true;
@@ -658,16 +672,18 @@ R_API int r_socket_block_time (RSocket *s, int block, int sec) {
 		tv.tv_sec = sec;
 		tv.tv_usec = 0;
 		if (setsockopt (s->fd, SOL_SOCKET, SO_RCVTIMEO,
-				(char *)&tv, sizeof (tv)) < 0)
+			    (char *)&tv, sizeof (tv)) < 0) {
 			return false;
+		}
 	}
 	return true;
 }
 
 R_API int r_socket_flush(RSocket *s) {
 #if HAVE_LIB_SSL
-	if (s->is_ssl && s->bio)
-		return BIO_flush(s->bio);
+	if (s->is_ssl && s->bio) {
+		return BIO_flush (s->bio);
+	}
 #endif
 	return true;
 }
@@ -717,10 +733,13 @@ R_API char *r_socket_to_string(RSocket *s) {
 	if (!getpeername (s->fd, &sa, &sl)) {
 		struct sockaddr_in *sain = (struct sockaddr_in*) &sa;
 		ut8 *a = (ut8*) &(sain->sin_addr);
-		if ((str = malloc (32)))
+		if ((str = malloc (32))) {
 			sprintf (str, "%d.%d.%d.%d:%d",
-				a[0],a[1],a[2],a[3], ntohs (sain->sin_port));
-	} else eprintf ("getperrname: failed\n"); //r_sys_perror ("getpeername");
+				a[0], a[1], a[2], a[3], ntohs (sain->sin_port));
+		}
+	} else {
+		eprintf ("getperrname: failed\n"); //r_sys_perror ("getpeername");
+	}
 	return str;
 #else
 	return NULL;
@@ -740,10 +759,11 @@ R_API int r_socket_write(RSocket *s, void *buf, int len) {
 		}
 #if HAVE_LIB_SSL
 		if (s->is_ssl) {
-			if (s->bio)
+			if (s->bio) {
 				ret = BIO_write (s->bio, buf+delta, b);
-			else
-				ret = SSL_write (s->sfd, buf+delta, b);
+			} else {
+				ret = SSL_write (s->sfd, buf + delta, b);
+			}
 		} else
 #endif
 		{
diff --git a/libr/util/base85.c b/libr/util/base85.c
index b197716a9c..2511ba5d39 100644
--- a/libr/util/base85.c
+++ b/libr/util/base85.c
@@ -33,7 +33,9 @@
 
 static int getc_nospace(FILE *f) {
 	int c;
-	while (isspace (c = getc (f)));
+	while (isspace (c = getc (f))) {
+		;
+	}
 	return c;
 }
 
diff --git a/libr/util/base91.c b/libr/util/base91.c
index 4fded32b5e..b24134955e 100644
--- a/libr/util/base91.c
+++ b/libr/util/base91.c
@@ -15,8 +15,9 @@ static const char b91[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 int get_char_index(const char c) {
 	int i;
 	for (i = 0; i < 91; i++ ) {
-		if (b91[i] == c)
+		if (b91[i] == c) {
 			return i;
+		}
 	}
 	return -1;
 }
@@ -27,12 +28,14 @@ R_API int r_base91_decode(ut8* bout, const char *bin, int len) {
 	int b = 0;
 	int n = 0;
 	int c;
-	if (len < 0)
+	if (len < 0) {
 		len = strlen (bin);
+	}
 	for (in = out = 0; in < len; in++) {
 		c = get_char_index(bin[in]);
-		if (c == -1)
+		if (c == -1) {
 			continue;
+		}
 		if (v < 0) {
 			v = c;
 		} else {
@@ -47,8 +50,9 @@ R_API int r_base91_decode(ut8* bout, const char *bin, int len) {
 				bout[out++] = b & 255;
 				b >>= 8;
 				n -= 8;
-				if (n <= 7)
+				if (n <= 7) {
 					break;
+				}
 			}
 			v = -1;
 		}
@@ -64,8 +68,9 @@ R_API int r_base91_encode(char *bout, const ut8 *bin, int len) {
 	int v = 0;
 	int b = 0;
 	int n = 0;
-	if (len < 0)
+	if (len < 0) {
 		len = strlen ((const char *)bin);
+	}
 	for (in = out = 0; in < len; in++) {
 		b |= (bin[in] << n);
 		n += 8;
diff --git a/libr/util/bdiff.c b/libr/util/bdiff.c
index 73ab9e380f..8c41c306f5 100644
--- a/libr/util/bdiff.c
+++ b/libr/util/bdiff.c
@@ -48,13 +48,16 @@ static int splitlines(const char *a, int len, struct line **lr) {
 
 	/* count the lines */
 	i = 1; /* extra line for sentinel */
-	for (p = a; p < a + len; p++)
-		if (*p == '\n' || p == plast)
+	for (p = a; p < a + len; p++) {
+		if (*p == '\n' || p == plast) {
 			i++;
+		}
+	}
 
 	*lr = l = (struct line *)malloc(sizeof(struct line) * i);
-	if (!l)
+	if (!l) {
 		return -1;
+	}
 
 	/* build the line array and calculate hashes */
 	h = 0;
@@ -88,18 +91,21 @@ static int equatelines(struct line *a, int an, struct line *b, int bn) {
 	struct pos *h = NULL;
 
 	/* build a hash table of the next highest power of 2 */
-	while (buckets < bn + 1)
+	while (buckets < bn + 1) {
 		buckets *= 2;
+	}
 
 	/* try to allocate a large hash table to avoid collisions */
 	for (scale = 4; scale; scale /= 2) {
 		h = (struct pos *)malloc(scale * buckets * sizeof(struct pos));
-		if (h)
+		if (h) {
 			break;
+		}
 	}
 
-	if (!h)
+	if (!h) {
 		return 0;
+	}
 
 	buckets = buckets * scale - 1;
 
@@ -113,9 +119,11 @@ static int equatelines(struct line *a, int an, struct line *b, int bn) {
 	for (i = bn - 1; i >= 0; i--) {
 		/* find the equivalence class */
 		for (j = b[i].h & buckets; h[j].pos != INT_MAX;
-		     j = (j + 1) & buckets)
-			if (!cmp(b + i, b + h[j].pos))
+			j = (j + 1) & buckets) {
+			if (!cmp (b + i, b + h[j].pos)) {
 				break;
+			}
+		}
 
 		/* add to the head of the equivalence class */
 		b[i].n = h[j].pos;
@@ -131,15 +139,18 @@ static int equatelines(struct line *a, int an, struct line *b, int bn) {
 	for (i = 0; i < an; i++) {
 		/* find the equivalence class */
 		for (j = a[i].h & buckets; h[j].pos != INT_MAX;
-		     j = (j + 1) & buckets)
-			if (!cmp(a + i, b + h[j].pos))
+			j = (j + 1) & buckets) {
+			if (!cmp (a + i, b + h[j].pos)) {
 				break;
+			}
+		}
 
 		a[i].e = j; /* use equivalence class for quick compare */
-		if (h[j].len <= t)
+		if (h[j].len <= t) {
 			a[i].n = h[j].pos; /* point to head of match list */
-		else
+		} else {
 			a[i].n = INT_MAX; /* too popular */
+		}
 	}
 
 	/* discard hash tables */
@@ -154,16 +165,18 @@ static int longest_match(struct line *a, struct line *b, struct pos *pos,
 
 	for (i = a1; i < a2; i++) {
 		/* skip things before the current block */
-		for (j = a[i].n; j < b1; j = b[j].n)
+		for (j = a[i].n; j < b1; j = b[j].n) {
 			;
+		}
 
 		/* loop through all lines match a[i] in b */
 		for (; j < b2; j = b[j].n) {
 			/* does this extend an earlier match? */
-			if (i > a1 && j > b1 && pos[j - 1].pos == i - 1)
+			if (i > a1 && j > b1 && pos[j - 1].pos == i - 1) {
 				k = pos[j - 1].len + 1;
-			else
+			} else {
 				k = 1;
+			}
 			pos[j].pos = i;
 			pos[j].len = k;
 
@@ -183,11 +196,13 @@ static int longest_match(struct line *a, struct line *b, struct pos *pos,
 
 	/* expand match to include neighboring popular lines */
 	while (mi - mb > a1 && mj - mb > b1 &&
-	       a[mi - mb - 1].e == b[mj - mb - 1].e)
+		a[mi - mb - 1].e == b[mj - mb - 1].e) {
 		mb++;
+	}
 	while (mi + mk < a2 && mj + mk < b2 &&
-	       a[mi + mk].e == b[mj + mk].e)
+		a[mi + mk].e == b[mj + mk].e) {
 		mk++;
+	}
 
 	*omi = mi - mb;
 	*omj = mj - mb;
@@ -202,8 +217,9 @@ static void recurse(struct line *a, struct line *b, struct pos *pos,
 
 	/* find the longest match in this chunk */
 	k = longest_match(a, b, pos, a1, a2, b1, b2, &i, &j);
-	if (!k)
+	if (!k) {
 		return;
+	}
 
 	/* and recurse on the remaining chunks on either side */
 	recurse(a, b, pos, a1, i, b1, j, l);
@@ -244,19 +260,22 @@ static struct hunklist diff(struct line *a, int an, struct line *b, int bn)
 		struct hunk *next = curr+1;
 		int shift = 0;
 
-		if (next == l.head)
+		if (next == l.head) {
 			break;
+		}
 
-		if (curr->a2 == next->a1)
-			while (curr->a2+shift < an && curr->b2+shift < bn
-			       && !cmp(a+curr->a2+shift, b+curr->b2+shift))
+		if (curr->a2 == next->a1) {
+			while (curr->a2 + shift < an && curr->b2 + shift < bn && !cmp (a + curr->a2 + shift, b + curr->b2 + shift)) {
 				shift++;
-		else if (curr->b2 == next->b1)
-			while (curr->b2+shift < bn && curr->a2+shift < an
-			       && !cmp(b+curr->b2+shift, a+curr->a2+shift))
+			}
+		} else if (curr->b2 == next->b1) {
+			while (curr->b2 + shift < bn && curr->a2 + shift < an && !cmp (b + curr->b2 + shift, a + curr->a2 + shift)) {
 				shift++;
-		if (!shift)
+			}
+		}
+		if (!shift) {
 			continue;
+		}
 		curr->b2 += shift;
 		next->b1 += shift;
 		curr->a2 += shift;
@@ -317,8 +336,9 @@ R_API int r_diff_buffers_delta(RDiff *d, const ut8 *sa, int la, const ut8 *sb, i
 				dop.b_off = offa; // XXX offb not used??
 				dop.b_buf = (ut8 *)bl[lb].l;
 				dop.b_len = len;
-				if (!d->callback (d, d->user, &dop))
+				if (!d->callback (d, d->user, &dop)) {
 					break;
+				}
 			}
 #if 0	
 			if (rlen > 0) {
diff --git a/libr/util/bitmap.c b/libr/util/bitmap.c
index 6175171b6d..f93c26ef4a 100644
--- a/libr/util/bitmap.c
+++ b/libr/util/bitmap.c
@@ -12,15 +12,18 @@
 
 R_API RBitmap *r_bitmap_new(size_t len) {
 	RBitmap *b = R_NEW0 (RBitmap);
-	if (!b) return NULL;
+	if (!b) {
+		return NULL;
+	}
 	b->length = len;
 	b->bitmap = calloc (BITMAP_WORD_COUNT (len), sizeof (RBitword));
 	return b;
 }
 
 R_API void r_bitmap_set_bytes(RBitmap *b, const ut8 *buf, int len) {
-	if (b->length < len)
+	if (b->length < len) {
 		len = b->length;
+	}
 	memcpy (b->bitmap, buf, len);
 }
 
@@ -30,15 +33,17 @@ R_API void r_bitmap_free(RBitmap *b) {
 }
 
 R_API void r_bitmap_set(RBitmap *b, size_t bit) {
-	if (bit<b->length)
-		b->bitmap[(bit >> BITWORD_BITS_SHIFT)] |= \
+	if (bit < b->length) {
+		b->bitmap[(bit >> BITWORD_BITS_SHIFT)] |=
 			((RBitword)1 << (bit & BITWORD_BITS_MASK));
+	}
 }
 
 R_API void r_bitmap_unset(RBitmap *b, size_t bit) {
-	if (bit < b->length)
-		b->bitmap[(bit >> BITWORD_BITS_SHIFT)] &= \
+	if (bit < b->length) {
+		b->bitmap[(bit >> BITWORD_BITS_SHIFT)] &=
 			~((RBitword)1 << (bit & BITWORD_BITS_MASK));
+	}
 }
 
 R_API int r_bitmap_test(RBitmap *b, size_t bit) {
diff --git a/libr/util/btree.c b/libr/util/btree.c
index 9133d866f7..6a0366f971 100644
--- a/libr/util/btree.c
+++ b/libr/util/btree.c
@@ -8,7 +8,9 @@ R_API void btree_init(struct btree_node **T) {
 
 R_API struct btree_node *btree_remove(struct btree_node *p, BTREE_DEL(del)) {
 	struct btree_node *rp = NULL, *f;
-	if (!p) return p;
+	if (!p) {
+		return p;
+	}
 	if (p->right) {
 		if (p->left) {
 			f = p;
@@ -21,10 +23,18 @@ R_API struct btree_node *btree_remove(struct btree_node *p, BTREE_DEL(del)) {
 				f->left = rp->right;
 				rp->right = p->right;
 				rp->left = p->left;
-			} else rp->left = p->left;
-		} else rp = p->right;
-	} else rp = p->left;
-	if (del) del (p->data);
+			} else {
+				rp->left = p->left;
+			}
+		} else {
+			rp = p->right;
+		}
+	} else {
+		rp = p->left;
+	}
+	if (del) {
+		del (p->data);
+	}
 	free (p);
 	return(rp);
 }
@@ -33,16 +43,19 @@ R_API void *btree_search(struct btree_node *root, void *x, BTREE_CMP(cmp), int p
 	struct btree_node *p = NULL;
 
 	if (root) {
-		if (cmp (x, root->data)<0)
+		if (cmp (x, root->data) < 0) {
 			p = btree_search (root->left, x, cmp, parent);
-		else if (cmp(x, root->data)>0)
+		} else if (cmp (x, root->data) > 0) {
 			p = btree_search (root->right, x, cmp, parent);
-		else p = root;
+		} else {
+			p = root;
+		}
 	}
 	/* node found */
 	if (p) {
-		if (parent)
+		if (parent) {
 			return root;
+		}
 		return p;
 	} return NULL;
 }
@@ -85,7 +98,9 @@ R_API void btree_cleartree(struct btree_node *proot, BTREE_DEL(del)) {
 	if (proot) {
 		btree_cleartree (proot->left, del);
 		btree_cleartree (proot->right, del);
-		if (del) del (proot->data);
+		if (del) {
+			del (proot->data);
+		}
 		free (proot);
 	}
 }
@@ -93,11 +108,17 @@ R_API void btree_cleartree(struct btree_node *proot, BTREE_DEL(del)) {
 R_API void btree_insert(struct btree_node **T, struct btree_node *p, BTREE_CMP(cmp)) {
 	int ret = cmp (p->data, (*T)->data);
 	if (ret<0) {
-		if ((*T)->left) btree_insert (&(*T)->left, p, cmp);
-		else (*T)->left = p;
+		if ((*T)->left) {
+			btree_insert (&(*T)->left, p, cmp);
+		} else {
+			(*T)->left = p;
+		}
 	} else if (ret>0) {
-		if ((*T)->right) btree_insert (&(*T)->right, p, cmp);
-		else (*T)->right = p;
+		if ((*T)->right) {
+			btree_insert (&(*T)->right, p, cmp);
+		} else {
+			(*T)->right = p;
+		}
 	}
 }
 
@@ -123,8 +144,12 @@ R_API struct btree_node *btree_hittest(struct btree_node *root, struct btree_nod
 	if (root) {
 		struct btree_node *ml = btree_hittest(root->left, root);
 		struct btree_node *mr = btree_hittest(root->right, root);
-		if (ml && ml->hits > p->hits) p = ml;
-		if (mr && mr->hits > p->hits) p = mr;
+		if (ml && ml->hits > p->hits) {
+			p = ml;
+		}
+		if (mr && mr->hits > p->hits) {
+			p = mr;
+		}
 	}
 	return p;
 }
diff --git a/libr/util/buf.c b/libr/util/buf.c
index 12621e3b79..b30c960d81 100644
--- a/libr/util/buf.c
+++ b/libr/util/buf.c
@@ -269,7 +269,9 @@ R_API RBuffer *r_buf_new_file(const char *file, bool newFile) {
 R_API RBuffer *r_buf_new_slurp(const char *file) {
 	int len;
 	RBuffer *b = r_buf_new ();
-	if (!b) return NULL;
+	if (!b) {
+		return NULL;
+	}
 	b->buf = (ut8*)r_file_slurp (file, &len);
 	b->length = len;
 	if (b->buf) {
@@ -421,9 +423,12 @@ R_API bool r_buf_append_nbytes(RBuffer *b, int length) {
 		}
 		return false;
 	}
-	if (b->empty) b->length = b->empty = 0;
-	if (!(b->buf = realloc (b->buf, b->length+length)))
+	if (b->empty) {
+		b->length = b->empty = 0;
+	}
+	if (!(b->buf = realloc (b->buf, b->length + length))) {
 		return false;
+	}
 	memset (b->buf+b->length, 0, length);
 	b->length += length;
 	return true;
@@ -436,9 +441,12 @@ R_API bool r_buf_append_ut16(RBuffer *b, ut16 n) {
 	if (b->fd != -1) {
 		return r_buf_append_bytes (b, (const ut8*)&n, sizeof (n));
 	}
-	if (b->empty) b->length = b->empty = 0;
-	if (!(b->buf = realloc (b->buf, b->length + sizeof (n))))
+	if (b->empty) {
+		b->length = b->empty = 0;
+	}
+	if (!(b->buf = realloc (b->buf, b->length + sizeof (n)))) {
 		return false;
+	}
 	memmove (b->buf+b->length, &n, sizeof (n));
 	b->length += sizeof (n);
 	return true;
@@ -469,9 +477,12 @@ R_API bool r_buf_append_ut64(RBuffer *b, ut64 n) {
 	if (b->fd != -1) {
 		return r_buf_append_bytes (b, (const ut8*)&n, sizeof (n));
 	}
-	if (b->empty) b->length = b->empty = 0;
-	if (!(b->buf = realloc (b->buf, b->length+sizeof (n))))
+	if (b->empty) {
+		b->length = b->empty = 0;
+	}
+	if (!(b->buf = realloc (b->buf, b->length + sizeof (n)))) {
 		return false;
+	}
 	memmove (b->buf+b->length, &n, sizeof (n));
 	b->length += sizeof (n);
 	return true;
@@ -584,9 +595,9 @@ static int r_buf_fcpy_at (RBuffer *b, ut64 addr, ut8 *buf, const char *fmt, int
 		return -1;
 	}
 	tsize = 2;
-	for (i = len = 0; i < n; i++)
-	for (j = 0; fmt[j]; j++) {
-		switch (fmt[j]) {
+	for (i = len = 0; i < n; i++) {
+		for (j = 0; fmt[j]; j++) {
+			switch (fmt[j]) {
 		#ifdef _MSC_VER
 		case'0':case'1':case'2':case'3':case'4':case'5':case'6':case'7':case'8':case'9':
 		#else
@@ -681,6 +692,7 @@ static int r_buf_fcpy_at (RBuffer *b, ut64 addr, ut8 *buf, const char *fmt, int
 		}
 		len += tsize * m;
 		m = 1;
+		}
 	}
 	b->cur = vaddr + len;
 	return len;
@@ -821,7 +833,9 @@ R_API int r_buf_fwrite_at (RBuffer *b, ut64 addr, ut8 *buf, const char *fmt, int
 }
 
 R_API void r_buf_deinit(RBuffer *b) {
-	if (!b) return;
+	if (!b) {
+		return;
+	}
 	if (b->fd != -1) {
 		r_sandbox_close (b->fd);
 		b->fd = -1;
diff --git a/libr/util/calc.c b/libr/util/calc.c
index 5867f6d48a..ff26050870 100644
--- a/libr/util/calc.c
+++ b/libr/util/calc.c
@@ -45,14 +45,30 @@ static inline RNumCalcValue Nror(RNumCalcValue n, RNumCalcValue v) {
 	return n;
 }
 static inline RNumCalcValue Nmod(RNumCalcValue n, RNumCalcValue v) {
-	if (v.d) n.d = (n.d - (n.d/v.d)); else n.d = 0;
-	if (v.n) n.n %= v.n; else n.n = 0;
+	if (v.d) {
+		n.d = (n.d - (n.d / v.d));
+	} else {
+		n.d = 0;
+	}
+	if (v.n) {
+		n.n %= v.n;
+	} else {
+		n.n = 0;
+	}
 	return n;
 }
 
 static inline RNumCalcValue Ndiv(RNumCalcValue n, RNumCalcValue v) {
-	if (v.d) n.d /= v.d; else n.d = 0;
-	if (v.n) n.n /= v.n; else n.n = 0;
+	if (v.d) {
+		n.d /= v.d;
+	} else {
+		n.d = 0;
+	}
+	if (v.n) {
+		n.n /= v.n;
+	} else {
+		n.n = 0;
+	}
 	return n;
 }
 
diff --git a/libr/util/chmod.c b/libr/util/chmod.c
index 08531b42b6..33f49f1448 100644
--- a/libr/util/chmod.c
+++ b/libr/util/chmod.c
@@ -20,8 +20,9 @@ R_API int r_file_chmod (const char *file, const char *mod, int recursive) {
 #if __UNIX__
 	oper = '=';
 	mode = 0;
-	if (!parsemode (mod))
+	if (!parsemode (mod)) {
 		return false;
+	}
 	return chmodr (file, recursive);
 #else
 	return -1;
@@ -33,8 +34,9 @@ R_API int r_file_chmod (const char *file, const char *mod, int recursive) {
 int chmodr(const char *path, int rflag) {
 	struct stat st;
 
-	if (stat (path, &st) == -1)
+	if (stat (path, &st) == -1) {
 		return 0;
+	}
 
 	switch (oper) {
 	case '+':
@@ -51,8 +53,9 @@ int chmodr(const char *path, int rflag) {
 		eprintf ("chmod %s:", path);
 		return false;
 	}
-	if (rflag)
+	if (rflag) {
 		recurse (path, rflag, chmodr);
+	}
 	return true;
 }
 
@@ -64,20 +67,42 @@ int parsemode(const char *str) {
 
 	octal = strtol(str, &end, 8);
 	if (*end == '\0') {
-		if (octal & 04000) mode |= S_ISUID;
-		if (octal & 02000) mode |= S_ISGID;
-		if (octal & 00400) mode |= S_IRUSR;
-		if (octal & 00200) mode |= S_IWUSR;
-		if (octal & 00100) mode |= S_IXUSR;
-		if (octal & 00040) mode |= S_IRGRP;
-		if (octal & 00020) mode |= S_IWGRP;
-		if (octal & 00010) mode |= S_IXGRP;
-		if (octal & 00004) mode |= S_IROTH;
-		if (octal & 00002) mode |= S_IWOTH;
-		if (octal & 00001) mode |= S_IXOTH;
+		if (octal & 04000) {
+			mode |= S_ISUID;
+		}
+		if (octal & 02000) {
+			mode |= S_ISGID;
+		}
+		if (octal & 00400) {
+			mode |= S_IRUSR;
+		}
+		if (octal & 00200) {
+			mode |= S_IWUSR;
+		}
+		if (octal & 00100) {
+			mode |= S_IXUSR;
+		}
+		if (octal & 00040) {
+			mode |= S_IRGRP;
+		}
+		if (octal & 00020) {
+			mode |= S_IWGRP;
+		}
+		if (octal & 00010) {
+			mode |= S_IXGRP;
+		}
+		if (octal & 00004) {
+			mode |= S_IROTH;
+		}
+		if (octal & 00002) {
+			mode |= S_IWOTH;
+		}
+		if (octal & 00001) {
+			mode |= S_IXOTH;
+		}
 		return true;
 	}
-	for(p = str; *p; p++)
+	for (p = str; *p; p++) {
 		switch(*p) {
 		/* masks */
 		case 'u':
@@ -116,17 +141,22 @@ int parsemode(const char *str) {
 			eprintf ("%s: invalid mode\n", str);
 			return false;
 		}
-	if (mask)
+	}
+	if (mask) {
 		mode &= mask;
+	}
 	return true;
 }
 
 char * agetcwd(void) {
         char *buf = malloc (4096);
-	if (!buf) return NULL;
-        if(!getcwd(buf, 4096))
-                eprintf("getcwd:");
-        return buf;
+	if (!buf) {
+		return NULL;
+	}
+	if (!getcwd (buf, 4096)) {
+		eprintf ("getcwd:");
+	}
+	return buf;
 }
 
 static void recurse(const char *path, int rec, int (*fn)(const char *,int)) {
@@ -135,10 +165,10 @@ static void recurse(const char *path, int rec, int (*fn)(const char *,int)) {
         struct stat st;
         DIR *dp;
 
-        if (lstat (path, &st) == -1 || !S_ISDIR (st.st_mode))
-                return;
-        else if (!(dp = opendir (path))) {
-                eprintf ("opendir %s:", path);
+	if (lstat (path, &st) == -1 || !S_ISDIR (st.st_mode)) {
+		return;
+	} else if (!(dp = opendir (path))) {
+		eprintf ("opendir %s:", path);
 		return;
 	}
         cwd = agetcwd();
@@ -148,13 +178,16 @@ static void recurse(const char *path, int rec, int (*fn)(const char *,int)) {
 		free (cwd);
 		return;
 	}
-        while ((d = readdir (dp)))
-                if (strcmp (d->d_name, ".") && strcmp (d->d_name, ".."))
-                        fn (d->d_name, 1);
+	while ((d = readdir (dp))) {
+		if (strcmp (d->d_name, ".") && strcmp (d->d_name, "..")) {
+			fn (d->d_name, 1);
+		}
+	}
 
-        closedir (dp);
-        if (chdir (cwd) == -1)
-                eprintf ("chdir %s:", cwd);
-        free (cwd);
+	closedir (dp);
+	if (chdir (cwd) == -1) {
+		eprintf ("chdir %s:", cwd);
+	}
+	free (cwd);
 }
 #endif
diff --git a/libr/util/constr.c b/libr/util/constr.c
index 07a419ceb7..485297afcb 100644
--- a/libr/util/constr.c
+++ b/libr/util/constr.c
@@ -18,16 +18,18 @@ R_API void r_constr_free (RConstr *c) {
 R_API const char *r_constr_get (RConstr *c, const char *str) {
 	char *e = c->b+c->i, *p = c->b;
 	for (p = c->b; p<e; p += strlen (p)+1) {
-		if (!strcmp (p, str))
+		if (!strcmp (p, str)) {
 			return p;
+		}
 	}
 	return NULL;
 }
 
 R_API const char *r_constr_append (RConstr *c, const char *str) {
 	int i = c->i, l = strlen (str)+1;
-	if ((c->b + i+l) >= (c->b + c->l))
+	if ((c->b + i + l) >= (c->b + c->l)) {
 		return NULL;
+	}
 	memcpy (c->b + i, str, l);
 	c->i += l;
 	return c->b+i;
diff --git a/libr/util/date.c b/libr/util/date.c
index e99d382d0a..c4ca1f204c 100644
--- a/libr/util/date.c
+++ b/libr/util/date.c
@@ -47,7 +47,9 @@ R_API int r_print_date_hfs(RPrint *p, const ut8 *buf, int len) {
 					p->cb_printf ("%s\n", s);
 					ret = sizeof (time_t);
 				}
-			} else p->cb_printf ("Invalid time\n");
+			} else {
+				p->cb_printf ("Invalid time\n");
+			}
 		}
 	}
 	return ret;
@@ -71,7 +73,9 @@ R_API int r_print_date_unix(RPrint *p, const ut8 *buf, int len) {
 					p->cb_printf ("%s\n", s);
 					ret = sizeof (time_t);
 				}
-			} else p->cb_printf ("Invalid time\n");
+			} else {
+				p->cb_printf ("Invalid time\n");
+			}
 		}
 	}
 	return ret;
diff --git a/libr/util/diff.c b/libr/util/diff.c
index 4c5ddd4da4..f380746ff5 100644
--- a/libr/util/diff.c
+++ b/libr/util/diff.c
@@ -424,8 +424,9 @@ out:
 }
 
 R_API bool r_diff_buffers_distance_original(RDiff *diff, const ut8 *a, ut32 la, const ut8 *b, ut32 lb, ut32 *distance, double *similarity) {
-	if (!a || !b)
+	if (!a || !b) {
 		return false;
+	}
 
 	const bool verbose = diff ? diff->verbose : false;
 	const ut32 length = R_MAX (la, lb);
diff --git a/libr/util/file.c b/libr/util/file.c
index c28354daeb..4db7d079b1 100644
--- a/libr/util/file.c
+++ b/libr/util/file.c
@@ -84,7 +84,9 @@ R_API char *r_file_dirname (const char *path) {
 		*ptr = 0;
 	} else {
 		ptr = (char*)r_str_rchr (newpath, NULL, '\\');
-		if (ptr) *ptr = 0;
+		if (ptr) {
+			*ptr = 0;
+		}
 	}
 	return newpath;
 }
@@ -186,8 +188,9 @@ R_API char *r_file_abspath(const char *file) {
 		ret = r_str_home (file + 2);
 	} else {
 #if __UNIX__ || __CYGWIN__
-		if (cwd && *file != '/')
-			ret = r_str_newf ("%s"R_SYS_DIR"%s", cwd, file);
+		if (cwd && *file != '/') {
+			ret = r_str_newf ("%s" R_SYS_DIR "%s", cwd, file);
+		}
 #elif __WINDOWS__ && !__CYGWIN__
 		// Network path
 		if (!strncmp (file, "\\\\", 2)) {
@@ -476,11 +479,12 @@ R_API char *r_file_slurp_random_line_count(const char *file, int *line) {
 				}
 			}
 			ptr = str + i;
-			for (i = 0; ptr[i]; i++)
+			for (i = 0; ptr[i]; i++) {
 				if (ptr[i] == '\n') {
 					ptr[i] = '\0';
 					break;
 				}
+			}
 			ptr = strdup (ptr);
 		}
 		free (str);
diff --git a/libr/util/flist.c b/libr/util/flist.c
index 5d8fc550a6..3641e5dde4 100644
--- a/libr/util/flist.c
+++ b/libr/util/flist.c
@@ -58,7 +58,9 @@ R_API void r_flist_delete(void **it, int idx) {
 	r_flist_rewind (it);
 	free (it[idx]);
 	it[idx] = NULL;
-	for (it += idx; *it; it++) *it = *(it+1);
+	for (it += idx; *it; it++) {
+		*it = *(it + 1);
+	}
 }
 
 #define r_flist_foreach(it, pos) \
diff --git a/libr/util/format.c b/libr/util/format.c
index 2a99200c2d..5e4c270ed0 100644
--- a/libr/util/format.c
+++ b/libr/util/format.c
@@ -92,7 +92,9 @@ static void r_print_format_quadword(const RPrint* p, int endian, int mode,
 				updateAddr (buf + i, size - i, endian, NULL, &addr64);
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("0x%016"PFMT64x, addr64);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
@@ -102,7 +104,9 @@ static void r_print_format_quadword(const RPrint* p, int endian, int mode,
 				}
 				i += 8;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
 		if (size==-1) {
@@ -113,12 +117,16 @@ static void r_print_format_quadword(const RPrint* p, int endian, int mode,
 				updateAddr (buf + i, size - i, endian, NULL, &addr64);
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("%"PFMT64d, addr64);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
 				}
-				if (elem > -1) elem--;
+				if (elem > -1) {
+					elem--;
+				}
 				i += 8;
 			}
 			p->cb_printf (" ]");
@@ -143,18 +151,27 @@ static void r_print_format_byte(const RPrint* p, int endian, int mode,
 		if (size == -1) {
 			p->cb_printf ("0x%02x", buf[i]);
 		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("0x%02x", buf[i]);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i++;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
 		if (size==-1) {
@@ -164,7 +181,9 @@ static void r_print_format_byte(const RPrint* p, int endian, int mode,
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf (", %d", buf[i]);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
@@ -204,25 +223,36 @@ static int r_print_format_uleb(const RPrint* p, int endian, int mode,
 		free (tmp);
 		free (nbr);
 	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki);
+		}
 		if (size==-1) {
 			r_uleb128_decode (buf+i, &offset, &value);
 			p->cb_printf ("%"PFMT64d, value);
 		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					r_uleb128_decode (buf+i, &s, &value);
 					i += s;
 					offset += s;
 					p->cb_printf ("%"PFMT64d, value);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
 		}
 	} else if (MUSTSEEJSON) {
 		if (size==-1) {
@@ -236,11 +266,16 @@ static int r_print_format_uleb(const RPrint* p, int endian, int mode,
 					i += s;
 					offset += s;
 					p->cb_printf ("\"%"PFMT64d"\"", value);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 			}
 			p->cb_printf (" ]");
 		}
@@ -259,36 +294,52 @@ static void r_print_format_char(const RPrint* p, int endian, int mode,
 	if (MUSTSET) {
 		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
 	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*2:0)); //XXX:: shouldn't it be elem*1??
-		if (size==-1)
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 2 : 0)); //XXX:: shouldn't it be elem*1??
+		}
+		if (size == -1) {
 			p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i++;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i++;
 			}
 			p->cb_printf (" ]");
@@ -307,36 +358,52 @@ static void r_print_format_decchar(const RPrint* p, int endian, int mode,
 	if (MUSTSET) {
 		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
 	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem:0));
-		if (size==-1)
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem : 0));
+		}
+		if (size == -1) {
 			p->cb_printf ("%d", buf[i]);
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("%d", buf[i]);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i++;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("\"%d\"", buf[i]);
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("\"%d\"", buf[i]);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i++;
 			}
 			p->cb_printf (" ]");
@@ -362,8 +429,12 @@ static int r_print_format_string(const RPrint* p, ut64 seeki, ut64 addr64, ut64
 			free (encstr);
 		}
 	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x" ", seeki, addr);
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki);
+		}
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " -> 0x%08" PFMT64x " ", seeki, addr);
+		}
 		if (res && buffer[0] != 0xff && buffer[1] != 0xff) {
 			p->cb_printf ("%s", buffer);
 		}
@@ -385,11 +456,15 @@ static void r_print_format_time(const RPrint* p, int endian, int mode,
 	} else if (MUSTSEE) {
 		char *timestr = strdup(asctime (gmtime ((time_t*)&addr)));
 		*(timestr+24) = '\0';
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 4 : 0));
+		}
 		if (size==-1) {
 			p->cb_printf ("%s", timestr);
 		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
 				free (timestr);
@@ -409,7 +484,9 @@ static void r_print_format_time(const RPrint* p, int endian, int mode,
 				}
 				i += 4;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 		free (timestr);
 	} else if (MUSTSEEJSON) {
@@ -426,7 +503,9 @@ static void r_print_format_time(const RPrint* p, int endian, int mode,
 				*(timestr+24) = '\0';
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("\"%s\"", timestr);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
@@ -458,7 +537,9 @@ static void r_print_format_hex(const RPrint* p, int endian, int mode,
 	} else if (mode & R_PRINT_DOT) {
 		p->cb_printf ("%"PFMT64d, addr);
 	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 4 : 0));
+		}
 		if (size==-1) {
 			p->cb_printf ("%"PFMT64d, addr);
 		} else {
@@ -486,9 +567,9 @@ static void r_print_format_hex(const RPrint* p, int endian, int mode,
 			}
 		}
 	} else if (MUSTSEEJSON) {
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("%d", addr);
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
@@ -556,9 +637,9 @@ static void r_print_format_int(const RPrint* p, int endian, int mode,
 			}
 		}
 	} else if (MUSTSEEJSON) {
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("%d", addr);
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
@@ -613,42 +694,60 @@ static void r_print_format_octal (const RPrint* p, int endian, int mode,
 		p->cb_printf ("0%"PFMT64o, addr);
 	} else if (MUSTSEE) {
 		ut32 addr32 = (ut32)addr;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		if (!SEEVALUE) p->cb_printf ("(octal) ");
-		if (size==-1)
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 4 : 0));
+		}
+		if (!SEEVALUE) {
+			p->cb_printf ("(octal) ");
+		}
+		if (size == -1) {
 			p->cb_printf (" 0%08"PFMT64o, addr32);
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
 				addr32 = (ut32)addr;
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("0%08"PFMT64o, addr32);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i+=4;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
 		ut32 addr32 = (ut32)addr;
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("%d", addr32);
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				updateAddr (buf, i, endian, &addr, NULL);
 				addr32 = (ut32)addr;
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("%d", addr32);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i+=4;
 			}
 			p->cb_printf (" ]");
@@ -672,37 +771,50 @@ static void r_print_format_hexflag(const RPrint* p, int endian, int mode,
 		p->cb_printf ("0x%08"PFMT64x, addr & UT32_MAX);
 	} else if (MUSTSEE) {
 		ut32 addr32 = (ut32)addr;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 4 : 0));
+		}
 		if (size==-1) {
 			p->cb_printf ("0x%08"PFMT64x, (ut64)addr32);
 		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
 				addr32 = (ut32)addr;
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("0x%08"PFMT64x, addr32);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
-				if (size != 0 && elem == -1)
+				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
-				if (elem > -1) elem--;
+				}
+				if (elem > -1) {
+					elem--;
+				}
 				i+=4;
 			}
-			if (!SEEVALUE) p->cb_printf (" ]");
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
 		}
 	} else if (MUSTSEEJSON) {
 		ut32 addr32 = (ut32)addr;
-		if (size==-1)
+		if (size == -1) {
 			p->cb_printf ("%d", addr32);
-		else {
+		} else {
 			p->cb_printf ("[ ");
 			while (size--) {
 				updateAddr (buf + i, size - i, endian, &addr, NULL);
 				addr32 = (ut32)addr;
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("%d", addr32);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (",");
@@ -734,11 +846,15 @@ static int r_print_format_10bytes(const RPrint* p, int mode, const char* setval,
 			return -1;
 		}
 		p->iob.read_at (p->iob.io, (ut64)addr, buffer, 248);
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki);
+		}
 		for (j=0; j<10; j++) {
 			p->cb_printf ("%02x ", buf[j]);
 		}
-		if (!SEEVALUE) p->cb_printf (" ... (");
+		if (!SEEVALUE) {
+			p->cb_printf (" ... (");
+		}
 		for (j = 0; j < 10; j++) {
 			if (!SEEVALUE) {
 				if (IS_PRINTABLE (buf[j])) {
@@ -748,7 +864,9 @@ static int r_print_format_10bytes(const RPrint* p, int mode, const char* setval,
 				}
 			}
 		}
-		if (!SEEVALUE) p->cb_printf (")");
+		if (!SEEVALUE) {
+			p->cb_printf (")");
+		}
 	} else if (MUSTSEEJSON) {
 		if (!p->iob.read_at) {
 			printf ("(cannot read memory)\n");
@@ -779,17 +897,22 @@ static int r_print_format_hexpairs(const RPrint* p, int endian, int mode,
 		}
 	} else if (MUSTSEE) {
 		size = (size < 1) ? 1 : size;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki);
+		}
 		for (j = 0; j < size; j++) {
 			p->cb_printf ("%02x ", buf[i + j]);
 		}
-		if (!SEEVALUE) p->cb_printf (" ... (");
+		if (!SEEVALUE) {
+			p->cb_printf (" ... (");
+		}
 		for (j=0; j<size; j++) {
 			if (!SEEVALUE) {
-				if (IS_PRINTABLE (buf[j]))
+				if (IS_PRINTABLE (buf[j])) {
 					p->cb_printf ("%c", buf[i+j]);
-				else
+				} else {
 					p->cb_printf (".");
+				}
 			}
 		}
 		p->cb_printf (")");
@@ -797,8 +920,9 @@ static int r_print_format_hexpairs(const RPrint* p, int endian, int mode,
 		size = (size < 1) ? 1 : size;
 		p->cb_printf ("[ %d", buf[0]);
 		j = 1;
-		for (; j < 10; j++)
+		for (; j < 10; j++) {
 			p->cb_printf (", %d", buf[j]);
+		}
 		p->cb_printf ("]}");
 		return size;
 	}
@@ -940,7 +1064,9 @@ static void r_print_format_word(const RPrint* p, int endian, int mode,
 				: (*(buf+i+1))<<8 | (*(buf+i));
 			if (elem == -1 || elem == 0) {
 				p->cb_printf ("%d", addr);
-				if (elem == 0) elem = -2;
+				if (elem == 0) {
+					elem = -2;
+				}
 			}
 			if (size != 0 && elem == -1) {
 				p->cb_printf (",");
@@ -966,7 +1092,9 @@ static void r_print_format_word(const RPrint* p, int endian, int mode,
 					: (*(buf+i+1))<<8 | (*(buf+i));
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("0x%04x", addr);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (", ");
@@ -991,12 +1119,16 @@ static void r_print_format_word(const RPrint* p, int endian, int mode,
 					: (*(buf+i+1))<<8 | (*(buf+i));
 				if (elem == -1 || elem == 0) {
 					p->cb_printf ("%d", addr);
-					if (elem == 0) elem = -2;
+					if (elem == 0) {
+						elem = -2;
+					}
 				}
 				if (size != 0 && elem == -1) {
 					p->cb_printf (",");
 				}
-				if (elem > -1) elem--;
+				if (elem > -1) {
+					elem--;
+				}
 				i += 2;
 			}
 			p->cb_printf (" ]");
@@ -1040,12 +1172,16 @@ static void r_print_format_nulltermstring(const RPrint* p, const int len, int en
 				p->cb_printf ("\\\"");
 			} else if (IS_PRINTABLE (ch)) {
 				p->cb_printf ("%c", ch);
-			} else p->cb_printf (".");
+			} else {
+				p->cb_printf (".");
+			}
 		}
 		p->cb_printf ("\\\"");
 	} else if (MUSTSEE) {
 		int j = i;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08" PFMT64x " = ", seeki);
+		}
 		for (; j < len && ((size == -1 || size-- > 0) && buf[j]) ; j++) {
 			if (IS_PRINTABLE (buf[j])) {
 				p->cb_printf ("%c", buf[j]);
@@ -1110,12 +1246,18 @@ static void r_print_format_bitfield(const RPrint* p, ut64 seeki, char* fmtname,
 	}
 	bitfield = r_type_enum_getbitfield (p->sdb_types, fmtname, addr);
 	if (bitfield && *bitfield) {
-		if (MUSTSEEJSON) p->cb_printf ("\"%s\"}", bitfield);
-		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = %s\n", fieldname, bitfield);
+		if (MUSTSEEJSON) {
+			p->cb_printf ("\"%s\"}", bitfield);
+		} else if (MUSTSEE) {
+			p->cb_printf (" %s (bitfield) = %s\n", fieldname, bitfield);
+		}
 	} else {
-		if (MUSTSEEJSON) p->cb_printf ("\"`tb %s 0x%x`\"}", fmtname, addr);
-		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = `tb %s 0x%x`\n",
+		if (MUSTSEEJSON) {
+			p->cb_printf ("\"`tb %s 0x%x`\"}", fmtname, addr);
+		} else if (MUSTSEE) {
+			p->cb_printf (" %s (bitfield) = `tb %s 0x%x`\n",
 				fieldname, fmtname, addr);
+		}
 	}
 	free (bitfield);
 }
@@ -1162,8 +1304,11 @@ static void r_print_format_register (const RPrint* p, int mode,
 		if (MUSTSET) {
 			p->cb_printf ("dr %s=%s\n", name, setval);
 		} else if (MUSTSEE) {
-			if (!SEEVALUE) p->cb_printf("%s : 0x%08"PFMT64x"\n", ri->name, p->get_register_value (p->reg, ri));
-			else p->cb_printf("0x%08"PFMT64x"\n", p->get_register_value (p->reg, ri));
+			if (!SEEVALUE) {
+				p->cb_printf ("%s : 0x%08" PFMT64x "\n", ri->name, p->get_register_value (p->reg, ri));
+			} else {
+				p->cb_printf ("0x%08" PFMT64x "\n", p->get_register_value (p->reg, ri));
+			}
 		} else if (MUSTSEEJSON) {
 			p->cb_printf ("%d}", p->get_register_value (p->reg, ri));
 		}
@@ -1323,7 +1468,9 @@ int r_print_format_struct_size(const char *f, RPrint *p, int mode, int n) {
 			tabsize_set = true;
 			tabsize = r_num_math (NULL, fmt + i + 1);
 			*end = ']';
-			while (fmt[i++] != ']');
+			while (fmt[i++] != ']') {
+				;
+			}
 		} else {
 			tabsize = 1;
 		}
@@ -1580,7 +1727,9 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 	if (!fmt) {
 		fmt = formatname;
 	}
-	while (*fmt && IS_WHITECHAR (*fmt)) fmt++;
+	while (*fmt && IS_WHITECHAR (*fmt)) {
+		fmt++;
+	}
 	argend = fmt + strlen (fmt);
 	arg = fmt;
 
@@ -1919,7 +2068,9 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname, seeki);
 				} else if (slide/STRUCTFLAG>0 && idx==1) {
 					p->cb_printf ("%s=0x%08"PFMT64x"\n", fieldname, seeki);
-				} else p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname , seeki);
+				} else {
+					p->cb_printf ("f %s=0x%08" PFMT64x "\n", fieldname, seeki);
+				}
 				if (newname) {
 					free (newname);
 					newname = fieldname = NULL;
@@ -1940,8 +2091,11 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 			/* json */
 			if (MUSTSEEJSON && mode & R_PRINT_JSON) {
 				if (oldslide <= slide) {
-					if (first) first = 0;
-					else p->cb_printf (",");
+					if (first) {
+						first = 0;
+					} else {
+						p->cb_printf (",");
+					}
 				} else if (oldslide) {
 					p->cb_printf ("]},");
 				}
@@ -1973,10 +2127,10 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					p->cb_printf (" NULL\n");
 				}
 				isptr = PTRBACK;
-			} else
-			/* format chars */
-			// before to enter in the switch statement check buf boundaries due to  updateAddr
-			// might go beyond its len and it's usually called in each of the following functions
+			} else {
+				/* format chars */
+				// before to enter in the switch statement check buf boundaries due to  updateAddr
+				// might go beyond its len and it's usually called in each of the following functions
 #if 0
 // those boundaries are wrong. the fix was not correct, we need a reproducer
 			if (((i+3)<len) || (i+7)<len) {
@@ -2056,17 +2210,23 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					break;
 				case 'z': // zero terminated string
 					r_print_format_nulltermstring (p, len, endian, mode, setval, seeki, buf, i, size);
-					if (size == -1)
+					if (size == -1) {
 						i+=strlen((char*)buf+i)+1;
-					else
-						while (size--) i++;
+					} else {
+						while (size--) {
+							i++;
+						}
+					}
 					break;
 				case 'Z': // zero terminated wide string
 					r_print_format_nulltermwidestring (p, len, endian, mode, setval, seeki, buf, i, size);
-					if (size == -1)
+					if (size == -1) {
 						i += r_wstr_clen((char*)(buf+i))*2+2;
-					else
-						while (size--) i+=2;
+					} else {
+						while (size--) {
+							i += 2;
+						}
+					}
 					break;
 				case 's':
 					if (r_print_format_string (p, seeki, addr64, addr, 0, mode) == 0) {
@@ -2074,16 +2234,21 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					}
 					break;
 				case 'S':
-					if (r_print_format_string (p, seeki, addr64, addr, 1, mode) == 0)
-						i += (size==-1) ? 8 : 8*size;
+					if (r_print_format_string (p, seeki, addr64, addr, 1, mode) == 0) {
+						i += (size == -1) ? 8 : 8 * size;
+					}
 					break;
 				case 'B': // resolve bitfield
-					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
+					if (size >= ARRAYINDEX_COEF) {
+						size %= ARRAYINDEX_COEF;
+					}
 					r_print_format_bitfield (p, seeki, fmtname, fieldname, addr, mode, size);
 					i+=(size==-1)?1:size;
 					break;
 				case 'E': // resolve enum
-					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
+					if (size >= ARRAYINDEX_COEF) {
+						size %= ARRAYINDEX_COEF;
+					}
 					r_print_format_enum (p, seeki, fmtname, fieldname, addr, mode, size);
 					i += (size==-1)? 1: size;
 					break;
@@ -2110,7 +2275,9 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					}
 
 					if (MUSTSEE) {
-						if (!SEEVALUE) p->cb_printf ("\n");
+						if (!SEEVALUE) {
+							p->cb_printf ("\n");
+						}
 					}
 					if (MUSTSEEJSON) {
 						if (isptr) {
@@ -2221,6 +2388,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 					invalid = 1;
 					break;
 				} //switch
+			}
 #if 0
 			} else {
 				eprintf ("r_print_format: Likely a heap buffer overflow (%s)\n", buf);
@@ -2232,9 +2400,13 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 			}
 			if (viewflags && p->offname) {
 				const char *s = p->offname (p->user, seeki);
-				if (s) p->cb_printf ("@(%s)", s);
+				if (s) {
+					p->cb_printf ("@(%s)", s);
+				}
 				s = p->offname (p->user, addr);
-				if (s) p->cb_printf ("*(%s)", s);
+				if (s) {
+					p->cb_printf ("*(%s)", s);
+				}
 			}
 			if (tmp != 'D' && !invalid && !fmtname && MUSTSEE) {
 				p->cb_printf ("\n");
diff --git a/libr/util/graph.c b/libr/util/graph.c
index 3de7b89db4..db8de9aec9 100644
--- a/libr/util/graph.c
+++ b/libr/util/graph.c
@@ -61,15 +61,17 @@ static void dfs_node (RGraph *g, RGraphNode *n, RGraphVisitor *vis, int color[])
 		int i;
 
 		if (from && cur) {
-			if (color[cur->idx] == WHITE_COLOR && vis->tree_edge)
+			if (color[cur->idx] == WHITE_COLOR && vis->tree_edge) {
 				vis->tree_edge (cur_edge, vis);
-			else if (color[cur->idx] == GRAY_COLOR && vis->back_edge)
+			} else if (color[cur->idx] == GRAY_COLOR && vis->back_edge) {
 				vis->back_edge (cur_edge, vis);
-			else if (color[cur->idx] == BLACK_COLOR && vis->fcross_edge)
+			} else if (color[cur->idx] == BLACK_COLOR && vis->fcross_edge) {
 				vis->fcross_edge (cur_edge, vis);
+			}
 		} else if (!cur && from) {
-			if (color[from->idx] != BLACK_COLOR && vis->finish_node)
+			if (color[from->idx] != BLACK_COLOR && vis->finish_node) {
 				vis->finish_node (from, vis);
+			}
 			color[from->idx] = BLACK_COLOR;
 		}
 		free (cur_edge);
@@ -100,7 +102,9 @@ static void dfs_node (RGraph *g, RGraphNode *n, RGraphVisitor *vis, int color[])
 
 R_API RGraph *r_graph_new () {
 	RGraph *t = R_NEW0 (RGraph);
-	if (!t) return NULL;
+	if (!t) {
+		return NULL;
+	}
 	t->nodes = r_list_new ();
 	if (!t->nodes) {
 		r_graph_free(t);
@@ -191,7 +195,9 @@ R_API void r_graph_add_edge_at (RGraph *t, RGraphNode *from, RGraphNode *to, int
 }
 
 R_API void r_graph_del_edge (RGraph *t, RGraphNode *from, RGraphNode *to) {
-	if (!from || !to || !r_graph_adjacent (t, from, to)) return;
+	if (!from || !to || !r_graph_adjacent (t, from, to)) {
+		return;
+	}
 	r_list_delete_data (from->out_nodes, to);
 	r_list_delete_data (from->all_neighbours, to);
 	r_list_delete_data (to->in_nodes, from);
@@ -201,14 +207,18 @@ R_API void r_graph_del_edge (RGraph *t, RGraphNode *from, RGraphNode *to) {
 
 /* returns the list of nodes reachable from `n` */
 R_API const RList *r_graph_get_neighbours (const RGraph *g, const RGraphNode *n) {
-	if (!n) return NULL;
+	if (!n) {
+		return NULL;
+	}
 	return n->out_nodes;
 }
 
 /* returns the n-th nodes reachable from the give node `n`.
  * This, of course, depends on the order of the nodes. */
 R_API RGraphNode *r_graph_nth_neighbour (const RGraph *g, const RGraphNode *n, int nth) {
-	if (!n) return NULL;
+	if (!n) {
+		return NULL;
+	}
 	return (RGraphNode *)r_list_get_n (n->out_nodes, nth);
 }
 
@@ -228,7 +238,9 @@ R_API const RList *r_graph_get_nodes (const RGraph *g) {
 
 /* true if there is an edge from the node `from` to the node `to` */
 R_API int r_graph_adjacent (const RGraph *g, const RGraphNode *from, const RGraphNode *to) {
-	if (!g || !from) return false;
+	if (!g || !from) {
+		return false;
+	}
 	return r_list_contains (from->out_nodes, to) ? true : false;
 }
 
diff --git a/libr/util/hex.c b/libr/util/hex.c
index 4011fb65f0..22dd1b30ad 100644
--- a/libr/util/hex.c
+++ b/libr/util/hex.c
@@ -388,9 +388,13 @@ R_API char *r_hex_bin2strdup(const ut8 *in, int len) {
 	int i, idx;
 	char tmp[5], *out;
 
-	if ((len + 1) * 2 < len) return NULL;
+	if ((len + 1) * 2 < len) {
+		return NULL;
+	}
 	out = malloc ((len + 1) * 2);
-	if (!out) return NULL;
+	if (!out) {
+		return NULL;
+	}
 	for (i = idx = 0; i < len; i++, idx += 2)  {
 		snprintf (tmp, sizeof (tmp), "%02x", in[i]);
 		memcpy (out+idx, tmp, 2);
@@ -436,7 +440,9 @@ R_API int r_hex_str2bin(const char *in, ut8 *out) {
 	}
 
 	if (nibbles % 2) {
-		if (out) r_hex_to_byte (&out[nibbles/2], '0');
+		if (out) {
+			r_hex_to_byte (&out[nibbles / 2], '0');
+		}
 		return -(nibbles+1) / 2;
 	}
 
@@ -448,16 +454,25 @@ R_API int r_hex_str2binmask(const char *in, ut8 *out, ut8 *mask) {
 	int len, ilen = strlen (in)+1;
 	int has_nibble = 0;
 	memcpy (out, in, ilen);
-	for (ptr=out; *ptr; ptr++) if (*ptr=='.') *ptr = '0';
+	for (ptr = out; *ptr; ptr++) {
+		if (*ptr == '.') {
+			*ptr = '0';
+		}
+	}
 	len = r_hex_str2bin ((char*)out, out);
 	if (len<0) { has_nibble = 1; len = -(len+1); }
 	if (len != -1) {
 		memcpy (mask, in, ilen);
-		if (has_nibble)
-			memcpy (mask+ilen, "f0", 3);
-		for (ptr=mask; *ptr; ptr++) *ptr = (*ptr=='.')?'0':'f';
+		if (has_nibble) {
+			memcpy (mask + ilen, "f0", 3);
+		}
+		for (ptr = mask; *ptr; ptr++) {
+			*ptr = (*ptr == '.') ? '0' : 'f';
+		}
 		len = r_hex_str2bin ((char*)mask, mask);
-		if (len<0) len++;
+		if (len < 0) {
+			len++;
+		}
 	}
 	return len;
 }
@@ -465,16 +480,19 @@ R_API int r_hex_str2binmask(const char *in, ut8 *out, ut8 *mask) {
 R_API st64 r_hex_bin_truncate (ut64 in, int n) {
 	switch (n) {
 	case 1:
-		if ((in&UT8_GT0))
-			return UT64_8U|in;
+		if ((in & UT8_GT0)) {
+			return UT64_8U | in;
+		}
 		return in&UT8_MAX;
 	case 2:
-		if ((in&UT16_GT0))
-			return UT64_16U|in;
+		if ((in & UT16_GT0)) {
+			return UT64_16U | in;
+		}
 		return in&UT16_MAX;
 	case 4:
-		if ((in&UT32_GT0))
-			return UT64_32U|in;
+		if ((in & UT32_GT0)) {
+			return UT64_32U | in;
+		}
 		return in&UT32_MAX;
 	case 8:
 		return in&UT64_MAX;
@@ -490,10 +508,12 @@ R_API int r_hex_str_is_valid(const char* str) {
 		str += 2;
 	}
 	for (i = 0; str[i] != '\0'; i++) {
-		if (IS_HEXCHAR (str[i]))
+		if (IS_HEXCHAR (str[i])) {
 			len++;
-		if (IS_HEXCHAR (str[i]) || IS_WHITESPACE(str[i]))
+		}
+		if (IS_HEXCHAR (str[i]) || IS_WHITESPACE (str[i])) {
 			continue;
+		}
 		return -1; //if we're here, then str isnt valid
 	}
 	return len;
diff --git a/libr/util/lib.c b/libr/util/lib.c
index dbba860888..bc2505a6b2 100644
--- a/libr/util/lib.c
+++ b/libr/util/lib.c
@@ -113,11 +113,15 @@ R_API char *r_lib_path(const char *libname) {
 	char *env = strdup (".:../../../../../../../windows/system32");
 	const char *ext = ".dll";
 #endif
-	if (!env) env = strdup (".");
+	if (!env) {
+		env = strdup (".");
+	}
 	path0 = env;
 	do {
 		next = strchr (path0, ':');
-		if (next) *next = 0;
+		if (next) {
+			*next = 0;
+		}
 		snprintf (libpath, sizeof (libpath), "%s/%s%s", path0, libname, ext);
 		//eprintf ("--> %s\n", libpath);
 		if (r_file_exists (libpath)) {
@@ -178,8 +182,9 @@ R_API RLibHandler *r_lib_get_handler(RLib *lib, int type) {
 	RLibHandler *h;
 	RListIter *iter;
 	r_list_foreach (lib->handlers, iter, h) {
-		if (h->type == type)
+		if (h->type == type) {
 			return h;
+		}
 	}
 	return NULL;
 }
@@ -323,7 +328,9 @@ R_API int r_lib_open_ptr (RLib *lib, const char *file, void *handler, RLibStruct
 		free (p->file);
 		free (p);
 		r_lib_dl_close (handler);
-	} else r_list_append (lib->plugins, p);
+	} else {
+		r_list_append (lib->plugins, p);
+	}
 
 	return ret;
 }
@@ -426,8 +433,9 @@ R_API bool r_lib_add_handler(RLib *lib,
 	}
 	if (!handler) {
 		handler = R_NEW (RLibHandler);
-		if (!handler)
+		if (!handler) {
 			return false;
+		}
 		handler->type = type;
 		r_list_append (lib->handlers, handler);
 	}
diff --git a/libr/util/list.c b/libr/util/list.c
index 2e5f6686e1..23572a97d0 100644
--- a/libr/util/list.c
+++ b/libr/util/list.c
@@ -300,7 +300,7 @@ R_API int r_list_del_n(RList *list, int n) {
 	if (!list) {
 		return false;
 	}
-	for (it = list->head, i = 0; it && it->data; it = it->n, i++)
+	for (it = list->head, i = 0; it && it->data; it = it->n, i++) {
 		if (i == n) {
 			if (!it->p && !it->n) {
 				list->head = list->tail = NULL;
@@ -318,6 +318,7 @@ R_API int r_list_del_n(RList *list, int n) {
 			list->length--;
 			return true;
 		}
+	}
 	return false;
 }
 
@@ -371,7 +372,9 @@ R_API RList *r_list_clone(RList *list) {
 R_API RListIter *r_list_add_sorted(RList *list, void *data, RListComparator cmp) {
 	RListIter *it, *item = NULL;
 	if (list && data && cmp) {
-		for (it = list->head; it && it->data && cmp (data, it->data) > 0; it = it->n) ;
+		for (it = list->head; it && it->data && cmp (data, it->data) > 0; it = it->n) {
+			;
+		}
 		if (it) {
 			item = R_NEW0 (RListIter);
 			if (!item) {
diff --git a/libr/util/log.c b/libr/util/log.c
index 0e7cfc77e5..1b053af03e 100644
--- a/libr/util/log.c
+++ b/libr/util/log.c
@@ -11,7 +11,9 @@ R_API void r_log_file(const char *str) {
 	if (fd) {
 		fputs (str, fd);
 		fclose (fd);
-	} else eprintf ("ERR: Cannot open %s\n", logfile);
+	} else {
+		eprintf ("ERR: Cannot open %s\n", logfile);
+	}
 }
 
 R_API void r_log_msg(const char *str) {
diff --git a/libr/util/name.c b/libr/util/name.c
index f86d671cc9..8b370206ea 100644
--- a/libr/util/name.c
+++ b/libr/util/name.c
@@ -72,11 +72,15 @@ R_API int r_name_filter(char *name, int maxlen) {
 	}
 	// trimming trailing and leading underscores
 	len = strlen (name);
-	for (; len > 0 && *(name + len - 1) == '_'; len--);
+	for (; len > 0 && *(name + len - 1) == '_'; len--) {
+		;
+	}
 	if (!len) { // name consists only of underscores
 		return r_name_check (oname);
 	}
-	for (i = 0; *(name + i) == '_'; i++, len--);
+	for (i = 0; *(name + i) == '_'; i++, len--) {
+		;
+	}
 	memmove (name, name + i, len);
 	*(name + len) = '\0';
 	return r_name_check (oname);
diff --git a/libr/util/pkcs7.c b/libr/util/pkcs7.c
index 4267b47c44..97d35ab9b1 100644
--- a/libr/util/pkcs7.c
+++ b/libr/util/pkcs7.c
@@ -389,7 +389,9 @@ char* r_pkcs7_signerinfos_dump (RX509CertificateRevocationList *crl, char* buffe
 		pad = "";
 	}
 	pad3 = r_str_newf ("%s    ", pad);
-	if (!pad3) return NULL;
+	if (!pad3) {
+		return NULL;
+	}
 
 	pad2 = pad3 + 2;
 	algo = crl->signature.algorithm;
@@ -485,7 +487,9 @@ static char* r_x509_signedinfo_dump (RPKCS7SignerInfo *si, char* buffer, ut32 le
 	}
 	for (i = 0; i < si->authenticatedAttributes.length; ++i) {
 		RPKCS7Attribute* attr = si->authenticatedAttributes.elements[i];
-		if (!attr) continue;
+		if (!attr) {
+			continue;
+		}
 		r = snprintf (buffer + p, length - p, "%s%s: %u bytes\n",
 					pad3, attr->oid ? attr->oid->string : "Missing", attr->data ? attr->data->length : 0);
 		p += (ut32) r;
diff --git a/libr/util/print.c b/libr/util/print.c
index 7f3fd39a33..5e8248fcb8 100644
--- a/libr/util/print.c
+++ b/libr/util/print.c
@@ -1433,14 +1433,22 @@ R_API void r_print_fill(RPrint *p, const ut8 *arr, int size, ut64 addr, int step
 		if (next < arr[i]) {
 			//if (arr[i]>0 && i>0) p->cb_printf ("  ");
 			if (arr[i] > INC) {
-				for (j = 0; j < next + base; j += INC) p->cb_printf (i? " ": "'");
+				for (j = 0; j < next + base; j += INC) {
+					p->cb_printf (i ? " " : "'");
+				}
+			}
+			for (j = next + INC; j + base < arr[i]; j += INC) {
+				p->cb_printf ("_");
 			}
-			for (j = next + INC; j + base < arr[i]; j += INC) p->cb_printf ("_");
 		} else {
 			if (i == 0) {
-				for (j = INC; j < arr[i] + base; j += INC) p->cb_printf ("'");
+				for (j = INC; j < arr[i] + base; j += INC) {
+					p->cb_printf ("'");
+				}
 			} else {
-				for (j = INC; j < arr[i] + base; j += INC) p->cb_printf (" ");
+				for (j = INC; j < arr[i] + base; j += INC) {
+					p->cb_printf (" ");
+				}
 			}
 		}
 		//for (j=1;j<arr[i]; j+=INC) p->cb_printf (under);
@@ -1636,7 +1644,9 @@ static bool issymbol(char c) {
 static bool check_arg_name (RPrint *print, char *p, ut64 func_addr) {
 	if (func_addr && print->exists_var) {
 		int z;
-		for (z = 0; p[z] && (IS_ALPHA (p[z]) || IS_DIGIT (p[z]) || p[z] == '_'); z++);
+		for (z = 0; p[z] && (IS_ALPHA (p[z]) || IS_DIGIT (p[z]) || p[z] == '_'); z++) {
+			;
+		}
 		char tmp = p[z];
 		p[z] = '\0';
 		bool ret = print->exists_var (print, func_addr, p);
diff --git a/libr/util/queue.c b/libr/util/queue.c
index 9d6fcdfb68..e7ad59893e 100644
--- a/libr/util/queue.c
+++ b/libr/util/queue.c
@@ -37,8 +37,9 @@ static int increase_capacity(RQueue *q) {
 	int i, tmp_front;
 
 	newelems = R_NEWS0(void *, new_capacity);
-	if (!newelems)
+	if (!newelems) {
 		return false;
+	}
 
 	i = -1;
 	tmp_front = q->front;
@@ -59,8 +60,9 @@ static int increase_capacity(RQueue *q) {
 R_API int r_queue_enqueue(RQueue *q, void *el) {
 	if (is_full(q)) {
 		int res = increase_capacity (q);
-		if (!res)
+		if (!res) {
 			return false;
+		}
 	}
 
 	q->rear = (q->rear + 1) % q->capacity;
diff --git a/libr/util/r_json.c b/libr/util/r_json.c
index 8633702e56..611ca60193 100644
--- a/libr/util/r_json.c
+++ b/libr/util/r_json.c
@@ -254,14 +254,18 @@ R_API char* r_json_var_string (RJSVar* var, bool expanded) {
 			}
 			for (i = 0; i < var->array.l; i++) {
 				t[i] = r_json_var_string (var->array.a[i], expanded);
-				if (!t[i]) continue;
+				if (!t[i]) {
+					continue;
+				}
 				len += strlen (t[i]) + 1;
 			}
 			c = (char*) calloc (len, 1);
 			p = c + 1;
 			e = p + len;
 			for (i = 0; i < var->array.l; i++) {
-				if (!t[i]) continue;
+				if (!t[i]) {
+					continue;
+				}
 				if (c) {
 					p += snprintf (p, e - p, "%s,", t[i]);
 				}
@@ -269,8 +273,9 @@ R_API char* r_json_var_string (RJSVar* var, bool expanded) {
 			}
 			if (c) {
 				c[0] = '[';
-				if (p == c + 1)
+				if (p == c + 1) {
 					p++;
+				}
 				c[len - (e - p)] = ']';
 				c[len - 1] = 0;
 			}
@@ -292,7 +297,9 @@ R_API char* r_json_var_string (RJSVar* var, bool expanded) {
 			len = 3;
 			for (i = 0; i < var->object.l; i++) {
 				t[i] = r_json_var_string (var->object.a[i], expanded);
-				if (!t[i]) continue;
+				if (!t[i]) {
+					continue;
+				}
 				fflush (stdout);
 				len += strlen (t[i]) + strlen (var->object.n[i]) + 4;
 			}
@@ -300,7 +307,9 @@ R_API char* r_json_var_string (RJSVar* var, bool expanded) {
 			p = c + 1;
 			e = p + len;
 			for (i = 0; i < var->object.l; i++) {
-				if (!t[i]) continue;
+				if (!t[i]) {
+					continue;
+				}
 				if (c) {
 					p += snprintf (p, e - p, "\"%s\":%s,", var->object.n[i], t[i]);
 				}
@@ -308,8 +317,9 @@ R_API char* r_json_var_string (RJSVar* var, bool expanded) {
 			}
 			if (c) {
 				c[0] = '{';
-				if (p == c + 1)
+				if (p == c + 1) {
 					p++;
+				}
 				c[len - (e - p)] = '}';
 				c[len - 1] = 0;
 			}
diff --git a/libr/util/randomart.c b/libr/util/randomart.c
index 6ddeaf4218..d2881d8bcc 100644
--- a/libr/util/randomart.c
+++ b/libr/util/randomart.c
@@ -79,8 +79,9 @@ R_API char *r_print_randomart(const ut8 *dgst_raw, ut32 dgst_raw_len, ut64 addr)
 			y = R_MIN(y, FLDSIZE_Y - 1);
 
 			/* augment the field */
-			if (field[x][y] < len - 2)
+			if (field[x][y] < len - 2) {
 				field[x][y]++;
+			}
 			input = input >> 2;
 		}
 	}
@@ -99,24 +100,27 @@ R_API char *r_print_randomart(const ut8 *dgst_raw, ut32 dgst_raw_len, ut64 addr)
 	p = strchr(retval, '\0');
 
 	/* output upper border */
-	for (i = p - retval - 1; i < FLDSIZE_X; i++)
+	for (i = p - retval - 1; i < FLDSIZE_X; i++) {
 		*p++ = '-';
+	}
 	*p++ = '+';
 	*p++ = '\n';
 
 	/* output content */
 	for (y = 0; y < FLDSIZE_Y; y++) {
 		*p++ = '|';
-		for (x = 0; x < FLDSIZE_X; x++)
-			*p++ = augmentation_string[R_MIN(field[x][y], len)];
+		for (x = 0; x < FLDSIZE_X; x++) {
+			*p++ = augmentation_string[R_MIN (field[x][y], len)];
+		}
 		*p++ = '|';
 		*p++ = '\n';
 	}
 
 	/* output lower border */
 	*p++ = '+';
-	for (i = 0; i < FLDSIZE_X; i++)
+	for (i = 0; i < FLDSIZE_X; i++) {
 		*p++ = '-';
+	}
 	*p++ = '+';
 	*p++ = 0;
 
diff --git a/libr/util/range.c b/libr/util/range.c
index 1c4ff490ed..19c5c6099c 100644
--- a/libr/util/range.c
+++ b/libr/util/range.c
@@ -62,8 +62,9 @@ RRangeItem *r_range_item_get(RRange *rgs, ut64 addr) {
 	RRangeItem *r;
 	RListIter *iter;
 	r_list_foreach (rgs->ranges, iter, r) {
-		if (addr >= r->fr && addr < r->to)
+		if (addr >= r->fr && addr < r->to) {
 			return r;
+		}
 	}
 	return NULL;
 }
diff --git a/libr/util/regex/regcomp.c b/libr/util/regex/regcomp.c
index 00a1129dc5..e7fb3e6677 100644
--- a/libr/util/regex/regcomp.c
+++ b/libr/util/regex/regcomp.c
@@ -160,24 +160,43 @@ R_API int r_regex_match (const char *pattern, const char *flags, const char *tex
 R_API RRegex *r_regex_new (const char *pattern, const char *flags) {
 	RRegex rx, *r;
 	memset(&rx, 0, sizeof(RRegex));
-	if (r_regex_comp (&rx, pattern, r_regex_flags (flags)))
+	if (r_regex_comp (&rx, pattern, r_regex_flags (flags))) {
 		return NULL;
+	}
 	r = malloc (sizeof (RRegex));
-	if (!r) return NULL;
+	if (!r) {
+		return NULL;
+	}
 	memcpy (r, &rx, sizeof (RRegex));
 	return r;
 }
 
 R_API int r_regex_flags(const char *f) {
 	int flags = 0;
-	if (!f||!*f) return 0;
-	if (strchr (f, 'e')) flags |= R_REGEX_EXTENDED;
-	if (strchr (f, 'i')) flags |= R_REGEX_ICASE;
-	if (strchr (f, 's')) flags |= R_REGEX_NOSUB;
-	if (strchr (f, 'n')) flags |= R_REGEX_NEWLINE;
-	if (strchr (f, 'N')) flags |= R_REGEX_NOSPEC;
-	if (strchr (f, 'p')) flags |= R_REGEX_PEND;
-	if (strchr (f, 'd')) flags |= R_REGEX_DUMP;
+	if (!f || !*f) {
+		return 0;
+	}
+	if (strchr (f, 'e')) {
+		flags |= R_REGEX_EXTENDED;
+	}
+	if (strchr (f, 'i')) {
+		flags |= R_REGEX_ICASE;
+	}
+	if (strchr (f, 's')) {
+		flags |= R_REGEX_NOSUB;
+	}
+	if (strchr (f, 'n')) {
+		flags |= R_REGEX_NEWLINE;
+	}
+	if (strchr (f, 'N')) {
+		flags |= R_REGEX_NOSPEC;
+	}
+	if (strchr (f, 'p')) {
+		flags |= R_REGEX_PEND;
+	}
+	if (strchr (f, 'd')) {
+		flags |= R_REGEX_DUMP;
+	}
 	return flags;
 }
 
@@ -323,8 +342,9 @@ R_API int r_regex_comp(RRegex *preg, const char *pattern, int cflags) {
 	preg->re_magic = MAGIC1;
 #ifndef REDEBUG
 	/* not debugging, so can't rely on the asssert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(R_REGEX_ASSERT);
+	if (g->iflags & BAD) {
+		SETERROR (R_REGEX_ASSERT);
+	}
 #endif
 	if (p->error) {
 		r_regex_fini (preg);
@@ -395,11 +415,13 @@ static void p_ere_exp(struct parse *p) {
 		REQUIRE(MORE(), R_REGEX_EPAREN);
 		p->g->nsub++;
 		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
+		if (subno < NPAREN) {
+			p->pbegin[subno] = HERE ();
+		}
 		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')');
+		if (!SEE (')')) {
+			p_ere (p, ')');
+		}
 		if (subno < NPAREN) {
 			p->pend[subno] = HERE();
 			if (!p->pend[subno]) {
@@ -429,10 +451,11 @@ static void p_ere_exp(struct parse *p) {
 		SETERROR(R_REGEX_BADRPT);
 		break;
 	case '.':
-		if (p->g->cflags&R_REGEX_NEWLINE)
+		if (p->g->cflags & R_REGEX_NEWLINE) {
 			nonnewline(p);
-		else
-			EMIT(OANY, 0);
+		} else {
+			EMIT (OANY, 0);
+		}
 		break;
 	case '[':
 		p_bracket(p);
@@ -450,13 +473,15 @@ static void p_ere_exp(struct parse *p) {
 		break;
 	}
 
-	if (!MORE())
+	if (!MORE ()) {
 		return;
+	}
 	c = PEEK();
 	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((ut8)PEEK2())) ))
-		return;		/* no repetition, we're done */
+	if (!(c == '*' || c == '+' || c == '?' ||
+		    (c == '{' && MORE2 () && isdigit ((ut8)PEEK2 ())))) {
+		return; /* no repetition, we're done */
+	}
 	NEXT();
 
 	REQUIRE(!wascaret, R_REGEX_BADRPT);
@@ -487,26 +512,31 @@ static void p_ere_exp(struct parse *p) {
 			if (isdigit((ut8)PEEK())) {
 				count2 = p_count(p);
 				REQUIRE(count <= count2, R_REGEX_BADBR);
-			} else		/* single number with comma */
+			} else { /* single number with comma */
 				count2 = INTFINITY;
-		} else		/* just a single number */
+			}
+		} else { /* just a single number */
 			count2 = count;
+		}
 		repeat(p, pos, count, count2);
 		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
+			while (MORE () && PEEK () != '}') {
+				NEXT ();
+			}
 			REQUIRE(MORE(), R_REGEX_EBRACE);
 			SETERROR(R_REGEX_BADBR);
 		}
 		break;
 	}
 
-	if (!MORE())
+	if (!MORE ()) {
 		return;
+	}
 	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((ut8)PEEK2())) ) )
+	if (!(c == '*' || c == '+' || c == '?' ||
+		    (c == '{' && MORE2 () && isdigit ((ut8)PEEK2 ())))) {
 		return;
+	}
 	SETERROR(R_REGEX_BADRPT);
 }
 
@@ -584,10 +614,11 @@ p_simp_re(struct parse *p,
 	}
 	switch (c) {
 	case '.':
-		if (p->g->cflags&R_REGEX_NEWLINE)
+		if (p->g->cflags & R_REGEX_NEWLINE) {
 			nonnewline(p);
-		else
-			EMIT(OANY, 0);
+		} else {
+			EMIT (OANY, 0);
+		}
 		break;
 	case '[':
 		p_bracket(p);
@@ -598,12 +629,14 @@ p_simp_re(struct parse *p,
 	case BACKSL|'(':
 		p->g->nsub++;
 		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
+		if (subno < NPAREN) {
+			p->pbegin[subno] = HERE ();
+		}
 		EMIT(OLPAREN, subno);
 		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')');
+		if (MORE () && !SEETWO ('\\', ')')) {
+			p_bre (p, '\\', ')');
+		}
 		if (subno < NPAREN) {
 			p->pend[subno] = HERE();
 			if (!p->pend[subno]) {
@@ -661,19 +694,23 @@ p_simp_re(struct parse *p,
 			if (MORE() && isdigit((ut8)PEEK())) {
 				count2 = p_count(p);
 				REQUIRE(count <= count2, R_REGEX_BADBR);
-			} else		/* single number with comma */
+			} else { /* single number with comma */
 				count2 = INTFINITY;
-		} else		/* just a single number */
+			}
+		} else { /* just a single number */
 			count2 = count;
+		}
 		repeat(p, pos, count, count2);
 		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
+			while (MORE () && !SEETWO ('\\', '}')) {
+				NEXT ();
+			}
 			REQUIRE(MORE(), R_REGEX_EBRACE);
 			SETERROR(R_REGEX_BADBR);
 		}
-	} else if (c == '$')	/* $ (but not \$) ends it */
-		return(1);
+	} else if (c == '$') { /* $ (but not \$) ends it */
+		return (1);
+	}
 
 	return(0);
 }
@@ -723,16 +760,20 @@ static void p_bracket(struct parse *p) {
 		return;
 	}
 
-	if (EAT('^'))
-		invert++;	/* make note to invert set at end */
-	if (EAT(']'))
+	if (EAT ('^')) {
+		invert++; /* make note to invert set at end */
+	}
+	if (EAT (']')) {
 		CHadd(cs, ']');
-	else if (EAT('-'))
-		CHadd(cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(cs, '-');
+	} else if (EAT ('-')) {
+		CHadd (cs, '-');
+	}
+	while (MORE () && PEEK () != ']' && !SEETWO ('-', ']')) {
+		p_b_term (p, cs);
+	}
+	if (EAT ('-')) {
+		CHadd (cs, '-');
+	}
 	MUSTEAT(']', R_REGEX_EBRACK);
 
 	if (p->error != 0) {	/* don't mess things up further */
@@ -744,27 +785,34 @@ static void p_bracket(struct parse *p) {
 		int i;
 		int ci;
 
-		for (i = p->g->csetsize - 1; i >= 0; i--)
+		for (i = p->g->csetsize - 1; i >= 0; i--) {
 			if (CHIN(cs, i) && isalpha(i)) {
 				ci = othercase(i);
-				if (ci != i)
-					CHadd(cs, ci);
+				if (ci != i) {
+					CHadd (cs, ci);
+				}
 			}
-		if (cs->multis != NULL)
-			mccase(p, cs);
+		}
+		if (cs->multis != NULL) {
+			mccase (p, cs);
+		}
 	}
 	if (invert) {
 		int i;
 
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i))
+		for (i = p->g->csetsize - 1; i >= 0; i--) {
+			if (CHIN (cs, i)) {
 				CHsub(cs, i);
-			else
-				CHadd(cs, i);
-		if (p->g->cflags&R_REGEX_NEWLINE)
-			CHsub(cs, '\n');
-		if (cs->multis != NULL)
-			mcinvert(p, cs);
+			} else {
+				CHadd (cs, i);
+			}
+		}
+		if (p->g->cflags & R_REGEX_NEWLINE) {
+			CHsub (cs, '\n');
+		}
+		if (cs->multis != NULL) {
+			mcinvert (p, cs);
+		}
 	}
 
 	if (cs->multis) {		/* xxx */
@@ -826,16 +874,19 @@ static void p_b_term(struct parse *p, cset *cs) {
 		if (SEE('-') && MORE2() && PEEK2() != ']') {
 			/* range */
 			NEXT();
-			if (EAT('-'))
+			if (EAT ('-')) {
 				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
+			} else {
+				finish = p_b_symbol (p);
+			}
+		} else {
 			finish = start;
-/* xxx what about signed chars here... */
+		}
+		/* xxx what about signed chars here... */
 		REQUIRE(start <= finish, R_REGEX_ERANGE);
-		for (i = start; i <= finish; i++)
-			CHadd(cs, i);
+		for (i = start; i <= finish; i++) {
+			CHadd (cs, i);
+		}
 		break;
 	}
 }
@@ -850,12 +901,15 @@ static void p_b_cclass(struct parse *p, cset *cs) {
 	char *u;
 	char c;
 
-	while (MORE() && isalpha((unsigned char)PEEK()))
-		NEXT();
+	while (MORE () && isalpha ((unsigned char)PEEK ())) {
+		NEXT ();
+	}
 	len = p->next - sp;
-	for (cp = cclasses; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
+	for (cp = cclasses; cp->name != NULL; cp++) {
+		if (strncmp (cp->name, sp, len) == 0 && cp->name[len] == '\0') {
 			break;
+		}
+	}
 	if (!cp->name) {
 		/* oops, didn't find it */
 		SETERROR(R_REGEX_ECTYPE);
@@ -863,10 +917,12 @@ static void p_b_cclass(struct parse *p, cset *cs) {
 	}
 
 	u = cp->chars;
-	while ((c = *u++) != '\0')
-		CHadd(cs, c);
-	for (u = cp->multis; *u != '\0'; u += strlen(u) + 1)
-		MCadd(p, cs, u);
+	while ((c = *u++) != '\0') {
+		CHadd (cs, c);
+	}
+	for (u = cp->multis; *u != '\0'; u += strlen (u) + 1) {
+		MCadd (p, cs, u);
+	}
 }
 
 /*
@@ -890,8 +946,9 @@ p_b_symbol(struct parse *p)
 	char value;
 
 	REQUIRE(MORE(), R_REGEX_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(GETNEXT());
+	if (!EATTWO ('[', '.')) {
+		return (GETNEXT ());
+	}
 
 	/* collating symbol */
 	value = p_b_coll_elem(p, '.');
@@ -910,18 +967,22 @@ p_b_coll_elem(struct parse *p,
 	struct cname *cp;
 	int len;
 
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
+	while (MORE () && !SEETWO (endc, ']')) {
+		NEXT ();
+	}
 	if (!MORE()) {
 		SETERROR(R_REGEX_EBRACK);
 		return(0);
 	}
 	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	if (len == 1)
-		return(*sp);	/* single character */
+	for (cp = cnames; cp->name != NULL; cp++) {
+		if (strncmp (cp->name, sp, len) == 0 && cp->name[len] == '\0') {
+			return (cp->code); /* known name */
+		}
+	}
+	if (len == 1) {
+		return (*sp); /* single character */
+	}
 	SETERROR(R_REGEX_ECOLLATE);			/* neither */
 	return(0);
 }
@@ -934,12 +995,13 @@ othercase(int ch)
 {
 	ch = (ut8)ch;
 	if (isalpha(ch)) {
-		if (isupper(ch))
+		if (isupper (ch)) {
 			return ((ut8)tolower(ch));
-		else if (islower(ch))
+		} else if (islower (ch)) {
 			return ((ut8)toupper(ch));
-		else			/* peculiar, but could happen */
-			return(ch);
+		} else { /* peculiar, but could happen */
+			return (ch);
+		}
 	}
 	return ch;
 }
@@ -977,12 +1039,13 @@ ordinary(struct parse *p, int ch)
 {
 	cat_t *cap = p->g->categories;
 
-	if ((p->g->cflags&R_REGEX_ICASE) && isalpha((ut8)ch) && othercase(ch) != ch)
+	if ((p->g->cflags & R_REGEX_ICASE) && isalpha ((ut8)ch) && othercase (ch) != ch) {
 		bothcases(p, ch);
-	else {
+	} else {
 		EMIT(OCHAR, (ut8)ch);
-		if (cap[ch] == 0)
+		if (cap[ch] == 0) {
 			cap[ch] = p->g->ncategories++;
+		}
 	}
 }
 
@@ -1027,8 +1090,9 @@ repeat(struct parse *p,
 #	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INTFINITY) ? INF : N)
 	sopno copy;
 
-	if (p->error != 0)	/* head off possible runaway recursion */
+	if (p->error != 0) { /* head off possible runaway recursion */
 		return;
+	}
 
 	if (from > to) {
 		return;
@@ -1090,8 +1154,9 @@ repeat(struct parse *p,
 static int			/* useless but makes type checking happy */
 seterr(struct parse *p, int e)
 {
-	if (p->error == 0)	/* keep earliest error condition */
+	if (p->error == 0) { /* keep earliest error condition */
 		p->error = e;
+	}
 	p->next = nuls;		/* try to bring things to a halt */
 	p->end = nuls;
 	return(0);		/* make the return value well-defined */
@@ -1119,23 +1184,27 @@ static cset * allocset(struct parse *p) {
 		nbytes = nc / CHAR_BIT * css;
 
 		ptr = (cset *)realloc((char *)p->g->sets, nc * sizeof(cset));
-		if (!ptr)
+		if (!ptr) {
 			goto nomem;
+		}
 		p->g->sets = ptr;
 
 		ptr = (ut8 *)realloc((char *)p->g->setbits, nbytes);
-		if (!ptr)
+		if (!ptr) {
 			goto nomem;
+		}
 		p->g->setbits = ptr;
 
-		for (i = 0; i < no; i++)
-			p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
+		for (i = 0; i < no; i++) {
+			p->g->sets[i].ptr = p->g->setbits + css * (i / CHAR_BIT);
+		}
 
 		(void) memset((char *)p->g->setbits + (nbytes - css), 0, css);
 	}
 	/* XXX should not happen */
-	if (!p->g->sets || !p->g->setbits)
+	if (!p->g->sets || !p->g->setbits) {
 		goto nomem;
+	}
 
 	cs = &p->g->sets[no];
 	cs->ptr = p->g->setbits + css*((no)/CHAR_BIT);
@@ -1164,10 +1233,12 @@ static void freeset(struct parse *p, cset *cs) {
 	cset *top = &p->g->sets[p->g->ncsets];
 	size_t css = (size_t)p->g->csetsize;
 
-	for (i = 0; i < css; i++)
-		CHsub(cs, i);
-	if (cs == top-1)	/* recover only the easy case */
+	for (i = 0; i < css; i++) {
+		CHsub (cs, i);
+	}
+	if (cs == top - 1) { /* recover only the easy case */
 		p->g->ncsets--;
+	}
 }
 
 /*
@@ -1189,15 +1260,19 @@ freezeset(struct parse *p, cset *cs)
 	size_t css = (size_t)p->g->csetsize;
 
 	/* look for an earlier one which is the same */
-	for (cs2 = &p->g->sets[0]; cs2 < top; cs2++)
+	for (cs2 = &p->g->sets[0]; cs2 < top; cs2++) {
 		if (cs2->hash == h && cs2 != cs) {
 			/* maybe */
-			for (i = 0; i < css; i++)
-				if (!!CHIN(cs2, i) != !!CHIN(cs, i))
-					break;		/* no */
-			if (i == css)
-				break;			/* yes */
+			for (i = 0; i < css; i++) {
+				if (!!CHIN (cs2, i) != !!CHIN (cs, i)) {
+					break; /* no */
+				}
+			}
+			if (i == css) {
+				break; /* yes */
+			}
 		}
+	}
 
 	if (cs2 < top) {	/* found one */
 		freeset(p, cs);
@@ -1216,9 +1291,11 @@ firstch(struct parse *p, cset *cs)
 	int i;
 	size_t css = (size_t)p->g->csetsize;
 
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			return((char)i);
+	for (i = 0; i < css; i++) {
+		if (CHIN (cs, i)) {
+			return ((char)i);
+		}
+	}
 	return(0);		/* arbitrary */
 }
 
@@ -1230,9 +1307,11 @@ static int nch(struct parse *p, cset *cs) {
 	size_t css = (size_t)p->g->csetsize;
 	int n = 0;
 
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
+	for (i = 0; i < css; i++) {
+		if (CHIN (cs, i)) {
 			n++;
+		}
+	}
 	return(n);
 }
 
@@ -1246,8 +1325,9 @@ static void mcadd( struct parse *p, cset *cs, char *cp) {
 	cs->smultis += strlen(cp) + 1;
 	np = realloc(cs->multis, cs->smultis);
 	if (!np) {
-		if (cs->multis)
-			free(cs->multis);
+		if (cs->multis) {
+			free (cs->multis);
+		}
 		cs->multis = NULL;
 		SETERROR(R_REGEX_ESPACE);
 		return;
@@ -1292,9 +1372,11 @@ isinsets(struct re_guts *g, int c)
 	int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
 	unsigned uc = (ut8)c;
 
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc] != 0)
-			return(1);
+	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) {
+		if (col[uc] != 0) {
+			return (1);
+		}
+	}
 	return(0);
 }
 
@@ -1310,9 +1392,11 @@ samesets(struct re_guts *g, int c1, int c2)
 	unsigned uc1 = (ut8)c1;
 	unsigned uc2 = (ut8)c2;
 
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc1] != col[uc2])
-			return(0);
+	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) {
+		if (col[uc1] != col[uc2]) {
+			return (0);
+		}
+	}
 	return(1);
 }
 
@@ -1328,17 +1412,21 @@ categorize(struct parse *p, struct re_guts *g)
 	cat_t cat;
 
 	/* avoid making error situations worse */
-	if (!p || p->error != 0 || !cats )
+	if (!p || p->error != 0 || !cats) {
 		return;
+	}
 
-	for (c = CHAR_MIN; c <= CHAR_MAX; c++)
+	for (c = CHAR_MIN; c <= CHAR_MAX; c++) {
 		if ( *(cats+c) && isinsets(g, c)) {
 			cat = g->ncategories++;
 			cats[c] = cat;
-			for (c2 = c+1; c2 <= CHAR_MAX; c2++)
-				if (cats[c2] == 0 && samesets(g, c, c2))
+			for (c2 = c + 1; c2 <= CHAR_MAX; c2++) {
+				if (cats[c2] == 0 && samesets (g, c, c2)) {
 					cats[c2] = cat;
+				}
+			}
 		}
+	}
 }
 
 /*
@@ -1353,8 +1441,9 @@ dupl(struct parse *p,
 	sopno len = finish - start;
 
 	if (finish >= start) {
-		if (len == 0)
-			return(ret);
+		if (len == 0) {
+			return (ret);
+		}
 		enlarge(p, p->ssize + len);	/* this many unexpected additions */
 		if (p->ssize >= p->slen + len) {
 			(void) memcpy((char *)(p->strip + p->slen),
@@ -1377,15 +1466,17 @@ static void
 doemit(struct parse *p, sop op, size_t opnd)
 {
 	/* avoid making error situations worse */
-	if (p->error != 0)
+	if (p->error != 0) {
 		return;
+	}
 
 	/* deal with oversize operands ("can't happen", more or less) */
 	if (opnd < 1<<OPSHIFT) {
 
 		/* deal with undersized strip */
-		if (p->slen >= p->ssize)
-			enlarge(p, (p->ssize+1) / 2 * 3);	/* +50% */
+		if (p->slen >= p->ssize) {
+			enlarge (p, (p->ssize + 1) / 2 * 3); /* +50% */
+		}
 		if (p->slen < p->ssize) {
 			/* finally, it's all reduced to the easy case */
 			p->strip[p->slen++] = SOP(op, opnd);
@@ -1404,8 +1495,9 @@ doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
 	int i;
 
 	/* avoid making error situations worse */
-	if (p->error != 0)
+	if (p->error != 0) {
 		return;
+	}
 
 	sn = HERE();
 	EMIT(op, opnd);		/* do checks, ensure space */
@@ -1438,8 +1530,9 @@ static void
 dofwd(struct parse *p, sopno pos, sop value)
 {
 	/* avoid making error situations worse */
-	if (p->error != 0)
+	if (p->error != 0) {
 		return;
+	}
 
 	if (value < 1<<OPSHIFT) {
 		p->strip[pos] = OP(p->strip[pos]) | value;
@@ -1454,8 +1547,9 @@ enlarge(struct parse *p, sopno size)
 {
 	sop *sp;
 
-	if (p->ssize >= size)
+	if (p->ssize >= size) {
 		return;
+	}
 
 	sp = (sop *)realloc(p->strip, size*sizeof(sop));
 	if (!sp) {
@@ -1501,8 +1595,9 @@ findmust(struct parse *p, struct re_guts *g)
 	sopno i;
 
 	/* avoid making error situations worse */
-	if (p->error != 0)
+	if (p->error != 0) {
 		return;
+	}
 
 	/* find the longest OCHAR sequence in strip */
 	newlen = 0;
@@ -1511,8 +1606,9 @@ findmust(struct parse *p, struct re_guts *g)
 		s = *scan++;
 		switch (OP(s)) {
 		case OCHAR:		/* sequence member */
-			if (newlen == 0)		/* new sequence */
+			if (newlen == 0) { /* new sequence */
 				newstart = scan - 1;
+			}
 			newlen++;
 			break;
 		case OPLUS_:		/* things that don't break one */
@@ -1543,8 +1639,9 @@ findmust(struct parse *p, struct re_guts *g)
 		}
 	} while (OP(s) != OEND);
 
-	if (g->mlen == 0)		/* there isn't one */
+	if (g->mlen == 0) { /* there isn't one */
 		return;
+	}
 
 	/* turn it into a character string */
 	g->must = malloc((size_t)g->mlen + 1);
@@ -1555,8 +1652,9 @@ findmust(struct parse *p, struct re_guts *g)
 	cp = g->must;
 	scan = start;
 	for (i = g->mlen; i > 0; i--) {
-		while (OP(s = *scan++) != OCHAR)
+		while (OP (s = *scan++) != OCHAR) {
 			continue;
+		}
 		if (cp < g->must + g->mlen) {
 			*cp++ = (char)OPND(s);
 		}
@@ -1577,8 +1675,9 @@ pluscount(struct parse *p, struct re_guts *g)
 	sopno plusnest = 0;
 	sopno maxnest = 0;
 
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
+	if (p->error != 0) {
+		return (0); /* there may not be an OEND */
+	}
 
 	scan = g->strip + 1;
 	do {
@@ -1588,13 +1687,15 @@ pluscount(struct parse *p, struct re_guts *g)
 			plusnest++;
 			break;
 		case O_PLUS:
-			if (plusnest > maxnest)
+			if (plusnest > maxnest) {
 				maxnest = plusnest;
+			}
 			plusnest--;
 			break;
 		}
 	} while (OP(s) != OEND);
-	if (plusnest != 0)
+	if (plusnest != 0) {
 		g->iflags |= BAD;
+	}
 	return(maxnest);
 }
diff --git a/libr/util/regex/regerror.c b/libr/util/regex/regerror.c
index 2b8eefa9c4..f8385365f0 100644
--- a/libr/util/regex/regerror.c
+++ b/libr/util/regex/regerror.c
@@ -121,11 +121,14 @@ regatoi(const RRegex *preg, char *localbuf, int localbufsize)
 {
 	struct rerr *r;
 
-	for (r = rerrs; r->code != 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
+	for (r = rerrs; r->code != 0; r++) {
+		if (strcmp (r->name, preg->re_endp) == 0) {
 			break;
-	if (r->code == 0)
-		return("0");
+		}
+	}
+	if (r->code == 0) {
+		return ("0");
+	}
 
 	(void)snprintf(localbuf, localbufsize, "%d", r->code);
 	return(localbuf);
diff --git a/libr/util/regex/regexec.c b/libr/util/regex/regexec.c
index 3e8ec4f356..28b0e56389 100644
--- a/libr/util/regex/regexec.c
+++ b/libr/util/regex/regexec.c
@@ -149,17 +149,21 @@ r_regex_exec(const RRegex *preg, const char *string, size_t nmatch,
 #else
 #	define	GOODFLAGS(f)	((f)&(R_REGEX_NOTBOL|R_REGEX_NOTEOL|R_REGEX_STARTEND))
 #endif
-	if (!preg || !string)
+	if (!preg || !string) {
 		return R_REGEX_ASSERT;
+	}
 
 	g = preg->re_g;
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(R_REGEX_BADPAT);
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(R_REGEX_BADPAT);
+	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2) {
+		return (R_REGEX_BADPAT);
+	}
+	if (g->iflags & BAD) { /* backstop for no-debug case */
+		return (R_REGEX_BADPAT);
+	}
 	eflags = GOODFLAGS(eflags);
-	if (g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags&R_REGEX_LARGE))
+	if (g->nstates <= CHAR_BIT * sizeof (states1) && !(eflags & R_REGEX_LARGE)) {
 		return(smatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, (char *)string, nmatch, pmatch, eflags));
+	} else {
+		return (lmatcher (g, (char *)string, nmatch, pmatch, eflags));
+	}
 }
diff --git a/libr/util/sandbox.c b/libr/util/sandbox.c
index 6d2a9db4a7..16fe416168 100644
--- a/libr/util/sandbox.c
+++ b/libr/util/sandbox.c
@@ -66,7 +66,9 @@ R_API bool r_sandbox_check_path (const char *path) {
 		return false;
 	}
 	// Properly check for directrory traversal using "..". First, does it start with a .. part?
-        if (path[0]=='.' && path[1]=='.' && (path[2]=='\0' || path[2]=='/')) return 0;
+	if (path[0] == '.' && path[1] == '.' && (path[2] == '\0' || path[2] == '/')) {
+		return 0;
+	}
 
 	// Or does it have .. in some other position?
 	for (p = strstr (path, "/.."); p; p = strstr(p, "/..")) {
@@ -292,8 +294,12 @@ R_API FILE *r_sandbox_fopen (const char *path, const char *mode) {
 R_API int r_sandbox_chdir (const char *path) {
 	if (enabled) {
 		// TODO: check path
-		if (strstr (path, "../")) return -1;
-		if (*path == '/') return -1;
+		if (strstr (path, "../")) {
+			return -1;
+		}
+		if (*path == '/') {
+			return -1;
+		}
 		return -1;
 	}
 	return chdir (path);
@@ -301,7 +307,9 @@ R_API int r_sandbox_chdir (const char *path) {
 
 R_API int r_sandbox_kill(int pid, int sig) {
 	// XXX: fine-tune. maybe we want to enable kill for child?
-	if (enabled) return -1;
+	if (enabled) {
+		return -1;
+	}
 #if __UNIX__
 	return kill (pid, sig);
 #endif
@@ -332,8 +340,9 @@ R_API HANDLE r_sandbox_opendir (const char *path, WIN32_FIND_DATAW *entry) {
 }
 #else
 R_API DIR* r_sandbox_opendir (const char *path) {
-	if (!path)
+	if (!path) {
 		return NULL;
+	}
 	if (r_sandbox_enable (0)) {
 		if (path && !r_sandbox_check_path (path)) {
 			return NULL;
diff --git a/libr/util/skiplist.c b/libr/util/skiplist.c
index 31d6a044ad..ad5561178b 100644
--- a/libr/util/skiplist.c
+++ b/libr/util/skiplist.c
@@ -85,7 +85,9 @@ static bool delete_element(RSkipList* list, void* data, bool by_data) {
 	// update forward links for all `update` points,
 	// by removing the element from the list in each level
 	for (i = 0; i <= list->list_level; i++) {
-		if (update[i]->forward[i] != x) break;
+		if (update[i]->forward[i] != x) {
+			break;
+		}
 		update[i]->forward[i] = x->forward[i];
 	}
 	r_skiplist_node_free (list, x);
@@ -165,7 +167,9 @@ R_API RSkipListNode* r_skiplist_insert(RSkipList* list, void* data) {
 	}
 
 	// randomly choose the number of levels the new node will be put in
-	for (x_level = 0; rand() < RAND_MAX/2 && x_level < SKIPLIST_MAX_DEPTH; x_level++);
+	for (x_level = 0; rand () < RAND_MAX / 2 && x_level < SKIPLIST_MAX_DEPTH; x_level++) {
+		;
+	}
 
 	// update the `update` array with default values when the current node
 	// has a level greater than the current one
diff --git a/libr/util/slist.c b/libr/util/slist.c
index 4254efa250..362a404f89 100644
--- a/libr/util/slist.c
+++ b/libr/util/slist.c
@@ -5,7 +5,9 @@
 
 R_API RSList *r_slist_new() {
 	RSList *s = R_NEW0 (RSList);
-	if (!s) return NULL;
+	if (!s) {
+		return NULL;
+	}
 	s->list = r_list_new ();
 	if (!s->list) {
 		r_slist_free (s);
@@ -22,10 +24,12 @@ R_API void r_slist_free(RSList *s) {
 }
 
 R_API int r_slist_get_slot(RSList *s, ut64 addr) {
-	if (s->min == 0 && s->min == s->max)
+	if (s->min == 0 && s->min == s->max) {
 		return -1;
-	if (addr < s->min || addr > s->max)
+	}
+	if (addr < s->min || addr > s->max) {
 		return -1;
+	}
 	return (addr - s->min) / s->mod;
 }
 
@@ -38,7 +42,9 @@ R_API RSList *r_slist_add(RSList *s, void *data, ut64 from, ut64 to) {
 	ut64 at = from;
 	int slot, lastslot;
 	RSListItem *item = get_new_item ();
-	if (!item) return NULL;
+	if (!item) {
+		return NULL;
+	}
 	//RSListItem **items;
 	// append to list
 	item->from = from;
@@ -112,10 +118,12 @@ R_API void r_slist_optimize(RSList *s) {
 			max = ptr->to;
 			begin = 0;
 		} else {
-			if (ptr->from < min)
+			if (ptr->from < min) {
 				min = ptr->from;
-			if (ptr->to > max)
+			}
+			if (ptr->to > max) {
 				max = ptr->to;
+			}
 		}
 	}
 
diff --git a/libr/util/stack.c b/libr/util/stack.c
index 7201ebc9dc..6d884fa953 100644
--- a/libr/util/stack.c
+++ b/libr/util/stack.c
@@ -43,8 +43,9 @@ R_API int r_stack_push(RStack *s, void *el) {
 		/* reallocate the stack */
 		s->n_elems *= 2;
 		s->elems = realloc (s->elems, s->n_elems * sizeof (void *));
-		if (!s->elems)
+		if (!s->elems) {
 			return false;
+		}
 	}
 
 	s->top++;
diff --git a/libr/util/str.c b/libr/util/str.c
index d5916899db..13465bd00d 100644
--- a/libr/util/str.c
+++ b/libr/util/str.c
@@ -197,7 +197,9 @@ R_API ut64 r_str_bits_from_string(const char *buf, const char *bitz) {
 	/* return the numberic value associated to a string (rflags) */
 	for (; *buf; buf++) {
 		char *ch = strchr (bitz, toupper ((const unsigned char)*buf));
-		if (!ch) ch = strchr (bitz, tolower ((const unsigned char)*buf));
+		if (!ch) {
+			ch = strchr (bitz, tolower ((const unsigned char)*buf));
+		}
 		if (ch) {
 			int bit = (int)(size_t)(ch - bitz);
 			out |= (ut64)(1LL << bit);
@@ -567,10 +569,16 @@ R_API int r_str_word_count(const char *string) {
 	const char *text, *tmp;
 	int word;
 
-	for (text = tmp = string; *text && IS_SEPARATOR (*text); text++);
+	for (text = tmp = string; *text && IS_SEPARATOR (*text); text++) {
+		;
+	}
 	for (word = 0; *text; word++) {
-		for (;*text && !IS_SEPARATOR (*text); text++);
-		for (tmp = text; *text && IS_SEPARATOR (*text); text++);
+		for (; *text && !IS_SEPARATOR (*text); text++) {
+			;
+		}
+		for (tmp = text; *text && IS_SEPARATOR (*text); text++) {
+			;
+		}
 	}
 	return word;
 }
@@ -611,7 +619,9 @@ R_API const char *r_sub_str_lchr(const char *str, int start, int end, char chr)
 
 /* find the first char chr in the substring str[start:end] with end not included */
 R_API const char *r_sub_str_rchr(const char *str, int start, int end, char chr) {
-	while (str[start] != chr && start < end) start++;
+	while (str[start] != chr && start < end) {
+		start++;
+	}
 	return str[start] == chr ? &str[start] : NULL;
 }
 
@@ -755,8 +765,12 @@ R_API int r_str_cmp(const char *a, const char *b, int len) {
 	if ((a == b) || (!a && !b)) {
 		return 0;
 	}
-	if (!a && b) return -1;
-	if (a && !b) return 1;
+	if (!a && b) {
+		return -1;
+	}
+	if (a && !b) {
+		return 1;
+	}
 	if (len < 0) {
 		return strcmp (a, b);
 	}
@@ -776,7 +790,9 @@ R_API int r_str_ccpy(char *dst, char *src, int ch) {
 R_API char *r_str_word_get_first(const char *text) {
 	char *ret;
 	int len = 0;
-	for (;*text && IS_SEPARATOR (*text); text++);
+	for (; *text && IS_SEPARATOR (*text); text++) {
+		;
+	}
 	/* strdup */
 	len = strlen (text);
 	ret = (char *)malloc (len + 1);
@@ -1353,7 +1369,9 @@ R_API int r_str_ansi_len(const char *str) {
 	while (str[i]) {
 		ch = str[i];
 		if (ch == 0x1b && str[i + 1] == '[') {
-			for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
+			for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++) {
+				;
+			}
 		} else {
 			len++;
 #if 0
@@ -1464,7 +1482,9 @@ R_API const char *r_str_ansi_chrn(const char *str, int n) {
 	int len, i, li;
 	for (li = i = len = 0; str[i] && (n!=len); i++) {
 		if (str[i] == 0x1b && str[i + 1] == '[') {
-			for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
+			for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++) {
+				;
+			}
 		} else {
 			if ((str[i] & 0xc0) != 0x80) {
 				len++;
@@ -1508,8 +1528,9 @@ R_API int r_str_ansi_filter(char *str, char **out, int **cposs, int len) {
 
 	for (i = j = 0; i < len; i++) {
 		if ((i + 1) < len && tmp[i] == 0x1b && tmp[i + 1] == '[') {
-			for (i += 2; i < len && str[i] != 'J'
-				     && str[i] != 'm' && str[i] != 'H'; i++);
+			for (i += 2; i < len && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++) {
+				;
+			}
 		} else {
 			str[j] = tmp[i];
 			cps[j] = i;
@@ -2011,7 +2032,9 @@ R_API void r_str_range_foreach(const char *r, RStrRangeCallback cb, void *u) {
 			} else {
 				fprintf (stderr, "Invalid range\n");
 			}
-			for (r++; *r && *r!=','&& *r!='-'; r++);
+			for (r++; *r && *r != ',' && *r != '-'; r++) {
+				;
+			}
 			p = r;
 		}
 	}
@@ -2050,7 +2073,9 @@ R_API bool r_str_range_in(const char *r, ut64 addr) {
 			} else {
 				fprintf (stderr, "Invalid range\n");
 			}
-			for (r++; *r && *r!=','&& *r!='-'; r++);
+			for (r++; *r && *r != ',' && *r != '-'; r++) {
+				;
+			}
 			p = r;
 		}
 	}
@@ -2275,7 +2300,9 @@ R_API int r_print_format_length(const char *fmt) {
 	/* get times */
 	times = atoi (arg);
 	if (times > 0) {
-		while ((*arg>='0'&&*arg<='9')) arg++;
+		while ((*arg >= '0' && *arg <= '9')) {
+			arg++;
+		}
 	}
 	bracket = strchr (arg,'{');
 	if (bracket) {
diff --git a/libr/util/str_trim.c b/libr/util/str_trim.c
index 2923c92b89..68783ac996 100644
--- a/libr/util/str_trim.c
+++ b/libr/util/str_trim.c
@@ -86,7 +86,9 @@ R_API char *r_str_trim(char *str) {
 // TODO: rename to r_str_trim_head_ro()
 R_API const char *r_str_trim_ro(const char *str) {
 	if (str) {
-		for (; *str && IS_WHITECHAR (*str); str++);
+		for (; *str && IS_WHITECHAR (*str); str++) {
+			;
+		}
 	}
 	return str;
 }
@@ -95,7 +97,9 @@ R_API const char *r_str_trim_ro(const char *str) {
 // TODO: rename to r_str_trim_head_wp()
 R_API const char *r_str_trim_wp(const char *str) {
 	if (str) {
-		for (; *str && !IS_WHITESPACE (*str); str++);
+		for (; *str && !IS_WHITESPACE (*str); str++) {
+			;
+		}
 	}
 	return str;
 }
@@ -172,11 +176,10 @@ R_API int r_str_ansi_trim(char *str, int str_len, int n) {
 					i += 18;
 				}
 			} else if (ch2 == '[') {
-				for (++i; (i < str_len) && str[i]
-					&& str[i] != 'J'
-					&& str[i] != 'm'
-					&& str[i] != 'H';
-				     i++);
+				for (++i; (i < str_len) && str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H';
+					i++) {
+					;
+				}
 			}
 		} else if ((str[i] & 0xc0) != 0x80) {
 			len++;
diff --git a/libr/util/strbuf.c b/libr/util/strbuf.c
index cdee504a82..1a00b86232 100644
--- a/libr/util/strbuf.c
+++ b/libr/util/strbuf.c
@@ -66,8 +66,9 @@ R_API bool r_strbuf_setf(RStrBuf *sb, const char *fmt, ...) {
 	char string[1024];
 	va_list ap, ap2;
 
-	if (!sb || !fmt)
+	if (!sb || !fmt) {
 		return false;
+	}
 	va_start (ap, fmt);
 	va_copy (ap2, ap);
 	rc = vsnprintf (string, sizeof (string), fmt, ap);
@@ -116,7 +117,9 @@ R_API int r_strbuf_append_n(RStrBuf *sb, const char *s, int l) {
 			allocated = false;
 		}
 		if (allocated) {
-			if (!p) return false;
+			if (!p) {
+				return false;
+			}
 			sb->ptr = p;
 			sb->ptrlen = newlen;
 		}
diff --git a/libr/util/strpool.c b/libr/util/strpool.c
index 401636ed8a..f6a8a0f7b3 100644
--- a/libr/util/strpool.c
+++ b/libr/util/strpool.c
@@ -8,7 +8,9 @@ R_API RStrpool* r_strpool_new (int sz) {
 		eprintf ("Malloc failed!\n");
 		return NULL;
 	}
-	if (sz < 1) sz = 1024;
+	if (sz < 1) {
+		sz = 1024;
+	}
 	p->str = malloc (sz);
 	if (!p->str) {
 		eprintf ("Malloc failed!\n");
diff --git a/libr/util/tree.c b/libr/util/tree.c
index cdae132688..c408e1ca4e 100644
--- a/libr/util/tree.c
+++ b/libr/util/tree.c
@@ -8,22 +8,27 @@ static void tree_dfs_node (RTreeNode *r, RTreeVisitor *vis) {
 	RTreeNode *n;
 
 	s = r_stack_new (16);
-	if (!s) return;
+	if (!s) {
+		return;
+	}
 	r_stack_push (s, r);
 	while (!r_stack_is_empty (s)) {
 		RTreeNode *el = (RTreeNode *)r_stack_pop (s);
 
-		if (vis->pre_visit)
+		if (vis->pre_visit) {
 			vis->pre_visit (el, vis);
+		}
 
 		r_list_foreach_prev (el->children, it, n) {
-			if (vis->discover_child)
+			if (vis->discover_child) {
 				vis->discover_child (n, vis);
+			}
 			r_stack_push (s, n);
 		}
 
-		if (vis->post_visit)
+		if (vis->post_visit) {
 			vis->post_visit (el, vis);
+		}
 	}
 
 	r_stack_free (s);
@@ -31,8 +36,9 @@ static void tree_dfs_node (RTreeNode *r, RTreeVisitor *vis) {
 
 static void r_tree_node_free (RTreeNode *n) {
 	r_list_free (n->children);
-	if (n->free)
+	if (n->free) {
 		n->free (n->data);
+	}
 	free (n);
 }
 
@@ -52,7 +58,9 @@ static void update_depth (RTreeNode *n, RTreeVisitor *vis) {
 
 static RTreeNode *node_new (RTree *t, void *data) {
 	RTreeNode *n = R_NEW0 (RTreeNode);
-	if (!n) return NULL;
+	if (!n) {
+		return NULL;
+	}
 	n->children = r_list_new ();
 	n->data = data;
 	n->tree = t;
@@ -64,16 +72,18 @@ R_API RTree *r_tree_new (void) {
 }
 
 R_API void r_tree_free (RTree* t) {
-	if (!t)
+	if (!t) {
 		return;
+	}
 
 	free_all_children (t);
 	free (t);
 }
 
 R_API void r_tree_reset (RTree *t) {
-	if (!t)
+	if (!t) {
 		return;
+	}
 
 	free_all_children (t);
 	t->root = NULL;
@@ -89,8 +99,9 @@ R_API RTreeNode *r_tree_add_node (RTree *t, RTreeNode *node, void *child_data) {
 	RTreeVisitor vis = { 0 };
 
 	/* a NULL node is allowed only the first time, to set the root */
-	if (!t || (node && node->tree != t) || (t->root && !node))
+	if (!t || (node && node->tree != t) || (t->root && !node)) {
 		return NULL;
+	}
 
 	child = node_new (t, child_data);
 	if (!node && !t->root) {
@@ -109,8 +120,9 @@ R_API RTreeNode *r_tree_add_node (RTree *t, RTreeNode *node, void *child_data) {
 }
 
 R_API void r_tree_dfs (RTree *t, RTreeVisitor *vis) {
-	if (!t || !t->root)
+	if (!t || !t->root) {
 		return;
+	}
 
 	tree_dfs_node (t->root, vis);
 }
@@ -118,11 +130,14 @@ R_API void r_tree_dfs (RTree *t, RTreeVisitor *vis) {
 R_API void r_tree_bfs (RTree *t, RTreeVisitor *vis) {
 	RQueue *q;
 
-	if (!t || !t->root)
+	if (!t || !t->root) {
 		return;
+	}
 
 	q = r_queue_new (16);
-	if (!q) return;
+	if (!q) {
+		return;
+	}
 	r_queue_enqueue (q, t->root);
 	while (!r_queue_is_empty (q)) {
 		 RTreeNode *el = (RTreeNode *)r_queue_dequeue (q);
@@ -133,17 +148,20 @@ R_API void r_tree_bfs (RTree *t, RTreeVisitor *vis) {
 		 RTreeNode *n;
 		 RListIter *it;
 
-		 if (vis->pre_visit)
+		 if (vis->pre_visit) {
 			 vis->pre_visit (el, vis);
+		 }
 
 		 r_list_foreach (el->children, it, n) {
-			 if (vis->discover_child)
+			 if (vis->discover_child) {
 				 vis->discover_child (n, vis);
+			 }
 			 r_queue_enqueue (q, n);
 		 }
 
-		 if (vis->post_visit)
+		 if (vis->post_visit) {
 			 vis->post_visit (el, vis);
+		 }
 	}
 
 	r_queue_free (q);
diff --git a/libr/util/trie.c b/libr/util/trie.c
index 95c2454fbb..f4b15de295 100644
--- a/libr/util/trie.c
+++ b/libr/util/trie.c
@@ -2,9 +2,15 @@
 #include "r_util/r_trie.h"
 
 static int c2_idx(char c) {
-	if (c <= 'Z' && c >= 'A') return c-'A';
-	if (c <= 'z' && c >= 'a') return c-'a'+26;
-	if (c <= '9' && c >= '0') return c-'0'+26*2;
+	if (c <= 'Z' && c >= 'A') {
+		return c - 'A';
+	}
+	if (c <= 'z' && c >= 'a') {
+		return c - 'a' + 26;
+	}
+	if (c <= '9' && c >= '0') {
+		return c - '0' + 26 * 2;
+	}
 	return 26*2 + 10;
 }
 
diff --git a/libr/util/ubase64.c b/libr/util/ubase64.c
index d28589d8b2..4308f821ff 100644
--- a/libr/util/ubase64.c
+++ b/libr/util/ubase64.c
@@ -18,7 +18,9 @@ static const char cb64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
 static const char cd64[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
 
 static void b64_encode(const ut8 in[3], char out[4], int len) {
-	if (len < 1) return;
+	if (len < 1) {
+		return;
+	}
 	out[0] = cb64[in[0] >> 2];
 	out[1] = cb64[((in[0] & 0x03) << 4) | ((len > 1)? ((in[1] & 0xf0) >> 4): 0)];
 	out[2] = (len > 1? cb64[((in[1] & 0x0f) << 2) | (len > 2? ((in[2] & 0xc0) >> 6): 0)]: '=');
@@ -80,11 +82,13 @@ R_API ut8 *r_base64_decode_dyn(const char *in, int len) {
 
 R_API int r_base64_encode(char *bout, const ut8 *bin, int len) {
 	int in, out;
-	if (len < 0)
+	if (len < 0) {
 		len = strlen ((const char *)bin);
-	for (in = out = 0; in < len; in += 3, out += 4)
+	}
+	for (in = out = 0; in < len; in += 3, out += 4) {
 		b64_encode (bin + in, (char *)bout + out,
-			(len - in) > 3? 3: len - in);
+			(len - in) > 3 ? 3 : len - in);
+	}
 	bout[out] = 0;
 	return out;
 }
@@ -106,9 +110,10 @@ R_API char *r_base64_encode_dyn(const char *str, int len) {
 	if (!bout) {
 		return NULL;
 	}
-	for (in = out = 0; in < len; in += 3, out += 4)
+	for (in = out = 0; in < len; in += 3, out += 4) {
 		b64_encode ((const ut8 *)str + in, (char *)bout + out,
-			(len - in) > 3? 3: len - in);
+			(len - in) > 3 ? 3 : len - in);
+	}
 	bout[out] = 0;
 	return bout;
 }
diff --git a/libr/util/uleb128.c b/libr/util/uleb128.c
index b2d7b36bd8..9878f4525e 100644
--- a/libr/util/uleb128.c
+++ b/libr/util/uleb128.c
@@ -8,7 +8,9 @@ R_API const ut8 *r_uleb128(const ut8 *data, int datalen, ut64 *v) {
 	ut8 c;
 	ut64 s, sum = 0;
 	const ut8 *data_end;
-	if (v) *v = 0LL;
+	if (v) {
+		*v = 0LL;
+	}
 	if (datalen == ST32_MAX) {
 		// WARNING; possible overflow
 		datalen = 0xffff;
@@ -22,13 +24,17 @@ R_API const ut8 *r_uleb128(const ut8 *data, int datalen, ut64 *v) {
 			for (s = 0; data < data_end; s += 7) {
 				c = *(data++) & 0xff;
 				sum |= ((ut32) (c & 0x7f) << s);
-				if (!(c & 0x80)) break;
+				if (!(c & 0x80)) {
+					break;
+				}
 			}
 		} else {
 			data++;
 		}
 	}
-	if (v) *v = sum;
+	if (v) {
+		*v = sum;
+	}
 	return data;
 }
 
@@ -45,8 +51,12 @@ R_API const ut8 *r_uleb128_decode(const ut8 *data, int *datalen, ut64 *v) {
 		s += 7;
 		l++;
 	} while (c & 0x80);
-	if (v) *v = sum;
-	if (datalen) *datalen = l;
+	if (v) {
+		*v = sum;
+	}
+	if (datalen) {
+		*datalen = l;
+	}
 	return data;
 }
 
@@ -65,10 +75,14 @@ R_API const ut8 *r_uleb128_encode(const ut64 s, int *len) {
 		c = 0; //May not be necessary
 		c = source & 0x7f;
 		source >>= 7;
-		if (source) c |= 0x80;
+		if (source) {
+			c |= 0x80;
+		}
 		*(target) = c;
 	} while (source);
-	if (len) *len = l;
+	if (len) {
+		*len = l;
+	}
 	return otarget;
 }
 
@@ -80,13 +94,17 @@ R_API const ut8 *r_leb128(const ut8 *data, st64 *v) {
 			c = *(data++) & 0x0ff;
 			sum |= ((st64) (c & 0x7f) << s);
 			s += 7;
-			if (!(c & 0x80)) break;
+			if (!(c & 0x80)) {
+				break;
+			}
 		}
 	}
 	if ((s < (8 * sizeof (sum))) && (c & 0x40)) {
 		sum |= -((st64)1 << s);
 	}
-	if (v) *v = sum;
+	if (v) {
+		*v = sum;
+	}
 	return data;
 }
 
diff --git a/libr/util/unum.c b/libr/util/unum.c
index 486208df22..c6edb663e4 100644
--- a/libr/util/unum.c
+++ b/libr/util/unum.c
@@ -375,7 +375,9 @@ R_API ut64 r_num_math(RNum *num, const char *str) {
 #if R_NUM_USE_CALC
 	ut64 ret;
 	const char *err = NULL;
-	if (!str) return 0LL;
+	if (!str) {
+		return 0LL;
+	}
 	//if (!str || !*str) return 0LL;
 	if (num) {
 		num->dbz = 0;
@@ -458,11 +460,17 @@ R_API double r_num_get_float(RNum *num, const char *str) {
 R_API int r_num_to_bits (char *out, ut64 num) {
 	int size = 64, i;
 
-	if (num>>32) size = 64;
-	else if (num&0xff000000) size = 32;
-	else if (num&0xff0000) size = 24;
-	else if (num&0xff00) size = 16;
-	else if (num&0xff) size = 8;
+	if (num >> 32) {
+		size = 64;
+	} else if (num & 0xff000000) {
+		size = 32;
+	} else if (num & 0xff0000) {
+		size = 24;
+	} else if (num & 0xff00) {
+		size = 16;
+	} else if (num & 0xff) {
+		size = 8;
+	}
 	if (out) {
 		int pos = 0;
 		int realsize = 0;
@@ -477,8 +485,9 @@ R_API int r_num_to_bits (char *out, ut64 num) {
 				realsize = size-i;
 			}
 		}
-		if (realsize==0)
-		out[realsize++] = '0';
+		if (realsize == 0) {
+			out[realsize++] = '0';
+		}
 		out[realsize] = '\0'; //Maybe not nesesary?
 
 	}
@@ -504,7 +513,9 @@ R_API int r_num_to_trits (char *out, ut64 num) {
 }
 
 R_API ut64 r_num_chs (int cylinder, int head, int sector, int sectorsize) {
-	if (sectorsize<1) sectorsize = 512;
+	if (sectorsize < 1) {
+		sectorsize = 512;
+	}
 	return (ut64)cylinder * (ut64)head * (ut64)sector * (ut64)sectorsize;
 }
 
@@ -515,17 +526,23 @@ R_API int r_num_conditional(RNum *num, const char *str) {
 	p = s;
 	do {
 		t = strchr (p, ',');
-		if (t) *t = 0;
+		if (t) {
+			*t = 0;
+		}
 		lgt = strchr (p, '<');
 		if (lgt) {
 			*lgt = 0;
 			a = r_num_math (num, p);
 			if (lgt[1]=='=') {
 				b = r_num_math (num, lgt+2);
-				if (a>b) goto fail;
+				if (a > b) {
+					goto fail;
+				}
 			} else {
 				b = r_num_math (num, lgt+1);
-				if (a>=b) goto fail;
+				if (a >= b) {
+					goto fail;
+				}
 			}
 		} else {
 			lgt = strchr (p, '>');
@@ -534,10 +551,14 @@ R_API int r_num_conditional(RNum *num, const char *str) {
 				a = r_num_math (num, p);
 				if (lgt[1]=='=') {
 					b = r_num_math (num, lgt+2);
-					if (a<b) goto fail;
+					if (a < b) {
+						goto fail;
+					}
 				} else {
 					b = r_num_math (num, lgt+1);
-					if (a<=b) goto fail;
+					if (a <= b) {
+						goto fail;
+					}
 				}
 			} else {
 				lgt = strchr (p, '=');
@@ -547,14 +568,20 @@ R_API int r_num_conditional(RNum *num, const char *str) {
 						r_str_replace_char (p, '!', ' ');
 						r_str_replace_char (p, '=', '-');
 						n = r_num_math (num, p);
-						if (!n) goto fail;
+						if (!n) {
+							goto fail;
+						}
 					}
 				}
 				lgt = strstr (p, "==");
-				if (lgt) *lgt = ' ';
+				if (lgt) {
+					*lgt = ' ';
+				}
 				r_str_replace_char (p, '=', '-');
 				n = r_num_math (num, p);
-				if (n) goto fail;
+				if (n) {
+					goto fail;
+				}
 			}
 		}
 		p = t+1;
@@ -608,8 +635,9 @@ R_API char* r_num_as_string(RNum *___, ut64 n, bool printable_only) {
 		} else if (!printable_only && (off = escape_char (str + stri, ch)) != 0) {
 			stri += off;
 		} else {
-			if (ch)
+			if (ch) {
 				return NULL;
+			}
 		}
 		ret |= (num & 0xff);
 		num >>= 8;
diff --git a/libr/util/utf8.c b/libr/util/utf8.c
index 6fad121591..3a4bb99f98 100644
--- a/libr/util/utf8.c
+++ b/libr/util/utf8.c
@@ -491,16 +491,24 @@ R_API int r_utf8_decode (const ut8 *ptr, int ptrlen, RRune *ch) {
 		return 0;
 	}
 	if (ptrlen > 0 && ptr[0] < 0x80) {
-		if (ch) *ch = (ut32)ptr[0];
+		if (ch) {
+			*ch = (ut32)ptr[0];
+		}
 		return 1;
 	} else if (ptrlen>1 && (ptr[0]&0xe0) == 0xc0 && (ptr[1]&0xc0) == 0x80) {
-		if (ch) *ch = (ptr[0] & 0x1f) << 6 | (ptr[1] & 0x3f);
+		if (ch) {
+			*ch = (ptr[0] & 0x1f) << 6 | (ptr[1] & 0x3f);
+		}
 		return 2;
 	} else if (ptrlen>2 && (ptr[0]&0xf0) == 0xe0 && (ptr[1]&0xc0) == 0x80 && (ptr[2]&0xc0) == 0x80) {
-		if (ch) *ch = (ptr[0] & 0xf) << 12 | (ptr[1] & 0x3f) << 6 | (ptr[2] & 0x3f);
+		if (ch) {
+			*ch = (ptr[0] & 0xf) << 12 | (ptr[1] & 0x3f) << 6 | (ptr[2] & 0x3f);
+		}
 		return 3;
 	} else if (ptrlen>3 && (ptr[0]&0xf8) == 0xf0 && (ptr[1]&0xc0) == 0x80 && (ptr[2]&0xc0) == 0x80 && (ptr[3]&0xc0) == 0x80) {
-		if (ch) *ch = (ptr[0] & 7) << 18 | (ptr[1] & 0x3f) << 12 | (ptr[2] & 0x3f) << 6 | (ptr[3] & 0x3f);
+		if (ch) {
+			*ch = (ptr[0] & 7) << 18 | (ptr[1] & 0x3f) << 12 | (ptr[2] & 0x3f) << 6 | (ptr[3] & 0x3f);
+		}
 		return 4;
 	}
 	return 0;
@@ -537,10 +545,13 @@ R_API int r_utf8_encode (ut8 *ptr, const RRune ch) {
 R_API int r_utf8_encode_str (const RRune *str, ut8 *dst, const int dst_length) {
 	int i, pos = 0;
 
-	if (!str || !dst) return -1;
+	if (!str || !dst) {
+		return -1;
+	}
 
-	for (i = 0; i < sizeof (str) - 1 && str[i] && pos < dst_length - 1; i++)
+	for (i = 0; i < sizeof (str) - 1 && str[i] && pos < dst_length - 1; i++) {
 		pos += r_utf8_encode (&dst[pos], str[i]);
+	}
 
 	dst[pos++] = '\0';
 	return pos;
diff --git a/libr/util/vector.c b/libr/util/vector.c
index 7f7fa9359a..0fb1eb5dec 100644
--- a/libr/util/vector.c
+++ b/libr/util/vector.c
@@ -262,17 +262,20 @@ R_API void *r_pvector_pop_front(RPVector *vec) {
 
 // CLRS Quicksort. It is slow, but simple.
 static void quick_sort(void **a, size_t n, RPVectorComparator cmp) {
-	if (n <= 1) return;
+	if (n <= 1) {
+		return;
+	}
 	int i = rand() % n, j = 0;
 	void *t, *pivot = a[i];
 	a[i] = a[n - 1];
-	for (i = 0; i < n - 1; i++)
+	for (i = 0; i < n - 1; i++) {
 		if (cmp (a[i], pivot) < 0) {
 			t = a[i];
 			a[i] = a[j];
 			a[j] = t;
 			j++;
 		}
+	}
 	a[n - 1] = a[j];
 	a[j] = pivot;
 	quick_sort (a, j, cmp);
diff --git a/libr/util/x509.c b/libr/util/x509.c
index f0b505572f..aa2fe8f24f 100644
--- a/libr/util/x509.c
+++ b/libr/util/x509.c
@@ -492,7 +492,9 @@ char* r_x509_extensions_dump (RX509Extensions* exts, char* buffer, ut32 length,
 	for (i = 0, p = 0, r = 0; i < exts->length; ++i) {
 		//RASN1String *s;
 		RX509Extension *e = exts->extensions[i];
-		if (!e) continue;
+		if (!e) {
+			continue;
+		}
 		//TODO handle extensions..
 		//s = r_asn1_stringify_bytes (e->extnValue->sector, e->extnValue->length);
 		if (len < p) {
@@ -523,7 +525,9 @@ char* r_x509_tbscertificate_dump (RX509TBSCertificate* tbsc, char* buffer, ut32
 		pad = "";
 	}
 	pad2 = r_str_newf ("%s  ", pad);
-	if (!pad2) return NULL;
+	if (!pad2) {
+		return NULL;
+	}
 	r = snprintf (buffer, length, "%sVersion: v%u\n"
 				"%sSerial Number:\n%s  %s\n"
 				"%sSignature Algorithm:\n%s  %s\n"
@@ -696,7 +700,9 @@ char* r_x509_crl_dump (RX509CertificateRevocationList *crl, char* buffer, ut32 l
 		pad = "";
 	}
 	pad3 = r_str_newf ("%s    ", pad);
-	if (!pad3) return NULL;
+	if (!pad3) {
+		return NULL;
+	}
 	pad2 = pad3 + 2;
 	algo = crl->signature.algorithm;
 	last = crl->lastUpdate;
diff --git a/libr/util/zip.c b/libr/util/zip.c
index 335873f38e..c5c09d1faf 100644
--- a/libr/util/zip.c
+++ b/libr/util/zip.c
@@ -48,11 +48,13 @@ R_API ut8 *r_inflate(const ut8 *src, int srcLen, int *srcConsumed, int *dstLen)
 
 	do {
 		if (stream.avail_out == 0) {
-			if (! (dst = realloc (dst, stream.total_out + srcLen*2)))
+			if (!(dst = realloc (dst, stream.total_out + srcLen * 2))) {
 				goto err_exit;
+			}
 			out_size += srcLen*2;
-			if (out_size > MAXOUT)
+			if (out_size > MAXOUT) {
 				goto err_exit;
+			}
 			stream.next_out  = dst + stream.total_out;
 			stream.avail_out = srcLen * 2;
 		}