Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-09 15:52:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make bin/core java plugins use libr_java.a

Browse Source
This commit is contained in:
pancake 2014-06-25 04:25:38 +02:00
parent f67850fcb2
commit 046b014dee
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/bin/p/bin_java.c
View File

@ -4,11 +4,9 @@
#include <r_util.h>
#include <r_lib.h>
#include <r_bin.h>
#undef R_API
#define R_API static inline
#undef R_IPI
#define R_IPI static
#include "../../shlr/java/class.c"
#include "../../shlr/java/class.h"
#include "../../shlr/java/code.h"
#define IFDBG_BIN_JAVA if(0)

4
libr/bin/p/java.mk
View File

@ -18,4 +18,6 @@ ALL_TARGETS+=${TARGET_JAVA}
${TARGET_JAVA}: ${OBJ_JAVA}
${CC} $(call libname,bin_java) ${CFLAGS} ${OBJ_JAVA} \
$(LDFLAGS) ${SHARED2_JAVA} ${SHLR}/sdb/src/libsdb.a
$(LDFLAGS) ${SHARED2_JAVA} \
${SHLR}/java/libr_java.a \
${SHLR}/sdb/src/libsdb.a

12
libr/core/p/core_java.c
View File

@ -7,17 +7,15 @@
#include <r_cons.h>
#include <string.h>
#include <r_anal.h>
#include <r_anal_ex.h>
#undef R_API
#define R_API static inline
#undef R_IPI
#define R_IPI static
#if 0
#include "../../../shlr/java/ops.c"
#include "../../../shlr/java/code.c"
#include "../../../shlr/java/class.c"
//#include "../../../shlr/java/class.h"
#endif
#include "../../../shlr/java/class.h"
#include "../../../shlr/java/code.h"
#define DO_THE_DBG 0
#undef IFDBG

2
libr/core/p/java.mk
View File

@ -17,4 +17,6 @@ ALL_TARGETS+=${CORE_TARGET_JAVA}
${CORE_TARGET_JAVA}: ${CORE_OBJ_JAVA}
${CC} $(call libname,core_java) ${CFLAGS} \
-o core_java.${EXT_SO} \
$(SHLR)/java/libr_java.a \
$(SHLR)/sdb/src/libsdb.a \
${CORE_OBJ_JAVA} ${CORE_SHARED2_JAVA}

4
shlr/java/class.h
View File

@ -7,7 +7,7 @@
#include <r_types.h>
#undef U
#define U(x) UNUSED_FUNCTION(x)
#define U(x) x
#include <r_list.h>
#include <r_bin.h>
#include <sdb.h>
@ -749,6 +749,8 @@ typedef struct r_bin_java_obj_t {
R_API RList * U(r_bin_java_get_interface_names)(RBinJavaObj * bin);
R_API RBinJavaCPTypeObj* U(r_bin_java_get_item_from_cp)(RBinJavaObj *bin, int i);
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_bin_cp_list(RBinJavaObj *bin, ut64 idx);
R_API ut8 * r_bin_java_cp_get_idx_bytes(RBinJavaObj *bin, ut16 idx, ut32 *out_sz);
R_API RList * r_bin_java_get_lib_names(RBinJavaObj * bin);
R_API RList* r_bin_java_get_sections(RBinJavaObj *bin);
R_API RList* r_bin_java_get_fields(RBinJavaObj *bin);