Skip to content

Commit

Permalink
Fix static link
Browse files Browse the repository at this point in the history
  • Loading branch information
radare committed Mar 18, 2014
1 parent b1b02fb commit 6a835f1
Show file tree
Hide file tree
Showing 22 changed files with 91 additions and 572 deletions.
2 changes: 1 addition & 1 deletion libr/anal/data.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static ut64 is_pointer(RIOBind *iob, const ut8 *buf, int endian, int size) {
// optimization to ignore very low and very high pointers
// this makes disasm 5x faster, but can result in some false positives
if (n<0x1000) return 0; // probably wrong
if (n>0xffffffffffff) return 0; // probably wrong
if (n>0xffffffffffffLL) return 0; // probably wrong

ret = iob->read_at (iob->io, n, buf2, size);
if (ret != size) return 0;
Expand Down
4 changes: 3 additions & 1 deletion libr/anal/esil.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ static int r_anal_esil (RAnalEsil *c, const char *str) {
return c->iterate (c, buf, tkns);
}

#if 0
static int iterate (RAnalEsil *c, char *buf, int *tkns) {
char *str;
int i, type;
Expand All @@ -101,6 +102,7 @@ static int iterate (RAnalEsil *c, char *buf, int *tkns) {
}
return 0;
}
#endif

#define TOKEN_IS(x,y,z) (x[i]==y && !strcmp (x[i+1]==z))
#define TOKEN_GET(x,y) x=tkns[i]; y=buf+tkns[i+1]
Expand Down Expand Up @@ -195,7 +197,7 @@ eprintf (";; -> this means that we have to resolve before accessing memory %d\n"
static int emulate (RAnalEsil *c, char *buf, int *tkns) {
ut64 num = 0;
char *op = NULL;
char *str;
char *str = NULL;
int i, type;
c->opstack = r_list_new ();
c->stack = r_list_new ();
Expand Down
8 changes: 8 additions & 0 deletions libr/anal/p/anal_java.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,17 @@
#include <r_anal_ex.h>
#include <r_cons.h>

#undef R_API
#define R_API static
#undef R_IPI
#define R_IPI static
#include "../../../shlr/java/code.h"
#include "../../../shlr/java/class.h"
//#include "../../../shlr/java/ssa_java.h"
#undef R_API
#define R_API
#undef R_IPI
#define R_IPI

#define IFDBG if(0)
#define IFINT if(0)
Expand Down
6 changes: 3 additions & 3 deletions libr/anal/p/java.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OBJ_JAVA=anal_java.o
SHARED_JAVA+=../../shlr/java/ops.o
SHARED_JAVA+=../../shlr/java/code.o
SHARED_JAVA+=../../shlr/java/class.o
##SHARED_JAVA+=../../shlr/java/ops.o
#SHARED_JAVA+=../../shlr/java/code.o
#SHARED_JAVA+=../../shlr/java/class.o
SHARED2_JAVA=$(addprefix ../,${SHARED_JAVA})
OBJ_JAVA+=${SHARED2_JAVA}

Expand Down
10 changes: 0 additions & 10 deletions libr/cmd/Jamroot

This file was deleted.

19 changes: 0 additions & 19 deletions libr/cmd/Makefile

This file was deleted.

Loading

0 comments on commit 6a835f1

Please sign in to comment.