diff options
| author | Tim Northover <tnorthover@apple.com> | 2013-06-01 10:23:46 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2013-06-01 10:23:46 +0000 |
| commit | 3ba14fab1b653015428055ddce4205682885ff3f (patch) | |
| tree | 7926a5dac9bd3ca0f95366bf9e0f7aea89a84253 /lib/Target/X86/X86MCInstLower.cpp | |
| parent | 4d3ace4da0a000428ad5baea72c82e585fcd531c (diff) | |
| download | llvm-3ba14fab1b653015428055ddce4205682885ff3f.tar.gz llvm-3ba14fab1b653015428055ddce4205682885ff3f.tar.bz2 llvm-3ba14fab1b653015428055ddce4205682885ff3f.tar.xz | |
Revert r183069: "TMP: LEA64_32r fixing"
Very sorry, it was committed from the wrong branch by mistake.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183070 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86MCInstLower.cpp')
| -rw-r--r-- | lib/Target/X86/X86MCInstLower.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/Target/X86/X86MCInstLower.cpp b/lib/Target/X86/X86MCInstLower.cpp index a453245e7c..4b6503b6f6 100644 --- a/lib/Target/X86/X86MCInstLower.cpp +++ b/lib/Target/X86/X86MCInstLower.cpp @@ -225,6 +225,20 @@ MCOperand X86MCInstLower::LowerSymbolOperand(const MachineOperand &MO, } + +static void lower_lea64_32mem(MCInst *MI, unsigned OpNo) { + // Convert registers in the addr mode according to subreg64. + for (unsigned i = 0; i != 4; ++i) { + if (!MI->getOperand(OpNo+i).isReg()) continue; + + unsigned Reg = MI->getOperand(OpNo+i).getReg(); + // LEAs can use RIP-relative addressing, and RIP has no sub/super register. + if (Reg == 0 || Reg == X86::RIP) continue; + + MI->getOperand(OpNo+i).setReg(getX86SubSuperRegister(Reg, MVT::i64)); + } +} + /// LowerUnaryToTwoAddr - R = setb -> R = sbb R, R static void LowerUnaryToTwoAddr(MCInst &OutMI, unsigned NewOpc) { OutMI.setOpcode(NewOpc); @@ -350,7 +364,9 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const { // Handle a few special cases to eliminate operand modifiers. ReSimplify: switch (OutMI.getOpcode()) { - case X86::LEA64_32r: + case X86::LEA64_32r: // Handle 'subreg rewriting' for the lea64_32mem operand. + lower_lea64_32mem(&OutMI, 1); + // FALL THROUGH. case X86::LEA64r: case X86::LEA16r: case X86::LEA32r: |