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

Fixed semantics of type vs definition for ArchOperands

Browse Source
This commit is contained in:
Pierre Pronchery 2011-05-02 01:08:21 +00:00
parent d16f99ebbb
commit 266f4c2682
7 changed files with 208 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Asm/arch.h
View File

@ -116,9 +116,11 @@ typedef enum _ArchOperandType
| ((dsize) << AOD_SIZE) \ | ((dsize) << AOD_SIZE) \
| ((id) << AOD_VALUE)) | ((id) << AOD_VALUE))
typedef uint32_t ArchOperandDefinition;
typedef struct _ArchOperand typedef struct _ArchOperand
{ {
ArchOperandType type; ArchOperandDefinition definition;
union union
{ {
/* AOT_DREGISTER */ /* AOT_DREGISTER */
@ -152,8 +154,6 @@ typedef struct _ArchOperand
} value; } value;
} ArchOperand; } ArchOperand;
typedef uint32_t ArchOperandDefinition;
typedef struct _ArchInstruction typedef struct _ArchInstruction
{ {
char const * name; char const * name;

9
src/arch.c
View File

@ -246,10 +246,11 @@ static int _call_operands(Arch * arch, ArchInstruction * instruction,
#endif #endif
if(AO_GET_TYPE(definition) == AOT_CONSTANT) if(AO_GET_TYPE(definition) == AOT_CONSTANT)
{ {
if(operand->type != AOT_IMMEDIATE) if(AO_GET_TYPE(operand->definition) != AOT_IMMEDIATE)
return -1; return -1;
} }
else if(AO_GET_TYPE(definition) != operand->type) else if(AO_GET_TYPE(definition)
!= AO_GET_TYPE(operand->definition))
return -1; return -1;
switch(AO_GET_TYPE(definition)) switch(AO_GET_TYPE(definition))
{ {
@ -289,8 +290,8 @@ static int _call_operands_constant(ArchOperandDefinition definition,
if(AO_GET_VALUE(definition) != operand->value.immediate.value) if(AO_GET_VALUE(definition) != operand->value.immediate.value)
return -1; return -1;
/* set this operand as a constant */ /* set this operand as a constant */
operand->type &= AOM_TYPE; operand->definition &= AOM_TYPE;
operand->type |= AOT_CONSTANT; operand->definition |= (AOT_CONSTANT << AOD_TYPE);
return 0; return 0;
} }

36
src/arch/dalvik.c
View File

@ -153,9 +153,6 @@ static int _dalvik_decode(ArchPlugin * plugin, ArchInstructionCall * call)
/* FIXME detect end of input */ /* FIXME detect end of input */
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
return -1; return -1;
call->operands[0].type = AOT_NONE;
call->operands[1].type = AOT_NONE;
call->operands[2].type = AOT_NONE;
if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8)) if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8))
== NULL) == NULL)
{ {
@ -163,9 +160,11 @@ static int _dalvik_decode(ArchPlugin * plugin, ArchInstructionCall * call)
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
{ {
call->name = "db"; call->name = "db";
call->operands[0].type = AO_IMMEDIATE(0, 8, 0); call->operands[0].definition = AO_IMMEDIATE(0, 8, 0);
call->operands[0].value.immediate.name = NULL;
call->operands[0].value.immediate.value = u16; call->operands[0].value.immediate.value = u16;
call->operands[0].value.immediate.negative = 0; call->operands[0].value.immediate.negative = 0;
call->operands_cnt = 1;
return 0; return 0;
} }
u16 = _htol16((u16 << 8) | u8); u16 = _htol16((u16 << 8) | u8);
@ -173,18 +172,20 @@ static int _dalvik_decode(ArchPlugin * plugin, ArchInstructionCall * call)
u16)) == NULL) u16)) == NULL)
{ {
call->name = "dw"; call->name = "dw";
call->operands[0].type = AO_IMMEDIATE(0, 16, 0); call->operands[0].definition = AO_IMMEDIATE(0, 16, 0);
call->operands[0].value.immediate.name = NULL;
call->operands[0].value.immediate.value = u16; call->operands[0].value.immediate.value = u16;
call->operands[0].value.immediate.negative = 0; call->operands[0].value.immediate.negative = 0;
call->operands_cnt = 1;
return 0; return 0;
} }
} }
call->name = ai->name; call->name = ai->name;
call->operands[0].type = ai->op1; call->operands[0].definition = ai->op1;
call->operands[1].type = ai->op2; call->operands[1].definition = ai->op2;
call->operands[2].type = ai->op3; call->operands[2].definition = ai->op3;
for(i = 0; i < 3 && AO_GET_TYPE(call->operands[i].type) != AOT_NONE; for(i = 0; i < 3 && AO_GET_TYPE(call->operands[i].definition)
i++) != 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;
@ -201,7 +202,7 @@ static int _decode_immediate(DalvikDecode * dd, size_t i)
AsmFunction * af; AsmFunction * af;
AsmString * as; AsmString * as;
switch(AO_GET_SIZE(ao->type)) switch(AO_GET_SIZE(ao->definition))
{ {
case 4: case 4:
if(dd->u8 >= 0) if(dd->u8 >= 0)
@ -238,7 +239,7 @@ static int _decode_immediate(DalvikDecode * dd, size_t i)
return -error_set_code(1, "%s", "Unsupported immediate" return -error_set_code(1, "%s", "Unsupported immediate"
" operand"); " operand");
} }
switch(AO_GET_VALUE(ao->type)) switch(AO_GET_VALUE(ao->definition))
{ {
case AOI_REFERS_FUNCTION: case AOI_REFERS_FUNCTION:
af = helper->get_function_by_id(helper->arch, af = helper->get_function_by_id(helper->arch,
@ -259,7 +260,7 @@ static int _decode_immediate(DalvikDecode * dd, size_t i)
static int _decode_operand(DalvikDecode * dd, size_t i) static int _decode_operand(DalvikDecode * dd, size_t i)
{ {
switch(AO_GET_TYPE(dd->call->operands[i].type)) switch(AO_GET_TYPE(dd->call->operands[i].definition))
{ {
case AOT_IMMEDIATE: case AOT_IMMEDIATE:
return _decode_immediate(dd, i); return _decode_immediate(dd, i);
@ -275,16 +276,17 @@ static int _decode_operand(DalvikDecode * dd, size_t i)
static int _decode_register(DalvikDecode * dd, size_t i) static int _decode_register(DalvikDecode * dd, size_t i)
{ {
ArchPluginHelper * helper = dd->plugin->helper; ArchPluginHelper * helper = dd->plugin->helper;
ArchOperandDefinition aod = dd->call->operands[i].definition;
uint32_t id; uint32_t id;
uint8_t u8; uint8_t u8;
uint16_t u16; uint16_t u16;
ArchRegister * ar; ArchRegister * ar;
if(AO_GET_FLAGS(dd->call->operands[i].type) & AOF_IMPLICIT) if(AO_GET_FLAGS(aod) & AOF_IMPLICIT)
id = AO_GET_VALUE(dd->call->operands[i].type); id = AO_GET_VALUE(aod);
else if(AO_GET_FLAGS(dd->call->operands[i].type) & AOF_DALVIK_REGSIZE) else if(AO_GET_FLAGS(aod) & AOF_DALVIK_REGSIZE)
{ {
switch(AO_GET_VALUE(dd->call->operands[i].type)) switch(AO_GET_VALUE(aod))
{ {
case 4: case 4:
if(dd->u8 >= 0) if(dd->u8 >= 0)

119
src/arch/i386.h
View File

@ -56,9 +56,6 @@ static int _i386_decode(ArchPlugin * plugin, ArchInstructionCall * call)
/* FIXME detect end of input */ /* FIXME detect end of input */
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
return -1; return -1;
call->operands[0].type = AOT_NONE;
call->operands[1].type = AOT_NONE;
call->operands[2].type = AOT_NONE;
if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8)) if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8))
== NULL) == NULL)
{ {
@ -66,7 +63,8 @@ static int _i386_decode(ArchPlugin * plugin, ArchInstructionCall * call)
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
{ {
call->name = "db"; call->name = "db";
call->operands[0].type = AO_IMMEDIATE(0, 8, 0); call->operands[0].definition = AO_IMMEDIATE(0, 8, 0);
call->operands[0].value.immediate.name = NULL;
call->operands[0].value.immediate.value = u8; call->operands[0].value.immediate.value = u8;
call->operands[0].value.immediate.negative = 0; call->operands[0].value.immediate.negative = 0;
call->operands_cnt = 1; call->operands_cnt = 1;
@ -77,7 +75,8 @@ static int _i386_decode(ArchPlugin * plugin, ArchInstructionCall * call)
u16)) == NULL) u16)) == NULL)
{ {
call->name = "dw"; call->name = "dw";
call->operands[0].type = AO_IMMEDIATE(0, 16, 0); call->operands[0].definition = AO_IMMEDIATE(0, 16, 0);
call->operands[0].value.immediate.name = NULL;
call->operands[0].value.immediate.value = u16; call->operands[0].value.immediate.value = u16;
call->operands[0].value.immediate.negative = 0; call->operands[0].value.immediate.negative = 0;
call->operands_cnt = 1; call->operands_cnt = 1;
@ -85,10 +84,11 @@ static int _i386_decode(ArchPlugin * plugin, ArchInstructionCall * call)
} }
} }
call->name = ai->name; call->name = ai->name;
call->operands[0].type = ai->op1; call->operands[0].definition = ai->op1;
call->operands[1].type = ai->op2; call->operands[1].definition = ai->op2;
call->operands[2].type = ai->op3; call->operands[2].definition = ai->op3;
for(i = 0; i < 3 && AO_GET_TYPE(call->operands[i].type) != 0; i++) for(i = 0; i < 3 && AO_GET_TYPE(call->operands[i].definition)
!= AOT_NONE; i++)
if(_decode_operand(plugin, call, &i) != 0) if(_decode_operand(plugin, call, &i) != 0)
return -1; return -1;
call->operands_cnt = i; call->operands_cnt = i;
@ -98,7 +98,7 @@ static int _i386_decode(ArchPlugin * plugin, ArchInstructionCall * call)
static int _decode_constant(ArchPlugin * plugin, ArchInstructionCall * call, static int _decode_constant(ArchPlugin * plugin, ArchInstructionCall * call,
size_t i) size_t i)
{ {
ArchOperandDefinition aod = call->operands[i].type; ArchOperandDefinition aod = call->operands[i].definition;
ArchOperand * ao = &call->operands[i]; ArchOperand * ao = &call->operands[i];
#ifdef DEBUG #ifdef DEBUG
@ -106,8 +106,10 @@ static int _decode_constant(ArchPlugin * plugin, ArchInstructionCall * call,
#endif #endif
if(AO_GET_FLAGS(aod) & AOF_IMPLICIT) if(AO_GET_FLAGS(aod) & AOF_IMPLICIT)
{ {
ao->type = AO_IMMEDIATE(0, AO_GET_SIZE(aod), 0); ao->definition = AO_IMMEDIATE(0, AO_GET_SIZE(aod), 0);
ao->value.immediate.name = NULL;
ao->value.immediate.value = AO_GET_VALUE(aod); ao->value.immediate.value = AO_GET_VALUE(aod);
ao->value.immediate.negative = 0;
return 0; return 0;
} }
return -error_set_code(1, "%s", "Not implemented"); return -error_set_code(1, "%s", "Not implemented");
@ -117,7 +119,7 @@ static int _decode_dregister(ArchPlugin * plugin, ArchInstructionCall * call,
size_t i) size_t i)
{ {
ArchPluginHelper * helper = plugin->helper; ArchPluginHelper * helper = plugin->helper;
ArchOperandDefinition aod = call->operands[i].type; ArchOperandDefinition aod = call->operands[i].definition;
ArchRegister * ar; ArchRegister * ar;
uint8_t id; uint8_t id;
@ -146,9 +148,10 @@ static int _decode_immediate(ArchPlugin * plugin, ArchInstructionCall * call,
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() size=%u\n", __func__, fprintf(stderr, "DEBUG: %s() size=%u\n", __func__,
AO_GET_SIZE(ao->type) >> 3); AO_GET_SIZE(ao->definition) >> 3);
#endif #endif
switch(AO_GET_SIZE(ao->type) >> 3) ao->value.immediate.name = NULL;
switch(AO_GET_SIZE(ao->definition) >> 3)
{ {
case sizeof(u8): case sizeof(u8):
if(helper->read(helper->arch, &u8, sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8))
@ -180,6 +183,7 @@ static int _decode_modrm(ArchPlugin * plugin, ArchInstructionCall * call,
{ {
int ret = -1; int ret = -1;
ArchPluginHelper * helper = plugin->helper; ArchPluginHelper * helper = plugin->helper;
ArchOperand * ao = call->operands;
ArchOperand * ao1 = &call->operands[*i]; ArchOperand * ao1 = &call->operands[*i];
ArchOperand * ao2 = NULL; ArchOperand * ao2 = NULL;
uint8_t u8; uint8_t u8;
@ -190,9 +194,8 @@ static int _decode_modrm(ArchPlugin * plugin, ArchInstructionCall * call,
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(\"%s\", &%lu)\n", __func__, call->name, *i); fprintf(stderr, "DEBUG: %s(\"%s\", &%lu)\n", __func__, call->name, *i);
#endif #endif
if(*i + 1 < 3 && (AO_GET_TYPE(call->operands[*i + 1].type) if(*i + 1 < 3 && (AO_GET_TYPE(ao[*i + 1].definition) == AOT_REGISTER
== AOT_REGISTER || AO_GET_TYPE(ao[*i + 1].definition)
|| AO_GET_TYPE(call->operands[*i + 1].type)
== AOT_DREGISTER)) == AOT_DREGISTER))
ao2 = &call->operands[*i + 1]; ao2 = &call->operands[*i + 1];
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8)) if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
@ -203,17 +206,17 @@ static int _decode_modrm(ArchPlugin * plugin, ArchInstructionCall * call,
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: u8=0x%02x (%u %u %u)\n", u8, mod, reg, rm); fprintf(stderr, "DEBUG: u8=0x%02x (%u %u %u)\n", u8, mod, reg, rm);
#endif #endif
if(AO_GET_TYPE(ao1->type) == AOT_DREGISTER && ao2 != NULL if(AO_GET_TYPE(ao1->definition) == AOT_DREGISTER && ao2 != NULL
&& AO_GET_TYPE(ao2->type) & AOT_REGISTER && AO_GET_TYPE(ao2->definition) & AOT_REGISTER
&& AO_GET_FLAGS(ao2->type) & AOF_I386_MODRM) && AO_GET_FLAGS(ao2->definition) & AOF_I386_MODRM)
{ {
ret = _decode_modrm_do(plugin, call, (*i)++, ret = _decode_modrm_do(plugin, call, (*i)++,
(mod << 6) | (rm << 3)); (mod << 6) | (rm << 3));
ret |= _decode_modrm_do(plugin, call, *i, ret |= _decode_modrm_do(plugin, call, *i,
(0x3 << 6) | (reg << 3)); (0x3 << 6) | (reg << 3));
} }
else if(AO_GET_TYPE(ao1->type) == AOT_REGISTER && ao2 != NULL else if(AO_GET_TYPE(ao1->definition) == AOT_REGISTER && ao2 != NULL
&& AO_GET_FLAGS(ao2->type) & AOF_I386_MODRM) && AO_GET_FLAGS(ao2->definition) & AOF_I386_MODRM)
{ {
ret = _decode_modrm_do(plugin, call, (*i)++, ret = _decode_modrm_do(plugin, call, (*i)++,
(0x3 << 6) | (reg << 3)); (0x3 << 6) | (reg << 3));
@ -242,14 +245,15 @@ static int _decode_modrm_do(ArchPlugin * plugin, ArchInstructionCall * call,
rm = u8 & 0x7; rm = u8 & 0x7;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: u8=0x%02x (%u %u %u) size=%u\n", fprintf(stderr, "DEBUG: u8=0x%02x (%u %u %u) size=%u\n",
u8, mod, reg, rm, AO_GET_SIZE(ao->type)); u8, mod, reg, rm, AO_GET_SIZE(ao->definition));
#endif #endif
if(mod == 3) if(mod == 3)
{ {
if((ar = helper->get_register_by_id_size(helper->arch, reg, if((ar = helper->get_register_by_id_size(helper->arch, reg,
AO_GET_SIZE(ao->type))) == NULL) AO_GET_SIZE(ao->definition)))
== NULL)
return -1; return -1;
ao->type = AO_REGISTER(0, 32, 0); ao->definition = AO_REGISTER(0, 32, 0);
ao->value._register.name = ar->name; ao->value._register.name = ar->name;
} }
else if(mod == 2) else if(mod == 2)
@ -259,7 +263,7 @@ static int _decode_modrm_do(ArchPlugin * plugin, ArchInstructionCall * call,
return -1; return -1;
if(helper->read(helper->arch, &uW, sizeof(uW)) != sizeof(uW)) if(helper->read(helper->arch, &uW, sizeof(uW)) != sizeof(uW))
return -1; return -1;
ao->type = AO_DREGISTER(0, W, W, 0); ao->definition = AO_DREGISTER(0, W, W, 0);
ao->value.dregister.name = ar->name; ao->value.dregister.name = ar->name;
ao->value.dregister.offset = _htol32(uW); /* XXX _htolW() */ ao->value.dregister.offset = _htol32(uW); /* XXX _htolW() */
} }
@ -268,7 +272,7 @@ static int _decode_modrm_do(ArchPlugin * plugin, ArchInstructionCall * call,
if((ar = helper->get_register_by_id_size(helper->arch, reg, W)) if((ar = helper->get_register_by_id_size(helper->arch, reg, W))
== NULL) == NULL)
return -1; return -1;
ao->type = AO_DREGISTER(0, 8, W, 0); ao->definition = AO_DREGISTER(0, 8, W, 0);
ao->value.dregister.name = ar->name; ao->value.dregister.name = ar->name;
} }
else /* mod == 0 */ else /* mod == 0 */
@ -280,13 +284,13 @@ static int _decode_modrm_do(ArchPlugin * plugin, ArchInstructionCall * call,
!= sizeof(uW)) != sizeof(uW))
return -1; return -1;
/* FIXME endian */ /* FIXME endian */
ao->type = AO_IMMEDIATE(0, W, 0); ao->definition = AO_IMMEDIATE(0, W, 0);
ao->value.immediate.value = uW; ao->value.immediate.value = uW;
} }
else if((ar = helper->get_register_by_id_size(helper->arch, reg, else if((ar = helper->get_register_by_id_size(helper->arch, reg,
W)) != NULL) W)) != NULL)
{ {
ao->type = AO_DREGISTER(0, 0, W, 0); ao->definition = AO_DREGISTER(0, 0, W, 0);
ao->value.dregister.name = ar->name; ao->value.dregister.name = ar->name;
} }
else else
@ -300,18 +304,18 @@ static int _decode_operand(ArchPlugin * plugin, ArchInstructionCall * call,
{ {
ArchOperand * ao = &call->operands[*i]; ArchOperand * ao = &call->operands[*i];
switch(AO_GET_TYPE(ao->type)) switch(AO_GET_TYPE(ao->definition))
{ {
case AOT_CONSTANT: case AOT_CONSTANT:
return _decode_constant(plugin, call, *i); return _decode_constant(plugin, call, *i);
case AOT_DREGISTER: case AOT_DREGISTER:
if(AO_GET_FLAGS(ao->type) & AOF_I386_MODRM) if(AO_GET_FLAGS(ao->definition) & AOF_I386_MODRM)
return _decode_modrm(plugin, call, i); return _decode_modrm(plugin, call, i);
return _decode_dregister(plugin, call, *i); return _decode_dregister(plugin, call, *i);
case AOT_IMMEDIATE: case AOT_IMMEDIATE:
return _decode_immediate(plugin, call, *i); return _decode_immediate(plugin, call, *i);
case AOT_REGISTER: case AOT_REGISTER:
if(AO_GET_FLAGS(ao->type) & AOF_I386_MODRM) if(AO_GET_FLAGS(ao->definition) & AOF_I386_MODRM)
return _decode_modrm(plugin, call, i); return _decode_modrm(plugin, call, i);
return _decode_register(plugin, call, *i); return _decode_register(plugin, call, *i);
} }
@ -322,7 +326,7 @@ static int _decode_register(ArchPlugin * plugin, ArchInstructionCall * call,
size_t i) size_t i)
{ {
ArchPluginHelper * helper = plugin->helper; ArchPluginHelper * helper = plugin->helper;
ArchOperandDefinition aod = call->operands[i].type; ArchOperandDefinition aod = call->operands[i].definition;
ArchRegister * ar; ArchRegister * ar;
uint8_t id; uint8_t id;
@ -354,8 +358,7 @@ static int _write_constant(ArchPlugin * plugin,
ArchOperandDefinition definition, ArchOperand * operand); ArchOperandDefinition definition, ArchOperand * operand);
static int _write_dregister(ArchPlugin * plugin, uint32_t * i, static int _write_dregister(ArchPlugin * plugin, uint32_t * i,
ArchOperandDefinition * definitions, ArchOperand * operands); ArchOperandDefinition * definitions, ArchOperand * operands);
static int _write_immediate(ArchPlugin * plugin, static int _write_immediate(ArchPlugin * plugin, ArchOperand * operand);
ArchOperandDefinition definition, ArchOperand * operand);
static int _write_immediate8(ArchPlugin * plugin, uint8_t value); static int _write_immediate8(ArchPlugin * plugin, uint8_t value);
static int _write_immediate16(ArchPlugin * plugin, uint16_t value); static int _write_immediate16(ArchPlugin * plugin, uint16_t value);
static int _write_immediate24(ArchPlugin * plugin, uint32_t value); static int _write_immediate24(ArchPlugin * plugin, uint32_t value);
@ -389,10 +392,13 @@ static int _i386_write(ArchPlugin * plugin, ArchInstruction * instruction,
static int _write_constant(ArchPlugin * plugin, static int _write_constant(ArchPlugin * plugin,
ArchOperandDefinition definition, ArchOperand * operand) ArchOperandDefinition definition, ArchOperand * operand)
{ {
ArchOperand ao;
if(AO_GET_FLAGS(definition) & AOF_IMPLICIT) if(AO_GET_FLAGS(definition) & AOF_IMPLICIT)
return 0; return 0;
definition &= ~(AOM_FLAGS); ao = *operand;
return _write_immediate(plugin, definition, operand); ao.definition &= ~(AOM_FLAGS);
return _write_immediate(plugin, &ao);
} }
static int _write_dregister(ArchPlugin * plugin, uint32_t * i, static int _write_dregister(ArchPlugin * plugin, uint32_t * i,
@ -404,16 +410,14 @@ static int _write_dregister(ArchPlugin * plugin, uint32_t * i,
char const * name = operand->value._register.name; char const * name = operand->value._register.name;
size_t size = AO_GET_SIZE(definition); size_t size = AO_GET_SIZE(definition);
ArchRegister * ar; ArchRegister * ar;
ArchOperandDefinition idefinition;
ArchOperand ioperand; ArchOperand ioperand;
if((ar = helper->get_register_by_name_size(helper->arch, name, size)) if((ar = helper->get_register_by_name_size(helper->arch, name, size))
== NULL) == NULL)
return -1; return -1;
/* write register */ /* write register */
idefinition = AO_IMMEDIATE(0, 8, 0);
memset(&ioperand, 0, sizeof(ioperand)); memset(&ioperand, 0, sizeof(ioperand));
ioperand.type = AOT_IMMEDIATE; ioperand.definition = AO_IMMEDIATE(0, 8, 0);
/* FIXME some combinations of register values are illegal */ /* FIXME some combinations of register values are illegal */
ioperand.value.immediate.value = ar->id; ioperand.value.immediate.value = ar->id;
if(AO_GET_FLAGS(definition) & AOF_I386_MODRM if(AO_GET_FLAGS(definition) & AOF_I386_MODRM
@ -433,7 +437,7 @@ static int _write_dregister(ArchPlugin * plugin, uint32_t * i,
<< 3); << 3);
if(operand->value.dregister.offset == 0) if(operand->value.dregister.offset == 0)
/* there is no offset */ /* there is no offset */
return _write_immediate(plugin, idefinition, &ioperand); return _write_immediate(plugin, &ioperand);
/* declare offset */ /* declare offset */
switch(AO_GET_OFFSET(definition) >> 3) switch(AO_GET_OFFSET(definition) >> 3)
{ {
@ -446,23 +450,22 @@ static int _write_dregister(ArchPlugin * plugin, uint32_t * i,
default: default:
return -error_set_code(1, "%s", "Invalid offset"); return -error_set_code(1, "%s", "Invalid offset");
} }
if(_write_immediate(plugin, idefinition, &ioperand) != 0) if(_write_immediate(plugin, &ioperand) != 0)
return -1; return -1;
/* write offset */ /* write offset */
idefinition = AO_IMMEDIATE(0, AO_GET_OFFSET(definition), 0); ioperand.definition = AO_IMMEDIATE(0, AO_GET_OFFSET(definition), 0);
ioperand.value.immediate.value = operand->value.dregister.offset; ioperand.value.immediate.value = operand->value.dregister.offset;
return _write_immediate(plugin, idefinition, &ioperand); return _write_immediate(plugin, &ioperand);
} }
static int _write_immediate(ArchPlugin * plugin, static int _write_immediate(ArchPlugin * plugin, ArchOperand * operand)
ArchOperandDefinition definition, ArchOperand * operand)
{ {
uint64_t value = operand->value.immediate.value; uint64_t value = operand->value.immediate.value;
if((AO_GET_FLAGS(definition) & AOF_SIGNED) if((AO_GET_FLAGS(operand->definition) & AOF_SIGNED)
&& operand->value.immediate.negative != 0) && operand->value.immediate.negative != 0)
value = -value; value = -value; /* XXX check */
switch(AO_GET_SIZE(definition) >> 3) switch(AO_GET_SIZE(operand->definition) >> 3)
{ {
case 0: case 0:
return 0; return 0;
@ -475,7 +478,7 @@ static int _write_immediate(ArchPlugin * plugin,
case sizeof(uint32_t): case sizeof(uint32_t):
return _write_immediate32(plugin, value); return _write_immediate32(plugin, value);
} }
return -error_set_code(1, "Invalid size"); return -error_set_code(1, "%s", "Invalid size");
} }
static int _write_immediate8(ArchPlugin * plugin, uint8_t value) static int _write_immediate8(ArchPlugin * plugin, uint8_t value)
@ -526,7 +529,8 @@ static int _write_opcode(ArchPlugin * plugin, ArchInstruction * instruction)
AO_GET_SIZE(instruction->flags), instruction->opcode); AO_GET_SIZE(instruction->flags), instruction->opcode);
#endif #endif
memset(&operand, 0, sizeof(operand)); memset(&operand, 0, sizeof(operand));
operand.type = AOT_IMMEDIATE; operand.definition = AO_IMMEDIATE(0, AO_GET_SIZE(instruction->flags),
0);
switch(AO_GET_SIZE(instruction->flags) >> 3) switch(AO_GET_SIZE(instruction->flags) >> 3)
{ {
case sizeof(uint8_t): case sizeof(uint8_t):
@ -544,13 +548,13 @@ static int _write_opcode(ArchPlugin * plugin, ArchInstruction * instruction)
default: default:
return -error_set_code(1, "%s", "Invalid size"); return -error_set_code(1, "%s", "Invalid size");
} }
return _write_immediate(plugin, instruction->flags, &operand); return _write_immediate(plugin, &operand);
} }
static int _write_operand(ArchPlugin * plugin, uint32_t * i, static int _write_operand(ArchPlugin * plugin, uint32_t * i,
ArchOperandDefinition * definitions, ArchOperand * operands) ArchOperandDefinition * definitions, ArchOperand * operands)
{ {
switch(operands[*i].type) switch(operands[*i].definition)
{ {
case AOT_CONSTANT: case AOT_CONSTANT:
return _write_constant(plugin, definitions[*i], return _write_constant(plugin, definitions[*i],
@ -559,8 +563,7 @@ static int _write_operand(ArchPlugin * plugin, uint32_t * i,
return _write_dregister(plugin, i, definitions, return _write_dregister(plugin, i, definitions,
operands); operands);
case AOT_IMMEDIATE: case AOT_IMMEDIATE:
return _write_immediate(plugin, definitions[*i], return _write_immediate(plugin, &operands[*i]);
&operands[*i]);
case AOT_REGISTER: case AOT_REGISTER:
return _write_register(plugin, i, definitions, return _write_register(plugin, i, definitions,
operands); operands);
@ -581,7 +584,6 @@ static int _write_register(ArchPlugin * plugin, uint32_t * i,
char const * name = operand->value._register.name; char const * name = operand->value._register.name;
size_t size = AO_GET_SIZE(definition); size_t size = AO_GET_SIZE(definition);
ArchRegister * ar; ArchRegister * ar;
ArchOperandDefinition idefinition;
ArchOperand ioperand; ArchOperand ioperand;
if(AO_GET_FLAGS(definition) & AOF_IMPLICIT) if(AO_GET_FLAGS(definition) & AOF_IMPLICIT)
@ -590,9 +592,8 @@ static int _write_register(ArchPlugin * plugin, uint32_t * i,
== NULL) == NULL)
return -1; return -1;
/* write register */ /* write register */
idefinition = AO_IMMEDIATE(0, 8, 0);
memset(&ioperand, 0, sizeof(ioperand)); memset(&ioperand, 0, sizeof(ioperand));
ioperand.type = AOT_IMMEDIATE; ioperand.definition = AO_IMMEDIATE(0, 8, 0);
ioperand.value.immediate.value = ar->id; ioperand.value.immediate.value = ar->id;
if(AO_GET_FLAGS(definition) & AOF_I386_MODRM if(AO_GET_FLAGS(definition) & AOF_I386_MODRM
&& AO_GET_VALUE(definition) == 8) /* mod r/m, /r */ && AO_GET_VALUE(definition) == 8) /* mod r/m, /r */
@ -611,5 +612,5 @@ static int _write_register(ArchPlugin * plugin, uint32_t * i,
| (AO_GET_VALUE(definition) << 3); | (AO_GET_VALUE(definition) << 3);
else else
ioperand.value.immediate.value = ar->id; ioperand.value.immediate.value = ar->id;
return _write_immediate(plugin, idefinition, &ioperand); return _write_immediate(plugin, &ioperand);
} }

109
src/arch/java.c
View File

@ -250,6 +250,7 @@ static ArchInstruction _java_instructions[] =
/* plug-in */ /* plug-in */
static int _java_write(ArchPlugin * plugin, ArchInstruction * instruction, static int _java_write(ArchPlugin * plugin, ArchInstruction * instruction,
ArchInstructionCall * call); ArchInstructionCall * call);
static int _java_decode(ArchPlugin * plugin, ArchInstructionCall * call);
/* public */ /* public */
@ -262,7 +263,7 @@ ArchPlugin arch_plugin =
_java_registers, _java_registers,
_java_instructions, _java_instructions,
_java_write, _java_write,
NULL _java_decode
}; };
@ -273,8 +274,108 @@ static int _java_write(ArchPlugin * plugin, ArchInstruction * instruction,
ArchInstructionCall * call) ArchInstructionCall * call)
{ {
ArchPluginHelper * helper = plugin->helper; ArchPluginHelper * helper = plugin->helper;
size_t i;
ArchOperandDefinition definitions[3];
ArchOperand * ao;
uint8_t u8;
uint16_t u16;
uint32_t u32;
/* FIXME really implement */ if((helper->write(helper->arch, &instruction->opcode, 1)) != 1)
return (helper->write(helper->arch, &instruction->opcode, 1) == 1) return -1;
? 0 : -1; definitions[0] = instruction->op1;
definitions[1] = instruction->op2;
definitions[2] = instruction->op3;
for(i = 0; i < call->operands_cnt; i++)
{
ao = &call->operands[i];
if(AO_GET_TYPE(ao->definition) != AOT_IMMEDIATE)
return -error_set_code(1, "%s", "Not implemented");
if(AO_GET_SIZE(definitions[i]) == 8)
{
u8 = ao->value.immediate.value;
if(helper->write(helper->arch, &u8, 1) != 1)
return -1;
}
else if(AO_GET_SIZE(definitions[i]) == 16)
{
u16 = _htob16(ao->value.immediate.value);
if(helper->write(helper->arch, &u16, 2) != 2)
return -1;
}
else if(AO_GET_SIZE(definitions[i]) == 32)
{
u32 = _htob32(ao->value.immediate.value);
if(helper->write(helper->arch, &u32, 4) != 4)
return -1;
}
else
return -error_set_code(1, "%s", "Size not implemented");
}
return 0;
}
/* java_decode */
static int _java_decode(ArchPlugin * plugin, ArchInstructionCall * call)
{
ArchPluginHelper * helper = plugin->helper;
uint8_t u8;
ArchInstruction * ai;
size_t i;
ArchOperand * ao;
uint16_t u16;
uint32_t u32;
if(helper->read(helper->arch, &u8, sizeof(u8)) != sizeof(u8))
return -1;
if((ai = helper->get_instruction_by_opcode(helper->arch, 8, u8))
== NULL)
{
call->name = "db";
call->operands[0].definition = AO_IMMEDIATE(0, 8, 0);
call->operands[0].value.immediate.name = NULL;
call->operands[0].value.immediate.value = u8;
call->operands[0].value.immediate.negative = 0;
call->operands_cnt = 1;
return 0;
}
call->name = ai->name;
call->operands[0].definition = ai->op1;
call->operands[1].definition = ai->op2;
call->operands[2].definition = ai->op3;
for(i = 0; i < 3 && AO_GET_TYPE(call->operands[i].definition)
!= AOT_NONE; i++)
{
ao = &call->operands[i];
if(AO_GET_TYPE(ao->definition) != AOT_IMMEDIATE)
/* XXX should there be more types? */
return -error_set_code(1, "%s", "Not implemented");
if(AO_GET_SIZE(ao->definition) == 8)
{
if(helper->read(helper->arch, &u8, 1) != 1)
return -1;
ao->value.immediate.value = u8;
}
else if(AO_GET_SIZE(ao->definition) == 16)
{
if(helper->read(helper->arch, &u16, 2) != 2)
return -1;
u16 = _htob16(u16);
ao->value.immediate.value = u16;
}
else if(AO_GET_SIZE(ao->definition) == 32)
{
if(helper->read(helper->arch, &u32, 4) != 4)
return -1;
u32 = _htob32(u32);
ao->value.immediate.value = u32;
}
else
return -error_set_code(1, "%s", "Size not implemented");
ao->value.immediate.name = NULL;
ao->value.immediate.negative = 0;
}
call->operands_cnt = i;
return 0;
} }

13
src/code.c
View File

@ -113,6 +113,7 @@ Code * code_new_file(char const * arch, char const * format,
return NULL; return NULL;
} }
memset(code, 0, sizeof(*code)); memset(code, 0, sizeof(*code));
code->filename = string_new(filename);
if(format == NULL) if(format == NULL)
code->format = _new_file_format(filename, fp); code->format = _new_file_format(filename, fp);
else if((code->format = format_new(format)) != NULL else if((code->format = format_new(format)) != NULL
@ -129,7 +130,7 @@ Code * code_new_file(char const * arch, char const * format,
arch_delete(code->arch); arch_delete(code->arch);
code->arch = NULL; code->arch = NULL;
} }
if(code->arch == NULL || code->format == NULL) if(code->filename == NULL || code->arch == NULL || code->format == NULL)
{ {
code_delete(code); code_delete(code);
return NULL; return NULL;
@ -286,6 +287,8 @@ int code_close(Code * code)
/* code_decode */ /* code_decode */
int code_decode(Code * code) int code_decode(Code * code)
{ {
printf("%s: %s-%s\n", code->filename, format_get_name(code->format),
arch_get_name(code->arch));
return format_decode(code->format, code); return format_decode(code->format, code);
} }
@ -408,7 +411,7 @@ int code_print(Code * code, ArchInstructionCall * call)
{ {
ao = &call->operands[i]; ao = &call->operands[i];
fputs(sep, stdout); fputs(sep, stdout);
switch(AO_GET_TYPE(ao->type)) switch(AO_GET_TYPE(ao->definition))
{ {
case AOT_DREGISTER: case AOT_DREGISTER:
name = ao->value.dregister.name; name = ao->value.dregister.name;
@ -443,14 +446,14 @@ static void _print_immediate(ArchOperand * ao)
{ {
printf("%s$0x%lx", ao->value.immediate.negative ? "-" : "", printf("%s$0x%lx", ao->value.immediate.negative ? "-" : "",
ao->value.immediate.value); ao->value.immediate.value);
if(AO_GET_VALUE(ao->type) == AOI_REFERS_STRING) if(AO_GET_VALUE(ao->definition) == AOI_REFERS_STRING)
{ {
if(ao->value.immediate.name != NULL) if(ao->value.immediate.name != NULL)
printf(" \"%s\"", ao->value.immediate.name); printf(" \"%s\"", ao->value.immediate.name);
else else
printf("%s", " (string)"); printf("%s", " (string)");
} }
else if(AO_GET_VALUE(ao->type) == AOI_REFERS_FUNCTION) else if(AO_GET_VALUE(ao->definition) == AOI_REFERS_FUNCTION)
{ {
if(ao->value.immediate.name != NULL) if(ao->value.immediate.name != NULL)
printf(" call \"%s\"", ao->value.immediate.name); printf(" call \"%s\"", ao->value.immediate.name);
@ -508,7 +511,7 @@ static int _code_string_set(CodeString * codestring, int id, char const * name,
{ {
char * p = NULL; char * p = NULL;
if(name != NULL && (p = strdup(name)) == NULL) if(name != NULL && (p = string_new(name)) == NULL)
return -error_set_code(1, "%s", strerror(errno)); return -error_set_code(1, "%s", strerror(errno));
codestring->id = id; codestring->id = id;
free(codestring->name); free(codestring->name);

13
src/parser.c
View File

@ -493,7 +493,7 @@ static int _operand(State * state)
string = token_get_string(state->token); string = token_get_string(state->token);
if(string == NULL) if(string == NULL)
break; break;
p->type = AOT_IMMEDIATE; p->definition = AO_IMMEDIATE(0, 0, 0);
/* FIXME also true for numbers? */ /* FIXME also true for numbers? */
p->value.immediate.value = strtoul(string + 1, p->value.immediate.value = strtoul(string + 1,
NULL, 0); NULL, 0);
@ -501,14 +501,16 @@ static int _operand(State * state)
break; break;
case AS_CODE_IMMEDIATE: case AS_CODE_IMMEDIATE:
case AS_CODE_NUMBER: case AS_CODE_NUMBER:
p->type = AOT_IMMEDIATE; p->definition = AO_IMMEDIATE(0, 0, 0);
/* FIXME also true for numbers? */ /* FIXME also true for numbers? */
p->value.immediate.value = strtoul(string + 1, p->value.immediate.value = strtoul(string + 1,
NULL, 0); NULL, 0);
break; break;
case AS_CODE_REGISTER: case AS_CODE_REGISTER:
p->type = (code == AS_CODE_OPERATOR_LBRACKET) p->definition = (code
? AOT_DREGISTER : AOT_REGISTER; == AS_CODE_OPERATOR_LBRACKET)
? AO_DREGISTER(0, 0, 0, 0)
: AO_REGISTER(0, 0, 0);
/* FIXME check errors */ /* FIXME check errors */
p->value._register.name = strdup(string); p->value._register.name = strdup(string);
break; break;
@ -544,7 +546,8 @@ static int _operand(State * state)
break; break;
case AS_CODE_REGISTER: case AS_CODE_REGISTER:
/* FIXME check everything... */ /* FIXME check everything... */
p->type = AOT_DREGISTER2; p->definition = AO_DREGISTER2(0, 0, 0,
0);
p->value.dregister2.name2 = strdup( p->value.dregister2.name2 = strdup(
string); string);
break; break;