mirror of
https://github.com/radareorg/radare2.git
synced 2025-04-03 18:11:38 +00:00
Ragg2-cc -> Ragg2 merge (#9658)
- change of 'access' function for 'r_file_exists' for windows portability - several changes in the way ragg2.c is done, see PR #9658 pancake comments - change function for the remove of 'file'.text - open changed for r_file_dump - some elt of cEnv_t are now const - skip all the pointers verification in set_cEnv but do them in check_cEnv instead - add 2 r_str_sanitize for file and CC in parseCFile - rewrite the removal of .o, .tmp, .bin, .s files, with cleaner code - changed the long command with sed and grep to 2 C functions. - The function parseCompiled that basically does what the command was doing - And r_str_stripLines that is equivalent to "grep -v" (maybe we should put this one in str.c ?) - simplify a bit getCompiler function with a const char* array - add ternary operator for armOrMips condition - use r_file_path for finding path to compilers - new file created in libr/egg which contains all the C file parser - modifications of 2 files to match the change : - libr/egg/r_egg.h - libr/egg/Makefile - the function r_str_stripLine is simplier (the mallocs wasn't needed) - the function r_str_stripLine is moved to libr/util/str.c - libr/include/r_util/r_str.h is changed accordingly
This commit is contained in:
Gromimousse
radare
parent
362184b722
commit
a5c9fc7855
@ -11,7 +11,7 @@
|
||||
#include <string.h>
|
||||
|
||||
|
||||
static int usage (int v) {
|
||||
static int usage(int v) {
|
||||
printf ("Usage: ragg2 [-FOLsrxhvz] [-a arch] [-b bits] [-k os] [-o file] [-I path]\n"
|
||||
" [-i sc] [-e enc] [-B hex] [-c k=v] [-C file] [-p pad] [-q off]\n"
|
||||
" [-q off] [-dDw off:hex] file|f.asm|-\n");
|
||||
@ -50,7 +50,8 @@ static int usage (int v) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void list (REgg *egg) {
|
||||
|
||||
static void list(REgg *egg) {
|
||||
RListIter *iter;
|
||||
REggPlugin *p;
|
||||
printf ("shellcodes:\n");
|
||||
@ -67,7 +68,7 @@ static void list (REgg *egg) {
|
||||
}
|
||||
}
|
||||
|
||||
static int create (const char *format, const char *arch, int bits, const ut8 *code, int codelen) {
|
||||
static int create(const char *format, const char *arch, int bits, const ut8 *code, int codelen) {
|
||||
RBin *bin = r_bin_new ();
|
||||
RBuffer *b;
|
||||
if (!r_bin_use_arch (bin, arch, bits, format)) {
|
||||
@ -86,7 +87,7 @@ static int create (const char *format, const char *arch, int bits, const ut8 *co
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int openfile (const char *f, int x) {
|
||||
static int openfile(const char *f, int x) {
|
||||
int fd = open (f, O_RDWR | O_CREAT, 0644);
|
||||
if (fd == -1) {
|
||||
fd = open (f, O_RDWR);
|
||||
@ -156,7 +157,7 @@ int main(int argc, char **argv) {
|
||||
case 'C':
|
||||
contents = optarg;
|
||||
break;
|
||||
case 'w':
|
||||
case 'w':
|
||||
{
|
||||
char *arg = strdup (optarg);
|
||||
char *p = strchr (arg, ':');
|
||||
@ -191,7 +192,7 @@ int main(int argc, char **argv) {
|
||||
ut64 n = r_num_math (NULL, optarg);
|
||||
r_egg_patch (egg, -1, (const ut8*)&n, 8);
|
||||
append = 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'd':
|
||||
{
|
||||
@ -340,6 +341,28 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
r_egg_load (egg, buf, 0);
|
||||
}
|
||||
} else if (strstr (file, ".c")) {
|
||||
char *fileSanitized = strdup (file);
|
||||
r_str_sanitize (fileSanitized);
|
||||
char *textFile = r_egg_Cfile_parser (fileSanitized, arch, os, bits);
|
||||
|
||||
if (!textFile) {
|
||||
eprintf ("Failure while parsing '%s'\n", fileSanitized);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
int l;
|
||||
char *buf = r_file_slurp (textFile, &l);
|
||||
if (buf && l > 0) {
|
||||
r_egg_raw (egg, (const ut8*)buf, l);
|
||||
} else {
|
||||
eprintf ("Error loading '%s'\n", textFile);
|
||||
}
|
||||
|
||||
r_file_rm (textFile);
|
||||
free (fileSanitized);
|
||||
free (textFile);
|
||||
free (buf);
|
||||
} else {
|
||||
if (strstr (file, ".s") || strstr (file, ".asm")) {
|
||||
fmt = 'a';
|
||||
|
||||
@ -9,6 +9,7 @@ OBJS+=emit_x86.o
|
||||
OBJS+=emit_arm.o
|
||||
OBJS+=emit_x64.o
|
||||
OBJS+=emit_trace.o
|
||||
OBJS+=egg_Cfile.o
|
||||
|
||||
all: ${LIBSO} ${LIBAR}
|
||||
|
||||
|
||||
344
libr/egg/egg_Cfile.c
Normal file
344
libr/egg/egg_Cfile.c
Normal file
@ -0,0 +1,344 @@
|
||||
/* radare - LGPL - Copyright 2011-2018 - pancake */
|
||||
|
||||
#include <r_egg.h>
|
||||
|
||||
// compilation environment
|
||||
struct cEnv_t {
|
||||
char *SFLIBPATH;
|
||||
char *CC;
|
||||
const char *OBJCOPY;
|
||||
char *CFLAGS;
|
||||
char *LDFLAGS;
|
||||
const char *JMP;
|
||||
const char *FMT;
|
||||
char *SHDR;
|
||||
char *TRIPLET;
|
||||
const char *TEXT;
|
||||
};
|
||||
|
||||
static char* r_egg_Cfile_getCompiler(void) {
|
||||
size_t i;
|
||||
const char *compilers[] = {"llvm-gcc", "clang", "gcc"};
|
||||
char *output = r_sys_getenv ("CC");
|
||||
|
||||
if (output) {
|
||||
return output;
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
output = r_file_path (compilers[i]);
|
||||
if (strcmp (output, compilers[i])) {
|
||||
free (output);
|
||||
return strdup (compilers[i]);
|
||||
}
|
||||
free (output);
|
||||
}
|
||||
|
||||
eprintf ("Couldn't find a compiler ! Please, set CC.\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline bool r_egg_Cfile_armOrMips(const char *arch) {
|
||||
return (!strcmp (arch, "arm") || !strcmp (arch, "arm64") || !strcmp (arch, "aarch64")
|
||||
|| !strcmp (arch, "thumb") || !strcmp (arch, "arm32") || !strcmp (arch, "mips")
|
||||
|| !strcmp (arch, "mips32") || !strcmp (arch, "mips64"));
|
||||
}
|
||||
|
||||
static void r_egg_Cfile_free_cEnv(struct cEnv_t *cEnv) {
|
||||
if (cEnv) {
|
||||
free (cEnv->SFLIBPATH);
|
||||
free (cEnv->CC);
|
||||
free (cEnv->CFLAGS);
|
||||
free (cEnv->LDFLAGS);
|
||||
free (cEnv->SHDR);
|
||||
free (cEnv->TRIPLET);
|
||||
}
|
||||
free (cEnv);
|
||||
}
|
||||
|
||||
static inline bool r_egg_Cfile_check_cEnv(struct cEnv_t *cEnv) {
|
||||
return (!cEnv->SFLIBPATH || !cEnv->CC || !cEnv->CFLAGS || !cEnv->LDFLAGS
|
||||
|| !cEnv->SHDR || !cEnv->TRIPLET);
|
||||
}
|
||||
|
||||
static struct cEnv_t* r_egg_Cfile_set_cEnv(const char *arch, const char *os, int bits) {
|
||||
struct cEnv_t *cEnv = calloc (1, sizeof (struct cEnv_t));
|
||||
bool use_clang;
|
||||
char *buffer = NULL;
|
||||
char *output = NULL;
|
||||
|
||||
if (!cEnv) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!(cEnv->CC = r_egg_Cfile_getCompiler())) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
cEnv->SFLIBPATH = r_sys_getenv ("SFLIBPATH");
|
||||
if (!cEnv->SFLIBPATH) {
|
||||
output = r_sys_cmd_strf ("r2 -hh | grep INCDIR | awk '{print $2}'");
|
||||
if (!output || (output[0] == '\0')) {
|
||||
eprintf ("Cannot find SFLIBPATH env var.\n"
|
||||
"Please define it, or fix r2 installation.\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
output[strlen (output) - 1] = '\0'; // strip the ending '\n'
|
||||
if (!(cEnv->SFLIBPATH = r_str_newf ("%s/sflib", output))) {
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
cEnv->JMP = r_egg_Cfile_armOrMips (arch) ? "b" : "jmp";
|
||||
|
||||
if (!strcmp (os, "darwin")) {
|
||||
cEnv->OBJCOPY = "gobjcopy";
|
||||
cEnv->FMT = "mach0";
|
||||
if (!strcmp (arch, "x86")) {
|
||||
if (bits == 32) {
|
||||
cEnv->CFLAGS = strdup ("-arch i386");
|
||||
cEnv->LDFLAGS = strdup ("-arch i386 -shared -c");
|
||||
} else {
|
||||
cEnv->CFLAGS = strdup ("-arch x86_64");
|
||||
cEnv->LDFLAGS = strdup ("-arch x86_64 -shared -c");
|
||||
}
|
||||
} else {
|
||||
cEnv->LDFLAGS = strdup ("-shared -c");
|
||||
}
|
||||
cEnv->SHDR = r_str_newf ("\n.text\n%s _main\n", cEnv->JMP);
|
||||
|
||||
} else {
|
||||
cEnv->OBJCOPY = "objcopy";
|
||||
cEnv->FMT = "elf";
|
||||
cEnv->SHDR = r_str_newf ("\n.section .text\n.globl main\n"
|
||||
"// .type main, @function\n%s main\n", cEnv->JMP);
|
||||
if (!strcmp (arch, "x86")) {
|
||||
if (bits == 32) {
|
||||
cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m32");
|
||||
cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m32");
|
||||
} else {
|
||||
cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m64");
|
||||
cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m64");
|
||||
}
|
||||
} else {
|
||||
cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -nostartfiles");
|
||||
cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -nostartfiles");
|
||||
}
|
||||
}
|
||||
|
||||
cEnv->TRIPLET = r_str_newf ("%s-%s-%d", os, arch, bits);
|
||||
|
||||
if (!strcmp (os, "windows")) {
|
||||
cEnv->TEXT = ".text";
|
||||
cEnv->FMT = "pe";
|
||||
} else if (!strcmp (os, "darwin")) {
|
||||
cEnv->TEXT = "0.__TEXT.__text";
|
||||
} else {
|
||||
cEnv->TEXT = ".text";
|
||||
}
|
||||
|
||||
use_clang = false;
|
||||
if (!strcmp (cEnv->TRIPLET, "darwin-arm-64")) {
|
||||
free (cEnv->CC);
|
||||
cEnv->CC = strdup ("xcrun --sdk iphoneos gcc -arch arm64 -miphoneos-version-min=0.0");
|
||||
use_clang = true;
|
||||
cEnv->TEXT = "0.__TEXT.__text";
|
||||
} else if (!strcmp (cEnv->TRIPLET, "darwin-arm-32")) {
|
||||
free (cEnv->CC);
|
||||
cEnv->CC = strdup ("xcrun --sdk iphoneos gcc -arch armv7 -miphoneos-version-min=0.0");
|
||||
use_clang = true;
|
||||
cEnv->TEXT = "0.__TEXT.__text";
|
||||
}
|
||||
|
||||
buffer = r_str_newf ("%s -nostdinc -include '%s'/'%s'/sflib.h",
|
||||
cEnv->CFLAGS, cEnv->SFLIBPATH, cEnv->TRIPLET);
|
||||
if (!buffer) {
|
||||
goto fail;
|
||||
}
|
||||
free (cEnv->CFLAGS);
|
||||
cEnv->CFLAGS = strdup (buffer);
|
||||
|
||||
if (use_clang) {
|
||||
free (buffer);
|
||||
buffer = r_str_newf ("%s -fomit-frame-pointer"
|
||||
" -fno-zero-initialized-in-bss", cEnv->CFLAGS);
|
||||
if (!buffer) {
|
||||
goto fail;
|
||||
}
|
||||
free (cEnv->CFLAGS);
|
||||
cEnv->CFLAGS = strdup (buffer);
|
||||
} else {
|
||||
free (buffer);
|
||||
buffer = r_str_newf ("%s -z execstack -fomit-frame-pointer"
|
||||
" -finline-functions -fno-zero-initialized-in-bss", cEnv->CFLAGS);
|
||||
if (!buffer) {
|
||||
goto fail;
|
||||
}
|
||||
free (cEnv->CFLAGS);
|
||||
cEnv->CFLAGS = strdup (buffer);
|
||||
}
|
||||
free (buffer);
|
||||
buffer = r_str_newf ("%s -nostdlib", cEnv->LDFLAGS);
|
||||
if (!buffer) {
|
||||
goto fail;
|
||||
}
|
||||
free (cEnv->LDFLAGS);
|
||||
cEnv->LDFLAGS = strdup (buffer);
|
||||
|
||||
if (r_egg_Cfile_check_cEnv (cEnv)) {
|
||||
eprintf ("Error with cEnv allocation!\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
free (buffer);
|
||||
free (output);
|
||||
return cEnv;
|
||||
|
||||
fail:
|
||||
free (buffer);
|
||||
free (output);
|
||||
r_egg_Cfile_free_cEnv (cEnv);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static bool r_egg_Cfile_parseCompiled(const char *file) {
|
||||
char *fileExt = r_str_newf ("%s.tmp", file);
|
||||
char *buffer = r_file_slurp (fileExt, NULL);
|
||||
|
||||
buffer = r_str_replace (buffer, "rdata", "text", false);
|
||||
buffer = r_str_replace (buffer, "rodata", "text", false);
|
||||
buffer = r_str_replace (buffer, "get_pc_thunk.bx", "__getesp__", true);
|
||||
|
||||
const char *words[] = {".cstring", "size", "___main", "section", "__alloca", "zero", "cfi"};
|
||||
size_t i;
|
||||
for (i = 0; i < 7; i++) {
|
||||
r_str_stripLine (buffer, words[i]);
|
||||
}
|
||||
|
||||
free (fileExt);
|
||||
fileExt = r_str_newf ("%s.s", file);
|
||||
if (!r_file_dump (fileExt, (const ut8*) buffer, strlen (buffer), true)) {
|
||||
eprintf ("Error while opening %s.s\n", file);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
free (buffer);
|
||||
free (fileExt);
|
||||
return true;
|
||||
|
||||
fail:
|
||||
free (buffer);
|
||||
free (fileExt);
|
||||
return false;
|
||||
}
|
||||
|
||||
R_API char* r_egg_Cfile_parser(const char *file, const char *arch, const char *os, int bits) {
|
||||
char *output = NULL;
|
||||
char *fileExt = NULL; // "file" with extension (.s, .text, ...)
|
||||
struct cEnv_t *cEnv = r_egg_Cfile_set_cEnv (arch, os, bits);
|
||||
|
||||
if (!cEnv) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
r_str_sanitize (cEnv->CC);
|
||||
|
||||
//printf ("==> Compile\n");
|
||||
printf ("'%s' %s -o '%s.tmp' -S -Os '%s'\n", cEnv->CC, cEnv->CFLAGS, file, file);
|
||||
|
||||
output = r_sys_cmd_strf ("('%s' %s -o '%s.tmp' -S -Os '%s') 2>&1",
|
||||
cEnv->CC, cEnv->CFLAGS, file, file);
|
||||
if (output == NULL) {
|
||||
eprintf ("Compilation failed!\n");
|
||||
goto fail;
|
||||
}
|
||||
printf ("%s", output);
|
||||
|
||||
if (!(fileExt = r_str_newf ("%s.s", file))) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!r_file_dump (fileExt, (const ut8*) cEnv->SHDR, strlen (cEnv->SHDR), false)) {
|
||||
eprintf ("Error while opening %s.s\n", file);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!r_egg_Cfile_parseCompiled (file)) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
//printf ("==> Assemble\n");
|
||||
printf ("'%s' %s -Os -o '%s.o' '%s.s'\n", cEnv->CC, cEnv->LDFLAGS, file, file);
|
||||
|
||||
free (output);
|
||||
output = r_sys_cmd_strf ("'%s' %s -Os -o '%s.o' '%s.s'",
|
||||
cEnv->CC, cEnv->LDFLAGS, file, file);
|
||||
if (!output) {
|
||||
eprintf ("Assembly failed!\n");
|
||||
goto fail;
|
||||
}
|
||||
printf ("%s", output);
|
||||
|
||||
//printf ("==> Link\n");
|
||||
printf ("rabin2 -o '%s.text' -O d/S/'%s' '%s.o'\n", file, cEnv->TEXT, file);
|
||||
|
||||
free (output);
|
||||
output = r_sys_cmd_strf ("rabin2 -o '%s.text' -O d/S/'%s' '%s'.o",
|
||||
file, cEnv->TEXT, file);
|
||||
if (!output) {
|
||||
eprintf ("Linkage failed!\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
free (fileExt);
|
||||
if (!(fileExt = r_str_newf ("%s.o", file))) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!r_file_exists (fileExt)) {
|
||||
eprintf ("Cannot find %s.o\n", file);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
free (fileExt);
|
||||
if (!(fileExt = r_str_newf ("%s.text", file))) {
|
||||
goto fail;
|
||||
}
|
||||
if (r_file_size (fileExt) == 0) {
|
||||
printf ("FALLBACK: Using objcopy instead of rabin2");
|
||||
|
||||
free (output);
|
||||
output = r_sys_cmd_strf ("'%s' -j .text -O binary '%s.o' '%s.text'",
|
||||
cEnv->OBJCOPY, file, file);
|
||||
if (!output) {
|
||||
eprintf ("objcopy failed!\n");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
size_t i;
|
||||
const char *extArray[] = {"bin", "tmp", "s", "o"};
|
||||
for (i = 0; i < 4; i++) {
|
||||
free (fileExt);
|
||||
if (!(fileExt = r_str_newf ("%s.%s", file, extArray[i]))) {
|
||||
goto fail;
|
||||
}
|
||||
r_file_rm (fileExt);
|
||||
}
|
||||
|
||||
free (fileExt);
|
||||
if ((fileExt = r_str_newf ("%s.text", file)) == NULL) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
free (output);
|
||||
r_egg_Cfile_free_cEnv (cEnv);
|
||||
return fileExt;
|
||||
|
||||
fail:
|
||||
free (fileExt);
|
||||
free (output);
|
||||
r_egg_Cfile_free_cEnv (cEnv);
|
||||
return NULL;
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
files = [
|
||||
'egg.c',
|
||||
'egg_Cfile.c',
|
||||
'egg_lang.c',
|
||||
'emit_arm.c',
|
||||
'emit_trace.c',
|
||||
|
||||
@ -217,6 +217,9 @@ R_API int r_egg_run(REgg *egg);
|
||||
R_API int r_egg_patch(REgg *egg, int off, const ut8 *b, int l);
|
||||
R_API void r_egg_finalize(REgg *egg);
|
||||
|
||||
/* r_egg_Cfile.c */
|
||||
R_API char* r_egg_Cfile_parser(const char *file, const char *arch, const char *os, int bits);
|
||||
|
||||
/* lang.c */
|
||||
R_API char *r_egg_mkvar(REgg *egg, char *out, const char *_str, int delta);
|
||||
R_API int r_egg_lang_parsechar(REgg *egg, char c);
|
||||
|
||||
@ -158,6 +158,7 @@ R_API const char *r_str_last (const char *in, const char *ch);
|
||||
R_API char* r_str_highlight(char *str, const char *word, const char *color);
|
||||
R_API char *r_qrcode_gen(const ut8 *text, int len, bool utf8, bool inverted);
|
||||
R_API char *r_str_from_ut64(ut64 val);
|
||||
R_API void r_str_stripLine(char *str, const char *key);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -2936,3 +2936,42 @@ R_API int r_snprintf(char *string, int len, const char *fmt, ...) {
|
||||
va_end (ap);
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Strips all the lines in str that contain key
|
||||
R_API void r_str_stripLine(char *str, const char *key)
|
||||
{
|
||||
size_t i, j, klen, slen, off;
|
||||
const char *ptr;
|
||||
|
||||
if (!str || !key) {
|
||||
return;
|
||||
}
|
||||
klen = strlen (key);
|
||||
slen = strlen (str);
|
||||
|
||||
for (i = 0; i < slen; ) {
|
||||
ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) "\n", 1);
|
||||
if (!ptr) {
|
||||
ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) key, klen);
|
||||
if (ptr) {
|
||||
str[i] = '\0';
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
off = (size_t) (ptr - (str + i)) + 1;
|
||||
|
||||
ptr = (char*) r_mem_mem ((ut8*) str + i, off, (ut8*) key, klen);
|
||||
if (ptr) {
|
||||
for (j = i; j < slen - off + 1; j++) {
|
||||
str[j] = str[j + off];
|
||||
}
|
||||
slen -= off;
|
||||
} else {
|
||||
i += off;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user