Cleaned up my last check-in.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4014 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index 4278f82fff91bf8421701cb6354c17c6b7965cdb..96bf16275bb0b644348e904805b085ff65baa82b 100644 (file)
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -1018,73 +1018,13 @@ void CWriter::printIndexingExpression(Value *Ptr, User::op_iterator I,
     }
 }
 
-
-
-
-
-/*
-void CWriter::printIndexingExpression(Value *Ptr, User::op_iterator I,
-                                      User::op_iterator E) {
-  bool HasImplicitAddress = false;
-  // If accessing a global value with no indexing, avoid *(&GV) syndrome
-  if (GlobalValue *V = dyn_cast<GlobalValue>(Ptr)) {
-    HasImplicitAddress = true;
-  } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(Ptr)) {
-    HasImplicitAddress = true;
-    Ptr = CPR->getValue();         // Get to the global...
-  }
-
-  if (I == E) {
-    if (!HasImplicitAddress)
-      Out << "*";  // Implicit zero first argument: '*x' is equivalent to 'x[0]'
-
-    writeOperandInternal(Ptr);
-    return;
-  }
-
-  const Constant *CI = dyn_cast<Constant>(I->get());
-  if (HasImplicitAddress && (!CI || !CI->isNullValue()))
-    Out << "(&";
-
-  writeOperandInternal(Ptr);
-
-  if (HasImplicitAddress && (!CI || !CI->isNullValue())) {
-    Out << ")";
-    HasImplicitAddress = false;  // HIA is only true if we haven't addressed yet
-  }
-
-  assert(!HasImplicitAddress || (CI && CI->isNullValue()) &&
-         "Can only have implicit address with direct accessing");
-
-  if (HasImplicitAddress) {
-    ++I;
-  } else if (CI && CI->isNullValue() && I+1 != E) {
-    // Print out the -> operator if possible...
-    if ((*(I+1))->getType() == Type::UByteTy) {
-      Out << (HasImplicitAddress ? "." : "->");
-      Out << "field" << cast<ConstantUInt>(*(I+1))->getValue();
-      I += 2;
-    } 
-  }
-
-  for (; I != E; ++I)
-    if ((*I)->getType() == Type::LongTy) {
-      Out << "[";
-      writeOperand(*I);
-      Out << "]";
-    } else {
-      Out << ".field" << cast<ConstantUInt>(*I)->getValue();
-    }
-}
-*/
-
 void CWriter::visitLoadInst(LoadInst &I) {
   //Out << "*";
   writeOperand(I.getOperand(0));
 }
 
 void CWriter::visitStoreInst(StoreInst &I) {
-  //Out << "*";
+  Out << "*";
   writeOperand(I.getPointerOperand());
   Out << " = ";
   writeOperand(I.getOperand(0));

diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index 4278f82fff91bf8421701cb6354c17c6b7965cdb..96bf16275bb0b644348e904805b085ff65baa82b 100644 (file)
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -1018,73 +1018,13 @@ void CWriter::printIndexingExpression(Value *Ptr, User::op_iterator I,
     }
 }
 
-
-
-
-
-/*
-void CWriter::printIndexingExpression(Value *Ptr, User::op_iterator I,
-                                      User::op_iterator E) {
-  bool HasImplicitAddress = false;
-  // If accessing a global value with no indexing, avoid *(&GV) syndrome
-  if (GlobalValue *V = dyn_cast<GlobalValue>(Ptr)) {
-    HasImplicitAddress = true;
-  } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(Ptr)) {
-    HasImplicitAddress = true;
-    Ptr = CPR->getValue();         // Get to the global...
-  }
-
-  if (I == E) {
-    if (!HasImplicitAddress)
-      Out << "*";  // Implicit zero first argument: '*x' is equivalent to 'x[0]'
-
-    writeOperandInternal(Ptr);
-    return;
-  }
-
-  const Constant *CI = dyn_cast<Constant>(I->get());
-  if (HasImplicitAddress && (!CI || !CI->isNullValue()))
-    Out << "(&";
-
-  writeOperandInternal(Ptr);
-
-  if (HasImplicitAddress && (!CI || !CI->isNullValue())) {
-    Out << ")";
-    HasImplicitAddress = false;  // HIA is only true if we haven't addressed yet
-  }
-
-  assert(!HasImplicitAddress || (CI && CI->isNullValue()) &&
-         "Can only have implicit address with direct accessing");
-
-  if (HasImplicitAddress) {
-    ++I;
-  } else if (CI && CI->isNullValue() && I+1 != E) {
-    // Print out the -> operator if possible...
-    if ((*(I+1))->getType() == Type::UByteTy) {
-      Out << (HasImplicitAddress ? "." : "->");
-      Out << "field" << cast<ConstantUInt>(*(I+1))->getValue();
-      I += 2;
-    } 
-  }
-
-  for (; I != E; ++I)
-    if ((*I)->getType() == Type::LongTy) {
-      Out << "[";
-      writeOperand(*I);
-      Out << "]";
-    } else {
-      Out << ".field" << cast<ConstantUInt>(*I)->getValue();
-    }
-}
-*/
-
 void CWriter::visitLoadInst(LoadInst &I) {
   //Out << "*";
   writeOperand(I.getOperand(0));
 }
 
 void CWriter::visitStoreInst(StoreInst &I) {
-  //Out << "*";
+  Out << "*";
   writeOperand(I.getPointerOperand());
   Out << " = ";
   writeOperand(I.getOperand(0));