6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-06-26 10:29:57 +00:00
Code Issues Projects Releases Wiki Activity

[ARM] Handle commutativity when converting to tADDhirr in Thumb2

Browse Source 
Also, run thumb_rewrite.s tests in Thumb2 now that they pass.

Differential Revision: http://reviews.llvm.org/D11132

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242036 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Scott Douglass 2015-07-13 15:31:48 +00:00
parent ffc51593c8
commit f8560e5a5b
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -8215,8 +8215,16 @@ bool ARMAsmParser::processInstruction(MCInst &Inst,
// If the destination and first source operand are the same, and
// there's no setting of the flags, use encoding T2 instead of T3.
// Note that this is only for ADD, not SUB. This mirrors the system
// 'as' behaviour. Make sure the wide encoding wasn't explicit.
if (Inst.getOperand(0).getReg() != Inst.getOperand(1).getReg() ||
// 'as' behaviour. Also take advantage of ADD being commutative.
// Make sure the wide encoding wasn't explicit.
bool Swap = false;
auto DestReg = Inst.getOperand(0).getReg();
bool Transform = DestReg == Inst.getOperand(1).getReg();
if (!Transform && DestReg == Inst.getOperand(2).getReg()) {
Transform = true;
Swap = true;
}
if (!Transform ||
Inst.getOperand(5).getReg() != 0 ||
(static_cast<ARMOperand &>(*Operands[3]).isToken() &&
static_cast<ARMOperand &>(*Operands[3]).getToken() == ".w"))
@ -8225,7 +8233,7 @@ bool ARMAsmParser::processInstruction(MCInst &Inst,
TmpInst.setOpcode(ARM::tADDhirr);
TmpInst.addOperand(Inst.getOperand(0));
TmpInst.addOperand(Inst.getOperand(0));
TmpInst.addOperand(Inst.getOperand(2));
TmpInst.addOperand(Inst.getOperand(Swap ? 1 : 2));
TmpInst.addOperand(Inst.getOperand(3));
TmpInst.addOperand(Inst.getOperand(4));
Inst = TmpInst;

2
test/MC/ARM/thumb2-narrow-dp.ll
View File

@ -44,6 +44,8 @@
// CHECK: adds r0, r2, r1 @ encoding: [0x50,0x18]
ADDS r2, r2, r1 // ADDS has T1 narrow 3 operand
// CHECK: adds r2, r2, r1 @ encoding: [0x52,0x18]
ADD r3, r1, r3 // T2
// CHECK: add r3, r1 @ encoding: [0x0b,0x44]
IT EQ
// CHECK: it eq @ encoding: [0x08,0xbf]

1
test/MC/ARM/thumb_rewrites.s
View File

@ -1,4 +1,5 @@
@ RUN: llvm-mc -triple thumbv6m -show-encoding < %s | FileCheck %s
@ RUN: llvm-mc -triple thumbv7m -show-encoding < %s | FileCheck %s
adds r1, r1, #3
@ CHECK: adds r1, r1, #3 @ encoding: [0xc9,0x1c]