Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-25 06:09:50 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix more 68k bugs and doesnt git pull capstone

Browse Source
This commit is contained in:
pancake 2014-05-15 20:13:47 +02:00
parent d9ba1de3e9
commit 5f5cbde791
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libr/asm/arch/m68k/m68k_disasm/m68k_disasm.c
View File

@ -1052,8 +1052,7 @@ static void opcode_1110(dis_buffer_t *dbuf, u_short opc)
bf = BITFIELD(ext,10,6);
if (ISBITSET(ext, 11)) {
if (bf<8)
PRINT_DREG(dbuf, bf);
PRINT_DREG(dbuf, bf);
} else
printu_wb(dbuf, bf, SIZE_BYTE, 10);

6
libr/asm/arch/m68k/m68k_disasm/m68k_disasm.h
View File

@ -471,9 +471,9 @@ typedef struct dis_buffer dis_buffer_t;
#else
#define IS_INST(inst,val) ((inst/**/_MASK & (val)) == inst/**/_INST)
#endif
#define PRINT_FPREG(dbuf, reg) addstr(dbuf, fpregs[reg])
#define PRINT_DREG(dbuf, reg) addstr(dbuf, dregs[reg])
#define PRINT_AREG(dbuf, reg) addstr(dbuf, aregs[reg])
#define PRINT_FPREG(dbuf, reg) addstr(dbuf, reg<8?fpregs[reg]:"f?")
#define PRINT_DREG(dbuf, reg) addstr(dbuf, reg<8?dregs[reg]:"d?")
#define PRINT_AREG(dbuf, reg) addstr(dbuf, reg<8?aregs[reg]:"a?")
#undef NBBY
#define NBBY 256 /*@@@*/

4
libr/bin/format/mach0/mach0.c
View File

@ -295,6 +295,7 @@ static int MACH0_(r_bin_mach0_init_items)(struct MACH0_(r_bin_mach0_obj_t)* bin)
ut64 off = 0LL;
int i, len;
bin->uuidn = 0;
bin->os = 0;
bin->has_crypto = 0;
for (i = 0, off = sizeof (struct MACH0_(mach_header)); \
@ -348,10 +349,9 @@ static int MACH0_(r_bin_mach0_init_items)(struct MACH0_(r_bin_mach0_obj_t)* bin)
{
struct uuid_command uc = {0};
if (r_buf_fread_at (bin->b, off, (ut8*)&uc, "24c", 1) != -1) {
static int uuidn = 0;
char key[128];
char val[128];
snprintf (key, sizeof (key)-1, "uuid.%d", uuidn++);
snprintf (key, sizeof (key)-1, "uuid.%d", bin->uuidn++);
r_hex_bin2str (&uc.uuid, 16, val);
sdb_set (bin->kv, key, val, 0);
//for (i=0;i<16; i++) eprintf ("%02x%c", uc.uuid[i], (i==15)?'\n':'-');

3
libr/bin/format/mach0/mach0.h
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2010-2013 - pancake, nibble */
/* radare - LGPL - Copyright 2010-2014 - pancake, nibble */
#include <r_bin.h>
#include <r_types.h>
@ -97,6 +97,7 @@ struct MACH0_(r_bin_mach0_obj_t) {
int os;
Sdb *kv;
int has_crypto;
int uuidn;
};
struct MACH0_(r_bin_mach0_obj_t)* MACH0_(r_bin_mach0_new)(const char* file);

5
libr/core/cmd_meta.c
View File

@ -1,5 +1,5 @@
/* radare - LGPL - Copyright 2009-2014 - pancake */
/* radare - LGPL - Copyright 2009-2014 - pancake */
#if 0
static void filter_line(char *line) {
char *a;
@ -21,6 +21,7 @@ static void filter_line(char *line) {
}
}
}
#endif
static int remove_meta_offset(RCore *core, ut64 offset) {
int ret;

4
shlr/Makefile
View File

@ -122,9 +122,7 @@ ifeq ($(CS_TAR),)
capstone: capstone-sync
capstone-sync:
if [ -d capstone ]; then \
( cd capstone ; git pull ) ; \
else \
if [ ! -d capstone ]; then \
git clone $(CS_URL) ; \
fi
cd capstone ; \