diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-12-05 22:27:04 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-12-05 22:27:04 +0000 |
| commit | b8c719ccc6af14b1ba4d19f406a20e0b2b87bf88 (patch) | |
| tree | 63f1dc993232c454a7528bcf70ef7360ca801246 /llvm | |
| parent | 6d694a38fd2bd848dd1a433c2a23df8978c2bb58 (diff) | |
| download | bcm5719-llvm-b8c719ccc6af14b1ba4d19f406a20e0b2b87bf88.tar.gz bcm5719-llvm-b8c719ccc6af14b1ba4d19f406a20e0b2b87bf88.zip | |
Tweak ADDrr fix. Bad check for explicit .w
llvm-svn: 145863
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/mode-switch.s | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index c1a745216e8..07679a60ffd 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -5245,8 +5245,8 @@ processInstruction(MCInst &Inst, // 'as' behaviour. Make sure the wide encoding wasn't explicit. if (Inst.getOperand(0).getReg() != Inst.getOperand(1).getReg() || Inst.getOperand(5).getReg() != 0 || - (static_cast<ARMOperand*>(Operands[2])->isToken() && - static_cast<ARMOperand*>(Operands[2])->getToken() == ".w")) + (static_cast<ARMOperand*>(Operands[3])->isToken() && + static_cast<ARMOperand*>(Operands[3])->getToken() == ".w")) break; MCInst TmpInst; TmpInst.setOpcode(ARM::tADDhirr); diff --git a/llvm/test/MC/ARM/mode-switch.s b/llvm/test/MC/ARM/mode-switch.s index 99bd4b53108..9d4995439e8 100644 --- a/llvm/test/MC/ARM/mode-switch.s +++ b/llvm/test/MC/ARM/mode-switch.s @@ -4,7 +4,7 @@ .code 16 add.w r0, r0, r1 -@ CHECK: add r0, r1 @ encoding: [0x08,0x44] +@ CHECK: add.w r0, r0, r1 @ encoding: [0x00,0xeb,0x01,0x00] .code 32 add r0, r0, r1 |
