Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-02 11:43:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

First implementation of pf*

Browse Source 
Doesn't work for nested struct yet...
This commit is contained in:
Skia 2014-09-09 21:08:47 +02:00 committed by pancake
parent 164ced622b
commit ff626df236
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libr/core/cmd_print.c
View File

@ -1,5 +1,5 @@
/* radare - LGPL - Copyright 2009-2014 - pancake */
//#include <r_anal_ex.h>
/*#include <r_anal_ex.h>*/
static void set_asm_configs(RCore *core, char *arch, ut32 bits, int segoff){
r_config_set (core->config, "asm.arch", arch);
@ -1681,11 +1681,17 @@ static int cmd_print(void *data, const char *input) {
}
}
} else {
const char *fmt = r_strht_get (core->print->formats, name);
const char *fmt;
int namelen = strlen (name), flag = -1;
if (name[namelen-1] == '*') {
name[namelen-1] = '\0';
flag = -2;
}
fmt = r_strht_get (core->print->formats, name);
if (fmt) {
//printf ("GET (%s) = %s\n", name, fmt);
r_print_format (core->print, core->offset,
core->block, len, fmt, -1, NULL);
core->block, len, fmt, flag, NULL);
} else eprintf ("Unknown format (%s)\n", name);
}
}

12
libr/util/p_format.c
View File

@ -271,16 +271,18 @@ static int computeStructSize(char *fmt) {
static int r_print_format_struct(RPrint* p, ut64 seek, const ut8* b, int len, char *name, int slide) {
const char *fmt;
/*int flag = (slide>=10000) ? -2 : -1;*/
if ((slide%100) > 14) {
eprintf ("Too much nested struct, recursion too deep...\n");
return 0;
}
fmt = r_strht_get (p->formats, name);
r_print_format (p, seek, b, len, fmt, -1, NULL);
r_print_format (p, seek, b, len, fmt, /*flag*/-1, NULL);
return computeStructSize(strdup(fmt));
}
R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, const char *fmt, int elem, const char *setval) {
R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
const char *fmt, int elem, const char *setval) {
int nargs, i, j, invalid, nexti, idx, times, otimes, endian, isptr = 0;
int (*oldprintf)(const char *str, ...);
const char *argend = fmt+strlen (fmt);
@ -383,6 +385,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, cons
p->printf (" ");
#define MUSTSET (setval && elem == idx)
#define MUSTSEE (elem == -1 || elem == idx)
#define SEEFLAG (elem == -2)
if (MUSTSEE) {
if (!(MUSTSET)) {
if (oldprintf)
@ -457,6 +460,9 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, cons
//tmp = (sizeof (void*)==8)? 'q': 'x';
break;
}
if (SEEFLAG) {
p->printf ("f %s=0x%08"PFMT64x"\n", r_str_word_get0 (args, idx) , seeki);
}
if (isptr == 3) {
p->printf ("NULL");
@ -613,11 +619,13 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, cons
*(name++) = '\0';
}
p->printf ("<struct>\n");
/* if (SEEFLAG) slide+=10000;*/
slide += (isptr) ? 100 : 1;
s = r_print_format_struct (p, seeki, buf+i, len, structname--, slide);
free (structname);
i+= (isptr) ? 4 : s;
slide -= (isptr) ? 100 : 1;
/*if (SEEFLAG) slide-=10000;*/
break;
}
default: