DeforaOS/Asm
DeforaOS/Asm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improving Dalvik again

Browse Source
This commit is contained in:
Pierre Pronchery 2011-04-24 03:10:53 +00:00
parent 85fcaa2e01
commit 79e248b195
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/arch/dalvik.c
View File

@ -159,21 +159,31 @@ static int _dalvik_decode(ArchPlugin * plugin, ArchInstructionCall * call)
if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8)) if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8))
== NULL) == NULL)
{ {
u16 = u8 << 8; u16 = u8;
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
/* FIXME return "db" */ {
return -1; call->name = "db";
u16 = _htol16(u16 | u8); call->operands[0].type = AO_IMMEDIATE(0, 0, 8);
call->operands[0].value.immediate.value = u16;
call->operands[0].value.immediate.negative = 0;
return 0;
}
u16 = _htol16((u16 << 8) | u8);
if((ai = helper->get_instruction_by_opcode(helper->arch, 16, if((ai = helper->get_instruction_by_opcode(helper->arch, 16,
u16)) == NULL) u16)) == NULL)
/* FIXME return "dw" */ {
return -1; call->name = "dw";
call->operands[0].type = AO_IMMEDIATE(0, 0, 16);
call->operands[0].value.immediate.value = u16;
call->operands[0].value.immediate.negative = 0;
return 0;
}
} }
call->name = ai->name; call->name = ai->name;
call->operands[0].type = ai->op1; call->operands[0].type = ai->op1;
call->operands[1].type = ai->op2; call->operands[1].type = ai->op2;
call->operands[2].type = ai->op3; call->operands[2].type = ai->op3;
for(i = 0; AO_GET_TYPE(call->operands[i].type) != 0; i++) for(i = 0; AO_GET_TYPE(call->operands[i].type) != AOT_NONE; i++)
if(_decode_operand(&dd, i) != 0) if(_decode_operand(&dd, i) != 0)
return -1; return -1;
call->operands_cnt = i; call->operands_cnt = i;
@ -285,11 +295,15 @@ static int _decode_register(DalvikDecode * dd, size_t i)
return -1; return -1;
} }
} }
else
return -error_set_code(1, "%s", "Unsupported register operand");
if(id >= 256)
/* FIXME give the real name instead */
dd->call->operands[i].value._register.name = ">256";
else if((ar = helper->get_register_by_id_size(helper->arch, id, 32))
!= NULL)
dd->call->operands[i].value._register.name = ar->name;
else else
return -1; return -1;
/* FIXME it could be a register above 256... */
if((ar = helper->get_register_by_id_size(helper->arch, id, 32)) == NULL)
return -1;
dd->call->operands[i].value._register.name = ar->name;
return 0; return 0;
} }