Lower llvm.isunordered(a, b) into a != a | b != b.

[oota-llvm.git] / lib / CodeGen / AsmPrinter.cpp

diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index 9d99bdc4cde1824453994816edc39de2347d8042..4e77a78d81b1e7a628a1edd790c4d8838645281a 100644 (file)
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -41,17 +41,11 @@ void AsmPrinter::emitAlignment(unsigned NumBits) const {
 
 /// emitZeros - Emit a block of zeros.
 ///
-void AsmPrinter::emitZeros(unsigned NumZeros) const {
+void AsmPrinter::emitZeros(uint64_t NumZeros) const {
   if (NumZeros) {
     if (ZeroDirective)
       O << ZeroDirective << NumZeros << "\n";
     else {
-      if (NumZeros >= 8 && Data64bitsDirective) {
-        for (; NumZeros >= 8; NumZeros -= 8)
-          O << Data64bitsDirective << "0\n";
-      }
-      for (; NumZeros >= 4; NumZeros -= 4)
-        O << Data32bitsDirective << "0\n";
       for (; NumZeros; --NumZeros)
         O << Data8bitsDirective << "0\n";
     }
@@ -61,7 +55,7 @@ void AsmPrinter::emitZeros(unsigned NumZeros) const {
 // Print out the specified constant, without a storage class.  Only the
 // constants valid in constant expressions can occur here.
 void AsmPrinter::emitConstantValueOnly(const Constant *CV) {
-  if (CV->isNullValue())
+  if (CV->isNullValue() || isa<UndefValue>(CV))
     O << "0";
   else if (const ConstantBool *CB = dyn_cast<ConstantBool>(CV)) {
     assert(CB == ConstantBool::True);
@@ -84,10 +78,14 @@ void AsmPrinter::emitConstantValueOnly(const Constant *CV) {
       // generate a symbolic expression for the byte address
       const Constant *ptrVal = CE->getOperand(0);
       std::vector<Value*> idxVec(CE->op_begin()+1, CE->op_end());
-      if (unsigned Offset = TD.getIndexedOffset(ptrVal->getType(), idxVec)) {
-        O << "(";
+      if (int64_t Offset = TD.getIndexedOffset(ptrVal->getType(), idxVec)) {
+        if (Offset)
+          O << "(";
         emitConstantValueOnly(ptrVal);
-        O << ") + " << Offset;
+        if (Offset > 0)
+          O << ") + " << Offset;
+        else if (Offset < 0)
+          O << ") - " << -Offset;
       } else {
         emitConstantValueOnly(ptrVal);
       }
@@ -145,7 +143,8 @@ static void printAsCString(std::ostream &O, const ConstantArray *CVA) {
 
   O << "\"";
   for (unsigned i = 0; i != CVA->getNumOperands(); ++i) {
-    unsigned char C = cast<ConstantInt>(CVA->getOperand(i))->getRawValue();
+    unsigned char C = 
+        (unsigned char)cast<ConstantInt>(CVA->getOperand(i))->getRawValue();
 
     if (C == '"') {
       O << "\\\"";
@@ -177,7 +176,7 @@ static void printAsCString(std::ostream &O, const ConstantArray *CVA) {
 void AsmPrinter::emitGlobalConstant(const Constant *CV) {  
   const TargetData &TD = TM.getTargetData();
 
-  if (CV->isNullValue()) {
+  if (CV->isNullValue() || isa<UndefValue>(CV)) {
     emitZeros(TD.getTypeSize(CV->getType()));
     return;
   } else if (const ConstantArray *CVA = dyn_cast<ConstantArray>(CV)) {
@@ -193,13 +192,13 @@ void AsmPrinter::emitGlobalConstant(const Constant *CV) {
   } else if (const ConstantStruct *CVS = dyn_cast<ConstantStruct>(CV)) {
     // Print the fields in successive locations. Pad to align if needed!
     const StructLayout *cvsLayout = TD.getStructLayout(CVS->getType());
-    unsigned sizeSoFar = 0;
+    uint64_t sizeSoFar = 0;
     for (unsigned i = 0, e = CVS->getNumOperands(); i != e; ++i) {
       const Constant* field = CVS->getOperand(i);
 
       // Check if padding is needed and insert one or more 0s.
-      unsigned fieldSize = TD.getTypeSize(field->getType());
-      unsigned padSize = ((i == e-1? cvsLayout->StructSize
+      uint64_t fieldSize = TD.getTypeSize(field->getType());
+      uint64_t padSize = ((i == e-1? cvsLayout->StructSize
                            : cvsLayout->MemberOffsets[i+1])
                           - cvsLayout->MemberOffsets[i]) - fieldSize;
       sizeSoFar += fieldSize + padSize;
@@ -225,21 +224,21 @@ void AsmPrinter::emitGlobalConstant(const Constant *CV) {
       U.FVal = Val;
 
       if (Data64bitsDirective)
-        O << Data64bitsDirective << U.UVal << "\t" << CommentChar
+        O << Data64bitsDirective << U.UVal << "\t" << CommentString
           << " double value: " << Val << "\n";
       else if (TD.isBigEndian()) {
         O << Data32bitsDirective << unsigned(U.UVal >> 32)
-          << "\t" << CommentChar << " double most significant word "
+          << "\t" << CommentString << " double most significant word "
           << Val << "\n";
         O << Data32bitsDirective << unsigned(U.UVal)
-          << "\t" << CommentChar << " double least significant word "
+          << "\t" << CommentString << " double least significant word "
           << Val << "\n";
       } else {
         O << Data32bitsDirective << unsigned(U.UVal)
-          << "\t" << CommentChar << " double least significant word " << Val
+          << "\t" << CommentString << " double least significant word " << Val
           << "\n";
         O << Data32bitsDirective << unsigned(U.UVal >> 32)
-          << "\t" << CommentChar << " double most significant word " << Val
+          << "\t" << CommentString << " double most significant word " << Val
           << "\n";
       }
       return;
@@ -248,9 +247,9 @@ void AsmPrinter::emitGlobalConstant(const Constant *CV) {
         float FVal;
         int32_t UVal;
       } U;
-      U.FVal = Val;
+      U.FVal = (float)Val;
       
-      O << Data32bitsDirective << U.UVal << "\t" << CommentChar
+      O << Data32bitsDirective << U.UVal << "\t" << CommentString
         << " float " << Val << "\n";
       return;
     }
@@ -262,17 +261,17 @@ void AsmPrinter::emitGlobalConstant(const Constant *CV) {
         O << Data64bitsDirective << Val << "\n";
       else if (TD.isBigEndian()) {
         O << Data32bitsDirective << unsigned(Val >> 32)
-          << "\t" << CommentChar << " Double-word most significant word "
+          << "\t" << CommentString << " Double-word most significant word "
           << Val << "\n";
         O << Data32bitsDirective << unsigned(Val)
-          << "\t" << CommentChar << " Double-word least significant word "
+          << "\t" << CommentString << " Double-word least significant word "
           << Val << "\n";
       } else {
         O << Data32bitsDirective << unsigned(Val)
-          << "\t" << CommentChar << " Double-word least significant word "
+          << "\t" << CommentString << " Double-word least significant word "
           << Val << "\n";
         O << Data32bitsDirective << unsigned(Val >> 32)
-          << "\t" << CommentChar << " Double-word most significant word "
+          << "\t" << CommentString << " Double-word most significant word "
           << Val << "\n";
       }
       return;
@@ -281,14 +280,19 @@ void AsmPrinter::emitGlobalConstant(const Constant *CV) {
 
   const Type *type = CV->getType();
   switch (type->getTypeID()) {
+  case Type::BoolTyID: 
   case Type::UByteTyID: case Type::SByteTyID:
     O << Data8bitsDirective;
     break;
   case Type::UShortTyID: case Type::ShortTyID:
     O << Data16bitsDirective;
     break;
-  case Type::BoolTyID: 
   case Type::PointerTyID:
+    if (TD.getPointerSize() == 8) {
+      O << Data64bitsDirective;
+      break;
+    }
+    //Fall through for pointer size == int size
   case Type::UIntTyID: case Type::IntTyID:
     O << Data32bitsDirective;
     break;