From 496da56a9e3884fc413598b2a3b0dd68c5be8fb9 Mon Sep 17 00:00:00 2001 From: pancake Date: Mon, 12 Sep 2016 20:52:12 +0200 Subject: [PATCH] Fix sys/ios-static.sh --- libr/anal/Makefile | 1 + libr/anal/p/xtensa.mk | 7 +++-- libr/asm/arch/include/bfdlink.h | 2 +- libr/asm/arch/xtensa/gnu/elf32-xtensa.c | 4 +-- libr/asm/arch/xtensa/gnu/xtensa-isa.c | 8 +++--- libr/asm/arch/xtensa/gnu/xtensa-modules.c | 9 ++++-- libr/bin/p/bin_nes.c | 13 +++++---- libr/bin/p/bin_spc700.c | 35 ++++++++++++++--------- libr/core/cmd_print.c | 5 ++-- libr/crypto/p/Makefile | 2 ++ libr/crypto/p/aes.mk | 5 +++- libr/crypto/p/aes_cbc.mk | 4 ++- libr/parse/p/Makefile | 2 +- libr/parse/p/m68k_pseudo.mk | 1 + shlr/bochs/Makefile | 1 + 15 files changed, 61 insertions(+), 38 deletions(-) diff --git a/libr/anal/Makefile b/libr/anal/Makefile index 64c40766ad..7e0f286c66 100644 --- a/libr/anal/Makefile +++ b/libr/anal/Makefile @@ -6,6 +6,7 @@ EXTRA_CLEAN=doclean NAME=r_anal DEPS=r_util r_reg r_syscall CFLAGS+=-DCORELIB -Iarch -I$(TOP)/shlr +CFLAGS+=-I$(LTOP)/asm/arch/include LDFLAGS+=${BN_LIBS} diff --git a/libr/anal/p/xtensa.mk b/libr/anal/p/xtensa.mk index 1c43dc714d..cd2421e46b 100644 --- a/libr/anal/p/xtensa.mk +++ b/libr/anal/p/xtensa.mk @@ -3,7 +3,8 @@ OBJ_XTENSA=anal_xtensa.o STATIC_OBJ+=${OBJ_XTENSA} TARGET_XTENSA=anal_xtensa.${EXT_SO} -ALL_TARGETS+=${TARGET_XTENSA} +ALL_TARGETS+=$(TARGET_XTENSA) -${TARGET_XTENSA}: ${OBJ_XTENSA} - ${CC} $(call libname,anal_xtensa) ${LDFLAGS} ${CFLAGS} -o anal_xtensa.${EXT_SO} ${OBJ_XTENSA} +$(TARGET_XTENSA): $(OBJ_XTENSA) + $(CC) $(call libname,anal_xtensa) -I$(LTOP)/asm/arch/include/ \ + $(LDFLAGS) $(CFLAGS) -o anal_xtensa.$(EXT_SO) $(OBJ_XTENSA) diff --git a/libr/asm/arch/include/bfdlink.h b/libr/asm/arch/include/bfdlink.h index f1864cd7b0..b94ec1d02c 100644 --- a/libr/asm/arch/include/bfdlink.h +++ b/libr/asm/arch/include/bfdlink.h @@ -22,7 +22,7 @@ #ifndef BFDLINK_H #define BFDLINK_H -#include +#include "mybfd.h" /* Which symbols to strip during a link. */ enum bfd_link_strip diff --git a/libr/asm/arch/xtensa/gnu/elf32-xtensa.c b/libr/asm/arch/xtensa/gnu/elf32-xtensa.c index d2257ad3d3..28bec33476 100644 --- a/libr/asm/arch/xtensa/gnu/elf32-xtensa.c +++ b/libr/asm/arch/xtensa/gnu/elf32-xtensa.c @@ -19,9 +19,7 @@ 02110-1301, USA. */ #include "sysdep.h" -//#include "bfd.h" - -#include +#include "dis-asm.h" #include #include #include diff --git a/libr/asm/arch/xtensa/gnu/xtensa-isa.c b/libr/asm/arch/xtensa/gnu/xtensa-isa.c index d40992ea18..fbbf7e4b9d 100644 --- a/libr/asm/arch/xtensa/gnu/xtensa-isa.c +++ b/libr/asm/arch/xtensa/gnu/xtensa-isa.c @@ -22,12 +22,12 @@ #include #include #include -#include "dis-asm.h" -#include "sysdep.h" +#include "../../include/dis-asm.h" +#include "../../include/sysdep.h" //#include "bfd.h" //#include "libbfd.h" -#include "xtensa-isa.h" -#include "xtensa-isa-internal.h" +#include "../../include/xtensa-isa.h" +#include "../../include/xtensa-isa-internal.h" extern int filename_cmp (const char *s1, const char *s2); xtensa_isa_status xtisa_errno; diff --git a/libr/asm/arch/xtensa/gnu/xtensa-modules.c b/libr/asm/arch/xtensa/gnu/xtensa-modules.c index b0d4c67aff..69897a33d0 100644 --- a/libr/asm/arch/xtensa/gnu/xtensa-modules.c +++ b/libr/asm/arch/xtensa/gnu/xtensa-modules.c @@ -18,9 +18,12 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "ansidecl.h" -#include -#include "xtensa-isa-internal.h" +#ifndef ATTRIBUTE_UNUSED +#define ATTRIBUTE_UNUSED +#endif +//#include "ansidecl.h" +#include "../../include/xtensa-isa.h" +#include "../../include/xtensa-isa-internal.h" /* Sysregs. */ diff --git a/libr/bin/p/bin_nes.c b/libr/bin/p/bin_nes.c index 162188afb1..2e3459ee19 100644 --- a/libr/bin/p/bin_nes.c +++ b/libr/bin/p/bin_nes.c @@ -1,6 +1,7 @@ -/* radare - LGPL3 - 2015 - maijin */ +/* radare - LGPL3 - 2015-2016 - maijin */ #include +#include #include "nes/nes_specs.h" static int check(RBinFile *arch); @@ -179,17 +180,19 @@ static RList *mem (RBinFile *arch) { static RList* entries(RBinFile *arch) { //Should be 3 offsets pointed by NMI, RESET, IRQ after mapping && default = 1st CHR RList *ret; RBinAddr *ptr = NULL; - if (!(ret = r_list_new ())) + if (!(ret = r_list_new ())) { return NULL; - if (!(ptr = R_NEW0 (RBinAddr))) + } + if (!(ptr = R_NEW0 (RBinAddr))) { return ret; + } ptr->paddr = INES_HDR_SIZE; ptr->vaddr = ROM_START_ADDRESS; r_list_append (ret, ptr); return ret; } -struct r_bin_plugin_t r_bin_plugin_nes = { +RBinPlugin r_bin_plugin_nes = { .name = "nes", .desc = "NES", .license = "LGPL3", @@ -204,7 +207,7 @@ struct r_bin_plugin_t r_bin_plugin_nes = { }; #ifndef CORELIB -struct r_lib_struct_t radare_plugin = { +RLibStruct radare_plugin = { .type = R_LIB_TYPE_BIN, .data = &r_bin_plugin_nes, .version = R2_VERSION diff --git a/libr/bin/p/bin_spc700.c b/libr/bin/p/bin_spc700.c index 248c311827..c79975865d 100644 --- a/libr/bin/p/bin_spc700.c +++ b/libr/bin/p/bin_spc700.c @@ -1,6 +1,7 @@ -/* radare - LGPL - 2015 - maijin */ +/* radare - LGPL - 2015-2016 - maijin */ #include +#include #include "../format/spc700/spc_specs.h" static int check(RBinFile *arch); @@ -18,8 +19,10 @@ static int check(RBinFile *arch) { } static int check_bytes(const ut8 *buf, ut64 length) { - if (!buf || length < 27) return false; - return (!memcmp (buf, SPC_MAGIC, 27)); + if (!buf || length < 27) { + return false; + } + return !memcmp (buf, SPC_MAGIC, 27); } static RBinInfo* info(RBinFile *arch) { @@ -31,16 +34,17 @@ static RBinInfo* info(RBinFile *arch) { eprintf ("Truncated Header\n"); return NULL; } - if (!(ret = R_NEW0 (RBinInfo))) + if (!(ret = R_NEW0 (RBinInfo))) { return NULL; + } ret->file = strdup (arch->file); ret->type = strdup ("Sound File Data"); ret->machine = strdup ("SPC700"); ret->os = strdup ("spc700"); ret->arch = strdup ("spc700"); ret->bits = 16; - ret->has_va = 1; - return ret; + ret->has_va = 1; + return ret; } static RList* sections(RBinFile *arch) { @@ -53,10 +57,13 @@ static RList* sections(RBinFile *arch) { eprintf ("Truncated Header\n"); return NULL; } - if (!(ret = r_list_new ())) + if (!(ret = r_list_new ())) { return NULL; - if (!(ptr = R_NEW0 (RBinSection))) + } + if (!(ptr = R_NEW0 (RBinSection))) { + r_list_free (ret); return ret; + } strcpy (ptr->name, "RAM"); ptr->paddr = RAM_START_ADDRESS; ptr->size = RAM_SIZE; @@ -71,17 +78,19 @@ static RList* sections(RBinFile *arch) { static RList* entries(RBinFile *arch) { RList *ret; RBinAddr *ptr = NULL; - if (!(ret = r_list_new ())) + if (!(ret = r_list_new ())) { return NULL; - if (!(ptr = R_NEW0 (RBinAddr))) + } + if (!(ptr = R_NEW0 (RBinAddr))) { return ret; + } ptr->paddr = RAM_START_ADDRESS; - ptr->vaddr = 0x0; + ptr->vaddr = 0; r_list_append (ret, ptr); return ret; } -struct r_bin_plugin_t r_bin_plugin_spc700 = { +RBinPlugin r_bin_plugin_spc700 = { .name = "spc700", .desc = "SNES-SPC700 Sound File Data", .license = "LGPL3", @@ -94,7 +103,7 @@ struct r_bin_plugin_t r_bin_plugin_spc700 = { }; #ifndef CORELIB -struct r_lib_struct_t radare_plugin = { +RLibStruct radare_plugin = { .type = R_LIB_TYPE_BIN, .data = &r_bin_plugin_spc700, .version = R2_VERSION diff --git a/libr/core/cmd_print.c b/libr/core/cmd_print.c index f0e1ecfd70..96a04335ca 100644 --- a/libr/core/cmd_print.c +++ b/libr/core/cmd_print.c @@ -2000,9 +2000,8 @@ static void _pointer_table (RCore *core, ut64 origin, ut64 offset, const ut8 *bu } //TODO: this function is a temporary fix. All analysis should be based on realsize. However, now for same architectures realisze is not used -static ut32 tmp_get_contsize (RAnalFunction *f) -{ - ut32 size = r_anal_fcn_contsize (f); +static ut32 tmp_get_contsize (RAnalFunction *f) { + int size = r_anal_fcn_contsize (f); size = (size > 0) ? size : r_anal_fcn_size (f); return (size < 0) ? 0 : size; } diff --git a/libr/crypto/p/Makefile b/libr/crypto/p/Makefile index 45915b70aa..0a413854f9 100644 --- a/libr/crypto/p/Makefile +++ b/libr/crypto/p/Makefile @@ -1,6 +1,7 @@ include ../../config.mk include ../../../mk/platform.mk +LINK+=-L../../util -lr_util LDFLAGS+=${LINK} nop: @@ -8,6 +9,7 @@ nop: foo: all ALL_TARGETS= +CFLAGS+=-I../../include ALGOS=aes.mk aes_cbc.mk include $(ALGOS) diff --git a/libr/crypto/p/aes.mk b/libr/crypto/p/aes.mk index 83abfd64a9..e937911a87 100644 --- a/libr/crypto/p/aes.mk +++ b/libr/crypto/p/aes.mk @@ -1,5 +1,7 @@ OBJ_AES=crypto_aes.o crypto_aes_algo.o + DEPS+=r_util +DEPFLAGS=-L../../util -lr_util -L.. -lr_crypto STATIC_OBJ+=${OBJ_AES} TARGET_AES=crypto_aes.${EXT_SO} @@ -7,4 +9,5 @@ TARGET_AES=crypto_aes.${EXT_SO} ALL_TARGETS+=${TARGET_AES} ${TARGET_AES}: ${OBJ_AES} - ${CC} $(call libname,crypto_aes) -L.. -lr_crypto ${LDFLAGS} ${CFLAGS} -o ${TARGET_AES} ${OBJ_AES} + ${CC} $(call libname,crypto_aes) ${LDFLAGS} ${CFLAGS} \ + -o ${TARGET_AES} ${OBJ_AES} $(DEPFLAGS) diff --git a/libr/crypto/p/aes_cbc.mk b/libr/crypto/p/aes_cbc.mk index 3450a79425..54abe46ec7 100644 --- a/libr/crypto/p/aes_cbc.mk +++ b/libr/crypto/p/aes_cbc.mk @@ -4,6 +4,8 @@ STATIC_OBJ+=${OBJ_AES_CBC} TARGET_AES_CBC=crypto_aes_cbc.${EXT_SO} ALL_TARGETS+=${TARGET_AES_CBC} +DEPFLAGS=-L.. -lr_crypto -I../../../include ${TARGET_AES_CBC}: ${OBJ_AES_CBC} - ${CC} $(call libname,crypto_aes_cbc) -L.. -lr_crypto ${LDFLAGS} ${CFLAGS} -o ${TARGET_AES_CBC} ${OBJ_AES_CBC} + ${CC} $(call libname,crypto_aes_cbc) $(DEPFLAGS) \ + ${LDFLAGS} ${CFLAGS} -o ${TARGET_AES_CBC} ${OBJ_AES_CBC} diff --git a/libr/parse/p/Makefile b/libr/parse/p/Makefile index 078c7b971d..ba5f32eaba 100644 --- a/libr/parse/p/Makefile +++ b/libr/parse/p/Makefile @@ -1,6 +1,6 @@ include ../../config.mk include ../../../mk/platform.mk -include ../../util/deps.mk +include ../../../shlr/zip/deps.mk CFLAGS+=-I../../include -Wall ${PIC_CFLAGS} ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}.. # -D__UNIX__ diff --git a/libr/parse/p/m68k_pseudo.mk b/libr/parse/p/m68k_pseudo.mk index cef9638cea..6afd502f87 100644 --- a/libr/parse/p/m68k_pseudo.mk +++ b/libr/parse/p/m68k_pseudo.mk @@ -5,6 +5,7 @@ ALL_TARGETS+=${TARGET_M68KPSEUDO} STATIC_OBJ+=${OBJ_M68KPSEUDO} LIBDEPS=-L../../util -lr_util LIBDEPS+=-L../../flags -lr_flags +LIBDEPS+=$(STOP)/zip/librz.a ${TARGET_M68KPSEUDO}: ${OBJ_M68KPSEUDO} ${CC} $(call libname,parse_m68k_pseudo) ${LIBDEPS} \ diff --git a/shlr/bochs/Makefile b/shlr/bochs/Makefile index 2967e50b38..e3bde15b99 100644 --- a/shlr/bochs/Makefile +++ b/shlr/bochs/Makefile @@ -21,6 +21,7 @@ LDFLAGS_SHARED=-shared endif #OSTYPE=windows include ../../libr/socket/deps.mk +include ../../shlr/zip/deps.mk SRC_D=src SRC_C=$(wildcard $(SRC_D)/*.c)