Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-08 21:47:12 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

* Full implementation of the 64bit register profile for linux

Browse Source 
* Simplify debugger plugin arch/bits info
* Display 64bit registers with 'dr'
  - Padding with 16 0's instead of 8
This commit is contained in:
pancake/fluendo 2010-03-03 14:48:17 +01:00
parent f0e1c8ef78
commit 4941781bd7
6 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/cmd.c
View File

@ -83,10 +83,12 @@ static void cmd_reg (struct r_core_t *core, const char *str) {
case '*':
r_debug_reg_sync (&core->dbg, R_REG_TYPE_GPR, R_FALSE);
r_debug_reg_list (&core->dbg, R_REG_TYPE_GPR, 32, 1);
r_debug_reg_list (&core->dbg, R_REG_TYPE_GPR, 64, 1);
break;
case '\0':
r_debug_reg_sync (&core->dbg, R_REG_TYPE_GPR, R_FALSE);
r_debug_reg_list (&core->dbg, R_REG_TYPE_GPR, 32, 0);
r_debug_reg_list (&core->dbg, R_REG_TYPE_GPR, 64, 0);
break;
case ' ':
arg = strchr(str+1, '=');

1
libr/core/config.c
View File

@ -70,6 +70,7 @@ static int config_asm_bits_callback(void *user, void *data) {
ret = R_TRUE;
}
}
// TODO: change debugger backend bit profile here
return ret;
}

2
libr/debug/debug.c
View File

@ -43,7 +43,7 @@ R_API int r_debug_attach(struct r_debug_t *dbg, int pid) {
ret = dbg->h->attach (pid);
if (ret) {
// TODO: get arch and set io pid
//int arch = dbg->h->get_arch();
//int arch = dbg->h->arch;
//r_reg_set(dbg->reg->nregs, arch); //R_DBG_ARCH_X86);
// dbg->bp->iob->system("pid %d", pid);
dbg->pid = pid;

78
libr/debug/p/debug_native.c
View File

@ -317,7 +317,6 @@ static const char *r_debug_native_reg_profile() {
"flg flag_r .1 .457 0\n"
);
#elif __x86_64__
#warning linux-x64 reg profile is incomplete
return strdup (
"=pc rip\n"
"=sp rsp\n"
@ -327,12 +326,33 @@ static const char *r_debug_native_reg_profile() {
"=a2 rcx\n"
"=a3 rdx\n"
"# no profile defined for x86-64\n"
"gpr rbx .32 0 0\n"
"gpr rcx .32 8 0\n"
"gpr rdx .32 16 0\n"
"gpr rsi .32 24 0\n"
"gpr rdi .32 32 0\n"
"gpr rip .32 40 0\n"
"gpr r15 .64 0 0\n"
"gpr r14 .64 8 0\n"
"gpr r13 .64 16 0\n"
"gpr r12 .64 24 0\n"
"gpr rbp .64 32 0\n"
"gpr rbx .64 40 0\n"
"gpr r11 .64 48 0\n"
"gpr r10 .64 56 0\n"
"gpr r9 .64 64 0\n"
"gpr r8 .64 72 0\n"
"gpr rax .64 80 0\n"
"gpr rcx .64 88 0\n"
"gpr rdx .64 96 0\n"
"gpr rsi .64 104 0\n"
"gpr rdi .64 112 0\n"
"gpr oeax .64 120 0\n"
"gpr rip .64 128 0\n"
"seg cs .64 136 0\n"
"flg eflags .64 144 0\n"
"gpr rsp .64 152 0\n"
"seg ss .64 160 0\n"
"seg fs_base .64 168 0\n"
"seg gs_base .64 176 0\n"
"seg ds .64 184 0\n"
"seg es .64 192 0\n"
"seg fs .64 200 0\n"
"seg gs .64 208 0\n"
);
#elif __arm__
return strdup (
@ -653,30 +673,6 @@ static RList *r_debug_native_frames(RDebug *dbg) {
#warning Backtrace frames not implemented for this platform
#endif
static int r_debug_get_arch() {
#if __i386__ || __x86_64__
return R_ASM_ARCH_X86;
#elif __powerpc__ || __POWERPC__
return R_ASM_ARCH_PPC;
#elif __mips__
return R_ASM_ARCH_MIPS;
#elif __arm__
return R_ASM_ARCH_ARM;
#endif
}
#if __i386__
const char *archlist[3] = { "x86", "x86-32", 0 };
#elif __x86_64__
const char *archlist[4] = { "x86", "x86-32", "x86-64", 0 };
#elif __powerpc__ || __POWERPC__
const char *archlist[2] = { "powerpc", 0 };
#elif __mips__
const char *archlist[2] = { "mips", 0 };
#elif __arm__
const char *archlist[2] = { "arm", 0 };
#endif
static int r_debug_native_kill(struct r_debug_t *dbg, int sig) {
#if __WINDOWS__
TerminateProcess (WIN32_PI(hProcess), 1);
@ -691,7 +687,24 @@ static int r_debug_native_kill(struct r_debug_t *dbg, int sig) {
struct r_debug_handle_t r_debug_plugin_native = {
.name = "native",
.archs = (const char **)archlist,
#if __i386__
.bits = R_DBG_BIT_32,
.arch = R_ASM_ARCH_X86,
#elif __x86_64__
.bits = R_DBG_BIT_32 | R_DBG_BIT_64,
.arch = R_ASM_ARCH_X86,
#elif __arm__
.bits = R_DBG_BIT_32,
.arch = R_ASM_ARCH_ARM,
#elif __mips__
.bits = R_DBG_BIT_32,
.arch = R_ASM_ARCH_MIPS,
#elif __powerpc__
.bits = R_DBG_BIT_32,
.arch = R_ASM_ARCH_PPC,
#else
#warning food
#endif
.step = &r_debug_native_step,
.cont = &r_debug_native_continue,
.attach = &r_debug_native_attach,
@ -699,7 +712,6 @@ struct r_debug_handle_t r_debug_plugin_native = {
.wait = &r_debug_native_wait,
.kill = &r_debug_native_kill,
.frames = &r_debug_native_frames,
.get_arch = &r_debug_get_arch,
.reg_profile = (void *)&r_debug_native_reg_profile,
.reg_read = &r_debug_native_reg_read,
.reg_write = (void *)&r_debug_native_reg_write,

9
libr/debug/reg.c
View File

@ -27,6 +27,10 @@ R_API int r_debug_reg_sync(struct r_debug_t *dbg, int type, int write) {
R_API int r_debug_reg_list(struct r_debug_t *dbg, int type, int size, int rad) {
int n = 0;
struct list_head *pos, *head = r_reg_get_list(dbg->reg, type);
const char *fmt;
if (dbg->h && dbg->h->bits & R_DBG_BIT_64)
fmt = "%s = 0x%016llx\n";
else fmt = "%s = 0x%08llx\n";
//printf("list type=%d size=%d\n", type, size);
list_for_each (pos, head) {
struct r_reg_item_t *item = list_entry (pos, struct r_reg_item_t, list);
@ -35,10 +39,9 @@ R_API int r_debug_reg_list(struct r_debug_t *dbg, int type, int size, int rad) {
continue;
if (size != 0 && size != item->size)
continue;
if (rad) dbg->printf ("f %s @ 0x%08llx\n",
item->name, r_reg_get_value (dbg->reg, item));
else dbg->printf ("%s = 0x%08llx\n",
if (rad) dbg->printf ("f %s @ 0x%llx\n",
item->name, r_reg_get_value (dbg->reg, item));
else dbg->printf (fmt, item->name, r_reg_get_value (dbg->reg, item));
n++;
}
return n;

12
libr/include/r_debug.h
View File

@ -26,6 +26,13 @@ enum {
//..
};
enum {
R_DBG_BIT_8 = 1,
R_DBG_BIT_16 = 2,
R_DBG_BIT_32 = 4,
R_DBG_BIT_64 = 8,
};
/* TODO: move to r_anal */
typedef struct r_debug_frame_t {
ut64 addr;
@ -69,8 +76,9 @@ typedef struct r_debug_t {
/* TODO: pass dbg and user data pointer everywhere */
typedef struct r_debug_handle_t {
const char *name;
const char **archs;
int (*get_arch)();
const char **archs; // MUST BE DEPREACTED!!!!
ut32 bits;
ut32 arch;
/* life */
int (*startv)(int argc, char **argv);
int (*attach)(int pid);