Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-23 22:36:27 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix disasm indent. Add 'mvn' and 'cmp r, n' opcodes

Browse Source
This commit is contained in:
pancake 2013-03-13 17:57:40 +01:00
parent fcbe3cac4a
commit 67f0794b82
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/anal/p/anal_x86.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2012 - nibble */
/* radare - LGPL - Copyright 2009-2013 - nibble */
#include <string.h>

34
libr/asm/arch/arm/armass.c
View File

@ -75,7 +75,7 @@ static ArmOp ops[] = {
//{ "mov", 0x3, TYPE_MOV },
//{ "mov", 0x0a3, TYPE_MOV },
{ "mov", 0xa001, TYPE_MOV },
{ "mvn", 0, TYPE_MOV },
{ "mvn", 0xe000, TYPE_MOV },
{ "svc", 0xf, TYPE_SWI }, // ???
{ "and", 0x0000, TYPE_ARI },
@ -478,7 +478,7 @@ static int thumb_assemble(ArmOpcode *ao, const char *str) {
}
static int arm_assemble(ArmOpcode *ao, const char *str) {
int i, j, ret, reg;
int i, j, ret, reg, a, b;
for (i=0; ops[i].name; i++) {
if (!memcmp(ao->op, ops[i].name, strlen (ops[i].name))) {
ao->o = ops[i].code;
@ -565,11 +565,33 @@ static int arm_assemble(ArmOpcode *ao, const char *str) {
else ao->o |= 0xa003 | getnum (ao->a[1])<<24;
break;
case TYPE_TST:
a = getreg (ao->a[0]);
b = getreg (ao->a[1]);
if (b == -1) {
b = getnum (ao->a[1]);
if (b<0|| b>255) {
eprintf ("Parameter out of range (0-255)\n");
return 0;
}
ao->o = 0x50e3;
// TODO: if (b>255) -> automatic multiplier
if (ao->a[2]) {
int n = getnum (ao->a[2]);
if (n&1) {
eprintf ("Invalid multiplier\n");
return 0;
}
ao->o |= (n>>1)<<16;
}
ao->o |= (a<<8);
ao->o |= ((b&0xff)<<24);
} else {
//ao->o |= getreg(ao->a[0])<<20; // ???
ao->o |= getreg (ao->a[0])<<8;
ao->o |= getreg (ao->a[1])<<24;
if (ao->a[2])
ao->o |= getshift (ao->a[2]);
ao->o |= (a<<8);
ao->o |= (b<<24);
if (ao->a[2])
ao->o |= getshift (ao->a[2]);
}
break;
}
return 1;

8
libr/core/disasm.c
View File

@ -432,9 +432,7 @@ toro:
} else if (at > f->addr && at < f->addr+f->size-1) {
r_cons_printf ("| ");
pre = "| ";
} else {
f = NULL;
}
} else f = NULL;
if (f && at == f->addr+f->size-analop.length) // HACK
pre = "\\ ";
} else pre = " "; //r_cons_printf (" ");
@ -445,7 +443,7 @@ toro:
if (show_lines && refline)
r_cons_strcat (refline);
if (show_offset)
r_cons_printf ("; -------- ");
r_cons_printf ("; -------- ");
if (show_functions)
r_cons_printf ("%s:\n%s", flag->name, f?pre:"");
else r_cons_printf ("%s:\n", flag->name);
@ -800,7 +798,7 @@ toro:
if (show_lines && analop.type == R_ANAL_OP_TYPE_RET) {
if (strchr (line, '>'))
memset (line, ' ', strlen (line));
r_cons_printf ("%s%s; ------------\n", show_functions?" ":"", line);
r_cons_printf ("%s%s; ------------\n", (f&&show_functions)?" ":"", line);
}
free (line);
free (refline);