[llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaISelPattern.cpp AlphaInstrInfo.td

[Andrew Lenharth]

Changes in directory llvm/lib/Target/Alpha:

AlphaISelPattern.cpp updated: 1.19 -> 1.20
AlphaInstrInfo.td updated: 1.9 -> 1.10
---
Log message:

added fp extend and removed a forgotten assert in more than 6 arg support (should break somewhere else now :) ) and fix an incorrect asm sequence for indirect calls

---
Diffs of the changes:  (+32 -22)

 AlphaISelPattern.cpp |   38 ++++++++++++++++++++++----------------
 AlphaInstrInfo.td    |   16 ++++++++++------
 2 files changed, 32 insertions(+), 22 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaISelPattern.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.19 llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.20
--- llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.19	Sun Jan 30 10:32:48 2005
+++ llvm/lib/Target/Alpha/AlphaISelPattern.cpp	Sun Jan 30 14:42:36 2005
@@ -307,6 +307,12 @@
     Node->dump();
     assert(0 && "Node not handled!\n");
 
+  case ISD::FP_EXTEND:
+    assert (DestType == MVT::f64 && N.getOperand(0).getValueType() == MVT::f32 && "only f32 to f64 conversion supported here");
+    Tmp1 = SelectExpr(N.getOperand(0));
+    BuildMI(BB, Alpha::CVTST, 1, Result).addReg(Tmp1);
+    return Result;
+
   case ISD::CopyFromReg:
     {
       // Make sure we generate both values.
@@ -584,7 +590,7 @@
       
       //grab the arguments
       std::vector<unsigned> argvregs;
-      assert(Node->getNumOperands() < 8 && "Only 6 args supported");
+      //assert(Node->getNumOperands() < 8 && "Only 6 args supported");
       for(int i = 2, e = Node->getNumOperands(); i < e; ++i)
 	  argvregs.push_back(SelectExpr(N.getOperand(i)));
       
@@ -640,23 +646,23 @@
         }
       //build the right kind of call
       if (GlobalAddressSDNode *GASD =
-	  dyn_cast<GlobalAddressSDNode>(N.getOperand(1))) 
-	{
-	  AlphaLowering.restoreGP(BB);
-	  BuildMI(BB, Alpha::CALL, 1).addGlobalAddress(GASD->getGlobal(),true);
-	} 
+          dyn_cast<GlobalAddressSDNode>(N.getOperand(1))) 
+        {
+          AlphaLowering.restoreGP(BB);
+          BuildMI(BB, Alpha::CALL, 1).addGlobalAddress(GASD->getGlobal(),true);
+        } 
       else if (ExternalSymbolSDNode *ESSDN =
-	       dyn_cast<ExternalSymbolSDNode>(N.getOperand(1))) 
-	{
-	  AlphaLowering.restoreGP(BB);
-	  BuildMI(BB, Alpha::CALL, 0).addExternalSymbol(ESSDN->getSymbol(), true);
-	} 
+               dyn_cast<ExternalSymbolSDNode>(N.getOperand(1))) 
+        {
+          AlphaLowering.restoreGP(BB);
+          BuildMI(BB, Alpha::CALL, 0).addExternalSymbol(ESSDN->getSymbol(), true);
+        } 
       else 
-	{
-	  Tmp1 = SelectExpr(N.getOperand(1));
-	  AlphaLowering.restoreGP(BB);
-	  BuildMI(BB, Alpha::CALL, 1).addReg(Tmp1);
-	}
+        {
+          //no need to restore GP as we are doing an indirect call
+          Tmp1 = SelectExpr(N.getOperand(1));
+          BuildMI(BB, Alpha::JSR, 2, Alpha::R26).addReg(Tmp1).addImm(1);
+        }
       
       //push the result into a virtual register
       


Index: llvm/lib/Target/Alpha/AlphaInstrInfo.td
diff -u llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.9 llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.10
--- llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.9	Sat Jan 29 09:42:07 2005
+++ llvm/lib/Target/Alpha/AlphaInstrInfo.td	Sun Jan 30 14:42:36 2005
@@ -246,15 +246,19 @@
   def RET : MForm< 0x1A, (ops GPRC:$RD, GPRC:$RS), "ret $RD,($RS),1">; //Return from subroutine
 
 def JMP : MForm< 0x1A, (ops GPRC:$RD, GPRC:$RS), "jmp $RD,($RS),0">; //Jump
-let isCall = 1 in
-  let Defs = [R0, R1, R2, R3, R4, R5, R6, R7, R8, R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, R27, R29] in 
+let isCall = 1,
+    Defs = [R0, R1, R2, R3, R4, R5, R6, R7, R8, R16, R17, R18, R19,
+            R20, R21, R22, R23, R24, R25, R26, R27, R29,
+            F0, F1,
+            F10, F11, F12, F13, F14, F15, F16, F17, F18, F19,
+            F20, F21, F22, F23, F24, F25, F26, F27, F28, F29, F30],
+    Uses = [R27, R29] in {
     def JSR : MForm< 0x1A, (ops GPRC:$RD, GPRC:$RS, s14imm:$DISP), "jsr $RD,($RS),$DISP">; //Jump to subroutine
-def JSR_COROUTINE : MForm< 0x1A, (ops GPRC:$RD, GPRC:$RS), "jsr_coroutine $RD,($RS),1">; //Jump to subroutine return
+    def BSR : BForm<0x34, (ops GPRC:$RD, s21imm:$DISP), "bsr $RD,$DISP">; //Branch to subroutine
+}
 
+def JSR_COROUTINE : MForm< 0x1A, (ops GPRC:$RD, GPRC:$RS), "jsr_coroutine $RD,($RS),1">; //Jump to subroutine return
 def BR : BForm<0x30, (ops GPRC:$RD, s21imm:$DISP), "br $RD,$DISP">; //Branch
-let isCall = 1 in
-  let Defs = [R0, R1, R2, R3, R4, R5, R6, R7, R8, R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, R27, R29] in 
-    def BSR : BForm<0x34, (ops GPRC:$RD, s21imm:$DISP), "bsr $RD,$DISP">; //Branch to subroutine
 
 //Stores, int
 def STB : MForm<0x0E, (ops GPRC:$RA, s16imm:$DISP, GPRC:$RB), "stb $RA,$DISP($RB)">; // Store byte