RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-04 03:06:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The disassembler for Thumb was wrongly adding 4 to the computed imm32 offset.

Browse Source 
Remove the offending logic and update the test cases.

llvm-svn: 127843
This commit is contained in:
Johnny Chen 2011-03-18 00:38:03 +00:00
parent a4b86e96b1
commit 14f091b6ab
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h
View File

@ -962,11 +962,7 @@ static bool DisassembleThumb1Br(MCInst &MI, unsigned Opcode, uint32_t insn,
unsigned Imm11 = getT1Imm11(insn);
// When executing a Thumb instruction, PC reads as the address of the current
// instruction plus 4. The assembler subtracts 4 from the difference between
// the branch instruction and the target address, disassembler has to add 4 to
// to compensate.
MI.addOperand(MCOperand::CreateImm(SignExtend32<12>(Imm11 << 1) + 4));
MI.addOperand(MCOperand::CreateImm(SignExtend32<12>(Imm11 << 1)));
NumOpsAdded = 1;
@ -1747,11 +1743,7 @@ static bool DisassembleThumb2BrMiscCtrl(MCInst &MI, unsigned Opcode,
Offset = decodeImm32_BLX(insn);
break;
}
// When executing a Thumb instruction, PC reads as the address of the current
// instruction plus 4. The assembler subtracts 4 from the difference between
// the branch instruction and the target address, disassembler has to add 4 to
// to compensate.
MI.addOperand(MCOperand::CreateImm(Offset + 4));
MI.addOperand(MCOperand::CreateImm(Offset));
// This is an increment as some predicate operands may have been added first.
NumOpsAdded += 1;

6
test/MC/Disassembler/ARM/thumb-tests.txt
View File

@ -6,10 +6,10 @@
# CHECK: adcs r0, r0, #1
0x50 0xf1 0x01 0x00
# CHECK: b #34
# CHECK: b #30
0x0f 0xe0
# CHECK: b.w #-12
# CHECK: b.w #-16
0xff 0xf7 0xf8 0xaf
# CHECK: bfi r2, r10, #0, #1
@ -128,5 +128,5 @@
# CHECK: msr cpsr_fc, r0
0x80 0xf3 0x00 0x89
# CHECK: blx #0
# CHECK: blx #-4
0xff 0xf7 0xfe 0xef