Fix indentation of LSR(2)/ASR(2)
Jeffrey Pfau jeffrey@endrift.com
Sun, 14 Apr 2013 02:51:21 -0700
1 files changed,
24 insertions(+),
24 deletions(-)
jump to
M
src/isa-thumb.c
→
src/isa-thumb.c
@@ -182,38 +182,38 @@ DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(AND, cpu->gprs[rd] = cpu->gprs[rd] & cpu->gprs[rn]; THUMB_NEUTRAL_S( , , cpu->gprs[rd]))
DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(EOR, cpu->gprs[rd] = cpu->gprs[rd] ^ cpu->gprs[rn]; THUMB_NEUTRAL_S( , , cpu->gprs[rd])) DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(LSL2, ARM_STUB) DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(LSR2, \ - int rs = cpu->gprs[rn] & 0xFF; \ - if (rs) { \ - if (rs < 32) { \ - cpu->cpsr.c = cpu->gprs[rd] & (1 << (rs - 1)); \ - cpu->gprs[rd] = (uint32_t) cpu->gprs[rd] >> rs; \ + int rs = cpu->gprs[rn] & 0xFF; \ + if (rs) { \ + if (rs < 32) { \ + cpu->cpsr.c = cpu->gprs[rd] & (1 << (rs - 1)); \ + cpu->gprs[rd] = (uint32_t) cpu->gprs[rd] >> rs; \ + } else { \ + if (rs > 32) { \ + cpu->cpsr.c = 0; \ } else { \ - if (rs > 32) { \ - cpu->cpsr.c = 0; \ - } else { \ - cpu->cpsr.c = ARM_SIGN(cpu->gprs[rd]); \ - } \ - cpu->gprs[rd] = 0; \ + cpu->cpsr.c = ARM_SIGN(cpu->gprs[rd]); \ } \ + cpu->gprs[rd] = 0; \ } \ - THUMB_NEUTRAL_S( , , cpu->gprs[rd])) + } \ + THUMB_NEUTRAL_S( , , cpu->gprs[rd])) DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(ASR2, \ - int rs = cpu->gprs[rn] & 0xFF; \ - if (rs) { \ - if (rs < 32) { \ - cpu->cpsr.c = cpu->gprs[rd] & (1 << (rs - 1)); \ - cpu->gprs[rd] >>= rs; \ + int rs = cpu->gprs[rn] & 0xFF; \ + if (rs) { \ + if (rs < 32) { \ + cpu->cpsr.c = cpu->gprs[rd] & (1 << (rs - 1)); \ + cpu->gprs[rd] >>= rs; \ + } else { \ + cpu->cpsr.c = ARM_SIGN(cpu->gprs[rd]); \ + if (cpu->cpsr.c) { \ + cpu->gprs[rd] = 0xFFFFFFFF; \ } else { \ - cpu->cpsr.c = ARM_SIGN(cpu->gprs[rd]); \ - if (cpu->cpsr.c) { \ - cpu->gprs[rd] = 0xFFFFFFFF; \ - } else { \ - cpu->gprs[rd] = 0; \ - } \ + cpu->gprs[rd] = 0; \ } \ } \ - THUMB_NEUTRAL_S( , , cpu->gprs[rd])) + } \ + THUMB_NEUTRAL_S( , , cpu->gprs[rd])) DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(ADC, ARM_STUB) DEFINE_DATA_FORM_5_INSTRUCTION_THUMB(SBC, ARM_STUB)