diff --git a/binr/old.rarc2/rarc2.h b/binr/old.rarc2/rarc2.h index 5214a4187d..89f7c04524 100644 --- a/binr/old.rarc2/rarc2.h +++ b/binr/old.rarc2/rarc2.h @@ -18,7 +18,7 @@ enum { LAST }; -#define eprintf(x,y...) (fprintf(stderr,"\x1b[33m"x"\x1b[0m",##y),1) +#define eprintf(x,y...) fprintf(stderr,"\x1b[33m"x"\x1b[0m",##y) #define FREE(x) free(x); x=NULL #define IS_VAR(x) (x[0]=='.'||((x[0]=='*'||x[0]=='&')&&x[1]=='.')) #define MAX 255 diff --git a/libr/egg/emit_arm.c b/libr/egg/emit_arm.c index 27f8dbada2..2f4de5a7ba 100644 --- a/libr/egg/emit_arm.c +++ b/libr/egg/emit_arm.c @@ -64,8 +64,8 @@ static void emit_set_string(REgg *egg, const char *dstvar, const char *str, int int rest, off = 0; off = strlen (str)+1; rest = (off%4); - if (rest) rest = 4-rest; - off += rest-8; + if (rest) rest = 4 - rest; + off += rest - 4; r_egg_printf (egg, " add pc, $%d\n", (off)); // XXX: does not handle \n and so on.. must use r_util r_egg_printf (egg, ".string \"%s\"\n", str);