Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-01 00:51:19 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

* More work on r_bin_java

Browse Source
This commit is contained in:
Nibble 2009-03-16 08:51:20 +01:00
parent dc0459875e
commit a27a4b393c
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libr/bin/format/java/java.c
View File

@ -263,7 +263,7 @@ static struct java_op {
{ NULL, 0x0, 0 }
};
static struct cp_item cp_null_item; // NOTE: must be initialized for safe use
static struct r_bin_java_cp_item_t cp_null_item; // NOTE: must be initialized for safe use
static void check_eof(FILE *fd)
{
@ -281,14 +281,14 @@ static unsigned short read_short(FILE *fd)
return ntohs(sh);
}
static struct cp_item * get_cp(int i)
static struct r_bin_java_cp_item_t* get_cp(struct r_bin_java_t *bin, int i)
{
if (i<0||i>cf.cp_count)
return &cp_null_item;
return &cp_items[i];
return &bin->cp_items[i];
}
static int attributes_walk(FILE *fd, int sz2, int fields)
static int attributes_walk(struct r_bin_java_t *bin, FILE *fd, int sz2, int fields)
{
char buf[99999];
int sz3, sz4;
@ -297,7 +297,7 @@ static int attributes_walk(FILE *fd, int sz2, int fields)
for(j=0;j<sz2;j++) {
fread(buf, 6, 1, fd);
name = (get_cp(USHORT(buf,0)-1))->value;//cp_items[USHORT(buf,0)-1].value;
name = (get_cp(bin, USHORT(buf,0)-1))->value;//cp_items[USHORT(buf,0)-1].value;
IFDBG printf(" %2d: Name Index: %d (%s)\n", j, USHORT(buf,0), name);
// TODO add comment with constant pool index
sz3 = UINT(buf, 2);
@ -393,7 +393,7 @@ static int javasm_init(struct r_bin_java_t *bin)
bin->cf.cp_count--;
IFDBG printf("ConstantPoolCount %d\n", bin->cf.cp_count);
bin->cp_items = malloc(sizeof(struct cp_item)*(bin->cf.cp_count+1));
bin->cp_items = malloc(sizeof(struct r_bin_java_cp_item_t)*(bin->cf.cp_count+1));
for(i=0;i<bin->cf.cp_count;i++) {
struct constant_t *c;
@ -469,6 +469,8 @@ static int javasm_init(struct r_bin_java_t *bin)
//printf("This class: %d (%s)\n", ntohs(bin->cf2.this_class), bin->cp_items[ntohs(bin->cf2.this_class)-1].value); // XXX this is a double pointer !!1
//printf("Super class: %d (%s)\n", ntohs(bin->cf2.super_class), bin->cp_items[ntohs(bin->cf2.super_class)-1].value);
sz = read_short(bin->fd);
/* TODO: intefaces*/
IFDBG printf("Interfaces count: %d\n", sz);
if (sz>0) {
fread(buf, sz*2, 1, bin->fd);
@ -485,7 +487,7 @@ static int javasm_init(struct r_bin_java_t *bin)
fread(buf, 8, 1, bin->fd);
IFDBG {
printf("%2d: Access Flags: %d\n", i, USHORT(buf, 0));
printf(" Name Index: %d (%s)\n", USHORT(buf, 2), get_cp(USHORT(buf,2)-1)->value);
printf(" Name Index: %d (%s)\n", USHORT(buf, 2), get_cp(bin, USHORT(buf,2)-1)->value);
printf(" Descriptor Index: %d\n", USHORT(buf, 4)); //, bin->cp_items[USHORT(buf, 4)-1].value);
}
sz2 = USHORT(buf, 6);
@ -503,8 +505,8 @@ static int javasm_init(struct r_bin_java_t *bin)
IFDBG {
printf("%2d: Access Flags: %d\n", i, USHORT(buf, 0));
printf(" Name Index: %d (%s)\n", USHORT(buf, 2), get_cp(USHORT(buf, 2)-1)->value);
printf(" Descriptor Index: %d (%s)\n", USHORT(buf, 4), get_cp(USHORT(buf, 4)-1)->value);
printf(" Name Index: %d (%s)\n", USHORT(buf, 2), get_cp(bin, USHORT(buf, 2)-1)->value);
printf(" Descriptor Index: %d (%s)\n", USHORT(buf, 4), get_cp(bin, USHORT(buf, 4)-1)->value);
}
sz2 = USHORT(buf, 6);
@ -539,7 +541,7 @@ int r_bin_java_get_version(struct r_bin_java_t *bin, char *version)
return R_TRUE;
}
int r_bin_java_get_entrypoint(struct r_bin_java_t *bin, r_bin_java_entrypoint*)
int r_bin_java_get_entrypoint(struct r_bin_java_t *bin, r_bin_java_entrypoint *entry)
{
return R_FALSE;
}

23
libr/bin/format/java/java.h
View File

@ -5,20 +5,20 @@
#define USHORT(x,y) (unsigned short)(x[y+1]|(x[y]<<8))
#define UINT(x,y) (unsigned int) ((x[y]<<24)|(x[y+1]<<16)|(x[y+2]<<8)|x[y+3])
struct classfile {
struct r_bin_java_classfile_t {
unsigned char cafebabe[4];
unsigned char minor[2];
unsigned char major[2];
unsigned short cp_count;
};
struct classfile2 {
struct r_bin_java_classfile2_t {
unsigned short access_flags;
unsigned short this_class;
unsigned short super_class;
};
struct cp_item {
struct r_bin_java_cp_item_t {
int tag;
char name[255];
char *value;
@ -26,18 +26,21 @@ struct cp_item {
u64 off;
};
struct r_bin_java_fields_t {
int flags;
int name_ndx;
int descriptor_ndx;
struct r_bin_java_attribute_t *atributes;
}
typedef struct r_bin_java_t {
const char* file;
FILE fd;
struct classfile cf;
struct classfile2 cf2;
struct cp_item *cp_items;
struct r_bin_java_cp_item_t *cp_items;
struct r_bin_java_field_t *fields;
struct r_bin_java_method_t *methods;
};
int java_print_opcode(int idx, const u8 *bytes, char *output);
int java_disasm(const u8 *bytes, char *output);
int java_assemble(unsigned char *bytes, char *string);
unsigned short read_short(FILE *fd);
int javasm_init();
int java_classdump(const char *file);