Fix bug: CWriter/2003-05-12-IntegerSizeWarning.c

[oota-llvm.git] / lib / Target / TargetData.cpp

diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index ec27d9e028e794dde213a20595fd5c5341db1d20..158f57e3accf2941e27022c9c5d7ada39d0eb432 100644 (file)
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Target/TargetData.h"
+#include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
 
@@ -81,18 +82,27 @@ Annotation *TargetData::TypeAnFactory(AnnotationID AID, const Annotable *T,
 //===----------------------------------------------------------------------===//
 
 TargetData::TargetData(const std::string &TargetName,
-             unsigned char IntRegSize, unsigned char PtrSize,
-            unsigned char PtrAl, unsigned char DoubleAl,
-            unsigned char FloatAl, unsigned char LongAl, 
-            unsigned char IntAl, unsigned char ShortAl,
-            unsigned char ByteAl)
+                       bool isLittleEndian, unsigned char PtrSize,
+                       unsigned char PtrAl, unsigned char DoubleAl,
+                       unsigned char FloatAl, unsigned char LongAl, 
+                       unsigned char IntAl, unsigned char ShortAl,
+                       unsigned char ByteAl)
   : AID(AnnotationManager::getID("TargetData::" + TargetName)) {
   AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
 
-  IntegerRegSize   = IntRegSize;
+  // If this assert triggers, a pass "required" TargetData information, but the
+  // top level tool did not provide once for it.  We do not want to default
+  // construct, or else we might end up using a bad endianness or pointer size!
+  //
+  assert(!TargetName.empty() &&
+         "ERROR: Tool did not specify a target data to use!");
+
+  LittleEndian     = isLittleEndian;
   PointerSize      = PtrSize;
   PointerAlignment = PtrAl;
   DoubleAlignment  = DoubleAl;
+  assert(DoubleAlignment == PtrAl &&
+         "Double alignment and pointer alignment agree for now!");
   FloatAlignment   = FloatAl;
   LongAlignment    = LongAl;
   IntAlignment     = IntAl;
@@ -100,6 +110,21 @@ TargetData::TargetData(const std::string &TargetName,
   ByteAlignment    = ByteAl;
 }
 
+TargetData::TargetData(const std::string &ToolName, const Module *M)
+  : AID(AnnotationManager::getID("TargetData::" + ToolName)) {
+  AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
+
+  LittleEndian     = M->isLittleEndian();
+  PointerSize      = M->has32BitPointers() ? 4 : 8;
+  PointerAlignment = PointerSize;
+  DoubleAlignment  = PointerSize;
+  FloatAlignment   = 4;
+  LongAlignment    = 8;
+  IntAlignment     = 4;
+  ShortAlignment   = 2;
+  ByteAlignment    = 1;
+}
+
 TargetData::~TargetData() {
   AnnotationManager::registerAnnotationFactory(AID, 0);   // Deregister factory
 }
@@ -170,11 +195,10 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
       Ty = cast<SequentialType>(Ty)->getElementType();
 
       // Get the array index and the size of each array element.
-      // Both must be known constants, or this will fail.
-      // Also, the product needs to be sign-extended from 32 to 64 bits.
-      int64_t elementSize = (int64_t)getTypeSize(Ty);
+      // Both must be known constants, or the index shd be 0; else this fails.
       int64_t arrayIdx = cast<ConstantSInt>(Idx[CurIDX])->getValue();
-      Result += (uint64_t)(arrayIdx * elementSize);
+      Result += arrayIdx == 0? 0
+                : (uint64_t) (arrayIdx * (int64_t) getTypeSize(Ty)); 
 
     } else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
       assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
@@ -189,9 +213,6 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
 
       // Update Ty to refer to current element
       Ty = STy->getElementTypes()[FieldNo];
-
-    } else if (isa<const ArrayType>(Ty)) {
-      assert(0 && "Loading from arrays not implemented yet!");
     } else {
       assert(0 && "Indexing type that is not struct or array?");
       return 0;                         // Load directly through ptr