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

Minor code cleanup for the esil compiler

Browse Source
This commit is contained in:
pancake 2024-03-27 18:55:55 +01:00
parent 7f00cb03f1
commit 366ab4d54b
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libr/core/cmd_anal.inc.c
View File

@ -8167,6 +8167,11 @@ static void esil_compile(RCore *core, const char *input) {
r_esil_compiler_parse (ec, code);
char *s = r_esil_compiler_tostring (ec);
r_cons_printf ("%s\n", s);
#if 0
char *us = r_esil_compiler_unparse (ec, s);
r_cons_printf ("(((%s)))\n", us);
free (us);
#endif
free (s);
r_esil_compiler_free (ec);
}

44
libr/esil/esil_compiler.c
View File

@ -50,6 +50,12 @@ R_API REsilCompiler *r_esil_compiler_new(void) {
return ec;
}
R_API void r_esil_compiler_reset(REsilCompiler *ec) {
R_RETURN_IF_FAIL (ec);
ps_free (ec->priv);
ec->priv = ps_new (ec);
}
R_API void r_esil_compiler_use(REsilCompiler *ec, REsil *esil) {
R_RETURN_IF_FAIL (ec);
ec->esil = esil;
@ -57,23 +63,14 @@ R_API void r_esil_compiler_use(REsilCompiler *ec, REsil *esil) {
static char peek(ParseState *ps) {
char ch = ps->cur[0];
if (ch == 0) {
ps->available = false;
}
ps->available = (ch != 0);
ps->cur++;
return ch;
}
static bool is_invalid_token(const char *token) {
static inline bool is_invalid_token(const char *token) {
const char t0 = *token;
switch (t0) {
case '(':
case ')':
case ':':
case ';':
return true;
}
return false;
return t0 && strchr ("():;", t0);
}
static bool checkword(ParseState *ps, const char *s) {
@ -88,13 +85,10 @@ static bool checkword(ParseState *ps, const char *s) {
} else {
RRegItem *ri = r_reg_get (anal->reg, s, -1);
if (ri) {
r_unref (ri);
} else {
if (islower (*s)) {
R_LOG_ERROR ("Invalid register name '%s' at line %d", s, ps->line);
} else {
R_LOG_ERROR ("Invalid operation '%s' at line %d", s, ps->line);
}
const char *type = islower (*s)? "register": "operation";
R_LOG_ERROR ("Invalid %s '%s' at line %d", type, s, ps->line);
ps->error = true;
}
}
@ -175,6 +169,8 @@ static void sep(ParseState *ps) {
}
R_API char *r_esil_compiler_unparse(REsilCompiler *ec, const char *expr) {
ParseState *ps = ec->priv;
sdb_query (ps->db, "*");
// TODO
// parse esil expression and return an esil source
// 1. replace commas with spaces
@ -190,10 +186,11 @@ R_API bool r_esil_compiler_parse(REsilCompiler *ec, const char *expr) {
ps_init (ps, expr);
R_LOG_DEBUG ("PARSE '%s'", expr);
// parse a space separated list of tokens
for (;ps->available && !ps->error;) {
for (; ps->available && !ps->error; ) {
switch (peek (ps)) {
case '\n':
ps->line ++;
// passthrough
case 0:
case '\t':
case ' ':
@ -207,13 +204,16 @@ R_API bool r_esil_compiler_parse(REsilCompiler *ec, const char *expr) {
}
R_API char *r_esil_compiler_tostring(REsilCompiler *ec) {
R_RETURN_VAL_IF_FAIL (ec, NULL);
return ec->str;
}
R_API void r_esil_compiler_free(REsilCompiler *ec) {
ParseState *ps = ec->priv;
ps_free (ps);
free (ec);
if (ec) {
ParseState *ps = ec->priv;
ps_free (ps);
free (ec);
}
}
#if 0

1
libr/include/r_esil.h
View File

@ -386,6 +386,7 @@ typedef struct {
} REsilCompiler;
R_API REsilCompiler *r_esil_compiler_new(void);
R_API void r_esil_compiler_reset(REsilCompiler *ec);
R_API void r_esil_compiler_free(REsilCompiler *ec);
R_API char *r_esil_compiler_tostring(REsilCompiler *ec);
R_API bool r_esil_compiler_parse(REsilCompiler *ec, const char *expr);