Move function implementations to a .cpp file, avoid #including <cstdlib> here.

[oota-llvm.git] / include / llvm / Target / TargetData.h

diff --git a/include/llvm/Target/TargetData.h b/include/llvm/Target/TargetData.h
index ae7780dc3a25d2c22d1ccafba2e81c0dd52d601d..dc40efb1abd99a545d76ce6e3371ba5cdaf4f14e 100644 (file)
--- a/include/llvm/Target/TargetData.h
+++ b/include/llvm/Target/TargetData.h
@@ -1,4 +1,11 @@
 //===-- llvm/Target/TargetData.h - Data size & alignment info ---*- C++ -*-===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This file defines target properties related to datatype size/offset/alignment
 // information.  It uses lazy annotations to cache information about how 
@@ -14,9 +21,12 @@
 #define LLVM_TARGET_TARGETDATA_H
 
 #include "llvm/Pass.h"
-#include "Support/Annotation.h"
 #include "Support/DataTypes.h"
 #include <vector>
+#include <string>
+
+namespace llvm {
+
 class Value;
 class Type;
 class StructType;
@@ -32,9 +42,6 @@ class TargetData : public ImmutablePass {
   unsigned char DoubleAlignment;       // Defaults to 8 bytes
   unsigned char PointerSize;           // Defaults to 8 bytes
   unsigned char PointerAlignment;      // Defaults to 8 bytes
-  AnnotationID  AID;                   // AID for structure layout annotation
- 
-  static Annotation *TypeAnFactory(AnnotationID, const Annotable *, void *);
 public:
   TargetData(const std::string &TargetName = "",
              bool LittleEndian = false,
@@ -59,39 +66,40 @@ public:
   unsigned char getDoubleAlignment()  const { return  DoubleAlignment; }
   unsigned char getPointerAlignment() const { return PointerAlignment; }
   unsigned char getPointerSize()      const { return      PointerSize; }
-  AnnotationID  getStructLayoutAID()  const { return AID; }
 
-  // getTypeSize - Return the number of bytes necessary to hold the specified
-  // type
-  uint64_t      getTypeSize     (const Type *Ty) const;
+  /// getTypeSize - Return the number of bytes necessary to hold the specified
+  /// type
+  uint64_t getTypeSize(const Type *Ty) const;
 
-  // getTypeAlignment - Return the minimum required alignment for the specified
-  // type
+  /// getTypeAlignment - Return the minimum required alignment for the specified
+  /// type
   unsigned char getTypeAlignment(const Type *Ty) const;
 
-  // getIndexOffset - return the offset from the beginning of the type for the
-  // specified indices.  This is used to implement getelementptr.
-  //
-  uint64_t      getIndexedOffset(const Type *Ty, 
-                                const std::vector<Value*> &Indices) const;
+  /// getIntPtrType - Return an unsigned integer type that is the same size or
+  /// greater to the host pointer size.
+  const Type *getIntPtrType() const;
+
+  /// getIndexOffset - return the offset from the beginning of the type for the
+  /// specified indices.  This is used to implement getelementptr.
+  ///
+  uint64_t getIndexedOffset(const Type *Ty, 
+                            const std::vector<Value*> &Indices) const;
   
-  inline const StructLayout *getStructLayout(const StructType *Ty) const {
-    return (const StructLayout*)
-         ((const Annotable*)Ty)->getOrCreateAnnotation(AID);
-  }
+  const StructLayout *getStructLayout(const StructType *Ty) const;
 };
 
-// This annotation (attached ONLY to StructType classes) is used to lazily
-// calculate structure layout information for a target machine, based on the
-// TargetData structure.
+// This object is used to lazily calculate structure layout information for a
+// target machine, based on the TargetData structure.
 //
-struct StructLayout : public Annotation {
+struct StructLayout {
   std::vector<uint64_t> MemberOffsets;
   uint64_t StructSize;
   unsigned StructAlignment;
 private:
   friend class TargetData;   // Only TargetData can create this class
-  inline StructLayout(const StructType *ST, const TargetData &TD);
+  StructLayout(const StructType *ST, const TargetData &TD);
 };
 
+} // End llvm namespace
+
 #endif