Code cleanup

This commit is contained in:
Pierre Pronchery 2011-06-14 22:42:53 +00:00
parent b2120b5582
commit 281dd9d9c4

View File

@ -39,26 +39,27 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
switch(instruction->opcode & 0x0fffffff) /* ignore condition code */ switch(instruction->opcode & 0x0fffffff) /* ignore condition code */
{ {
case and: /* data processing */
case eor: case OPDP(0, and):
case sub: case OPDP(0, eor):
case rsb: case OPDP(0, sub):
case add: case OPDP(0, rsb):
case adc: case OPDP(0, add):
case sbc: case OPDP(0, adc):
case rsc: case OPDP(0, sbc):
case orr: case OPDP(0, rsc):
case bic: case OPDP(0, orr):
case and | (0x1 << 20): /* ands */ case OPDP(0, bic):
case eor | (0x1 << 20): /* eors */ case OPDPS(0, and): /* ands */
case sub | (0x1 << 20): /* subs */ case OPDPS(0, eor): /* eors */
case rsb | (0x1 << 20): /* rsbs */ case OPDPS(0, sub): /* subs */
case add | (0x1 << 20): /* adds */ case OPDPS(0, rsb): /* rsbs */
case adc | (0x1 << 20): /* adcs */ case OPDPS(0, add): /* adds */
case sbc | (0x1 << 20): /* sbcs */ case OPDPS(0, adc): /* adcs */
case rsc | (0x1 << 20): /* rscs */ case OPDPS(0, sbc): /* sbcs */
case orr | (0x1 << 20): /* orrs */ case OPDPS(0, rsc): /* rscs */
case bic | (0x1 << 20): /* bics */ case OPDPS(0, orr): /* orrs */
case OPDPS(0, bic): /* bics */
/* first operand, Rd */ /* first operand, Rd */
p = call->operands[0].value._register.name; p = call->operands[0].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch, if((ar = helper->get_register_by_name_size(helper->arch,
@ -78,26 +79,26 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
return -1; return -1;
opcode |= ar->id; opcode |= ar->id;
break; break;
case and | (0x1 << 25): case OPDPI(0, and):
case eor | (0x1 << 25): case OPDPI(0, eor):
case sub | (0x1 << 25): case OPDPI(0, sub):
case rsb | (0x1 << 25): case OPDPI(0, rsb):
case add | (0x1 << 25): case OPDPI(0, add):
case adc | (0x1 << 25): case OPDPI(0, adc):
case sbc | (0x1 << 25): case OPDPI(0, sbc):
case rsc | (0x1 << 25): case OPDPI(0, rsc):
case orr | (0x1 << 25): case OPDPI(0, orr):
case bic | (0x1 << 25): case OPDPI(0, bic):
case and | (0x1 << 25) | (0x1 << 20): /* ands (immediate) */ case OPDPIS(0, and): /* ands (immediate) */
case eor | (0x1 << 25) | (0x1 << 20): /* eors (immediate) */ case OPDPIS(0, eor): /* eors (immediate) */
case sub | (0x1 << 25) | (0x1 << 20): /* subs (immediate) */ case OPDPIS(0, sub): /* subs (immediate) */
case rsb | (0x1 << 25) | (0x1 << 20): /* rsbs (immediate) */ case OPDPIS(0, rsb): /* rsbs (immediate) */
case add | (0x1 << 25) | (0x1 << 20): /* adds (immediate) */ case OPDPIS(0, add): /* adds (immediate) */
case adc | (0x1 << 25) | (0x1 << 20): /* adcs (immediate) */ case OPDPIS(0, adc): /* adcs (immediate) */
case sbc | (0x1 << 25) | (0x1 << 20): /* sbcs (immediate) */ case OPDPIS(0, sbc): /* sbcs (immediate) */
case rsc | (0x1 << 25) | (0x1 << 20): /* rscs (immediate) */ case OPDPIS(0, rsc): /* rscs (immediate) */
case orr | (0x1 << 25) | (0x1 << 20): /* orrs (immediate) */ case OPDPIS(0, orr): /* orrs (immediate) */
case bic | (0x1 << 25) | (0x1 << 20): /* bics (immediate) */ case OPDPIS(0, bic): /* bics (immediate) */
/* first operand, Rd */ /* first operand, Rd */
p = call->operands[0].value._register.name; p = call->operands[0].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch, if((ar = helper->get_register_by_name_size(helper->arch,
@ -113,14 +114,14 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
/* third operand */ /* third operand */
opcode |= call->operands[2].value.immediate.value; opcode |= call->operands[2].value.immediate.value;
break; break;
case tst: case OPDP(0, tst):
case teq: case OPDP(0, teq):
case cmp: case OPDP(0, cmp):
case cmn: case OPDP(0, cmn):
case tst | (0x1 << 20): /* tsts */ case OPDPS(0, tst): /* tsts */
case teq | (0x1 << 20): /* teqs */ case OPDPS(0, teq): /* teqs */
case cmp | (0x1 << 20): /* cmps */ case OPDPS(0, cmp): /* cmps */
case cmn | (0x1 << 20): /* cmns */ case OPDPS(0, cmn): /* cmns */
/* first operand, Rn */ /* first operand, Rn */
p = call->operands[0].value._register.name; p = call->operands[0].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch, if((ar = helper->get_register_by_name_size(helper->arch,
@ -134,14 +135,14 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
return -1; return -1;
opcode |= ar->id; opcode |= ar->id;
break; break;
case tst | (0x1 << 25): case OPDPI(0, tst):
case teq | (0x1 << 25): case OPDPI(0, teq):
case cmp | (0x1 << 25): case OPDPI(0, cmp):
case cmn | (0x1 << 25): case OPDPI(0, cmn):
case tst | (0x1 << 25) | (0x1 << 20): /* tsts (immediate) */ case OPDPIS(0, tst): /* tsts (immediate) */
case teq | (0x1 << 25) | (0x1 << 20): /* teqs (immediate) */ case OPDPIS(0, teq): /* teqs (immediate) */
case cmp | (0x1 << 25) | (0x1 << 20): /* cmps (immediate) */ case OPDPIS(0, cmp): /* cmps (immediate) */
case cmn | (0x1 << 25) | (0x1 << 20): /* cmns (immediate) */ case OPDPIS(0, cmn): /* cmns (immediate) */
/* first operand, Rn */ /* first operand, Rn */
p = call->operands[0].value._register.name; p = call->operands[0].value._register.name;
if((ar = helper->get_register_by_name_size(helper->arch, if((ar = helper->get_register_by_name_size(helper->arch,
@ -151,10 +152,10 @@ 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;
case mov: case OPDP(0, mov):
case mov | (0x1 << 20): /* movs */ case OPDPS(0, mov): /* movs */
case mvn: case OPDP(0, mvn):
case mvn | (0x1 << 20): /* mvns */ case OPDPS(0, mvn): /* mvns */
if(call->operands_cnt == 0) /* nop */ if(call->operands_cnt == 0) /* nop */
break; break;
/* first operand, Rd */ /* first operand, Rd */
@ -170,10 +171,10 @@ static int _arm_write(ArchPlugin * plugin, ArchInstruction * instruction,
return -1; return -1;
opcode |= ar->id; opcode |= ar->id;
break; break;
case mov | (0x1 << 25): /* mov (immediate) */ case OPDPI(0, mov): /* mov (immediate) */
case mov | (0x1 << 25) | (0x1 << 20): /* movs (immediate) */ case OPDPIS(0, mov): /* movs (immediate) */
case mvn | (0x1 << 25): /* mvn (immediate) */ case OPDPI(0, mvn): /* mvn (immediate) */
case mvn | (0x1 << 25) | (0x1 << 20): /* mvns (immediate) */ case OPDPIS(0, mvn): /* mvns (immediate) */
if(call->operands_cnt == 0) /* nop */ if(call->operands_cnt == 0) /* nop */
break; break;
/* first operand, Rd */ /* first operand, Rd */