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

Better encoding and decoding of Yasep instructions

Browse Source
This commit is contained in:
Pierre Pronchery 2011-11-28 02:22:48 +00:00
parent 8d57663795
commit ff1bd3b657
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/arch/yasep.c
View File

@ -83,11 +83,28 @@ static int _encode_16(ArchPlugin * plugin, ArchInstruction * instruction,
ArchInstructionCall * call) ArchInstructionCall * call)
{ {
ArchPluginHelper * helper = plugin->helper; ArchPluginHelper * helper = plugin->helper;
uint16_t opcode = instruction->opcode; uint16_t u16 = instruction->opcode;
ArchRegister * ar;
size_t size;
char const * name;
opcode = _htob16(opcode); if((instruction->opcode & 0x03) == 0x0) /* RR */
if(helper->write(helper->arch, &opcode, sizeof(opcode)) {
!= sizeof(opcode)) name = call->operands[0].value._register.name;
size = AO_GET_SIZE(instruction->op1);
if((ar = helper->get_register_by_name_size(helper->arch, name,
size)) == NULL)
return -1;
u16 |= ar->id << 12;
name = call->operands[1].value._register.name;
size = AO_GET_SIZE(instruction->op2);
if((ar = helper->get_register_by_name_size(helper->arch, name,
size)) == NULL)
return -1;
u16 |= ar->id << 8;
}
u16 = _htob16(u16);
if(helper->write(helper->arch, &u16, sizeof(u16)) != sizeof(u16))
return -1; return -1;
return 0; return 0;
} }
@ -113,6 +130,7 @@ static int _yasep_decode(ArchPlugin * plugin, ArchInstructionCall * call)
uint16_t u16; uint16_t u16;
uint16_t opcode; uint16_t opcode;
ArchInstruction * ai; ArchInstruction * ai;
ArchRegister * ar;
if(helper->read(helper->arch, &u16, sizeof(u16)) != sizeof(u16)) if(helper->read(helper->arch, &u16, sizeof(u16)) != sizeof(u16))
return -1; return -1;
@ -122,5 +140,21 @@ static int _yasep_decode(ArchPlugin * plugin, ArchInstructionCall * call)
== NULL) == NULL)
return -1; return -1;
call->name = ai->name; call->name = ai->name;
if((opcode & 0x3) == 0x0) /* RR */
{
call->operands[0].definition = ai->op1;
if((ar = helper->get_register_by_id_size(helper->arch,
((u16 & 0xf000) >> 12) & 0xf,
AO_GET_SIZE(ai->op1))) == NULL)
return -1;
call->operands[0].value._register.name = ar->name;
call->operands[1].definition = ai->op2;
if((ar = helper->get_register_by_id_size(helper->arch,
((u16 & 0x0f00) >> 8) & 0xf,
AO_GET_SIZE(ai->op2))) == NULL)
return -1;
call->operands[1].value._register.name = ar->name;
call->operands_cnt = 2;
}
return 0; return 0;
} }

4
src/arch/yasep.ins
View File

@ -17,8 +17,8 @@
/* generic */ /* generic */
/* opcode */ /* opcode */
#define OPIR(opcode) (opcode << 2) #define OPIR(opcode) ((opcode << 2) | 0x2)
#define OPRR(opcode) ((opcode << 2) | 0x2) #define OPRR(opcode) (opcode << 2)
#define OPIRL(opcode) ((opcode << 2) | 0x1) #define OPIRL(opcode) ((opcode << 2) | 0x1)
#define OPRRL(opcode) ((opcode << 2) | 0x3) #define OPRRL(opcode) ((opcode << 2) | 0x3)
/* flags */ /* flags */

4
test/yasep.S
View File

@ -1,8 +1,8 @@
/* $Id$ */ /* $Id$ */
.text .text
add %r0, %r1 add %r0, %r1
and %r0, %r1 and %r2, %r3
andn %r0, %r1 andn %r4, %r5
cmps %r0, %r1 cmps %r0, %r1
cmpu %r0, %r1 cmpu %r0, %r1
get %r0, %r1 get %r0, %r1