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

* rasm2 refactoring

Browse Source 
* Fixed r_lib null handler issue
* Default blocksize of 64B
This commit is contained in:
Nibble 2009-02-18 16:20:14 +01:00
parent ca77c47350
commit a2abae1c01
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libr/asm/t/rasm2.c
View File

@ -18,10 +18,12 @@ static int rasm_show_help()
printf( "rasm2 [-e] [-o offset] [-a arch] [-s syntax] -d \"opcode\"|\"hexpairs\"|-\n"
" -d Disassemble from hexpair bytes\n"
" -o [offset] Offset where this opcode is suposed to be\n"
" -a [arch] Select architecture (x86, arm)\n"
" -a [arch] Select architecture plugin\n"
" -s [syntax] Select syntax (intel, att, olly)\n"
" -e Use big endian\n"
" If the last argument is '-' reads from stdin\n");
" If the last argument is '-' reads from stdin\n\n"
"Available plugins:\n");
r_asm_list(&a);
return R_TRUE;
}
@ -34,7 +36,7 @@ static int rasm_disasm(char *buf, u64 offset, char *arch, char *syntax, int big_
int ret = 0;
u64 idx = 0, word = 0, len = 0;
if (arch != NULL && strcmp(arch, "bf")) {
if (arch != NULL && strcmp(arch, "asm_bf")) {
while(ptr[0]) {
if (ptr[0]!= ' ')
if (0==(++word%2))len++;
@ -44,26 +46,11 @@ static int rasm_disasm(char *buf, u64 offset, char *arch, char *syntax, int big_
r_hex_str2bin(buf, data);
} else {
len = strlen(buf);
data = buf;
data = (u8*)buf;
}
if (arch != NULL) {
if (!strcmp(arch, "arm"))
r_asm_set(&a, "asm_arm");
else if (!strcmp(arch, "mips"))
r_asm_set(&a, "asm_mips");
else if (!strcmp(arch, "sparc"))
r_asm_set(&a, "asm_sparc");
else if (!strcmp(arch, "ppc"))
r_asm_set(&a, "asm_ppc");
else if (!strcmp(arch, "bf"))
r_asm_set(&a, "asm_bf");
else if (!strcmp(arch, "csr"))
r_asm_set(&a, "asm_csr");
else if (!strcmp(arch, "m68k"))
r_asm_set(&a, "asm_m68k");
else r_asm_set(&a, "asm_x86");
} else r_asm_set(&a, "asm_x86");
if (arch == NULL || !r_asm_set(&a, arch))
r_asm_set(&a, "asm_x86");
if (syntax != NULL) {
if (!strcmp(syntax, "att"))
@ -123,15 +110,15 @@ int main(int argc, char *argv[])
u64 offset = 0;
int big_endian = 0, dis = 0, c;
if (argc<2)
return rasm_show_help();
r_asm_init(&a);
r_lib_init(&l, "radare_plugin");
r_lib_add_handler(&l, R_LIB_TYPE_ASM, "(dis)assembly plugins",
&__lib_asm_cb, &__lib_asm_dt, NULL);
r_lib_opendir(&l, getenv("LIBR_PLUGINS"));
if (argc<2)
return rasm_show_help();
while ((c = getopt(argc, argv, "da:s:o:h")) != -1)
{
switch( c ) {

2
libr/include/r_core.h
View File

@ -17,7 +17,7 @@
#include "r_flags.h"
#include "r_config.h"
#define R_CORE_BLOCKSIZE 256
#define R_CORE_BLOCKSIZE 64
#define R_CORE_BLOCKSIZE_MAX 0x40000 /* 4 MB */
struct r_core_file_t {

4
libr/lib/lib.c
View File

@ -90,7 +90,7 @@ int r_lib_dl_check_filename(const char *file)
int r_lib_run_handler(struct r_lib_t *lib, struct r_lib_plugin_t *plugin, struct r_lib_struct_t *symbol)
{
struct r_lib_handler_t *h = plugin->handler;
if (h->constructor != NULL)
if (h && h->constructor != NULL)
return h->constructor(plugin, h->user, symbol->data);
return -1;
}
@ -154,7 +154,7 @@ int r_lib_open(struct r_lib_t *lib, const char *file)
ret = r_lib_run_handler(lib, p, stru);
if (ret == -1) {
fprintf(stderr, "Library handler returned -1 for '%s'\n", file);
//fprintf(stderr, "Library handler returned -1 for '%s'\n", file);
free(p->file);
free(p);
r_lib_dl_close(handler);