[llvm-commits] [llvm] r95136 - /llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Feb  2 15:44:10 2010
New Revision: 95136

URL: http://llvm.org/viewvc/llvm-project?rev=95136&view=rev
Log:
MCCodeEmitter/X86: Handle tied registers better when converting MCInst ->
MCMachineInstr. This also fixes handling of tied registers for MRMSrcMem
instructions.

Modified:
    llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp

Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=95136&r1=95135&r2=95136&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Tue Feb  2 15:44:10 2010
@@ -1002,10 +1002,10 @@
     unsigned Opcode = MI.getOpcode();
     unsigned NumOps = MI.getNumOperands();
     unsigned CurOp = 0;
-    if (NumOps > 1 && Desc.getOperandConstraint(1, TOI::TIED_TO) != -1) {
-      Instr->addOperand(MachineOperand::CreateReg(0, false));
-      ++CurOp;
-    } else if (NumOps > 2 && 
+    bool AddTied = false;
+    if (NumOps > 1 && Desc.getOperandConstraint(1, TOI::TIED_TO) != -1)
+      AddTied = true;
+    else if (NumOps > 2 && 
              Desc.getOperandConstraint(NumOps-1, TOI::TIED_TO)== 0)
       // Skip the last source operand that is tied_to the dest reg. e.g. LXADD32
       --NumOps;
@@ -1016,7 +1016,9 @@
     case X86II::MRMSrcReg:
       // Matching doesn't fill this in completely, we have to choose operand 0
       // for a tied register.
-      OK &= AddRegToInstr(MI, Instr, 0); CurOp++;
+      OK &= AddRegToInstr(MI, Instr, CurOp++);
+      if (AddTied)
+        OK &= AddRegToInstr(MI, Instr, CurOp++ - 1);
       OK &= AddRegToInstr(MI, Instr, CurOp++);
       if (CurOp < NumOps)
         OK &= AddImmToInstr(MI, Instr, CurOp);
@@ -1035,7 +1037,11 @@
       break;
 
     case X86II::AddRegFrm:
+      // Matching doesn't fill this in completely, we have to choose operand 0
+      // for a tied register.
       OK &= AddRegToInstr(MI, Instr, CurOp++);
+      if (AddTied)
+        OK &= AddRegToInstr(MI, Instr, CurOp++ - 1);
       if (CurOp < NumOps)
         OK &= AddImmToInstr(MI, Instr, CurOp);
       break;
@@ -1046,7 +1052,9 @@
     case X86II::MRM6r: case X86II::MRM7r:
       // Matching doesn't fill this in completely, we have to choose operand 0
       // for a tied register.
-      OK &= AddRegToInstr(MI, Instr, 0); CurOp++;
+      OK &= AddRegToInstr(MI, Instr, CurOp++);
+      if (AddTied)
+        OK &= AddRegToInstr(MI, Instr, CurOp++ - 1);
       if (CurOp < NumOps)
         OK &= AddImmToInstr(MI, Instr, CurOp);
       break;
@@ -1061,7 +1069,11 @@
       break;
 
     case X86II::MRMSrcMem:
+      // Matching doesn't fill this in completely, we have to choose operand 0
+      // for a tied register.
       OK &= AddRegToInstr(MI, Instr, CurOp++);
+      if (AddTied)
+        OK &= AddRegToInstr(MI, Instr, CurOp++ - 1);
       if (Opcode == X86::LEA64r || Opcode == X86::LEA64_32r ||
           Opcode == X86::LEA16r || Opcode == X86::LEA32r)
         OK &= AddLMemToInstr(MI, Instr, CurOp);