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

Fix cov, upgrade capstone

Browse Source
This commit is contained in:
pancake 2015-10-07 13:08:23 +02:00
parent 21406a9af2
commit 58fd60b01d
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libr/core/core.c
View File

@ -847,8 +847,9 @@ R_API char *r_core_anal_hasrefs(RCore *core, ut64 value) {
if (r == -1) {
eprintf ("Something was wrong %s-%d\n",
__FILE__, __LINE__);
}
} else {
r_strbuf_appendf (s, " (%s%s%s)", c, widebuf, cend);
}
break;
}
}

2
shlr/Makefile
View File

@ -12,7 +12,7 @@ CS_TAR=
CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
CS_UPD=20151003
CS_BRA=next
CS_TIP=bcf33a58f1f7f5a61bb65bcd6fe6ad8489d75169
CS_TIP=8f216d48fe4bc9a5d27b5b9bfa21c7eb38c8d42d
# REVERT THIS COMMIT BECAUSE ITS WRONG
CS_REV=
#21b9b25e9dae4af0ef309d4089a54e53b8f5b479

23
shlr/capstone-patches/fix-prefix-uninit.patch
View File

@ -1,23 +0,0 @@
diff --git a/arch/X86/X86Disassembler.c b/arch/X86/X86Disassembler.c
index ecf8142..76523d9 100644
--- a/arch/X86/X86Disassembler.c
+++ b/arch/X86/X86Disassembler.c
@@ -911,17 +911,7 @@ bool X86_getInstruction(csh ud, const uint8_t *code, size_t code_len,
info.offset = address;
memset(&insn, 0, offsetof(InternalInstruction, reader));
- //initialize some the necessary values
- insn.prefixPresent[0x26] = 0;
- insn.prefixPresent[0x2e] = 0;
- insn.prefixPresent[0x36] = 0;
- insn.prefixPresent[0x3e] = 0;
- insn.prefixPresent[0x64] = 0;
- insn.prefixPresent[0x65] = 0;
- insn.prefixPresent[0x66] = 0;
- insn.prefixPresent[0xf0] = 0;
- insn.prefixPresent[0xf2] = 0;
- insn.prefixPresent[0xf3] = 0;
+ memset(&insn.prefixPresent, 0, sizeof(insn.prefixPresent));
if (instr->flat_insn->detail) {
instr->flat_insn->detail->x86.op_count = 0;

8
shlr/capstone-patches/fix-x86-16.patch
View File

@ -1,8 +1,8 @@
diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
index 6837d26..7aee4d7 100644
index 7e19b4e..062eef8 100644
--- a/arch/X86/X86ATTInstPrinter.c
+++ b/arch/X86/X86ATTInstPrinter.c
@@ -538,6 +538,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
@@ -576,6 +576,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
imm = imm & 0xffff;
@ -14,10 +14,10 @@ index 6837d26..7aee4d7 100644
SStream_concat(O, "0x%"PRIx64, imm);
} else {
diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
index 86dc0b3..9580555 100644
index c455725..eb60586 100644
--- a/arch/X86/X86IntelInstPrinter.c
+++ b/arch/X86/X86IntelInstPrinter.c
@@ -716,6 +716,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
@@ -756,6 +756,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
imm = imm & 0xffff;