Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-30 18:05:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Better checks in packed register boundaries

Browse Source 
- Support spaces after dr? <reg>
This commit is contained in:
pancake 2015-08-23 04:08:01 +02:00
parent f776f5a515
commit 1c143a3e3b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/core/cmd_debug.c
View File

@ -861,9 +861,11 @@ static void cmd_debug_reg(RCore *core, const char *str) {
break;
case '?':
if (str[1]) {
const char *p = str+1;
ut64 off;
while (IS_WHITESPACE (*p)) p++;
r_debug_reg_sync (core->dbg, -1, 0); //R_REG_TYPE_GPR, R_FALSE);
off = r_debug_reg_get (core->dbg, str+1);
off = r_debug_reg_get (core->dbg, p);
// r = r_reg_get (core->dbg->reg, str+1, 0);
// if (r == NULL) eprintf ("Unknown register (%s)\n", str+1);
r_cons_printf ("0x%08"PFMT64x"\n", off);

23
libr/reg/value.c
View File

@ -129,14 +129,19 @@ R_API HEAP char *r_reg_get_bvalue(RReg *reg, RRegItem *item) {
/* packed registers */
// packbits can be 8, 16, 32 or 64
// result value is always casted into ut64
// TODO: use item->packed_size
R_API ut64 r_reg_get_pack(RReg *reg, RRegItem *item, int packidx, int packbits) {
int packbytes = packbits / 8;
int packmod = packbits % 8;
int packbytes, packmod;
ut64 ret = 0LL;
RRegSet *regset;
int off;
if (!reg || !item)
return 0LL;
if (packbits<1) {
packbits = item->packed_size;
}
packbytes = packbits / 8;
packmod = packbits % 8;
if (packmod) {
eprintf ("Invalid bit size for packet register\n");
return 0LL;
@ -151,17 +156,25 @@ R_API ut64 r_reg_get_pack(RReg *reg, RRegItem *item, int packidx, int packbits)
}
R_API int r_reg_set_pack(RReg *reg, RRegItem *item, int packidx, int packbits, ut64 val) {
int packbytes = packbits / 8;
int packmod = packbits % 8;
int packbytes, packmod;
int off = item->offset;
if (!reg || !item) {
eprintf ("r_reg_set_value: item is NULL\n");
return R_FALSE;
}
if (packbits<1) {
packbits = item->packed_size;
}
packbytes = packbits / 8;
packmod = packbits % 8;
if (packidx * packbits > item->size) {
eprintf ("Packed index is beyond the register size\n");
return R_FALSE;
}
if (packmod) {
eprintf ("Invalid bit size for packet register\n");
return 0LL;
return R_FALSE;
}
if (reg->regset[item->type].arena->size - BITS2BYTES (off) - BITS2BYTES(packbytes) >= 0) {
r_mem_copybits (reg->regset[item->type].arena->bytes+