Emacs-tag and some comment fix for all ARM, CellSPU, Hexagon, MBlaze, MSP430, PPC...

[oota-llvm.git] / lib / Target / ARM / ARMConstantPoolValue.cpp

diff --git a/lib/Target/ARM/ARMConstantPoolValue.cpp b/lib/Target/ARM/ARMConstantPoolValue.cpp
index cdb747631dd1db0f8d2026c444372a004febbf68..fa3226e37eb9a216174d1ab1bb50c1dfdf1fb55f 100644 (file)
--- a/lib/Target/ARM/ARMConstantPoolValue.cpp
+++ b/lib/Target/ARM/ARMConstantPoolValue.cpp
@@ -1,4 +1,4 @@
-//===- ARMConstantPoolValue.cpp - ARM constantpool value --------*- C++ -*-===//
+//===-- ARMConstantPoolValue.cpp - ARM constantpool value -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -31,7 +31,7 @@ ARMConstantPoolValue::ARMConstantPoolValue(Type *Ty, unsigned id,
                                            unsigned char PCAdj,
                                            ARMCP::ARMCPModifier modifier,
                                            bool addCurrentAddress)
-  : MachineConstantPoolValue(Ty), MBB(NULL), LabelId(id), Kind(kind),
+  : MachineConstantPoolValue(Ty), LabelId(id), Kind(kind),
     PCAdjust(PCAdj), Modifier(modifier),
     AddCurrentAddress(addCurrentAddress) {}
 
@@ -44,26 +44,10 @@ ARMConstantPoolValue::ARMConstantPoolValue(LLVMContext &C, unsigned id,
     LabelId(id), Kind(kind), PCAdjust(PCAdj), Modifier(modifier),
     AddCurrentAddress(addCurrentAddress) {}
 
-ARMConstantPoolValue::ARMConstantPoolValue(LLVMContext &C,
-                                           const MachineBasicBlock *mbb,
-                                           unsigned id,
-                                           ARMCP::ARMCPKind K,
-                                           unsigned char PCAdj,
-                                           ARMCP::ARMCPModifier Modif,
-                                           bool AddCA)
-  : MachineConstantPoolValue((Type*)Type::getInt8PtrTy(C)),
-    MBB(mbb), LabelId(id), Kind(K), PCAdjust(PCAdj),
-    Modifier(Modif), AddCurrentAddress(AddCA) {}
-
 ARMConstantPoolValue::~ARMConstantPoolValue() {}
 
-const MachineBasicBlock *ARMConstantPoolValue::getMBB() const {
-  return MBB;
-}
-
 const char *ARMConstantPoolValue::getModifierText() const {
   switch (Modifier) {
-  default: llvm_unreachable("Unknown modifier!");
     // FIXME: Are these case sensitive? It'd be nice to lower-case all the
     // strings if that's legal.
   case ARMCP::no_modifier: return "none";
@@ -73,25 +57,12 @@ const char *ARMConstantPoolValue::getModifierText() const {
   case ARMCP::GOTTPOFF:    return "gottpoff";
   case ARMCP::TPOFF:       return "tpoff";
   }
+  llvm_unreachable("Unknown modifier!");
 }
 
 int ARMConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP,
                                                     unsigned Alignment) {
-  unsigned AlignMask = Alignment - 1;
-  const std::vector<MachineConstantPoolEntry> Constants = CP->getConstants();
-  for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
-    if (Constants[i].isMachineConstantPoolEntry() &&
-        (Constants[i].getAlignment() & AlignMask) == 0) {
-      ARMConstantPoolValue *CPV =
-        (ARMConstantPoolValue *)Constants[i].Val.MachineCPVal;
-      if (CPV->LabelId == LabelId &&
-          CPV->PCAdjust == PCAdjust &&
-          CPV->Modifier == Modifier)
-        return i;
-    }
-  }
-
-  return -1;
+  llvm_unreachable("Shouldn't be calling this directly!");
 }
 
 void
@@ -120,8 +91,6 @@ void ARMConstantPoolValue::dump() const {
 }
 
 void ARMConstantPoolValue::print(raw_ostream &O) const {
-  if (MBB)
-    O << "";
   if (Modifier) O << "(" << getModifierText() << ")";
   if (PCAdjust != 0) {
     O << "-(LPC" << LabelId << "+" << (unsigned)PCAdjust;
@@ -203,11 +172,7 @@ int ARMConstantPoolConstant::getExistingMachineCPValue(MachineConstantPool *CP,
         (ARMConstantPoolValue *)Constants[i].Val.MachineCPVal;
       ARMConstantPoolConstant *APC = dyn_cast<ARMConstantPoolConstant>(CPV);
       if (!APC) continue;
-
-      if (APC->getGV() == this->CVal &&
-          APC->getLabelId() == this->getLabelId() &&
-          APC->getPCAdjustment() == this->getPCAdjustment() &&
-          APC->getModifier() == this->getModifier())
+      if (APC->CVal == CVal && equals(APC))
         return i;
     }
   }
@@ -273,10 +238,7 @@ int ARMConstantPoolSymbol::getExistingMachineCPValue(MachineConstantPool *CP,
       ARMConstantPoolSymbol *APS = dyn_cast<ARMConstantPoolSymbol>(CPV);
       if (!APS) continue;
 
-      if (APS->getLabelId() == this->getLabelId() &&
-          APS->getPCAdjustment() == this->getPCAdjustment() &&
-          CPV_streq(APS->getSymbol(), this->getSymbol()) &&
-          APS->getModifier() == this->getModifier())
+      if (CPV_streq(APS->S, S) && equals(APS))
         return i;
     }
   }
@@ -304,16 +266,17 @@ void ARMConstantPoolSymbol::print(raw_ostream &O) const {
 // ARMConstantPoolMBB
 //===----------------------------------------------------------------------===//
 
-ARMConstantPoolMBB::ARMConstantPoolMBB(LLVMContext &C, MachineBasicBlock *mbb,
+ARMConstantPoolMBB::ARMConstantPoolMBB(LLVMContext &C,
+                                       const MachineBasicBlock *mbb,
                                        unsigned id, unsigned char PCAdj,
                                        ARMCP::ARMCPModifier Modifier,
                                        bool AddCurrentAddress)
-  : ARMConstantPoolValue(C, mbb, id, ARMCP::CPMachineBasicBlock, PCAdj,
+  : ARMConstantPoolValue(C, id, ARMCP::CPMachineBasicBlock, PCAdj,
                          Modifier, AddCurrentAddress),
     MBB(mbb) {}
 
 ARMConstantPoolMBB *ARMConstantPoolMBB::Create(LLVMContext &C,
-                                               MachineBasicBlock *mbb,
+                                               const MachineBasicBlock *mbb,
                                                unsigned ID,
                                                unsigned char PCAdj) {
   return new ARMConstantPoolMBB(C, mbb, ID, PCAdj, ARMCP::no_modifier, false);
@@ -331,10 +294,7 @@ int ARMConstantPoolMBB::getExistingMachineCPValue(MachineConstantPool *CP,
       ARMConstantPoolMBB *APMBB = dyn_cast<ARMConstantPoolMBB>(CPV);
       if (!APMBB) continue;
 
-      if (APMBB->getLabelId() == this->getLabelId() &&
-          APMBB->getPCAdjustment() == this->getPCAdjustment() &&
-          APMBB->getMBB() == this->getMBB() &&
-          APMBB->getModifier() == this->getModifier())
+      if (APMBB->MBB == MBB && equals(APMBB))
         return i;
     }
   }
@@ -354,5 +314,6 @@ void ARMConstantPoolMBB::addSelectionDAGCSEId(FoldingSetNodeID &ID) {
 }
 
 void ARMConstantPoolMBB::print(raw_ostream &O) const {
+  O << "BB#" << MBB->getNumber();
   ARMConstantPoolValue::print(O);
 }