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 #20030 - Add binary input support for rasm2 ##tools

Browse Source
This commit is contained in:
pancake 2022-05-02 11:14:09 +02:00
parent a0c52167a0
commit 05fe032e50
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libr/main/rasm2.c
View File

@ -345,7 +345,7 @@ static void rasm2_list(RAsmState *as, const char *arch) {
static int rasm_show_help(int v) {
if (v < 2) {
printf ("Usage: rasm2 [-ACdDehLBvw] [-a arch] [-b bits] [-o addr] [-s syntax]\n"
" [-f file] [-F fil:ter] [-i skip] [-l len] 'code'|hex|-\n");
" [-f file] [-F fil:ter] [-i skip] [-l len] 'code'|hex|0101b|-\n");
}
if (v != 1) {
printf (" -a [arch] Set architecture to assemble/disassemble (see -L)\n"
@ -424,6 +424,22 @@ static int rasm_show_help(int v) {
return 0;
}
static bool is_binary(const char *s) {
if (!r_str_endswith (s, "b")) {
return false;
}
while (*s) {
if (*s != '0' && *s != '1') {
if (*s == 'b' && !s[1]) {
return true;
}
return false;
}
s++;
}
return false;
}
static int rasm_disasm(RAsmState *as, ut64 addr, const char *buf, int len, int bits, int bin, int hex) {
RAsmCode *acode;
ut8 *data = NULL;
@ -432,6 +448,20 @@ static int rasm_disasm(RAsmState *as, ut64 addr, const char *buf, int len, int b
if (bits == 1) {
len /= 8;
}
ut8 bbuf[8] = {0};
if (is_binary (buf)) {
int blen = strlen (buf);
ut64 n = r_num_get (NULL, buf);
memcpy (bbuf, &n, 8);
buf = (const char*)&bbuf;
bin = true;
hex = false;
if (blen > 32) {
len = 8;
} else {
len = 4;
}
}
if (bin) {
if (len < 0) {
return false;