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

Improving ARM support

Browse Source
This commit is contained in:
Pierre Pronchery 2011-06-14 23:10:08 +00:00
parent a88be030a1
commit 0b81e9475d
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/arch/arm.h
View File

@ -39,6 +39,11 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
switch(instruction->opcode & 0x0fffffff) /* ignore condition code */ switch(instruction->opcode & 0x0fffffff) /* ignore condition code */
{ {
/* branch, branch with link */
case OPB(0):
case OPBL(0):
opcode |= call->operands[0].value.immediate.value;
break;
/* branch and exchange */ /* branch and exchange */
case OPBX(0): case OPBX(0):
/* first operand, Rn */ /* first operand, Rn */
@ -195,6 +200,23 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
/* second operand */ /* second operand */
opcode |= call->operands[1].value.immediate.value; opcode |= call->operands[1].value.immediate.value;
break; break;
/* psr transfer */
case OPPT(0):
/* first operand, Rd */
p = call->operands[0].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch,
p, 32)) == NULL)
return -1;
opcode |= (ar->id << 12);
break;
case OPPTI(0):
/* second operand, Rm */
p = call->operands[1].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch,
p, 32)) == NULL)
return -1;
opcode |= ar->id;
break;
#if 1 /* FIXME really implement */ #if 1 /* FIXME really implement */
default: default:
break; break;

14
test/arm.S
View File

@ -81,13 +81,13 @@
mrc %r0, %r0, %r0 mrc %r0, %r0, %r0
mrceq %r0, %r0, %r0 mrceq %r0, %r0, %r0
mrs %r0, %cpsr mrs %r0, %cpsr
mrseq %r0, %cpsr mrseq %r1, %cpsr
mrs %r0, %spsr mrs %r2, %spsr
mrseq %r0, %spsr mrseq %r3, %spsr
msr %cpsr, %r0 msr %cpsr, %r4
msreq %cpsr, %r1 msreq %cpsr, %r5
msr %spsr, %r0 msr %spsr, %r6
msreq %spsr, %r1 msreq %spsr, %r7
mul %r0, %r1, %r2 mul %r0, %r1, %r2
muls %r0, %r1, %r2 muls %r0, %r1, %r2
mvn %r5, %r4 mvn %r5, %r4