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

Bump capstone again and fix some warns

Browse Source
This commit is contained in:
pancake 2014-07-02 17:14:32 +02:00
parent b86486609b
commit 9368fc7253
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libr/anal/meta.c
View File

@ -200,7 +200,8 @@ R_API RAnalMetaItem *r_meta_find(RAnal *a, ut64 off, int type, int where) {
}
//char *range = get_in_range (off);
if (type == R_META_TYPE_ANY) {
char *p, key [100];
const char *p;
char key [100];
snprintf (key, sizeof (key)-1, "meta.0x%"PFMT64x, off);
p = sdb_const_get (DB, key, 0);
// XXX: TODO unimplemented. see core/disasm.c:1070

1
libr/anal/reflines.c
View File

@ -11,7 +11,6 @@ R_API struct r_anal_refline_t *r_anal_reflines_get(struct r_anal_t *anal,
RAnalOp op = {0};
const ut8 *ptr = buf;
const ut8 *end = buf + len;
ut64 bytes_consumed = 0;
ut64 opc = addr;
int sz = 0, index = 0;

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

@ -7,7 +7,6 @@
static ut64 MACH0_(r_bin_mach0_vaddr_to_baddr)(struct MACH0_(r_bin_mach0_obj_t)* bin, ut64 addr) {
ut64 section_base, section_size;
ut64 oaddr = addr;
int i, min = -1;
if (!bin->sects)
@ -19,11 +18,10 @@ ut64 oaddr = addr;
continue;
if (addr<bin->sects[i].addr) {
min = i;
addr = bin->sects[i].addr & 0xffffffffFFFF0000;
addr = bin->sects[i].addr & 0xffffffffFFFF0000;
}
}
}
//if (min != -1) { addr += oaddr; }
for (i = 0; i < bin->nsects; i++) {
section_base = (ut64)bin->sects[i].addr;
section_size = (ut64)bin->sects[i].size;
@ -936,8 +934,8 @@ struct r_bin_mach0_addr_t* MACH0_(r_bin_mach0_get_entrypoint)(struct MACH0_(r_bi
return NULL;
if (!(entry = malloc (sizeof (struct r_bin_mach0_addr_t))))
return NULL;
// hack to bypass this test
bin->entry = NULL;
// hack to bypass this test
bin->entry = 0LL;
if (bin->entry) {
entry->offset = MACH0_(r_bin_mach0_addr_to_offset)(bin, bin->entry);
entry->addr = bin->entry;

2
libr/bin/p/bin_p9.c
View File

@ -29,7 +29,7 @@ static Sdb* get_sdb (RBinObject *o) {
}
static void * load_bytes(const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb){
return check_bytes (buf, sz);
return (size_t)check_bytes (buf, sz);
}
static int load(RBinFile *arch) {

3
shlr/Makefile
View File

@ -9,8 +9,7 @@ CS_URL=https://github.com/aquynh/capstone.git
CS_UPD=20140617
CS_BRA=next
#CS_TIP=5a7f409dec06859ad28ee577d404a501b7d380c8
CS_TIP=ed6b8c5a96579e3907f7b2b9d8d0d9efa7e134df
CS_TIP=22ea683583adbbc344989f83fdc3f5c618756eaa
CS_TIP=d392f6ef89f258ea7c3a166131e08ae2c2ff99ef
.PHONY: capstone-sync capstone-build all clean mrproper libgdbr