diff --git a/libr/anal/p/anal_arm_cs.c b/libr/anal/p/anal_arm_cs.c index fcf707c5d9..261a8a9ed8 100644 --- a/libr/anal/p/anal_arm_cs.c +++ b/libr/anal/p/anal_arm_cs.c @@ -48,15 +48,15 @@ static const ut64 bitmask_by_width[] = { 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff, 0x1ffff, 0x3ffff, 0x7ffff, - 0xfffff, 0x1fffff, 0x3fffff, 0x7fffff, 0xffffff, 0x1ffffffL, 0x3ffffffL, - 0x7ffffffL, 0xfffffffL, 0x1fffffffL, 0x3fffffffL, 0x7fffffffL, 0xffffffffL, - 0x1ffffffffL, 0x3ffffffffL, 0x7ffffffffL, 0xfffffffffL, 0x1fffffffffL, - 0x3fffffffffL, 0x7fffffffffL, 0xffffffffffL, 0x1ffffffffffL, 0x3ffffffffffL, - 0x7ffffffffffL, 0xfffffffffffL, 0x1fffffffffffL, 0x3fffffffffffL, 0x7fffffffffffL, - 0xffffffffffffL, 0x1ffffffffffffL, 0x3ffffffffffffL, 0x7ffffffffffffL, - 0xfffffffffffffL, 0x1fffffffffffffL, 0x3fffffffffffffL, 0x7fffffffffffffL, - 0xffffffffffffffL, 0x1ffffffffffffffL, 0x3ffffffffffffffL, 0x7ffffffffffffffL, - 0xfffffffffffffffL, 0x1fffffffffffffffL, 0x3fffffffffffffffL, 0x7fffffffffffffffL, 0xffffffffffffffffL + 0xfffff, 0x1fffff, 0x3fffff, 0x7fffff, 0xffffff, 0x1ffffffLL, 0x3ffffffLL, + 0x7ffffffLL, 0xfffffffLL, 0x1fffffffLL, 0x3fffffffLL, 0x7fffffffLL, 0xffffffffLL, + 0x1ffffffffLL, 0x3ffffffffLL, 0x7ffffffffLL, 0xfffffffffLL, 0x1fffffffffLL, + 0x3fffffffffLL, 0x7fffffffffLL, 0xffffffffffLL, 0x1ffffffffffLL, 0x3ffffffffffLL, + 0x7ffffffffffLL, 0xfffffffffffLL, 0x1fffffffffffLL, 0x3fffffffffffLL, 0x7fffffffffffLL, + 0xffffffffffffLL, 0x1ffffffffffffLL, 0x3ffffffffffffLL, 0x7ffffffffffffLL, + 0xfffffffffffffLL, 0x1fffffffffffffLL, 0x3fffffffffffffLL, 0x7fffffffffffffLL, + 0xffffffffffffffLL, 0x1ffffffffffffffLL, 0x3ffffffffffffffLL, 0x7ffffffffffffffLL, + 0xfffffffffffffffLL, 0x1fffffffffffffffLL, 0x3fffffffffffffffLL, 0x7fffffffffffffffLL, 0xffffffffffffffffLL }; static const char *decode_shift(arm_shifter shift) { diff --git a/libr/asm/arch/dcpu16/dis.c b/libr/asm/arch/dcpu16/dis.c index 31fe3d0631..b2cf918f67 100644 --- a/libr/asm/arch/dcpu16/dis.c +++ b/libr/asm/arch/dcpu16/dis.c @@ -71,7 +71,7 @@ static int instrPrint(char *out, const op* o) { char arg[32], arg2[32]; if (o->code.opcode == 0) { valPrint (arg, o->n.a_type, o->n.a); - if (o->n.opcode<0 || o->n.opcode>1) { + if (o->n.opcode > 1) { strcpy (out, "invalid"); return strlen (out); } diff --git a/mk/gcc.mk b/mk/gcc.mk index 3b8a09cd44..76f4c868bc 100644 --- a/mk/gcc.mk +++ b/mk/gcc.mk @@ -19,6 +19,7 @@ ifeq ($(OSTYPE),darwin) ARCH=$(shell uname -m) #CFLAGS+=-arch ${ARCH} #LDFLAGS+=-arch ${ARCH} +CFLAGS+=-fno-common LDFLAGS_LIB=-dynamiclib LDFLAGS_SONAME=-Wl,-install_name,${LIBDIR}/ else