X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FTargetMachine.cpp;h=f50580332a65ace30c02494a9a0a0f569a5f56e1;hb=3d3067bf6bccc06ff2411caed50428f03dcd730d;hp=d508b32a399287a2d09b38dea8d9396948f147d5;hpb=0799fc479ab1eb7261f125e2312c5e192cacdb98;p=oota-llvm.git

diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index d508b32a399..f50580332a6 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -1,12 +1,13 @@
 //===-- TargetMachine.cpp - General Target Information ---------------------==//
 //
 // This file describes the general parts of a Target machine.
-// This file also implements the InstInfo interface as well...
+// This file also implements MachineCacheInfo.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Target/MachineInstrInfo.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/MachineCacheInfo.h"
+#include "llvm/Type.h"
 
 //---------------------------------------------------------------------------
 // class TargetMachine
@@ -24,62 +25,26 @@
 //   space equal to optSizeForSubWordData, and all other primitive data
 //   items use space according to the type.
 //   
-unsigned int
-TargetMachine::findOptimalStorageSize(const Type* ty) const
-{
-  switch(ty->getPrimitiveID())
-    {
-    case Type::BoolTyID:
-    case Type::UByteTyID:
-    case Type::SByteTyID:     
-    case Type::UShortTyID:
-    case Type::ShortTyID:     
-      return optSizeForSubWordData;
-    
-    default:
-      return DataLayout.getTypeSize(ty);
-    }
+unsigned TargetMachine::findOptimalStorageSize(const Type *Ty) const {
+  // Round integral values smaller than SubWordDataSize up to SubWordDataSize
+  if (Ty->isIntegral() &&
+      Ty->getPrimitiveSize() < DataLayout.getSubWordDataSize())
+    return DataLayout.getSubWordDataSize();
+
+  return DataLayout.getTypeSize(Ty);
 }
 
 
 //---------------------------------------------------------------------------
-// class MachineInstructionInfo
-//	Interface to description of machine instructions
+// class MachineCacheInfo 
+// 
+// Purpose:
+//   Describes properties of the target cache architecture.
 //---------------------------------------------------------------------------
 
-
-/*ctor*/
-MachineInstrInfo::MachineInstrInfo(const MachineInstrDescriptor* _desc,
-				   unsigned int _descSize,
-				   unsigned int _numRealOpCodes)
-  : desc(_desc), descSize(_descSize), numRealOpCodes(_numRealOpCodes)
-{
-  // FIXME: TargetInstrDescriptors should not be global
-  assert(TargetInstrDescriptors == NULL && desc != NULL);
-  TargetInstrDescriptors = desc;	// initialize global variable
-}  
-
-
-MachineInstrInfo::~MachineInstrInfo()
-{
-  TargetInstrDescriptors = NULL;	// reset global variable
-}
-
-
-bool
-MachineInstrInfo::constantFitsInImmedField(MachineOpCode opCode,
-					   int64_t intValue) const
-{
-  // First, check if opCode has an immed field.
-  bool isSignExtended;
-  uint64_t maxImmedValue = maxImmedConstant(opCode, isSignExtended);
-  if (maxImmedValue != 0)
-    {
-      // Now check if the constant fits
-      if (intValue <= (int64_t) maxImmedValue &&
-	  intValue >= -((int64_t) maxImmedValue+1))
-	return true;
-    }
-  
-  return false;
+void MachineCacheInfo::Initialize() {
+  numLevels = 2;
+  cacheLineSizes.push_back(16);  cacheLineSizes.push_back(32); 
+  cacheSizes.push_back(1 << 15); cacheSizes.push_back(1 << 20);
+  cacheAssoc.push_back(1);       cacheAssoc.push_back(4);
 }