From lattner at cs.uiuc.edu  Mon Sep  1 10:30:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 10:30:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/CustomChecked/Makefile
Message-ID: <200309011529.KAA10769@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource/CustomChecked:

Makefile updated: 1.3 -> 1.4

---
Log message:

Add C++ and EH libraries for the C++ tests


---
Diffs of the changes:

Index: llvm/test/Programs/SingleSource/CustomChecked/Makefile
diff -u llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.3 llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.4
--- llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.3	Wed May 14 14:00:46 2003
+++ llvm/test/Programs/SingleSource/CustomChecked/Makefile	Mon Sep  1 10:29:18 2003
@@ -6,6 +6,8 @@
 
 include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
 
+LIBS += -lsupc++ -lexception
+
 LLI_RUN  := $(addsuffix .run-lli, $(PREFIXED_PROGRAMS_TO_TEST))
 JIT_RUN  := $(addsuffix .run-jit, $(PREFIXED_PROGRAMS_TO_TEST))
 LLC_RUN  := $(addsuffix .run-llc, $(PREFIXED_PROGRAMS_TO_TEST))




From lattner at cs.uiuc.edu  Mon Sep  1 11:32:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:32:01 2003
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200309011631.LAA11839@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.120 -> 1.121

---
Log message:

Remove gross old hacky code that was in there for backwards compatibility
1 year is plenty of migration time!


---
Diffs of the changes:

Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.120 llvm/lib/AsmParser/llvmAsmParser.y:1.121
--- llvm/lib/AsmParser/llvmAsmParser.y:1.120	Sat Aug 23 18:14:51 2003
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Sep  1 11:31:28 2003
@@ -37,14 +37,6 @@
 
 #define YYERROR_VERBOSE 1
 
-// HACK ALERT: This variable is used to implement the automatic conversion of
-// load/store instructions with indexes into a load/store + getelementptr pair
-// of instructions.  When this compatiblity "Feature" is removed, this should be
-// too.
-//
-static BasicBlock *CurBB;
-
-
 // This contains info used when building the body of a function.  It is
 // destroyed when the function is completed.
 //
@@ -1457,7 +1449,7 @@
     $$ = $1;
   }
   | /* empty */ {
-    $$ = CurBB = new BasicBlock();
+    $$ = new BasicBlock();
   };
 
 BBTerminatorInst : RET ResolvedVal {              // Return with a result...
@@ -1741,66 +1733,27 @@
     $$ = new FreeInst($2);
   }
 
-  | LOAD Types ValueRef IndexList {
+  | LOAD Types ValueRef {
     if (!isa<PointerType>($2->get()))
       ThrowException("Can't load from nonpointer type: " +
 		     (*$2)->getDescription());
-    if (GetElementPtrInst::getIndexedType(*$2, *$4) == 0)
-      ThrowException("Invalid indices for load instruction!");
-
-    Value *Src = getVal(*$2, $3);
-    if (!$4->empty()) {
-      std::cerr << "WARNING: Use of index load instruction:"
-                << " replacing with getelementptr/load pair.\n";
-      // Create a getelementptr hack instruction to do the right thing for
-      // compatibility.
-      //
-      Instruction *I = new GetElementPtrInst(Src, *$4);
-      CurBB->getInstList().push_back(I);
-      Src = I;
-    }
-
-    $$ = new LoadInst(Src);
-    delete $4;   // Free the vector...
+    $$ = new LoadInst(getVal(*$2, $3));
     delete $2;
   }
-  | STORE ResolvedVal ',' Types ValueRef IndexList {
-    if (!isa<PointerType>($4->get()))
+  | STORE ResolvedVal ',' Types ValueRef {
+    const PointerType *PT = dyn_cast<PointerType>($4->get());
+    if (!PT)
       ThrowException("Can't store to a nonpointer type: " +
                      (*$4)->getDescription());
-    const Type *ElTy = GetElementPtrInst::getIndexedType(*$4, *$6);
-    if (ElTy == 0)
-      ThrowException("Can't store into that field list!");
+    const Type *ElTy = PT->getElementType();
     if (ElTy != $2->getType())
       ThrowException("Can't store '" + $2->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'!");
 
-    Value *Ptr = getVal(*$4, $5);
-    if (!$6->empty()) {
-      std::cerr << "WARNING: Use of index store instruction:"
-                << " replacing with getelementptr/store pair.\n";
-      // Create a getelementptr hack instruction to do the right thing for
-      // compatibility.
-      //
-      Instruction *I = new GetElementPtrInst(Ptr, *$6);
-      CurBB->getInstList().push_back(I);
-      Ptr = I;
-    }
-
-    $$ = new StoreInst($2, Ptr);
-    delete $4; delete $6;
+    $$ = new StoreInst($2, getVal(*$4, $5));
+    delete $4;
   }
   | GETELEMENTPTR Types ValueRef IndexList {
-    for (unsigned i = 0, e = $4->size(); i != e; ++i) {
-      if ((*$4)[i]->getType() == Type::UIntTy) {
-        std::cerr << "WARNING: Use of uint type indexes to getelementptr "
-                  << "instruction: replacing with casts to long type.\n";
-        Instruction *I = new CastInst((*$4)[i], Type::LongTy);
-        CurBB->getInstList().push_back(I);
-        (*$4)[i] = I;
-      }
-    }
-
     if (!isa<PointerType>($2->get()))
       ThrowException("getelementptr insn requires pointer operand!");
     if (!GetElementPtrInst::getIndexedType(*$2, *$4, true))




From lattner at cs.uiuc.edu  Mon Sep  1 11:36:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:36:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200309011635.LAA11885@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.33 -> 1.34

---
Log message:

Fix spell-o


---
Diffs of the changes:

Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.33 llvm/include/llvm/DerivedTypes.h:1.34
--- llvm/include/llvm/DerivedTypes.h:1.33	Thu Aug 21 17:08:59 2003
+++ llvm/include/llvm/DerivedTypes.h	Mon Sep  1 11:35:30 2003
@@ -58,7 +58,8 @@
   // removeAbstractTypeUser - Notify an abstract type that a user of the class
   // no longer has a handle to the type.  This function is called primarily by
   // the PATypeHandle class.  When there are no users of the abstract type, it
-  // is anihilated, because there is no way to get a reference to it ever again.
+  // is annihilated, because there is no way to get a reference to it ever
+  // again.
   //
   void removeAbstractTypeUser(AbstractTypeUser *U) const;
 




From lattner at cs.uiuc.edu  Mon Sep  1 11:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:39:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200309011638.LAA14332@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.34 -> 1.35

---
Log message:

Other minor cleanups while I'm in the area


---
Diffs of the changes:

Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.34 llvm/include/llvm/DerivedTypes.h:1.35
--- llvm/include/llvm/DerivedTypes.h:1.34	Mon Sep  1 11:35:30 2003
+++ llvm/include/llvm/DerivedTypes.h	Mon Sep  1 11:38:43 2003
@@ -83,8 +83,7 @@
 
 
 
-class FunctionType : public DerivedType {
-public:
+struct FunctionType : public DerivedType {
   typedef std::vector<PATypeHandle> ParamTypes;
 private:
   PATypeHandle ResultType;
@@ -150,7 +149,6 @@
 class CompositeType : public DerivedType {
 protected:
   inline CompositeType(PrimitiveID id) : DerivedType(id) { }
-
 public:
 
   // getTypeAtIndex - Given an index value into the type, return the type of the
@@ -250,7 +248,6 @@
     : CompositeType(TID), ElementType(PATypeHandle(ElType, this)) {
   }
 public:
-
   inline const Type *getElementType() const { return ElementType; }
 
   virtual const Type *getContainedType(unsigned i) const { 
@@ -295,7 +292,6 @@
   // from GCC to make them protected:  warning: `class ArrayType' only 
   // defines private constructors and has no friends
 
-
   // Private ctor - Only can be created by a static member...
   ArrayType(const Type *ElType, unsigned NumEl);
 public:
@@ -329,7 +325,6 @@
   // from GCC to make them protected:  warning: `class PointerType' only 
   // defines private constructors and has no friends
 
-
   // Private ctor - Only can be created by a static member...
   PointerType(const Type *ElType);
 public:
@@ -354,9 +349,8 @@
 
 
 class OpaqueType : public DerivedType {
-private:
-  OpaqueType(const OpaqueType &);                   // Do not implement
-  const OpaqueType &operator=(const OpaqueType &);  // Do not implement
+  OpaqueType(const OpaqueType &);                   // DO NOT IMPLEMENT
+  const OpaqueType &operator=(const OpaqueType &);  // DO NOT IMPLEMENT
 protected:
   // This should really be private, but it squelches a bogus warning
   // from GCC to make them protected:  warning: `class OpaqueType' only 
@@ -364,7 +358,6 @@
 
   // Private ctor - Only can be created by a static member...
   OpaqueType();
-
 public:
 
   // get - Static factory method for the OpaqueType class...




From lattner at cs.uiuc.edu  Mon Sep  1 11:43:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:43:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Parallelize.h
Message-ID: <200309011642.LAA24129@neo.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

Parallelize.h (r1.1) removed

---
Log message:

This file is just a subset of Cilkifier.h


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 11:43:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:43:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Parallelize.cpp
Message-ID: <200309011642.LAA24118@neo.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Parallelize.cpp updated: 1.3 -> 1.4

---
Log message:

Minor cleanups
Do not #include Parallelize.h, it's just a subset of Cilkifier.h


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/Parallelize.cpp
diff -u llvm/lib/Transforms/IPO/Parallelize.cpp:1.3 llvm/lib/Transforms/IPO/Parallelize.cpp:1.4
--- llvm/lib/Transforms/IPO/Parallelize.cpp:1.3	Wed Aug  6 12:16:24 2003
+++ llvm/lib/Transforms/IPO/Parallelize.cpp	Mon Sep  1 11:42:16 2003
@@ -1,4 +1,4 @@
-//===- Parallelize.cpp - Auto parallelization using DS Graphs ---*- C++ -*-===//
+//===- Parallelize.cpp - Auto parallelization using DS Graphs -------------===//
 //
 // This file implements a pass that automatically parallelizes a program,
 // using the Cilk multi-threaded runtime system to execute parallel code.
@@ -28,19 +28,16 @@
 // -- Excessive overhead at "spawned" function calls, which has no benefit
 //    once all threads are busy (especially common when the degree of
 //    parallelism is low).
+//
 //===----------------------------------------------------------------------===//
 
-
-#include "llvm/Transforms/Parallelize.h"
 #include "llvm/Transforms/Utils/DemoteRegToStack.h"
 #include "llvm/Analysis/PgmDependenceGraph.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"
 #include "llvm/Module.h"
-#include "llvm/Function.h"
-#include "llvm/iOther.h"
-#include "llvm/iPHINode.h"
+#include "llvm/Instructions.h"
 #include "llvm/iTerminators.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/InstVisitor.h"
@@ -49,8 +46,6 @@
 #include "Support/STLExtras.h"
 #include "Support/hash_set"
 #include "Support/hash_map"
-#include <vector>
-#include <stack>
 #include <functional>
 #include <algorithm>
 
@@ -221,14 +216,14 @@
   // Now find all outgoing SSA dependences to the eventual non-Phi users of
   // the call value (i.e., direct users that are not phis, and for any
   // user that is a Phi, direct non-Phi users of that Phi, and recursively).
-  std::stack<const PHINode*> phiUsers;
+  std::vector<const PHINode*> phiUsers;
   hash_set<const PHINode*> phisSeen;    // ensures we don't visit a phi twice
   for (Value::use_iterator UI=CI.use_begin(), UE=CI.use_end(); UI != UE; ++UI)
     if (const PHINode* phiUser = dyn_cast<PHINode>(*UI))
       {
         if (phisSeen.find(phiUser) == phisSeen.end())
           {
-            phiUsers.push(phiUser);
+            phiUsers.push_back(phiUser);
             phisSeen.insert(phiUser);
           }
       }
@@ -237,16 +232,16 @@
 
   // Now we've found the non-Phi users and immediate phi users.
   // Recursively walk the phi users and add their non-phi users.
-  for (const PHINode* phiUser; !phiUsers.empty(); phiUsers.pop())
+  for (const PHINode* phiUser; !phiUsers.empty(); phiUsers.pop_back())
     {
-      phiUser = phiUsers.top();
+      phiUser = phiUsers.back();
       for (Value::use_const_iterator UI=phiUser->use_begin(),
              UE=phiUser->use_end(); UI != UE; ++UI)
         if (const PHINode* pn = dyn_cast<PHINode>(*UI))
           {
             if (phisSeen.find(pn) == phisSeen.end())
               {
-                phiUsers.push(pn);
+                phiUsers.push_back(pn);
                 phisSeen.insert(pn);
               }
           }




From lattner at cs.uiuc.edu  Mon Sep  1 11:46:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:46:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Cilkifier.cpp Parallelize.cpp
Message-ID: <200309011645.LAA23116@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Cilkifier.cpp updated: 1.1 -> 1.2
Parallelize.cpp updated: 1.4 -> 1.5

---
Log message:

Moved all of the cilkifier stuff into lib/Transforms/IPO, as it really is not
support stuff.


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/Cilkifier.cpp
diff -u llvm/lib/Transforms/IPO/Cilkifier.cpp:1.1 llvm/lib/Transforms/IPO/Cilkifier.cpp:1.2
--- llvm/lib/Transforms/IPO/Cilkifier.cpp:1.1	Tue Dec 10 07:08:48 2002
+++ llvm/lib/Transforms/IPO/Cilkifier.cpp	Mon Sep  1 11:45:30 2003
@@ -6,12 +6,10 @@
 //===----------------------------------------------------------------------===//
 
 
-#include "llvm/Support/Cilkifier.h"
+#include "Cilkifier.h"
 #include "llvm/Function.h"
 #include "llvm/iOther.h"
 #include "llvm/DerivedTypes.h"
-#include <vector>
-
 
 //---------------------------------------------------------------------------- 
 // Global constants used in marking Cilk functions and function calls.


Index: llvm/lib/Transforms/IPO/Parallelize.cpp
diff -u llvm/lib/Transforms/IPO/Parallelize.cpp:1.4 llvm/lib/Transforms/IPO/Parallelize.cpp:1.5
--- llvm/lib/Transforms/IPO/Parallelize.cpp:1.4	Mon Sep  1 11:42:16 2003
+++ llvm/lib/Transforms/IPO/Parallelize.cpp	Mon Sep  1 11:45:30 2003
@@ -31,6 +31,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Cilkifier.h"
 #include "llvm/Transforms/Utils/DemoteRegToStack.h"
 #include "llvm/Analysis/PgmDependenceGraph.h"
 #include "llvm/Analysis/Dominators.h"
@@ -41,7 +42,6 @@
 #include "llvm/iTerminators.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/InstVisitor.h"
-#include "llvm/Support/Cilkifier.h"
 #include "Support/Statistic.h"
 #include "Support/STLExtras.h"
 #include "Support/hash_set"




From lattner at cs.uiuc.edu  Mon Sep  1 11:50:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:50:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Parallelize.cpp
Message-ID: <200309011649.LAA23556@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Parallelize.cpp updated: 1.5 -> 1.6

---
Log message:

If "These should be used only by the auto-parallelization pass", we might as
well put them INTO the auto-par pass.


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/Parallelize.cpp
diff -u llvm/lib/Transforms/IPO/Parallelize.cpp:1.5 llvm/lib/Transforms/IPO/Parallelize.cpp:1.6
--- llvm/lib/Transforms/IPO/Parallelize.cpp:1.5	Mon Sep  1 11:45:30 2003
+++ llvm/lib/Transforms/IPO/Parallelize.cpp	Mon Sep  1 11:49:38 2003
@@ -31,7 +31,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Cilkifier.h"
 #include "llvm/Transforms/Utils/DemoteRegToStack.h"
 #include "llvm/Analysis/PgmDependenceGraph.h"
 #include "llvm/Analysis/Dominators.h"
@@ -84,6 +83,37 @@
 }
 
 #endif
+
+
+//---------------------------------------------------------------------------- 
+// Global constants used in marking Cilk functions and function calls.
+//---------------------------------------------------------------------------- 
+
+static const char * const CilkSuffix = ".llvm2cilk";
+static const char * const DummySyncFuncName = "__sync.llvm2cilk";
+
+//---------------------------------------------------------------------------- 
+// Routines to identify Cilk functions, calls to Cilk functions, and syncs.
+//---------------------------------------------------------------------------- 
+
+static bool isCilk(const Function& F) {
+  return (F.getName().rfind(CilkSuffix) ==
+          F.getName().size() - std::strlen(CilkSuffix));
+}
+
+static bool isCilkMain(const Function& F) {
+  return F.getName() == "main" + std::string(CilkSuffix);
+}
+
+
+static bool isCilk(const CallInst& CI) {
+  return CI.getCalledFunction() && isCilk(*CI.getCalledFunction());
+}
+
+static bool isSync(const CallInst& CI) { 
+  return CI.getCalledFunction() &&
+         CI.getCalledFunction()->getName() == DummySyncFuncName;
+}
 
 
 //---------------------------------------------------------------------------- 




From lattner at cs.uiuc.edu  Mon Sep  1 11:51:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:51:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Cilkifier.cpp Cilkifier.h
Message-ID: <200309011650.LAA23573@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Cilkifier.cpp (r1.2) removed
Cilkifier.h (r1.1) removed

---
Log message:

Dead files


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 11:54:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 11:54:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Parallelize.cpp
Message-ID: <200309011653.LAA23893@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Parallelize.cpp updated: 1.6 -> 1.7

---
Log message:

Not only is this a lot smaller, it actually works if there is already a 
function with the right name in the module.


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/Parallelize.cpp
diff -u llvm/lib/Transforms/IPO/Parallelize.cpp:1.6 llvm/lib/Transforms/IPO/Parallelize.cpp:1.7
--- llvm/lib/Transforms/IPO/Parallelize.cpp:1.6	Mon Sep  1 11:49:38 2003
+++ llvm/lib/Transforms/IPO/Parallelize.cpp	Mon Sep  1 11:53:46 2003
@@ -158,11 +158,7 @@
 Cilkifier::Cilkifier(Module& M)
 {
   // create the dummy Sync function and add it to the Module
-  DummySyncFunc = new Function(FunctionType::get( Type::VoidTy,
-                                                 std::vector<const Type*>(),
-                                                 /*isVararg*/ false),
-                               GlobalValue::ExternalLinkage, DummySyncFuncName,
-                               &M);
+  DummySyncFunc = M.getOrInsertFunction(DummySyncFuncName, Type::VoidTy, 0);
 }
 
 void Cilkifier::TransformFunc(Function* F,




From lattner at cs.uiuc.edu  Mon Sep  1 13:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 13:02:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Parallelize.cpp
Message-ID: <200309011801.NAA24705@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Parallelize.cpp updated: 1.7 -> 1.8

---
Log message:

Final cleanup: remove dead code


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/Parallelize.cpp
diff -u llvm/lib/Transforms/IPO/Parallelize.cpp:1.7 llvm/lib/Transforms/IPO/Parallelize.cpp:1.8
--- llvm/lib/Transforms/IPO/Parallelize.cpp:1.7	Mon Sep  1 11:53:46 2003
+++ llvm/lib/Transforms/IPO/Parallelize.cpp	Mon Sep  1 13:01:36 2003
@@ -33,12 +33,10 @@
 
 #include "llvm/Transforms/Utils/DemoteRegToStack.h"
 #include "llvm/Analysis/PgmDependenceGraph.h"
-#include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "llvm/iTerminators.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/InstVisitor.h"
 #include "Support/Statistic.h"
@@ -47,43 +45,6 @@
 #include "Support/hash_map"
 #include <functional>
 #include <algorithm>
-
-
-
-#if 0
-void AddToDomSet(vector<BasicBlock*>& domSet, BasicBlock* bb,
-                 const DominatorTree& domTree)
-{
-  DominatorTreeBase::Node* bbNode = domTree.getNode(bb);
-  const std::vector<Node*>& domKids = bbNode.getChildren();
-  domSet.insert(domSet.end(), domKids.begin(), domKids.end());
-  for (unsigned i = 0; i < domKids.size(); ++i)
-    AddToDomSet(domSet, domKids[i]->getNode(), domTree);
-}
-
-bool CheckDominance(Function& func,
-                    const CallInst& callInst1,
-                    const CallInst& callInst2)
-{
-  if (callInst1 == callInst2)           // makes sense if this is in a loop but
-    return false;                       // we're not handling loops yet
-
-  // Check first if one call dominates the other
-  DominatorSet& domSet = getAnalysis<DominatorSet>(func);
-  if (domSet.dominates(callInst2, callInst1))
-    { // swap callInst1 and callInst2
-      const CallInst& tmp = callInst2; callInst2 = callInst1; callInst1 = tmp;
-    }
-  else if (! domSet.dominates(callInst1, callInst2))
-    return false;                       // neither dominates the other: 
-
-  // 
-  if (! AreIndependent(func, callInst1, callInst2))
-    return false;
-}
-
-#endif
-
 
 //---------------------------------------------------------------------------- 
 // Global constants used in marking Cilk functions and function calls.




From lattner at cs.uiuc.edu  Mon Sep  1 14:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 14:57:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegClassInfo.cpp SparcRegClassInfo.h SparcRegInfo.cpp
Message-ID: <200309011956.OAA27333@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegClassInfo.cpp updated: 1.25 -> 1.26
SparcRegClassInfo.h updated: 1.19 -> 1.20
SparcRegInfo.cpp updated: 1.106 -> 1.107

---
Log message:

No longer include IGNode.h in the Sparc global header


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcRegClassInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.25 llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.26
--- llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.25	Fri Jul 25 16:12:15 2003
+++ llvm/lib/Target/Sparc/SparcRegClassInfo.cpp	Mon Sep  1 14:56:48 2003
@@ -8,6 +8,7 @@
 #include "SparcInternals.h"
 #include "llvm/Type.h"
 #include "../../CodeGen/RegAlloc/RegAllocCommon.h"   // FIXME!
+#include "llvm/CodeGen/IGNode.h"
 
 //-----------------------------------------------------------------------------
 // Int Register Class - method for coloring a node in the interference graph.
@@ -160,6 +161,19 @@
 
   Node->setColor(ccReg);                // only one int cc reg is available
 }
+
+
+void SparcFloatCCRegClass::colorIGNode(IGNode *Node,
+                                const std::vector<bool> &IsColorUsedArr) const {
+  for(unsigned c = 0; c != 4; ++c)
+    if (!IsColorUsedArr[c]) { // find unused color
+      Node->setColor(c);   
+      return;
+    }
+  
+  Node->getParentLR()->markForSpill();
+}
+
 
 
 //-----------------------------------------------------------------------------


Index: llvm/lib/Target/Sparc/SparcRegClassInfo.h
diff -u llvm/lib/Target/Sparc/SparcRegClassInfo.h:1.19 llvm/lib/Target/Sparc/SparcRegClassInfo.h:1.20
--- llvm/lib/Target/Sparc/SparcRegClassInfo.h:1.19	Fri Jul 25 16:12:15 2003
+++ llvm/lib/Target/Sparc/SparcRegClassInfo.h	Mon Sep  1 14:56:48 2003
@@ -8,7 +8,6 @@
 #define SPARC_REG_CLASS_INFO_H
 
 #include "llvm/Target/TargetRegInfo.h"
-#include "llvm/CodeGen/IGNode.h"
 
 //-----------------------------------------------------------------------------
 // Integer Register Class
@@ -175,15 +174,7 @@
     : TargetRegClassInfo(ID, 4, 5) {  }
 
   void colorIGNode(IGNode *Node,
-                   const std::vector<bool> &IsColorUsedArr) const {
-    for(unsigned c = 0; c != 4; ++c)
-      if (!IsColorUsedArr[c]) { // find unused color
-        Node->setColor(c);   
-        return;
-      }
-
-    Node->getParentLR()->markForSpill();
-  }
+                   const std::vector<bool> &IsColorUsedArr) const;
   
   // according to  Sparc 64 ABI, all %fp CC regs are volatile
   //


Index: llvm/lib/Target/Sparc/SparcRegInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.106 llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.107
--- llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.106	Tue Jul 29 14:53:21 2003
+++ llvm/lib/Target/Sparc/SparcRegInfo.cpp	Mon Sep  1 14:56:48 2003
@@ -14,6 +14,7 @@
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
 #include "llvm/CodeGen/LiveRangeInfo.h"
+#include "llvm/CodeGen/IGNode.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"
 #include "llvm/Function.h"




From lattner at cs.uiuc.edu  Mon Sep  1 14:59:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 14:59:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegInfo.cpp
Message-ID: <200309011958.OAA27654@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegInfo.cpp updated: 1.107 -> 1.108

---
Log message:

This file just needs LiveRange.h not IGNode.h


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcRegInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.107 llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.108
--- llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.107	Mon Sep  1 14:56:48 2003
+++ llvm/lib/Target/Sparc/SparcRegInfo.cpp	Mon Sep  1 14:58:02 2003
@@ -14,7 +14,7 @@
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
 #include "llvm/CodeGen/LiveRangeInfo.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "llvm/CodeGen/LiveRange.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"
 #include "llvm/Function.h"
@@ -941,7 +941,7 @@
 
 void UltraSparcRegInfo::printReg(const LiveRange *LR) const {
   unsigned RegClassID = LR->getRegClassID();
-  std::cerr << " *Node " << (LR->getUserIGNode())->getIndex();
+  std::cerr << " Node ";
 
   if (!LR->hasColor()) {
     std::cerr << " - could not find a color\n";




From lattner at cs.uiuc.edu  Mon Sep  1 15:01:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:01:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegClassInfo.cpp
Message-ID: <200309012000.PAA27851@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegClassInfo.cpp updated: 1.26 -> 1.27

---
Log message:

IGNode got moved to lib/CodeGen/RegAlloc


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcRegClassInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.26 llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.27
--- llvm/lib/Target/Sparc/SparcRegClassInfo.cpp:1.26	Mon Sep  1 14:56:48 2003
+++ llvm/lib/Target/Sparc/SparcRegClassInfo.cpp	Mon Sep  1 15:00:08 2003
@@ -8,7 +8,7 @@
 #include "SparcInternals.h"
 #include "llvm/Type.h"
 #include "../../CodeGen/RegAlloc/RegAllocCommon.h"   // FIXME!
-#include "llvm/CodeGen/IGNode.h"
+#include "../../CodeGen/RegAlloc/IGNode.h"           // FIXME!
 
 //-----------------------------------------------------------------------------
 // Int Register Class - method for coloring a node in the interference graph.




From lattner at cs.uiuc.edu  Mon Sep  1 15:06:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:06:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/IGNode.cpp InterferenceGraph.cpp LiveRangeInfo.cpp PhyRegAlloc.cpp RegClass.cpp
Message-ID: <200309012005.PAA29518@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

IGNode.cpp updated: 1.8 -> 1.9
InterferenceGraph.cpp updated: 1.15 -> 1.16
LiveRangeInfo.cpp updated: 1.42 -> 1.43
PhyRegAlloc.cpp updated: 1.105 -> 1.106
RegClass.cpp updated: 1.23 -> 1.24

---
Log message:

Move IGNode from public include directory to here.  Minor cleanups like adding std:: namespace qualifiers


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/IGNode.cpp
diff -u llvm/lib/CodeGen/RegAlloc/IGNode.cpp:1.8 llvm/lib/CodeGen/RegAlloc/IGNode.cpp:1.9
--- llvm/lib/CodeGen/RegAlloc/IGNode.cpp:1.8	Thu Sep 19 19:45:46 2002
+++ llvm/lib/CodeGen/RegAlloc/IGNode.cpp	Mon Sep  1 15:05:47 2003
@@ -1,13 +1,12 @@
-//===-- IGNode.cpp -------------------------------------------------------===//
+//===-- IGNode.cpp --------------------------------------------------------===//
 // 
 //  class IGNode for coloring-based register allocation for LLVM.
 // 
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/IGNode.h"
+#include "IGNode.h"
 #include <algorithm>
 #include <iostream>
-using std::cerr;
 
 //-----------------------------------------------------------------------------
 // Sets this IGNode on stack and reduce the degree of neighbors  
@@ -18,7 +17,7 @@
   int neighs = AdjList.size();
 
   if (neighs < 0) {
-    cerr << "\nAdj List size = " << neighs;
+    std::cerr << "\nAdj List size = " << neighs;
     assert(0 && "Invalid adj list size");
   }
 


Index: llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
diff -u llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp:1.15 llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp:1.16
--- llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp:1.15	Thu Jul 10 14:43:33 2003
+++ llvm/lib/CodeGen/RegAlloc/InterferenceGraph.cpp	Mon Sep  1 15:05:47 2003
@@ -6,7 +6,7 @@
 
 #include "RegAllocCommon.h"
 #include "InterferenceGraph.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "IGNode.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
 using std::cerr;
@@ -22,22 +22,18 @@
 // The matrix is NOT yet created by the constructor. Call createGraph() 
 // to create it after adding all IGNodes to the IGNodeList.
 //-----------------------------------------------------------------------------
-InterferenceGraph::InterferenceGraph(RegClass *const RC) : RegCl(RC), 
-							   IGNodeList() 
-{   
+InterferenceGraph::InterferenceGraph(RegClass *const RC) : RegCl(RC) {
   IG = NULL;         
   Size = 0;            
-  if( DEBUG_RA >= RA_DEBUG_Interference) {
-    cerr << "Interference graph created!\n";
-  }
+  if( DEBUG_RA >= RA_DEBUG_Interference)
+    std::cerr << "Interference graph created!\n";
 }
 
 
 //-----------------------------------------------------------------------------
 // destructor. Deletes the bit matrix and all IGNodes
 //-----------------------------------------------------------------------------
-InterferenceGraph:: ~InterferenceGraph() {             
-
+InterferenceGraph:: ~InterferenceGraph() {
   // delete the matrix
   for(unsigned int r=0; r < IGNodeList.size(); ++r)
     delete[] IG[r];
@@ -98,7 +94,7 @@
   char *val;
 
   if( DEBUG_RA >= RA_DEBUG_Interference) 
-    cerr << "setting intf for: [" << row << "][" <<  col << "]\n"; 
+    std::cerr << "setting intf for: [" << row << "][" <<  col << "]\n"; 
 
   ( row > col) ?  val = &IG[row][col]: val = &IG[col][row]; 
 
@@ -152,9 +148,9 @@
   assertIGNode(this, SrcNode);
 
   if( DEBUG_RA >= RA_DEBUG_Interference) {
-    cerr << "Merging LRs: \""; printSet(*LR1); 
-    cerr << "\" and \""; printSet(*LR2);
-    cerr << "\"\n";
+    std::cerr << "Merging LRs: \""; printSet(*LR1);
+    std::cerr << "\" and \""; printSet(*LR2);
+    std::cerr << "\"\n";
   }
 
   unsigned SrcDegree = SrcNode->getNumOfNeighbors();
@@ -215,20 +211,16 @@
 //----------------------------------------------------------------------------
 // Print the IGnodes 
 //----------------------------------------------------------------------------
-void InterferenceGraph::printIG() const
-{
-
-  for(unsigned int i=0; i < Size; i++) {   
-
+void InterferenceGraph::printIG() const {
+  for(unsigned i=0; i < Size; i++) {   
     const IGNode *const Node = IGNodeList[i];
     if(Node) {
-      cerr << " [" << i << "] ";
+      std::cerr << " [" << i << "] ";
 
-      for( unsigned int j=0; j < Size; j++) {
+      for( unsigned int j=0; j < Size; j++)
 	if(IG[i][j])
-          cerr << "(" << i << "," << j << ") ";
-      }
-      cerr << "\n";
+          std::cerr << "(" << i << "," << j << ") ";
+      std::cerr << "\n";
     }
   }
 }
@@ -236,16 +228,15 @@
 //----------------------------------------------------------------------------
 // Print the IGnodes in the IGNode List
 //----------------------------------------------------------------------------
-void InterferenceGraph::printIGNodeList() const
-{
+void InterferenceGraph::printIGNodeList() const {
   for(unsigned i=0; i < IGNodeList.size() ; ++i) {
     const IGNode *const Node = IGNodeList[i];
 
     if (Node) {
-      cerr << " [" << Node->getIndex() << "] ";
+      std::cerr << " [" << Node->getIndex() << "] ";
       printSet(*Node->getParentLR());
       //int Deg = Node->getCurDegree();
-      cerr << "\t <# of Neighs: " << Node->getNumOfNeighbors() << ">\n";
+      std::cerr << "\t <# of Neighs: " << Node->getNumOfNeighbors() << ">\n";
     }
   }
 }


Index: llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
diff -u llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.42 llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.43
--- llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.42	Fri Jul 25 16:06:09 2003
+++ llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp	Mon Sep  1 15:05:47 2003
@@ -7,7 +7,7 @@
 #include "llvm/CodeGen/LiveRangeInfo.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "IGNode.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/Target/TargetMachine.h"
@@ -15,7 +15,6 @@
 #include "llvm/Target/TargetRegInfo.h"
 #include "llvm/Function.h"
 #include "Support/SetOperations.h"
-using std::cerr;
 
 unsigned LiveRange::getRegClassID() const { return getRegClass()->getID(); }
 
@@ -105,9 +104,9 @@
                                                              isCC)]);
 
   if (DEBUG_RA >= RA_DEBUG_LiveRanges) {
-    cerr << "  Creating a LR for def ";
-    if (isCC) cerr << " (CC Register!)";
-    cerr << " : " << RAV(Def) << "\n";
+    std::cerr << "  Creating a LR for def ";
+    if (isCC) std::cerr << " (CC Register!)";
+    std::cerr << " : " << RAV(Def) << "\n";
   }
   return DefRange;
 }
@@ -125,7 +124,7 @@
     DefRange->insert(Def);          // add the operand to the range
     LiveRangeMap[Def] = DefRange;   // make operand point to merged set
     if (DEBUG_RA >= RA_DEBUG_LiveRanges)
-      cerr << "   Added to existing LR for def: " << RAV(Def) << "\n";
+      std::cerr << "   Added to existing LR for def: " << RAV(Def) << "\n";
   }
   return DefRange;
 }
@@ -139,7 +138,7 @@
 void LiveRangeInfo::constructLiveRanges() {  
 
   if (DEBUG_RA >= RA_DEBUG_LiveRanges) 
-    cerr << "Constructing Live Ranges ...\n";
+    std::cerr << "Constructing Live Ranges ...\n";
 
   // first find the live ranges for all incoming args of the function since
   // those LRs start from the start of the function
@@ -221,7 +220,7 @@
   suggestRegs4CallRets();
 
   if( DEBUG_RA >= RA_DEBUG_LiveRanges) 
-    cerr << "Initial Live Ranges constructed!\n";
+    std::cerr << "Initial Live Ranges constructed!\n";
 }
 
 
@@ -318,7 +317,7 @@
 void LiveRangeInfo::coalesceLRs()  
 {
   if(DEBUG_RA >= RA_DEBUG_LiveRanges) 
-    cerr << "\nCoalescing LRs ...\n";
+    std::cerr << "\nCoalescing LRs ...\n";
 
   MachineFunction &MF = MachineFunction::get(Meth);
   for (MachineFunction::iterator BBI = MF.begin(); BBI != MF.end(); ++BBI) {
@@ -329,9 +328,9 @@
       const MachineInstr *MI = *MII;
 
       if( DEBUG_RA >= RA_DEBUG_LiveRanges) {
-	cerr << " *Iterating over machine instr ";
+	std::cerr << " *Iterating over machine instr ";
 	MI->dump();
-	cerr << "\n";
+	std::cerr << "\n";
       }
 
       // iterate over  MI operands to find defs
@@ -348,7 +347,7 @@
 	    if (!LROfUse) {             // if LR of use is not found
 	      //don't warn about labels
 	      if (!isa<BasicBlock>(*UseI) && DEBUG_RA >= RA_DEBUG_LiveRanges)
-		cerr << " !! Warning: No LR for use " << RAV(*UseI) << "\n";
+		std::cerr << " !! Warning: No LR for use " << RAV(*UseI)<< "\n";
 	      continue;                 // ignore and continue
 	    }
 
@@ -388,7 +387,7 @@
   } // for all BBs
 
   if (DEBUG_RA >= RA_DEBUG_LiveRanges) 
-    cerr << "\nCoalescing Done!\n";
+    std::cerr << "\nCoalescing Done!\n";
 }
 
 /*--------------------------- Debug code for printing ---------------*/
@@ -396,15 +395,15 @@
 
 void LiveRangeInfo::printLiveRanges() {
   LiveRangeMapType::iterator HMI = LiveRangeMap.begin();   // hash map iterator
-  cerr << "\nPrinting Live Ranges from Hash Map:\n";
+  std::cerr << "\nPrinting Live Ranges from Hash Map:\n";
   for( ; HMI != LiveRangeMap.end(); ++HMI) {
     if (HMI->first && HMI->second) {
-      cerr << " Value* " << RAV(HMI->first) << "\t: "; 
+      std::cerr << " Value* " << RAV(HMI->first) << "\t: "; 
       if (IGNode* igNode = HMI->second->getUserIGNode())
-        cerr << "LR# " << igNode->getIndex();
+        std::cerr << "LR# " << igNode->getIndex();
       else
-        cerr << "LR# " << "<no-IGNode>";
-      cerr << "\t:Values = "; printSet(*HMI->second); cerr << "\n";
+        std::cerr << "LR# " << "<no-IGNode>";
+      std::cerr << "\t:Values = "; printSet(*HMI->second); std::cerr << "\n";
     }
   }
 }


Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.105 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.106
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.105	Thu Aug 14 01:09:30 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Mon Sep  1 15:05:47 2003
@@ -7,7 +7,7 @@
 #include "llvm/CodeGen/RegisterAllocation.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "IGNode.h"
 #include "llvm/CodeGen/PhyRegAlloc.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
@@ -27,8 +27,6 @@
 #include "Support/SetOperations.h"
 #include "Support/CommandLine.h"
 #include <math.h>
-using std::cerr;
-using std::vector;
 
 RegAllocDebugLevel_t DEBUG_RA;
 
@@ -57,13 +55,13 @@
     
     bool runOnFunction(Function &F) {
       if (DEBUG_RA)
-        cerr << "\n********* Function "<< F.getName() << " ***********\n";
+        std::cerr << "\n********* Function "<< F.getName() << " ***********\n";
       
       PhyRegAlloc PRA(&F, Target, &getAnalysis<FunctionLiveVarInfo>(),
                       &getAnalysis<LoopInfo>());
       PRA.allocateRegisters();
       
-      if (DEBUG_RA) cerr << "\nRegister allocation complete!\n";
+      if (DEBUG_RA) std::cerr << "\nRegister allocation complete!\n";
       return false;
     }
 
@@ -110,7 +108,7 @@
 // and IGNodeList (one in each IG). The actual nodes will be pushed later. 
 //----------------------------------------------------------------------------
 void PhyRegAlloc::createIGNodeListsAndIGs() {
-  if (DEBUG_RA >= RA_DEBUG_LiveRanges) cerr << "Creating LR lists ...\n";
+  if (DEBUG_RA >= RA_DEBUG_LiveRanges) std::cerr << "Creating LR lists ...\n";
 
   // hash map iterator
   LiveRangeMapType::const_iterator HMI = LRI.getLiveRangeMap()->begin();   
@@ -123,7 +121,7 @@
       LiveRange *L = HMI->second;   // get the LiveRange
       if (!L) { 
         if (DEBUG_RA)
-          cerr << "\n**** ?!?WARNING: NULL LIVE RANGE FOUND FOR: "
+          std::cerr << "\n**** ?!?WARNING: NULL LIVE RANGE FOUND FOR: "
                << RAV(HMI->first) << "****\n";
         continue;
       }
@@ -141,7 +139,7 @@
   for ( unsigned rc=0; rc < NumOfRegClasses ; rc++)  
     RegClassList[rc]->createInterferenceGraph();
 
-  if (DEBUG_RA >= RA_DEBUG_LiveRanges) cerr << "LRLists Created!\n";
+  if (DEBUG_RA >= RA_DEBUG_LiveRanges) std::cerr << "LRLists Created!\n";
 }
 
 
@@ -172,7 +170,7 @@
   for ( ; LIt != LVSet->end(); ++LIt) {
 
     if (DEBUG_RA >= RA_DEBUG_Verbose)
-      cerr << "< Def=" << RAV(Def) << ", Lvar=" << RAV(*LIt) << "> ";
+      std::cerr << "< Def=" << RAV(Def) << ", Lvar=" << RAV(*LIt) << "> ";
 
     //  get the live range corresponding to live var
     // 
@@ -201,7 +199,7 @@
 				       const ValueSet *LVSetAft) {
 
   if (DEBUG_RA >= RA_DEBUG_Interference)
-    cerr << "\n For call inst: " << *MInst;
+    std::cerr << "\n For call inst: " << *MInst;
 
   // for each live var in live variable set after machine inst
   //
@@ -217,12 +215,12 @@
     //
     if (LR ) {  
       if (DEBUG_RA >= RA_DEBUG_Interference) {
-        cerr << "\n\tLR after Call: ";
+        std::cerr << "\n\tLR after Call: ";
         printSet(*LR);
       }
       LR->setCallInterference();
       if (DEBUG_RA >= RA_DEBUG_Interference) {
-	cerr << "\n  ++After adding call interference for LR: " ;
+	std::cerr << "\n  ++After adding call interference for LR: " ;
 	printSet(*LR);
       }
     }
@@ -265,7 +263,7 @@
 {
 
   if (DEBUG_RA >= RA_DEBUG_Interference)
-    cerr << "Creating interference graphs ...\n";
+    std::cerr << "Creating interference graphs ...\n";
 
   unsigned BBLoopDepthCost;
   for (MachineFunction::iterator BBI = MF.begin(), BBE = MF.end();
@@ -339,7 +337,7 @@
   addInterferencesForArgs();          
 
   if (DEBUG_RA >= RA_DEBUG_Interference)
-    cerr << "Interference graphs calculated!\n";
+    std::cerr << "Interference graphs calculated!\n";
 }
 
 
@@ -359,7 +357,7 @@
   for (MachineInstr::const_val_op_iterator It1 = MInst->begin(),
          ItE = MInst->end(); It1 != ItE; ++It1) {
     const LiveRange *LROfOp1 = LRI.getLiveRangeForValue(*It1); 
-    assert((LROfOp1 || !It1.isUseOnly())&& "No LR for Def in PSEUDO insruction");
+    assert((LROfOp1 || !It1.isUseOnly())&&"No LR for Def in PSEUDO insruction");
 
     MachineInstr::const_val_op_iterator It2 = It1;
     for (++It2; It2 != ItE; ++It2) {
@@ -378,8 +376,8 @@
   } // for all operands in an instruction
 
   if (!setInterf && MInst->getNumOperands() > 2) {
-    cerr << "\nInterf not set for any operand in pseudo instr:\n";
-    cerr << *MInst;
+    std::cerr << "\nInterf not set for any operand in pseudo instr:\n";
+    std::cerr << *MInst;
     assert(0 && "Interf not set for pseudo instr with > 2 operands" );
   }
 } 
@@ -399,7 +397,7 @@
     addInterference(AI, &InSet, false);
     
     if (DEBUG_RA >= RA_DEBUG_Interference)
-      cerr << " - %% adding interference for  argument " << RAV(AI) << "\n";
+      std::cerr << " - %% adding interference for  argument " << RAV(AI) << "\n";
   }
 }
 
@@ -450,7 +448,7 @@
 }
 
 inline void
-PrependInstructions(vector<MachineInstr *> &IBef,
+PrependInstructions(std::vector<MachineInstr *> &IBef,
                     MachineBasicBlock& MBB,
                     MachineBasicBlock::iterator& MII,
                     const std::string& msg)
@@ -462,8 +460,8 @@
       for (AdIt = IBef.begin(); AdIt != IBef.end() ; ++AdIt)
         {
           if (DEBUG_RA) {
-            if (OrigMI) cerr << "For MInst:\n  " << *OrigMI;
-            cerr << msg << "PREPENDed instr:\n  " << **AdIt << "\n";
+            if (OrigMI) std::cerr << "For MInst:\n  " << *OrigMI;
+            std::cerr << msg << "PREPENDed instr:\n  " << **AdIt << "\n";
           }
           InsertBefore(*AdIt, MBB, MII);
         }
@@ -483,8 +481,8 @@
       for ( AdIt = IAft.begin(); AdIt != IAft.end() ; ++AdIt )
         {
           if (DEBUG_RA) {
-            if (OrigMI) cerr << "For MInst:\n  " << *OrigMI;
-            cerr << msg << "APPENDed instr:\n  "  << **AdIt << "\n";
+            if (OrigMI) std::cerr << "For MInst:\n  " << *OrigMI;
+            std::cerr << msg << "APPENDed instr:\n  "  << **AdIt << "\n";
           }
           InsertAfter(*AdIt, MBB, MII);
         }
@@ -647,7 +645,7 @@
                                   MBB, MII+1);        // replace with NOP
 
               if (DEBUG_RA) {
-                cerr << "\nRegAlloc: Moved instr. with added code: "
+                std::cerr << "\nRegAlloc: Moved instr. with added code: "
                      << *DelaySlotMI
                      << "           out of delay slots of instr: " << *MInst;
               }
@@ -766,8 +764,8 @@
 
   MF.getInfo()->pushTempValue(MRI.getSpilledRegSize(RegType) );
   
-  vector<MachineInstr*> MIBef, MIAft;
-  vector<MachineInstr*> AdIMid;
+  std::vector<MachineInstr*> MIBef, MIAft;
+  std::vector<MachineInstr*> AdIMid;
   
   // Choose a register to hold the spilled value, if one was not preallocated.
   // This may insert code before and after MInst to free up the value.  If so,
@@ -826,9 +824,9 @@
   AI.InstrnsAfter.insert(AI.InstrnsAfter.begin(), MIAft.begin(), MIAft.end());
   
   if (DEBUG_RA) {
-    cerr << "\nFor Inst:\n  " << *MInst;
-    cerr << "SPILLED LR# " << LR->getUserIGNode()->getIndex();
-    cerr << "; added Instructions:";
+    std::cerr << "\nFor Inst:\n  " << *MInst;
+    std::cerr << "SPILLED LR# " << LR->getUserIGNode()->getIndex();
+    std::cerr << "; added Instructions:";
     for_each(MIBef.begin(), MIBef.end(), std::mem_fun(&MachineInstr::dump));
     for_each(MIAft.begin(), MIAft.end(), std::mem_fun(&MachineInstr::dump));
   }
@@ -972,7 +970,6 @@
                                    AdIAft.begin(), AdIAft.end());
             
 	    //---- Insert code for popping the reg from the stack ----------
-
 	    AdIBef.clear();
             AdIAft.clear();
             
@@ -1212,8 +1209,8 @@
   std::vector<MachineInstr *> &OrigAft = AddedInstrMap[OrigMI].InstrnsAfter;
 
   if (DEBUG_RA && OrigAft.size() > 0) {
-    cerr << "\nRegAlloc: Moved InstrnsAfter for: " << *OrigMI;
-    cerr << "         to last delay slot instrn: " << *DelayedMI;
+    std::cerr << "\nRegAlloc: Moved InstrnsAfter for: " << *OrigMI;
+    std::cerr << "         to last delay slot instrn: " << *DelayedMI;
   }
 
   // "added after" instructions of the delayed instr
@@ -1235,12 +1232,12 @@
 void PhyRegAlloc::printMachineCode()
 {
 
-  cerr << "\n;************** Function " << Fn->getName()
+  std::cerr << "\n;************** Function " << Fn->getName()
        << " *****************\n";
 
   for (MachineFunction::iterator BBI = MF.begin(), BBE = MF.end();
        BBI != BBE; ++BBI) {
-    cerr << "\n"; printLabel(BBI->getBasicBlock()); cerr << ": ";
+    std::cerr << "\n"; printLabel(BBI->getBasicBlock()); std::cerr << ": ";
 
     // get the iterator for machine instructions
     MachineBasicBlock& MBB = *BBI;
@@ -1250,8 +1247,8 @@
     for ( ; MII != MBB.end(); ++MII) {  
       MachineInstr *MInst = *MII; 
 
-      cerr << "\n\t";
-      cerr << TM.getInstrInfo().getName(MInst->getOpCode());
+      std::cerr << "\n\t";
+      std::cerr << TM.getInstrInfo().getName(MInst->getOpCode());
 
       for (unsigned OpNum=0; OpNum < MInst->getNumOperands(); ++OpNum) {
 	MachineOperand& Op = MInst->getOperand(OpNum);
@@ -1263,58 +1260,58 @@
 	  const Value *const Val = Op.getVRegValue () ;
 	  // ****this code is temporary till NULL Values are fixed
 	  if (! Val ) {
-	    cerr << "\t<*NULL*>";
+	    std::cerr << "\t<*NULL*>";
 	    continue;
 	  }
 
 	  // if a label or a constant
 	  if (isa<BasicBlock>(Val)) {
-	    cerr << "\t"; printLabel(	Op.getVRegValue	() );
+	    std::cerr << "\t"; printLabel(	Op.getVRegValue	() );
 	  } else {
 	    // else it must be a register value
 	    const int RegNum = Op.getAllocatedRegNum();
 
-	    cerr << "\t" << "%" << MRI.getUnifiedRegName( RegNum );
+	    std::cerr << "\t" << "%" << MRI.getUnifiedRegName( RegNum );
 	    if (Val->hasName() )
-	      cerr << "(" << Val->getName() << ")";
+	      std::cerr << "(" << Val->getName() << ")";
 	    else 
-	      cerr << "(" << Val << ")";
+	      std::cerr << "(" << Val << ")";
 
 	    if (Op.opIsDefOnly() || Op.opIsDefAndUse())
-	      cerr << "*";
+	      std::cerr << "*";
 
 	    const LiveRange *LROfVal = LRI.getLiveRangeForValue(Val);
 	    if (LROfVal )
 	      if (LROfVal->hasSpillOffset() )
-		cerr << "$";
+		std::cerr << "$";
 	  }
 
 	} 
 	else if (Op.getType() ==  MachineOperand::MO_MachineRegister) {
-	  cerr << "\t" << "%" << MRI.getUnifiedRegName(Op.getMachineRegNum());
+	  std::cerr << "\t%" << MRI.getUnifiedRegName(Op.getMachineRegNum());
 	}
 
 	else 
-	  cerr << "\t" << Op;      // use dump field
+	  std::cerr << "\t" << Op;      // use dump field
       }
 
     
 
       unsigned NumOfImpRefs =  MInst->getNumImplicitRefs();
       if (NumOfImpRefs > 0) {
-	cerr << "\tImplicit:";
+	std::cerr << "\tImplicit:";
 
 	for (unsigned z=0; z < NumOfImpRefs; z++)
-	  cerr << RAV(MInst->getImplicitRef(z)) << "\t";
+	  std::cerr << RAV(MInst->getImplicitRef(z)) << "\t";
       }
 
     } // for all machine instructions
 
-    cerr << "\n";
+    std::cerr << "\n";
 
   } // for all BBs
 
-  cerr << "\n";
+  std::cerr << "\n";
 }
 
 
@@ -1333,9 +1330,9 @@
 //----------------------------------------------------------------------------
 void PhyRegAlloc::printLabel(const Value *Val) {
   if (Val->hasName())
-    cerr  << Val->getName();
+    std::cerr  << Val->getName();
   else
-    cerr << "Label" << Val;
+    std::cerr << "Label" << Val;
 }
 
 
@@ -1379,7 +1376,7 @@
 //----------------------------------------------------------------------------
 
 void PhyRegAlloc::allocateStackSpace4SpilledLRs() {
-  if (DEBUG_RA) cerr << "\nSetting LR stack offsets for spills...\n";
+  if (DEBUG_RA) std::cerr << "\nSetting LR stack offsets for spills...\n";
 
   LiveRangeMapType::const_iterator HMI    = LRI.getLiveRangeMap()->begin();   
   LiveRangeMapType::const_iterator HMIEnd = LRI.getLiveRangeMap()->end();   
@@ -1391,7 +1388,7 @@
         int stackOffset = MF.getInfo()->allocateSpilledValue(Type::LongTy);
         L->setSpillOffFromFP(stackOffset);
         if (DEBUG_RA)
-          cerr << "  LR# " << L->getUserIGNode()->getIndex()
+          std::cerr << "  LR# " << L->getUserIGNode()->getIndex()
                << ": stack-offset = " << stackOffset << "\n";
       }
     }
@@ -1474,7 +1471,7 @@
   updateMachineCode(); 
 
   if (DEBUG_RA) {
-    cerr << "\n**** Machine Code After Register Allocation:\n\n";
+    std::cerr << "\n**** Machine Code After Register Allocation:\n\n";
     MF.dump();
   }
 }


Index: llvm/lib/CodeGen/RegAlloc/RegClass.cpp
diff -u llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.23 llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.24
--- llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.23	Fri Jul 25 16:06:09 2003
+++ llvm/lib/CodeGen/RegAlloc/RegClass.cpp	Mon Sep  1 15:05:47 2003
@@ -6,9 +6,8 @@
 
 #include "RegClass.h"
 #include "RegAllocCommon.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "IGNode.h"
 #include "llvm/Target/TargetRegInfo.h"
-using std::cerr;
 
 //----------------------------------------------------------------------------
 // This constructor inits IG. The actual matrix is created by a call to 
@@ -21,7 +20,7 @@
                      RegClassID( _MRC_->getRegClassID() ),
                      IG(this), IGNodeStack() {
   if( DEBUG_RA >= RA_DEBUG_Interference)
-    cerr << "Created Reg Class: " << RegClassID << "\n";
+    std::cerr << "Created Reg Class: " << RegClassID << "\n";
 
   IsColorUsedArr.resize(MRC->getNumOfAllRegs());
 }
@@ -34,7 +33,7 @@
 void RegClass::colorAllRegs()
 {
   if(DEBUG_RA >= RA_DEBUG_Coloring)
-    cerr << "Coloring IG of reg class " << RegClassID << " ...\n";
+    std::cerr << "Coloring IG of reg class " << RegClassID << " ...\n";
 
                                         // pre-color IGNodes
   pushAllIGNodes();                     // push all IG Nodes
@@ -68,9 +67,9 @@
   bool PushedAll  = pushUnconstrainedIGNodes(); 
 
   if( DEBUG_RA >= RA_DEBUG_Coloring) {
-    cerr << " Puhsed all-unconstrained IGNodes. ";
-    if( PushedAll ) cerr << " No constrained nodes left.";
-    cerr << "\n";
+    std::cerr << " Puhsed all-unconstrained IGNodes. ";
+    if( PushedAll ) std::cerr << " No constrained nodes left.";
+    std::cerr << "\n";
   }
 
   if( PushedAll )                       // if NO constrained nodes left
@@ -99,7 +98,7 @@
     NeedMoreSpills = !pushUnconstrainedIGNodes(); 
 
     if (DEBUG_RA >= RA_DEBUG_Coloring)
-      cerr << "\nConstrained IG Node found !@!" << IGNodeSpill->getIndex();
+      std::cerr << "\nConstrained IG Node found !@!" << IGNodeSpill->getIndex();
 
   } while(NeedMoreSpills);            // repeat until we have pushed all 
 
@@ -140,8 +139,8 @@
       IGNode->pushOnStack();            // set OnStack and dec deg of neighs
 
       if (DEBUG_RA >= RA_DEBUG_Coloring) {
-	cerr << " pushed un-constrained IGNode " << IGNode->getIndex() ;
-	cerr << " on to stack\n";
+	std::cerr << " pushed un-constrained IGNode " << IGNode->getIndex()
+                  << " on to stack\n";
       }
     }
     else pushedall = false;             // we didn't push all live ranges
@@ -239,16 +238,16 @@
   }
   else {
     if( DEBUG_RA >= RA_DEBUG_Coloring) {
-      cerr << " Node " << Node->getIndex();
-      cerr << " already colored with color " << Node->getColor() << "\n";
+      std::cerr << " Node " << Node->getIndex();
+      std::cerr << " already colored with color " << Node->getColor() << "\n";
     }
   }
 
 
   if( !Node->hasColor() ) {
     if( DEBUG_RA >= RA_DEBUG_Coloring) {
-      cerr << " Node " << Node->getIndex();
-      cerr << " - could not find a color (needs spilling)\n";
+      std::cerr << " Node " << Node->getIndex();
+      std::cerr << " - could not find a color (needs spilling)\n";
     }
   }
 




From lattner at cs.uiuc.edu  Mon Sep  1 15:10:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:10:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
Message-ID: <200309012009.PAA30289@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

PhyRegAlloc.cpp updated: 1.106 -> 1.107

---
Log message:

PhyRegAlloc.h got moved to lib/CodeGen/RegAlloc


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.106 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.107
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.106	Mon Sep  1 15:05:47 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Mon Sep  1 15:09:04 2003
@@ -5,10 +5,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/RegisterAllocation.h"
+#include "PhyRegAlloc.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
 #include "IGNode.h"
-#include "llvm/CodeGen/PhyRegAlloc.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
 #include "llvm/CodeGen/MachineFunction.h"




From lattner at cs.uiuc.edu  Mon Sep  1 15:12:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:12:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegInfo.cpp
Message-ID: <200309012011.PAA30498@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegInfo.cpp updated: 1.108 -> 1.109

---
Log message:

LiveRangeInfo got moved into the lib/CodeGen/RegAlloc directory


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcRegInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.108 llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.109
--- llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.108	Mon Sep  1 14:58:02 2003
+++ llvm/lib/Target/Sparc/SparcRegInfo.cpp	Mon Sep  1 15:11:23 2003
@@ -13,7 +13,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
-#include "llvm/CodeGen/LiveRangeInfo.h"
+#include "../../CodeGen/RegAlloc/LiveRangeInfo.h"   // FIXME!!
 #include "llvm/CodeGen/LiveRange.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"




From lattner at cs.uiuc.edu  Mon Sep  1 15:13:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:13:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp PhyRegAlloc.h
Message-ID: <200309012012.PAA30966@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

LiveRangeInfo.cpp updated: 1.43 -> 1.44
PhyRegAlloc.h updated: 1.46 -> 1.47

---
Log message:

LiveRangeInfo got moved into the lib/CodeGen/RegAlloc directory


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
diff -u llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.43 llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.44
--- llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp:1.43	Mon Sep  1 15:05:47 2003
+++ llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp	Mon Sep  1 15:12:17 2003
@@ -4,7 +4,7 @@
 // 
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/LiveRangeInfo.h"
+#include "LiveRangeInfo.h"
 #include "RegAllocCommon.h"
 #include "RegClass.h"
 #include "IGNode.h"


Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.46 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.47
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.46	Tue Aug  5 17:09:31 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h	Mon Sep  1 15:12:17 2003
@@ -19,7 +19,7 @@
 #ifndef PHY_REG_ALLOC_H
 #define PHY_REG_ALLOC_H
 
-#include "llvm/CodeGen/LiveRangeInfo.h"
+#include "LiveRangeInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include <map>
 




From lattner at cs.uiuc.edu  Mon Sep  1 15:15:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:15:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/LiveVar/README
Message-ID: <200309012014.PAA31015@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/LiveVar:

README (r1.2) removed

---
Log message:

This file is hopelessly out of date


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:18:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:18:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegInfo.cpp
Message-ID: <200309012017.PAA00746@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegInfo.cpp updated: 1.109 -> 1.110

---
Log message:

LiveRange.h is now in lib/CodeGen/RegAlloc


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcRegInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.109 llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.110
--- llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.109	Mon Sep  1 15:11:23 2003
+++ llvm/lib/Target/Sparc/SparcRegInfo.cpp	Mon Sep  1 15:17:13 2003
@@ -14,7 +14,7 @@
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineInstrAnnot.h"
 #include "../../CodeGen/RegAlloc/LiveRangeInfo.h"   // FIXME!!
-#include "llvm/CodeGen/LiveRange.h"
+#include "../../CodeGen/RegAlloc/LiveRange.h"       // FIXME!!
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"
 #include "llvm/Function.h"




From lattner at cs.uiuc.edu  Mon Sep  1 15:18:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:18:03 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/IGNode.h
Message-ID: <200309012017.PAA00739@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

IGNode.h updated: 1.13 -> 1.14

---
Log message:

LiveRange.h is now in lib/CodeGen/RegAlloc


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/IGNode.h
diff -u llvm/lib/CodeGen/RegAlloc/IGNode.h:1.13 llvm/lib/CodeGen/RegAlloc/IGNode.h:1.14
--- llvm/lib/CodeGen/RegAlloc/IGNode.h:1.13	Sat Jun 21 22:06:13 2003
+++ llvm/lib/CodeGen/RegAlloc/IGNode.h	Mon Sep  1 15:17:07 2003
@@ -25,7 +25,7 @@
 #ifndef IG_NODE_H
 #define IG_NODE_H
 
-#include "llvm/CodeGen/LiveRange.h"
+#include "LiveRange.h"
 class RegClass;
 
 //----------------------------------------------------------------------------




From lattner at cs.uiuc.edu  Mon Sep  1 15:20:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:20:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/StackSlots.h
Message-ID: <200309012019.PAA00813@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

StackSlots.h (r1.2) removed

---
Log message:

This file is never #included


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:25:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:25:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
Message-ID: <200309012024.PAA00897@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/PostOpts:

PeepholeOpts.cpp updated: 1.9 -> 1.10

---
Log message:

Simplify code a bit


---
Diffs of the changes:

Index: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
diff -u llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.9 llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.10
--- llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.9	Thu Aug 14 09:43:24 2003
+++ llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp	Mon Sep  1 15:24:06 2003
@@ -16,11 +16,10 @@
 
 //************************* Internal Functions *****************************/
 
-inline void
+static inline void
 DeleteInstruction(MachineBasicBlock& mvec,
                   MachineBasicBlock::iterator& BBI,
-                  const TargetMachine& target)
-{
+                  const TargetMachine& target) {
   // Check if this instruction is in a delay slot of its predecessor.
   if (BBI != mvec.begin()) {
       const TargetInstrInfo& mii = target.getInstrInfo();
@@ -43,12 +42,10 @@
 
 //******************* Individual Peephole Optimizations ********************/
 
-
 inline bool
 RemoveUselessCopies(MachineBasicBlock& mvec,
                     MachineBasicBlock::iterator& BBI,
-                    const TargetMachine& target)
-{
+                    const TargetMachine& target) {
   if (target.getOptInfo().IsUselessCopy(*BBI)) {
     DeleteInstruction(mvec, BBI, target);
     return true;
@@ -69,37 +66,27 @@
   virtual const char *getPassName() const { return "Peephole Optimization"; }
 };
 
-/* Apply a list of peephole optimizations to this machine instruction
- * within its local context.  They are allowed to delete MI or any
- * instruction before MI, but not 
- */
-bool
-PeepholeOpts::visit(MachineBasicBlock& mvec,
-                    MachineBasicBlock::iterator BBI) const
-{
-  bool changed = false;
-
+// Apply a list of peephole optimizations to this machine instruction
+// within its local context.  They are allowed to delete MI or any
+// instruction before MI, but not 
+//
+bool PeepholeOpts::visit(MachineBasicBlock& mvec,
+                         MachineBasicBlock::iterator BBI) const {
   /* Remove redundant copy instructions */
-  changed |= RemoveUselessCopies(mvec, BBI, target);
-  if (BBI == mvec.end())                // nothing more to do!
-    return changed;
-
-  return changed;
+  return RemoveUselessCopies(mvec, BBI, target);
 }
 
 
-bool
-PeepholeOpts::runOnBasicBlock(BasicBlock &BB)
-{
+bool PeepholeOpts::runOnBasicBlock(BasicBlock &BB) {
   // Get the machine instructions for this BB
   // FIXME: MachineBasicBlock::get() is deprecated, hence inlining the function
   const Function *F = BB.getParent();
   MachineFunction &MF = MachineFunction::get(F);
   MachineBasicBlock *MBB = NULL;
-  for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {
+  for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I)
     if (I->getBasicBlock() == &BB)
       MBB = I;
-  }
+
   assert(MBB && "MachineBasicBlock object not found for specified block!");
   MachineBasicBlock &mvec = *MBB;
 
@@ -108,8 +95,7 @@
   // Insertions or deletions *before* MI are not safe.
   // 
   for (MachineBasicBlock::reverse_iterator RI=mvec.rbegin(),
-         RE=mvec.rend(); RI != RE; )
-  {
+         RE=mvec.rend(); RI != RE; ) {
     MachineBasicBlock::iterator BBI = RI.base()-1; // save before incr
     ++RI;             // pre-increment to delete MI or after it
     visit(mvec, BBI);
@@ -123,8 +109,6 @@
 // createPeepholeOptsPass - Public entrypoint for peephole optimization
 // and this file as a whole...
 //
-FunctionPass*
-createPeepholeOptsPass(TargetMachine &T)
-{
+FunctionPass* createPeepholeOptsPass(TargetMachine &T) {
   return new PeepholeOpts(T);
 }




From lattner at cs.uiuc.edu  Mon Sep  1 15:27:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:27:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile
Message-ID: <200309012026.PAA02335@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.37 -> 1.38

---
Log message:

Sparc peephole optimizer moved out of post-opts library into Sparc target library



---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.37 llvm/tools/lli/Makefile:1.38
--- llvm/tools/lli/Makefile:1.37	Thu Aug 14 23:56:09 2003
+++ llvm/tools/lli/Makefile	Mon Sep  1 15:26:14 2003
@@ -36,7 +36,7 @@
   JITLIBS  += sparc 
   ARCHLIBS += sched livevar instrument.a profpaths \
               bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-              select postopts.a preopts
+              select preopts
 endif
 
 USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \




From lattner at cs.uiuc.edu  Mon Sep  1 15:27:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:27:03 2003
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile
Message-ID: <200309012026.PAA02326@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/llc:

Makefile updated: 1.40 -> 1.41

---
Log message:

Sparc peephole optimizer moved out of post-opts library into Sparc target library


---
Diffs of the changes:

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.40 llvm/tools/llc/Makefile:1.41
--- llvm/tools/llc/Makefile:1.40	Thu Aug 14 23:56:01 2003
+++ llvm/tools/llc/Makefile	Mon Sep  1 15:26:11 2003
@@ -8,7 +8,6 @@
            select \
            codegen \
            preopts \
-           postopts.a \
            target.a \
            livevar \
            transforms.a \




From lattner at cs.uiuc.edu  Mon Sep  1 15:28:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:28:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/PostOpts/Makefile
Message-ID: <200309012027.PAA02357@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/PostOpts:

Makefile (r1.1) removed

---
Log message:

Remove makefile for dead library


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:30:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:30:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/PreOpts/Makefile
Message-ID: <200309012029.PAA02830@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/PreOpts:

Makefile (r1.1) removed

---
Log message:

Remove dead library makefile


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:31:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:31:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile
Message-ID: <200309012030.PAA02939@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.38 -> 1.39

---
Log message:

Preselection is now integrated into the Sparc target library



---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.38 llvm/tools/lli/Makefile:1.39
--- llvm/tools/lli/Makefile:1.38	Mon Sep  1 15:26:14 2003
+++ llvm/tools/lli/Makefile	Mon Sep  1 15:30:17 2003
@@ -36,7 +36,7 @@
   JITLIBS  += sparc 
   ARCHLIBS += sched livevar instrument.a profpaths \
               bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-              select preopts
+              select
 endif
 
 USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \




From lattner at cs.uiuc.edu  Mon Sep  1 15:31:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:31:03 2003
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile
Message-ID: <200309012030.PAA02932@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/llc:

Makefile updated: 1.41 -> 1.42

---
Log message:

Preselection is now integrated into the Sparc target library


---
Diffs of the changes:

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.41 llvm/tools/llc/Makefile:1.42
--- llvm/tools/llc/Makefile:1.41	Mon Sep  1 15:26:11 2003
+++ llvm/tools/llc/Makefile	Mon Sep  1 15:30:16 2003
@@ -7,7 +7,6 @@
            sched \
            select \
            codegen \
-           preopts \
            target.a \
            livevar \
            transforms.a \




From lattner at cs.uiuc.edu  Mon Sep  1 15:34:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:34:00 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/PreSelection.h PeepholeOpts.h
Message-ID: <200309012033.PAA05083@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

PreSelection.h (r1.1) removed
PeepholeOpts.h (r1.2) removed

---
Log message:

Remove header files that were privatized


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:34:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:34:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/PeepholeOpts.cpp PreSelection.cpp Sparc.cpp SparcInternals.h
Message-ID: <200309012033.PAA04481@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

PeepholeOpts.cpp updated: 1.10 -> 1.11
PreSelection.cpp updated: 1.15 -> 1.16
Sparc.cpp updated: 1.78 -> 1.79
SparcInternals.h updated: 1.98 -> 1.99

---
Log message:

Move private interfaces into private .h file


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/PeepholeOpts.cpp
diff -u llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.10 llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.11
--- llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.10	Mon Sep  1 15:24:06 2003
+++ llvm/lib/Target/Sparc/PeepholeOpts.cpp	Mon Sep  1 15:33:07 2003
@@ -5,7 +5,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/PeepholeOpts.h"
+#include "SparcInternals.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"


Index: llvm/lib/Target/Sparc/PreSelection.cpp
diff -u llvm/lib/Target/Sparc/PreSelection.cpp:1.15 llvm/lib/Target/Sparc/PreSelection.cpp:1.16
--- llvm/lib/Target/Sparc/PreSelection.cpp:1.15	Wed Aug  6 13:42:49 2003
+++ llvm/lib/Target/Sparc/PreSelection.cpp	Mon Sep  1 15:33:07 2003
@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/PreSelection.h"
+#include "SparcInternals.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Transforms/Scalar.h"


Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.78 llvm/lib/Target/Sparc/Sparc.cpp:1.79
--- llvm/lib/Target/Sparc/Sparc.cpp:1.78	Sun Aug 24 14:49:47 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Mon Sep  1 15:33:07 2003
@@ -13,8 +13,6 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFunctionInfo.h"
-#include "llvm/CodeGen/PreSelection.h"
-#include "llvm/CodeGen/PeepholeOpts.h"
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/CodeGen/RegisterAllocation.h"


Index: llvm/lib/Target/Sparc/SparcInternals.h
diff -u llvm/lib/Target/Sparc/SparcInternals.h:1.98 llvm/lib/Target/Sparc/SparcInternals.h:1.99
--- llvm/lib/Target/Sparc/SparcInternals.h:1.98	Thu Aug 14 01:04:29 2003
+++ llvm/lib/Target/Sparc/SparcInternals.h	Mon Sep  1 15:33:07 2003
@@ -654,6 +654,13 @@
 /// empty slots at the top of each function stack
 Pass *createStackSlotsPass(const TargetMachine &TM);
 
+// Interface to pre-selection pass that specializes LLVM code for a target
+// machine.
+Pass *createPreSelectionPass(TargetMachine &Target);
+
+// External interface to peephole optimization pass operating on machine code.
+FunctionPass *createPeepholeOptsPass(TargetMachine &Target);
+
 
 //---------------------------------------------------------------------------
 // class UltraSparc 




From lattner at cs.uiuc.edu  Mon Sep  1 15:35:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:35:00 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Makefile
Message-ID: <200309012034.PAA05332@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

Makefile updated: 1.13 -> 1.14

---
Log message:

Don't build dead directories


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.13 llvm/lib/CodeGen/Makefile:1.14
--- llvm/lib/CodeGen/Makefile:1.13	Thu Aug 14 23:55:20 2003
+++ llvm/lib/CodeGen/Makefile	Mon Sep  1 15:34:15 2003
@@ -1,5 +1,5 @@
 LEVEL = ../..
-PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts SelectionDAG
+PARALLEL_DIRS = InstrSelection InstrSched RegAlloc SelectionDAG
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Mon Sep  1 15:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:39:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/PeepholeOpts.cpp
Message-ID: <200309012038.PAA06293@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

PeepholeOpts.cpp updated: 1.11 -> 1.12

---
Log message:

Inline simple comparison which is sparc specific anyway


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/PeepholeOpts.cpp
diff -u llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.11 llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.12
--- llvm/lib/Target/Sparc/PeepholeOpts.cpp:1.11	Mon Sep  1 15:33:07 2003
+++ llvm/lib/Target/Sparc/PeepholeOpts.cpp	Mon Sep  1 15:38:03 2003
@@ -10,7 +10,6 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "llvm/Target/TargetOptInfo.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Pass.h"
 
@@ -42,11 +41,55 @@
 
 //******************* Individual Peephole Optimizations ********************/
 
+//----------------------------------------------------------------------------
+// Function: IsUselessCopy
+// Decide whether a machine instruction is a redundant copy:
+// -- ADD    with g0 and result and operand are identical, or
+// -- OR     with g0 and result and operand are identical, or
+// -- FMOVS or FMOVD and result and operand are identical.
+// Other cases are possible but very rare that they would be useless copies,
+// so it's not worth analyzing them.
+//----------------------------------------------------------------------------
+
+static bool IsUselessCopy(const TargetMachine &target, const MachineInstr* MI) {
+  if (MI->getOpCode() == V9::FMOVS || MI->getOpCode() == V9::FMOVD) {
+    return (/* both operands are allocated to the same register */
+            MI->getOperand(0).getAllocatedRegNum() == 
+            MI->getOperand(1).getAllocatedRegNum());
+  } else if (MI->getOpCode() == V9::ADDr || MI->getOpCode() == V9::ORr) {
+    unsigned srcWithDestReg;
+    
+    for (srcWithDestReg = 0; srcWithDestReg < 2; ++srcWithDestReg)
+      if (MI->getOperand(srcWithDestReg).hasAllocatedReg() &&
+          MI->getOperand(srcWithDestReg).getAllocatedRegNum()
+          == MI->getOperand(2).getAllocatedRegNum())
+        break;
+    
+    if (srcWithDestReg == 2)
+      return false;
+    else {
+      /* else source and dest are allocated to the same register */
+      unsigned otherOp = 1 - srcWithDestReg;
+      return (/* either operand otherOp is register %g0 */
+              (MI->getOperand(otherOp).hasAllocatedReg() &&
+               MI->getOperand(otherOp).getAllocatedRegNum() ==
+               target.getRegInfo().getZeroRegNum()) ||
+              
+              /* or operand otherOp == 0 */
+              (MI->getOperand(otherOp).getType()
+               == MachineOperand::MO_SignExtendedImmed &&
+               MI->getOperand(otherOp).getImmedValue() == 0));
+    }
+  }
+  else
+    return false;
+}
+
 inline bool
 RemoveUselessCopies(MachineBasicBlock& mvec,
                     MachineBasicBlock::iterator& BBI,
                     const TargetMachine& target) {
-  if (target.getOptInfo().IsUselessCopy(*BBI)) {
+  if (IsUselessCopy(target, *BBI)) {
     DeleteInstruction(mvec, BBI, target);
     return true;
   }




From lattner at cs.uiuc.edu  Mon Sep  1 15:41:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:41:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200309012040.PAA09399@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.33 -> 1.34

---
Log message:

No longer require an OptInfo


---
Diffs of the changes:

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.33 llvm/include/llvm/Target/TargetMachine.h:1.34
--- llvm/include/llvm/Target/TargetMachine.h:1.33	Fri Aug 15 00:21:30 2003
+++ llvm/include/llvm/Target/TargetMachine.h	Mon Sep  1 15:40:43 2003
@@ -15,7 +15,6 @@
 class TargetRegInfo;
 class TargetFrameInfo;
 class TargetCacheInfo;
-class TargetOptInfo;
 class MachineCodeEmitter;
 class MRegisterInfo;
 class FunctionPassManager;
@@ -62,7 +61,6 @@
   virtual const TargetRegInfo&          getRegInfo()   const = 0;
   virtual const TargetFrameInfo&        getFrameInfo() const = 0;
   virtual const TargetCacheInfo&        getCacheInfo() const = 0;
-  virtual const TargetOptInfo&          getOptInfo()   const = 0;
   const TargetData &getTargetData() const { return DataLayout; }
 
   /// getRegisterInfo - If register information is available, return it.  If




From lattner at cs.uiuc.edu  Mon Sep  1 15:42:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:42:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetOptInfo.h
Message-ID: <200309012041.PAA10012@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetOptInfo.h (r1.3) removed

---
Log message:

Remove dead file


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:42:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:42:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetMachine.h
Message-ID: <200309012041.PAA09430@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86TargetMachine.h updated: 1.12 -> 1.13

---
Log message:

OptInfo is no longer required


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86TargetMachine.h
diff -u llvm/lib/Target/X86/X86TargetMachine.h:1.12 llvm/lib/Target/X86/X86TargetMachine.h:1.13
--- llvm/lib/Target/X86/X86TargetMachine.h:1.12	Sun Aug 24 14:49:48 2003
+++ llvm/lib/Target/X86/X86TargetMachine.h	Mon Sep  1 15:41:07 2003
@@ -27,7 +27,6 @@
   virtual const TargetSchedInfo &getSchedInfo()  const { abort(); }
   virtual const TargetRegInfo   &getRegInfo()    const { abort(); }
   virtual const TargetCacheInfo  &getCacheInfo() const { abort(); }
-  virtual const TargetOptInfo    &getOptInfo()   const { abort(); }
 
   /// addPassesToJITCompile - Add passes to the specified pass manager to
   /// implement a fast dynamic compiler for this target.  Return true if this is




From lattner at cs.uiuc.edu  Mon Sep  1 15:42:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:42:04 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Sparc.cpp SparcInternals.h SparcOptInfo.cpp
Message-ID: <200309012041.PAA09421@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

Sparc.cpp updated: 1.79 -> 1.80
SparcInternals.h updated: 1.99 -> 1.100
SparcOptInfo.cpp updated: 1.9 -> 1.10

---
Log message:

No longer provide an optinfo, noone uses it


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.79 llvm/lib/Target/Sparc/Sparc.cpp:1.80
--- llvm/lib/Target/Sparc/Sparc.cpp:1.79	Mon Sep  1 15:33:07 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Mon Sep  1 15:40:59 2003
@@ -139,8 +139,7 @@
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),
-    cacheInfo(*this),
-    optInfo(*this) {
+    cacheInfo(*this) {
 }
 
 


Index: llvm/lib/Target/Sparc/SparcInternals.h
diff -u llvm/lib/Target/Sparc/SparcInternals.h:1.99 llvm/lib/Target/Sparc/SparcInternals.h:1.100
--- llvm/lib/Target/Sparc/SparcInternals.h:1.99	Mon Sep  1 15:33:07 2003
+++ llvm/lib/Target/Sparc/SparcInternals.h	Mon Sep  1 15:40:59 2003
@@ -14,7 +14,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetCacheInfo.h"
 #include "llvm/Target/TargetRegInfo.h"
-#include "llvm/Target/TargetOptInfo.h"
 #include "llvm/Type.h"
 #include "SparcRegClassInfo.h"
 #include "Config/sys/types.h"
@@ -631,19 +630,6 @@
 };
 
 
-//---------------------------------------------------------------------------
-// class UltraSparcOptInfo 
-// 
-// Purpose:
-//   Interface to machine-level optimization routines for the UltraSPARC.
-//---------------------------------------------------------------------------
-
-struct UltraSparcOptInfo: public TargetOptInfo {
-  UltraSparcOptInfo(const TargetMachine &T) : TargetOptInfo(T) {} 
-
-  virtual bool IsUselessCopy    (const MachineInstr* MI) const;
-};
-
 /// createAddRegNumToValuesPass - this pass adds unsigned register numbers to
 /// instructions, since that's not done by the Sparc InstSelector, but that's
 /// how the target-independent register allocator in the JIT likes to see
@@ -678,7 +664,6 @@
   UltraSparcRegInfo   regInfo;
   UltraSparcFrameInfo frameInfo;
   UltraSparcCacheInfo cacheInfo;
-  UltraSparcOptInfo   optInfo;
 public:
   UltraSparc();
 
@@ -687,7 +672,6 @@
   virtual const TargetRegInfo    &getRegInfo()   const { return regInfo; }
   virtual const TargetFrameInfo  &getFrameInfo() const { return frameInfo; }
   virtual const TargetCacheInfo  &getCacheInfo() const { return cacheInfo; }
-  virtual const TargetOptInfo    &getOptInfo()   const { return optInfo; }
 
   virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
   virtual bool addPassesToJITCompile(FunctionPassManager &PM);


Index: llvm/lib/Target/Sparc/SparcOptInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcOptInfo.cpp:1.9 llvm/lib/Target/Sparc/SparcOptInfo.cpp:1.10
--- llvm/lib/Target/Sparc/SparcOptInfo.cpp:1.9	Mon Jun 30 16:58:49 2003
+++ llvm/lib/Target/Sparc/SparcOptInfo.cpp	Mon Sep  1 15:40:59 2003
@@ -1,55 +0,0 @@
-//===-- SparcOptInfo.cpp --------------------------------------------------===//
-//
-// FIXME: Describe
-//
-//===----------------------------------------------------------------------===//
-
-#include "SparcInternals.h"
-#include "llvm/Target/TargetRegInfo.h"
-#include "llvm/CodeGen/MachineInstr.h"
-#include "Config/stdlib.h"
-
-//----------------------------------------------------------------------------
-// Function: IsUselessCopy
-// Decide whether a machine instruction is a redundant copy:
-// -- ADD    with g0 and result and operand are identical, or
-// -- OR     with g0 and result and operand are identical, or
-// -- FMOVS or FMOVD and result and operand are identical.
-// Other cases are possible but very rare that they would be useless copies,
-// so it's not worth analyzing them.
-//----------------------------------------------------------------------------
-
-bool
-UltraSparcOptInfo::IsUselessCopy(const MachineInstr* MI) const {
-  if (MI->getOpCode() == V9::FMOVS || MI->getOpCode() == V9::FMOVD) {
-    return (/* both operands are allocated to the same register */
-            MI->getOperand(0).getAllocatedRegNum() == 
-            MI->getOperand(1).getAllocatedRegNum());
-  } else if (MI->getOpCode() == V9::ADDr || MI->getOpCode() == V9::ORr) {
-    unsigned srcWithDestReg;
-    
-    for (srcWithDestReg = 0; srcWithDestReg < 2; ++srcWithDestReg)
-      if (MI->getOperand(srcWithDestReg).hasAllocatedReg() &&
-          MI->getOperand(srcWithDestReg).getAllocatedRegNum()
-          == MI->getOperand(2).getAllocatedRegNum())
-        break;
-    
-    if (srcWithDestReg == 2)
-      return false;
-    else {
-      /* else source and dest are allocated to the same register */
-      unsigned otherOp = 1 - srcWithDestReg;
-      return (/* either operand otherOp is register %g0 */
-              (MI->getOperand(otherOp).hasAllocatedReg() &&
-               MI->getOperand(otherOp).getAllocatedRegNum() ==
-               target.getRegInfo().getZeroRegNum()) ||
-              
-              /* or operand otherOp == 0 */
-              (MI->getOperand(otherOp).getType()
-               == MachineOperand::MO_SignExtendedImmed &&
-               MI->getOperand(otherOp).getImmedValue() == 0));
-    }
-  }
-  else
-    return false;
-}




From lattner at cs.uiuc.edu  Mon Sep  1 15:43:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:43:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcOptInfo.cpp
Message-ID: <200309012042.PAA12616@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcOptInfo.cpp (r1.10) removed

---
Log message:

Whoops, cvs rm this file, don't just empty it out  :)


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Sep  1 15:45:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:45:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Scalar.h
Message-ID: <200309012044.PAA14971@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

Scalar.h updated: 1.21 -> 1.22

---
Log message:

Add RPR prototype here


---
Diffs of the changes:

Index: llvm/include/llvm/Transforms/Scalar.h
diff -u llvm/include/llvm/Transforms/Scalar.h:1.21 llvm/include/llvm/Transforms/Scalar.h:1.22
--- llvm/include/llvm/Transforms/Scalar.h:1.21	Sun Aug 31 22:14:00 2003
+++ llvm/include/llvm/Transforms/Scalar.h	Mon Sep  1 15:44:42 2003
@@ -16,6 +16,14 @@
 
 //===----------------------------------------------------------------------===//
 //
+// RaisePointerReferences - Try to eliminate as many pointer arithmetic
+// expressions as possible, by converting expressions to use getelementptr and
+// friends.
+//
+Pass *createRaisePointerReferencesPass();
+
+//===----------------------------------------------------------------------===//
+//
 // Constant Propagation Pass - A worklist driven constant propagation pass
 //
 Pass *createConstantPropagationPass();




From lattner at cs.uiuc.edu  Mon Sep  1 15:46:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:46:01 2003
Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp
Message-ID: <200309012045.PAA17184@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/gccas:

gccas.cpp updated: 1.70 -> 1.71

---
Log message:

#include is unnecessary


---
Diffs of the changes:

Index: llvm/tools/gccas/gccas.cpp
diff -u llvm/tools/gccas/gccas.cpp:1.70 llvm/tools/gccas/gccas.cpp:1.71
--- llvm/tools/gccas/gccas.cpp:1.70	Sun Aug 31 16:47:24 2003
+++ llvm/tools/gccas/gccas.cpp	Mon Sep  1 15:45:46 2003
@@ -14,7 +14,6 @@
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Target/TargetData.h"
-#include "llvm/Transforms/RaisePointerReferences.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "Support/CommandLine.h"




From lattner at cs.uiuc.edu  Mon Sep  1 15:46:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:46:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/LevelRaise.cpp
Message-ID: <200309012045.PAA16973@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms:

LevelRaise.cpp updated: 1.84 -> 1.85

---
Log message:

Prototype for creator function got moved


---
Diffs of the changes:

Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.84 llvm/lib/Transforms/LevelRaise.cpp:1.85
--- llvm/lib/Transforms/LevelRaise.cpp:1.84	Fri Aug  1 17:15:00 2003
+++ llvm/lib/Transforms/LevelRaise.cpp	Mon Sep  1 15:45:33 2003
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/RaisePointerReferences.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "TransformInternals.h"
 #include "llvm/iOther.h"




From lattner at cs.uiuc.edu  Mon Sep  1 15:47:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Sep  1 15:47:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/RaisePointerReferences.h
Message-ID: <200309012046.PAA17714@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

RaisePointerReferences.h (r1.5) removed

---
Log message:

Dead header file


---
Diffs of the changes:



From gaeke at cs.uiuc.edu  Tue Sep  2 01:46:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Sep  2 01:46:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/iMemory.cpp
Message-ID: <200309020645.BAA15571@morpheus.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

iMemory.cpp updated: 1.29 -> 1.30

---
Log message:

Remove assertion which is never reached.


---
Diffs of the changes:

Index: llvm/lib/VMCore/iMemory.cpp
diff -u llvm/lib/VMCore/iMemory.cpp:1.29 llvm/lib/VMCore/iMemory.cpp:1.30
--- llvm/lib/VMCore/iMemory.cpp:1.29	Tue Jan 14 16:19:44 2003
+++ llvm/lib/VMCore/iMemory.cpp	Tue Sep  2 01:45:34 2003
@@ -94,7 +94,6 @@
   : Instruction(PointerType::get(checkType(getIndexedType(Ptr->getType(),
                                                             Idx, true))),
 		  GetElementPtr, Name, InBe) {
-  assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!");
   Operands.reserve(1+Idx.size());
   Operands.push_back(Use(Ptr, this));
 




From gaeke at cs.uiuc.edu  Tue Sep  2 01:48:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Sep  2 01:48:01 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
Message-ID: <200309020647.BAA15605@morpheus.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

RuntimeOptimizations.cpp updated: 1.5 -> 1.6

---
Log message:

I might as well check in the version of the file I'm actually using,
just to be consistent.


---
Diffs of the changes:

Index: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
diff -u reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.5 reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.6
--- reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.5	Thu Aug 21 11:50:15 2003
+++ reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp	Tue Sep  2 01:46:39 2003
@@ -17,7 +17,7 @@
 #include <fstream>
 
 // From TraceToFunction.cpp
-// extern Function *runTraceToFunction (Trace &T);
+extern Function *runTraceToFunction (Trace &T);
 
 // From Initialization.cpp
 extern void initModules ();
@@ -59,6 +59,6 @@
   T.print (o);
 
   // Try to turn it into a function
-  // Function *TF = runTraceToFunction (T);
-  // DEBUG(std::cerr << "Function created from trace: \n" << *TF);
+  Function *TF = runTraceToFunction (T);
+  DEBUG(std::cerr << "Function created from trace: \n" << *TF);
 }




From gaeke at cs.uiuc.edu  Tue Sep  2 01:48:04 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Sep  2 01:48:04 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/TraceToFunction.cpp
Message-ID: <200309020647.BAA15599@morpheus.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

TraceToFunction.cpp updated: 1.2 -> 1.3

---
Log message:

Try extra hard not to get sucked into dereferencing a null pointer
that operator[] might have put there. Sigh.


---
Diffs of the changes:

Index: reopt/lib/LightWtProfiling/TraceToFunction.cpp
diff -u reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.2 reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.3
--- reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.2	Fri Aug 29 00:13:12 2003
+++ reopt/lib/LightWtProfiling/TraceToFunction.cpp	Tue Sep  2 01:47:06 2003
@@ -452,7 +452,7 @@
       // function, and I will still reference the version from
       // outside the function. Replace any reference to an operand
       // which has had a clone made with a reference to its clone.
-      else if (O2CMap.find (V) != O2CMap.end ()) {
+      else if (O2CMap.find (V) != O2CMap.end () && O2CMap[V]) {
 	DEBUG(std::cerr << *V << " in instruction " << I
 	      << " is value " << O2CMap[V] << " in new function\n");
 	assert (V->getType () == O2CMap[V]->getType ()




From brukman at cs.uiuc.edu  Tue Sep  2 08:42:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Tue Sep  2 08:42:01 2003
Subject: [llvm-commits] CVS: llvm/www/testresults/index.html
Message-ID: <200309021341.IAA14071@tank.cs.uiuc.edu>


Changes in directory llvm/www/testresults:

index.html updated: 1.2 -> 1.3

---
Log message:

Separated results from trinity vs. tank and debug vs. optimized builds.


---
Diffs of the changes:

Index: llvm/www/testresults/index.html
diff -u llvm/www/testresults/index.html:1.2 llvm/www/testresults/index.html:1.3
--- llvm/www/testresults/index.html:1.2	Thu Aug 14 11:23:02 2003
+++ llvm/www/testresults/index.html	Tue Sep  2 08:41:24 2003
@@ -15,9 +15,13 @@
 <!-- zion -->
 <li><a href="X86/">Linux on X86 (Dual P4 Xeon @ 3.06GHz)</a>
 <!-- trinity -->
-<li><a href="Sparc/">Solaris on Sparc V9 (UltraSparc IIe @ 502 MHz)</a>
+<li>Solaris on Sparc V9 (UltraSparc IIe @ 502 MHz): 
+<a href="Sparc/trinity/debug">debug</a>, 
+<a href="Sparc/trinity/opt">optimized</a>.</li>
 <!-- tank -->
-<!-- <li>Solaris on Sparc V9 (UltraSPARC-IIi at 440MHz) -->
+<li>Solaris on Sparc V9 (UltraSPARC-IIi at 440MHz):
+<!-- <a href="Sparc/tank/debug">debug</a>, -->
+<a href="Sparc/tank/opt">optimized</a>.</li>
 </ol>
 
 <hr>




From lattner at cs.uiuc.edu  Tue Sep  2 11:29:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 11:29:04 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Type.h
Message-ID: <200309021628.LAA21729@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

Type.h updated: 1.25 -> 1.26

---
Log message:

The description is no longer stored directly in the type.


---
Diffs of the changes:

Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.25 llvm/include/llvm/Type.h:1.26
--- llvm/include/llvm/Type.h:1.25	Thu Aug 21 17:08:59 2003
+++ llvm/include/llvm/Type.h	Tue Sep  2 11:28:03 2003
@@ -72,7 +72,6 @@
 private:
   PrimitiveID ID;        // The current base type of this type...
   unsigned    UID;       // The unique ID number for this class
-  std::string Desc;      // The printed name of the string...
   bool        Abstract;  // True if type contains an OpaqueType
   bool        Recursive; // True if the type is recursive
 
@@ -81,10 +80,6 @@
   Type(const std::string &Name, PrimitiveID id);
   virtual ~Type() {}
 
-  /// When types are refined, they update their description to be more concrete.
-  ///
-  inline void setDescription(const std::string &D) { Desc = D; }
-  
   /// setName - Associate the name with this type in the symbol table, but don't
   /// set the local name to be equal specified name.
   ///
@@ -119,7 +114,7 @@
   inline unsigned getUniqueID() const { return UID; }
 
   /// getDescription - Return the string representation of the type...
-  inline const std::string &getDescription() const { return Desc; }
+  const std::string &getDescription() const;
 
   /// isSigned - Return whether an integral numeric type is signed.  This is
   /// true for SByteTy, ShortTy, IntTy, LongTy.  Note that this is not true for




From lattner at cs.uiuc.edu  Tue Sep  2 11:36:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 11:36:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309021635.LAA22110@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.50 -> 1.51

---
Log message:

Change the code to no longer compute the "type description" immediately when 
the type is analyzed.  Instead, only compute it when requested (with 
getDescription), and cached for reuse later.

This dramatically speeds up LLVM in general because these descriptions almost 
_never_ need to be constructed.  The only time they are used is when a type is
<<'d.  Printing of modules by themselves uses other code to print symbolic 
types when possible, so these descriptions are really only used for debugging.

Also, this fixes the particularly bad case when lots of types get resolved to 
each other, such as during linking of large programs.  In these cases, the type
descriptions would be repeatedly recomputed and discarded even though: A. noone
reads the description before it gets resolved, and B. many many resolutions 
happen at intermediate steps, causing a HUGE waste of time.

Overall, this makes the getTypeDesc function much more light-weight, and fixes
bug: Assembler/2002-07-08-HugePerformanceProblem.llx, which went from taking
1048.770u/19.150s (which is 17.5 MINUTES, on apoc), to taking 0.020u/0.000s,
which is a nice little speedup.  :)



---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.50 llvm/lib/VMCore/Type.cpp:1.51
--- llvm/lib/VMCore/Type.cpp:1.50	Thu Aug 21 17:12:47 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 11:35:17 2003
@@ -25,6 +25,13 @@
 static unsigned CurUID = 0;
 static std::vector<const Type *> UIDMappings;
 
+// Concrete/Abstract TypeDescriptions - We lazily calculate type descriptions
+// for types as they are needed.  Because resolution of types must invalidate
+// all of the abstract type descriptions, we keep them in a seperate map to make
+// this easy.
+static std::map<const Type*, std::string> ConcreteTypeDescriptions;
+static std::map<const Type*, std::string> AbstractTypeDescriptions;
+
 void PATypeHolder::dump() const {
   std::cerr << "PATypeHolder(" << (void*)this << ")\n";
 }
@@ -32,7 +39,7 @@
 
 Type::Type(const std::string &name, PrimitiveID id)
   : Value(Type::TypeTy, Value::TypeVal) {
-  setDescription(name);
+  ConcreteTypeDescriptions[this] = name;
   ID = id;
   Abstract = Recursive = false;
   UID = CurUID++;       // Assign types UID's as they are created
@@ -114,6 +121,125 @@
 }
 
 
+// getTypeDescription - This is a recursive function that walks a type hierarchy
+// calculating the description for a type.
+//
+static std::string getTypeDescription(const Type *Ty,
+                                      std::vector<const Type *> &TypeStack) {
+  if (isa<OpaqueType>(Ty)) {                     // Base case for the recursion
+    std::map<const Type*, std::string>::iterator I =
+      AbstractTypeDescriptions.lower_bound(Ty);
+    if (I != AbstractTypeDescriptions.end() && I->first == Ty)
+      return I->second;
+    std::string Desc = "opaque"+utostr(Ty->getUniqueID());
+    AbstractTypeDescriptions.insert(std::make_pair(Ty, Desc));
+    return Desc;
+  }
+  
+  if (!Ty->isAbstract() && !Ty->isRecursive()) {  // Base case for the recursion
+    std::map<const Type*, std::string>::iterator I =
+      ConcreteTypeDescriptions.find(Ty);
+    if (I != ConcreteTypeDescriptions.end()) return I->second;
+  }
+      
+  // Check to see if the Type is already on the stack...
+  unsigned Slot = 0, CurSize = TypeStack.size();
+  while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
+  
+  // This is another base case for the recursion.  In this case, we know 
+  // that we have looped back to a type that we have previously visited.
+  // Generate the appropriate upreference to handle this.
+  // 
+  if (Slot < CurSize)
+    return "\\" + utostr(CurSize-Slot);         // Here's the upreference
+
+  // Recursive case: derived types...
+  std::string Result;
+  TypeStack.push_back(Ty);    // Add us to the stack..
+      
+  switch (Ty->getPrimitiveID()) {
+  case Type::FunctionTyID: {
+    const FunctionType *FTy = cast<FunctionType>(Ty);
+    Result = getTypeDescription(FTy->getReturnType(), TypeStack) + " (";
+    for (FunctionType::ParamTypes::const_iterator
+           I = FTy->getParamTypes().begin(),
+           E = FTy->getParamTypes().end(); I != E; ++I) {
+      if (I != FTy->getParamTypes().begin())
+        Result += ", ";
+      Result += getTypeDescription(*I, TypeStack);
+    }
+    if (FTy->isVarArg()) {
+      if (!FTy->getParamTypes().empty()) Result += ", ";
+      Result += "...";
+    }
+    Result += ")";
+    break;
+  }
+  case Type::StructTyID: {
+    const StructType *STy = cast<StructType>(Ty);
+    Result = "{ ";
+    for (StructType::ElementTypes::const_iterator
+           I = STy->getElementTypes().begin(),
+           E = STy->getElementTypes().end(); I != E; ++I) {
+      if (I != STy->getElementTypes().begin())
+        Result += ", ";
+      Result += getTypeDescription(*I, TypeStack);
+    }
+    Result += " }";
+    break;
+  }
+  case Type::PointerTyID: {
+    const PointerType *PTy = cast<PointerType>(Ty);
+    Result = getTypeDescription(PTy->getElementType(), TypeStack) + " *";
+    break;
+  }
+  case Type::ArrayTyID: {
+    const ArrayType *ATy = cast<ArrayType>(Ty);
+    unsigned NumElements = ATy->getNumElements();
+    Result = "[";
+    Result += utostr(NumElements) + " x ";
+    Result += getTypeDescription(ATy->getElementType(), TypeStack) + "]";
+    break;
+  }
+  default:
+    assert(0 && "Unhandled type in getTypeDescription!");
+    Result = "<error>";
+  }
+
+  TypeStack.pop_back();       // Remove self from stack...
+
+  // In order to reduce the amount of repeated computation, we cache the computd
+  // value for later.
+  if (Ty->isAbstract())
+    AbstractTypeDescriptions[Ty] = Result;
+  else
+    ConcreteTypeDescriptions[Ty] = Result;
+
+  return Result;
+}
+
+
+
+static const std::string &getOrCreateDesc(std::map<const Type*,std::string>&Map,
+                                          const Type *Ty) {
+  std::map<const Type*, std::string>::iterator I = Map.find(Ty);
+  if (I != Map.end()) return I->second;
+    
+  std::vector<const Type *> TypeStack;
+  getTypeDescription(Ty, TypeStack);
+  assert(Map.count(Ty) && "Type didn't get inserted!!");
+  return Map[Ty];
+}
+
+
+const std::string &Type::getDescription() const {
+  if (isAbstract())
+    return getOrCreateDesc(AbstractTypeDescriptions, this);
+  else
+    return getOrCreateDesc(ConcreteTypeDescriptions, this);
+}
+
+
 bool StructType::indexValid(const Value *V) const {
   if (!isa<Constant>(V)) return false;
   if (V->getType() != Type::UByteTy) return false;
@@ -247,7 +373,6 @@
 
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
   setAbstract(true);
-  setDescription("opaque"+utostr(getUniqueID()));
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "Derived new type: " << getDescription() << "\n";
 #endif
@@ -266,87 +391,64 @@
 // some whacko opaque types, but in most cases, it will do some simple stuff
 // when it hits non-abstract types that aren't recursive.
 //
-static std::string getTypeProps(const Type *Ty,
-                                std::vector<const Type *> &TypeStack,
-                                bool &isAbstract, bool &isRecursive) {
-  if (!Ty->isAbstract() && !Ty->isRecursive() && // Base case for the recursion
-      Ty->getDescription().size()) {
-    return Ty->getDescription();                 // Primitive = leaf type
-  } else if (isa<OpaqueType>(Ty)) {              // Base case for the recursion
-    isAbstract = true;                           // This whole type is abstract!
-    return Ty->getDescription();                 // Opaque = leaf type
-  } else {
-    // Check to see if the Type is already on the stack...
-    unsigned Slot = 0, CurSize = TypeStack.size();
-    while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
+static void getTypeProps(const Type *Ty, std::vector<const Type *> &TypeStack,
+                         bool &isAbstract, bool &isRecursive) {
+  if (!Ty->isAbstract() && !Ty->isRecursive()) // Base case for the recursion
+    return;                                    // Primitive = leaf type
+  
+  if (isa<OpaqueType>(Ty)) {                   // Base case for the recursion
+    isAbstract = true;                         // This whole type is abstract!
+    return;                                    // Opaque = leaf type
+  }
+
+  // Check to see if the Type is already on the stack...
+  unsigned Slot = 0, CurSize = TypeStack.size();
+  while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
     
-    // This is another base case for the recursion.  In this case, we know 
-    // that we have looped back to a type that we have previously visited.
-    // Generate the appropriate upreference to handle this.
-    // 
-    if (Slot < CurSize) {
-      isRecursive = true;                         // We know we are recursive
-      return "\\" + utostr(CurSize-Slot);         // Here's the upreference
-    } else {                      // Recursive case: abstract derived type...
-      std::string Result;
-      TypeStack.push_back(Ty);    // Add us to the stack..
-      
-      switch (Ty->getPrimitiveID()) {
-      case Type::FunctionTyID: {
-	const FunctionType *MTy = cast<FunctionType>(Ty);
-	Result = getTypeProps(MTy->getReturnType(), TypeStack,
-			      isAbstract, isRecursive)+" (";
-	for (FunctionType::ParamTypes::const_iterator
-	       I = MTy->getParamTypes().begin(),
-	       E = MTy->getParamTypes().end(); I != E; ++I) {
-	  if (I != MTy->getParamTypes().begin())
-	    Result += ", ";
-	  Result += getTypeProps(*I, TypeStack, isAbstract, isRecursive);
-	}
-	if (MTy->isVarArg()) {
-	  if (!MTy->getParamTypes().empty()) Result += ", ";
-	  Result += "...";
-	}
-	Result += ")";
-	break;
-      }
-      case Type::StructTyID: {
-	const StructType *STy = cast<StructType>(Ty);
-	Result = "{ ";
-	for (StructType::ElementTypes::const_iterator
-	       I = STy->getElementTypes().begin(),
-	       E = STy->getElementTypes().end(); I != E; ++I) {
-	  if (I != STy->getElementTypes().begin())
-	    Result += ", ";
-	  Result += getTypeProps(*I, TypeStack, isAbstract, isRecursive);
-	}
-	Result += " }";
-	break;
-      }
-      case Type::PointerTyID: {
-	const PointerType *PTy = cast<PointerType>(Ty);
-	Result = getTypeProps(PTy->getElementType(), TypeStack,
-			      isAbstract, isRecursive) + " *";
-	break;
-      }
-      case Type::ArrayTyID: {
-	const ArrayType *ATy = cast<ArrayType>(Ty);
-	unsigned NumElements = ATy->getNumElements();
-	Result = "[";
-	Result += utostr(NumElements) + " x ";
-	Result += getTypeProps(ATy->getElementType(), TypeStack,
-			       isAbstract, isRecursive) + "]";
-	break;
-      }
-      default:
-	assert(0 && "Unhandled case in getTypeProps!");
-	Result = "<error>";
-      }
+  // This is another base case for the recursion.  In this case, we know 
+  // that we have looped back to a type that we have previously visited.
+  // Generate the appropriate upreference to handle this.
+  // 
+  if (Slot < CurSize) {
+    isRecursive = true;                         // We know we are recursive
+    return;
+  }
 
-      TypeStack.pop_back();       // Remove self from stack...
-      return Result;
-    }
+  // Recursive case: derived type...
+  TypeStack.push_back(Ty);    // Add us to the stack..
+      
+  switch (Ty->getPrimitiveID()) {
+  case Type::FunctionTyID: {
+    const FunctionType *FTy = cast<FunctionType>(Ty);
+    getTypeProps(FTy->getReturnType(), TypeStack, isAbstract, isRecursive);
+    for (FunctionType::ParamTypes::const_iterator
+           I = FTy->getParamTypes().begin(),
+           E = FTy->getParamTypes().end(); I != E; ++I)
+      getTypeProps(*I, TypeStack, isAbstract, isRecursive);
+    break;
+  }
+  case Type::StructTyID: {
+    const StructType *STy = cast<StructType>(Ty);
+    for (StructType::ElementTypes::const_iterator
+           I = STy->getElementTypes().begin(),
+           E = STy->getElementTypes().end(); I != E; ++I)
+      getTypeProps(*I, TypeStack, isAbstract, isRecursive);
+    break;
+  }
+  case Type::PointerTyID: {
+    const PointerType *PTy = cast<PointerType>(Ty);
+    getTypeProps(PTy->getElementType(), TypeStack, isAbstract, isRecursive);
+    break;
+  }
+  case Type::ArrayTyID:
+    getTypeProps(cast<ArrayType>(Ty)->getElementType(), TypeStack,
+                 isAbstract, isRecursive);
+    break;
+  default:
+    assert(0 && "Unhandled type in getTypeProps!");
   }
+
+  TypeStack.pop_back();       // Remove self from stack...
 }
 
 
@@ -358,7 +460,7 @@
   std::vector<const Type *> TypeStack;
   bool isAbstract = false, isRecursive = false;
   
-  setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
+  getTypeProps(this, TypeStack, isAbstract, isRecursive);
   setAbstract(isAbstract);
   setRecursive(isRecursive);
 }
@@ -402,8 +504,8 @@
   if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
     if (ATy->getNumElements() != cast<ArrayType>(Ty2)->getNumElements())
       return false;
-  } else if (const FunctionType *MTy = dyn_cast<FunctionType>(Ty)) {
-    if (MTy->isVarArg() != cast<FunctionType>(Ty2)->isVarArg())
+  } else if (const FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
+    if (FTy->isVarArg() != cast<FunctionType>(Ty2)->isVarArg())
       return false;
   }
 
@@ -846,6 +948,9 @@
 void DerivedType::refineAbstractTypeTo(const Type *NewType) {
   assert(isAbstract() && "refineAbstractTypeTo: Current type is not abstract!");
   assert(this != NewType && "Can't refine to myself!");
+  
+  // The descriptions may be out of date.  Conservatively clear them all!
+  AbstractTypeDescriptions.clear();
 
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "REFINING abstract type [" << (void*)this << " "




From lattner at cs.uiuc.edu  Tue Sep  2 11:47:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 11:47:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309021646.LAA22494@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.51 -> 1.52

---
Log message:

Further simplifications


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.51 llvm/lib/VMCore/Type.cpp:1.52
--- llvm/lib/VMCore/Type.cpp:1.51	Tue Sep  2 11:35:17 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 11:46:41 2003
@@ -402,52 +402,19 @@
   }
 
   // Check to see if the Type is already on the stack...
-  unsigned Slot = 0, CurSize = TypeStack.size();
-  while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
-    
-  // This is another base case for the recursion.  In this case, we know 
-  // that we have looped back to a type that we have previously visited.
-  // Generate the appropriate upreference to handle this.
-  // 
-  if (Slot < CurSize) {
-    isRecursive = true;                         // We know we are recursive
-    return;
-  }
+  for (unsigned Slot = 0; Slot != TypeStack.size(); ++Slot)
+    if (TypeStack[Slot] == Ty) { // Scan for type
+      isRecursive = true;                         // We know we are recursive
+      return;
+    }
 
   // Recursive case: derived type...
   TypeStack.push_back(Ty);    // Add us to the stack..
-      
-  switch (Ty->getPrimitiveID()) {
-  case Type::FunctionTyID: {
-    const FunctionType *FTy = cast<FunctionType>(Ty);
-    getTypeProps(FTy->getReturnType(), TypeStack, isAbstract, isRecursive);
-    for (FunctionType::ParamTypes::const_iterator
-           I = FTy->getParamTypes().begin(),
-           E = FTy->getParamTypes().end(); I != E; ++I)
-      getTypeProps(*I, TypeStack, isAbstract, isRecursive);
-    break;
-  }
-  case Type::StructTyID: {
-    const StructType *STy = cast<StructType>(Ty);
-    for (StructType::ElementTypes::const_iterator
-           I = STy->getElementTypes().begin(),
-           E = STy->getElementTypes().end(); I != E; ++I)
-      getTypeProps(*I, TypeStack, isAbstract, isRecursive);
-    break;
-  }
-  case Type::PointerTyID: {
-    const PointerType *PTy = cast<PointerType>(Ty);
-    getTypeProps(PTy->getElementType(), TypeStack, isAbstract, isRecursive);
-    break;
-  }
-  case Type::ArrayTyID:
-    getTypeProps(cast<ArrayType>(Ty)->getElementType(), TypeStack,
-                 isAbstract, isRecursive);
-    break;
-  default:
-    assert(0 && "Unhandled type in getTypeProps!");
-  }
 
+  for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
+       I != E; ++I)
+    getTypeProps(*I, TypeStack, isAbstract, isRecursive);
+      
   TypeStack.pop_back();       // Remove self from stack...
 }
 




From lattner at cs.uiuc.edu  Tue Sep  2 14:15:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 14:15:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309021914.OAA28582@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.52 -> 1.53

---
Log message:

Ugh, fix bugs.  Ok, so the last fix wasn't as great as I thought it was.
Now we're back to: 131.730u, 0.330s, which is still quite an improvement,
but still quite unacceptable


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.52 llvm/lib/VMCore/Type.cpp:1.53
--- llvm/lib/VMCore/Type.cpp:1.52	Tue Sep  2 11:46:41 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 14:14:12 2003
@@ -372,6 +372,7 @@
 }
 
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
+  Recursive = false;
   setAbstract(true);
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "Derived new type: " << getDescription() << "\n";
@@ -426,7 +427,9 @@
 void DerivedType::setDerivedTypeProperties() {
   std::vector<const Type *> TypeStack;
   bool isAbstract = false, isRecursive = false;
-  
+
+  setAbstract(true);
+  setRecursive(true);
   getTypeProps(this, TypeStack, isAbstract, isRecursive);
   setAbstract(isAbstract);
   setRecursive(isRecursive);




From lattner at cs.uiuc.edu  Tue Sep  2 15:07:07 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 15:07:07 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022006.PAA29504@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.53 -> 1.54

---
Log message:

Don't bother doing an exhaustive recursive walk if we are at the limit of what 
we need to know anyway.  This reduces the 2002-07-08-HugePerformanceProblem.llx
down to 3.210u:0.010s, which is back in the acceptable range again



---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.53 llvm/lib/VMCore/Type.cpp:1.54
--- llvm/lib/VMCore/Type.cpp:1.53	Tue Sep  2 14:14:12 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 15:06:29 2003
@@ -372,7 +372,7 @@
 }
 
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
-  Recursive = false;
+  setRecursive(false);
   setAbstract(true);
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "Derived new type: " << getDescription() << "\n";
@@ -413,8 +413,10 @@
   TypeStack.push_back(Ty);    // Add us to the stack..
 
   for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
-       I != E; ++I)
+       I != E; ++I) {
     getTypeProps(*I, TypeStack, isAbstract, isRecursive);
+    if (isAbstract && isRecursive) break;
+  }
       
   TypeStack.pop_back();       // Remove self from stack...
 }




From criswell at cs.uiuc.edu  Tue Sep  2 15:16:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 15:16:02 2003
Subject: [llvm-commits] CVS: llvm/include/Support/FileUtilities.h
Message-ID: <200309022015.PAA25885@choi.cs.uiuc.edu>


Changes in directory llvm/include/Support:

FileUtilities.h updated: 1.2 -> 1.3

---
Log message:

Added the MakeFileExecutable() method.  This method takes a filename and
gives it execute access while respecting the user's umask.



---
Diffs of the changes:

Index: llvm/include/Support/FileUtilities.h
diff -u llvm/include/Support/FileUtilities.h:1.2 llvm/include/Support/FileUtilities.h:1.3
--- llvm/include/Support/FileUtilities.h:1.2	Thu Aug  7 16:28:47 2003
+++ llvm/include/Support/FileUtilities.h	Tue Sep  2 15:14:57 2003
@@ -36,4 +36,19 @@
 ///
 std::string getUniqueFilename(const std::string &FilenameBase);
 
+///
+/// Method: MakeFileExecutable()
+///
+/// Description:
+///	This method turns on whatever access attributes are needed to make the
+///	specified file executable.
+///
+/// Return value:
+///	True  - The operation succeeded.
+///	False - The operation failed.
+///
+/// Notes:
+///	In case of failure, the file's access attributes are unspecified.
+///
+bool MakeFileExecutable (const std::string & Filename);
 #endif




From criswell at cs.uiuc.edu  Tue Sep  2 15:16:05 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 15:16:05 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp
Message-ID: <200309022015.PAA25878@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

FileUtilities.cpp updated: 1.3 -> 1.4

---
Log message:

Added the MakeFileExecutable() method.  This method takes a filename and
gives it execute access while respecting the user's umask.



---
Diffs of the changes:

Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.3 llvm/lib/Support/FileUtilities.cpp:1.4
--- llvm/lib/Support/FileUtilities.cpp:1.3	Thu Aug  7 16:35:41 2003
+++ llvm/lib/Support/FileUtilities.cpp	Tue Sep  2 15:14:55 2003
@@ -7,6 +7,8 @@
 
 #include "Support/FileUtilities.h"
 #include "Config/unistd.h"
+#include "Config/sys/stat.h"
+#include "Config/sys/types.h"
 #include <fstream>
 #include <iostream>
 #include <cstdio>
@@ -90,3 +92,51 @@
   delete[] FNBuffer;
   return Result;
 }
+
+///
+/// Method: MakeFileExecutable ()
+///
+/// Description:
+///	This method makes the specified filename executable by giving it
+///	execute permission.
+///
+///	For the UNIX version of this method, we turn on all of the read and
+///	execute bits and then turn off anything specified in the umask.  This
+///	should help ensure that access to the file remains at the level that
+///	the user desires.
+///
+bool
+MakeFileExecutable (const std::string & Filename)
+{
+  // Permissions masking value of the user
+  mode_t mask;
+
+  // Permissions currently enabled on the file
+  struct stat fstat;
+
+  //
+  // Grab the umask value from the operating system.  We want to use it when
+  // changing the file's permissions.
+  //
+  // Note:
+  //  Umask() is one of those annoying system calls.  You have to call it
+  //  to get the current value and then set it back.
+  //
+  mask = umask (0x777);
+  umask (mask);
+
+  //
+  // Go fetch the file's current permission bits.  We want to *add* execute
+  // access to the file.
+  //
+  if ((stat (Filename.c_str(), &fstat)) == -1)
+  {
+    return false;
+  }
+
+  // Make the script executable...
+  chmod(Filename.c_str(), (fstat.st_mode | (0111 & ~mask)));
+
+  return true;
+}
+




From criswell at cs.uiuc.edu  Tue Sep  2 15:18:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 15:18:02 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200309022017.PAA25900@choi.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.42 -> 1.43

---
Log message:

Modified the code so that it uses the MakeFileExecutable() method.  The new
library code now adds all execute bits that are allowed by the umask value to
the file's current permission bits.



---
Diffs of the changes:

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.42 llvm/tools/gccld/gccld.cpp:1.43
--- llvm/tools/gccld/gccld.cpp:1.42	Fri Aug 29 09:46:12 2003
+++ llvm/tools/gccld/gccld.cpp	Tue Sep  2 15:17:20 2003
@@ -21,6 +21,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
+#include "Support/FileUtilities.h"
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
@@ -433,9 +434,6 @@
   Out.close();
 
   if (!LinkAsLibrary) {
-    // Permissions masking value of the user
-    mode_t mask;
-
     // Output the script to start the program...
     std::ofstream Out2(OutputFilename.c_str());
     if (!Out2.good())
@@ -444,22 +442,11 @@
     Out2 << "#!/bin/sh\nlli -q -abort-on-exception $0.bc $*\n";
     Out2.close();
   
-    //
-    // Grab the umask value from the operating system.  We want to use it when
-    // changing the file's permissions.
-    //
-    // Note:
-    //  Umask() is one of those annoying system calls.  You have to call it
-    //  to get the current value and then set it back.
-    //
-    mask = umask (0);
-    umask (mask);
-
     // Make the script executable...
-    chmod(OutputFilename.c_str(), (0755 & ~mask));
+    MakeFileExecutable (OutputFilename);
 
     // Make the bytecode file directly executable in LLEE as well
-    chmod(RealBytecodeOutput.c_str(), (0755 & ~mask));
+    MakeFileExecutable (RealBytecodeOutput);
   }
 
   return 0;




From criswell at cs.uiuc.edu  Tue Sep  2 15:31:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 15:31:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp
Message-ID: <200309022030.PAA26342@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

FileUtilities.cpp updated: 1.4 -> 1.5

---
Log message:

Added a description of the algorithm.
Return failure if the chmod() fails.



---
Diffs of the changes:

Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.4 llvm/lib/Support/FileUtilities.cpp:1.5
--- llvm/lib/Support/FileUtilities.cpp:1.4	Tue Sep  2 15:14:55 2003
+++ llvm/lib/Support/FileUtilities.cpp	Tue Sep  2 15:30:16 2003
@@ -98,12 +98,14 @@
 ///
 /// Description:
 ///	This method makes the specified filename executable by giving it
-///	execute permission.
+///	execute permission.  It respects the umask value of the process, and it
+///	does not enable any unnecessary access bits.
 ///
-///	For the UNIX version of this method, we turn on all of the read and
-///	execute bits and then turn off anything specified in the umask.  This
-///	should help ensure that access to the file remains at the level that
-///	the user desires.
+/// Algorithm:
+///	o Get file's current permissions.
+///	o Get the process's current umask.
+///	o Take the set of all execute bits and disable those found in the umask.
+///	o Add the remaining permissions to the file's permissions.
 ///
 bool
 MakeFileExecutable (const std::string & Filename)
@@ -134,8 +136,13 @@
     return false;
   }
 
-  // Make the script executable...
-  chmod(Filename.c_str(), (fstat.st_mode | (0111 & ~mask)));
+  //
+  // Make the file executable...
+  //
+  if ((chmod(Filename.c_str(), (fstat.st_mode | (0111 & ~mask)))) == -1)
+  {
+    return false;
+  }
 
   return true;
 }




From criswell at cs.uiuc.edu  Tue Sep  2 16:18:04 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 16:18:04 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200309022111.QAA29591@choi.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.43 -> 1.44

---
Log message:

Added code that makes the bytecode file readable (needed by the generated shell
script).
Removed the use of sys/types.h and sys/stat.h.
Modified FileExists() so that it uses the access() system call to check for
file existance.  This requires less header files and might even be a tad bit
faster.



---
Diffs of the changes:

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.43 llvm/tools/gccld/gccld.cpp:1.44
--- llvm/tools/gccld/gccld.cpp:1.43	Tue Sep  2 15:17:20 2003
+++ llvm/tools/gccld/gccld.cpp	Tue Sep  2 16:11:22 2003
@@ -24,12 +24,11 @@
 #include "Support/FileUtilities.h"
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
+#include "Config/unistd.h"
 #include <fstream>
 #include <memory>
 #include <set>
 #include <algorithm>
-#include <sys/types.h>     // For FileExists
-#include <sys/stat.h>
 
 namespace {
   cl::list<std::string> 
@@ -78,8 +77,7 @@
 
 // FileExists - Return true if the specified string is an openable file...
 static inline bool FileExists(const std::string &FN) {
-  struct stat StatBuf;
-  return stat(FN.c_str(), &StatBuf) != -1;
+  return access(FN.c_str(), F_OK) != -1;
 }
 
 
@@ -445,8 +443,9 @@
     // Make the script executable...
     MakeFileExecutable (OutputFilename);
 
-    // Make the bytecode file directly executable in LLEE as well
+    // Make the bytecode file readable and directly executable in LLEE as well
     MakeFileExecutable (RealBytecodeOutput);
+    MakeFileReadable   (RealBytecodeOutput);
   }
 
   return 0;




From criswell at cs.uiuc.edu  Tue Sep  2 16:18:08 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 16:18:08 2003
Subject: [llvm-commits] CVS: llvm/include/Support/FileUtilities.h
Message-ID: <200309022109.QAA29572@choi.cs.uiuc.edu>


Changes in directory llvm/include/Support:

FileUtilities.h updated: 1.3 -> 1.4

---
Log message:

Added the MakeFileReadable() method.



---
Diffs of the changes:

Index: llvm/include/Support/FileUtilities.h
diff -u llvm/include/Support/FileUtilities.h:1.3 llvm/include/Support/FileUtilities.h:1.4
--- llvm/include/Support/FileUtilities.h:1.3	Tue Sep  2 15:14:57 2003
+++ llvm/include/Support/FileUtilities.h	Tue Sep  2 16:09:30 2003
@@ -51,4 +51,21 @@
 ///	In case of failure, the file's access attributes are unspecified.
 ///
 bool MakeFileExecutable (const std::string & Filename);
+
+///
+/// Method: MakeFileReadable()
+///
+/// Description:
+///	This method turns on whatever access attributes are needed to make the
+///	specified file readable.
+///
+/// Return value:
+///	True  - The operation succeeded.
+///	False - The operation failed.
+///
+/// Notes:
+///	In case of failure, the file's access attributes are unspecified.
+///
+bool MakeFileReadable (const std::string & Filename);
+
 #endif




From criswell at cs.uiuc.edu  Tue Sep  2 16:18:11 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Sep  2 16:18:11 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp
Message-ID: <200309022109.QAA29562@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

FileUtilities.cpp updated: 1.5 -> 1.6

---
Log message:

Added the MakeFileReadable() method.



---
Diffs of the changes:

Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.5 llvm/lib/Support/FileUtilities.cpp:1.6
--- llvm/lib/Support/FileUtilities.cpp:1.5	Tue Sep  2 15:30:16 2003
+++ llvm/lib/Support/FileUtilities.cpp	Tue Sep  2 16:09:28 2003
@@ -147,3 +147,57 @@
   return true;
 }
 
+///
+/// Method: MakeFileReadable ()
+///
+/// Description:
+///	This method makes the specified filename readable by giving it
+///	read permission.  It respects the umask value of the process, and it
+///	does not enable any unnecessary access bits.
+///
+/// Algorithm:
+///	o Get file's current permissions.
+///	o Get the process's current umask.
+///	o Take the set of all read bits and disable those found in the umask.
+///	o Add the remaining permissions to the file's permissions.
+///
+bool
+MakeFileReadable (const std::string & Filename)
+{
+  // Permissions masking value of the user
+  mode_t mask;
+
+  // Permissions currently enabled on the file
+  struct stat fstat;
+
+  //
+  // Grab the umask value from the operating system.  We want to use it when
+  // changing the file's permissions.
+  //
+  // Note:
+  //  Umask() is one of those annoying system calls.  You have to call it
+  //  to get the current value and then set it back.
+  //
+  mask = umask (0x777);
+  umask (mask);
+
+  //
+  // Go fetch the file's current permission bits.  We want to *add* execute
+  // access to the file.
+  //
+  if ((stat (Filename.c_str(), &fstat)) == -1)
+  {
+    return false;
+  }
+
+  //
+  // Make the file executable...
+  //
+  if ((chmod(Filename.c_str(), (fstat.st_mode | (0444 & ~mask)))) == -1)
+  {
+    return false;
+  }
+
+  return true;
+}
+




From lattner at cs.uiuc.edu  Tue Sep  2 16:41:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 16:41:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Type.h
Message-ID: <200309022140.QAA15410@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

Type.h updated: 1.26 -> 1.27

---
Log message:

Remove the "recursive bit", not only is it unused by anyone, it was also
not correctly calculated, and calculating it wrong for fun seems rather
pointless.


---
Diffs of the changes:

Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.26 llvm/include/llvm/Type.h:1.27
--- llvm/include/llvm/Type.h:1.26	Tue Sep  2 11:28:03 2003
+++ llvm/include/llvm/Type.h	Tue Sep  2 16:40:33 2003
@@ -73,7 +73,6 @@
   PrimitiveID ID;        // The current base type of this type...
   unsigned    UID;       // The unique ID number for this class
   bool        Abstract;  // True if type contains an OpaqueType
-  bool        Recursive; // True if the type is recursive
 
 protected:
   /// ctor is protected, so only subclasses can create Type objects...
@@ -89,10 +88,6 @@
   ///
   inline void setAbstract(bool Val) { Abstract = Val; }
 
-  /// Types can become recursive later, if they are refined.
-  ///
-  inline void setRecursive(bool Val) { Recursive = Val; }
-
 public:
   virtual void print(std::ostream &O) const;
 
@@ -147,10 +142,6 @@
   /// type that includes an opaque type somewhere in it.  
   ///
   inline bool isAbstract() const { return Abstract; }
-
-  /// isRecursive - True if the type graph contains a cycle.
-  ///
-  inline bool isRecursive() const { return Recursive; }
 
   /// isLosslesslyConvertibleTo - Return true if this type can be converted to
   /// 'Ty' without any reinterpretation of bits.  For example, uint to int.




From lattner at cs.uiuc.edu  Tue Sep  2 16:42:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 16:42:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022141.QAA15427@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.54 -> 1.55

---
Log message:

Remove the "recursive bit", not only is it unused by anyone, it was also
not correctly calculated, and calculating it wrong for fun seems rather
pointless.  This also speeds up my favorite testcase by .25 seconds. 



---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.54 llvm/lib/VMCore/Type.cpp:1.55
--- llvm/lib/VMCore/Type.cpp:1.54	Tue Sep  2 15:06:29 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 16:41:05 2003
@@ -41,7 +41,7 @@
   : Value(Type::TypeTy, Value::TypeVal) {
   ConcreteTypeDescriptions[this] = name;
   ID = id;
-  Abstract = Recursive = false;
+  Abstract = false;
   UID = CurUID++;       // Assign types UID's as they are created
   UIDMappings.push_back(this);
 }
@@ -136,7 +136,7 @@
     return Desc;
   }
   
-  if (!Ty->isAbstract() && !Ty->isRecursive()) {  // Base case for the recursion
+  if (!Ty->isAbstract()) {                       // Base case for the recursion
     std::map<const Type*, std::string>::iterator I =
       ConcreteTypeDescriptions.find(Ty);
     if (I != ConcreteTypeDescriptions.end()) return I->second;
@@ -372,7 +372,6 @@
 }
 
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
-  setRecursive(false);
   setAbstract(true);
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "Derived new type: " << getDescription() << "\n";
@@ -393,8 +392,8 @@
 // when it hits non-abstract types that aren't recursive.
 //
 static void getTypeProps(const Type *Ty, std::vector<const Type *> &TypeStack,
-                         bool &isAbstract, bool &isRecursive) {
-  if (!Ty->isAbstract() && !Ty->isRecursive()) // Base case for the recursion
+                         bool &isAbstract) {
+  if (!Ty->isAbstract())                       // Base case for the recursion
     return;                                    // Primitive = leaf type
   
   if (isa<OpaqueType>(Ty)) {                   // Base case for the recursion
@@ -404,37 +403,32 @@
 
   // Check to see if the Type is already on the stack...
   for (unsigned Slot = 0; Slot != TypeStack.size(); ++Slot)
-    if (TypeStack[Slot] == Ty) { // Scan for type
-      isRecursive = true;                         // We know we are recursive
-      return;
-    }
+    if (TypeStack[Slot] == Ty)   // Scan for type
+      return;                    // is a recursive check.
 
   // Recursive case: derived type...
   TypeStack.push_back(Ty);    // Add us to the stack..
 
   for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
        I != E; ++I) {
-    getTypeProps(*I, TypeStack, isAbstract, isRecursive);
-    if (isAbstract && isRecursive) break;
+    getTypeProps(*I, TypeStack, isAbstract);
+    if (isAbstract) break;
   }
       
   TypeStack.pop_back();       // Remove self from stack...
 }
 
 
-// setDerivedTypeProperties - This function is used to calculate the
-// isAbstract, isRecursive, and the Description settings for a type.  The
-// getTypeProps function does all the dirty work.
+// setDerivedTypeProperties - This function is used to calculate the isAbstract
+// setting for a type.  The getTypeProps function does all the dirty work.
 //
 void DerivedType::setDerivedTypeProperties() {
   std::vector<const Type *> TypeStack;
-  bool isAbstract = false, isRecursive = false;
+  bool isAbstract = false;
 
   setAbstract(true);
-  setRecursive(true);
-  getTypeProps(this, TypeStack, isAbstract, isRecursive);
+  getTypeProps(this, TypeStack, isAbstract);
   setAbstract(isAbstract);
-  setRecursive(isRecursive);
 }
 
 




From lattner at cs.uiuc.edu  Tue Sep  2 16:56:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 16:56:02 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Type.h
Message-ID: <200309022155.QAA18383@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

Type.h updated: 1.27 -> 1.28

---
Log message:

New method


---
Diffs of the changes:

Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.27 llvm/include/llvm/Type.h:1.28
--- llvm/include/llvm/Type.h:1.27	Tue Sep  2 16:40:33 2003
+++ llvm/include/llvm/Type.h	Tue Sep  2 16:54:56 2003
@@ -88,6 +88,9 @@
   ///
   inline void setAbstract(bool Val) { Abstract = Val; }
 
+  /// isTypeAbstract - This method is used to calculate the Abstract bit.
+  ///
+  bool isTypeAbstract();
 public:
   virtual void print(std::ostream &O) const;
 




From lattner at cs.uiuc.edu  Tue Sep  2 16:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 16:57:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022156.QAA18403@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.55 -> 1.56

---
Log message:

Removal of explicit stack, which requires the method to be a member (so it can 
call setAbstract).  Now that we just compute abstractness we can also return
the computed value by value instead of as an argument.


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.55 llvm/lib/VMCore/Type.cpp:1.56
--- llvm/lib/VMCore/Type.cpp:1.55	Tue Sep  2 16:41:05 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 16:56:34 2003
@@ -385,37 +385,38 @@
 //               Derived Type setDerivedTypeProperties Function
 //===----------------------------------------------------------------------===//
 
-// getTypeProps - This is a recursive function that walks a type hierarchy
-// calculating the description for a type and whether or not it is abstract or
-// recursive.  Worst case it will have to do a lot of traversing if you have
-// some whacko opaque types, but in most cases, it will do some simple stuff
-// when it hits non-abstract types that aren't recursive.
+// isTypeAbstract - This is a recursive function that walks a type hierarchy
+// calculating whether or not a type is abstract.  Worst case it will have to do
+// a lot of traversing if you have some whacko opaque types, but in most cases,
+// it will do some simple stuff when it hits non-abstract types that aren't
+// recursive.
 //
-static void getTypeProps(const Type *Ty, std::vector<const Type *> &TypeStack,
-                         bool &isAbstract) {
-  if (!Ty->isAbstract())                       // Base case for the recursion
-    return;                                    // Primitive = leaf type
+bool Type::isTypeAbstract() {
+  if (!isAbstract())                           // Base case for the recursion
+    return false;                              // Primitive = leaf type
   
-  if (isa<OpaqueType>(Ty)) {                   // Base case for the recursion
-    isAbstract = true;                         // This whole type is abstract!
-    return;                                    // Opaque = leaf type
-  }
+  if (isa<OpaqueType>(this))                   // Base case for the recursion
+    return true;                               // This whole type is abstract!
 
-  // Check to see if the Type is already on the stack...
-  for (unsigned Slot = 0; Slot != TypeStack.size(); ++Slot)
-    if (TypeStack[Slot] == Ty)   // Scan for type
-      return;                    // is a recursive check.
-
-  // Recursive case: derived type...
-  TypeStack.push_back(Ty);    // Add us to the stack..
+  // We have to guard against recursion.  To do this, we temporarily mark this
+  // type as concrete, so that if we get back to here recursively we will think
+  // it's not abstract, and thus not scan it again.
+  setAbstract(false);
+
+  // Scan all of the sub-types.  If any of them are abstract, than so is this
+  // one!
+  for (Type::subtype_iterator I = subtype_begin(), E = subtype_end();
+       I != E; ++I)
+    if (const_cast<Type*>(*I)->isTypeAbstract()) {
+      setAbstract(true);
+      return true;
+    }
+  
+  // Restore the abstract bit.
+  setAbstract(true);
 
-  for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
-       I != E; ++I) {
-    getTypeProps(*I, TypeStack, isAbstract);
-    if (isAbstract) break;
-  }
-      
-  TypeStack.pop_back();       // Remove self from stack...
+  // Nothing looks abstract here...
+  return false;
 }
 
 
@@ -423,12 +424,8 @@
 // setting for a type.  The getTypeProps function does all the dirty work.
 //
 void DerivedType::setDerivedTypeProperties() {
-  std::vector<const Type *> TypeStack;
-  bool isAbstract = false;
-
   setAbstract(true);
-  getTypeProps(this, TypeStack, isAbstract);
-  setAbstract(isAbstract);
+  setAbstract(isTypeAbstract());
 }
 
 




From lattner at cs.uiuc.edu  Tue Sep  2 17:16:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 17:16:03 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022215.RAA20452@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.56 -> 1.57

---
Log message:

Another optimization, speed up the testcase to 2.7s


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.56 llvm/lib/VMCore/Type.cpp:1.57
--- llvm/lib/VMCore/Type.cpp:1.56	Tue Sep  2 16:56:34 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 17:15:15 2003
@@ -208,8 +208,8 @@
 
   TypeStack.pop_back();       // Remove self from stack...
 
-  // In order to reduce the amount of repeated computation, we cache the computd
-  // value for later.
+  // In order to reduce the amount of repeated computation, we cache the
+  // computed value for later.
   if (Ty->isAbstract())
     AbstractTypeDescriptions[Ty] = Result;
   else
@@ -348,6 +348,7 @@
   for (unsigned i = 0; i < Params.size(); ++i)
     ParamTys.push_back(PATypeHandle(Params[i], this));
 
+  setAbstract(true);
   setDerivedTypeProperties();
 }
 
@@ -358,16 +359,19 @@
     assert(Types[i] != Type::VoidTy && "Void type in method prototype!!");
     ETypes.push_back(PATypeHandle(Types[i], this));
   }
+  setAbstract(true);
   setDerivedTypeProperties();
 }
 
 ArrayType::ArrayType(const Type *ElType, unsigned NumEl)
   : SequentialType(ArrayTyID, ElType) {
   NumElements = NumEl;
+  setAbstract(true);
   setDerivedTypeProperties();
 }
 
 PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
+  setAbstract(true);
   setDerivedTypeProperties();
 }
 
@@ -408,8 +412,8 @@
   for (Type::subtype_iterator I = subtype_begin(), E = subtype_end();
        I != E; ++I)
     if (const_cast<Type*>(*I)->isTypeAbstract()) {
-      setAbstract(true);
-      return true;
+      setAbstract(true);        // Restore the abstract bit.
+      return true;              // This type is abstract if subtype is abstract!
     }
   
   // Restore the abstract bit.
@@ -424,6 +428,8 @@
 // setting for a type.  The getTypeProps function does all the dirty work.
 //
 void DerivedType::setDerivedTypeProperties() {
+  // If the type is currently thought to be abstract, rescan all of our subtypes
+  // to see if the type has just become concrete!
   setAbstract(true);
   setAbstract(isTypeAbstract());
 }




From lattner at cs.uiuc.edu  Tue Sep  2 17:51:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 17:51:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022250.RAA29414@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.57 -> 1.58

---
Log message:

Don't return bogus references, and don't add an entry to the Concrete map
unless it's not empty!


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.57 llvm/lib/VMCore/Type.cpp:1.58
--- llvm/lib/VMCore/Type.cpp:1.57	Tue Sep  2 17:15:15 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 17:50:02 2003
@@ -39,7 +39,8 @@
 
 Type::Type(const std::string &name, PrimitiveID id)
   : Value(Type::TypeTy, Value::TypeVal) {
-  ConcreteTypeDescriptions[this] = name;
+  if (!name.empty())
+    ConcreteTypeDescriptions[this] = name;
   ID = id;
   Abstract = false;
   UID = CurUID++;       // Assign types UID's as they are created
@@ -202,8 +203,8 @@
     break;
   }
   default:
-    assert(0 && "Unhandled type in getTypeDescription!");
     Result = "<error>";
+    assert(0 && "Unhandled type in getTypeDescription!");
   }
 
   TypeStack.pop_back();       // Remove self from stack...
@@ -211,11 +212,9 @@
   // In order to reduce the amount of repeated computation, we cache the
   // computed value for later.
   if (Ty->isAbstract())
-    AbstractTypeDescriptions[Ty] = Result;
+    return AbstractTypeDescriptions[Ty] = Result;
   else
-    ConcreteTypeDescriptions[Ty] = Result;
-
-  return Result;
+    return ConcreteTypeDescriptions[Ty] = Result;
 }
 
 




From lattner at cs.uiuc.edu  Tue Sep  2 17:53:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 17:53:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309022253.RAA29955@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.58 -> 1.59

---
Log message:

Another small speedup, this one to: 2.42s


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.58 llvm/lib/VMCore/Type.cpp:1.59
--- llvm/lib/VMCore/Type.cpp:1.58	Tue Sep  2 17:50:02 2003
+++ llvm/lib/VMCore/Type.cpp	Tue Sep  2 17:52:49 2003
@@ -429,8 +429,8 @@
 void DerivedType::setDerivedTypeProperties() {
   // If the type is currently thought to be abstract, rescan all of our subtypes
   // to see if the type has just become concrete!
-  setAbstract(true);
-  setAbstract(isTypeAbstract());
+  if (isAbstract())
+    setAbstract(isTypeAbstract());
 }
 
 




From lattner at cs.uiuc.edu  Tue Sep  2 18:40:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 18:40:02 2003
Subject: [llvm-commits] CVS: llvm/www/docs/LangRef.html
Message-ID: <200309022338.SAA08595@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

LangRef.html updated: 1.27 -> 1.28

---
Log message:

hyphenation police visited here


---
Diffs of the changes:

Index: llvm/www/docs/LangRef.html
diff -u llvm/www/docs/LangRef.html:1.27 llvm/www/docs/LangRef.html:1.28
--- llvm/www/docs/LangRef.html:1.27	Thu Aug 28 17:12:25 2003
+++ llvm/www/docs/LangRef.html	Tue Sep  2 18:38:41 2003
@@ -100,8 +100,8 @@
 
 <blockquote>
   This document is a reference manual for the LLVM assembly language.  LLVM is
-  an SSA based representation that provides type safety, low level operations,
-  flexibility, and the capability of representing 'all' high level languages
+  an SSA based representation that provides type safety, low-level operations,
+  flexibility, and the capability of representing 'all' high-level languages
   cleanly.  It is the common code representation used throughout all phases of
   the LLVM compilation strategy.
 </blockquote>
@@ -117,17 +117,17 @@
 <!-- *********************************************************************** -->
 
 The LLVM code representation is designed to be used in three different forms: as
-an in-memory compiler IR, as an on-disk bytecode representation, suitable for
-fast loading by a dynamic compiler, and as a human readable assembly language
-representation.  This allows LLVM to provide a powerful intermediate
+an in-memory compiler IR, as an on-disk bytecode representation (suitable for
+fast loading by a Just-In-Time compiler), and as a human readable assembly
+language representation.  This allows LLVM to provide a powerful intermediate
 representation for efficient compiler transformations and analysis, while
 providing a natural means to debug and visualize the transformations.  The three
 different forms of LLVM are all equivalent.  This document describes the human
 readable representation and notation.<p>
 
-The LLVM representation aims to be a light weight and low level while being
+The LLVM representation aims to be a light-weight and low-level while being
 expressive, typed, and extensible at the same time.  It aims to be a "universal
-IR" of sorts, by being at a low enough level that high level ideas may be
+IR" of sorts, by being at a low enough level that high-level ideas may be
 cleanly mapped to it (similar to how microprocessors are "universal IR's",
 allowing many source languages to be mapped to them).  By providing type
 information, LLVM can be used as the target of optimizations: for example,
@@ -1839,7 +1839,7 @@
 <address><a href="mailto:sabre at nondot.org">Chris Lattner</a></address>
 <!-- Created: Tue Jan 23 15:19:28 CST 2001 -->
 <!-- hhmts start -->
-Last modified: Thu Aug 28 17:11:50 CDT 2003
+Last modified: Tue Sep  2 18:38:09 CDT 2003
 <!-- hhmts end -->
 </font>
 </body></html>




From lattner at cs.uiuc.edu  Tue Sep  2 19:43:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 19:43:02 2003
Subject: [llvm-commits] CVS: llvm/www/docs/LangRef.html
Message-ID: <200309030041.TAA01292@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

LangRef.html updated: 1.28 -> 1.29

---
Log message:

Add a WHOLE lot of updates clarifications and fixes.  This is not done but getting closer.  I changed the docs to reflect the goal of making unwind an instruction, not an intrinsic.


---
Diffs of the changes:

Index: llvm/www/docs/LangRef.html
diff -u llvm/www/docs/LangRef.html:1.28 llvm/www/docs/LangRef.html:1.29
--- llvm/www/docs/LangRef.html:1.28	Tue Sep  2 18:38:41 2003
+++ llvm/www/docs/LangRef.html	Tue Sep  2 19:41:47 2003
@@ -39,6 +39,7 @@
           <li><a href="#i_br"    >'<tt>br</tt>' Instruction</a>
           <li><a href="#i_switch">'<tt>switch</tt>' Instruction</a>
           <li><a href="#i_invoke">'<tt>invoke</tt>' Instruction</a>
+          <li><a href="#i_unwind"  >'<tt>unwind</tt>'  Instruction</a>
         </ol>
       <li><a href="#binaryops">Binary Operations</a>
         <ol>
@@ -81,7 +82,6 @@
       <li><a href="#i_va_start">'<tt>llvm.va_start</tt>' Intrinsic</a>
       <li><a href="#i_va_end"  >'<tt>llvm.va_end</tt>'   Intrinsic</a>
       <li><a href="#i_va_copy" >'<tt>llvm.va_copy</tt>'  Intrinsic</a>
-      <li><a href="#i_unwind"  >'<tt>llvm.unwind</tt>'  Intrinsic</a>
     </ol>
   </ol>
 
@@ -167,9 +167,17 @@
 LLVM uses three different forms of identifiers, for different purposes:<p>
 
 <ol>
-<li>Numeric constants are represented as you would expect: 12, -3 123.421, etc.  Floating point constants have an optional hexidecimal notation.
-<li>Named values are represented as a string of characters with a '%' prefix.  For example, %foo, %DivisionByZero, %a.really.long.identifier.  The actual regular expression used is '<tt>%[a-zA-Z$._][a-zA-Z$._0-9]*</tt>'.
-<li>Unnamed values are represented as an unsigned numeric value with a '%' prefix.  For example, %12, %2, %44.
+<li>Numeric constants are represented as you would expect: 12, -3 123.421, etc.
+Floating point constants have an optional hexidecimal notation.
+
+<li>Named values are represented as a string of characters with a '%' prefix.
+For example, %foo, %DivisionByZero, %a.really.long.identifier.  The actual
+regular expression used is '<tt>%[a-zA-Z$._][a-zA-Z$._0-9]*</tt>'.  Identifiers
+which require other characters in their names can be surrounded with quotes.  In
+this way, anything except a <tt>"</tt> character can be used in a name.
+
+<li>Unnamed values are represented as an unsigned numeric value with a '%'
+prefix.  For example, %12, %2, %44.
 </ol><p>
 
 LLVM requires the values start with a '%' sign for two reasons: Compilers don't
@@ -346,7 +354,7 @@
 <ul>
 <table border=0 cellpadding=0 cellspacing=0>
 <tr><td><tt>[3 x [4 x int]]</tt></td><td>: 3x4 array integer values.</td></tr>
-<tr><td><tt>[12 x [10 x float]]</tt></td><td>: 2x10 array of single precision floating point values.</td></tr>
+<tr><td><tt>[12 x [10 x float]]</tt></td><td>: 12x10 array of single precision floating point values.</td></tr>
 <tr><td><tt>[2 x [3 x [4 x uint]]]</tt></td><td>: 2x3x4 array of unsigned integer values.</td></tr>
 </table>
 </ul>
@@ -369,10 +377,10 @@
 
 Where '<tt>&lt;parameter list&gt;</tt>' is a comma-separated list of type
 specifiers.  Optionally, the parameter list may include a type <tt>...</tt>,
-which indicates that the function takes a variable number of arguments.  Note
-that there currently is no way to define a function in LLVM that takes a
-variable number of arguments, but it is possible to <b>call</b> a function that
-is vararg.<p>
+which indicates that the function takes a variable number of arguments.
+Variable argument functions can access their arguments with the <a
+href="#int_varargs">variable argument handling intrinsic</a> functions.
+<p>
 
 <h5>Examples:</h5>
 <ul>
@@ -490,13 +498,13 @@
 
 <pre>
 <i>; Declare the string constant as a global constant...</i>
-<a href="#identifiers">%.LC0</a> = <a href="#linkage_decl">internal</a> <a href="#globalvars">constant</a> <a href="#t_array">[13 x sbyte]</a> c"hello world\0A\00"          <i>; [13 x sbyte]*</i>
+<a href="#identifiers">%.LC0</a> = <a href="#linkage_internal">internal</a> <a href="#globalvars">constant</a> <a href="#t_array">[13 x sbyte]</a> c"hello world\0A\00"          <i>; [13 x sbyte]*</i>
 
-<i>; Forward declaration of puts</i>
-<a href="#functionstructure">declare</a> int "puts"(sbyte*)                                           <i>; int(sbyte*)* </i>
+<i>; External declaration of the puts function</i>
+<a href="#functionstructure">declare</a> int %puts(sbyte*)                                            <i>; int(sbyte*)* </i>
 
 <i>; Definition of main function</i>
-int "main"() {                                                       <i>; int()* </i>
+int %main() {                                                        <i>; int()* </i>
         <i>; Convert [13x sbyte]* to sbyte *...</i>
         %cast210 = <a href="#i_getelementptr">getelementptr</a> [13 x sbyte]* %.LC0, long 0, long 0 <i>; sbyte*</i>
 
@@ -510,19 +518,56 @@
 "<tt>.LC0</tt>", an external declaration of the "<tt>puts</tt>" function, and a
 <a href="#functionstructure">function definition</a> for "<tt>main</tt>".<p>
 
-<a name="linkage_decl">
+<a name="linkage">
 In general, a module is made up of a list of global values, where both functions
 and global variables are global values.  Global values are represented by a
 pointer to a memory location (in this case, a pointer to an array of char, and a
-pointer to a function), and can be either "internal" or externally accessible
-(which corresponds to the static keyword in C, when used at global scope).<p>
+pointer to a function), and have one of the following linkage types:<p>
+
+<dl>
+<a name="linkage_internal">
+<dt><tt><b>internal</b></tt>
+
+<dd>Global values with internal linkage are only directly accessible by objects
+in the current module.  In particular, linking code into a module with an
+internal global value may cause the internal to be renamed as necessary to avoid
+collisions.  Because the symbol is internal to the module, all references can be
+updated.  This corresponds to the notion of the '<tt>static</tt>' keyword in C,
+or the idea of "anonymous namespaces" in C++.<p>
+
+<a name="linkage_linkonce">
+<dt><tt><b>linkonce</b></tt>:
+
+<dd>"<tt>linkonce</tt>" linkage is similar to <tt>internal</tt> linkage, with
+the twist that linking together two modules defining the same <tt>linkonce</tt>
+globals will cause one of the globals to be discarded.  This is typically used
+to implement inline functions.<p>
+
+<a name="linkage_appending">
+<dt><tt><b>appending</b></tt>:
+
+<dd>"<tt>appending</tt>" linkage may only applied to global variables of pointer
+to array type.  When two global variables with appending linkage are linked
+together, the two global arrays are appended together.  This is the LLVM,
+typesafe, equivalent of having the system linker append together "sections" with
+identical names when .o files are linked.<p>
+
+<a name="linkage_external">
+<dt><tt><b>externally visible</b></tt>:
+
+<dd>If none of the above identifiers are used, the global is externally visible,
+meaning that it participates in linkage and can be used to resolve external
+symbol references.<p>
+
+</dl><p>
+
 
 For example, since the "<tt>.LC0</tt>" variable is defined to be internal, if
 another module defined a "<tt>.LC0</tt>" variable and was linked with this one,
 one of the two would be renamed, preventing a collision.  Since "<tt>main</tt>"
-and "<tt>puts</tt>" are external (i.e., lacking "<tt>internal</tt>"
-declarations), they are accessible outside of the current module.  It is illegal
-for a function declaration to be "<tt>internal</tt>".<p>
+and "<tt>puts</tt>" are external (i.e., lacking any linkage declarations), they
+are accessible outside of the current module.  It is illegal for a function
+<i>declaration</i> to have any linkage type other than "externally visible".<p>
 
 
 <!-- ======================================================================= -->
@@ -547,7 +592,7 @@
 <!-- ======================================================================= -->
 </ul><table width="100%" bgcolor="#441188" border=0 cellpadding=4 cellspacing=0>
 <tr><td>&nbsp;</td><td width="100%">&nbsp; <font color="#EEEEFF" face="Georgia,Palatino"><b>
-<a name="functionstructure">Function Structure
+<a name="functionstructure">Functions
 </b></font></td></tr></table><ul>
 
 LLVM functions definitions are composed of a (possibly empty) argument list, an
@@ -564,7 +609,8 @@
 The first basic block in program is special in two ways: it is immediately
 executed on entrance to the function, and it is not allowed to have predecessor
 basic blocks (i.e. there can not be any branches to the entry block of a
-function).<p>
+function).  Because the block can have no predecessors, it also cannot have any
+<a href="#i_phi">PHI nodes</a>.<p>
 
 
 <!-- *********************************************************************** -->
@@ -593,11 +639,12 @@
 (the one exception being the '<a href="#i_invoke"><tt>invoke</tt></a>'
 instruction).<p>
 
-There are four different terminator instructions: the '<a
+There are five different terminator instructions: the '<a
 href="#i_ret"><tt>ret</tt></a>' instruction, the '<a
 href="#i_br"><tt>br</tt></a>' instruction, the '<a
-href="#i_switch"><tt>switch</tt></a>' instruction, and the '<a
-href="#i_invoke"><tt>invoke</tt></a>' instruction.<p>
+href="#i_switch"><tt>switch</tt></a>' instruction, the '<a
+href="#i_invoke"><tt>invoke</tt></a>' instruction, and the '<a
+href="#i_unwind"><tt>unwind</tt></a>' instruction.<p>
 
 
 <!-- _______________________________________________________________________ -->
@@ -628,8 +675,13 @@
 <h5>Semantics:</h5>
 
 When the '<tt>ret</tt>' instruction is executed, control flow returns back to
-the calling function's context.  If the instruction returns a value, that value
-shall be propagated into the calling function's data space.<p>
+the calling function's context.  If the caller is a "<a
+href="#i_call"><tt>call</tt></a> instruction, execution continues at the
+instruction after the call.  If the caller was an "<a
+href="#i_invoke"><tt>invoke</tt></a>" instruction, execution continues at the
+beginning "normal" of the destination block.  If the instruction returns a
+value, that value shall set the call or invoke instruction's return value.<p>
+
 
 <h5>Example:</h5>
 <pre>
@@ -665,8 +717,8 @@
 
 Upon execution of a conditional '<tt>br</tt>' instruction, the '<tt>bool</tt>'
 argument is evaluated.  If the value is <tt>true</tt>, control flows to the
-'<tt>iftrue</tt>' '<tt>label</tt>' argument.  If "cond" is <tt>false</tt>,
-control flows to the '<tt>iffalse</tt>' '<tt>label</tt>' argument.<p>
+'<tt>iftrue</tt>' <tt>label</tt> argument.  If "cond" is <tt>false</tt>,
+control flows to the '<tt>iffalse</tt>' <tt>label</tt> argument.<p>
 
 <h5>Example:</h5>
 <pre>
@@ -685,7 +737,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  switch int &lt;value&gt;, label &lt;defaultdest&gt; [ int &lt;val&gt;, label &dest&gt;, ... ]
+  switch uint &lt;value&gt;, label &lt;defaultdest&gt; [ int &lt;val&gt;, label &dest&gt;, ... ]
 
 </pre>
 
@@ -718,15 +770,15 @@
 <pre>
   <i>; Emulate a conditional br instruction</i>
   %Val = <a href="#i_cast">cast</a> bool %value to uint
-  switch int %Val, label %truedest [int 0, label %falsedest ]
+  switch uint %Val, label %truedest [int 0, label %falsedest ]
 
   <i>; Emulate an unconditional br instruction</i>
-  switch int 0, label %dest [ ]
+  switch uint 0, label %dest [ ]
 
   <i>; Implement a jump table:</i>
-  switch int %val, label %otherwise [ int 0, label %onzero, 
-                                      int 1, label %onone, 
-                                      int 2, label %ontwo ]
+  switch uint %val, label %otherwise [ int 0, label %onzero, 
+                                       int 1, label %onone, 
+                                       int 2, label %ontwo ]
 </pre>
 
 
@@ -744,11 +796,12 @@
 
 The '<tt>invoke</tt>' instruction causes control to transfer to a specified
 function, with the possibility of control flow transfer to either the
-'<tt>normal label</tt>' label or the '<tt>exception label</tt>'.  If the callee
-function invokes the "<tt><a href="#i_ret">ret</a></tt>" instruction, control
-flow will return to the "normal" label.  If the callee (or any indirect callees)
-calls the "<a href="#i_unwind"><tt>llvm.unwind</tt></a>" intrinsic, control is
-interrupted, and continued at the "except" label.<p>
+'<tt>normal</tt>' <tt>label</tt> label or the '<tt>exception</tt>'
+<tt>label</tt>.  If the callee function returns with the "<tt><a
+href="#i_ret">ret</a></tt>" instruction, control flow will return to the
+"normal" label.  If the callee (or any indirect callees) returns with the "<a
+href="#i_unwind"><tt>unwind</tt></a>" instruction, control is interrupted, and
+continued at the dynamically nearest "except" label.<p>
 
 
 <h5>Arguments:</h5>
@@ -771,8 +824,8 @@
 <li>'<tt>normal label</tt>': the label reached when the called function executes
 a '<tt><a href="#i_ret">ret</a></tt>' instruction.
 
-<li>'<tt>exception label</tt>': the label reached when a callee calls the <a
-href="#i_unwind"><tt>llvm.unwind</tt></a> intrinsic.
+<li>'<tt>exception label</tt>': the label reached when a callee returns with the
+<a href="#i_unwind"><tt>unwind</tt></a> instruction.
 </ol>
 
 <h5>Semantics:</h5>
@@ -793,6 +846,30 @@
               except label %TestCleanup     <i>; {int}:retval set</i>
 </pre>
 
+<!-- _______________________________________________________________________ -->
+</ul><a name="i_unwind"><h4><hr size=0>'<tt>unwind</tt>' Instruction</h4><ul>
+
+<h5>Syntax:</h5>
+<pre>
+  unwind
+</pre>
+
+<h5>Overview:</h5>
+
+The '<tt>unwind</tt>' instruction unwinds the stack, continuing control flow at
+the first callee in the dynamic call stack which used an <a
+href="#i_invoke"><tt>invoke</tt></a> instruction to perform the call.  This is
+primarily used to implement exception handling.
+
+<h5>Semantics:</h5>
+
+The '<tt>unwind</tt>' intrinsic causes execution of the current function to
+immediately halt.  The dynamic call stack is then searched for the first <a
+href="#i_invoke"><tt>invoke</tt></a> instruction on the call stack.  Once found,
+execution continues at the "exceptional" destination block specified by the
+<tt>invoke</tt> instruction.  If there is no <tt>invoke</tt> instruction in the
+dynamic call chain, undefined behavior results.
+
 
 
 <!-- ======================================================================= -->
@@ -802,7 +879,7 @@
 
 Binary operators are used to do most of the computation in a program.  They
 require two operands, execute an operation on them, and produce a single value.
-The result value of a binary operator is not neccesarily the same type as its
+The result value of a binary operator is not necessarily the same type as its
 operands.<p>
 
 There are several different binary operators:<p>
@@ -972,9 +1049,6 @@
 '<tt>label</tt>'s, '<tt>array</tt>'s, '<tt>structure</tt>' or '<tt>void</tt>'
 values, etc...).  Both arguments must have identical types.<p>
 
-The '<tt>setlt</tt>', '<tt>setgt</tt>', '<tt>setle</tt>', and '<tt>setge</tt>'
-instructions do not operate on '<tt>bool</tt>' typed arguments.<p>
-
 <h5>Semantics:</h5>
 
 The '<tt>seteq</tt>' instruction yields a <tt>true</tt> '<tt>bool</tt>' value if
@@ -1109,7 +1183,8 @@
 <h5>Overview:</h5>
 
 The '<tt>xor</tt>' instruction returns the bitwise logical exclusive or of its
-two operands.<p>
+two operands.  The <tt>xor</tt> is used to implement the "one's complement"
+operation, which is the "~" operator in C.<p>
 
 <h5>Arguments:</h5>
 
@@ -1136,6 +1211,7 @@
   &lt;result&gt; = xor int 4, %var         <i>; yields {int}:result = 4 ^ %var</i>
   &lt;result&gt; = xor int 15, 40          <i>; yields {int}:result = 39</i>
   &lt;result&gt; = xor int 4, 8            <i>; yields {int}:result = 12</i>
+  &lt;result&gt; = xor int %V, -1          <i>; yields {int}:result = ~%V</i>
 </pre>
 
 
@@ -1211,7 +1287,9 @@
 <a name="memoryops">Memory Access Operations
 </b></font></td></tr></table><ul>
 
-Accessing memory in SSA form is, well, sticky at best.  This section describes how to read, write, allocate and free memory in LLVM.<p>
+A key design point of an SSA-based representation is how it represents memory.
+In LLVM, no memory locations are in SSA form, which makes things very simple.
+This section describes how to read, write, allocate and free memory in LLVM.<p>
 
 
 <!-- _______________________________________________________________________ -->
@@ -1234,10 +1312,12 @@
 second form of the instruction is a shorter version of the first instruction
 that defaults to allocating one element.<p>
 
-'<tt>type</tt>' must be a sized type<p>
+'<tt>type</tt>' must be a sized type.<p>
 
 <h5>Semantics:</h5>
-Memory is allocated, a pointer is returned.<p>
+
+Memory is allocated using the system "<tt>malloc</tt>" function, and a pointer
+is returned.<p>
 
 <h5>Example:</h5>
 <pre>
@@ -1308,7 +1388,9 @@
 Memory is allocated, a pointer is returned.  '<tt>alloca</tt>'d memory is
 automatically released when the function returns.  The '<tt>alloca</tt>'
 instruction is commonly used to represent automatic variables that must have an
-address available, as well as spilled variables.<p>
+address available.  When the function returns (either with the <tt><a
+href="#i_ret">ret</a></tt> or <tt><a href="#i_invoke">invoke</a></tt>
+instructions), the memory is reclaimed.<p>
 
 <h5>Example:</h5>
 <pre>
@@ -1803,32 +1885,6 @@
 arbitrarily complex and require memory allocation, for example.<p>
 
 
-<!-- _______________________________________________________________________ -->
-</ul><a name="i_unwind"><h4><hr size=0>'<tt>llvm.unwind</tt>' Intrinsic</h4><ul>
-
-<h5>Syntax:</h5>
-<pre>
-  call void (void)* %llvm.unwind()
-</pre>
-
-<h5>Overview:</h5>
-
-The '<tt>llvm.unwind</tt>' intrinsic unwinds the stack, continuing control flow
-at the first callee in the dynamic call stack which used an <a
-href="#i_invoke"><tt>invoke</tt></a> instruction to perform the call.  This is
-primarily used to implement exception handling.
-
-<h5>Semantics:</h5>
-
-The '<tt>llvm.unwind</tt>' intrinsic causes execution of the current function to
-immediately halt.  The dynamic call stack is then searched for the first <a
-href="#i_invoke"><tt>invoke</tt></a> instruction on the call stack.  Once found,
-execution continues at the "exceptional" destination block specified by the
-invoke instruction.  If there is no <tt>invoke</tt> instruction in the dynamic
-call chain, undefined behavior results.
-
-
-
 <!-- *********************************************************************** -->
 </ul>
 <!-- *********************************************************************** -->
@@ -1839,7 +1895,7 @@
 <address><a href="mailto:sabre at nondot.org">Chris Lattner</a></address>
 <!-- Created: Tue Jan 23 15:19:28 CST 2001 -->
 <!-- hhmts start -->
-Last modified: Tue Sep  2 18:38:09 CDT 2003
+Last modified: Tue Sep  2 19:41:01 CDT 2003
 <!-- hhmts end -->
 </font>
 </body></html>




From lattner at cs.uiuc.edu  Tue Sep  2 23:22:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Sep  2 23:22:01 2003
Subject: [llvm-commits] CVS: llvm/www/docs/LangRef.html
Message-ID: <200309030420.XAA15839@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

LangRef.html updated: 1.29 -> 1.30

---
Log message:

Final cleanups, document is good to go


---
Diffs of the changes:

Index: llvm/www/docs/LangRef.html
diff -u llvm/www/docs/LangRef.html:1.29 llvm/www/docs/LangRef.html:1.30
--- llvm/www/docs/LangRef.html:1.29	Tue Sep  2 19:41:47 2003
+++ llvm/www/docs/LangRef.html	Tue Sep  2 23:20:13 2003
@@ -1562,7 +1562,7 @@
 <a name="otherops">Other Operations
 </b></font></td></tr></table><ul>
 
-The instructions in this catagory are the "miscellaneous" functions, that defy better classification.<p>
+The instructions in this catagory are the "miscellaneous" instructions, which defy better classification.<p>
 
 
 <!-- _______________________________________________________________________ -->




From lattner at cs.uiuc.edu  Wed Sep  3 09:46:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Sep  3 09:46:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309031445.JAA03075@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.59 -> 1.60

---
Log message:

No need to rescan types when they are created.


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.59 llvm/lib/VMCore/Type.cpp:1.60
--- llvm/lib/VMCore/Type.cpp:1.59	Tue Sep  2 17:52:49 2003
+++ llvm/lib/VMCore/Type.cpp	Wed Sep  3 09:44:53 2003
@@ -343,35 +343,42 @@
                            bool IsVarArgs) : DerivedType(FunctionTyID), 
     ResultType(PATypeHandle(Result, this)),
     isVarArgs(IsVarArgs) {
+  bool isAbstract = Result->isAbstract();
   ParamTys.reserve(Params.size());
-  for (unsigned i = 0; i < Params.size(); ++i)
+  for (unsigned i = 0; i < Params.size(); ++i) {
     ParamTys.push_back(PATypeHandle(Params[i], this));
+    isAbstract |= Params[i]->isAbstract();
+  }
 
-  setAbstract(true);
-  setDerivedTypeProperties();
+  // Calculate whether or not this type is abstract
+  setAbstract(isAbstract);
 }
 
 StructType::StructType(const std::vector<const Type*> &Types)
   : CompositeType(StructTyID) {
   ETypes.reserve(Types.size());
+  bool isAbstract = false;
   for (unsigned i = 0; i < Types.size(); ++i) {
     assert(Types[i] != Type::VoidTy && "Void type in method prototype!!");
     ETypes.push_back(PATypeHandle(Types[i], this));
+    isAbstract |= Types[i]->isAbstract();
   }
-  setAbstract(true);
-  setDerivedTypeProperties();
+
+  // Calculate whether or not this type is abstract
+  setAbstract(isAbstract);
 }
 
 ArrayType::ArrayType(const Type *ElType, unsigned NumEl)
   : SequentialType(ArrayTyID, ElType) {
   NumElements = NumEl;
-  setAbstract(true);
-  setDerivedTypeProperties();
+
+  // Calculate whether or not this type is abstract
+  setAbstract(ElType->isAbstract());
 }
 
 PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
-  setAbstract(true);
-  setDerivedTypeProperties();
+  // Calculate whether or not this type is abstract
+  setAbstract(E->isAbstract());
 }
 
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {




From lattner at cs.uiuc.edu  Wed Sep  3 11:03:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Sep  3 11:03:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadConst.cpp
Message-ID: <200309031602.LAA30837@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReadConst.cpp updated: 1.49 -> 1.50

---
Log message:

Follow the pattern of all other atu's


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReadConst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadConst.cpp:1.49 llvm/lib/Bytecode/Reader/ReadConst.cpp:1.50
--- llvm/lib/Bytecode/Reader/ReadConst.cpp:1.49	Wed Jul 23 10:30:01 2003
+++ llvm/lib/Bytecode/Reader/ReadConst.cpp	Wed Sep  3 11:01:54 2003
@@ -110,12 +110,8 @@
 	   "Can't refine a type I don't know about!");
   }
 
-  if (OldType == NewType) {
-    assert(!OldType->isAbstract());
-    I->removeUserFromConcrete();
-  } else {
-    *I = NewType;  // Update to point to new, more refined type.
-  }
+  I->removeUserFromConcrete();
+  *I = NewType;  // Update to point to new, more refined type.
 }
 
 




From lattner at cs.uiuc.edu  Wed Sep  3 12:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Sep  3 12:57:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200309031756.MAA22095@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.96 -> 1.97

---
Log message:

Fix bug where we couldn't print a function without a name


---
Diffs of the changes:

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.96 llvm/lib/VMCore/AsmWriter.cpp:1.97
--- llvm/lib/VMCore/AsmWriter.cpp:1.96	Sun Aug 24 08:48:48 2003
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed Sep  3 12:56:43 2003
@@ -658,7 +658,9 @@
     case GlobalValue::ExternalLinkage: break;
     }
 
-  printType(F->getReturnType()) << " " << getLLVMName(F->getName()) << "(";
+  printType(F->getReturnType()) << " ";
+  if (!F->getName().empty()) Out << getLLVMName(F->getName());
+  Out << "(";
   Table.incorporateFunction(F);
 
   // Loop over the arguments, printing them...




From lattner at cs.uiuc.edu  Wed Sep  3 15:26:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Sep  3 15:26:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadConst.cpp
Message-ID: <200309032025.PAA32682@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReadConst.cpp updated: 1.50 -> 1.51

---
Log message:

Avoid printing meaningless numbers 


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReadConst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadConst.cpp:1.50 llvm/lib/Bytecode/Reader/ReadConst.cpp:1.51
--- llvm/lib/Bytecode/Reader/ReadConst.cpp:1.50	Wed Sep  3 11:01:54 2003
+++ llvm/lib/Bytecode/Reader/ReadConst.cpp	Wed Sep  3 15:25:27 2003
@@ -76,7 +76,7 @@
   case Type::PointerTyID: {
     unsigned ElTyp;
     if (read_vbr(Buf, EndBuf, ElTyp)) return Val;
-    BCR_TRACE(5, "Pointer Type Constant #" << (ElTyp-14) << "\n");
+    BCR_TRACE(5, "Pointer Type Constant #" << ElTyp << "\n");
     const Type *ElementType = getType(ElTyp);
     if (ElementType == 0) return Val;
     return PointerType::get(ElementType);
@@ -99,9 +99,6 @@
 //
 void BytecodeParser::refineAbstractType(const DerivedType *OldType, 
 					const Type *NewType) {
-  if (OldType == NewType &&
-      OldType->isAbstract()) return;  // Type is modified, but same
-
   TypeValuesListTy::iterator I = find(FunctionTypeValues.begin(), 
 				      FunctionTypeValues.end(), OldType);
   if (I == FunctionTypeValues.end()) {




From gaeke at cs.uiuc.edu  Wed Sep  3 15:35:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Sep  3 15:35:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp ExecutionEngine.h lli.cpp
Message-ID: <200309032034.PAA08143@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.23 -> 1.24
ExecutionEngine.h updated: 1.8 -> 1.9
lli.cpp updated: 1.22 -> 1.23

---
Log message:

ExecutionEngine.cpp: Move execution engine creation stuff into a new
  static method here.
 Remove some extra blank lines.
ExecutionEngine.h: Add its prototype.
lli.cpp: Call it.

Make creation method for each type of EE into a static method of its
own subclass.

Interpreter/Interpreter.cpp: ExecutionEngine::createInterpreter -->
 Interpreter::create
Interpreter/Interpreter.h: Likewise.
JIT/JIT.cpp: ExecutionEngine::createJIT --> VM::create
JIT/VM.h: Likewise.


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.23 llvm/tools/lli/ExecutionEngine.cpp:1.24
--- llvm/tools/lli/ExecutionEngine.cpp:1.23	Sun Aug 24 14:55:26 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Wed Sep  3 15:34:17 2003
@@ -15,9 +15,25 @@
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
 #include "Config/dlfcn.h"
+#include "JIT/VM.h"
+#include "Interpreter/Interpreter.h"
 
 Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
 
+ExecutionEngine *ExecutionEngine::create (Module *M, bool ForceInterpreter,
+					  bool DebugMode, bool TraceMode) {
+  ExecutionEngine *EE = 0;
+
+  // If there is nothing that is forcing us to use the interpreter, make a JIT.
+  if (!ForceInterpreter && !DebugMode && !TraceMode)
+    EE = VM::create(M);
+
+  // If we can't make a JIT, make an interpreter instead.
+  if (EE == 0)
+    EE = Interpreter::create(M, DebugMode, TraceMode);
+  return EE;
+}
+
 // getPointerToGlobal - This returns the address of the specified global
 // value.  This may involve code generation if it's a function.
 //
@@ -29,7 +45,6 @@
   return GlobalAddress[GV];
 }
 
-
 GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
   GenericValue Result;
 
@@ -258,7 +273,6 @@
   }
   return Result;
 }
-
 
 // InitializeMemory - Recursive function to apply a Constant value into the
 // specified memory location...


Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.8 llvm/tools/lli/ExecutionEngine.h:1.9
--- llvm/tools/lli/ExecutionEngine.h:1.8	Sun Aug 24 14:50:50 2003
+++ llvm/tools/lli/ExecutionEngine.h	Wed Sep  3 15:34:17 2003
@@ -48,6 +48,9 @@
                   const std::vector<std::string> &Args,
                   const char ** envp) = 0;
 
+  static ExecutionEngine *create (Module *M, bool ForceInterpreter,
+				  bool DebugMode, bool TraceMode);
+
   /// createJIT - Create an return a new JIT compiler if there is one available
   /// for the current target.  Otherwise it returns null.
   ///


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.22 llvm/tools/lli/lli.cpp:1.23
--- llvm/tools/lli/lli.cpp:1.22	Sun Aug 24 14:52:02 2003
+++ llvm/tools/lli/lli.cpp	Wed Sep  3 15:34:17 2003
@@ -59,15 +59,9 @@
     exit(1);
   }
 
-  ExecutionEngine *EE = 0;
-
-  // If there is nothing that is forcing us to use the interpreter, make a JIT.
-  if (!ForceInterpreter && !DebugMode && !TraceMode)
-    EE = ExecutionEngine::createJIT(M);
-
-  // If we can't make a JIT, make an interpreter instead.
-  if (EE == 0)
-    EE = ExecutionEngine::createInterpreter(M, DebugMode, TraceMode);
+  ExecutionEngine *EE =
+    ExecutionEngine::create (M, ForceInterpreter, DebugMode, TraceMode);
+  assert (EE && "Couldn't create an ExecutionEngine, not even an interpreter?");
 
   // Add the module name to the start of the argv vector...
   // But delete .bc first, since programs (and users) might not expect to




From gaeke at cs.uiuc.edu  Wed Sep  3 15:35:06 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Sep  3 15:35:06 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Interpreter.cpp Interpreter.h
Message-ID: <200309032034.PAA08153@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Interpreter.cpp updated: 1.8 -> 1.9
Interpreter.h updated: 1.33 -> 1.34

---
Log message:

ExecutionEngine.cpp: Move execution engine creation stuff into a new
  static method here.
 Remove some extra blank lines.
ExecutionEngine.h: Add its prototype.
lli.cpp: Call it.

Make creation method for each type of EE into a static method of its
own subclass.

Interpreter/Interpreter.cpp: ExecutionEngine::createInterpreter -->
 Interpreter::create
Interpreter/Interpreter.h: Likewise.
JIT/JIT.cpp: ExecutionEngine::createJIT --> VM::create
JIT/VM.h: Likewise.


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Interpreter.cpp
diff -u llvm/tools/lli/Interpreter/Interpreter.cpp:1.8 llvm/tools/lli/Interpreter/Interpreter.cpp:1.9
--- llvm/tools/lli/Interpreter/Interpreter.cpp:1.8	Sun Aug 24 14:50:52 2003
+++ llvm/tools/lli/Interpreter/Interpreter.cpp	Wed Sep  3 15:34:18 2003
@@ -9,11 +9,9 @@
 #include "Interpreter.h"
 #include "llvm/Module.h"
 
-/// createInterpreter - Create a new interpreter object.  This can never fail.
+/// create - Create a new interpreter object.  This can never fail.
 ///
-ExecutionEngine *ExecutionEngine::createInterpreter(Module *M,
-						    bool DebugMode,
-						    bool TraceMode) {
+ExecutionEngine *Interpreter::create(Module *M, bool DebugMode, bool TraceMode){
   bool isLittleEndian;
   switch (M->getEndianness()) {
   case Module::LittleEndian: isLittleEndian = true; break;


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.33 llvm/tools/lli/Interpreter/Interpreter.h:1.34
--- llvm/tools/lli/Interpreter/Interpreter.h:1.33	Sun Aug 24 14:50:52 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Wed Sep  3 15:34:18 2003
@@ -91,8 +91,13 @@
               bool DebugMode, bool TraceMode);
   inline ~Interpreter() { CW.setModule(0); }
 
-  // getExitCode - return the code that should be the exit code for the lli
-  // utility.
+  /// create - Create an interpreter ExecutionEngine. This can never fail.
+  ///
+  static ExecutionEngine *create(Module *M, bool DebugMode, bool TraceMode);
+
+  /// getExitCode - return the code that should be the exit code for the lli
+  /// utility.
+  ///
   inline int getExitCode() const { return ExitCode; }
 
   /// run - Start execution with the specified function and arguments.




From gaeke at cs.uiuc.edu  Wed Sep  3 15:35:09 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Sep  3 15:35:09 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/JIT/JIT.cpp VM.h
Message-ID: <200309032034.PAA08163@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/JIT:

JIT.cpp updated: 1.15 -> 1.16
VM.h updated: 1.10 -> 1.11

---
Log message:

ExecutionEngine.cpp: Move execution engine creation stuff into a new
  static method here.
 Remove some extra blank lines.
ExecutionEngine.h: Add its prototype.
lli.cpp: Call it.

Make creation method for each type of EE into a static method of its
own subclass.

Interpreter/Interpreter.cpp: ExecutionEngine::createInterpreter -->
 Interpreter::create
Interpreter/Interpreter.h: Likewise.
JIT/JIT.cpp: ExecutionEngine::createJIT --> VM::create
JIT/VM.h: Likewise.


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/JIT.cpp
diff -u llvm/tools/lli/JIT/JIT.cpp:1.15 llvm/tools/lli/JIT/JIT.cpp:1.16
--- llvm/tools/lli/JIT/JIT.cpp:1.15	Sun Aug 24 14:50:53 2003
+++ llvm/tools/lli/JIT/JIT.cpp	Wed Sep  3 15:34:19 2003
@@ -41,11 +41,10 @@
 #endif /* NO_JITS_ENABLED */
 }
 
-/// createJIT - Create an return a new JIT compiler if there is one available
-/// for the current target.  Otherwise it returns null.
+/// create - Create an return a new JIT compiler if there is one available
+/// for the current target.  Otherwise, return null.
 ///
-ExecutionEngine *ExecutionEngine::createJIT(Module *M) {
-  
+ExecutionEngine *VM::create(Module *M) {
   TargetMachine* (*TargetMachineAllocator)(const Module &) = 0;
 
   // Allow a command-line switch to override what *should* be the default target


Index: llvm/tools/lli/JIT/VM.h
diff -u llvm/tools/lli/JIT/VM.h:1.10 llvm/tools/lli/JIT/VM.h:1.11
--- llvm/tools/lli/JIT/VM.h:1.10	Thu Aug 21 16:12:30 2003
+++ llvm/tools/lli/JIT/VM.h	Wed Sep  3 15:34:19 2003
@@ -26,6 +26,11 @@
   VM(Module *M, TargetMachine *tm);
   ~VM();
 
+  /// create - Create an return a new JIT compiler if there is one available
+  /// for the current target.  Otherwise, return null.
+  ///
+  static ExecutionEngine *create(Module *M);
+
   /// run - Start execution with the specified function and arguments.
   ///
   virtual int run(const std::string &FnName,




From gaeke at cs.uiuc.edu  Thu Sep  4 17:22:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Sep  4 17:22:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp Interpreter.cpp Interpreter.h UserInput.cpp
Message-ID: <200309042221.RAA14998@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.91 -> 1.92
Interpreter.cpp updated: 1.9 -> 1.10
Interpreter.h updated: 1.34 -> 1.35
UserInput.cpp updated: 1.26 -> 1.27

---
Log message:

Interpreter cleanups:

Get rid of support for DebugMode (make it always off).
Mung some comments.
Get rid of interpreter's PROFILE_STRUCTURE_FIELDS and PerformExitStuff
 which have been disabled forever.
Get rid of -abort-on-exception (make it always on).
Get rid of user interaction stuff (debug mode innards).
Simplify Interpreter's callMainFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.91 llvm/tools/lli/Interpreter/Execution.cpp:1.92
--- llvm/tools/lli/Interpreter/Execution.cpp:1.91	Wed Jul 23 10:30:32 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Thu Sep  4 17:21:24 2003
@@ -31,10 +31,6 @@
 
   cl::opt<bool>
   ArrayChecksEnabled("array-checks", cl::desc("Enable array bound checks"));
-
-  cl::opt<bool>
-  AbortOnExceptions("abort-on-exception",
-                    cl::desc("Halt execution on a machine exception"));
 }
 
 // Create a TargetData structure to handle memory addressing and size/alignment
@@ -42,14 +38,6 @@
 //
 CachedWriter CW;     // Object to accelerate printing of LLVM
 
-#ifdef PROFILE_STRUCTURE_FIELDS
-static cl::opt<bool>
-ProfileStructureFields("profilestructfields", 
-                       cl::desc("Profile Structure Field Accesses"));
-#include <map>
-static std::map<const StructType *, std::vector<unsigned> > FieldAccessCounts;
-#endif
-
 sigjmp_buf SignalRecoverBuffer;
 static bool InInstruction = false;
 
@@ -520,54 +508,6 @@
 //                     Terminator Instruction Implementations
 //===----------------------------------------------------------------------===//
 
-// PerformExitStuff - Print out counters and profiling information if
-// applicable...
-void Interpreter::PerformExitStuff() {
-#ifdef PROFILE_STRUCTURE_FIELDS
-  // Print out structure field accounting information...
-  if (!FieldAccessCounts.empty()) {
-    CW << "Profile Field Access Counts:\n";
-    std::map<const StructType *, std::vector<unsigned> >::iterator 
-      I = FieldAccessCounts.begin(), E = FieldAccessCounts.end();
-    for (; I != E; ++I) {
-      std::vector<unsigned> &OfC = I->second;
-      CW << "  '" << (Value*)I->first << "'\t- Sum=";
-      
-      unsigned Sum = 0;
-      for (unsigned i = 0; i < OfC.size(); ++i)
-        Sum += OfC[i];
-      CW << Sum << " - ";
-      
-      for (unsigned i = 0; i < OfC.size(); ++i) {
-        if (i) CW << ", ";
-        CW << OfC[i];
-      }
-      CW << "\n";
-    }
-    CW << "\n";
-
-    CW << "Profile Field Access Percentages:\n";
-    std::cout.precision(3);
-    for (I = FieldAccessCounts.begin(); I != E; ++I) {
-      std::vector<unsigned> &OfC = I->second;
-      unsigned Sum = 0;
-      for (unsigned i = 0; i < OfC.size(); ++i)
-        Sum += OfC[i];
-      
-      CW << "  '" << (Value*)I->first << "'\t- ";
-      for (unsigned i = 0; i < OfC.size(); ++i) {
-        if (i) CW << ", ";
-        CW << double(OfC[i])/Sum;
-      }
-      CW << "\n";
-    }
-    CW << "\n";
-
-    FieldAccessCounts.clear();
-  }
-#endif
-}
-
 void Interpreter::exitCalled(GenericValue GV) {
   if (!QuietMode) {
     std::cout << "Program returned ";
@@ -756,15 +696,6 @@
       assert(CPU->getType() == Type::UByteTy);
       unsigned Index = CPU->getValue();
       
-#ifdef PROFILE_STRUCTURE_FIELDS
-      if (ProfileStructureFields) {
-        // Do accounting for this field...
-        std::vector<unsigned> &OfC = FieldAccessCounts[STy];
-        if (OfC.size() == 0) OfC.resize(STy->getElementTypes().size());
-        OfC[Index]++;
-      }
-#endif
-      
       Total += SLO->MemberOffsets[Index];
       Ty = STy->getElementTypes()[Index];
     } else if (const SequentialType *ST = cast<SequentialType>(Ty)) {
@@ -1107,16 +1038,8 @@
   //
   if (int SigNo = sigsetjmp(SignalRecoverBuffer, 1)) {
     --SF.CurInst;   // Back up to erroring instruction
-    if (SigNo != SIGINT) {
-      std::cout << "EXCEPTION OCCURRED [" << strsignal(SigNo) << "]:\n";
-      printStackTrace();
-      // If -abort-on-exception was specified, terminate LLI instead of trying
-      // to debug it.
-      //
-      if (AbortOnExceptions) exit(1);
-    } else if (SigNo == SIGINT) {
-      std::cout << "CTRL-C Detected, execution halted.\n";
-    }
+    std::cout << "EXCEPTION OCCURRED [" << strsignal(SigNo) << "]\n";
+    exit(1);
     InInstruction = false;
     return true;
   }


Index: llvm/tools/lli/Interpreter/Interpreter.cpp
diff -u llvm/tools/lli/Interpreter/Interpreter.cpp:1.9 llvm/tools/lli/Interpreter/Interpreter.cpp:1.10
--- llvm/tools/lli/Interpreter/Interpreter.cpp:1.9	Wed Sep  3 15:34:18 2003
+++ llvm/tools/lli/Interpreter/Interpreter.cpp	Thu Sep  4 17:21:24 2003
@@ -11,7 +11,7 @@
 
 /// create - Create a new interpreter object.  This can never fail.
 ///
-ExecutionEngine *Interpreter::create(Module *M, bool DebugMode, bool TraceMode){
+ExecutionEngine *Interpreter::create(Module *M, bool TraceMode){
   bool isLittleEndian;
   switch (M->getEndianness()) {
   case Module::LittleEndian: isLittleEndian = true; break;
@@ -32,15 +32,15 @@
     break;
   }
 
-  return new Interpreter(M, isLittleEndian, isLongPointer, DebugMode,TraceMode);
+  return new Interpreter(M, isLittleEndian, isLongPointer, TraceMode);
 }
 
 //===----------------------------------------------------------------------===//
 // Interpreter ctor - Initialize stuff
 //
 Interpreter::Interpreter(Module *M, bool isLittleEndian, bool isLongPointer,
-                         bool DebugMode, bool TraceMode)
-  : ExecutionEngine(M), ExitCode(0), Debug(DebugMode), Trace(TraceMode),
+                         bool TraceMode)
+  : ExecutionEngine(M), ExitCode(0), Trace(TraceMode),
     CurFrame(-1), TD("lli", isLittleEndian, isLongPointer ? 8 : 4,
                      isLongPointer ? 8 : 4, isLongPointer ? 8 : 4) {
 
@@ -59,17 +59,12 @@
                      const char ** envp) {
   // Start interpreter into the main function...
   //
-  if (!callMainFunction(MainFunction, Args) && !Debug) {
-    // If not in debug mode and if the call succeeded, run the code now...
+  if (!callMainFunction(MainFunction, Args)) {
+    // If the call succeeded, run the code now...
     run();
   }
 
   do {
-    // If debug mode, allow the user to interact... also, if the user pressed 
-    // ctrl-c or execution hit an error, enter the event loop...
-    if (Debug || isStopped())
-      handleUserInput();
-
     // If the program has exited, run atexit handlers...
     if (ECStack.empty() && !AtExitHandlers.empty()) {
       callFunction(AtExitHandlers.back(), std::vector<GenericValue>());
@@ -78,7 +73,6 @@
     }
   } while (!ECStack.empty());
 
-  PerformExitStuff();
   return ExitCode;
 }
 


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.34 llvm/tools/lli/Interpreter/Interpreter.h:1.35
--- llvm/tools/lli/Interpreter/Interpreter.h:1.34	Wed Sep  3 15:34:18 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Thu Sep  4 17:21:24 2003
@@ -7,9 +7,6 @@
 #ifndef LLI_INTERPRETER_H
 #define LLI_INTERPRETER_H
 
-// Uncomment this line to enable profiling of structure field accesses.
-//#define PROFILE_STRUCTURE_FIELDS 1
-
 #include "../ExecutionEngine.h"
 #include "../GenericValue.h"
 #include "Support/DataTypes.h"
@@ -74,7 +71,6 @@
 //
 class Interpreter : public ExecutionEngine, public InstVisitor<Interpreter> {
   int ExitCode;                // The exit code to be returned by the lli util
-  bool Debug;                  // Debug mode enabled?
   bool Profile;                // Profiling enabled?
   bool Trace;                  // Tracing enabled?
   int CurFrame;                // The current stack frame being inspected
@@ -88,12 +84,12 @@
   std::vector<Function*> AtExitHandlers;
 public:
   Interpreter(Module *M, bool isLittleEndian, bool isLongPointer,
-              bool DebugMode, bool TraceMode);
+              bool TraceMode);
   inline ~Interpreter() { CW.setModule(0); }
 
   /// create - Create an interpreter ExecutionEngine. This can never fail.
   ///
-  static ExecutionEngine *create(Module *M, bool DebugMode, bool TraceMode);
+  static ExecutionEngine *create(Module *M, bool TraceMode);
 
   /// getExitCode - return the code that should be the exit code for the lli
   /// utility.
@@ -219,10 +215,6 @@
   //
   Value *ChooseOneOption(const std::string &Name,
                          const std::vector<Value*> &Opts);
-
-  // PerformExitStuff - Print out counters and profiling information if
-  // applicable...
-  void PerformExitStuff();
 
   void initializeExecutionEngine();
   void initializeExternalFunctions();


Index: llvm/tools/lli/Interpreter/UserInput.cpp
diff -u llvm/tools/lli/Interpreter/UserInput.cpp:1.26 llvm/tools/lli/Interpreter/UserInput.cpp:1.27
--- llvm/tools/lli/Interpreter/UserInput.cpp:1.26	Wed May 14 09:21:30 2003
+++ llvm/tools/lli/Interpreter/UserInput.cpp	Thu Sep  4 17:21:24 2003
@@ -5,220 +5,41 @@
 //===----------------------------------------------------------------------===//
 
 #include "Interpreter.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
-#include "llvm/Transforms/Utils/Linker.h"
-#include <algorithm>
-
-enum CommandID {
-  Quit, Help,                                 // Basics
-  Print, Info, List, StackTrace, Up, Down,    // Inspection
-  Next, Step, Run, Finish, Call,              // Control flow changes
-  Break, Watch,                               // Debugging
-  Flush,
-  TraceOpt,                                   // Toggle features
-};
-
-// CommandTable - Build a lookup table for the commands available to the user...
-static struct CommandTableElement {
-  const char *Name;
-  enum CommandID CID;
-
-  inline bool operator<(const CommandTableElement &E) const {
-    return std::string(Name) < std::string(E.Name);
-  }
-  inline bool operator==(const std::string &S) const { 
-    return std::string(Name) == S;
-  }
-} CommandTable[] = {
-  { "quit"     , Quit       }, { "q", Quit }, { "", Quit }, // Empty str = eof
-  { "help"     , Help       }, { "h", Help },
-
-  { "print"    , Print      }, { "p", Print },
-  { "list"     , List       },
-  { "info"     , Info       },
-  { "backtrace", StackTrace }, { "bt", StackTrace }, { "where", StackTrace },
-  { "up"       , Up         },
-  { "down"     , Down       },
-
-  { "next"     , Next       }, { "n", Next },
-  { "step"     , Step       }, { "s", Step },
-  { "run"      , Run        },
-  { "finish"   , Finish     },
-  { "call"     , Call       },
-
-  { "break"    , Break      }, { "b", Break },
-  { "watch"    , Watch      },
-
-  { "flush"    , Flush      },
-
-  { "trace"    , TraceOpt   },
-};
-static CommandTableElement *CommandTableEnd = 
-   CommandTable+sizeof(CommandTable)/sizeof(CommandTable[0]);
-
-
-//===----------------------------------------------------------------------===//
-// handleUserInput - Enter the input loop for the interpreter.  This function
-// returns when the user quits the interpreter.
-//
-void Interpreter::handleUserInput() {
-  bool UserQuit = false;
-
-  // Sort the table...
-  std::sort(CommandTable, CommandTableEnd);
-
-  // Print the instruction that we are stopped at...
-  printCurrentInstruction();
-
-  do {
-    std::string Command;
-    std::cout << "lli> " << std::flush;
-    std::cin >> Command;
-
-    CommandTableElement *E = find(CommandTable, CommandTableEnd, Command);
-
-    if (E == CommandTableEnd) {
-      std::cout << "Error: '" << Command << "' not recognized!\n";
-      continue;
-    }
-
-    switch (E->CID) {
-    case Quit:       UserQuit = true;   break;
-    case Print:
-      std::cin >> Command;
-      print(Command);
-      break;
-    case Info:
-      std::cin >> Command;
-      infoValue(Command);
-      break;
-     
-    case List:       list();            break;
-    case StackTrace: printStackTrace(); break;
-    case Up: 
-      if (CurFrame > 0) { --CurFrame; printStackFrame(); }
-      else std::cout << "Error: Already at root of stack!\n";
-      break;
-    case Down:
-      if ((unsigned)CurFrame < ECStack.size()-1) {
-        ++CurFrame;
-        printStackFrame();
-      } else
-        std::cout << "Error: Already at bottom of stack!\n";
-      break;
-    case Next:       nextInstruction(); break;
-    case Step:       stepInstruction(); break;
-    case Run:        run();             break;
-    case Finish:     finish();          break;
-    case Call:
-      std::cin >> Command;
-      callFunction(Command);    // Enter the specified function
-      finish();                 // Run until it's complete
-      break;
-
-    case TraceOpt:
-      Trace = !Trace;
-      std::cout << "Tracing " << (Trace ? "enabled\n" : "disabled\n");
-      break;
-
-    default:
-      std::cout << "Command '" << Command << "' unimplemented!\n";
-      break;
-    }
-
-  } while (!UserQuit);
-  AtExitHandlers.clear();
-}
-
-//===----------------------------------------------------------------------===//
-// setBreakpoint - Enable a breakpoint at the specified location
-//
-void Interpreter::setBreakpoint(const std::string &Name) {
-  Value *PickedVal = ChooseOneOption(Name, LookupMatchingNames(Name));
-  // TODO: Set a breakpoint on PickedVal
-}
-
-//===----------------------------------------------------------------------===//
-// callFunction - Enter the specified function...
-//
-bool Interpreter::callFunction(const std::string &Name) {
-  std::vector<Value*> Options = LookupMatchingNames(Name);
-
-  for (unsigned i = 0; i < Options.size(); ++i) { // Remove non-fn matches...
-    if (!isa<Function>(Options[i])) {
-      Options.erase(Options.begin()+i);
-      --i;
-    }
-  }
-
-  Value *PickedMeth = ChooseOneOption(Name, Options);
-  if (PickedMeth == 0)
-    return true;
-
-  Function *F = cast<Function>(PickedMeth);
-
-  std::vector<GenericValue> Args;
-  // TODO, get args from user...
-
-  callFunction(F, Args);  // Start executing it...
-
-  // Reset the current frame location to the top of stack
-  CurFrame = ECStack.size()-1;
-
-  return false;
-}
+#include "llvm/Module.h"
 
 // callMainFunction - This is a nasty gross hack that will dissapear when
 // callFunction can parse command line options and stuff for us.
 //
 bool Interpreter::callMainFunction(const std::string &Name,
                                    const std::vector<std::string> &InputArgv) {
-  std::vector<Value*> Options = LookupMatchingNames(Name);
-
-  for (unsigned i = 0; i < Options.size(); ++i) { // Remove non-fn matches...
-    if (!isa<Function>(Options[i])) {
-      Options.erase(Options.begin()+i);
-      --i;
-    }
+  Function *M = getModule().getNamedFunction(Name);
+  if (M == 0) {
+    std::cerr << "Could not find function '" << Name << "' in module!\n";
+    return 1;
   }
-
-  Value *PickedMeth = ChooseOneOption(Name, Options);
-  if (PickedMeth == 0)
-    return true;
-
-  Function *M = cast<Function>(PickedMeth);
   const FunctionType *MT = M->getFunctionType();
 
   std::vector<GenericValue> Args;
-  switch (MT->getParamTypes().size()) {
-  default:
-    std::cout << "Unknown number of arguments to synthesize for '" << Name
-              << "'!\n";
+  if (MT->getParamTypes().size() >= 2) {
+  PointerType *SPP = PointerType::get(PointerType::get(Type::SByteTy));
+  if (MT->getParamTypes()[1] != SPP) {
+    CW << "Second argument of '" << Name << "' should have type: '"
+       << SPP << "'!\n";
     return true;
-  case 2: {
-    PointerType *SPP = PointerType::get(PointerType::get(Type::SByteTy));
-    if (MT->getParamTypes()[1] != SPP) {
-      CW << "Second argument of '" << Name << "' should have type: '"
-         << SPP << "'!\n";
-      return true;
-    }
+  }
+  Args.push_back(PTOGV(CreateArgv(InputArgv)));
+  }
 
-    Args.push_back(PTOGV(CreateArgv(InputArgv)));
+  if (MT->getParamTypes().size() >= 1) {
+  if (!MT->getParamTypes()[0]->isInteger()) {
+    std::cout << "First argument of '" << Name << "' should be an integer!\n";
+    return true;
+  } else {
+    GenericValue GV; GV.UIntVal = InputArgv.size();
+    Args.insert(Args.begin(), GV);
   }
-    // fallthrough
-  case 1:
-    if (!MT->getParamTypes()[0]->isInteger()) {
-      std::cout << "First argument of '" << Name << "' should be an integer!\n";
-      return true;
-    } else {
-      GenericValue GV; GV.UIntVal = InputArgv.size();
-      Args.insert(Args.begin(), GV);
-    }
-    // fallthrough
-  case 0:
-    break;
   }
 
   callFunction(M, Args);  // Start executing it...
@@ -227,21 +48,4 @@
   CurFrame = ECStack.size()-1;
 
   return false;
-}
-
-
-
-void Interpreter::list() {
-  if (ECStack.empty())
-    std::cout << "Error: No program executing!\n";
-  else
-    CW << ECStack[CurFrame].CurFunction;   // Just print the function out...
-}
-
-void Interpreter::printStackTrace() {
-  if (ECStack.empty()) std::cout << "No program executing!\n";
-
-  for (unsigned i = 0; i < ECStack.size(); ++i) {
-    printStackFrame((int)i);
-  }
 }




From gaeke at cs.uiuc.edu  Thu Sep  4 17:22:06 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Sep  4 17:22:06 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp ExecutionEngine.h lli.cpp
Message-ID: <200309042221.RAA14987@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.24 -> 1.25
ExecutionEngine.h updated: 1.9 -> 1.10
lli.cpp updated: 1.23 -> 1.24

---
Log message:

Interpreter cleanups:

Get rid of support for DebugMode (make it always off).
Mung some comments.
Get rid of interpreter's PROFILE_STRUCTURE_FIELDS and PerformExitStuff
 which have been disabled forever.
Get rid of -abort-on-exception (make it always on).
Get rid of user interaction stuff (debug mode innards).
Simplify Interpreter's callMainFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.24 llvm/tools/lli/ExecutionEngine.cpp:1.25
--- llvm/tools/lli/ExecutionEngine.cpp:1.24	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Thu Sep  4 17:21:22 2003
@@ -21,16 +21,16 @@
 Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
 
 ExecutionEngine *ExecutionEngine::create (Module *M, bool ForceInterpreter,
-					  bool DebugMode, bool TraceMode) {
+					  bool TraceMode) {
   ExecutionEngine *EE = 0;
 
   // If there is nothing that is forcing us to use the interpreter, make a JIT.
-  if (!ForceInterpreter && !DebugMode && !TraceMode)
+  if (!ForceInterpreter && !TraceMode)
     EE = VM::create(M);
 
   // If we can't make a JIT, make an interpreter instead.
   if (EE == 0)
-    EE = Interpreter::create(M, DebugMode, TraceMode);
+    EE = Interpreter::create(M, TraceMode);
   return EE;
 }
 


Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.9 llvm/tools/lli/ExecutionEngine.h:1.10
--- llvm/tools/lli/ExecutionEngine.h:1.9	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/ExecutionEngine.h	Thu Sep  4 17:21:22 2003
@@ -49,7 +49,7 @@
                   const char ** envp) = 0;
 
   static ExecutionEngine *create (Module *M, bool ForceInterpreter,
-				  bool DebugMode, bool TraceMode);
+				  bool TraceMode);
 
   /// createJIT - Create an return a new JIT compiler if there is one available
   /// for the current target.  Otherwise it returns null.
@@ -58,8 +58,7 @@
 
   /// createInterpreter - Create a new interpreter object.  This can never fail.
   ///
-  static ExecutionEngine *createInterpreter(Module *M, bool DebugMode,
-                                            bool TraceMode);
+  static ExecutionEngine *createInterpreter(Module *M, bool TraceMode);
 
   void addGlobalMapping(const Function *F, void *Addr) {
     void *&CurVal = GlobalAddress[(const GlobalValue*)F];


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.23 llvm/tools/lli/lli.cpp:1.24
--- llvm/tools/lli/lli.cpp:1.23	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/lli.cpp	Thu Sep  4 17:21:22 2003
@@ -26,8 +26,6 @@
   MainFunction ("f", cl::desc("Function to execute"), cl::init("main"),
 		cl::value_desc("function name"));
 
-  cl::opt<bool> DebugMode("d", cl::desc("Start program in debugger"));
-
   cl::opt<bool> TraceMode("trace", cl::desc("Enable Tracing"));
 
   cl::opt<bool> ForceInterpreter("force-interpreter",
@@ -60,10 +58,10 @@
   }
 
   ExecutionEngine *EE =
-    ExecutionEngine::create (M, ForceInterpreter, DebugMode, TraceMode);
+    ExecutionEngine::create (M, ForceInterpreter, TraceMode);
   assert (EE && "Couldn't create an ExecutionEngine, not even an interpreter?");
 
-  // Add the module name to the start of the argv vector...
+  // Add the module's name to the start of the vector of arguments to main().
   // But delete .bc first, since programs (and users) might not expect to
   // see it.
   const std::string ByteCodeFileSuffix (".bc");




From gaeke at cs.uiuc.edu  Thu Sep  4 17:58:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Sep  4 17:58:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp lli.cpp
Message-ID: <200309042257.RAA19457@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.25 -> 1.26
lli.cpp updated: 1.24 -> 1.25

---
Log message:

Move EE dtor where it belongs


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.25 llvm/tools/lli/ExecutionEngine.cpp:1.26
--- llvm/tools/lli/ExecutionEngine.cpp:1.25	Thu Sep  4 17:21:22 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Thu Sep  4 17:57:27 2003
@@ -20,6 +20,10 @@
 
 Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
 
+ExecutionEngine::~ExecutionEngine() {
+  delete &CurMod;
+}
+
 ExecutionEngine *ExecutionEngine::create (Module *M, bool ForceInterpreter,
 					  bool TraceMode) {
   ExecutionEngine *EE = 0;


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.24 llvm/tools/lli/lli.cpp:1.25
--- llvm/tools/lli/lli.cpp:1.24	Thu Sep  4 17:21:22 2003
+++ llvm/tools/lli/lli.cpp	Thu Sep  4 17:57:27 2003
@@ -34,14 +34,6 @@
 }
 
 //===----------------------------------------------------------------------===//
-// ExecutionEngine Class Implementation
-//
-
-ExecutionEngine::~ExecutionEngine() {
-  delete &CurMod;
-}
-
-//===----------------------------------------------------------------------===//
 // main Driver function
 //
 int main(int argc, char** argv, const char ** envp) {




From gaeke at cs.uiuc.edu  Thu Sep  4 18:16:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Sep  4 18:16:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp ExecutionAnnotations.h Interpreter.h
Message-ID: <200309042315.SAA24652@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.92 -> 1.93
ExecutionAnnotations.h updated: 1.10 -> 1.11
Interpreter.h updated: 1.35 -> 1.36

---
Log message:

Remove support for breakpoints (not used).
Remove some dead code and whitespace.


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.92 llvm/tools/lli/Interpreter/Execution.cpp:1.93
--- llvm/tools/lli/Interpreter/Execution.cpp:1.92	Thu Sep  4 17:21:24 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Thu Sep  4 18:15:40 2003
@@ -1019,10 +1019,9 @@
   StackFrame.VarArgs.assign(ArgVals.begin()+i, ArgVals.end());
 }
 
-// executeInstruction - Interpret a single instruction, increment the "PC", and
-// return true if the next instruction is a breakpoint...
+// executeInstruction - Interpret a single instruction & increment the "PC".
 //
-bool Interpreter::executeInstruction() {
+void Interpreter::executeInstruction() {
   assert(!ECStack.empty() && "No program running, cannot execute inst!");
 
   ExecutionContext &SF = ECStack.back();  // Current stack frame
@@ -1037,11 +1036,8 @@
   // instruction execution...
   //
   if (int SigNo = sigsetjmp(SignalRecoverBuffer, 1)) {
-    --SF.CurInst;   // Back up to erroring instruction
     std::cout << "EXCEPTION OCCURRED [" << strsignal(SigNo) << "]\n";
     exit(1);
-    InInstruction = false;
-    return true;
   }
 
   InInstruction = true;
@@ -1050,11 +1046,6 @@
   
   // Reset the current frame location to the top of stack
   CurFrame = ECStack.size()-1;
-
-  if (CurFrame == -1) return false;  // No breakpoint if no code
-
-  // Return true if there is a breakpoint annotation on the instruction...
-  return ECStack[CurFrame].CurInst->getAnnotation(BreakpointAID) != 0;
 }
 
 void Interpreter::stepInstruction() {  // Do the 'step' command
@@ -1082,12 +1073,7 @@
   if (ECStack.back().CurInst->getOpcode() == Instruction::Call) {
     unsigned StackSize = ECStack.size();
     // Step into the function...
-    if (executeInstruction()) {
-      // Hit a breakpoint, print current instruction, then return to user...
-      std::cout << "Breakpoint hit!\n";
-      printCurrentInstruction();
-      return;
-    }
+    executeInstruction();
 
     // If we we able to step into the function, finish it now.  We might not be
     // able the step into a function, if it's external for example.
@@ -1108,15 +1094,11 @@
     return;
   }
 
-  bool HitBreakpoint = false;
-  while (!ECStack.empty() && !HitBreakpoint) {
+  while (!ECStack.empty()) {
     // Run an instruction...
-    HitBreakpoint = executeInstruction();
+    executeInstruction();
   }
 
-  if (HitBreakpoint)
-    std::cout << "Breakpoint hit!\n";
-
   // Print the next instruction to execute...
   printCurrentInstruction();
 }
@@ -1128,20 +1110,14 @@
   }
 
   unsigned StackSize = ECStack.size();
-  bool HitBreakpoint = false;
-  while (ECStack.size() >= StackSize && !HitBreakpoint) {
+  while (ECStack.size() >= StackSize) {
     // Run an instruction...
-    HitBreakpoint = executeInstruction();
+    executeInstruction();
   }
 
-  if (HitBreakpoint)
-    std::cout << "Breakpoint hit!\n";
-
   // Print the next instruction to execute...
   printCurrentInstruction();
 }
-
-
 
 // printCurrentInstruction - Print out the instruction that the virtual PC is
 // at, or fail silently if no program is running.


Index: llvm/tools/lli/Interpreter/ExecutionAnnotations.h
diff -u llvm/tools/lli/Interpreter/ExecutionAnnotations.h:1.10 llvm/tools/lli/Interpreter/ExecutionAnnotations.h:1.11
--- llvm/tools/lli/Interpreter/ExecutionAnnotations.h:1.10	Thu May  8 11:18:31 2003
+++ llvm/tools/lli/Interpreter/ExecutionAnnotations.h	Thu Sep  4 18:15:40 2003
@@ -37,7 +37,6 @@
   unsigned getValueSlot(const Value *V);
 };
 
-
 //===----------------------------------------------------------------------===//
 // Support for the SlotNumber annotation
 //===----------------------------------------------------------------------===//
@@ -58,9 +57,6 @@
 			    SlotNum(sn) {}
 };
 
-
-
-
 //===----------------------------------------------------------------------===//
 // Support for the InstNumber annotation
 //===----------------------------------------------------------------------===//
@@ -78,15 +74,5 @@
 
   InstNumber(unsigned in, unsigned sn) : SlotNumber(sn), InstNum(in) {}
 };
-
-
-//===----------------------------------------------------------------------===//
-// Support for the Breakpoint annotation
-//===----------------------------------------------------------------------===//
-
-static AnnotationID BreakpointAID(
-	            AnnotationManager::getID("Interpreter::Breakpoint"));
-// Just use an Annotation directly, Breakpoint is currently just a marker
-
 
 #endif


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.35 llvm/tools/lli/Interpreter/Interpreter.h:1.36
--- llvm/tools/lli/Interpreter/Interpreter.h:1.35	Thu Sep  4 17:21:24 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Thu Sep  4 18:15:40 2003
@@ -111,7 +111,6 @@
 
   // User Interation Methods...
   bool callFunction(const std::string &Name);      // return true on failure
-  void setBreakpoint(const std::string &Name);
   void infoValue(const std::string &Name);
   void print(const std::string &Name);
   static void print(const Type *Ty, GenericValue V);
@@ -125,7 +124,7 @@
 
   // Code execution methods...
   void callFunction(Function *F, const std::vector<GenericValue> &ArgVals);
-  bool executeInstruction(); // Execute one instruction...
+  void executeInstruction(); // Execute one instruction...
 
   void stepInstruction();  // Do the 'step' command
   void nextInstruction();  // Do the 'next' command




From lattner at cs.uiuc.edu  Thu Sep  4 18:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:39:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp
Message-ID: <200309042338.SAA16058@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.32 -> 1.33

---
Log message:

This is now unnecessary


---
Diffs of the changes:

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.32 llvm/lib/VMCore/SymbolTable.cpp:1.33
--- llvm/lib/VMCore/SymbolTable.cpp:1.32	Fri Aug 29 00:11:34 2003
+++ llvm/lib/VMCore/SymbolTable.cpp	Thu Sep  4 18:38:22 2003
@@ -192,9 +192,6 @@
 // This function is called when one of the types in the type plane are refined
 void SymbolTable::refineAbstractType(const DerivedType *OldType,
 				     const Type *NewType) {
-  if (OldType == NewType && OldType->isAbstract())
-    return;  // Noop, don't waste time dinking around
-
   // Search to see if we have any values of the type oldtype.  If so, we need to
   // move them into the newtype plane...
   iterator TPI = find(OldType);




From lattner at cs.uiuc.edu  Thu Sep  4 18:42:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:42:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309042341.SAA16822@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.60 -> 1.61

---
Log message:

Don't try to be sneaky, breaking recursive types in the process


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.60 llvm/lib/VMCore/Type.cpp:1.61
--- llvm/lib/VMCore/Type.cpp:1.60	Wed Sep  3 09:44:53 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 18:41:03 2003
@@ -211,10 +211,7 @@
 
   // In order to reduce the amount of repeated computation, we cache the
   // computed value for later.
-  if (Ty->isAbstract())
-    return AbstractTypeDescriptions[Ty] = Result;
-  else
-    return ConcreteTypeDescriptions[Ty] = Result;
+  return Result;
 }
 
 
@@ -225,9 +222,7 @@
   if (I != Map.end()) return I->second;
     
   std::vector<const Type *> TypeStack;
-  getTypeDescription(Ty, TypeStack);
-  assert(Map.count(Ty) && "Type didn't get inserted!!");
-  return Map[Ty];
+  return Map[Ty] = getTypeDescription(Ty, TypeStack);
 }
 
 




From lattner at cs.uiuc.edu  Thu Sep  4 18:44:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:44:00 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200309042343.SAA16854@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.35 -> 1.36

---
Log message:

Remove method



---
Diffs of the changes:

Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.35 llvm/include/llvm/DerivedTypes.h:1.36
--- llvm/include/llvm/DerivedTypes.h:1.35	Mon Sep  1 11:38:43 2003
+++ llvm/include/llvm/DerivedTypes.h	Thu Sep  4 18:43:35 2003
@@ -36,13 +36,6 @@
   //
   void typeIsRefined();
   
-  // setDerivedTypeProperties - Based on the subtypes, set the name of this
-  // type so that it is printed nicely by the type printer.  Also calculate
-  // whether this type is abstract or not.  Used by the constructor and when
-  // the type is refined.
-  //
-  void setDerivedTypeProperties();
-
 public:
 
   //===--------------------------------------------------------------------===//




From lattner at cs.uiuc.edu  Thu Sep  4 18:44:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:44:04 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309042343.SAA16861@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.61 -> 1.62

---
Log message:

Inline method


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.61 llvm/lib/VMCore/Type.cpp:1.62
--- llvm/lib/VMCore/Type.cpp:1.61	Thu Sep  4 18:41:03 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 18:43:40 2003
@@ -209,8 +209,6 @@
 
   TypeStack.pop_back();       // Remove self from stack...
 
-  // In order to reduce the amount of repeated computation, we cache the
-  // computed value for later.
   return Result;
 }
 
@@ -384,12 +382,6 @@
 }
 
 
-
-
-//===----------------------------------------------------------------------===//
-//               Derived Type setDerivedTypeProperties Function
-//===----------------------------------------------------------------------===//
-
 // isTypeAbstract - This is a recursive function that walks a type hierarchy
 // calculating whether or not a type is abstract.  Worst case it will have to do
 // a lot of traversing if you have some whacko opaque types, but in most cases,
@@ -425,17 +417,6 @@
 }
 
 
-// setDerivedTypeProperties - This function is used to calculate the isAbstract
-// setting for a type.  The getTypeProps function does all the dirty work.
-//
-void DerivedType::setDerivedTypeProperties() {
-  // If the type is currently thought to be abstract, rescan all of our subtypes
-  // to see if the type has just become concrete!
-  if (isAbstract())
-    setAbstract(isTypeAbstract());
-}
-
-
 //===----------------------------------------------------------------------===//
 //                      Type Structural Equality Testing
 //===----------------------------------------------------------------------===//
@@ -1089,7 +1070,9 @@
   if (MT && MT != this) {
     refineAbstractTypeTo(MT);            // Different type altogether...
   } else {
-    setDerivedTypeProperties();          // Update the name and isAbstract
+    // If the type is currently thought to be abstract, rescan all of our
+    // subtypes to see if the type has just become concrete!
+    if (isAbstract()) setAbstract(isTypeAbstract());
     typeIsRefined();                     // Same type, different contents...
   }
 }
@@ -1115,7 +1098,9 @@
   if (AT && AT != this) {
     refineAbstractTypeTo(AT);          // Different type altogether...
   } else {
-    setDerivedTypeProperties();        // Update the name and isAbstract
+    // If the type is currently thought to be abstract, rescan all of our
+    // subtypes to see if the type has just become concrete!
+    if (isAbstract()) setAbstract(isTypeAbstract());
     typeIsRefined();                   // Same type, different contents...
   }
 }
@@ -1144,7 +1129,9 @@
   if (ST && ST != this) {
     refineAbstractTypeTo(ST);          // Different type altogether...
   } else {
-    setDerivedTypeProperties();        // Update the name and isAbstract
+    // If the type is currently thought to be abstract, rescan all of our
+    // subtypes to see if the type has just become concrete!
+    if (isAbstract()) setAbstract(isTypeAbstract());
     typeIsRefined();                   // Same type, different contents...
   }
 }
@@ -1169,7 +1156,9 @@
   if (PT && PT != this) {
     refineAbstractTypeTo(PT);          // Different type altogether...
   } else {
-    setDerivedTypeProperties();        // Update the name and isAbstract
+    // If the type is currently thought to be abstract, rescan all of our
+    // subtypes to see if the type has just become concrete!
+    if (isAbstract()) setAbstract(isTypeAbstract());
     typeIsRefined();                   // Same type, different contents...
   }
 }




From lattner at cs.uiuc.edu  Thu Sep  4 18:47:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:47:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309042346.SAA18043@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.62 -> 1.63

---
Log message:

Remove needless usage of getDescription()


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.62 llvm/lib/VMCore/Type.cpp:1.63
--- llvm/lib/VMCore/Type.cpp:1.62	Thu Sep  4 18:43:40 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 18:46:03 2003
@@ -377,7 +377,7 @@
 OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
   setAbstract(true);
 #ifdef DEBUG_MERGE_TYPES
-  std::cerr << "Derived new type: " << getDescription() << "\n";
+  std::cerr << "Derived new type: " << *this << "\n";
 #endif
 }
 
@@ -515,8 +515,8 @@
   virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
 #ifdef DEBUG_MERGE_TYPES
     std::cerr << "Removing Old type from Tab: " << (void*)OldTy << ", "
-              << OldTy->getDescription() << "  replacement == " << (void*)NewTy
-              << ", " << NewTy->getDescription() << "\n";
+              << *OldTy << "  replacement == " << (void*)NewTy
+              << ", " << *NewTy << "\n";
 #endif
     for (typename MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
       if (I->second == OldTy) {
@@ -539,7 +539,7 @@
     unsigned i = 0;
     for (MapTy::const_iterator I = Map.begin(), E = Map.end(); I != E; ++I)
       std::cerr << " " << (++i) << ". " << I->second << " " 
-                << I->second->getDescription() << "\n";
+                << *I->second << "\n";
 #endif
   }
 
@@ -712,7 +712,7 @@
   ArrayTypes.add(AVT, AT = new ArrayType(ElementType, NumElements));
 
 #ifdef DEBUG_MERGE_TYPES
-  std::cerr << "Derived new type: " << AT->getDescription() << "\n";
+  std::cerr << "Derived new type: " << *AT << "\n";
 #endif
   return AT;
 }
@@ -772,7 +772,7 @@
   StructTypes.add(STV, ST = new StructType(ETypes));
 
 #ifdef DEBUG_MERGE_TYPES
-  std::cerr << "Derived new type: " << ST->getDescription() << "\n";
+  std::cerr << "Derived new type: " << *ST << "\n";
 #endif
   return ST;
 }
@@ -825,7 +825,7 @@
   PointerTypes.add(PVT, PT = new PointerType(ValueType));
 
 #ifdef DEBUG_MERGE_TYPES
-  std::cerr << "Derived new type: " << PT->getDescription() << "\n";
+  std::cerr << "Derived new type: " << *PT << "\n";
 #endif
   return PT;
 }
@@ -850,7 +850,7 @@
 
 #if DEBUG_MERGE_TYPES
   std::cerr << "  addAbstractTypeUser[" << (void*)this << ", "
-            << getDescription() << "][" << AbstractTypeUsers.size()
+            << *this << "][" << AbstractTypeUsers.size()
             << "] User = " << U << "\n";
 #endif
   AbstractTypeUsers.push_back(U);
@@ -878,12 +878,12 @@
       
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "  remAbstractTypeUser[" << (void*)this << ", "
-            << getDescription() << "][" << i << "] User = " << U << "\n";
+            << *this << "][" << i << "] User = " << U << "\n";
 #endif
     
   if (AbstractTypeUsers.empty() && isAbstract()) {
 #ifdef DEBUG_MERGE_TYPES
-    std::cerr << "DELETEing unused abstract type: <" << getDescription()
+    std::cerr << "DELETEing unused abstract type: <" << *this
               << ">[" << (void*)this << "]" << "\n";
 #endif
     delete this;                  // No users of this abstract type!
@@ -905,8 +905,8 @@
 
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "REFINING abstract type [" << (void*)this << " "
-            << getDescription() << "] to [" << (void*)NewType << " "
-            << NewType->getDescription() << "]!\n";
+            << *this << "] to [" << (void*)NewType << " "
+            << *NewType << "]!\n";
 #endif
 
 
@@ -944,8 +944,8 @@
 #ifdef DEBUG_MERGE_TYPES
       std::cerr << " REFINING user " << OldSize-1 << "[" << (void*)User
                 << "] of abstract type [" << (void*)this << " "
-                << getDescription() << "] to [" << (void*)NewTy.get() << " "
-                << NewTy->getDescription() << "]!\n";
+                << *this << "] to [" << (void*)NewTy.get() << " "
+                << *NewTy << "]!\n";
 #endif
       User->refineAbstractType(this, NewTy);
 
@@ -985,8 +985,7 @@
   ++isRefining;
 
 #ifdef DEBUG_MERGE_TYPES
-  std::cerr << "typeIsREFINED type: " << (void*)this <<" "<<getDescription()
-            << "\n";
+  std::cerr << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
 #endif
 
   // In this loop we have to be very careful not to get into infinite loops and
@@ -1018,7 +1017,7 @@
 #ifdef DEBUG_MERGE_TYPES
     std::cerr << " typeIsREFINED user " << i << "[" << ATU
               << "] of abstract type [" << (void*)this << " "
-              << getDescription() << "]\n";
+              << *this << "]\n";
 #endif
     ATU->refineAbstractType(this, this);
   }
@@ -1052,8 +1051,8 @@
                                       const Type *NewType) {
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "[" 
-            << OldType->getDescription() << "], " << (void*)NewType << " [" 
-            << NewType->getDescription() << "])\n";
+            << *OldType << "], " << (void*)NewType << " [" 
+            << *NewType << "])\n";
 #endif
   // Find the type element we are refining...
   if (ResultType == OldType) {
@@ -1086,8 +1085,8 @@
 				   const Type *NewType) {
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "ArrayTy::refineAbstractTy(" << (void*)OldType << "[" 
-            << OldType->getDescription() << "], " << (void*)NewType << " [" 
-            << NewType->getDescription() << "])\n";
+            << *OldType << "], " << (void*)NewType << " [" 
+            << *NewType << "])\n";
 #endif
 
   assert(getElementType() == OldType);
@@ -1114,8 +1113,8 @@
 				    const Type *NewType) {
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "[" 
-            << OldType->getDescription() << "], " << (void*)NewType << " [" 
-            << NewType->getDescription() << "])\n";
+            << *OldType << "], " << (void*)NewType << " [" 
+            << *NewType << "])\n";
 #endif
   for (int i = ETypes.size()-1; i >= 0; --i)
     if (ETypes[i] == OldType) {
@@ -1144,8 +1143,8 @@
 				     const Type *NewType) {
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "PointerTy::refineAbstractTy(" << (void*)OldType << "[" 
-            << OldType->getDescription() << "], " << (void*)NewType << " [" 
-            << NewType->getDescription() << "])\n";
+            << *OldType << "], " << (void*)NewType << " [" 
+            << *NewType << "])\n";
 #endif
 
   assert(ElementType == OldType);




From lattner at cs.uiuc.edu  Thu Sep  4 18:48:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:48:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderInternals.h
Message-ID: <200309042347.SAA18443@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReaderInternals.h updated: 1.39 -> 1.40

---
Log message:

Non-functional change


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReaderInternals.h
diff -u llvm/lib/Bytecode/Reader/ReaderInternals.h:1.39 llvm/lib/Bytecode/Reader/ReaderInternals.h:1.40
--- llvm/lib/Bytecode/Reader/ReaderInternals.h:1.39	Sun Aug 24 08:47:32 2003
+++ llvm/lib/Bytecode/Reader/ReaderInternals.h	Thu Sep  4 18:47:07 2003
@@ -15,7 +15,7 @@
 #include <map>
 
 // Enable to trace to figure out what the heck is going on when parsing fails
-#define TRACE_LEVEL 0
+//#define TRACE_LEVEL 10
 
 #if TRACE_LEVEL    // ByteCodeReading_TRACEer
 #define BCR_TRACE(n, X) \




From lattner at cs.uiuc.edu  Thu Sep  4 18:51:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 18:51:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309042350.SAA24938@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.63 -> 1.64

---
Log message:

containsEquivalent never returns its argument


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.63 llvm/lib/VMCore/Type.cpp:1.64
--- llvm/lib/VMCore/Type.cpp:1.63	Thu Sep  4 18:46:03 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 18:49:53 2003
@@ -503,7 +503,7 @@
   inline const TypeClass *containsEquivalent(const TypeClass *Ty) {
     for (typename MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
       if (I->second.get() != Ty && TypesEqual(Ty, I->second.get()))
-	return (TypeClass*)I->second.get();  // FIXME TODO when types not const
+	return (TypeClass*)I->second.get();
     return 0;
   }
 
@@ -1065,8 +1065,7 @@
       ParamTys[i] = NewType;
     }
 
-  const FunctionType *MT = FunctionTypes.containsEquivalent(this);
-  if (MT && MT != this) {
+  if (const FunctionType *MT = FunctionTypes.containsEquivalent(this)) {
     refineAbstractTypeTo(MT);            // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
@@ -1093,8 +1092,7 @@
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
-  const ArrayType *AT = ArrayTypes.containsEquivalent(this);
-  if (AT && AT != this) {
+  if (const ArrayType *AT = ArrayTypes.containsEquivalent(this)) {
     refineAbstractTypeTo(AT);          // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
@@ -1124,8 +1122,7 @@
       ETypes[i] = NewType;
     }
 
-  const StructType *ST = StructTypes.containsEquivalent(this);
-  if (ST && ST != this) {
+  if (const StructType *ST = StructTypes.containsEquivalent(this)) {
     refineAbstractTypeTo(ST);          // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
@@ -1151,8 +1148,7 @@
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
-  const PointerType *PT = PointerTypes.containsEquivalent(this);
-  if (PT && PT != this) {
+  if (const PointerType *PT = PointerTypes.containsEquivalent(this)) {
     refineAbstractTypeTo(PT);          // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our




From lattner at cs.uiuc.edu  Thu Sep  4 21:16:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 21:16:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200309050215.VAA23911@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.36 -> 1.37

---
Log message:

Reshuffling of APIs


---
Diffs of the changes:

Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.36 llvm/include/llvm/DerivedTypes.h:1.37
--- llvm/include/llvm/DerivedTypes.h:1.36	Thu Sep  4 18:43:35 2003
+++ llvm/include/llvm/DerivedTypes.h	Thu Sep  4 21:15:36 2003
@@ -35,7 +35,16 @@
   // used, but the subtypes have changed.
   //
   void typeIsRefined();
+
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.  This also removes the
+  // type from the internal tables of available types.
+  virtual void dropAllTypeUses(bool inMap) = 0;
   
+
+  void refineAbstractTypeToInternal(const Type *NewType, bool inMap);
+
 public:
 
   //===--------------------------------------------------------------------===//
@@ -61,7 +70,9 @@
   // This causes all users of 'this' to switch to reference the more concrete
   // type NewType and for 'this' to be deleted.
   //
-  void refineAbstractTypeTo(const Type *NewType);
+  void refineAbstractTypeTo(const Type *NewType) {
+    refineAbstractTypeToInternal(NewType, true);
+  }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const DerivedType *T) { return true; }
@@ -94,6 +105,12 @@
   FunctionType(const Type *Result, const std::vector<const Type*> &Params, 
                bool IsVarArgs);
 
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.  This also removes the
+  // type from the internal tables of available types.
+  virtual void dropAllTypeUses(bool inMap);
+
 public:
 
   inline bool isVarArg() const { return isVarArgs; }
@@ -186,6 +203,12 @@
 
   // Private ctor - Only can be created by a static member...
   StructType(const std::vector<const Type*> &Types);
+
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.  This also removes the
+  // type from the internal tables of available types.
+  virtual void dropAllTypeUses(bool inMap);
   
 public:
   inline const ElementTypes &getElementTypes() const { return ETypes; }
@@ -240,6 +263,7 @@
   SequentialType(PrimitiveID TID, const Type *ElType)
     : CompositeType(TID), ElementType(PATypeHandle(ElType, this)) {
   }
+
 public:
   inline const Type *getElementType() const { return ElementType; }
 
@@ -287,6 +311,13 @@
 
   // Private ctor - Only can be created by a static member...
   ArrayType(const Type *ElType, unsigned NumEl);
+
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.  This also removes the
+  // type from the internal tables of available types.
+  virtual void dropAllTypeUses(bool inMap);
+
 public:
   inline unsigned    getNumElements() const { return NumElements; }
 
@@ -320,6 +351,12 @@
 
   // Private ctor - Only can be created by a static member...
   PointerType(const Type *ElType);
+
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.  This also removes the
+  // type from the internal tables of available types.
+  virtual void dropAllTypeUses(bool inMap);
 public:
   // PointerType::get - Named constructor for pointer types...
   static PointerType *get(const Type *ElementType);
@@ -351,6 +388,12 @@
 
   // Private ctor - Only can be created by a static member...
   OpaqueType();
+
+  // dropAllTypeUses - When this (abstract) type is resolved to be equal to
+  // another (more concrete) type, we must eliminate all references to other
+  // types, to avoid some circular reference problems.
+  virtual void dropAllTypeUses(bool inMap) {}  // No type uses
+
 public:
 
   // get - Static factory method for the OpaqueType class...




From lattner at cs.uiuc.edu  Thu Sep  4 21:22:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 21:22:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309050221.VAA23933@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.64 -> 1.65

---
Log message:

Check in a bunch of minor fixes, plus a whole lot of #if 0'd out code, which will hopefully be enabled in the near future
This does not make any functionality changes


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.64 llvm/lib/VMCore/Type.cpp:1.65
--- llvm/lib/VMCore/Type.cpp:1.64	Thu Sep  4 18:49:53 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 21:21:39 2003
@@ -1,4 +1,4 @@
-//===-- Type.cpp - Implement the Type class ----------------------*- C++ -*--=//
+//===-- Type.cpp - Implement the Type class -------------------------------===//
 //
 // This file implements the Type class for the VMCore library.
 //
@@ -451,7 +451,7 @@
 
   // Two really annoying special cases that breaks an otherwise nice simple
   // algorithm is the fact that arraytypes have sizes that differentiates types,
-  // and that method types can be varargs or not.  Consider this now.
+  // and that function types can be varargs or not.  Consider this now.
   if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
     if (ATy->getNumElements() != cast<ArrayType>(Ty2)->getNumElements())
       return false;
@@ -483,13 +483,12 @@
   typedef std::map<ValType, PATypeHandle> MapTy;
   MapTy Map;
 public:
+  typedef typename MapTy::iterator iterator;
   ~TypeMap() { print("ON EXIT"); }
 
   inline TypeClass *get(const ValType &V) {
-    typename std::map<ValType, PATypeHandle>::iterator I
-      = Map.find(V);
-    // TODO: FIXME: When Types are not CONST.
-    return (I != Map.end()) ? (TypeClass*)I->second.get() : 0;
+    iterator I = Map.find(V);
+    return I != Map.end() ? (TypeClass*)I->second.get() : 0;
   }
 
   inline void add(const ValType &V, TypeClass *T) {
@@ -497,13 +496,26 @@
     print("add");
   }
 
+  iterator getEntryForType(TypeClass *Ty) {
+    iterator I = Map.find(ValType::get(Ty));
+    if (I == Map.end()) print("ERROR!");
+    assert(I != Map.end() && "Didn't find type entry!");
+    return I;
+  }
+
   // containsEquivalent - Return true if the typemap contains a type that is
   // structurally equivalent to the specified type.
   //
-  inline const TypeClass *containsEquivalent(const TypeClass *Ty) {
-    for (typename MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
-      if (I->second.get() != Ty && TypesEqual(Ty, I->second.get()))
-	return (TypeClass*)I->second.get();
+  inline TypeClass *containsEquivalent(TypeClass *Ty) { //iterator TyIt) {
+    //const TypeClass *Ty = (const TypeClass*)TyIt->second.get();
+    for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
+      if (I->second.get() != Ty && TypesEqual(Ty, I->second.get())) {
+        TypeClass *New = (TypeClass*)I->second.get();
+#if 0
+        Map.erase(TyIt);                // The old entry is now dead!
+#endif
+	return New;
+      }
     return 0;
   }
 
@@ -518,8 +530,8 @@
               << *OldTy << "  replacement == " << (void*)NewTy
               << ", " << *NewTy << "\n";
 #endif
-    for (typename MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
-      if (I->second == OldTy) {
+    for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
+      if (I->second.get() == OldTy) {
         // Check to see if the type just became concrete.  If so, remove self
         // from user list.
         I->second.removeUserFromConcrete();
@@ -528,18 +540,24 @@
   }
 
   void remove(const ValType &OldVal) {
-    typename MapTy::iterator I = Map.find(OldVal);
+    iterator I = Map.find(OldVal);
     assert(I != Map.end() && "TypeMap::remove, element not found!");
     Map.erase(I);
   }
 
+  void remove(iterator I) {
+    assert(I != Map.end() && "Cannot remove invalid iterator pointer!");
+    Map.erase(I);
+  }
+
   void print(const char *Arg) const {
 #ifdef DEBUG_MERGE_TYPES
     std::cerr << "TypeMap<>::" << Arg << " table contents:\n";
     unsigned i = 0;
-    for (MapTy::const_iterator I = Map.begin(), E = Map.end(); I != E; ++I)
-      std::cerr << " " << (++i) << ". " << I->second << " " 
-                << *I->second << "\n";
+    for (typename MapTy::const_iterator I = Map.begin(), E = Map.end();
+         I != E; ++I)
+      std::cerr << " " << (++i) << ". " << (void*)I->second.get() << " " 
+                << *I->second.get() << "\n";
 #endif
   }
 
@@ -622,6 +640,8 @@
       ArgTypes.push_back(PATypeHandle(MVT.ArgTypes[i], this));
   }
 
+  static FunctionValType get(const FunctionType *FT);
+
   // Subclass should override this... to update self as usual
   virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
     if (RetTy == OldType) RetTy = NewType;
@@ -648,6 +668,17 @@
 // Define the actual map itself now...
 static TypeMap<FunctionValType, FunctionType> FunctionTypes;
 
+FunctionValType FunctionValType::get(const FunctionType *FT) {
+  // Build up a FunctionValType
+  std::vector<const Type *> ParamTypes;
+  ParamTypes.reserve(FT->getParamTypes().size());
+  for (unsigned i = 0, e = FT->getParamTypes().size(); i != e; ++i)
+    ParamTypes.push_back(FT->getParamType(i));
+  return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(),
+                         FunctionTypes);
+}
+
+
 // FunctionType::get - The factory function for the FunctionType class...
 FunctionType *FunctionType::get(const Type *ReturnType, 
                                 const std::vector<const Type*> &Params,
@@ -664,6 +695,17 @@
   return MT;
 }
 
+void FunctionType::dropAllTypeUses(bool inMap) {
+#if 0
+  //if (inMap) FunctionTypes.remove(FunctionTypes.getEntryForType(this));
+
+  // Drop all uses of other types, which might be recursive.
+  ResultType = Type::VoidTy;
+  ParamTys.clear();
+#endif
+}
+
+
 //===----------------------------------------------------------------------===//
 // Array Type Factory...
 //
@@ -681,6 +723,9 @@
     : ValTypeBase<ArrayValType, ArrayType>(AVT), ValTy(AVT.ValTy, this),
       Size(AVT.Size) {}
 
+  static ArrayValType get(const ArrayType *AT);
+
+
   // Subclass should override this... to update self as usual
   virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
     assert(ValTy == OldType);
@@ -701,6 +746,11 @@
 
 static TypeMap<ArrayValType, ArrayType> ArrayTypes;
 
+ArrayValType ArrayValType::get(const ArrayType *AT) {
+  return ArrayValType(AT->getElementType(), AT->getNumElements(), ArrayTypes);
+}
+
+
 ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
   assert(ElementType && "Can't get array of null types!");
 
@@ -717,6 +767,16 @@
   return AT;
 }
 
+void ArrayType::dropAllTypeUses(bool inMap) {
+#if 0
+  //if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
+  ElementType = Type::IntTy;
+#endif
+}
+
+
+
+
 //===----------------------------------------------------------------------===//
 // Struct Type Factory...
 //
@@ -744,6 +804,8 @@
       ElTypes.push_back(PATypeHandle(SVT.ElTypes[i], this));
   }
 
+  static StructValType get(const StructType *ST);
+
   // Subclass should override this... to update self as usual
   virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
     for (unsigned i = 0; i < ElTypes.size(); ++i)
@@ -763,6 +825,17 @@
 
 static TypeMap<StructValType, StructType> StructTypes;
 
+StructValType StructValType::get(const StructType *ST) {
+  std::vector<const Type *> ElTypes;
+  ElTypes.reserve(ST->getElementTypes().size());
+  for (unsigned i = 0, e = ST->getElementTypes().size(); i != e; ++i)
+    ElTypes.push_back(ST->getElementTypes()[i]);
+  
+  return StructValType(ElTypes, StructTypes);
+}
+
+
+
 StructType *StructType::get(const std::vector<const Type*> &ETypes) {
   StructValType STV(ETypes, StructTypes);
   StructType *ST = StructTypes.get(STV);
@@ -777,6 +850,15 @@
   return ST;
 }
 
+void StructType::dropAllTypeUses(bool inMap) {
+#if 0
+  //if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
+  ETypes.clear();
+#endif
+}
+
+
+
 //===----------------------------------------------------------------------===//
 // Pointer Type Factory...
 //
@@ -795,6 +877,8 @@
   PointerValType(const PointerValType &PVT) 
     : ValTypeBase<PointerValType, PointerType>(PVT), ValTy(PVT.ValTy, this) {}
 
+  static PointerValType get(const PointerType *PT);
+
   // Subclass should override this... to update self as usual
   virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
     assert(ValTy == OldType);
@@ -814,6 +898,11 @@
 
 static TypeMap<PointerValType, PointerType> PointerTypes;
 
+PointerValType PointerValType::get(const PointerType *PT) {
+  return PointerValType(PT->getElementType(), PointerTypes);
+}
+
+
 PointerType *PointerType::get(const Type *ValueType) {
   assert(ValueType && "Can't get a pointer to <null> type!");
   PointerValType PVT(ValueType, PointerTypes);
@@ -830,6 +919,13 @@
   return PT;
 }
 
+void PointerType::dropAllTypeUses(bool inMap) {
+#if 0
+  //if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
+  ElementType = Type::IntTy;
+#endif
+}
+
 void debug_type_tables() {
   FunctionTypes.dump();
   ArrayTypes.dump();
@@ -891,12 +987,12 @@
 }
 
 
-// refineAbstractTypeTo - This function is used to when it is discovered that
-// the 'this' abstract type is actually equivalent to the NewType specified.
-// This causes all users of 'this' to switch to reference the more concrete
-// type NewType and for 'this' to be deleted.
+// refineAbstractTypeToInternal - This function is used to when it is discovered
+// that the 'this' abstract type is actually equivalent to the NewType
+// specified.  This causes all users of 'this' to switch to reference the more
+// concrete type NewType and for 'this' to be deleted.
 //
-void DerivedType::refineAbstractTypeTo(const Type *NewType) {
+void DerivedType::refineAbstractTypeToInternal(const Type *NewType, bool inMap){
   assert(isAbstract() && "refineAbstractTypeTo: Current type is not abstract!");
   assert(this != NewType && "Can't refine to myself!");
   
@@ -924,6 +1020,14 @@
   //
   addAbstractTypeUser(this);
 
+#if 0
+  // To make the situation simpler, we ask the subclass to remove this type from
+  // the type map, and to replace any type uses with uses of non-abstract types.
+  // This dramatically limits the amount of recursive type trouble we can find
+  // ourselves in.
+  dropAllTypeUses(inMap);
+#endif
+
   // Count the number of self uses.  Stop looping when sizeof(list) == NSU.
   unsigned NumSelfUses = 0;
 
@@ -972,6 +1076,10 @@
   //
   assert((NewTy == this || AbstractTypeUsers.back() == this) &&
          "Only self uses should be left!");
+
+#if 0
+  assert(AbstractTypeUsers.size() == 1 && "This type should get deleted!");
+#endif
   removeAbstractTypeUser(this);
 }
 
@@ -1054,6 +1162,14 @@
             << *OldType << "], " << (void*)NewType << " [" 
             << *NewType << "])\n";
 #endif
+
+  // Look up our current type map entry..
+#if 0
+  TypeMap<FunctionValType, FunctionType>::iterator TMI =
+    FunctionTypes.getEntryForType(this);
+  assert(TMI->second == this);
+#endif
+
   // Find the type element we are refining...
   if (ResultType == OldType) {
     ResultType.removeUserFromConcrete();
@@ -1066,7 +1182,7 @@
     }
 
   if (const FunctionType *MT = FunctionTypes.containsEquivalent(this)) {
-    refineAbstractTypeTo(MT);            // Different type altogether...
+    refineAbstractTypeToInternal(MT, false);    // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
     // subtypes to see if the type has just become concrete!
@@ -1088,12 +1204,19 @@
             << *NewType << "])\n";
 #endif
 
+#if 0
+  // Look up our current type map entry..
+  TypeMap<ArrayValType, ArrayType>::iterator TMI =
+    ArrayTypes.getEntryForType(this);
+  assert(TMI->second == this);
+#endif
+
   assert(getElementType() == OldType);
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
   if (const ArrayType *AT = ArrayTypes.containsEquivalent(this)) {
-    refineAbstractTypeTo(AT);          // Different type altogether...
+    refineAbstractTypeToInternal(AT, false);    // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
     // subtypes to see if the type has just become concrete!
@@ -1114,6 +1237,14 @@
             << *OldType << "], " << (void*)NewType << " [" 
             << *NewType << "])\n";
 #endif
+
+#if 0
+  // Look up our current type map entry..
+  TypeMap<StructValType, StructType>::iterator TMI =
+    StructTypes.getEntryForType(this);
+  assert(TMI->second == this);
+#endif
+
   for (int i = ETypes.size()-1; i >= 0; --i)
     if (ETypes[i] == OldType) {
       ETypes[i].removeUserFromConcrete();
@@ -1123,7 +1254,7 @@
     }
 
   if (const StructType *ST = StructTypes.containsEquivalent(this)) {
-    refineAbstractTypeTo(ST);          // Different type altogether...
+    refineAbstractTypeToInternal(ST, false);    // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
     // subtypes to see if the type has just become concrete!
@@ -1144,12 +1275,19 @@
             << *NewType << "])\n";
 #endif
 
+#if 0
+  // Look up our current type map entry..
+  TypeMap<PointerValType, PointerType>::iterator TMI =
+    PointerTypes.getEntryForType(this);
+  assert(TMI->second == this);
+#endif
+
   assert(ElementType == OldType);
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
   if (const PointerType *PT = PointerTypes.containsEquivalent(this)) {
-    refineAbstractTypeTo(PT);          // Different type altogether...
+    refineAbstractTypeToInternal(PT, false);     // Different type altogether...
   } else {
     // If the type is currently thought to be abstract, rescan all of our
     // subtypes to see if the type has just become concrete!




From lattner at cs.uiuc.edu  Thu Sep  4 21:31:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 21:31:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200309050230.VAA25748@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.37 -> 1.38

---
Log message:

Get friendly


---
Diffs of the changes:

Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.37 llvm/include/llvm/DerivedTypes.h:1.38
--- llvm/include/llvm/DerivedTypes.h:1.37	Thu Sep  4 21:15:36 2003
+++ llvm/include/llvm/DerivedTypes.h	Thu Sep  4 21:30:18 2003
@@ -13,6 +13,12 @@
 
 #include "llvm/Type.h"
 
+template<class ValType, class TypeClass> class TypeMap;
+class FunctionValType;
+class ArrayValType;
+class StructValType;
+class PointerValType;
+
 class DerivedType : public Type {
   char isRefining;                                   // Used for recursive types
 
@@ -89,6 +95,7 @@
 
 struct FunctionType : public DerivedType {
   typedef std::vector<PATypeHandle> ParamTypes;
+  friend class TypeMap<FunctionValType, FunctionType>;
 private:
   PATypeHandle ResultType;
   ParamTypes ParamTys;
@@ -186,8 +193,8 @@
 };
 
 
-class StructType : public CompositeType {
-public:
+struct StructType : public CompositeType {
+  friend class TypeMap<StructValType, StructType>;
   typedef std::vector<PATypeHandle> ElementTypes;
 
 private:
@@ -300,6 +307,7 @@
 
 
 class ArrayType : public SequentialType {
+  friend class TypeMap<ArrayValType, ArrayType>;
   unsigned NumElements;
 
   ArrayType(const ArrayType &);                   // Do not implement
@@ -342,6 +350,7 @@
 
 
 class PointerType : public SequentialType {
+  friend class TypeMap<PointerValType, PointerType>;
   PointerType(const PointerType &);                   // Do not implement
   const PointerType &operator=(const PointerType &);  // Do not implement
 protected:




From lattner at cs.uiuc.edu  Thu Sep  4 21:31:12 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 21:31:12 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309050230.VAA25759@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.65 -> 1.66

---
Log message:

Refactor what has effectively become copy-and-pasted code


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.65 llvm/lib/VMCore/Type.cpp:1.66
--- llvm/lib/VMCore/Type.cpp:1.65	Thu Sep  4 21:21:39 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 21:30:47 2003
@@ -503,6 +503,7 @@
     return I;
   }
 
+
   // containsEquivalent - Return true if the typemap contains a type that is
   // structurally equivalent to the specified type.
   //
@@ -519,6 +520,18 @@
     return 0;
   }
 
+  void finishRefinement(TypeClass *Ty) {
+    if (TypeClass *NewTy = containsEquivalent(Ty)) {
+      // Refined to a different type altogether?
+      Ty->refineAbstractTypeToInternal(NewTy, false);
+    } else {
+      // If the type is currently thought to be abstract, rescan all of our
+      // subtypes to see if the type has just become concrete!
+      if (Ty->isAbstract()) Ty->setAbstract(Ty->isTypeAbstract());
+      Ty->typeIsRefined();                   // Same type, different contents...
+    }
+  }
+
   // refineAbstractType - This is called when one of the contained abstract
   // types gets refined... this simply removes the abstract type from our table.
   // We expect that whoever refined the type will add it back to the table,
@@ -1181,14 +1194,7 @@
       ParamTys[i] = NewType;
     }
 
-  if (const FunctionType *MT = FunctionTypes.containsEquivalent(this)) {
-    refineAbstractTypeToInternal(MT, false);    // Different type altogether...
-  } else {
-    // If the type is currently thought to be abstract, rescan all of our
-    // subtypes to see if the type has just become concrete!
-    if (isAbstract()) setAbstract(isTypeAbstract());
-    typeIsRefined();                     // Same type, different contents...
-  }
+  FunctionTypes.finishRefinement(this);
 }
 
 
@@ -1215,14 +1221,7 @@
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
-  if (const ArrayType *AT = ArrayTypes.containsEquivalent(this)) {
-    refineAbstractTypeToInternal(AT, false);    // Different type altogether...
-  } else {
-    // If the type is currently thought to be abstract, rescan all of our
-    // subtypes to see if the type has just become concrete!
-    if (isAbstract()) setAbstract(isTypeAbstract());
-    typeIsRefined();                   // Same type, different contents...
-  }
+  ArrayTypes.finishRefinement(this);
 }
 
 
@@ -1253,14 +1252,7 @@
       ETypes[i] = NewType;
     }
 
-  if (const StructType *ST = StructTypes.containsEquivalent(this)) {
-    refineAbstractTypeToInternal(ST, false);    // Different type altogether...
-  } else {
-    // If the type is currently thought to be abstract, rescan all of our
-    // subtypes to see if the type has just become concrete!
-    if (isAbstract()) setAbstract(isTypeAbstract());
-    typeIsRefined();                   // Same type, different contents...
-  }
+  StructTypes.finishRefinement(this);
 }
 
 // refineAbstractType - Called when a contained type is found to be more
@@ -1286,13 +1278,6 @@
   ElementType.removeUserFromConcrete();
   ElementType = NewType;
 
-  if (const PointerType *PT = PointerTypes.containsEquivalent(this)) {
-    refineAbstractTypeToInternal(PT, false);     // Different type altogether...
-  } else {
-    // If the type is currently thought to be abstract, rescan all of our
-    // subtypes to see if the type has just become concrete!
-    if (isAbstract()) setAbstract(isTypeAbstract());
-    typeIsRefined();                   // Same type, different contents...
-  }
+  PointerTypes.finishRefinement(this);
 }
 




From lattner at cs.uiuc.edu  Thu Sep  4 21:41:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep  4 21:41:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309050240.VAA26869@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.66 -> 1.67

---
Log message:

Move functionality preserving changes.
Inline containsEquivalent
Remove some //'s


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.66 llvm/lib/VMCore/Type.cpp:1.67
--- llvm/lib/VMCore/Type.cpp:1.66	Thu Sep  4 21:30:47 2003
+++ llvm/lib/VMCore/Type.cpp	Thu Sep  4 21:39:52 2003
@@ -504,32 +504,23 @@
   }
 
 
-  // containsEquivalent - Return true if the typemap contains a type that is
-  // structurally equivalent to the specified type.
-  //
-  inline TypeClass *containsEquivalent(TypeClass *Ty) { //iterator TyIt) {
+  void finishRefinement(TypeClass *Ty) {
     //const TypeClass *Ty = (const TypeClass*)TyIt->second.get();
     for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
       if (I->second.get() != Ty && TypesEqual(Ty, I->second.get())) {
-        TypeClass *New = (TypeClass*)I->second.get();
+        TypeClass *NewTy = (TypeClass*)I->second.get();
 #if 0
-        Map.erase(TyIt);                // The old entry is now dead!
+        //Map.erase(TyIt);                // The old entry is now dead!
 #endif
-	return New;
+        // Refined to a different type altogether?
+        Ty->refineAbstractTypeToInternal(NewTy, false);
+        return;
       }
-    return 0;
-  }
 
-  void finishRefinement(TypeClass *Ty) {
-    if (TypeClass *NewTy = containsEquivalent(Ty)) {
-      // Refined to a different type altogether?
-      Ty->refineAbstractTypeToInternal(NewTy, false);
-    } else {
-      // If the type is currently thought to be abstract, rescan all of our
-      // subtypes to see if the type has just become concrete!
-      if (Ty->isAbstract()) Ty->setAbstract(Ty->isTypeAbstract());
-      Ty->typeIsRefined();                   // Same type, different contents...
-    }
+    // If the type is currently thought to be abstract, rescan all of our
+    // subtypes to see if the type has just become concrete!
+    if (Ty->isAbstract()) Ty->setAbstract(Ty->isTypeAbstract());
+    Ty->typeIsRefined();                   // Same type, different contents...
   }
 
   // refineAbstractType - This is called when one of the contained abstract
@@ -710,8 +701,7 @@
 
 void FunctionType::dropAllTypeUses(bool inMap) {
 #if 0
-  //if (inMap) FunctionTypes.remove(FunctionTypes.getEntryForType(this));
-
+  if (inMap) FunctionTypes.remove(FunctionTypes.getEntryForType(this));
   // Drop all uses of other types, which might be recursive.
   ResultType = Type::VoidTy;
   ParamTys.clear();
@@ -782,7 +772,7 @@
 
 void ArrayType::dropAllTypeUses(bool inMap) {
 #if 0
-  //if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
+  if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
   ElementType = Type::IntTy;
 #endif
 }
@@ -865,7 +855,7 @@
 
 void StructType::dropAllTypeUses(bool inMap) {
 #if 0
-  //if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
+  if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
   ETypes.clear();
 #endif
 }
@@ -934,7 +924,7 @@
 
 void PointerType::dropAllTypeUses(bool inMap) {
 #if 0
-  //if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
+  if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
   ElementType = Type::IntTy;
 #endif
 }
@@ -1033,13 +1023,11 @@
   //
   addAbstractTypeUser(this);
 
-#if 0
   // To make the situation simpler, we ask the subclass to remove this type from
   // the type map, and to replace any type uses with uses of non-abstract types.
   // This dramatically limits the amount of recursive type trouble we can find
   // ourselves in.
   dropAllTypeUses(inMap);
-#endif
 
   // Count the number of self uses.  Stop looping when sizeof(list) == NSU.
   unsigned NumSelfUses = 0;




From gaeke at cs.uiuc.edu  Thu Sep  4 23:47:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Sep  4 23:47:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp Interpreter.cpp Interpreter.h UserInput.cpp
Message-ID: <200309050446.XAA29188@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.93 -> 1.94
Interpreter.cpp updated: 1.10 -> 1.11
Interpreter.h updated: 1.36 -> 1.37
UserInput.cpp (r1.27) removed

---
Log message:

Remove support for interactive (step finish next) instructions.
Remove printCurrentInstruction, printStackFrame and infoValue
 (only used interactively) and other unused methods of Interpreter.
Fold UserInput.cpp containing only callMainFunction() into Interpreter.cpp.
Remove unused Profile flag.


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.93 llvm/tools/lli/Interpreter/Execution.cpp:1.94
--- llvm/tools/lli/Interpreter/Execution.cpp:1.93	Thu Sep  4 18:15:40 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Thu Sep  4 23:46:26 2003
@@ -1048,46 +1048,6 @@
   CurFrame = ECStack.size()-1;
 }
 
-void Interpreter::stepInstruction() {  // Do the 'step' command
-  if (ECStack.empty()) {
-    std::cout << "Error: no program running, cannot step!\n";
-    return;
-  }
-
-  // Run an instruction...
-  executeInstruction();
-
-  // Print the next instruction to execute...
-  printCurrentInstruction();
-}
-
-// --- UI Stuff...
-void Interpreter::nextInstruction() {  // Do the 'next' command
-  if (ECStack.empty()) {
-    std::cout << "Error: no program running, cannot 'next'!\n";
-    return;
-  }
-
-  // If this is a call instruction, step over the call instruction...
-  // TODO: ICALL, CALL WITH, ...
-  if (ECStack.back().CurInst->getOpcode() == Instruction::Call) {
-    unsigned StackSize = ECStack.size();
-    // Step into the function...
-    executeInstruction();
-
-    // If we we able to step into the function, finish it now.  We might not be
-    // able the step into a function, if it's external for example.
-    if (ECStack.size() != StackSize)
-      finish(); // Finish executing the function...
-    else
-      printCurrentInstruction();
-
-  } else {
-    // Normal instruction, just step...
-    stepInstruction();
-  }
-}
-
 void Interpreter::run() {
   if (ECStack.empty()) {
     std::cout << "Error: no program running, cannot run!\n";
@@ -1098,40 +1058,6 @@
     // Run an instruction...
     executeInstruction();
   }
-
-  // Print the next instruction to execute...
-  printCurrentInstruction();
-}
-
-void Interpreter::finish() {
-  if (ECStack.empty()) {
-    std::cout << "Error: no program running, cannot run!\n";
-    return;
-  }
-
-  unsigned StackSize = ECStack.size();
-  while (ECStack.size() >= StackSize) {
-    // Run an instruction...
-    executeInstruction();
-  }
-
-  // Print the next instruction to execute...
-  printCurrentInstruction();
-}
-
-// printCurrentInstruction - Print out the instruction that the virtual PC is
-// at, or fail silently if no program is running.
-//
-void Interpreter::printCurrentInstruction() {
-  if (!ECStack.empty()) {
-    if (ECStack.back().CurBB->begin() == ECStack.back().CurInst)  // print label
-      WriteAsOperand(std::cout, ECStack.back().CurBB) << ":\n";
-
-    Instruction &I = *ECStack.back().CurInst;
-    InstNumber *IN = (InstNumber*)I.getAnnotation(SlotNumberAID);
-    assert(IN && "Instruction has no numbering annotation!");
-    std::cout << "#" << IN->InstNum << I;
-  }
 }
 
 void Interpreter::printValue(const Type *Ty, GenericValue V) {
@@ -1177,44 +1103,3 @@
     std::cout << "\n";
   }
 }
-
-void Interpreter::infoValue(const std::string &Name) {
-  Value *PickedVal = ChooseOneOption(Name, LookupMatchingNames(Name));
-  if (!PickedVal) return;
-
-  std::cout << "Value: ";
-  print(PickedVal->getType(), 
-        getOperandValue(PickedVal, ECStack[CurFrame]));
-  std::cout << "\n";
-  printOperandInfo(PickedVal, ECStack[CurFrame]);
-}
-
-// printStackFrame - Print information about the specified stack frame, or -1
-// for the default one.
-//
-void Interpreter::printStackFrame(int FrameNo) {
-  if (FrameNo == -1) FrameNo = CurFrame;
-  Function *F = ECStack[FrameNo].CurFunction;
-  const Type *RetTy = F->getReturnType();
-
-  CW << ((FrameNo == CurFrame) ? '>' : '-') << "#" << FrameNo << ". "
-     << (Value*)RetTy << " \"" << F->getName() << "\"(";
-  
-  unsigned i = 0;
-  for (Function::aiterator I = F->abegin(), E = F->aend(); I != E; ++I, ++i) {
-    if (i != 0) std::cout << ", ";
-    CW << *I << "=";
-    
-    printValue(I->getType(), getOperandValue(I, ECStack[FrameNo]));
-  }
-
-  std::cout << ")\n";
-
-  if (FrameNo != int(ECStack.size()-1)) {
-    BasicBlock::iterator I = ECStack[FrameNo].CurInst;
-    CW << --I;
-  } else {
-    CW << *ECStack[FrameNo].CurInst;
-  }
-}
-


Index: llvm/tools/lli/Interpreter/Interpreter.cpp
diff -u llvm/tools/lli/Interpreter/Interpreter.cpp:1.10 llvm/tools/lli/Interpreter/Interpreter.cpp:1.11
--- llvm/tools/lli/Interpreter/Interpreter.cpp:1.10	Thu Sep  4 17:21:24 2003
+++ llvm/tools/lli/Interpreter/Interpreter.cpp	Thu Sep  4 23:46:26 2003
@@ -8,6 +8,8 @@
 
 #include "Interpreter.h"
 #include "llvm/Module.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Function.h"
 
 /// create - Create a new interpreter object.  This can never fail.
 ///
@@ -76,3 +78,45 @@
   return ExitCode;
 }
 
+
+// callMainFunction - Construct call to typical C main() function and
+// call it using callFunction().
+//
+bool Interpreter::callMainFunction(const std::string &Name,
+                                   const std::vector<std::string> &InputArgv) {
+  Function *M = getModule().getNamedFunction(Name);
+  if (M == 0) {
+    std::cerr << "Could not find function '" << Name << "' in module!\n";
+    return 1;
+  }
+  const FunctionType *MT = M->getFunctionType();
+
+  std::vector<GenericValue> Args;
+  if (MT->getParamTypes().size() >= 2) {
+    PointerType *SPP = PointerType::get(PointerType::get(Type::SByteTy));
+    if (MT->getParamTypes()[1] != SPP) {
+      CW << "Second argument of '" << Name << "' should have type: '"
+	 << SPP << "'!\n";
+      return true;
+    }
+    Args.push_back(PTOGV(CreateArgv(InputArgv)));
+  }
+
+  if (MT->getParamTypes().size() >= 1) {
+    if (!MT->getParamTypes()[0]->isInteger()) {
+      std::cout << "First argument of '" << Name
+		<< "' should be an integer!\n";
+      return true;
+    } else {
+      GenericValue GV; GV.UIntVal = InputArgv.size();
+      Args.insert(Args.begin(), GV);
+    }
+  }
+
+  callFunction(M, Args);  // Start executing it...
+
+  // Reset the current frame location to the top of stack
+  CurFrame = ECStack.size()-1;
+
+  return false;
+}


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.36 llvm/tools/lli/Interpreter/Interpreter.h:1.37
--- llvm/tools/lli/Interpreter/Interpreter.h:1.36	Thu Sep  4 18:15:40 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Thu Sep  4 23:46:26 2003
@@ -71,7 +71,6 @@
 //
 class Interpreter : public ExecutionEngine, public InstVisitor<Interpreter> {
   int ExitCode;                // The exit code to be returned by the lli util
-  bool Profile;                // Profiling enabled?
   bool Trace;                  // Tracing enabled?
   int CurFrame;                // The current stack frame being inspected
   TargetData TD;
@@ -91,11 +90,6 @@
   ///
   static ExecutionEngine *create(Module *M, bool TraceMode);
 
-  /// getExitCode - return the code that should be the exit code for the lli
-  /// utility.
-  ///
-  inline int getExitCode() const { return ExitCode; }
-
   /// run - Start execution with the specified function and arguments.
   ///
   virtual int run(const std::string &FnName,
@@ -103,15 +97,12 @@
                   const char ** envp);
  
 
-  // enableProfiling() - Turn profiling on, clear stats?
-  void enableProfiling() { Profile = true; }
   void enableTracing() { Trace = true; }
 
   void handleUserInput();
 
   // User Interation Methods...
   bool callFunction(const std::string &Name);      // return true on failure
-  void infoValue(const std::string &Name);
   void print(const std::string &Name);
   static void print(const Type *Ty, GenericValue V);
   static void printValue(const Type *Ty, GenericValue V);
@@ -119,17 +110,11 @@
   bool callMainFunction(const std::string &MainName,
                         const std::vector<std::string> &InputFilename);
 
-  void list();             // Do the 'list' command
-  void printStackTrace();  // Do the 'backtrace' command
-
   // Code execution methods...
   void callFunction(Function *F, const std::vector<GenericValue> &ArgVals);
   void executeInstruction(); // Execute one instruction...
 
-  void stepInstruction();  // Do the 'step' command
-  void nextInstruction();  // Do the 'next' command
   void run();              // Do the 'run' command
-  void finish();           // Do the 'finish' command
 
   // Opcode Implementations
   void visitReturnInst(ReturnInst &I);
@@ -195,11 +180,6 @@
   // at, or fail silently if no program is running.
   //
   void printCurrentInstruction();
-
-  // printStackFrame - Print information about the specified stack frame, or -1
-  // for the default one.
-  //
-  void printStackFrame(int FrameNo = -1);
 
   // LookupMatchingNames - Search the current function namespace, then the
   // global namespace looking for values that match the specified name.  Return




From gaeke at cs.uiuc.edu  Fri Sep  5 00:05:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 00:05:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp Interpreter.h Support.cpp
Message-ID: <200309050504.AAA02126@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.94 -> 1.95
Interpreter.h updated: 1.37 -> 1.38
Support.cpp (r1.7) removed

---
Log message:

Remove support for printing values from a module by name, only used
 w/ interactive keyboard entry of names.
With that, Support.cpp is history.


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.94 llvm/tools/lli/Interpreter/Execution.cpp:1.95
--- llvm/tools/lli/Interpreter/Execution.cpp:1.94	Thu Sep  4 23:46:26 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Fri Sep  5 00:04:32 2003
@@ -1086,20 +1086,3 @@
   CW << Ty << " ";
   printValue(Ty, V);
 }
-
-void Interpreter::print(const std::string &Name) {
-  Value *PickedVal = ChooseOneOption(Name, LookupMatchingNames(Name));
-  if (!PickedVal) return;
-
-  if (const Function *F = dyn_cast<Function>(PickedVal)) {
-    CW << F;  // Print the function
-  } else if (const Type *Ty = dyn_cast<Type>(PickedVal)) {
-    CW << "type %" << Name << " = " << Ty->getDescription() << "\n";
-  } else if (const BasicBlock *BB = dyn_cast<BasicBlock>(PickedVal)) {
-    CW << BB;   // Print the basic block
-  } else {      // Otherwise there should be an annotation for the slot#
-    print(PickedVal->getType(), 
-          getOperandValue(PickedVal, ECStack[CurFrame]));
-    std::cout << "\n";
-  }
-}


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.37 llvm/tools/lli/Interpreter/Interpreter.h:1.38
--- llvm/tools/lli/Interpreter/Interpreter.h:1.37	Thu Sep  4 23:46:26 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Fri Sep  5 00:04:32 2003
@@ -103,7 +103,6 @@
 
   // User Interation Methods...
   bool callFunction(const std::string &Name);      // return true on failure
-  void print(const std::string &Name);
   static void print(const Type *Ty, GenericValue V);
   static void printValue(const Type *Ty, GenericValue V);
 
@@ -180,20 +179,6 @@
   // at, or fail silently if no program is running.
   //
   void printCurrentInstruction();
-
-  // LookupMatchingNames - Search the current function namespace, then the
-  // global namespace looking for values that match the specified name.  Return
-  // ALL matches to that name.  This is obviously slow, and should only be used
-  // for user interaction.
-  //
-  std::vector<Value*> LookupMatchingNames(const std::string &Name);
-
-  // ChooseOneOption - Prompt the user to choose among the specified options to
-  // pick one value.  If no options are provided, emit an error.  If a single 
-  // option is provided, just return that option.
-  //
-  Value *ChooseOneOption(const std::string &Name,
-                         const std::vector<Value*> &Opts);
 
   void initializeExecutionEngine();
   void initializeExternalFunctions();




From lattner at cs.uiuc.edu  Fri Sep  5 00:11:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 00:11:04 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200309050510.AAA25518@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.67 -> 1.68

---
Log message:

Add asserts, move code around.  This gets the dropAllTypeUses partially implemented


---
Diffs of the changes:

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.67 llvm/lib/VMCore/Type.cpp:1.68
--- llvm/lib/VMCore/Type.cpp:1.67	Thu Sep  4 21:39:52 2003
+++ llvm/lib/VMCore/Type.cpp	Fri Sep  5 00:10:04 2003
@@ -500,6 +500,7 @@
     iterator I = Map.find(ValType::get(Ty));
     if (I == Map.end()) print("ERROR!");
     assert(I != Map.end() && "Didn't find type entry!");
+    assert(T->second == Ty && "Type entry wrong?");
     return I;
   }
 
@@ -508,6 +509,7 @@
     //const TypeClass *Ty = (const TypeClass*)TyIt->second.get();
     for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
       if (I->second.get() != Ty && TypesEqual(Ty, I->second.get())) {
+        assert(Ty->isAbstract() && "Replacing a non-abstract type?");
         TypeClass *NewTy = (TypeClass*)I->second.get();
 #if 0
         //Map.erase(TyIt);                // The old entry is now dead!
@@ -519,8 +521,14 @@
 
     // If the type is currently thought to be abstract, rescan all of our
     // subtypes to see if the type has just become concrete!
-    if (Ty->isAbstract()) Ty->setAbstract(Ty->isTypeAbstract());
-    Ty->typeIsRefined();                   // Same type, different contents...
+    if (Ty->isAbstract())
+      Ty->setAbstract(Ty->isTypeAbstract());
+
+    // This method may be called with either an abstract or a concrete type.
+    // Concrete types might get refined if a subelement type got refined which
+    // was previously marked as abstract, but was realized to be concrete.  This
+    // can happen for recursive types.
+    Ty->typeIsRefined();                     // Same type, different contents...
   }
 
   // refineAbstractType - This is called when one of the contained abstract
@@ -703,9 +711,9 @@
 #if 0
   if (inMap) FunctionTypes.remove(FunctionTypes.getEntryForType(this));
   // Drop all uses of other types, which might be recursive.
-  ResultType = Type::VoidTy;
-  ParamTys.clear();
 #endif
+  ResultType = OpaqueType::get();
+  ParamTys.clear();
 }
 
 
@@ -773,8 +781,8 @@
 void ArrayType::dropAllTypeUses(bool inMap) {
 #if 0
   if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
-  ElementType = Type::IntTy;
 #endif
+  ElementType = OpaqueType::get();
 }
 
 
@@ -856,8 +864,9 @@
 void StructType::dropAllTypeUses(bool inMap) {
 #if 0
   if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
-  ETypes.clear();
 #endif
+  ETypes.clear();
+  ETypes.push_back(PATypeHandle(OpaqueType::get(), this));
 }
 
 
@@ -925,8 +934,8 @@
 void PointerType::dropAllTypeUses(bool inMap) {
 #if 0
   if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
-  ElementType = Type::IntTy;
 #endif
+  ElementType = OpaqueType::get();
 }
 
 void debug_type_tables() {
@@ -1158,6 +1167,8 @@
 //
 void FunctionType::refineAbstractType(const DerivedType *OldType,
                                       const Type *NewType) {
+  assert((isAbstract() || !OldType->isAbstract()) &&
+         "Refining a non-abstract type!");
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "[" 
             << *OldType << "], " << (void*)NewType << " [" 
@@ -1168,7 +1179,6 @@
 #if 0
   TypeMap<FunctionValType, FunctionType>::iterator TMI =
     FunctionTypes.getEntryForType(this);
-  assert(TMI->second == this);
 #endif
 
   // Find the type element we are refining...
@@ -1192,6 +1202,8 @@
 //
 void ArrayType::refineAbstractType(const DerivedType *OldType,
 				   const Type *NewType) {
+  assert((isAbstract() || !OldType->isAbstract()) &&
+         "Refining a non-abstract type!");
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "ArrayTy::refineAbstractTy(" << (void*)OldType << "[" 
             << *OldType << "], " << (void*)NewType << " [" 
@@ -1202,7 +1214,6 @@
   // Look up our current type map entry..
   TypeMap<ArrayValType, ArrayType>::iterator TMI =
     ArrayTypes.getEntryForType(this);
-  assert(TMI->second == this);
 #endif
 
   assert(getElementType() == OldType);
@@ -1219,6 +1230,8 @@
 //
 void StructType::refineAbstractType(const DerivedType *OldType,
 				    const Type *NewType) {
+  assert((isAbstract() || !OldType->isAbstract()) &&
+         "Refining a non-abstract type!");
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "[" 
             << *OldType << "], " << (void*)NewType << " [" 
@@ -1229,7 +1242,6 @@
   // Look up our current type map entry..
   TypeMap<StructValType, StructType>::iterator TMI =
     StructTypes.getEntryForType(this);
-  assert(TMI->second == this);
 #endif
 
   for (int i = ETypes.size()-1; i >= 0; --i)
@@ -1249,6 +1261,8 @@
 //
 void PointerType::refineAbstractType(const DerivedType *OldType,
 				     const Type *NewType) {
+  assert((isAbstract() || !OldType->isAbstract()) &&
+         "Refining a non-abstract type!");
 #ifdef DEBUG_MERGE_TYPES
   std::cerr << "PointerTy::refineAbstractTy(" << (void*)OldType << "[" 
             << *OldType << "], " << (void*)NewType << " [" 
@@ -1259,7 +1273,6 @@
   // Look up our current type map entry..
   TypeMap<PointerValType, PointerType>::iterator TMI =
     PointerTypes.getEntryForType(this);
-  assert(TMI->second == this);
 #endif
 
   assert(ElementType == OldType);




From gaeke at cs.uiuc.edu  Fri Sep  5 00:36:10 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 00:36:10 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp
Message-ID: <200309050522.AAA02226@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.95 -> 1.96

---
Log message:

Remove printOperandInfo(), and simplify run().


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.95 llvm/tools/lli/Interpreter/Execution.cpp:1.96
--- llvm/tools/lli/Interpreter/Execution.cpp:1.95	Fri Sep  5 00:04:32 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Fri Sep  5 00:22:08 2003
@@ -107,30 +107,6 @@
   }
 }
 
-static void printOperandInfo(Value *V, ExecutionContext &SF) {
-  if (isa<Constant>(V)) {
-    std::cout << "Constant Pool Value\n";
-  } else if (isa<GlobalValue>(V)) {
-    std::cout << "Global Value\n";
-  } else {
-    unsigned TyP  = V->getType()->getUniqueID();   // TypePlane for value
-    unsigned Slot = getOperandSlot(V);
-    std::cout << "Value=" << (void*)V << " TypeID=" << TyP << " Slot=" << Slot
-              << " Addr=" << &SF.Values[TyP][Slot] << " SF=" << &SF
-              << " Contents=0x";
-
-    const unsigned char *Buf = (const unsigned char*)&SF.Values[TyP][Slot];
-    for (unsigned i = 0; i < sizeof(GenericValue); ++i) {
-      unsigned char Cur = Buf[i];
-      std::cout << ( Cur     >= 160?char((Cur>>4)+'A'-10):char((Cur>>4) + '0'))
-                << ((Cur&15) >=  10?char((Cur&15)+'A'-10):char((Cur&15) + '0'));
-    }
-    std::cout << "\n";
-  }
-}
-
-
-
 static void SetValue(Value *V, GenericValue Val, ExecutionContext &SF) {
   unsigned TyP = V->getType()->getUniqueID();   // TypePlane for value
 
@@ -138,7 +114,6 @@
   SF.Values[TyP][getOperandSlot(V)] = Val;
 }
 
-
 //===----------------------------------------------------------------------===//
 //                    Annotation Wrangling code
 //===----------------------------------------------------------------------===//
@@ -1049,11 +1024,6 @@
 }
 
 void Interpreter::run() {
-  if (ECStack.empty()) {
-    std::cout << "Error: no program running, cannot run!\n";
-    return;
-  }
-
   while (!ECStack.empty()) {
     // Run an instruction...
     executeInstruction();




From lattner at cs.uiuc.edu  Fri Sep  5 00:36:17 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 00:36:17 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp
Message-ID: <200309050528.AAA26739@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReadInst.cpp updated: 1.44 -> 1.45

---
Log message:

Whoa, we were misreading invoke instructions "normal" destinations quite badly.



---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReadInst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.44 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.45
--- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.44	Sat Aug 23 18:14:52 2003
+++ llvm/lib/Bytecode/Reader/ReadInst.cpp	Fri Sep  5 00:27:58 2003
@@ -302,7 +302,7 @@
       if (Raw.NumOperands < 3) return true;
 
       Normal = cast<BasicBlock>(getValue(Type::LabelTy, Raw.Arg2));
-      if (Raw.NumOperands ==  3)
+      if (Raw.NumOperands == 3)
         Except = cast<BasicBlock>(getValue(Type::LabelTy, Raw.Arg3));
       else {
         Except = cast<BasicBlock>(getValue(Type::LabelTy, args[0]));
@@ -318,7 +318,7 @@
     } else {
       if (args.size() < 4) return true;
 
-      Normal = cast<BasicBlock>(getValue(Type::LabelTy, args[0]));
+      Normal = cast<BasicBlock>(getValue(Type::LabelTy, args[1]));
       Except = cast<BasicBlock>(getValue(Type::LabelTy, args[2]));
 
       if ((args.size() & 1) != 0)




From gaeke at cs.uiuc.edu  Fri Sep  5 01:12:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 01:12:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.h
Message-ID: <200309050611.BAA02313@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.h updated: 1.10 -> 1.11

---
Log message:

Zap some more unused static method decls


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.10 llvm/tools/lli/ExecutionEngine.h:1.11
--- llvm/tools/lli/ExecutionEngine.h:1.10	Thu Sep  4 17:21:22 2003
+++ llvm/tools/lli/ExecutionEngine.h	Fri Sep  5 01:10:50 2003
@@ -51,15 +51,6 @@
   static ExecutionEngine *create (Module *M, bool ForceInterpreter,
 				  bool TraceMode);
 
-  /// createJIT - Create an return a new JIT compiler if there is one available
-  /// for the current target.  Otherwise it returns null.
-  ///
-  static ExecutionEngine *createJIT(Module *M);
-
-  /// createInterpreter - Create a new interpreter object.  This can never fail.
-  ///
-  static ExecutionEngine *createInterpreter(Module *M, bool TraceMode);
-
   void addGlobalMapping(const Function *F, void *Addr) {
     void *&CurVal = GlobalAddress[(const GlobalValue*)F];
     assert(CurVal == 0 && "GlobalMapping already established!");




From lattner at cs.uiuc.edu  Fri Sep  5 13:26:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 13:26:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp
Message-ID: <200309051825.NAA31300@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReadInst.cpp updated: 1.45 -> 1.46

---
Log message:

Fix reading of invoke instrs


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReadInst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.45 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.46
--- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.45	Fri Sep  5 00:27:58 2003
+++ llvm/lib/Bytecode/Reader/ReadInst.cpp	Fri Sep  5 13:25:29 2003
@@ -223,19 +223,19 @@
   }
 
   case Instruction::Call: {
-    Value *M = getValue(Raw.Ty, Raw.Arg1);
-    if (M == 0) return true;
+    Value *F = getValue(Raw.Ty, Raw.Arg1);
+    if (F == 0) return true;
 
     // Check to make sure we have a pointer to method type
-    const PointerType *PTy = dyn_cast<PointerType>(M->getType());
+    const PointerType *PTy = dyn_cast<PointerType>(F->getType());
     if (PTy == 0) return true;
-    const FunctionType *MTy = dyn_cast<FunctionType>(PTy->getElementType());
-    if (MTy == 0) return true;
+    const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType());
+    if (FTy == 0) return true;
 
     std::vector<Value *> Params;
-    const FunctionType::ParamTypes &PL = MTy->getParamTypes();
+    const FunctionType::ParamTypes &PL = FTy->getParamTypes();
 
-    if (!MTy->isVarArg()) {
+    if (!FTy->isVarArg()) {
       FunctionType::ParamTypes::const_iterator It = PL.begin();
 
       switch (Raw.NumOperands) {
@@ -252,8 +252,8 @@
 	  std::vector<unsigned> &args = *Raw.VarArgs;
 	  for (unsigned i = 0; i < args.size(); i++) {
 	    if (It == PL.end()) return true;
-	    // TODO: Check getValue for null!
 	    Params.push_back(getValue(*It++, args[i]));
+            if (Params.back() == 0) return true;
 	  }
 	}
 	delete Raw.VarArgs;
@@ -279,26 +279,26 @@
       }
     }
 
-    Res = new CallInst(M, Params);
+    Res = new CallInst(F, Params);
     return false;
   }
   case Instruction::Invoke: {
-    Value *M = getValue(Raw.Ty, Raw.Arg1);
-    if (M == 0) return true;
+    Value *F = getValue(Raw.Ty, Raw.Arg1);
+    if (F == 0) return true;
 
     // Check to make sure we have a pointer to method type
-    const PointerType *PTy = dyn_cast<PointerType>(M->getType());
+    const PointerType *PTy = dyn_cast<PointerType>(F->getType());
     if (PTy == 0) return true;
-    const FunctionType *MTy = dyn_cast<FunctionType>(PTy->getElementType());
-    if (MTy == 0) return true;
+    const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType());
+    if (FTy == 0) return true;
 
     std::vector<Value *> Params;
-    const FunctionType::ParamTypes &PL = MTy->getParamTypes();
+    const FunctionType::ParamTypes &PL = FTy->getParamTypes();
     std::vector<unsigned> &args = *Raw.VarArgs;
 
     BasicBlock *Normal, *Except;
 
-    if (!MTy->isVarArg()) {
+    if (!FTy->isVarArg()) {
       if (Raw.NumOperands < 3) return true;
 
       Normal = cast<BasicBlock>(getValue(Type::LabelTy, Raw.Arg2));
@@ -310,28 +310,29 @@
         FunctionType::ParamTypes::const_iterator It = PL.begin();
         for (unsigned i = 1; i < args.size(); i++) {
           if (It == PL.end()) return true;
-          // TODO: Check getValue for null!
           Params.push_back(getValue(*It++, args[i]));
+          if (Params.back() == 0) return true;
         }
         if (It != PL.end()) return true;
       }
     } else {
       if (args.size() < 4) return true;
-
+      if (getType(args[0]) != Type::LabelTy || 
+          getType(args[2]) != Type::LabelTy) return true;
       Normal = cast<BasicBlock>(getValue(Type::LabelTy, args[1]));
-      Except = cast<BasicBlock>(getValue(Type::LabelTy, args[2]));
+      Except = cast<BasicBlock>(getValue(Type::LabelTy, args[3]));
 
       if ((args.size() & 1) != 0)
 	return true;  // Must be pairs of type/value
       for (unsigned i = 4; i < args.size(); i+=2) {
-	// TODO: Check getValue for null!
-	Params.push_back(getValue(getType(args[i]), args[i+1]));
+        Params.push_back(getValue(getType(args[i]), args[i+1]));
+        if (Params.back() == 0) return true;
       }
     }
 
     if (Raw.NumOperands > 3)
       delete Raw.VarArgs;
-    Res = new InvokeInst(M, Normal, Except, Params);
+    Res = new InvokeInst(F, Normal, Except, Params);
     return false;
   }
   case Instruction::Malloc:




From gaeke at cs.uiuc.edu  Fri Sep  5 13:43:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 13:43:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp ExecutionEngine.h lli.cpp
Message-ID: <200309051842.NAA05478@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.26 -> 1.27
ExecutionEngine.h updated: 1.11 -> 1.12
lli.cpp updated: 1.25 -> 1.26

---
Log message:

Make CreateArgv part of lli rather than part of ExecutionEngine.
Switch Interpreter and JIT's "run" methods to take a Function and a vector of
 GenericValues.
Move (almost all of) the stuff that constructs a canonical call to main()
 into lli (new methods "callAsMain", "makeStringVector").
Nuke getCurrentExecutablePath(), enableTracing(), getCurrentFunction(),
 isStopped(), and many dead decls from interpreter.
Add linux strdup() support to interpreter.
Make interpreter's atexit handler runner and JIT's runAtExitHandlers() look
 more alike, in preparation for refactoring.
atexit() is spelled "atexit", not "at_exit".


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.26 llvm/tools/lli/ExecutionEngine.cpp:1.27
--- llvm/tools/lli/ExecutionEngine.cpp:1.26	Thu Sep  4 17:57:27 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Fri Sep  5 13:41:58 2003
@@ -316,45 +316,6 @@
   }
 }
 
-void *ExecutionEngine::CreateArgv(const std::vector<std::string> &InputArgv) {
-  if (getTargetData().getPointerSize() == 8) {   // 64 bit target?
-    PointerTy *Result = new PointerTy[InputArgv.size()+1];
-    DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
-
-    for (unsigned i = 0; i < InputArgv.size(); ++i) {
-      unsigned Size = InputArgv[i].size()+1;
-      char *Dest = new char[Size];
-      DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
-      
-      copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
-      Dest[Size-1] = 0;
-      
-      // Endian safe: Result[i] = (PointerTy)Dest;
-      StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i), Type::LongTy);
-    }
-    Result[InputArgv.size()] = 0;
-    return Result;
-
-  } else {                                      // 32 bit target?
-    int *Result = new int[InputArgv.size()+1];
-    DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
-
-    for (unsigned i = 0; i < InputArgv.size(); ++i) {
-      unsigned Size = InputArgv[i].size()+1;
-      char *Dest = new char[Size];
-      DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
-      
-      copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
-      Dest[Size-1] = 0;
-      
-      // Endian safe: Result[i] = (PointerTy)Dest;
-      StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i), Type::IntTy);
-    }
-    Result[InputArgv.size()] = 0;  // null terminate it
-    return Result;
-  }
-}
-
 /// EmitGlobals - Emit all of the global variables to memory, storing their
 /// addresses into GlobalAddress.  This must make sure to copy the contents of
 /// their initializers into the memory.


Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.11 llvm/tools/lli/ExecutionEngine.h:1.12
--- llvm/tools/lli/ExecutionEngine.h:1.11	Fri Sep  5 01:10:50 2003
+++ llvm/tools/lli/ExecutionEngine.h	Fri Sep  5 13:41:58 2003
@@ -44,9 +44,8 @@
   /// run - Start execution with the specified function, arguments, and
   ///       environment.
   ///
-  virtual int run(const std::string &FnName,
-                  const std::vector<std::string> &Args,
-                  const char ** envp) = 0;
+  virtual GenericValue run(Function *F,
+                           const std::vector<GenericValue> &ArgValues) = 0;
 
   static ExecutionEngine *create (Module *M, bool ForceInterpreter,
 				  bool TraceMode);
@@ -83,7 +82,6 @@
   GenericValue getConstantValue(const Constant *C);
   void StoreValueToMemory(GenericValue Val, GenericValue *Ptr, const Type *Ty);
   GenericValue LoadValueFromMemory(GenericValue *Ptr, const Type *Ty);
-  void *CreateArgv(const std::vector<std::string> &InputArgv);
   void InitializeMemory(const Constant *Init, void *Addr);
 };
 


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.25 llvm/tools/lli/lli.cpp:1.26
--- llvm/tools/lli/lli.cpp:1.25	Thu Sep  4 17:57:27 2003
+++ llvm/tools/lli/lli.cpp	Fri Sep  5 13:41:58 2003
@@ -10,10 +10,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExecutionEngine.h"
+#include "GenericValue.h"
 #include "Support/CommandLine.h"
+#include "Support/Debug.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetMachineImpls.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Target/TargetData.h"
 
 namespace {
   cl::opt<std::string>
@@ -33,10 +37,82 @@
 				 cl::init(false));
 }
 
+static std::vector<std::string> makeStringVector (const char **envp) {
+  std::vector<std::string> rv;
+  for (unsigned i = 0; envp[i]; ++i)
+    rv.push_back (envp[i]);
+  return rv;
+}
+
+static void *CreateArgv(ExecutionEngine *EE,
+			const std::vector<std::string> &InputArgv) {
+  if (EE->getTargetData().getPointerSize() == 8) {   // 64 bit target?
+    PointerTy *Result = new PointerTy[InputArgv.size()+1];
+    DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
+
+    for (unsigned i = 0; i < InputArgv.size(); ++i) {
+      unsigned Size = InputArgv[i].size()+1;
+      char *Dest = new char[Size];
+      DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
+      
+      std::copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
+      Dest[Size-1] = 0;
+      
+      // Endian safe: Result[i] = (PointerTy)Dest;
+      EE->StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i),
+			     Type::LongTy);
+    }
+    Result[InputArgv.size()] = 0;
+    return Result;
+  } else {                                      // 32 bit target?
+    int *Result = new int[InputArgv.size()+1];
+    DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
+
+    for (unsigned i = 0; i < InputArgv.size(); ++i) {
+      unsigned Size = InputArgv[i].size()+1;
+      char *Dest = new char[Size];
+      DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
+      
+      std::copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
+      Dest[Size-1] = 0;
+      
+      // Endian safe: Result[i] = (PointerTy)Dest;
+      EE->StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i),
+			     Type::IntTy);
+    }
+    Result[InputArgv.size()] = 0;  // null terminate it
+    return Result;
+  }
+}
+
+/// callAsMain - Call the function named FnName from M as if its
+/// signature were int main (int argc, char **argv, const char
+/// **envp), using the contents of Args to determine argc & argv, and
+/// the contents of EnvVars to determine envp.  Returns the result
+/// from calling FnName, or -1 and prints an error msg. if the named
+/// function cannot be found.
+///
+int callAsMain (ExecutionEngine *EE, Module *M, const std::string &FnName,
+                const std::vector<std::string> &Args,
+                const std::vector<std::string> &EnvVars) {
+  Function *Fn = M->getNamedFunction (FnName);
+  if (!Fn) {
+    std::cerr << "Function '" << FnName << "' not found in module.\n";
+    return -1;
+  }
+  std::vector<GenericValue> GVArgs;
+  GenericValue GVArgc;
+  GVArgc.IntVal = Args.size ();
+  GVArgs.push_back (GVArgc); // Arg #0 = argc.
+  GVArgs.push_back (PTOGV (CreateArgv (EE, Args))); // Arg #1 = argv.
+  GVArgs.push_back (PTOGV (CreateArgv (EE, EnvVars))); // Arg #2 = envp.
+  return EE->run (Fn, GVArgs).IntVal;
+}
+
 //===----------------------------------------------------------------------===//
 // main Driver function
 //
-int main(int argc, char** argv, const char ** envp) {
+int main(int argc, char **argv, const char **envp) {
   cl::ParseCommandLineOptions(argc, argv,
 			      " llvm interpreter & dynamic compiler\n");
 
@@ -64,7 +140,8 @@
   InputArgv.insert(InputArgv.begin(), InputFile);
 
   // Run the main function!
-  int ExitCode = EE->run(MainFunction, InputArgv, envp);
+  int ExitCode = callAsMain (EE, M, MainFunction, InputArgv,
+			     makeStringVector (envp)); 
 
   // Now that we are done executing the program, shut down the execution engine
   delete EE;




From gaeke at cs.uiuc.edu  Fri Sep  5 13:43:08 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 13:43:08 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/ExternalFunctions.cpp Interpreter.cpp Interpreter.h
Message-ID: <200309051842.NAA05490@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

ExternalFunctions.cpp updated: 1.57 -> 1.58
Interpreter.cpp updated: 1.11 -> 1.12
Interpreter.h updated: 1.38 -> 1.39

---
Log message:

Make CreateArgv part of lli rather than part of ExecutionEngine.
Switch Interpreter and JIT's "run" methods to take a Function and a vector of
 GenericValues.
Move (almost all of) the stuff that constructs a canonical call to main()
 into lli (new methods "callAsMain", "makeStringVector").
Nuke getCurrentExecutablePath(), enableTracing(), getCurrentFunction(),
 isStopped(), and many dead decls from interpreter.
Add linux strdup() support to interpreter.
Make interpreter's atexit handler runner and JIT's runAtExitHandlers() look
 more alike, in preparation for refactoring.
atexit() is spelled "atexit", not "at_exit".


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/ExternalFunctions.cpp
diff -u llvm/tools/lli/Interpreter/ExternalFunctions.cpp:1.57 llvm/tools/lli/Interpreter/ExternalFunctions.cpp:1.58
--- llvm/tools/lli/Interpreter/ExternalFunctions.cpp:1.57	Sun Aug 24 09:02:47 2003
+++ llvm/tools/lli/Interpreter/ExternalFunctions.cpp	Fri Sep  5 13:42:00 2003
@@ -29,22 +29,6 @@
 
 static Interpreter *TheInterpreter;
 
-// getCurrentExecutablePath() - Return the directory that the lli executable
-// lives in.
-//
-std::string Interpreter::getCurrentExecutablePath() const {
-  Dl_info Info;
-  if (dladdr(&TheInterpreter, &Info) == 0) return "";
-  
-  std::string LinkAddr(Info.dli_fname);
-  unsigned SlashPos = LinkAddr.rfind('/');
-  if (SlashPos != std::string::npos)
-    LinkAddr.resize(SlashPos);    // Trim the executable name off...
-
-  return LinkAddr;
-}
-
-
 static char getTypeID(const Type *Ty) {
   switch (Ty->getPrimitiveID()) {
   case Type::VoidTyID:    return 'V';
@@ -496,6 +480,12 @@
   GenericValue Ret;
   Ret.LongVal = strlen((char*)GVTOP(Args[0]));
   return Ret;
+}
+
+// char *strdup(const char *src);
+GenericValue lle_X_strdup(FunctionType *M, const vector<GenericValue> &Args) {
+  assert(Args.size() == 1);
+  return PTOGV(strdup((char*)GVTOP(Args[0])));
 }
 
 // char *__strdup(const char *src);


Index: llvm/tools/lli/Interpreter/Interpreter.cpp
diff -u llvm/tools/lli/Interpreter/Interpreter.cpp:1.11 llvm/tools/lli/Interpreter/Interpreter.cpp:1.12
--- llvm/tools/lli/Interpreter/Interpreter.cpp:1.11	Thu Sep  4 23:46:26 2003
+++ llvm/tools/lli/Interpreter/Interpreter.cpp	Fri Sep  5 13:42:00 2003
@@ -54,69 +54,46 @@
   emitGlobals();
 }
 
-/// run - Start execution with the specified function and arguments.
-///
-int Interpreter::run(const std::string &MainFunction,
-		     const std::vector<std::string> &Args,
-                     const char ** envp) {
-  // Start interpreter into the main function...
-  //
-  if (!callMainFunction(MainFunction, Args)) {
-    // If the call succeeded, run the code now...
+void Interpreter::runAtExitHandlers () {
+  while (!AtExitHandlers.empty()) {
+    callFunction(AtExitHandlers.back(), std::vector<GenericValue>());
+    AtExitHandlers.pop_back();
     run();
   }
-
-  do {
-    // If the program has exited, run atexit handlers...
-    if (ECStack.empty() && !AtExitHandlers.empty()) {
-      callFunction(AtExitHandlers.back(), std::vector<GenericValue>());
-      AtExitHandlers.pop_back();
-      run();
-    }
-  } while (!ECStack.empty());
-
-  return ExitCode;
 }
 
-
-// callMainFunction - Construct call to typical C main() function and
-// call it using callFunction().
-//
-bool Interpreter::callMainFunction(const std::string &Name,
-                                   const std::vector<std::string> &InputArgv) {
-  Function *M = getModule().getNamedFunction(Name);
-  if (M == 0) {
-    std::cerr << "Could not find function '" << Name << "' in module!\n";
-    return 1;
-  }
-  const FunctionType *MT = M->getFunctionType();
-
-  std::vector<GenericValue> Args;
-  if (MT->getParamTypes().size() >= 2) {
-    PointerType *SPP = PointerType::get(PointerType::get(Type::SByteTy));
-    if (MT->getParamTypes()[1] != SPP) {
-      CW << "Second argument of '" << Name << "' should have type: '"
-	 << SPP << "'!\n";
-      return true;
-    }
-    Args.push_back(PTOGV(CreateArgv(InputArgv)));
-  }
-
-  if (MT->getParamTypes().size() >= 1) {
-    if (!MT->getParamTypes()[0]->isInteger()) {
-      std::cout << "First argument of '" << Name
-		<< "' should be an integer!\n";
-      return true;
-    } else {
-      GenericValue GV; GV.UIntVal = InputArgv.size();
-      Args.insert(Args.begin(), GV);
-    }
+/// run - Start execution with the specified function and arguments.
+///
+GenericValue Interpreter::run(Function *F,
+			      const std::vector<GenericValue> &ArgValues) {
+  assert (F && "Function *F was null at entry to run()");
+
+  // Try extra hard not to pass extra args to a function that isn't
+  // expecting them.  C programmers frequently bend the rules and
+  // declare main() with fewer parameters than it actually gets
+  // passed, and the interpreter barfs if you pass a function more
+  // parameters than it is declared to take. This does not attempt to
+  // take into account gratuitous differences in declared types,
+  // though.
+  std::vector<GenericValue> ActualArgs;
+  const unsigned ArgCount = F->getFunctionType()->getParamTypes().size();
+  for (unsigned i = 0; i < ArgCount; ++i) {
+    ActualArgs.push_back (ArgValues[i]);
   }
-
-  callFunction(M, Args);  // Start executing it...
+  
+  // Set up the function call.
+  callFunction(F, ActualArgs);
 
   // Reset the current frame location to the top of stack
   CurFrame = ECStack.size()-1;
 
-  return false;
+  // Start executing the function.
+  run();
+  
+  // Run any atexit handlers now!
+  runAtExitHandlers();
+
+  GenericValue rv;
+  rv.IntVal = ExitCode;
+  return rv;
 }


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.38 llvm/tools/lli/Interpreter/Interpreter.h:1.39
--- llvm/tools/lli/Interpreter/Interpreter.h:1.38	Fri Sep  5 00:04:32 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Fri Sep  5 13:42:00 2003
@@ -79,41 +79,38 @@
   // function record.
   std::vector<ExecutionContext> ECStack;
 
-  // AtExitHandlers - List of functions to call when the program exits.
+  // AtExitHandlers - List of functions to call when the program exits,
+  // registered with the atexit() library function.
   std::vector<Function*> AtExitHandlers;
 public:
   Interpreter(Module *M, bool isLittleEndian, bool isLongPointer,
               bool TraceMode);
   inline ~Interpreter() { CW.setModule(0); }
 
+  /// runAtExitHandlers - Run any functions registered by the
+  /// program's calls to atexit(3), which we intercept and store in
+  /// AtExitHandlers.
+  ///
+  void runAtExitHandlers ();
+
   /// create - Create an interpreter ExecutionEngine. This can never fail.
   ///
   static ExecutionEngine *create(Module *M, bool TraceMode);
 
   /// run - Start execution with the specified function and arguments.
   ///
-  virtual int run(const std::string &FnName,
-		  const std::vector<std::string> &Args,
-                  const char ** envp);
- 
-
-  void enableTracing() { Trace = true; }
+  virtual GenericValue run(Function *F,
+			   const std::vector<GenericValue> &ArgValues);
 
-  void handleUserInput();
-
-  // User Interation Methods...
-  bool callFunction(const std::string &Name);      // return true on failure
+  // Methods used for debug printouts:
   static void print(const Type *Ty, GenericValue V);
   static void printValue(const Type *Ty, GenericValue V);
 
-  bool callMainFunction(const std::string &MainName,
-                        const std::vector<std::string> &InputFilename);
-
-  // Code execution methods...
+  // Methods used to execute code:
+  // Place a call on the stack
   void callFunction(Function *F, const std::vector<GenericValue> &ArgVals);
-  void executeInstruction(); // Execute one instruction...
-
-  void run();              // Do the 'run' command
+  void executeInstruction(); // Execute one instruction
+  void run();                // Execute instructions until nothing left to do
 
   // Opcode Implementations
   void visitReturnInst(ReturnInst &I);
@@ -142,16 +139,6 @@
                                     const std::vector<GenericValue> &ArgVals);
   void exitCalled(GenericValue GV);
 
-  // getCurrentFunction - Return the currently executing function
-  inline Function *getCurrentFunction() const {
-    return CurFrame < 0 ? 0 : ECStack[CurFrame].CurFunction;
-  }
-
-  // isStopped - Return true if a program is stopped.  Return false if no
-  // program is running.
-  //
-  inline bool isStopped() const { return !ECStack.empty(); }
-
   void addAtExitHandler(Function *F) {
     AtExitHandlers.push_back(F);
   }
@@ -169,16 +156,6 @@
   void SwitchToNewBasicBlock(BasicBlock *Dest, ExecutionContext &SF);
 
   void *getPointerToFunction(Function *F) { return (void*)F; }
-
-  // getCurrentExecutablePath() - Return the directory that the lli executable
-  // lives in.
-  //
-  std::string getCurrentExecutablePath() const;
-
-  // printCurrentInstruction - Print out the instruction that the virtual PC is
-  // at, or fail silently if no program is running.
-  //
-  void printCurrentInstruction();
 
   void initializeExecutionEngine();
   void initializeExternalFunctions();




From gaeke at cs.uiuc.edu  Fri Sep  5 13:43:13 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 13:43:13 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/JIT/Intercept.cpp JIT.cpp VM.h
Message-ID: <200309051842.NAA05502@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/JIT:

Intercept.cpp updated: 1.6 -> 1.7
JIT.cpp updated: 1.16 -> 1.17
VM.h updated: 1.11 -> 1.12

---
Log message:

Make CreateArgv part of lli rather than part of ExecutionEngine.
Switch Interpreter and JIT's "run" methods to take a Function and a vector of
 GenericValues.
Move (almost all of) the stuff that constructs a canonical call to main()
 into lli (new methods "callAsMain", "makeStringVector").
Nuke getCurrentExecutablePath(), enableTracing(), getCurrentFunction(),
 isStopped(), and many dead decls from interpreter.
Add linux strdup() support to interpreter.
Make interpreter's atexit handler runner and JIT's runAtExitHandlers() look
 more alike, in preparation for refactoring.
atexit() is spelled "atexit", not "at_exit".


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/Intercept.cpp
diff -u llvm/tools/lli/JIT/Intercept.cpp:1.6 llvm/tools/lli/JIT/Intercept.cpp:1.7
--- llvm/tools/lli/JIT/Intercept.cpp:1.6	Mon Jul 28 14:07:30 2003
+++ llvm/tools/lli/JIT/Intercept.cpp	Fri Sep  5 13:42:01 2003
@@ -12,33 +12,38 @@
 #include "Config/dlfcn.h"    // dlsym access
 #include <iostream>
 
-// AtExitList - List of functions registered with the at_exit function
-static std::vector<void (*)()> AtExitList;
+// AtExitHandlers - List of functions to call when the program exits,
+// registered with the atexit() library function.
+static std::vector<void (*)()> AtExitHandlers;
 
+/// runAtExitHandlers - Run any functions registered by the program's
+/// calls to atexit(3), which we intercept and store in
+/// AtExitHandlers.
+///
 void VM::runAtExitHandlers() {
-  while (!AtExitList.empty()) {
-    void (*Fn)() = AtExitList.back();
-    AtExitList.pop_back();
+  while (!AtExitHandlers.empty()) {
+    void (*Fn)() = AtExitHandlers.back();
+    AtExitHandlers.pop_back();
     Fn();
   }
 }
 
 //===----------------------------------------------------------------------===//
-// Function stubs that are invoked instead of raw system calls
+// Function stubs that are invoked instead of certain library calls
 //===----------------------------------------------------------------------===//
 
 // NoopFn - Used if we have nothing else to call...
 static void NoopFn() {}
 
-// jit_exit - Used to intercept the "exit" system call.
+// jit_exit - Used to intercept the "exit" library call.
 static void jit_exit(int Status) {
-  VM::runAtExitHandlers();   // Run at_exit handlers...
+  VM::runAtExitHandlers();   // Run atexit handlers...
   exit(Status);
 }
 
-// jit_atexit - Used to intercept the "at_exit" system call.
+// jit_atexit - Used to intercept the "atexit" library call.
 static int jit_atexit(void (*Fn)(void)) {
-  AtExitList.push_back(Fn);    // Take note of at_exit handler...
+  AtExitHandlers.push_back(Fn);    // Take note of atexit handler...
   return 0;  // Always successful
 }
 


Index: llvm/tools/lli/JIT/JIT.cpp
diff -u llvm/tools/lli/JIT/JIT.cpp:1.16 llvm/tools/lli/JIT/JIT.cpp:1.17
--- llvm/tools/lli/JIT/JIT.cpp:1.16	Wed Sep  3 15:34:19 2003
+++ llvm/tools/lli/JIT/JIT.cpp	Fri Sep  5 13:42:01 2003
@@ -6,6 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VM.h"
+#include "../GenericValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineImpls.h"
 #include "llvm/Module.h"
@@ -100,38 +101,24 @@
   emitGlobals();
 }
 
-/// VM::run - This method begins the execution of a program beginning at the
-/// specified function name.  The function is called with the specified
-/// arguments and array of environment variables (a la main()).
+/// run - Start execution with the specified function and arguments.
 ///
-/// Inputs:
-///	FnName - The name of the function as a C++ string.
-///	Args   - A vector of C++ strings containing the arguments.
-///	envp   - An array of C strings containing the environment.
-///
-/// Return value:
-///	1 - An error occurred.
-///	Otherwise, the return value from the specified function is returned.
-///
-int VM::run(const std::string &FnName, const std::vector<std::string> &Args,
-            const char **envp) {
-  Function *F = getModule().getNamedFunction(FnName);
-  if (F == 0) {
-    std::cerr << "Could not find function '" << FnName << "' in module!\n";
-    return 1;
-  }
-
-  int (*PF)(int, char**, const char**) =
-    (int(*)(int, char**, const char**))getPointerToFunction(F);
-  assert(PF != 0 && "Null pointer to function?");
-
-  // Build an argv vector...
-  char **Argv = (char**)CreateArgv(Args);
-
-  // Call the main function...
-  int Result = PF(Args.size(), Argv, envp);
+GenericValue VM::run(Function *F, const std::vector<GenericValue> &ArgValues)
+{
+  assert (F && "Function *F was null at entry to run()");
+
+  int (*PF)(int, char **, const char **) =
+    (int(*)(int, char **, const char **))getPointerToFunction(F);
+  assert(PF != 0 && "Pointer to fn's code was null after getPointerToFunction");
+
+  // Call the function.
+  int ExitCode = PF(ArgValues[0].IntVal, (char **) GVTOP (ArgValues[1]),
+		    (const char **) GVTOP (ArgValues[2]));
 
   // Run any atexit handlers now!
   runAtExitHandlers();
-  return Result;
+
+  GenericValue rv;
+  rv.IntVal = ExitCode;
+  return rv;
 }


Index: llvm/tools/lli/JIT/VM.h
diff -u llvm/tools/lli/JIT/VM.h:1.11 llvm/tools/lli/JIT/VM.h:1.12
--- llvm/tools/lli/JIT/VM.h:1.11	Wed Sep  3 15:34:19 2003
+++ llvm/tools/lli/JIT/VM.h	Fri Sep  5 13:42:01 2003
@@ -33,9 +33,8 @@
 
   /// run - Start execution with the specified function and arguments.
   ///
-  virtual int run(const std::string &FnName,
-                  const std::vector<std::string> &Args,
-                  const char ** envp);
+  virtual GenericValue run(Function *F,
+			   const std::vector<GenericValue> &ArgValues);
 
   /// getPointerToNamedFunction - This method returns the address of the
   /// specified function by using the dlsym function call.  As such it is only




From gaeke at cs.uiuc.edu  Fri Sep  5 13:56:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 13:56:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.h
Message-ID: <200309051855.NAA10466@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.h updated: 1.12 -> 1.13

---
Log message:

Make getOperandValue and executeCastOperation methods of Interpreter.
This lets us protect a few more ExecutionEngine methods.


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.12 llvm/tools/lli/ExecutionEngine.h:1.13
--- llvm/tools/lli/ExecutionEngine.h:1.12	Fri Sep  5 13:41:58 2003
+++ llvm/tools/lli/ExecutionEngine.h	Fri Sep  5 13:55:02 2003
@@ -75,14 +75,13 @@
   //
   virtual void *getPointerToFunction(Function *F) = 0;
 
+  void StoreValueToMemory(GenericValue Val, GenericValue *Ptr, const Type *Ty);
+  void InitializeMemory(const Constant *Init, void *Addr);
+
 protected:
   void emitGlobals();
-
-public:   // FIXME: protected:   // API shared among subclasses
   GenericValue getConstantValue(const Constant *C);
-  void StoreValueToMemory(GenericValue Val, GenericValue *Ptr, const Type *Ty);
   GenericValue LoadValueFromMemory(GenericValue *Ptr, const Type *Ty);
-  void InitializeMemory(const Constant *Init, void *Addr);
 };
 
 #endif




From gaeke at cs.uiuc.edu  Fri Sep  5 13:56:07 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 13:56:07 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Execution.cpp Interpreter.h
Message-ID: <200309051855.NAA10476@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Execution.cpp updated: 1.96 -> 1.97
Interpreter.h updated: 1.39 -> 1.40

---
Log message:

Make getOperandValue and executeCastOperation methods of Interpreter.
This lets us protect a few more ExecutionEngine methods.


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Execution.cpp
diff -u llvm/tools/lli/Interpreter/Execution.cpp:1.96 llvm/tools/lli/Interpreter/Execution.cpp:1.97
--- llvm/tools/lli/Interpreter/Execution.cpp:1.96	Fri Sep  5 00:22:08 2003
+++ llvm/tools/lli/Interpreter/Execution.cpp	Fri Sep  5 13:55:03 2003
@@ -77,7 +77,7 @@
 				   const Type *Ty);
 
 
-static GenericValue getOperandValue(Value *V, ExecutionContext &SF) {
+GenericValue Interpreter::getOperandValue(Value *V, ExecutionContext &SF) {
   if (ConstantExpr *CE = dyn_cast<ConstantExpr>(V)) {
     switch (CE->getOpcode()) {
     case Instruction::Cast:
@@ -840,8 +840,8 @@
    IMPLEMENT_CAST_CASE_FP_IMP(DESTTY, DESTCTY); \
    IMPLEMENT_CAST_CASE_END()
 
-static GenericValue executeCastOperation(Value *SrcVal, const Type *Ty,
-                                         ExecutionContext &SF) {
+GenericValue Interpreter::executeCastOperation(Value *SrcVal, const Type *Ty,
+					       ExecutionContext &SF) {
   const Type *SrcTy = SrcVal->getType();
   GenericValue Dest, Src = getOperandValue(SrcVal, SF);
 


Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.39 llvm/tools/lli/Interpreter/Interpreter.h:1.40
--- llvm/tools/lli/Interpreter/Interpreter.h:1.39	Fri Sep  5 13:42:00 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Fri Sep  5 13:55:03 2003
@@ -159,6 +159,9 @@
 
   void initializeExecutionEngine();
   void initializeExternalFunctions();
+  GenericValue getOperandValue(Value *V, ExecutionContext &SF);
+  GenericValue executeCastOperation(Value *SrcVal, const Type *Ty,
+				    ExecutionContext &SF);
 };
 
 #endif




From gaeke at cs.uiuc.edu  Fri Sep  5 14:24:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:24:02 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200309051923.OAA14836@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.44 -> 1.45

---
Log message:

-abort-on-exception is gone. Rebuild your gccld shell scripts, folks! :-)


---
Diffs of the changes:

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.44 llvm/tools/gccld/gccld.cpp:1.45
--- llvm/tools/gccld/gccld.cpp:1.44	Tue Sep  2 16:11:22 2003
+++ llvm/tools/gccld/gccld.cpp	Fri Sep  5 14:23:03 2003
@@ -437,7 +437,7 @@
     if (!Out2.good())
       return PrintAndReturn(argv[0], "error opening '" + OutputFilename +
                                      "' for writing!");
-    Out2 << "#!/bin/sh\nlli -q -abort-on-exception $0.bc $*\n";
+    Out2 << "#!/bin/sh\nlli -q $0.bc $*\n";
     Out2.close();
   
     // Make the script executable...




From gaeke at cs.uiuc.edu  Fri Sep  5 14:24:07 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:24:07 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs
Message-ID: <200309051923.OAA14871@niobe.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.89 -> 1.90

---
Log message:

-abort-on-exception is gone.


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.89 llvm/test/Programs/Makefile.programs:1.90
--- llvm/test/Programs/Makefile.programs:1.89	Fri Aug 22 19:30:50 2003
+++ llvm/test/Programs/Makefile.programs	Fri Sep  5 14:23:26 2003
@@ -280,7 +280,7 @@
 # of the JIT and LLI in order to get timing info and statistics.
 EXTRA_LLI_OPTS = 
 
-LLI_OPTS = -q -abort-on-exception -force-interpreter=true $(EXTRA_LLI_OPTS)
+LLI_OPTS = -q -force-interpreter=true $(EXTRA_LLI_OPTS)
 JIT_OPTS = -force-interpreter=false $(EXTRA_LLI_OPTS)
 
 ifndef PROGRAMS_HAVE_CUSTOM_RUN_RULES




From gaeke at cs.uiuc.edu  Fri Sep  5 14:40:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:40:02 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/JIT.cpp VM.h
Message-ID: <200309051939.OAA20500@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/JIT:

JIT.cpp updated: 1.17 -> 1.18
VM.h updated: 1.12 -> 1.13

---
Log message:

ExecutionEngine.h, GenericValue.h --> include/llvm/ExecutionEngine/
Build ExecutionEngine as library.


---
Diffs of the changes:

Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.17 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.18
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.17	Fri Sep  5 13:42:01 2003
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Fri Sep  5 14:39:22 2003
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VM.h"
-#include "../GenericValue.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineImpls.h"
 #include "llvm/Module.h"


Index: llvm/lib/ExecutionEngine/JIT/VM.h
diff -u llvm/lib/ExecutionEngine/JIT/VM.h:1.12 llvm/lib/ExecutionEngine/JIT/VM.h:1.13
--- llvm/lib/ExecutionEngine/JIT/VM.h:1.12	Fri Sep  5 13:42:01 2003
+++ llvm/lib/ExecutionEngine/JIT/VM.h	Fri Sep  5 14:39:22 2003
@@ -7,7 +7,7 @@
 #ifndef VM_H
 #define VM_H
 
-#include "../ExecutionEngine.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/PassManager.h"
 #include <map>
 




From gaeke at cs.uiuc.edu  Fri Sep  5 14:40:08 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:40:08 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp Makefile
Message-ID: <200309051939.OAA20486@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.27 -> 1.28
Makefile updated: 1.39 -> 1.40

---
Log message:

ExecutionEngine.h, GenericValue.h --> include/llvm/ExecutionEngine/
Build ExecutionEngine as library.


---
Diffs of the changes:

Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.27 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.28
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.27	Fri Sep  5 13:41:58 2003
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Fri Sep  5 14:39:22 2003
@@ -6,14 +6,14 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "jit"
-#include "ExecutionEngine.h"
-#include "GenericValue.h"
+#include "Support/Debug.h"
+#include "Support/Statistic.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
 #include "Config/dlfcn.h"
 #include "JIT/VM.h"
 #include "Interpreter/Interpreter.h"


Index: llvm/lib/ExecutionEngine/Makefile
diff -u llvm/lib/ExecutionEngine/Makefile:1.39 llvm/lib/ExecutionEngine/Makefile:1.40
--- llvm/lib/ExecutionEngine/Makefile:1.39	Mon Sep  1 15:30:17 2003
+++ llvm/lib/ExecutionEngine/Makefile	Fri Sep  5 14:39:22 2003
@@ -1,5 +1,5 @@
 LEVEL = ../..
-TOOLNAME = lli
+LIBRARYNAME = executionengine
 PARALLEL_DIRS = Interpreter JIT
 
 # Get the $(ARCH) setting




From gaeke at cs.uiuc.edu  Fri Sep  5 14:40:13 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:40:13 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
Message-ID: <200309051939.OAA20489@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Interpreter.h updated: 1.40 -> 1.41

---
Log message:

ExecutionEngine.h, GenericValue.h --> include/llvm/ExecutionEngine/
Build ExecutionEngine as library.


---
Diffs of the changes:

Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.40 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.41
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.40	Fri Sep  5 13:55:03 2003
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Fri Sep  5 14:39:22 2003
@@ -7,8 +7,8 @@
 #ifndef LLI_INTERPRETER_H
 #define LLI_INTERPRETER_H
 
-#include "../ExecutionEngine.h"
-#include "../GenericValue.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "Support/DataTypes.h"
 #include "llvm/Assembly/CachedWriter.h"
 #include "llvm/Target/TargetData.h"




From gaeke at cs.uiuc.edu  Fri Sep  5 14:40:19 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:40:19 2003
Subject: [llvm-commits] CVS: llvm/lib/Makefile
Message-ID: <200309051939.OAA20546@niobe.cs.uiuc.edu>


Changes in directory llvm/lib:

Makefile updated: 1.13 -> 1.14

---
Log message:

Add ExecutionEngine directory.


---
Diffs of the changes:

Index: llvm/lib/Makefile
diff -u llvm/lib/Makefile:1.13 llvm/lib/Makefile:1.14
--- llvm/lib/Makefile:1.13	Thu Aug 21 15:32:04 2003
+++ llvm/lib/Makefile	Fri Sep  5 14:39:49 2003
@@ -1,6 +1,6 @@
 LEVEL = ..
 
-PARALLEL_DIRS = VMCore Analysis Transforms AsmParser Bytecode Support CodeGen Target CWriter
+PARALLEL_DIRS = VMCore Analysis Transforms AsmParser Bytecode Support CodeGen Target CWriter ExecutionEngine
 
 include $(LEVEL)/Makefile.common
 




From gaeke at cs.uiuc.edu  Fri Sep  5 14:43:02 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:43:02 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile lli.cpp
Message-ID: <200309051942.OAA21457@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.39 -> 1.40
lli.cpp updated: 1.26 -> 1.27

---
Log message:

Interpreter, JIT moved to lib/ExecutionEngine (includes -> llvm/ExecutionEngine)
Build lli using executionengine library


---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.39 llvm/tools/lli/Makefile:1.40
--- llvm/tools/lli/Makefile:1.39	Mon Sep  1 15:30:17 2003
+++ llvm/tools/lli/Makefile	Fri Sep  5 14:42:34 2003
@@ -1,12 +1,11 @@
 LEVEL = ../..
 TOOLNAME = lli
-PARALLEL_DIRS = Interpreter JIT
 
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
-JITLIBS   = lli-jit codegen
+JITLIBS   = lli-jit codegen executionengine
 ARCHLIBS  =
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.26 llvm/tools/lli/lli.cpp:1.27
--- llvm/tools/lli/lli.cpp:1.26	Fri Sep  5 13:41:58 2003
+++ llvm/tools/lli/lli.cpp	Fri Sep  5 14:42:34 2003
@@ -9,10 +9,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExecutionEngine.h"
-#include "GenericValue.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetMachineImpls.h"




From gaeke at cs.uiuc.edu  Fri Sep  5 14:44:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:44:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp InstLoops.cpp
Message-ID: <200309051943.OAA21523@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Instrumentation/ProfilePaths:

CombineBranch.cpp updated: 1.1 -> 1.2
InstLoops.cpp updated: 1.6 -> 1.7

---
Log message:

Correct comments
Don't include InstLoops.h
Don't export factory functions for these passes


---
Diffs of the changes:

Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.1 llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.2
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.1	Fri Jul 18 11:08:32 2003
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp	Fri Sep  5 14:43:19 2003
@@ -1,10 +1,9 @@
-//===-- InstLoops.cpp ---------------------------------------- ---*- C++ -*--=//
+//===-- CombineBranch.cpp ------------------------------------ ---*- C++ -*--=//
 // Pass to instrument loops
 //
 // At every backedge, insert a counter for that backedge and a call function
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Reoptimizer/InstLoops.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Constants.h"
@@ -45,13 +44,6 @@
   
   RegisterOpt<CombineBranches> X("branch-combine", "Multiple backedges going to same target are merged");
 }
-
-// Create a new pass to merge branches
-//
-Pass *createCombineBranchesPass() {
-  return new CombineBranches();
-}
-
 
 //helper function to get back edges: it is called by 
 //the "getBackEdges" function below


Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.6 llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.7
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.6	Sat Aug 30 19:21:59 2003
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp	Fri Sep  5 14:43:19 2003
@@ -4,7 +4,6 @@
 // At every backedge, insert a counter for that backedge and a call function
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Reoptimizer/InstLoops.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Constants.h"
@@ -48,13 +47,6 @@
   
   RegisterOpt<InstLoops> X("instloops", "Instrument backedges for profiling");
 }
-
-// createInstLoopsPass - Create a new pass to add path profiling
-//
-Pass *createInstLoopsPass() {
-  return new InstLoops();
-}
-
 
 //helper function to get back edges: it is called by 
 //the "getBackEdges" function below




From gaeke at cs.uiuc.edu  Fri Sep  5 14:44:07 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Sep  5 14:44:07 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Reoptimizer/InstLoops.h
Message-ID: <200309051943.OAA21570@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Reoptimizer:

InstLoops.h (r1.1) removed

---
Log message:

No longer used


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Fri Sep  5 15:09:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 15:09:04 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
Message-ID: <200309052008.PAA12315@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.28 -> 1.29

---
Log message:

Reorder #includes to follow LLVM conventions


---
Diffs of the changes:

Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.28 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.29
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.28	Fri Sep  5 14:39:22 2003
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Fri Sep  5 15:08:07 2003
@@ -6,17 +6,17 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "jit"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/GenericValue.h"
+#include "JIT/VM.h"
+#include "Interpreter/Interpreter.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/Module.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetData.h"
+#include "Support/Debug.h"
+#include "Support/Statistic.h"
 #include "Config/dlfcn.h"
-#include "JIT/VM.h"
-#include "Interpreter/Interpreter.h"
 
 Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
 




From lattner at cs.uiuc.edu  Fri Sep  5 15:09:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 15:09:11 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
Message-ID: <200309052008.PAA12323@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Interpreter.h updated: 1.41 -> 1.42

---
Log message:

Reorder #includes to follow LLVM conventions



---
Diffs of the changes:

Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.41 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.42
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.41	Fri Sep  5 14:39:22 2003
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Fri Sep  5 15:08:10 2003
@@ -7,13 +7,13 @@
 #ifndef LLI_INTERPRETER_H
 #define LLI_INTERPRETER_H
 
+#include "llvm/BasicBlock.h"
+#include "llvm/Assembly/CachedWriter.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
-#include "Support/DataTypes.h"
-#include "llvm/Assembly/CachedWriter.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Support/InstVisitor.h"
+#include "llvm/Target/TargetData.h"
+#include "Support/DataTypes.h"
 
 extern CachedWriter CW;     // Object to accelerate printing of LLVM
 




From lattner at cs.uiuc.edu  Fri Sep  5 15:09:17 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep  5 15:09:17 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/lli.cpp
Message-ID: <200309052008.PAA12330@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

lli.cpp updated: 1.27 -> 1.28

---
Log message:

Reorder #includes to follow LLVM conventions


---
Diffs of the changes:

Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.27 llvm/tools/lli/lli.cpp:1.28
--- llvm/tools/lli/lli.cpp:1.27	Fri Sep  5 14:42:34 2003
+++ llvm/tools/lli/lli.cpp	Fri Sep  5 15:08:15 2003
@@ -9,15 +9,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Module.h"
+#include "llvm/Bytecode/Reader.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Module.h"
 #include "llvm/Target/TargetMachineImpls.h"
-#include "llvm/DerivedTypes.h"
 #include "llvm/Target/TargetData.h"
+#include "Support/CommandLine.h"
+#include "Support/Debug.h"
 
 namespace {
   cl::opt<std::string>




From brukman at cs.uiuc.edu  Fri Sep  5 18:00:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Sep  5 18:00:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
Message-ID: <200309052259.RAA04378@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9CodeEmitter.cpp updated: 1.31 -> 1.32

---
Log message:

Added some optimizations:
* Generate a single BA instead of 6-instruction JUMP if possible
  (this occurs both in the creation and overwriting of the stub code)
* If possible, rewrite the ORIGINAL call to call the generated function
  directly, thus bypassing the stub entirely

Also added some statistics on how often calls are overwritten and how often the
CompilationCallback is invoked.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.31 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.32
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.31	Thu Aug 28 23:22:54 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Fri Sep  5 17:59:31 2003
@@ -17,10 +17,17 @@
 #include "llvm/Target/TargetData.h"
 #include "Support/Debug.h"
 #include "Support/hash_set"
+#include "Support/Statistic.h"
 #include "SparcInternals.h"
 #include "SparcV9CodeEmitter.h"
 #include "Config/alloca.h"
 
+namespace {
+  Statistic<> OverwrittenCalls("call-ovwr", "Number of over-written calls");
+  Statistic<> UnmodifiedCalls("call-skip", "Number of unmodified calls");
+  Statistic<> CallbackCalls("callback", "Number CompilationCallback() calls");
+}
+
 bool UltraSparc::addPassesToEmitMachineCode(FunctionPassManager &PM,
                                             MachineCodeEmitter &MCE) {
   MachineCodeEmitter *M = &MCE;
@@ -76,8 +83,10 @@
 
   private:
     uint64_t emitStubForFunction(Function *F);
-    static void SaveRegisters(uint64_t DoubleFP[]);
-    static void RestoreRegisters(uint64_t DoubleFP[]);
+    static void SaveRegisters(uint64_t DoubleFP[], uint64_t &FSR,
+                              uint64_t &FPRS, uint64_t &CCR);
+    static void RestoreRegisters(uint64_t DoubleFP[], uint64_t &FSR,
+                                 uint64_t &FPRS, uint64_t &CCR);
     static void CompilationCallback();
     uint64_t resolveFunctionReference(uint64_t RetAddr);
 
@@ -164,7 +173,8 @@
   return Addr;
 }
 
-void JITResolver::SaveRegisters(uint64_t DoubleFP[]) {
+void JITResolver::SaveRegisters(uint64_t DoubleFP[], uint64_t &FSR, 
+                                uint64_t &FPRS, uint64_t &CCR) {
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
 
 #if 0
@@ -215,7 +225,9 @@
 }
 
 
-void JITResolver::RestoreRegisters(uint64_t DoubleFP[]) {
+void JITResolver::RestoreRegisters(uint64_t DoubleFP[], uint64_t &FSR, 
+                                   uint64_t &FPRS, uint64_t &CCR)
+{
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
 
 #if 0
@@ -268,11 +280,13 @@
 void JITResolver::CompilationCallback() {
   // Local space to save double registers
   uint64_t DoubleFP[32];
-  //uint64_t CCR, FSR, FPRS;
+  uint64_t FSR, FPRS, CCR;
 
-  SaveRegisters(DoubleFP);
+  SaveRegisters(DoubleFP, FSR, FPRS, CCR);
+  ++CallbackCalls;
 
   uint64_t CameFrom = (uint64_t)(intptr_t)__builtin_return_address(0);
+  uint64_t CameFrom1 = (uint64_t)(intptr_t)__builtin_return_address(1);
   int64_t Target = (int64_t)TheJITResolver->resolveFunctionReference(CameFrom);
   DEBUG(std::cerr << "In callback! Addr=0x" << std::hex << CameFrom << "\n");
   register int64_t returnAddr = 0;
@@ -283,6 +297,23 @@
                   << std::hex << *(unsigned*)returnAddr << "\n");
 #endif
 
+  // If we can rewrite the ORIGINAL caller, we eliminate the whole need for a
+  // trampoline function stub!!
+  unsigned OrigCallInst = *((unsigned*)(intptr_t)CameFrom1);
+  int64_t OrigTarget = (Target-CameFrom1) >> 2;
+  if ((OrigCallInst & (1 << 30)) && 
+      (OrigTarget <= (1 << 30) && OrigTarget >= -(1 << 30)))
+  {
+    // The original call instruction was CALL <immed>, which means we can
+    // overwrite it directly, since the offset will fit into 30 bits
+    MachineInstr *C = BuildMI(V9::CALL, 1).addSImm(OrigTarget);
+    *((unsigned*)(intptr_t)CameFrom1)=TheJITResolver->getBinaryCodeForInstr(*C);
+    delete C;
+    ++OverwrittenCalls;
+  } else {
+    ++UnmodifiedCalls;
+  }
+
   // Rewrite the call target so that we don't fault every time we execute it.
   //
 
@@ -296,13 +327,13 @@
 
   // FIXME FIXME FIXME FIXME: __builtin_frame_address doesn't work if frame
   // pointer elimination has been performed.  Having a variable sized alloca
-  // disables frame pointer elimination currently, even if it's dead.  This is a
-  // gross hack.
+  // disables frame pointer elimination currently, even if it's dead.  This is
+  // a gross hack.
   alloca(42+Offset);
   // FIXME FIXME FIXME FIXME
   
   // Make sure that what we're about to overwrite is indeed "save"
-  MachineInstr *SV = BuildMI(V9::SAVEi, 3).addReg(o6).addSImm(-192).addReg(o6);
+  MachineInstr *SV =BuildMI(V9::SAVEi, 3).addReg(o6).addSImm(-192).addReg(o6);
   unsigned SaveInst = TheJITResolver->getBinaryCodeForInstr(*SV);
   delete SV;
   unsigned CodeInMem = *(unsigned*)(intptr_t)CodeBegin;
@@ -310,32 +341,35 @@
     std::cerr << "About to overwrite smthg not a save instr!";
     abort();
   }
-  DEBUG(std::cerr << "Emitting a far jump to 0x" << std::hex << Target << "\n");
-  TheJITResolver->insertFarJumpAtAddr(Target, CodeBegin);
+  DEBUG(std::cerr << "Emitting a jump to 0x" << std::hex << Target << "\n");
 
-  // FIXME: if the target function is close enough to fit into the 19bit disp of
+  // If the target function is close enough to fit into the 19bit disp of
   // BA, we should use this version, as its much cheaper to generate.
-#if 0  
-  uint64_t InstAddr = CodeBegin;
-  // ba <target>
-  MachineInstr *MI = BuildMI(V9::BA, 1).addSImm(Target);
-  *((unsigned*)(intptr_t)InstAddr)=TheJITResolver->getBinaryCodeForInstr(*MI);
-  InstAddr += 4;
-  delete MI;
-
-  // nop
-  MI = BuildMI(V9::NOP, 0);
-  *((unsigned*)(intptr_t))=TheJITResolver->getBinaryCodeForInstr(*Nop);
-  delete MI;
-#endif
+  int64_t BranchTarget = (Target-CodeBegin) >> 2;
+  if (BranchTarget >= (1 << 19) || BranchTarget <= -(1 << 19)) {
+    TheJITResolver->insertFarJumpAtAddr(Target, CodeBegin);
+  } else {
+    // ba <target>
+    MachineInstr *I = BuildMI(V9::BA, 1).addSImm(BranchTarget);
+    *((unsigned*)(intptr_t)CodeBegin) = 
+      TheJITResolver->getBinaryCodeForInstr(*I);
+    CodeBegin += 4;
+    delete I;
+
+    // nop
+    I = BuildMI(V9::NOP, 0);
+    *((unsigned*)(intptr_t)CodeBegin) = 
+      TheJITResolver->getBinaryCodeForInstr(*I);
+    delete I;
+  }
 
-  RestoreRegisters(DoubleFP);
+  RestoreRegisters(DoubleFP, FSR, FPRS, CCR);
 
-  // Change the return address to reexecute the restore, then the jump However,
+  // Change the return address to reexecute the restore, then the jump. However,
   // we can't just modify %i7 here, because we return to the function that will
   // restore the floating-point registers for us. Thus, we just return the value
   // we want it to be, and the parent will take care of setting %i7 correctly.
-  DEBUG(std::cerr << "Callback returning the addr of restore inst: "
+  DEBUG(std::cerr << "Callback returning to: 0x"
                   << std::hex << (CameFrom-Offset-12) << "\n");
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
   __asm__ __volatile__ ("sub %%i7, %0, %%i7" : : "r" (Offset+12));
@@ -370,13 +404,12 @@
   int64_t CurrPC = MCE.getCurrentPCValue();
   int64_t Addr = (int64_t)addFunctionReference(CurrPC, F);
   int64_t CallTarget = (Addr-CurrPC) >> 2;
-  //if (CallTarget >= (1 << 29) || CallTarget <= -(1 << 29)) {
-  // Since this is a far call, the actual address of the call is shifted
-  // by the number of instructions it takes to calculate the exact address
+  if (CallTarget >= (1 << 29) || CallTarget <= -(1 << 29)) {
+    // Since this is a far call, the actual address of the call is shifted
+    // by the number of instructions it takes to calculate the exact address
     deleteFunctionReference(CurrPC);
     SparcV9.emitFarCall(Addr, F);
-#if 0
-  else {
+  } else {
     // call CallTarget              ;; invoke the callback
     MachineInstr *Call = BuildMI(V9::CALL, 1).addSImm(CallTarget);
     SparcV9.emitWord(SparcV9.getBinaryCodeForInstr(*Call));
@@ -389,7 +422,6 @@
 
     addCallFlavor(CurrPC, ShortCall);
   }
-#endif
 
   SparcV9.emitWord(0xDEADBEEF); // marker so that we know it's really a stub
   return (intptr_t)MCE.finishFunctionStub(*F)+4; /* 1 instr past the restore */




From criswell at cs.uiuc.edu  Sat Sep  6 09:47:00 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 09:47:00 2003
Subject: [llvm-commits] CVS: llvm/autoconf/aclocal.m4 configure.ac
Message-ID: <200309061446.JAA13237@choi.cs.uiuc.edu>


Changes in directory llvm/autoconf:

aclocal.m4 updated: 1.3 -> 1.4
configure.ac updated: 1.6 -> 1.7

---
Log message:

Checkin of autoconf-style object root.
Added the AC_CONFIG_MAKEFILE macro to configure akefiles which don't need .in
templates.
Removed the --with-objroot option.
Added commands to configure.ac to configure all of the LLVM Makefiles.  Oof.


---
Diffs of the changes:

Index: llvm/autoconf/aclocal.m4
diff -u llvm/autoconf/aclocal.m4:1.3 llvm/autoconf/aclocal.m4:1.4
--- llvm/autoconf/aclocal.m4:1.3	Tue Jul 29 14:11:50 2003
+++ llvm/autoconf/aclocal.m4	Sat Sep  6 09:46:19 2003
@@ -6156,3 +6156,14 @@
 fi
 ])
 
+#
+# Configure a Makefile without clobbering it if it exists and is not out of
+# date.  This is modified from:
+# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+#[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1)
+#
+AC_DEFUN([AC_CONFIG_MAKEFILE],
+[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`)
+])
+
+


Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.6 llvm/autoconf/configure.ac:1.7
--- llvm/autoconf/configure.ac:1.6	Mon Aug 25 11:49:54 2003
+++ llvm/autoconf/configure.ac	Sat Sep  6 09:46:19 2003
@@ -22,6 +22,179 @@
 
 dnl Configure a header file
 AC_CONFIG_HEADERS(include/Config/config.h)
+AC_CONFIG_MAKEFILE(Makefile)
+AC_CONFIG_MAKEFILE(Makefile.common)
+AC_CONFIG_MAKEFILE(Makefile.rules)
+AC_CONFIG_MAKEFILE(lib/Makefile)
+AC_CONFIG_MAKEFILE(lib/Analysis/Makefile)
+AC_CONFIG_MAKEFILE(lib/Analysis/DataStructure/Makefile)
+AC_CONFIG_MAKEFILE(lib/Analysis/IPA/Makefile)
+AC_CONFIG_MAKEFILE(lib/Analysis/LiveVar/Makefile)
+AC_CONFIG_MAKEFILE(lib/AsmParser/Makefile)
+AC_CONFIG_MAKEFILE(lib/Bytecode/Makefile)
+AC_CONFIG_MAKEFILE(lib/Bytecode/Reader/Makefile)
+AC_CONFIG_MAKEFILE(lib/Bytecode/Writer/Makefile)
+AC_CONFIG_MAKEFILE(lib/CWriter/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSched/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSelection/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/ModuloScheduling/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/PostOpts/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/PreOpts/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/RegAlloc/Makefile)
+AC_CONFIG_MAKEFILE(lib/CodeGen/SelectionDAG/Makefile)
+AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Makefile)
+AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Interpreter/Makefile)
+AC_CONFIG_MAKEFILE(lib/ExecutionEngine/JIT/Makefile)
+AC_CONFIG_MAKEFILE(lib/Support/Makefile)
+AC_CONFIG_MAKEFILE(lib/Target/Makefile)
+AC_CONFIG_MAKEFILE(lib/Target/Sparc/Makefile)
+AC_CONFIG_MAKEFILE(lib/Target/X86/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Hello/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/IPO/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/ProfilePaths/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Scalar/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transforms/Utils/Makefile)
+AC_CONFIG_MAKEFILE(lib/VMCore/Makefile)
+AC_CONFIG_MAKEFILE(runtime/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/crtend/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libc/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libg/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libgcc/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libm/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libmalloc/Makefile)
+AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libucb/Makefile)
+AC_CONFIG_MAKEFILE(runtime/libdummy/Makefile)
+AC_CONFIG_MAKEFILE(runtime/libtrace/Makefile)
+AC_CONFIG_MAKEFILE(test/Makefile)
+AC_CONFIG_MAKEFILE(test/Makefile.tests)
+AC_CONFIG_MAKEFILE(test/Programs/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/Makefile.programs)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.report)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.report)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.report)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.example.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.buildrepo.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.report)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.report)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.typesafe.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.gnuplot)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/179.art/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/183.equake/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/188.ammp/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/164.gzip/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/175.vpr/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/176.gcc/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/181.mcf/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/186.crafty/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/197.parser/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/254.gap/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/255.vortex/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/300.twolf/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/LLVMSource/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Burg/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Fhourstones/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/01-qbsort/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/03-testtrie/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/04-bisect/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/05-eks/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/08-main/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/09-vor/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/12-IOtest/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/15-trie/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/17-bintr/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/18-imp/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bh/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bisort/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/em3d/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/health/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/mst/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/perimeter/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/power/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/treeadd/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/tsp/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/voronoi/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/OptimizerEval/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/anagram/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/bc/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ft/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ks/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/yacr2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/aha/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/llubenchmark/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sgefa/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sim/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/Moria-5.5.2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/Povray31/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/CustomChecked/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Shootout/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Stanford/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/Makefile)
+AC_CONFIG_MAKEFILE(tools/Makefile)
+AC_CONFIG_MAKEFILE(tools/analyze/Makefile)
+AC_CONFIG_MAKEFILE(tools/as/Makefile)
+AC_CONFIG_MAKEFILE(tools/bugpoint/Makefile)
+AC_CONFIG_MAKEFILE(tools/dis/Makefile)
+AC_CONFIG_MAKEFILE(tools/extract/Makefile)
+AC_CONFIG_MAKEFILE(tools/gccas/Makefile)
+AC_CONFIG_MAKEFILE(tools/gccld/Makefile)
+AC_CONFIG_MAKEFILE(tools/link/Makefile)
+AC_CONFIG_MAKEFILE(tools/llc/Makefile)
+AC_CONFIG_MAKEFILE(tools/lli/Makefile)
+AC_CONFIG_MAKEFILE(tools/opt/Makefile)
+AC_CONFIG_MAKEFILE(tools/llee/Makefile)
+AC_CONFIG_MAKEFILE(tools/llvm-as/Makefile)
+AC_CONFIG_MAKEFILE(tools/llvm-dis/Makefile)
+AC_CONFIG_MAKEFILE(utils/Makefile)
+AC_CONFIG_MAKEFILE(utils/Burg/Makefile)
+AC_CONFIG_MAKEFILE(utils/Burg/Doc/Makefile)
+AC_CONFIG_MAKEFILE(utils/TableGen/Makefile)
+AC_CONFIG_MAKEFILE(www/docs/Makefile)
+AC_CONFIG_MAKEFILE(projects/Makefile)
+AC_CONFIG_MAKEFILE(projects/sample/Makefile)
+AC_CONFIG_MAKEFILE(projects/sample/Makefile.common)
+AC_CONFIG_MAKEFILE(projects/sample/Makefile.config)
+AC_CONFIG_MAKEFILE(projects/sample/lib/Makefile)
+AC_CONFIG_MAKEFILE(projects/sample/lib/sample/Makefile)
+AC_CONFIG_MAKEFILE(projects/sample/tools/Makefile)
+AC_CONFIG_MAKEFILE(projects/sample/tools/sample/Makefile)
+AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile)
+AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile.common)
+AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/Makefile)
+AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/ModuleMaker/Makefile)
 
 dnl **************************************************************************
 dnl * Determine which system we are building on
@@ -337,21 +510,6 @@
 
 dnl Location of the purify program
 AC_ARG_WITH(purify,AC_HELP_STRING([--with-purify],[Location of purify program]),AC_SUBST(PURIFY,[$withval]))
-
-dnl Location for placing object files and built programs, libraries, etc
-if test ${USER}
-then
-	if test -d /localhome/${USER}
-	then
-		AC_SUBST(OBJROOT,[/localhome/${USER}])
-	else
-		AC_SUBST(OBJROOT,[.])
-	fi
-else
-	AC_SUBST(OBJROOT,[.])
-fi
-
-AC_ARG_WITH(objroot,AC_HELP_STRING([--with-objroot],[Location where object files should be placed (default is .)]),AC_SUBST(OBJROOT,[$withval]))
 
 dnl **************************************************************************
 dnl * Configure other software packages (via AC_CONFIG_SUBDIRS)




From criswell at cs.uiuc.edu  Sat Sep  6 09:47:06 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 09:47:06 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common Makefile.rules Makefile.config.in
Message-ID: <200309061446.JAA13228@choi.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.131 -> 1.132
Makefile.rules updated: 1.131 -> 1.132
Makefile.config.in updated: 1.10 -> 1.11

---
Log message:

Checkin of autoconf-style object root.
Moved Makefile.common to Makefile.rules.  This makes project Makefiles easier
to support, and allows for easier overriding of default configuration values
that used to be in Makefile.common.
Modified Makefile.config.in to determine paths for directories (like
LLVM_SRC_ROOT) and to use the pwd binary as opposed to the shell builtin (this
works better for symbolic links).


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.131 llvm/Makefile.common:1.132
--- llvm/Makefile.common:1.131	Fri Aug 29 09:07:02 2003
+++ llvm/Makefile.common	Sat Sep  6 09:44:17 2003
@@ -50,801 +50,10 @@
 #
 # Configuration file to set paths specific to local installation of LLVM
 # 
-ifdef LLVM_SRC_ROOT
-include $(LLVM_SRC_ROOT)/Makefile.config
-else
 include $(LEVEL)/Makefile.config
-endif
 
-###########################################################################
-# Directory Configuration
-#	This section of the Makefile determines what is where.  To be
-#	specific, there are several locations that need to be defined:
 #
-#	o LLVM_SRC_ROOT  : The root directory of the LLVM source code.
-#	o LLVM_OBJ_ROOT  : The root directory containing the built LLVM code.
+# Include all of the build rules used for making LLVM
 #
-#	o BUILD_SRC_DIR  : The directory containing the code to build.
-#	o BUILD_SRC_ROOT : The root directory of the code to build.
-#
-#	o BUILD_OBJ_DIR  : The directory in which compiled code will be placed.
-#	o BUILD_OBJ_ROOT : The root directory in which compiled code is placed.
-#
-###########################################################################
-
-#
-# Set the source build directory.  That is almost always the current directory.
-#
-ifndef BUILD_SRC_DIR
-BUILD_SRC_DIR = $(shell pwd)
-endif
-
-#
-# Set the source root directory.
-#
-ifndef BUILD_SRC_ROOT
-BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd)
-endif
-
-#
-# Determine the path of the source tree relative from $HOME (the mythical
-# home directory).
-#
-HOME_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT))
-
-#
-# Set the object build directory.  Its location depends upon the source path
-# and where object files should go.
-#
-ifndef BUILD_OBJ_DIR
-ifeq ($(OBJ_ROOT),.)
-BUILD_OBJ_DIR = $(BUILD_SRC_DIR)
-else
-BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR))
-endif
-endif
-
-#
-# Set the root of the object directory.
-#
-ifndef BUILD_OBJ_ROOT
-ifeq ($(OBJ_ROOT),.)
-BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT)
-else
-BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
-endif
-endif
-
-#
-# Set the LLVM object directory.
-#
-ifndef LLVM_OBJ_ROOT
-ifdef LLVM_SRC_ROOT
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
-else
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_ROOT); pwd)
-endif
-endif
-
-#
-# Set the LLVM source directory.
-# It is typically the root directory of what we're compiling now.
-#
-ifndef LLVM_SRC_ROOT
-LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
-endif
-
-###########################################################################
-# Default Targets:
-#	The following targets are the standard top level targets for
-#	building.
-###########################################################################
-
-ifdef SHARED_LIBRARY
-# if SHARED_LIBRARY is specified, the default is to build the dynamic lib
-all:: dynamic
-endif
-
-ifdef BYTECODE_LIBRARY
-# if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
-all:: bytecodelib
-install:: bytecodelib-install
-endif
-
-# Default Rule:  Make sure it's also a :: rule
-all ::
-
-# Default for install is to at least build everything...
-install ::
-
-# Default rule for test.  It ensures everything has a test rule
-test::
-
-# Default rule for building only bytecode.
-bytecode::
-
-# Print out the directories used for building
-prdirs::
-	@echo "Home Offset      : " $(HOME_OBJ_ROOT)
-	@echo "Build Source Root: " $(BUILD_SRC_ROOT)
-	@echo "Build Source Dir : " $(BUILD_SRC_DIR)
-	@echo "Build Object Root: " $(BUILD_OBJ_ROOT)
-	@echo "Build Object Dir : " $(BUILD_OBJ_DIR)
-	@echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
-	@echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
-
-###########################################################################
-# Suffixes and implicit rules:
-#	Empty out the list of suffixes, generate a list that is only
-#	used by this Makefile, and cancel useless implicit rules.   This
-#	will hopefully speed up compilation a little bit.
-###########################################################################
-.SUFFIXES:
-.SUFFIXES: .c .cpp .h .hpp .y .l
-.SUFFIXES: .lo .o .a .so .bc
-.SUFFIXES: .ps .dot .d
-
-#
-# Mark all of these targets as phony.  This will hopefully speed up builds
-# slightly since GNU Make will not try to find implicit rules for targets
-# which are marked as Phony.
-#
-.PHONY: all dynamic bytecodelib bytecodelib-install
-.PHONY: clean distclean install test bytecode prdirs
-
-###########################################################################
-# Miscellaneous paths and commands:
-#	This section defines various configuration macros, such as where
-#	to find burg, tblgen, and libtool.
-###########################################################################
-
-#--------------------------------------------------------------------
-# Variables derived from configuration options... 
-#--------------------------------------------------------------------
-
-#BinInstDir=/usr/local/bin
-#LibInstDir=/usr/local/lib/xxx
-#DocInstDir=/usr/doc/xxx
-
-BURG_OPTS = -I
-
-ifdef ENABLE_PROFILING
-  ENABLE_OPTIMIZED = 1
-  CONFIGURATION := Profile
-else
-  ifdef ENABLE_OPTIMIZED
-    CONFIGURATION := Release
-  else
-    CONFIGURATION := Debug
-  endif
-endif
-
-#
-# Enable this for profiling support with 'gprof'
-# This automatically enables optimized builds.
-#
-ifdef ENABLE_PROFILING
-  PROFILE = -pg
-endif
-
-###########################################################################
-# Library Locations:
-#	These variables describe various library locations:
-#
-#	DEST* = Location of where libraries that are built will be placed.
-#	LLVM* = Location of LLVM libraries used for linking.
-#	PROJ* = Location of previously built libraries used for linking.
-###########################################################################
-
-# Libraries that are being built
-DESTLIBDEBUG    := $(BUILD_OBJ_ROOT)/lib/Debug
-DESTLIBRELEASE  := $(BUILD_OBJ_ROOT)/lib/Release
-DESTLIBPROFILE  := $(BUILD_OBJ_ROOT)/lib/Profile
-DESTLIBBYTECODE := $(BUILD_OBJ_ROOT)/lib/Bytecode
-DESTLIBCURRENT  := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
-
-# LLVM libraries used for linking
-LLVMLIBDEBUGSOURCE    := $(LLVM_OBJ_ROOT)/lib/Debug
-LLVMLIBRELEASESOURCE  := $(LLVM_OBJ_ROOT)/lib/Release
-LLVMLIBPROFILESOURCE  := $(LLVM_OBJ_ROOT)/lib/Profile
-LLVMLIBCURRENTSOURCE  := $(LLVM_OBJ_ROOT)/lib/$(CONFIGURATION)
-
-# Libraries that were built that will now be used for linking
-PROJLIBDEBUGSOURCE    := $(BUILD_OBJ_ROOT)/lib/Debug
-PROJLIBRELEASESOURCE  := $(BUILD_OBJ_ROOT)/lib/Release
-PROJLIBPROFILESOURCE  := $(BUILD_OBJ_ROOT)/lib/Profile
-PROJLIBCURRENTSOURCE  := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
-
-###########################################################################
-# Tool Locations
-#	These variables describe various tool locations:
-#
-#	DEST* = Location of where tools that are built will be placed.
-#	LLVM* = Location of LLVM tools used for building.
-#	PROJ* = Location of previously built tools used for linking.
-###########################################################################
-
-DESTTOOLDEBUG   := $(BUILD_OBJ_ROOT)/tools/Debug
-DESTTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release
-DESTTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile
-DESTTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
-
-LLVMTOOLDEBUG   := $(LLVM_OBJ_ROOT)/tools/Debug
-LLVMTOOLRELEASE := $(LLVM_OBJ_ROOT)/tools/Release
-LLVMTOOLPROFILE := $(LLVM_OBJ_ROOT)/tools/Profile
-LLVMTOOLCURRENT := $(LLVM_OBJ_ROOT)/tools/$(CONFIGURATION)
-
-PROJTOOLDEBUG   := $(BUILD_OBJ_ROOT)/tools/Debug
-PROJTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release
-PROJTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile
-PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
-
-#
-# Libtool is found in the current directory.
-#
-LIBTOOL := $(LLVM_SRC_ROOT)/mklib
-
-#
-# If we're not building a shared library, use the disable-shared tag with
-# libtool.  This will disable the building of objects for shared libraries and
-# only generate static library objects.
-#
-# For dynamic libraries, we'll take the performance hit for now, since we
-# almost never build them.
-#
-# This should speed up compilation and require no modifications to future
-# versions of libtool.
-#
-ifndef SHARED_LIBRARY
-LIBTOOL += --tag=disable-shared
-endif
-
-#
-# Verbosity levels
-#
-ifndef VERBOSE
-VERB := @
-LIBTOOL += --silent
-endif
-
-###########################################################################
-# Miscellaneous paths and commands (part deux):
-#	This section defines various configuration macros, such as where
-#	to find burg, tblgen, and libtool.
-###########################################################################
-
-#--------------------------------------------------------------------------
-# Utilities used while building the LLVM tree, which live in the utils dir
-#
-BURG    := $(LLVMTOOLCURRENT)/burg
-RunBurg := $(BURG) $(BURG_OPTS)
-TBLGEN  := $(LLVMTOOLCURRENT)/tblgen
-
-#--------------------------------------------------------------------------
-# The LLVM GCC front-end in C and C++ flavors
-#
-LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc
-LCC1    := $(LLVMGCCDIR)/libexec/gcc/$(LLVMGCCARCH)/cc1
-LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++
-LCC1XX  := $(LLVMGCCDIR)/libexec/gcc/$(LLVMGCCARCH)/cc1plus
-
-#--------------------------------------------------------------------------
-# Some of the compiled LLVM tools which are used for compilation of runtime
-# libraries.
-#
-LLVMAS  := $(LLVMTOOLCURRENT)/llvm-as
-
-
-###########################################################################
-# Compile Time Flags
-###########################################################################
-
-#
-# Include both the project headers and the LLVM headers for compilation and
-# dependency computation.
-#
-CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include
-
-# By default, strip symbol information from executable
-ifndef KEEP_SYMBOLS
-STRIP = $(PLATFORMSTRIPOPTS)
-STRIP_WARN_MSG = "(without symbols)"
-endif
-
-# Allow gnu extensions...
-CPPFLAGS += -D_GNU_SOURCE
-
-CompileWarnings  := -Wall -W  -Wwrite-strings -Wno-unused
-CompileCommonOpts := $(CompileWarnings) -I$(LEVEL)/include -fshort-enums
-CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
-
-#
-# Compile commands with libtool.
-#
-Compile  := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
-CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CompileCommonOpts)
-
-# Compile a cpp file, don't link...
-CompileG := $(Compile) -g  -D_DEBUG
-CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer
-CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE)
-
-# Compile a c file, don't link...
-CompileCG := $(CompileC) -g  -D_DEBUG
-CompileCO := $(CompileC) $(CompileOptimizeOpts) -fomit-frame-pointer
-CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE)
-
-###########################################################################
-# Link Time Options
-###########################################################################
-
-#
-# Link final executable
-#	(Note that we always link with the C++ compiler).
-#
-Link     := $(LIBTOOL) --mode=link $(CXX)
-
-# link both projlib and llvmlib libraries
-LinkG    := $(Link) -g -L$(PROJLIBDEBUGSOURCE)  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
-LinkO    := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE)
-LinkP    := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
-
-# Create one .o file from a bunch of .o files...
-Relink := ${LIBTOOL} --mode=link $(CXX)
-
-#
-# Configure where the item being compiled should go.
-#
-ifdef SHARED_LIBRARY
-Link += -rpath $(DESTLIBCURRENT)
-endif
-
-ifdef TOOLNAME
-Link += -rpath $(DESTTOOLCURRENT)
-endif
-
-# Create dependency file from CPP file, send to stdout.
-Depend   := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) 
-DependC  := $(CC)  -MM -I$(LEVEL)/include $(CPPFLAGS) 
-
-# Archive a bunch of .o files into a .a file...
-AR       = ${AR_PATH} cq 
-
-#----------------------------------------------------------
-
-# Source includes all of the cpp files, and objects are derived from the
-# source files...
-# The local Makefile can list other Source files via ExtraSource = ...
-# 
-ifndef Source
-Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
-endif
-
-#
-# Libtool Objects
-#
-Srcs := $(sort $(notdir $(basename $(Source))))
-Objs := $(addsuffix .lo, $(Srcs))
-ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs))
-ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs))
-ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs))
-ObjectsBC := $(addprefix $(BUILD_OBJ_DIR)/Bytecode/,$(addsuffix .bc, $(Srcs)))
-
-#
-# The real objects underlying the libtool objects
-#
-RObjs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source))))))
-RObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(RObjs))
-RObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(RObjs))
-RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
-
-#---------------------------------------------------------
-# Handle the DIRS and PARALLEL_DIRS options
-#---------------------------------------------------------
-
-ifdef DIRS
-all install clean test bytecode ::
-	$(VERB) for dir in ${DIRS}; do \
-		(cd $$dir; $(MAKE) $@) || exit 1; \
-	done
-endif
-
-# Handle PARALLEL_DIRS
-ifdef PARALLEL_DIRS
-all      :: $(addsuffix /.makeall     , $(PARALLEL_DIRS))
-install  :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS))
-clean    :: $(addsuffix /.makeclean   , $(PARALLEL_DIRS))
-test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
-bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
-
-%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
-	$(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
-endif
-
-# Handle directories that may or may not exist
-ifdef OPTIONAL_DIRS
-all install clean test bytecode ::
-	$(VERB) for dir in ${OPTIONAL_DIRS}; do \
-		if [ -d $$dir ]; \
-		then\
-			(cd $$dir; $(MAKE) $@) || exit 1; \
-		fi \
-	done
-endif
-
-###########################################################################
-# Library Build Rules:
-#
-#---------------------------------------------------------
-# Handle the LIBRARYNAME option - used when building libs...
-#---------------------------------------------------------
-#
-#  When libraries are built, they are allowed to optionally define the
-#  DONT_BUILD_RELINKED make variable, which, when defined, prevents a .o file
-#  from being built for the library. This .o files may then be linked to by a
-#  tool if the tool does not need (or want) the semantics a .a file provides
-#  (linking in only object files that are "needed").  If a library is never to
-#  be used in this way, it is better to define DONT_BUILD_RELINKED, and define
-#  BUILD_ARCHIVE instead.
-#
-#  Some libraries must be built as .a files (libscalar for example) because if
-#  it's built as a .o file, then all of the constituent .o files in it will be
-#  linked into tools (for example gccas) even if they only use one of the parts
-#  of it.  For this reason, sometimes it's useful to use libraries as .a files.
-###########################################################################
-
-ifdef LIBRARYNAME
-
-# Make sure there isn't any extranous whitespace on the LIBRARYNAME option
-LIBRARYNAME := $(strip $(LIBRARYNAME))
-
-LIBNAME_O    := $(DESTLIBRELEASE)/lib$(LIBRARYNAME).so
-LIBNAME_P    := $(DESTLIBPROFILE)/lib$(LIBRARYNAME).so
-LIBNAME_G    := $(DESTLIBDEBUG)/lib$(LIBRARYNAME).so
-LIBNAME_AO   := $(DESTLIBRELEASE)/lib$(LIBRARYNAME).a
-LIBNAME_AP   := $(DESTLIBPROFILE)/lib$(LIBRARYNAME).a
-LIBNAME_AG   := $(DESTLIBDEBUG)/lib$(LIBRARYNAME).a
-LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o
-LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o
-LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o
-LIBNAME_BC   := $(DESTLIBBYTECODE)/lib$(LIBRARYNAME).bc
-
-#--------------------------------------------------------------------
-# Library Targets
-#	Modify the top level targets to build the desired libraries.
-#--------------------------------------------------------------------
-
-# dynamic target builds a shared object version of the library...
-dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so
-bytecodelib:: $(LIBNAME_BC)
-bytecodelib-install:: $(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc
-
-$(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc: $(LIBNAME_BC)
-	@echo ======= Installing $(LIBRARYNAME) bytecode library =======
-	cp $< $@
-
-# Does the library want a .o version built?
-ifndef DONT_BUILD_RELINKED
-all:: $(DESTLIBCURRENT)/$(LIBRARYNAME).o
-endif
-
-# Does the library want an archive version built?
-ifdef BUILD_ARCHIVE
-all:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).a
-endif
-
-#--------------------------------------------------------------------
-# Rules for building libraries
-#--------------------------------------------------------------------
-
-LinkBCLib := $(LLVMGCC) -shared
-ifdef EXPORTED_SYMBOL_LIST
-LinkBCLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST)
-else
-LinkBCLib += -Xlinker -disable-internalize
-endif
-
-
-# Rule for building bytecode libraries.
-$(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs) $(DESTLIBBYTECODE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) bytecode library =======
-	$(VERB) $(LinkBCLib) -o $@ $(ObjectsBC) $(LibSubDirs) $(LibLinkOpts)
-#
-# Rules for building dynamically linked libraries.
-#
-$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) dynamic release library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
-
-$(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) dynamic profile library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts)
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
-
-$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-	@echo ======= Linking $(LIBRARYNAME) dynamic debug library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
-
-#
-# Rules for building static archive libraries.
-#
-$(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) archive release library =======
-	@$(RM) -f $@
-	$(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static
-
-$(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) archive profile library =======
-	@$(RM) -f $@
-	$(VERB) $(Link) -03 $(PROFILE) -o $@ $(ObjectsP) $(LibSubDirs) -static
-
-$(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-	@echo ======= Linking $(LIBRARYNAME) archive debug library =======
-	@$(RM) -f $@
-	$(VERB) $(Link) -g $(STRIP) -o $@ $(ObjectsG) $(LibSubDirs) -static
-
-
-#
-# Rules for building .o libraries.
-#
-#	JTC:
-#	Note that for this special case, we specify the actual object files
-#	instead of their libtool counterparts.  This is because libtool
-#	doesn't want to generate a reloadable object file unless it is given
-#	.o files explicitly.
-#
-#	Note that we're making an assumption here: If we build a .lo file,
-#	it's corresponding .o file will be placed in the same directory.
-#
-#	I think that is safe.
-#
-$(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-	@echo "Linking $@"
-	$(VERB) $(Relink) -o $@ $(RObjectsO) $(LibSubDirs)
-
-$(LIBNAME_OBJP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-	@echo "Linking $@"
-	$(VERB) $(Relink) -o $@ $(RObjectsP) $(LibSubDirs)
-
-$(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-	@echo "Linking $@"
-	$(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs)
-
-endif
-
-#------------------------------------------------------------------------
-# Create a TAGS database for emacs
-#------------------------------------------------------------------------
-
-ifdef ETAGS
-ifeq ($(LEVEL), .)
-SRCDIRS := $(wildcard include lib tools)
-
-tags:
-	$(ETAGS) -l c++ `find $(SRCDIRS) -name '*.cpp' -o -name '*.h'`
-all:: tags
-endif
-else
-tags:
-	${ECHO} "Cannot build $@: The program etags is not installed"
-endif
-
-#------------------------------------------------------------------------
-# Handle the TOOLNAME option - used when building tool executables...
-#------------------------------------------------------------------------
-#
-# The TOOLNAME option should be used with a USEDLIBS variable that tells the
-# libraries (and the order of the libs) that should be linked to the
-# tool. USEDLIBS should contain a list of library names (some with .a extension)
-# that are automatically linked in as .o files unless the .a suffix is added.
-#
-ifdef TOOLNAME
-
-# TOOLEXENAME* - These compute the output filenames to generate...
-TOOLEXENAME_G := $(DESTTOOLDEBUG)/$(TOOLNAME)
-TOOLEXENAME_O := $(DESTTOOLRELEASE)/$(TOOLNAME)
-TOOLEXENAME_P := $(DESTTOOLPROFILE)/$(TOOLNAME)
-TOOLEXENAMES  := $(DESTTOOLCURRENT)/$(TOOLNAME)
-
-# USED_LIBS_OPTIONS - Compute the options line that add -llib1 -llib2, etc.
-PROJ_LIBS_OPTIONS   := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS)))
-PROJ_LIBS_OPTIONS_G := $(patsubst %.o, $(PROJLIBDEBUGSOURCE)/%.o,  $(PROJ_LIBS_OPTIONS))
-PROJ_LIBS_OPTIONS_O := $(patsubst %.o, $(PROJLIBRELEASESOURCE)/%.o,$(PROJ_LIBS_OPTIONS))
-PROJ_LIBS_OPTIONS_P := $(patsubst %.o, $(PROJLIBPROFILESOURCE)/%.o,$(PROJ_LIBS_OPTIONS))
-
-LLVM_LIBS_OPTIONS   := $(patsubst %.a.o, -l%, $(addsuffix .o, $(LLVMLIBS)))
-LLVM_LIBS_OPTIONS_G := $(patsubst %.o, $(LLVMLIBDEBUGSOURCE)/%.o,  $(LLVM_LIBS_OPTIONS))
-LLVM_LIBS_OPTIONS_O := $(patsubst %.o, $(LLVMLIBRELEASESOURCE)/%.o,$(LLVM_LIBS_OPTIONS))
-LLVM_LIBS_OPTIONS_P := $(patsubst %.o, $(LLVMLIBPROFILESOURCE)/%.o,$(LLVM_LIBS_OPTIONS))
-
-LIB_OPTS_G :=  $(LLVM_LIBS_OPTIONS_G) $(PROJ_LIBS_OPTIONS_G)
-LIB_OPTS_O :=  $(LLVM_LIBS_OPTIONS_O) $(PROJ_LIBS_OPTIONS_O)
-LIB_OPTS_P :=  $(LLVM_LIBS_OPTIONS_P) $(PROJ_LIBS_OPTIONS_P)
-
-# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
-# rebuilt if libraries change.  This has to make sure to handle .a/.so and .o
-# files separately.
-#
-STATICUSEDLIBS   := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS)))
-USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS))
-USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS))
-USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS))
-
-#
-# Libtool link options:
-#	Ensure that all binaries have their symbols exported so that they can
-#	by dlsym'ed.
-#
-LINK_OPTS := -export-dynamic $(TOOLLINKOPTS)
-
-
-
-
-
-# Tell make that we need to rebuild subdirectories before we can link the tool.
-# This affects things like LLI which has library subdirectories.
-$(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \
-        $(addsuffix /.makeall, $(PARALLEL_DIRS))
-
-all::   $(TOOLEXENAMES)
-
-clean::
-	$(VERB) $(RM) -f $(TOOLEXENAMES)
-
-$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
-	@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
-	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS)
-
-$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir
-	@echo ======= Linking $(TOOLNAME) release executable =======
-	$(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS)
-
-$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
-	@echo ======= Linking $(TOOLNAME) profile executable =======
-	$(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS)
-
-endif
-
-
-
-#---------------------------------------------------------
-.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir $(BUILD_OBJ_DIR)/Bytecode/.dir
-.PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir
-
-# Create .lo files in the ObjectFiles directory from the .cpp and .c files...
-$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
-	@echo "Compiling $<"
-	$(VERB) $(CompileO) $< -o $@
-
-$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
-	@echo "Compiling $<"
-	$(VERB) $(CompileCO) $< -o $@
-
-$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
-	@echo "Compiling $<"
-	$(VERB) $(CompileP) $< -o $@
-
-$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
-	@echo "Compiling $<"
-	$(VERB) $(CompileCP) $< -o $@
-
-$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
-	@echo "Compiling $<"
-	$(VERB) $(CompileG) $< -o $@
-
-$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir 
-	@echo "Compiling $<"
-	$(VERB) $(CompileCG) $< -o $@
-
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX)
-	@echo "Compiling $< to bytecode"
-	$(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
-
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
-	@echo "Compiling $< to bytecode"
-	$(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
-
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS)
-	@echo "Compiling $< to bytecode"
-	$(VERB) $(LLVMAS) $< -f -o $@
-
-
-#
-# Rules for building lex/yacc files
-#
-LEX_FILES   = $(filter %.l, $(Source))
-LEX_OUTPUT  = $(LEX_FILES:%.l=%.cpp)
-YACC_FILES  = $(filter %.y, $(Source))
-YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
-.PRECIOUS: $(LEX_OUTPUT) $(YACC_OUTPUT)
-
-# Create a .cpp source file from a flex input file... this uses sed to cut down
-# on the warnings emited by GCC...
-#
-# The last line is a gross hack to work around flex aparently not being able to
-# resize the buffer on a large token input.  Currently, for uninitialized string
-# buffers in LLVM we can generate very long tokens, so this is a hack around it.
-# FIXME.  (f.e. char Buffer[10000] )
-#
-%.cpp: %.l
-	@echo Flex\'ing $<...
-	$(VERB) $(FLEX) -t $< | \
-          $(SED) '/^find_rule/d' | \
-          $(SED) 's/void yyunput/inline void yyunput/' | \
-          $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
-          $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
-              > $@.tmp
-	$(VERB) cmp -s $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@
-	@# remove the output of flex if it didn't get moved over...
-	@rm -f $@.tmp
-
-# Rule for building the bison parsers...
-%.c: %.y     # Cancel built-in rules for yacc
-%.h: %.y     # Cancel built-in rules for yacc
-%.cpp %.h : %.y
-	@echo Bison\'ing $<...
-	$(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
-	$(VERB) cmp -s $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
-	$(VERB) cmp -s $*.tab.h $*.h   > /dev/null || ${MV} -f $*.tab.h $*.h
-	@# If the files were not updated, don't leave them lying around...
-	@rm -f $*.tab.c $*.tab.h
-
-# To create the directories...
-%/.dir:
-	$(VERB) ${MKDIR} $* > /dev/null
-	@$(DATE) > $@
-
-# To create postscript files from dot files...
-ifdef DOT
-%.ps: %.dot
-	${DOT} -Tps < $< > $@
-else
-%.ps: %.dot
-	${ECHO} "Cannot build $@: The program dot is not installed"
-endif
-
-# 'make clean' nukes the tree
-clean::
-	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release
-	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
-	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Bytecode
-	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
-	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
-
-###########################################################################
-# C/C++ Dependencies
-#	Define variables and rules that generate header file dependencies
-#	from C/C++ source files.
-###########################################################################
-
-ifndef DISABLE_AUTO_DEPENDENCIES
-
-# If dependencies were generated for the file that included this file,
-# include the dependencies now...
-#
-SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
-SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
-
-# Create dependencies for the *.cpp files...
-$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
-	$(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
-	$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.cpp||' | $(SED) 's|[^\]$$|&::|' >> $@
-
-# Create dependencies for the *.c files...
-$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
-	$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
-	$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.c||' | $(SED) 's|[^\]$$|&::|' >> $@
-
-#
-# Include dependencies generated from C/C++ source files, but not if we
-# are cleaning (this example taken from the GNU Make Manual).
-#
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),distclean)
--include /dev/null $(SourceDepend)
-endif
-endif
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
-endif  # ifndef DISABLE_AUTO_DEPENDENCIES


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.131 llvm/Makefile.rules:1.132
--- llvm/Makefile.rules:1.131	Fri Aug 29 09:07:02 2003
+++ llvm/Makefile.rules	Sat Sep  6 09:44:17 2003
@@ -48,91 +48,11 @@
 #===-----------------------------------------------------------------------====
 
 #
-# Configuration file to set paths specific to local installation of LLVM
-# 
-ifdef LLVM_SRC_ROOT
-include $(LLVM_SRC_ROOT)/Makefile.config
-else
-include $(LEVEL)/Makefile.config
-endif
-
-###########################################################################
-# Directory Configuration
-#	This section of the Makefile determines what is where.  To be
-#	specific, there are several locations that need to be defined:
-#
-#	o LLVM_SRC_ROOT  : The root directory of the LLVM source code.
-#	o LLVM_OBJ_ROOT  : The root directory containing the built LLVM code.
-#
-#	o BUILD_SRC_DIR  : The directory containing the code to build.
-#	o BUILD_SRC_ROOT : The root directory of the code to build.
-#
-#	o BUILD_OBJ_DIR  : The directory in which compiled code will be placed.
-#	o BUILD_OBJ_ROOT : The root directory in which compiled code is placed.
-#
-###########################################################################
-
-#
-# Set the source build directory.  That is almost always the current directory.
-#
-ifndef BUILD_SRC_DIR
-BUILD_SRC_DIR = $(shell pwd)
-endif
-
-#
-# Set the source root directory.
-#
-ifndef BUILD_SRC_ROOT
-BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd)
-endif
-
-#
-# Determine the path of the source tree relative from $HOME (the mythical
-# home directory).
-#
-HOME_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT))
-
-#
-# Set the object build directory.  Its location depends upon the source path
-# and where object files should go.
+# Set the VPATH so that we can find source files.
+# Also set $SouceDir for backwards compatibility
 #
-ifndef BUILD_OBJ_DIR
-ifeq ($(OBJ_ROOT),.)
-BUILD_OBJ_DIR = $(BUILD_SRC_DIR)
-else
-BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR))
-endif
-endif
-
-#
-# Set the root of the object directory.
-#
-ifndef BUILD_OBJ_ROOT
-ifeq ($(OBJ_ROOT),.)
-BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT)
-else
-BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
-endif
-endif
-
-#
-# Set the LLVM object directory.
-#
-ifndef LLVM_OBJ_ROOT
-ifdef LLVM_SRC_ROOT
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
-else
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_ROOT); pwd)
-endif
-endif
-
-#
-# Set the LLVM source directory.
-# It is typically the root directory of what we're compiling now.
-#
-ifndef LLVM_SRC_ROOT
-LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
-endif
+VPATH=$(BUILD_SRC_DIR)
+SourceDir=$(BUILD_SRC_DIR)
 
 ###########################################################################
 # Default Targets:
@@ -165,7 +85,6 @@
 
 # Print out the directories used for building
 prdirs::
-	@echo "Home Offset      : " $(HOME_OBJ_ROOT)
 	@echo "Build Source Root: " $(BUILD_SRC_ROOT)
 	@echo "Build Source Dir : " $(BUILD_SRC_DIR)
 	@echo "Build Object Root: " $(BUILD_OBJ_ROOT)
@@ -282,7 +201,7 @@
 #
 # Libtool is found in the current directory.
 #
-LIBTOOL := $(LLVM_SRC_ROOT)/mklib
+LIBTOOL := $(LLVM_OBJ_ROOT)/mklib
 
 #
 # If we're not building a shared library, use the disable-shared tag with
@@ -343,7 +262,15 @@
 # Include both the project headers and the LLVM headers for compilation and
 # dependency computation.
 #
-CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include
+# BUILD_OBJ_DIR          : Files local to the particular object directory
+#                          (locallly generated header files).
+# BUILD_SRC_DIR          : Files local to the particular source directory.
+# BUILD_SRC_ROOT/include : Files global to the project.
+# LEVEL/include          : config.h files for the project
+# LLVM_SRC_ROOT/include  : Files global to LLVM.
+# LLVM_OBJ_ROOT/include  : config.h files generated by autoconf
+#
+CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include -I$(LLVM_SRC_ROOT)/include -I$(LLVM_OBJ_ROOT)/include 
 
 # By default, strip symbol information from executable
 ifndef KEEP_SYMBOLS
@@ -355,7 +282,7 @@
 CPPFLAGS += -D_GNU_SOURCE
 
 CompileWarnings  := -Wall -W  -Wwrite-strings -Wno-unused
-CompileCommonOpts := $(CompileWarnings) -I$(LEVEL)/include -fshort-enums
+CompileCommonOpts := $(CompileWarnings) -fshort-enums
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
 
 #
@@ -417,7 +344,7 @@
 # The local Makefile can list other Source files via ExtraSource = ...
 # 
 ifndef Source
-Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
+Source  := $(ExtraSource) $(wildcard $(SourceDir)/*.cpp $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l)
 endif
 
 #
@@ -620,7 +547,7 @@
 
 ifdef ETAGS
 ifeq ($(LEVEL), .)
-SRCDIRS := $(wildcard include lib tools)
+SRCDIRS := $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools)
 
 tags:
 	$(ETAGS) -l c++ `find $(SRCDIRS) -name '*.cpp' -o -name '*.h'`
@@ -714,39 +641,39 @@
 .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir
 
 # Create .lo files in the ObjectFiles directory from the .cpp and .c files...
-$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Release/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileO) $< -o $@
 
-$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Release/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileCO) $< -o $@
 
-$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileP) $< -o $@
 
-$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Profile/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileCP) $< -o $@
 
-$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileG) $< -o $@
 
-$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir 
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Debug/.dir 
 	@echo "Compiling $<"
 	$(VERB) $(CompileCG) $< -o $@
 
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX)
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX)
 	@echo "Compiling $< to bytecode"
 	$(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
 	@echo "Compiling $< to bytecode"
 	$(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
-$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS)
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS)
 	@echo "Compiling $< to bytecode"
 	$(VERB) $(LLVMAS) $< -f -o $@
 
@@ -785,7 +712,7 @@
 %.h: %.y     # Cancel built-in rules for yacc
 %.cpp %.h : %.y
 	@echo Bison\'ing $<...
-	$(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
+	$(VERB) $(BISON) -v -d -p $(<F:%Parser.y=%) $*.y
 	$(VERB) cmp -s $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
 	$(VERB) cmp -s $*.tab.h $*.h   > /dev/null || ${MV} -f $*.tab.h $*.h
 	@# If the files were not updated, don't leave them lying around...
@@ -805,6 +732,13 @@
 	${ECHO} "Cannot build $@: The program dot is not installed"
 endif
 
+#
+# This rules ensures that header files that are removed still have a rule for
+# which they can be "generated."  This allows make to ignore them and
+# reproduce the dependency lists.
+#
+%.h::
+
 # 'make clean' nukes the tree
 clean::
 	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release
@@ -824,18 +758,16 @@
 # If dependencies were generated for the file that included this file,
 # include the dependencies now...
 #
-SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
+SourceBaseNames := $(basename $(notdir $(filter-out $(SourceDir)/$(CONFIGURATION)/%, $(Source))))
 SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
 
 # Create dependencies for the *.cpp files...
-$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
+$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
 	$(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
-	$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.cpp||' | $(SED) 's|[^\]$$|&::|' >> $@
 
 # Create dependencies for the *.c files...
-$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
+$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Depend/.dir
 	$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
-	$(VERB) $(Depend) $< | $(SED) 's|$*.o: $*.c||' | $(SED) 's|[^\]$$|&::|' >> $@
 
 #
 # Include dependencies generated from C/C++ source files, but not if we


Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.10 llvm/Makefile.config.in:1.11
--- llvm/Makefile.config.in:1.10	Tue Jul 22 14:17:35 2003
+++ llvm/Makefile.config.in	Sat Sep  6 09:44:17 2003
@@ -64,6 +64,7 @@
 #
 # Paths to miscellaneous programs.
 #
+RPWD    = @RPWD@
 SED     = @SED@
 RM      = @RM@
 ECHO    = @ECHO@
@@ -84,7 +85,7 @@
 # object files.
 # 
 #OBJ_ROOT = .
-OBJ_ROOT := @OBJROOT@
+OBJ_ROOT := .
 
 # Path to location for LLVM front-end this should only be specified here if you
 # want to override the value set in Makefile.$(uname)
@@ -168,4 +169,67 @@
 # Disable LLC diffs for testing.
 #
 @DISABLE_LLC_DIFFS@
+
+###########################################################################
+# Directory Configuration
+#	This section of the Makefile determines what is where.  To be
+#	specific, there are several locations that need to be defined:
+#
+#	o LLVM_SRC_ROOT  : The root directory of the LLVM source code.
+#	o LLVM_OBJ_ROOT  : The root directory containing the built LLVM code.
+#
+#	o BUILD_SRC_DIR  : The directory containing the code to build.
+#	o BUILD_SRC_ROOT : The root directory of the code to build.
+#
+#	o BUILD_OBJ_DIR  : The directory in which compiled code will be placed.
+#	o BUILD_OBJ_ROOT : The root directory in which compiled code is placed.
+#
+###########################################################################
+
+#
+# Set the object build directory.  By default, it is the current directory.
+#
+ifndef BUILD_OBJ_DIR
+BUILD_OBJ_DIR := $(subst //,/,$(shell $(RPWD)))
+endif
+
+#
+# Set the root of the object directory.
+#
+ifndef BUILD_OBJ_ROOT
+BUILD_OBJ_ROOT := $(subst //,/,$(shell cd $(BUILD_OBJ_DIR)/$(LEVEL); $(RPWD)))
+endif
+
+#
+# Set the source build directory.  That is almost always the current directory.
+#
+ifndef BUILD_SRC_DIR
+BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+endif
+
+#
+# Set the source root directory.
+#
+ifndef BUILD_SRC_ROOT
+BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+endif
+
+#
+# Set the LLVM object directory.
+#
+ifndef LLVM_OBJ_ROOT
+ifdef LLVM_SRC_ROOT
+LLVM_OBJ_ROOT := $(shell cd $(LLVM_SRC_ROOT); $(RPWD))
+else
+LLVM_OBJ_ROOT := $(BUILD_OBJ_ROOT)
+endif
+endif
+
+#
+# Set the LLVM source directory.
+# It is typically the root directory of what we're compiling now.
+#
+ifndef LLVM_SRC_ROOT
+LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
+endif
 




From criswell at cs.uiuc.edu  Sat Sep  6 09:51:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 09:51:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Makefile
Message-ID: <200309061450.JAA13269@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

Makefile updated: 1.29 -> 1.30

---
Log message:

Checkin of autoconf-style object root.
Adjusted Makefile to work with new autoconf-style object root.
Specifically, use the new -I option of tblgen to find include files.



---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/Makefile
diff -u llvm/lib/Target/Sparc/Makefile:1.29 llvm/lib/Target/Sparc/Makefile:1.30
--- llvm/lib/Target/Sparc/Makefile:1.29	Thu Aug 21 15:37:17 2003
+++ llvm/lib/Target/Sparc/Makefile	Sat Sep  6 09:50:07 2003
@@ -11,6 +11,12 @@
   DEBUG_FLAG = -D_DEBUG
 endif
 
+Debug/Sparc.burg.in1 : $(SourceDir)/Sparc.burg.in Debug/.dir
+	$(CXX) -E -I$(LLVM_SRC_ROOT)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Ydefine/#define/' > $@
+
+Debug/Sparc.burm : Debug/Sparc.burg.in1
+	$(CXX) -E -I$(LLVM_SRC_ROOT)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Xinclude/#include/g' | ${SED} 's/Xdefine/#define/g' > $@
+
 Debug/Sparc.burm.cpp: Debug/Sparc.burm Debug/.dir
 	$(RunBurg) $< -o $@
 
@@ -23,33 +29,17 @@
 $(BUILD_OBJ_DIR)/Profile/Sparc.burm.lo: Debug/Sparc.burm.cpp
 	$(CompileP) $< -o $@
 
-#$(BUILD_OBJ_DIR)/Debug/Sparc.burm.o: Debug/Sparc.burm.cpp
-#	$(CompileG) $< -o $@
-
-#$(BUILD_OBJ_DIR)/Release/Sparc.burm.o: Debug/Sparc.burm.cpp
-#	$(CompileO) $< -o $@
-
-#$(BUILD_OBJ_DIR)/Profile/Sparc.burm.o: Debug/Sparc.burm.cpp
-#	$(CompileP) $< -o $@
-
-Debug/Sparc.burg.in1 : Sparc.burg.in Debug/.dir
-	$(CXX) -E -I$(LEVEL)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Ydefine/#define/' > $@
-
-Debug/Sparc.burm : Debug/Sparc.burg.in1
-	$(CXX) -E -I$(LEVEL)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Xinclude/#include/g' | ${SED} 's/Xdefine/#define/g' > $@
-
 $(BUILD_OBJ_DIR)/Depend/Sparc.burm.d: $(BUILD_OBJ_DIR)/Depend/.dir
 	touch $@
 
-SparcV9CodeEmitter.cpp: SparcV9CodeEmitter.inc
-
-
 TARGET_NAME := SparcV9
 
-TABLEGEN_FILES := $(wildcard *.td)
+TABLEGEN_FILES := $(wildcard $(SourceDir)/*.td)
+
+$(SourceDir)/$(TARGET_NAME)CodeEmitter.cpp:: $(TARGET_NAME)CodeEmitter.inc
 
 $(TARGET_NAME)CodeEmitter.inc:: $(TABLEGEN_FILES) $(TBLGEN)
-	$(TBLGEN) $(TARGET_NAME).td -gen-emitter -o $@
+	$(TBLGEN) -I $(SourceDir) $(SourceDir)/$(TARGET_NAME).td -gen-emitter -o $@
 
 clean::
 	${RM} -f $(TARGET_NAME)CodeEmitter.inc




From criswell at cs.uiuc.edu  Sat Sep  6 09:51:07 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 09:51:07 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile
Message-ID: <200309061450.JAA13264@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.9 -> 1.10

---
Log message:

Checkin of autoconf-style object root.
Adjusted Makefile to work with new autoconf-style object root.
Specifically, use the new -I option of tblgen to find include files.



---
Diffs of the changes:

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.9 llvm/lib/Target/X86/Makefile:1.10
--- llvm/lib/Target/X86/Makefile:1.9	Thu Aug 21 15:37:16 2003
+++ llvm/lib/Target/X86/Makefile	Sat Sep  6 09:50:22 2003
@@ -8,22 +8,22 @@
                  X86GenInstrInfo.inc X86GenInstrSelector.inc
 
 X86GenRegisterNames.inc::  X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-register-enums -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-enums -o $@
 
 X86GenRegisterInfo.h.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-register-desc-header -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc-header -o $@
 
 X86GenRegisterInfo.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-register-desc -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc -o $@
 
 X86GenInstrNames.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-instr-enums -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-enums -o $@
 
 X86GenInstrInfo.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-instr-desc -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@
 
 X86GenInstrSelector.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-instr-selector -o $@
+	$(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc




From criswell at cs.uiuc.edu  Sat Sep  6 10:04:00 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:04:00 2003
Subject: [llvm-commits] CVS: llvm/projects/sample/Makefile Makefile.common
Message-ID: <200309061503.KAA13305@choi.cs.uiuc.edu>


Changes in directory llvm/projects/sample:

Makefile updated: 1.3 -> 1.4
Makefile.common updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.
Modified Makefiles to use the new Makefile setup in LLVM.


---
Diffs of the changes:

Index: llvm/projects/sample/Makefile
diff -u llvm/projects/sample/Makefile:1.3 llvm/projects/sample/Makefile:1.4
--- llvm/projects/sample/Makefile:1.3	Wed Jul 23 18:28:57 2003
+++ llvm/projects/sample/Makefile	Sat Sep  6 10:03:24 2003
@@ -10,7 +10,7 @@
 #
 # Directories that needs to be built.
 #
-#DIRS = lib tools
+DIRS = lib tools
 
 #
 # Include the Master Makefile that knows how to build all.


Index: llvm/projects/sample/Makefile.common
diff -u llvm/projects/sample/Makefile.common:1.3 llvm/projects/sample/Makefile.common:1.4
--- llvm/projects/sample/Makefile.common:1.3	Thu Aug 21 17:22:24 2003
+++ llvm/projects/sample/Makefile.common	Sat Sep  6 10:03:24 2003
@@ -1,10 +1,23 @@
 #
-# Set this variable to the top of the LLVM source tree.
+# Configure the location of the LLVM object root.  We know it is two
+# directories up.  The source tree location we do not know; let the LLVM
+# Makefiles find it for us.
 #
-LLVM_SRC_ROOT = $(LEVEL)/../..
+LLVM_OBJ_ROOT=$(LEVEL)/../..
 
 #
-# Include LLVM's Master Makefile.
+# Grab the LLVM configuration file.
 #
-include $(LLVM_SRC_ROOT)/Makefile.common
+include $(LEVEL)/../../Makefile.config
+
+#
+# Reconfigure the source directories
+#
+BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/sample
+BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+#
+# Include LLVM's build rules.
+#
+include $(LLVM_SRC_ROOT)/Makefile.rules
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:04:06 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:04:06 2003
Subject: [llvm-commits] CVS: llvm/projects/ModuleMaker/Makefile.common
Message-ID: <200309061503.KAA13296@choi.cs.uiuc.edu>


Changes in directory llvm/projects/ModuleMaker:

Makefile.common updated: 1.1 -> 1.2

---
Log message:

Checkin of autoconf-style object root.
Modified Makefiles to use the new Makefile setup in LLVM.


---
Diffs of the changes:

Index: llvm/projects/ModuleMaker/Makefile.common
diff -u llvm/projects/ModuleMaker/Makefile.common:1.1 llvm/projects/ModuleMaker/Makefile.common:1.2
--- llvm/projects/ModuleMaker/Makefile.common:1.1	Thu Aug 21 17:29:49 2003
+++ llvm/projects/ModuleMaker/Makefile.common	Sat Sep  6 10:03:21 2003
@@ -1,10 +1,23 @@
 #
-# Set this variable to the top of the LLVM source tree.
+# Configure the location of the LLVM object root.  We know it is two
+# directories up.  The source tree location we do not know; let the LLVM
+# Makefiles find it for us.
 #
-LLVM_SRC_ROOT = $(LEVEL)/../..
+LLVM_OBJ_ROOT=$(LEVEL)/../..
 
 #
-# Include LLVM's Master Makefile.
+# Grab the LLVM configuration file.
 #
-include $(LLVM_SRC_ROOT)/Makefile.common
+include $(LEVEL)/../../Makefile.config
+
+#
+# Reconfigure the source directories
+#
+BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker
+BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+#
+# Include LLVM's build rules.
+#
+include $(LLVM_SRC_ROOT)/Makefile.rules
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:00 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile
Message-ID: <200309061515.KAA13541@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/04-bisect:

Makefile updated: 1.4 -> 1.5

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.4 llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.5
--- llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.4	Fri Aug 15 13:59:15 2003
+++ llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile	Sat Sep  6 10:13:23 2003
@@ -2,7 +2,10 @@
 PROG = bisect
 LDFLAGS = -lm
 #RUN_OPTIONS += 
-STDIN_FILENAME = bisect_test.in
+
+include $(LEVEL)/Makefile.config
+
+STDIN_FILENAME = $(BUILD_SRC_DIR)/bisect_test.in
 
 # This program is adversely effected by the underlying precision of the machine
 PROGRAM_IS_NONDETERMINISTIC = 1




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:06 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:06 2003
Subject: [llvm-commits] CVS: llvm/test/Makefile Makefile.tests
Message-ID: <200309061515.KAA13536@choi.cs.uiuc.edu>


Changes in directory llvm/test:

Makefile updated: 1.36 -> 1.37
Makefile.tests updated: 1.77 -> 1.78

---
Log message:

Checkin of autoconf-style object root.

Use QMTest for the feature and Regression tests.
Continue using the Makefile system for the Programs tests.
Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Makefile
diff -u llvm/test/Makefile:1.36 llvm/test/Makefile:1.37
--- llvm/test/Makefile:1.36	Thu Aug 21 10:09:29 2003
+++ llvm/test/Makefile	Sat Sep  6 10:12:21 2003
@@ -1,8 +1,13 @@
 LEVEL  = ..
-DIRS   = Feature Regression Programs
+DIRS   = Programs
 include Makefile.tests
 
 #
+# Make QMTest the default for testing features and regressions
+#
+all:: qmtest
+
+#
 # New QMTest functionality:
 #	The test suite is being transitioned over to QMTest.  Eventually, it
 #	will use QMTest by default.
@@ -10,13 +15,7 @@
 
 # List of the functioning QM Tests
 QMTESTS=feature \
-        regression.assembler \
-        regression.analysis \
-        regression.bugpoint \
-        regression.cbackend \
-        regression.jello \
-        regression.linker \
-        regression.other
+        regression
 
 # QMTest option specifying the location of the QMTest database.
 QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
@@ -27,12 +26,13 @@
 #
 CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \
          -c buildroot=$(LLVM_OBJ_ROOT) \
-	 -c buildtype=$(CONFIGURATION) \
+         -c buildtype=$(CONFIGURATION) \
          -c tmpdir=$(LLVM_OBJ_ROOT)/test/tmp \
-	 -c cc=$(CC) \
-	 -c cxx=$(CXX) \
-	 -c "llvmgcc=$(LLVMGCC)" \
-	 -c make=$(MAKE)
+         -c coresize=0 \
+         -c cc=$(CC) \
+         -c cxx=$(CXX) \
+         -c "llvmgcc=$(LLVMGCC)" \
+         -c make=$(MAKE)
 
 #
 # Location of the QMTest program.


Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.77 llvm/test/Makefile.tests:1.78
--- llvm/test/Makefile.tests:1.77	Fri Aug 29 10:26:31 2003
+++ llvm/test/Makefile.tests	Sat Sep  6 10:12:21 2003
@@ -56,10 +56,10 @@
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LEVEL)/test/Failure.sh
+FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
-                  $(LEVEL)/test/TestRunner.sh
+             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 # Native Tool Definitions
 NATGCC  = $(CC)
@@ -85,15 +85,24 @@
 	$(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
-Output/%.ll: $(SourceDir)%.c $(LCC1) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
 	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
-Output/%.ll: $(SourceDir)%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
 	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
-Output/%.ll: $(SourceDir)%.cc $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.cc $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
 	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
@@ -105,15 +114,25 @@
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.
 #
-Output/%.bc: %.ll $(LAS) Output/.dir
+Output/%.bc: $(SourceDir)/%.ll $(LAS) Output/.dir
 	$(LAS) -f $< -o $@
 
 #
 # Testing versions of provided utilities...
 #
+Output/%.tll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
 Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
 	@echo "======== Compiling $<"
 	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
 	    ( rm -f $@; $(FAILURE) $@ )
 
 Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:11 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:11 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile
Message-ID: <200309061515.KAA13529@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/01-qbsort:

Makefile updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.3 llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.4
--- llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.3	Fri Aug 15 13:59:12 2003
+++ llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile	Sat Sep  6 10:13:21 2003
@@ -2,6 +2,6 @@
 PROG = qbsort
 LDFLAGS = -lm
 #RUN_OPTIONS += 
-STDIN_FILENAME = benchmark.in3
+STDIN_FILENAME = $(BUILD_SRC_DIR)/benchmark.in3
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:17 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:17 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Fhourstones/Makefile
Message-ID: <200309061515.KAA13522@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Fhourstones:

Makefile updated: 1.6 -> 1.7

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Fhourstones/Makefile
diff -u llvm/test/Programs/MultiSource/Fhourstones/Makefile:1.6 llvm/test/Programs/MultiSource/Fhourstones/Makefile:1.7
--- llvm/test/Programs/MultiSource/Fhourstones/Makefile:1.6	Wed Aug  6 15:42:25 2003
+++ llvm/test/Programs/MultiSource/Fhourstones/Makefile	Sat Sep  6 10:13:18 2003
@@ -3,7 +3,9 @@
 PROG     = fhourstones
 CPPFLAGS = -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8
 
+include $(LEVEL)/Makefile.config
+
 # Specify which file provides the contents of stdin for the test run 
-STDIN_FILENAME = input
+STDIN_FILENAME = $(BUILD_SRC_DIR)/input
 
 include	../Makefile.multisrc




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:22 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:22 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx
Message-ID: <200309061515.KAA13517@choi.cs.uiuc.edu>


Changes in directory llvm/test/Regression/CBackend:

2003-06-23-PromotedExprs.llx updated: 1.1 -> 1.2

---
Log message:

Checkin of autoconf-style object root.

Updated TestRunner tests so that they work correctly in a separate object root
directory.


---
Diffs of the changes:

Index: llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx
diff -u llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx:1.1 llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx:1.2
--- llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx:1.1	Mon Jun 23 14:59:17 2003
+++ llvm/test/Regression/CBackend/2003-06-23-PromotedExprs.llx	Sat Sep  6 10:14:47 2003
@@ -1,7 +1,7 @@
 
-; RUN: as < %s | dis -c > Output/%s.cbe.c
-; RUN: gcc -B/usr/bin/ Output/%s.cbe.c -o Output/%s.cbe
-; RUN: Output/%s.cbe
+; RUN: as < %s | dis -c > f1.cbe.c
+; RUN: gcc -B/usr/bin/ f1.cbe.c -o f1.cbe
+; RUN: ./f1.cbe
 
 bool %doTest(ubyte %x) {
 	%dec.0 = add ubyte %x, 255




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:27 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:27 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/CustomChecked/Makefile
Message-ID: <200309061515.KAA13512@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource/CustomChecked:

Makefile updated: 1.4 -> 1.5

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/SingleSource/CustomChecked/Makefile
diff -u llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.4 llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.5
--- llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.4	Mon Sep  1 10:29:18 2003
+++ llvm/test/Programs/SingleSource/CustomChecked/Makefile	Sat Sep  6 10:13:45 2003
@@ -34,19 +34,19 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-lli): \
 Output/%.run-lli: Output/%.llvm.bc $(LLI)
-	-$(TESTRUNR) $(filter $*.%, $(Source)) "$(LLI) $(LLI_OPTS) $<" $@
+	-$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$(LLI) $(LLI_OPTS) $<" $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-jit): \
 Output/%.run-jit: Output/%.llvm.bc $(LLI)
-	-$(TESTRUNR) $(filter $*.%, $(Source)) "$(LLI) $(JIT_OPTS) $<" $@
+	-$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$(LLI) $(JIT_OPTS) $<" $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-llc): \
 Output/%.run-llc: Output/%.llc
-	-$(TESTRUNR) $(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
+	-$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-cbe): \
 Output/%.run-cbe: Output/%.cbe
-	-$(TESTRUNR) $(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
+	-$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
 
 
 $(PROGRAMS_TO_TEST:%=Output/%.exe-lli): \




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:33 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:33 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs
Message-ID: <200309061515.KAA13507@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.90 -> 1.91

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.90 llvm/test/Programs/Makefile.programs:1.91
--- llvm/test/Programs/Makefile.programs:1.90	Fri Sep  5 14:23:26 2003
+++ llvm/test/Programs/Makefile.programs	Sat Sep  6 10:12:45 2003
@@ -38,15 +38,17 @@
 
 # Dependencies on header files need to be determined explicitly because
 # we do not automatically compute dependencies
-INCLUDES := $(ExtraHeaders) $(wildcard *.h)
+INCLUDES := $(ExtraHeaders) $(wildcard $(SourceDir)/*.h)
 
 include $(LEVEL)/test/Makefile.tests
 
+VPATH=$(SourceDir)
+
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
 .PRECIOUS: Output/%.linked.bc 
 
-PROGDIR = $(LEVEL)/test/Programs
+PROGDIR = $(LLVM_SRC_ROOT)/test/Programs
 
 #
 # Scripts in the Programs directory...




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:38 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:38 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx
Message-ID: <200309061515.KAA13502@choi.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Assembler:

2002-04-07-HexFloatConstants.llx updated: 1.1 -> 1.2

---
Log message:

Checkin of autoconf-style object root.

Updated TestRunner tests so that they work correctly in a separate object root
directory.


---
Diffs of the changes:

Index: llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx
diff -u llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx:1.1 llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx:1.2
--- llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx:1.1	Sun Apr  7 03:14:44 2002
+++ llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx	Sat Sep  6 10:14:44 2003
@@ -5,9 +5,9 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: as < %s | opt -constprop | dis > Output/%s && \
-; RUN: as < %s | dis | as | opt -constprop | dis > Output/%s2 && \
-; RUN: diff Output/%s Output/%s2
+; RUN: as < %s | opt -constprop | dis > s1 && \
+; RUN: as < %s | dis | as | opt -constprop | dis > s2 && \
+; RUN: diff s1 s2
 
 implementation
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:44 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:44 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Burg/Makefile
Message-ID: <200309061515.KAA13496@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Burg:

Makefile updated: 1.6 -> 1.7

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Burg/Makefile
diff -u llvm/test/Programs/MultiSource/Burg/Makefile:1.6 llvm/test/Programs/MultiSource/Burg/Makefile:1.7
--- llvm/test/Programs/MultiSource/Burg/Makefile:1.6	Fri Aug 22 12:15:18 2003
+++ llvm/test/Programs/MultiSource/Burg/Makefile	Sat Sep  6 10:13:12 2003
@@ -1,34 +1,34 @@
 LEVEL = ../../../..
 
+include $(LEVEL)/Makefile.config
+
 PROG     = burg
-CPPFLAGS = -DDEBUG 
+CPPFLAGS = -DDEBUG
 LDFLAGS  = 
 
 ExtraSource := y.tab.c
 
-STDIN_FILENAME = sample.gr
-
-Source  := $(ExtraSource) $(wildcard *.c)
+STDIN_FILENAME = $(BUILD_SRC_DIR)/sample.gr
 
-## $(BUILD_OBJ_ROOT)/Depend/y.tab.d:: y.tab.c $(BUILD_OBJ_ROOT)/Depend/.dir
+include $(LEVEL)/Makefile.config
 
-%.cpp %.h : %.y
-	yacc -d $<
-	$(VERB) cp -p y.tab.c $(basename $@).cpp
-	$(VERB) cp -p y.tab.h $(basename $@).h
-
-##	$(VERB) mv -f $(basename $@).tab.c $(basename $@).cpp
-##	$(VERB) mv -f $(basename $@).tab.h $(basename $@).h
+Source  := $(ExtraSource) $(wildcard $(BUILD_SRC_DIR)/*.c)
 
 include	../Makefile.multisrc
 
-y.tab.c y.tab.h: gram.y
+#
+# JTC -
+#	This is stupid.  I bet we'll yacc twice because of this, but for now it
+#	seems to work.  Ideally, these yacc rules should be in a master rule
+#	file for the test suite, separate from the LLVM build rules.
+# 
+y.tab.h:: $(SourceDir)/gram.y
 	yacc -d $<
 
-lex.c: y.tab.h
-Source := $(patsubst gram.%,,$(Source))
+y.tab.c: $(SourceDir)/gram.y
+	yacc -d $<
 
-## $(BUILD_OBJ_ROOT)/Depend/gram.d: gram.y
+$(SourceDir)/lex.c: y.tab.h
 
 src:
 	echo Sources = $(Source)




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:49 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:49 2003
Subject: [llvm-commits] CVS: llvm/test/QMTestDB/QMTest/llvm.py
Message-ID: <200309061515.KAA13491@choi.cs.uiuc.edu>


Changes in directory llvm/test/QMTestDB/QMTest:

llvm.py updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.

Added new resource and test classes for future tests.
Cleaned up the LLI tests (I think).


---
Diffs of the changes:

Index: llvm/test/QMTestDB/QMTest/llvm.py
diff -u llvm/test/QMTestDB/QMTest/llvm.py:1.3 llvm/test/QMTestDB/QMTest/llvm.py:1.4
--- llvm/test/QMTestDB/QMTest/llvm.py:1.3	Fri Aug 22 11:24:25 2003
+++ llvm/test/QMTestDB/QMTest/llvm.py	Sat Sep  6 10:14:12 2003
@@ -677,10 +677,9 @@
 		tmpdir=context['tmpdir']
 
 		#
-		# Construct the pathname of the source file and object file.
+		# Construct the pathname of the source file.
 		#
 		srcfile=srcroot + '/' + self.assembly_file
-		bcpath=tmpdir + '/' + 'temp.bc'
 
 		#
 		# Construct the pathnames to the various utilities.
@@ -698,12 +697,6 @@
 		else:
 			result.Fail ('Assembler Terminated Abnormally')
 
-		#
-		# Cleanup the bytecode file.
-		#
-		if ((os.access(bcpath,os.F_OK)) == 1):
-			os.remove (bcpath)
-
 		return
 
 
@@ -753,12 +746,12 @@
 		#
 		# Construct the pathnames to the various utilities.
 		#
-		lli  = buildroot + '/tools/Debug/lli'
+		lli  = buildroot + '/tools/Debug/lli -force-interpreter=false '
 
 		#
 		# Execute the program.
 		#
-		estatus=os.system (lli + ' ' + srcfile + ' > /dev/null 2>&1')
+		estatus=os.system (lli + ' ' + srcfile + ' < /dev/null')
 		if ((os.WIFEXITED(estatus)) and (os.WEXITSTATUS(estatus) != 0)):
 			result.Fail('LLI failed to execute bytecode')
 
@@ -934,6 +927,98 @@
 
 ##############################################################################
 #
+# Class: CTest
+#
+# Description:
+#	This test verifies that the specified C program can be compiled
+#	into LLVM assembly code which can then be assembled into LLVM byte
+#	code.
+#
+##############################################################################
+class CTest(qm.test.test.Test):
+
+	description="Verifies that LLVM can compile C code into LLVM bytecode"
+
+	#
+	# List of arguments that the objects accepts for test configuration.
+	#
+	arguments = [
+		qm.fields.TextField(name='srcfile',
+		                    title='C Source Code File',
+		                    description='C Source Code File to Convert to LLVM Bytecode'),
+	]
+
+
+	#devnull = ' > /dev/null 2>&1'
+	devnull = ''
+
+	def Run (self, context, result):
+
+		#
+		# Set the core dump size
+		#
+		resource.setrlimit (resource.RLIMIT_CORE, (context['coresize'],-1))
+
+		#
+		# Fetch the source and build root directories from the context.
+		#
+		srcroot=context['srcroot']
+		buildroot=context['buildroot']
+		tmpdir=context['tmpdir']
+
+		#
+		# Construct the pathname of the source file and object file.
+		#
+		srcfile=srcroot + '/' + self.srcfile
+		llvmsrc=tmpdir + '/' + os.path.basename (self.srcfile) + '.ll'
+		llvmobj=tmpdir + '/' + os.path.basename (self.srcfile) + '.bc'
+
+		#
+		# Construct the pathnames to the various utilities.
+		#
+		cc   = context['llvmgcc']
+		as   = buildroot + '/tools/' + context['buildtype'] + '/as'
+
+		#
+		# Construct the command to generate the LLVM assembly and byte
+		# code.
+		#
+		ccmd = cc + ' -S ' + srcfile + ' -o ' + llvmsrc + self.devnull
+		acmd = as + ' -f ' + llvmsrc + ' -o /dev/null 2>&1 /dev/null'
+
+		#
+		# Assemble the program into C code and then compile it.
+		#
+		estatus=os.system (ccmd)
+		if ((os.WIFEXITED(estatus)) and (os.WEXITSTATUS(estatus) != 0)):
+			fail = 1
+			result.Fail('Compiling C code failed')
+		else:
+			estatus=os.system (acmd)
+			if ((os.WIFEXITED(estatus)) and (os.WEXITSTATUS(estatus) != 0)):
+				fail = 1
+				result.Fail('Compiling code failed')
+			else:
+				fail = 0
+
+		#
+		# Cleanup the files.
+		#
+		if ((os.access(llvmsrc,os.F_OK)) == 1):
+			os.remove (llvmsrc)
+		else:
+			if (fail == 0):
+				result.Fail ('Object file not generated')
+
+		return
+
+
+##############################################################################
+# RESOURCES
+##############################################################################
+
+##############################################################################
+#
 # Class: MakeResource
 #
 # Description:
@@ -1014,112 +1099,101 @@
 	def CleanUp(self, result):
 		return
 
+
 ##############################################################################
 #
-# Class: CTest
+# Class: BytecodeResource
 #
 # Description:
-#	This test verifies that the specified C program can be compiled
-#	into LLVM assembly code which can then be assembled into LLVM byte
-#	code.
+#	This resource takes the specified source file and builds a bytecode
+#	file from it.
 #
 ##############################################################################
-class CTest(qm.test.test.Test):
-
-	description="Verifies that LLVM can compile C code into LLVM bytecode"
 
-	#
-	# List of arguments that the objects accepts for test configuration.
-	#
+class BytecodeResource(qm.test.resource.Resource):
 	arguments = [
 		qm.fields.TextField(name='srcfile',
-		                    title='C Source Code File',
-		                    description='C Source Code File to Convert to LLVM Bytecode'),
+		                    title='Source File',
+		                    description='Name of the file to assemble into bytecode.'),
+		qm.fields.TextField(name='bcfilename',
+		                    title='Bytecode Filename',
+		                    description='Name of the bytecode file to be generated.'),
 	]
 
+	srcroot=''
+	buildroot=''
+	tmpdir=''
 
-	#devnull = ' > /dev/null 2>&1'
-	devnull = ''
-
-	def Run (self, context, result):
-
+	#
+	# Method: SetUp()
+	#
+	# Description:
+	#	This method creates an instance of this resource.
+	#	Specifically, it will create the necessary bytecode file from
+	#	the specified source file.
+	#
+	def SetUp(self, context, result):
 		#
 		# Set the core dump size
 		#
 		resource.setrlimit (resource.RLIMIT_CORE, (context['coresize'],-1))
 
 		#
-		# Fetch the source and build root directories from the context.
-		#
-		srcroot=context['srcroot']
-		buildroot=context['buildroot']
-		tmpdir=context['tmpdir']
-
-		#
-		# Construct the pathname of the source file and object file.
-		#
-		srcfile=srcroot + '/' + self.srcfile
-		llvmsrc=tmpdir + '/' + os.path.basename (self.srcfile) + '.ll'
-		llvmobj=tmpdir + '/' + os.path.basename (self.srcfile) + '.bc'
-
-		#
-		# Construct the pathnames to the various utilities.
+		# Determine the pathnames to the source code and object code.
 		#
-		cc   = context['llvmgcc']
-		as   = buildroot + '/tools/' + context['buildtype'] + '/as'
+		self.srcroot   = context['srcroot']
+		self.buildroot = context['buildroot']
+		self.tmpdir    = context['tmpdir']
 
 		#
-		# Construct the command to generate the LLVM assembly and byte
-		# code.
+		# Now create the source file pathname.
 		#
-		ccmd = cc + ' -S ' + srcfile + ' -o ' + llvmsrc + self.devnull
-		acmd = as + ' -f ' + llvmsrc + ' -o /dev/null 2>&1 /dev/null'
+		srcpath = self.srcroot + '/' + self.srcfile
+		bcpath  = self.tmpdir  + '/' + self.bcfilename
 
 		#
-		# Assemble the program into C code and then compile it.
+		# Find the pathname of the assembler.
 		#
-		estatus=os.system (ccmd)
-		if ((os.WIFEXITED(estatus)) and (os.WEXITSTATUS(estatus) != 0)):
-			fail = 1
-			result.Fail('Compiling C code failed')
-		else:
-			estatus=os.system (acmd)
-			if ((os.WIFEXITED(estatus)) and (os.WEXITSTATUS(estatus) != 0)):
-				fail = 1
-				result.Fail('Compiling code failed')
-			else:
-				fail = 0
+		as = self.buildroot + '/tools/Debug/as'
 
 		#
-		# Cleanup the files.
+		# Use the LLVM assembler to create the bytecode file.
 		#
-		if ((os.access(llvmsrc,os.F_OK)) == 1):
-			os.remove (llvmsrc)
-		else:
-			if (fail == 0):
-				result.Fail ('Object file not generated')
+		exstatus=os.spawnl (os.P_WAIT, as, as, srcpath, '-o=' + bcpath)
+		if (exstatus != 0):
+			result.Fail('Failed to assemble ' + srcpath)
+			return
+		return
 
+	#
+	# Method: CleanUp()
+	#
+	# Description:
+	#	This method removes the resource once it is no longer needed.
+	#
+	def CleanUp(self, result):
+		os.remove (self.tmpdir + '/' + self.bcfilename)
 		return
 
 
 ##############################################################################
 #
-# Class: BytecodeResource
+# Class: NativecodeResource
 #
 # Description:
-#	This resource takes the specified source file and builds a bytecode
-#	file from it.
+#	This resource takes the specified source file and compiles it into
+#	a native program using the standard C or C++ compiler.
 #
 ##############################################################################
 
-class BytecodeResource(qm.test.resource.Resource):
+class NativecodeResource(qm.test.resource.Resource):
 	arguments = [
 		qm.fields.TextField(name='srcfile',
 		                    title='Source File',
 		                    description='Name of the file to assemble into bytecode.'),
-		qm.fields.TextField(name='bcfilename',
-		                    title='Bytecode Filename',
-		                    description='Name of the bytecode file to be generated.'),
+		qm.fields.TextField(name='libs',
+		                    title='Libraries',
+		                    description='Libraries to link into the program.'),
 	]
 
 	srcroot=''
@@ -1131,14 +1205,10 @@
 	#
 	# Description:
 	#	This method creates an instance of this resource.
-	#	Specifically, it will create the necessary bytecode file from
-	#	the specified source file.
+	#	Specifically, it will create the compile the program and link
+	#	it with the specified libraries.
 	#
 	def SetUp(self, context, result):
-		#
-		# Set the core dump size
-		#
-		resource.setrlimit (resource.RLIMIT_CORE, (context['coresize'],-1))
 
 		#
 		# Determine the pathnames to the source code and object code.
@@ -1148,15 +1218,25 @@
 		self.tmpdir    = context['tmpdir']
 
 		#
+		# Split the pathname into it's basename and suffix.
+		#
+		(base, suffix) = os.path.splitext (self.srcfile)
+
+		#
 		# Now create the source file pathname.
 		#
 		srcpath = self.srcroot + '/' + self.srcfile
-		bcpath  = self.tmpdir  + '/' + self.bcfilename
+		objpath = self.tmpdir  + '/' + base
 
 		#
-		# Find the pathname of the assembler.
+		# Determine which compiler to use.
 		#
-		as = self.buildroot + '/tools/Debug/as'
+		if (suffix == '.c'):
+			cc = context['cc']
+			cflags = context['cflags']
+		else:
+			cc = context['cpp']
+			cflags = context['cppflags']
 
 		#
 		# Use the LLVM assembler to create the bytecode file.




From criswell at cs.uiuc.edu  Sat Sep  6 10:16:55 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:16:55 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Makefile.singlesrc
Message-ID: <200309061515.KAA13486@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource:

Makefile.singlesrc updated: 1.21 -> 1.22

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/SingleSource/Makefile.singlesrc
diff -u llvm/test/Programs/SingleSource/Makefile.singlesrc:1.21 llvm/test/Programs/SingleSource/Makefile.singlesrc:1.22
--- llvm/test/Programs/SingleSource/Makefile.singlesrc:1.21	Sun Aug 17 23:33:18 2003
+++ llvm/test/Programs/SingleSource/Makefile.singlesrc	Sat Sep  6 10:13:41 2003
@@ -16,7 +16,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-PROGRAMS_TO_TEST = $(basename $(Source))
+PROGRAMS_TO_TEST = $(patsubst $(SourceDir)%,%,$(basename $(Source)))
 
 include $(LEVEL)/test/Programs/Makefile.programs
 .PRECIOUS: Output/%.linked.rll
@@ -25,14 +25,14 @@
 Output/%.linked.rll: Output/%.ll
 	cp -f $< $@
 
-Output/%.LOC.txt: %.c
+Output/%.LOC.txt: $(SourceDir)/%.c
 	cat $< | wc -l > $@
-Output/%.LOC.txt: %.cpp
+Output/%.LOC.txt: $(SourceDir)/%.cpp
 	cat $< | wc -l > $@
 endif
 
 # FIXME: LIBS should be specified, not hardcoded to -lm
-Output/%.native: %.c Output/.dir
+Output/%.native: $(SourceDir)/%.c Output/.dir
 	$(CC) $(CFLAGS) -O2 $< -lm -o $@
-Output/%.native: %.cpp Output/.dir
+Output/%.native: $(SourceDir)/%.cpp Output/.dir
 	$(CXX) $(CXXFLAGS) -O2 $< -lm -o $@




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Makefile.multisrc
Message-ID: <200309061515.KAA13481@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.35 -> 1.36

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.35 llvm/test/Programs/MultiSource/Makefile.multisrc:1.36
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.35	Sun Aug 17 23:33:15 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Sat Sep  6 10:13:08 2003
@@ -31,13 +31,22 @@
 
 .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
-Output/%.o: $(SourceDir)%.c Output/.dir
+Output/%.o: $(SourceDir)/%.c Output/.dir
 	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
 
-Output/%.o: $(SourceDir)%.cpp Output/.dir
+Output/%.o: $(SourceDir)/%.cpp Output/.dir
 	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
-Output/%.o: $(SourceDir)%.cc Output/.dir
+Output/%.o: $(SourceDir)/%.cc Output/.dir
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.c Output/.dir
+	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.cpp Output/.dir
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
+
+Output/%.o: %.cc Output/.dir
 	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
 bugpoint-gccas: Output/$(PROG).bugpoint-gccas




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:07 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:07 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile
Message-ID: <200309061515.KAA13476@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/bc:

Makefile updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.3 llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.4
--- llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.3	Fri Aug 15 14:02:50 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile	Sat Sep  6 10:13:37 2003
@@ -1,7 +1,10 @@
 LEVEL = ../../../../..
+
+include $(LEVEL)/Makefile.config
+
 PROG = bc
 OBJS = scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o
-STDIN_FILENAME = primes.b
+STDIN_FILENAME = $(BUILD_SRC_DIR)/primes.b
 
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:12 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:12 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile
Message-ID: <200309061515.KAA13471@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/anagram:

Makefile updated: 1.4 -> 1.5

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.4 llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.5
--- llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.4	Fri Aug 15 14:02:48 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile	Sat Sep  6 10:13:34 2003
@@ -1,8 +1,11 @@
 LEVEL=../../../../..
+
+include $(LEVEL)/Makefile.config
+
 PROG = anagram
 #OBJS = anagram.o
 RUN_OPTIONS = words 
-STDIN_FILENAME = input.OUT
+STDIN_FILENAME = $(BUILD_SRC_DIR)/input.OUT
 
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
  




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:18 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:18 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll 2002-07-17-LinkTest2.ll 2002-08-20-ConstantExpr.ll 2003-01-30-LinkerRename.ll 2003-01-30-LinkerTypeRename.ll 2003-04-21-Linkage.ll 2003-04-23-LinkOnceLost.ll 2003-04-26-NullPtrLinkProblem.ll 2003-05-15-TypeProblem.ll 2003-05-31-LinkerRename.ll 2003-06-02-TypeResolveProblem.ll 2003-06-02-TypeResolveProblem2.ll AppendingLinkage.ll AppendingLinkage2.ll LinkOnce.ll testlink1.ll
Message-ID: <200309061515.KAA13466@choi.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Linker:

2002-07-17-GlobalFail.ll updated: 1.1 -> 1.2
2002-07-17-LinkTest2.ll updated: 1.2 -> 1.3
2002-08-20-ConstantExpr.ll updated: 1.2 -> 1.3
2003-01-30-LinkerRename.ll updated: 1.1 -> 1.2
2003-01-30-LinkerTypeRename.ll updated: 1.1 -> 1.2
2003-04-21-Linkage.ll updated: 1.1 -> 1.2
2003-04-23-LinkOnceLost.ll updated: 1.1 -> 1.2
2003-04-26-NullPtrLinkProblem.ll updated: 1.1 -> 1.2
2003-05-15-TypeProblem.ll updated: 1.1 -> 1.2
2003-05-31-LinkerRename.ll updated: 1.3 -> 1.4
2003-06-02-TypeResolveProblem.ll updated: 1.1 -> 1.2
2003-06-02-TypeResolveProblem2.ll updated: 1.1 -> 1.2
AppendingLinkage.ll updated: 1.2 -> 1.3
AppendingLinkage2.ll updated: 1.1 -> 1.2
LinkOnce.ll updated: 1.1 -> 1.2
testlink1.ll updated: 1.8 -> 1.9

---
Log message:

Checkin of autoconf-style object root.

Updated TestRunner tests so that they work correctly in a separate object root
directory.


---
Diffs of the changes:

Index: llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll
diff -u llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.1 llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.2
--- llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.1	Tue Jul 23 13:26:47 2002
+++ llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll	Sat Sep  6 10:15:03 2003
@@ -1,6 +1,6 @@
-; RUN: as < %s > Output/%s.bc
-; RUN: echo | as > Output/%s.tmp.bc
-; RUN: link Output/%s.tmp.bc Output/%s.bc
+; RUN: as < %s > %t.bc
+; RUN: echo | as > %t.tmp.bc
+; RUN: link %t.tmp.bc %t.bc
 
 %X = constant int 5
 %Y = internal global [2 x int*] [ int* %X, int * %X]


Index: llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll
diff -u llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.2 llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.3
--- llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.2	Tue Aug 20 14:32:17 2002
+++ llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll	Sat Sep  6 10:15:03 2003
@@ -1,8 +1,8 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
-; RUN: as > Output/LinkTest1.bc < /dev/null
-; RUN: as < %s > Output/LinkTest2.bc
-; RUN: link Output/LinkTest[12].bc
+; RUN: as > %t1.bc < /dev/null
+; RUN: as < %s > %t2.bc
+; RUN: link %t[12].bc
 
 %work = global int (int, int)* %zip
 


Index: llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll
diff -u llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.2 llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.3
--- llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.2	Thu Jan 23 13:52:48 2003
+++ llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll	Sat Sep  6 10:15:03 2003
@@ -1,8 +1,8 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
-; RUN: as > Output/%s.LinkTest.bc < /dev/null
-; RUN: as < %s > Output/%s.bc
-; RUN: link Output/%s.LinkTest.bc Output/%s.bc
+; RUN: as > %t.LinkTest.bc < /dev/null
+; RUN: as < %s > %t.bc
+; RUN: link %t.LinkTest.bc %t.bc
 
 %work = global int 4
 %test = global int* getelementptr( int* %work, long 1)


Index: llvm/test/Regression/Linker/2003-01-30-LinkerRename.ll
diff -u llvm/test/Regression/Linker/2003-01-30-LinkerRename.ll:1.1 llvm/test/Regression/Linker/2003-01-30-LinkerRename.ll:1.2
--- llvm/test/Regression/Linker/2003-01-30-LinkerRename.ll:1.1	Thu Jan 30 13:28:01 2003
+++ llvm/test/Regression/Linker/2003-01-30-LinkerRename.ll	Sat Sep  6 10:15:03 2003
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the external symbol not the internal 
 ; one...
 
-; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep '%foo()' | grep -v internal
+; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep '%foo()' | grep -v internal
 
 implementation
 int %foo() { ret int 0 }


Index: llvm/test/Regression/Linker/2003-01-30-LinkerTypeRename.ll
diff -u llvm/test/Regression/Linker/2003-01-30-LinkerTypeRename.ll:1.1 llvm/test/Regression/Linker/2003-01-30-LinkerTypeRename.ll:1.2
--- llvm/test/Regression/Linker/2003-01-30-LinkerTypeRename.ll:1.1	Thu Jan 30 14:03:15 2003
+++ llvm/test/Regression/Linker/2003-01-30-LinkerTypeRename.ll	Sat Sep  6 10:15:03 2003
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "%Ty = type opaque" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep '%Ty ' | grep -v opaque
+; RUN: echo "%Ty = type opaque" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep '%Ty ' | grep -v opaque
 
 %Ty = type int
 


Index: llvm/test/Regression/Linker/2003-04-21-Linkage.ll
diff -u llvm/test/Regression/Linker/2003-04-21-Linkage.ll:1.1 llvm/test/Regression/Linker/2003-04-21-Linkage.ll:1.2
--- llvm/test/Regression/Linker/2003-04-21-Linkage.ll:1.1	Mon Apr 21 16:06:25 2003
+++ llvm/test/Regression/Linker/2003-04-21-Linkage.ll	Sat Sep  6 10:15:03 2003
@@ -1,6 +1,6 @@
-; RUN: echo "%X = linkonce global int 5  implementation linkonce int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc 
+; RUN: echo "%X = linkonce global int 5  implementation linkonce int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc 
 %X = external global int 
 
 implementation


Index: llvm/test/Regression/Linker/2003-04-23-LinkOnceLost.ll
diff -u llvm/test/Regression/Linker/2003-04-23-LinkOnceLost.ll:1.1 llvm/test/Regression/Linker/2003-04-23-LinkOnceLost.ll:1.2
--- llvm/test/Regression/Linker/2003-04-23-LinkOnceLost.ll:1.1	Wed Apr 23 13:38:24 2003
+++ llvm/test/Regression/Linker/2003-04-23-LinkOnceLost.ll	Sat Sep  6 10:15:03 2003
@@ -1,8 +1,8 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "implementation linkonce void %foo() { ret void } " | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep foo | grep linkonce
+; RUN: echo "implementation linkonce void %foo() { ret void } " | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep foo | grep linkonce
 
 declare void %foo()


Index: llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll
diff -u llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.1 llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.2
--- llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.1	Sat Apr 26 15:29:09 2003
+++ llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll	Sat Sep  6 10:15:03 2003
@@ -1,9 +1,9 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo "%T = type int" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type int" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 


Index: llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll
diff -u llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.1 llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.2
--- llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.1	Thu May 15 11:01:32 2003
+++ llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll	Sat Sep  6 10:15:03 2003
@@ -1,9 +1,9 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo "%S = type { %T*} %T = type opaque" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%S = type { %T*} %T = type opaque" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %S = type { %T* }
 %T = type int


Index: llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll
diff -u llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll:1.3 llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll:1.4
--- llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll:1.3	Sat Jun 28 18:32:04 2003
+++ llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll	Sat Sep  6 10:15:03 2003
@@ -3,9 +3,9 @@
 ; a program that already has an external declaration for the function name, we must
 ; rename the internal function to something that does not conflict.
 
-; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep 'internal' | not grep '%foo('
+; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep 'internal' | not grep '%foo('
 
 implementation
 declare int %foo() 


Index: llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll
diff -u llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.1 llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.2
--- llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.1	Mon Jun  2 12:07:42 2003
+++ llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll	Sat Sep  6 10:15:03 2003
@@ -1,6 +1,6 @@
-; RUN: echo "%T = type opaque" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type opaque" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 %a = constant { %T* }  { %T* null }


Index: llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll
diff -u llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.1 llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.2
--- llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.1	Mon Jun  2 12:31:24 2003
+++ llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll	Sat Sep  6 10:15:03 2003
@@ -1,6 +1,6 @@
-; RUN: echo "%T = type int" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type int" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 


Index: llvm/test/Regression/Linker/AppendingLinkage.ll
diff -u llvm/test/Regression/Linker/AppendingLinkage.ll:1.2 llvm/test/Regression/Linker/AppendingLinkage.ll:1.3
--- llvm/test/Regression/Linker/AppendingLinkage.ll:1.2	Tue May 13 16:32:48 2003
+++ llvm/test/Regression/Linker/AppendingLinkage.ll	Sat Sep  6 10:15:03 2003
@@ -1,8 +1,8 @@
 ; Test that appending linkage works correctly.
 
-; RUN: echo "%X = appending global [1x int] [int 8]" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep 7 | grep 4 | grep 8
+; RUN: echo "%X = appending global [1x int] [int 8]" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep 7 | grep 4 | grep 8
 
 %X = appending global [2 x int] [int 7, int 4]
 


Index: llvm/test/Regression/Linker/AppendingLinkage2.ll
diff -u llvm/test/Regression/Linker/AppendingLinkage2.ll:1.1 llvm/test/Regression/Linker/AppendingLinkage2.ll:1.2
--- llvm/test/Regression/Linker/AppendingLinkage2.ll:1.1	Tue May 13 15:48:17 2003
+++ llvm/test/Regression/Linker/AppendingLinkage2.ll	Sat Sep  6 10:15:03 2003
@@ -1,7 +1,7 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = appending global [1x int] [int 8]" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep 7 | grep 8
+; RUN: echo "%X = appending global [1x int] [int 8]" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep 7 | grep 8
 
 %X = appending global [1 x int] [int 7]


Index: llvm/test/Regression/Linker/LinkOnce.ll
diff -u llvm/test/Regression/Linker/LinkOnce.ll:1.1 llvm/test/Regression/Linker/LinkOnce.ll:1.2
--- llvm/test/Regression/Linker/LinkOnce.ll:1.1	Wed Apr 16 16:21:35 2003
+++ llvm/test/Regression/Linker/LinkOnce.ll	Sat Sep  6 10:15:03 2003
@@ -1,8 +1,8 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "%X = linkonce global int 8" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis
+; RUN: echo "%X = linkonce global int 8" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis
 
 %X = linkonce global int 7


Index: llvm/test/Regression/Linker/testlink1.ll
diff -u llvm/test/Regression/Linker/testlink1.ll:1.8 llvm/test/Regression/Linker/testlink1.ll:1.9
--- llvm/test/Regression/Linker/testlink1.ll:1.8	Wed Apr 23 13:38:13 2003
+++ llvm/test/Regression/Linker/testlink1.ll	Sat Sep  6 10:15:04 2003
@@ -1,6 +1,6 @@
-; RUN: as < %s > Output/%s.bc
-; RUN: as < testlink2.ll > Output/testlink2.bc
-; RUN: link Output/%s.bc Output/testlink2.bc
+; RUN: as < %s > %t.bc
+; RUN: as < `dirname %s`/testlink2.ll > %t2.bc
+; RUN: link %t.bc %t2.bc
 
 %MyVar     = external global int
 %MyIntList = global { \2 *, int } { { \2, int }* null, int 17 }




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:25 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:25 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile
Message-ID: <200309061515.KAA13429@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/17-bintr:

Makefile updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.3 llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.4
--- llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.3	Fri Aug 15 13:59:19 2003
+++ llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile	Sat Sep  6 10:13:30 2003
@@ -1,7 +1,10 @@
 LEVEL = ../../../../..
+
+include $(LEVEL)/Makefile.config
+
 PROG = bintr
 LDFLAGS = -lm
 #RUN_OPTIONS += 
-STDIN_FILENAME = bnchmrk.in1
+STDIN_FILENAME = $(BUILD_SRC_DIR)/bnchmrk.in1
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:17:30 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:17:30 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/09-vor/Makefile
Message-ID: <200309061515.KAA13424@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/09-vor:

Makefile updated: 1.3 -> 1.4

---
Log message:

Checkin of autoconf-style object root.

Adjusted the Makefile rules to handle building outside the source directory.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/09-vor/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.3 llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.4
--- llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.3	Fri Aug 15 13:59:19 2003
+++ llvm/test/Programs/MultiSource/McCat/09-vor/Makefile	Sat Sep  6 10:13:27 2003
@@ -1,6 +1,9 @@
 LEVEL = ../../../../..
+
+include $(LEVEL)/Makefile.config
+
 PROG = vor
-STDIN_FILENAME = vor.in3
+STDIN_FILENAME = $(BUILD_SRC_DIR)/vor.in3
 LDFLAGS = -lm
 
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc




From criswell at cs.uiuc.edu  Sat Sep  6 10:18:05 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:18:05 2003
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200309061517.KAA13556@choi.cs.uiuc.edu>


Changes in directory llvm:

configure updated: 1.13 -> 1.14

---
Log message:

Checkin of autoconf-style object root.

Copies Makefiles into the new object root directory from the source directory.
Removed the --with-objroot option.


---
Diffs of the changes:

Index: llvm/configure
diff -u llvm/configure:1.13 llvm/configure:1.14
--- llvm/configure:1.13	Mon Aug 25 11:49:50 2003
+++ llvm/configure	Sat Sep  6 10:17:13 2003
@@ -464,7 +464,7 @@
 #endif"
 
 ac_unique_file=""Makefile.config.in""
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RPWD SED RM MKDIR DATE MV DOT ETAGS PURIFY PYTHON QMTEST ALLOCA LIBOBJS MMAP_FILE ENABLE_PURIFY ENABLE_OPTIMIZED USE_SPEC UPB DISABLE_LLC_DIFFS JIT SPEC_ROOT BCR PAPIDIR OBJROOT LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RPWD SED RM MKDIR DATE MV DOT ETAGS PURIFY PYTHON QMTEST ALLOCA LIBOBJS MMAP_FILE ENABLE_PURIFY ENABLE_OPTIMIZED USE_SPEC UPB DISABLE_LLC_DIFFS JIT SPEC_ROOT BCR PAPIDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1050,8 +1050,6 @@
   --with-bcrepos          Location of Bytecode Repository
   --with-papi             Location of PAPI
   --with-purify           Location of purify program
-  --with-objroot          Location where object files should be placed
-                          (default is .)
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1513,6 +1511,525 @@
 
           ac_config_headers="$ac_config_headers include/Config/config.h"
 
+          ac_config_commands="$ac_config_commands Makefile"
+
+
+          ac_config_commands="$ac_config_commands Makefile.common"
+
+
+          ac_config_commands="$ac_config_commands Makefile.rules"
+
+
+          ac_config_commands="$ac_config_commands lib/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Analysis/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Analysis/DataStructure/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Analysis/IPA/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Analysis/LiveVar/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/AsmParser/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Bytecode/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Bytecode/Reader/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Bytecode/Writer/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CWriter/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/InstrSched/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/InstrSelection/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/ModuloScheduling/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/PostOpts/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/PreOpts/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/RegAlloc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/CodeGen/SelectionDAG/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/ExecutionEngine/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/ExecutionEngine/Interpreter/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/ExecutionEngine/JIT/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Support/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Target/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Target/Sparc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Target/X86/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Hello/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/IPO/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/ProfilePaths/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Scalar/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/Transforms/Utils/Makefile"
+
+
+          ac_config_commands="$ac_config_commands lib/VMCore/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/crtend/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libgcc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libm/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/libdummy/Makefile"
+
+
+          ac_config_commands="$ac_config_commands runtime/libtrace/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Makefile.tests"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/Makefile.programs"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.aa.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.report"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.micro.report"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.aa.report"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.example.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.buildrepo.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.jit.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.report"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.jit.report"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.typesafe.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.gnuplot"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/TEST.micro.Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/179.art/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/183.equake/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/188.ammp/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/164.gzip/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/175.vpr/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/176.gcc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/181.mcf/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/186.crafty/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/197.parser/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/254.gap/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/255.vortex/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/300.twolf/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/LLVMSource/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/Flex/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/Larn/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/Moria-5.5.2/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/Povray31/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/NoSource/m4/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile"
+
+
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/analyze/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/as/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/bugpoint/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/dis/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/extract/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/gccas/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/gccld/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/link/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/llc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/lli/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/opt/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/llee/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/llvm-as/Makefile"
+
+
+          ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile"
+
+
+          ac_config_commands="$ac_config_commands utils/Makefile"
+
+
+          ac_config_commands="$ac_config_commands utils/Burg/Makefile"
+
+
+          ac_config_commands="$ac_config_commands utils/Burg/Doc/Makefile"
+
+
+          ac_config_commands="$ac_config_commands utils/TableGen/Makefile"
+
+
+          ac_config_commands="$ac_config_commands www/docs/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/Makefile.common"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/Makefile.config"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/lib/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/lib/sample/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/tools/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/sample/tools/sample/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile.common"
+
+
+          ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/Makefile"
+
+
+          ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/ModuleMaker/Makefile"
+
+
 
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3860,7 +4377,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3863 "configure"' > conftest.$ac_ext
+  echo '#line 4380 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4701,7 +5218,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:4704:" \
+echo "$as_me:5221:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5710,11 +6227,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:5713: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:5717: \$? = $ac_status" >&5
+   echo "$as_me:6234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -5942,11 +6459,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:5945: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6462: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:5949: \$? = $ac_status" >&5
+   echo "$as_me:6466: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6009,11 +6526,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6012: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6529: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6016: \$? = $ac_status" >&5
+   echo "$as_me:6533: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8021,7 +8538,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8024 "configure"
+#line 8541 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8119,7 +8636,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8122 "configure"
+#line 8639 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10255,11 +10772,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10258: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10262: \$? = $ac_status" >&5
+   echo "$as_me:10779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10322,11 +10839,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10325: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10842: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10329: \$? = $ac_status" >&5
+   echo "$as_me:10846: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11565,7 +12082,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11568 "configure"
+#line 12085 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11663,7 +12180,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11666 "configure"
+#line 12183 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12485,11 +13002,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12488: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12492: \$? = $ac_status" >&5
+   echo "$as_me:13009: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12552,11 +13069,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12555: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13072: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12559: \$? = $ac_status" >&5
+   echo "$as_me:13076: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14496,11 +15013,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14499: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14503: \$? = $ac_status" >&5
+   echo "$as_me:15020: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14728,11 +15245,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14731: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15248: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14735: \$? = $ac_status" >&5
+   echo "$as_me:15252: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14795,11 +15312,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14798: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14802: \$? = $ac_status" >&5
+   echo "$as_me:15319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16807,7 +17324,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16810 "configure"
+#line 17327 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16905,7 +17422,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16908 "configure"
+#line 17425 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22225,29 +22742,6 @@
 
 fi;
 
-if test ${USER}
-then
-	if test -d /localhome/${USER}
-	then
-		OBJROOT=/localhome/${USER}
-
-	else
-		OBJROOT=.
-
-	fi
-else
-	OBJROOT=.
-
-fi
-
-
-# Check whether --with-objroot or --without-objroot was given.
-if test "${with_objroot+set}" = set; then
-  withval="$with_objroot"
-  OBJROOT=$withval
-
-fi;
-
 
           ac_config_files="$ac_config_files Makefile.config"
 cat >confcache <<\_ACEOF
@@ -22665,6 +23159,9 @@
 Configuration headers:
 $config_headers
 
+Configuration commands:
+$config_commands
+
 Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 
@@ -22765,7 +23262,186 @@
 
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
 
+${srcdir}/autoconf/mkinstalldirs `dirname Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname Makefile.common`
+${srcdir}/autoconf/mkinstalldirs `dirname Makefile.rules`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Analysis/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Analysis/DataStructure/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Analysis/IPA/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Analysis/LiveVar/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/AsmParser/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Bytecode/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Bytecode/Reader/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Bytecode/Writer/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CWriter/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/InstrSched/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/InstrSelection/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/ModuloScheduling/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/PostOpts/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/PreOpts/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/RegAlloc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/SelectionDAG/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/ExecutionEngine/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/ExecutionEngine/Interpreter/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/ExecutionEngine/JIT/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Support/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Target/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Target/Sparc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Target/X86/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Hello/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/IPO/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Instrumentation/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Instrumentation/ProfilePaths/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Scalar/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/Transforms/Utils/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname lib/VMCore/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/crtend/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libg/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libgcc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libm/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libmalloc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/GCCLibraries/libucb/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/libdummy/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname runtime/libtrace/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Makefile.tests`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/Makefile.programs`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.aa.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.dsgraph.report`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.micro.report`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.aa.report`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.example.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.nightly.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.buildrepo.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.jit.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.nightly.report`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.dsgraph.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.jit.report`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.typesafe.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.dsgraph.gnuplot`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/TEST.micro.Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CFP2000/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CFP2000/179.art/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CFP2000/183.equake/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CFP2000/188.ammp/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/164.gzip/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/175.vpr/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/176.gcc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/181.mcf/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/186.crafty/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/197.parser/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/254.gap/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/255.vortex/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/External/SPEC/CINT2000/300.twolf/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/LLVMSource/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Makefile.multisrc`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Burg/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Fhourstones/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/01-qbsort/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/03-testtrie/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/04-bisect/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/05-eks/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/08-main/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/09-vor/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/12-IOtest/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/15-trie/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/17-bintr/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/McCat/18-imp/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/bh/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/bisort/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/em3d/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/health/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/mst/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/perimeter/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/power/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/treeadd/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/tsp/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Olden/voronoi/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/OptimizerEval/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/anagram/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/bc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/ft/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/ks/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Ptrdist/yacr2/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/aha/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/llubenchmark/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/sgefa/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/sim/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Flex/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Larn/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Moria-5.5.2/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Povray31/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/m4/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Makefile.singlesrc`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/CustomChecked/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Shootout/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Stanford/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/UnitTests/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/analyze/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/as/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/bugpoint/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/dis/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/extract/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/gccas/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/gccld/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/link/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/llc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/lli/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/opt/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/llee/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/llvm-as/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname tools/llvm-dis/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname utils/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname utils/Burg/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname utils/Burg/Doc/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname utils/TableGen/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname www/docs/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/Makefile.common`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/Makefile.config`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/lib/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/lib/sample/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/tools/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/sample/tools/sample/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/ModuleMaker/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/ModuleMaker/Makefile.common`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/ModuleMaker/tools/Makefile`
+${srcdir}/autoconf/mkinstalldirs `dirname projects/ModuleMaker/tools/ModuleMaker/Makefile`
+
+_ACEOF
 
 
 
@@ -22775,6 +23451,179 @@
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
+  "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
+  "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
+  "Makefile.rules" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.rules" ;;
+  "lib/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
+  "lib/Analysis/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Analysis/Makefile" ;;
+  "lib/Analysis/DataStructure/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Analysis/DataStructure/Makefile" ;;
+  "lib/Analysis/IPA/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Analysis/IPA/Makefile" ;;
+  "lib/Analysis/LiveVar/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Analysis/LiveVar/Makefile" ;;
+  "lib/AsmParser/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/AsmParser/Makefile" ;;
+  "lib/Bytecode/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Bytecode/Makefile" ;;
+  "lib/Bytecode/Reader/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Bytecode/Reader/Makefile" ;;
+  "lib/Bytecode/Writer/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Bytecode/Writer/Makefile" ;;
+  "lib/CWriter/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CWriter/Makefile" ;;
+  "lib/CodeGen/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/Makefile" ;;
+  "lib/CodeGen/InstrSched/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/InstrSched/Makefile" ;;
+  "lib/CodeGen/InstrSelection/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/InstrSelection/Makefile" ;;
+  "lib/CodeGen/ModuloScheduling/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/ModuloScheduling/Makefile" ;;
+  "lib/CodeGen/PostOpts/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/PostOpts/Makefile" ;;
+  "lib/CodeGen/PreOpts/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/PreOpts/Makefile" ;;
+  "lib/CodeGen/RegAlloc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/RegAlloc/Makefile" ;;
+  "lib/CodeGen/SelectionDAG/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/SelectionDAG/Makefile" ;;
+  "lib/ExecutionEngine/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/ExecutionEngine/Makefile" ;;
+  "lib/ExecutionEngine/Interpreter/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/ExecutionEngine/Interpreter/Makefile" ;;
+  "lib/ExecutionEngine/JIT/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/ExecutionEngine/JIT/Makefile" ;;
+  "lib/Support/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Support/Makefile" ;;
+  "lib/Target/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Target/Makefile" ;;
+  "lib/Target/Sparc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Target/Sparc/Makefile" ;;
+  "lib/Target/X86/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Target/X86/Makefile" ;;
+  "lib/Transforms/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Makefile" ;;
+  "lib/Transforms/Hello/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Hello/Makefile" ;;
+  "lib/Transforms/IPO/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/IPO/Makefile" ;;
+  "lib/Transforms/Instrumentation/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Instrumentation/Makefile" ;;
+  "lib/Transforms/Instrumentation/ProfilePaths/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Instrumentation/ProfilePaths/Makefile" ;;
+  "lib/Transforms/Scalar/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Scalar/Makefile" ;;
+  "lib/Transforms/Utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transforms/Utils/Makefile" ;;
+  "lib/VMCore/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/VMCore/Makefile" ;;
+  "runtime/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/Makefile" ;;
+  "runtime/GCCLibraries/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/Makefile" ;;
+  "runtime/GCCLibraries/crtend/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/crtend/Makefile" ;;
+  "runtime/GCCLibraries/libc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libc/Makefile" ;;
+  "runtime/GCCLibraries/libg/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libg/Makefile" ;;
+  "runtime/GCCLibraries/libgcc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libgcc/Makefile" ;;
+  "runtime/GCCLibraries/libm/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libm/Makefile" ;;
+  "runtime/GCCLibraries/libmalloc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libmalloc/Makefile" ;;
+  "runtime/GCCLibraries/libucb/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/GCCLibraries/libucb/Makefile" ;;
+  "runtime/libdummy/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/libdummy/Makefile" ;;
+  "runtime/libtrace/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/libtrace/Makefile" ;;
+  "test/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Makefile" ;;
+  "test/Makefile.tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Makefile.tests" ;;
+  "test/Programs/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/Makefile" ;;
+  "test/Programs/Makefile.programs" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/Makefile.programs" ;;
+  "test/Programs/TEST.aa.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.aa.Makefile" ;;
+  "test/Programs/TEST.dsgraph.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.dsgraph.report" ;;
+  "test/Programs/TEST.micro.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.micro.report" ;;
+  "test/Programs/TEST.aa.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.aa.report" ;;
+  "test/Programs/TEST.example.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.example.Makefile" ;;
+  "test/Programs/TEST.nightly.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.nightly.Makefile" ;;
+  "test/Programs/TEST.buildrepo.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.buildrepo.Makefile" ;;
+  "test/Programs/TEST.jit.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.jit.Makefile" ;;
+  "test/Programs/TEST.nightly.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.nightly.report" ;;
+  "test/Programs/TEST.dsgraph.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.dsgraph.Makefile" ;;
+  "test/Programs/TEST.jit.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.jit.report" ;;
+  "test/Programs/TEST.typesafe.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.typesafe.Makefile" ;;
+  "test/Programs/TEST.dsgraph.gnuplot" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.dsgraph.gnuplot" ;;
+  "test/Programs/TEST.micro.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/TEST.micro.Makefile" ;;
+  "test/Programs/External/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/Makefile" ;;
+  "test/Programs/External/SPEC/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/Makefile" ;;
+  "test/Programs/External/SPEC/CFP2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CFP2000/Makefile" ;;
+  "test/Programs/External/SPEC/CFP2000/179.art/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CFP2000/179.art/Makefile" ;;
+  "test/Programs/External/SPEC/CFP2000/183.equake/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CFP2000/183.equake/Makefile" ;;
+  "test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/197.parser/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/197.parser/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/254.gap/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/254.gap/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" ;;
+  "test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" ;;
+  "test/Programs/LLVMSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/LLVMSource/Makefile" ;;
+  "test/Programs/MultiSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Makefile" ;;
+  "test/Programs/MultiSource/Makefile.multisrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Makefile.multisrc" ;;
+  "test/Programs/MultiSource/Burg/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Burg/Makefile" ;;
+  "test/Programs/MultiSource/Fhourstones/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Fhourstones/Makefile" ;;
+  "test/Programs/MultiSource/McCat/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/Makefile" ;;
+  "test/Programs/MultiSource/McCat/01-qbsort/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/01-qbsort/Makefile" ;;
+  "test/Programs/MultiSource/McCat/03-testtrie/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/03-testtrie/Makefile" ;;
+  "test/Programs/MultiSource/McCat/04-bisect/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/04-bisect/Makefile" ;;
+  "test/Programs/MultiSource/McCat/05-eks/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/05-eks/Makefile" ;;
+  "test/Programs/MultiSource/McCat/08-main/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/08-main/Makefile" ;;
+  "test/Programs/MultiSource/McCat/09-vor/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/09-vor/Makefile" ;;
+  "test/Programs/MultiSource/McCat/12-IOtest/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/12-IOtest/Makefile" ;;
+  "test/Programs/MultiSource/McCat/15-trie/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/15-trie/Makefile" ;;
+  "test/Programs/MultiSource/McCat/17-bintr/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/17-bintr/Makefile" ;;
+  "test/Programs/MultiSource/McCat/18-imp/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/McCat/18-imp/Makefile" ;;
+  "test/Programs/MultiSource/Olden/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/Makefile" ;;
+  "test/Programs/MultiSource/Olden/bh/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/bh/Makefile" ;;
+  "test/Programs/MultiSource/Olden/bisort/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/bisort/Makefile" ;;
+  "test/Programs/MultiSource/Olden/em3d/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/em3d/Makefile" ;;
+  "test/Programs/MultiSource/Olden/health/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/health/Makefile" ;;
+  "test/Programs/MultiSource/Olden/mst/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/mst/Makefile" ;;
+  "test/Programs/MultiSource/Olden/perimeter/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/perimeter/Makefile" ;;
+  "test/Programs/MultiSource/Olden/power/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/power/Makefile" ;;
+  "test/Programs/MultiSource/Olden/treeadd/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/treeadd/Makefile" ;;
+  "test/Programs/MultiSource/Olden/tsp/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/tsp/Makefile" ;;
+  "test/Programs/MultiSource/Olden/voronoi/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Olden/voronoi/Makefile" ;;
+  "test/Programs/MultiSource/OptimizerEval/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/OptimizerEval/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/anagram/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/anagram/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/bc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/bc/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/ft/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/ft/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/ks/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/ks/Makefile" ;;
+  "test/Programs/MultiSource/Ptrdist/yacr2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Ptrdist/yacr2/Makefile" ;;
+  "test/Programs/MultiSource/aha/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/aha/Makefile" ;;
+  "test/Programs/MultiSource/llubenchmark/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/llubenchmark/Makefile" ;;
+  "test/Programs/MultiSource/sgefa/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/sgefa/Makefile" ;;
+  "test/Programs/MultiSource/sim/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/sim/Makefile" ;;
+  "test/Programs/NoSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Makefile" ;;
+  "test/Programs/NoSource/Flex/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Flex/Makefile" ;;
+  "test/Programs/NoSource/Larn/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Larn/Makefile" ;;
+  "test/Programs/NoSource/Moria-5.5.2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Moria-5.5.2/Makefile" ;;
+  "test/Programs/NoSource/Povray31/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Povray31/Makefile" ;;
+  "test/Programs/NoSource/SPEC/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile" ;;
+  "test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile" ;;
+  "test/Programs/NoSource/m4/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/m4/Makefile" ;;
+  "test/Programs/SingleSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Makefile" ;;
+  "test/Programs/SingleSource/Makefile.singlesrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Makefile.singlesrc" ;;
+  "test/Programs/SingleSource/CustomChecked/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/CustomChecked/Makefile" ;;
+  "test/Programs/SingleSource/Shootout/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Shootout/Makefile" ;;
+  "test/Programs/SingleSource/Stanford/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Stanford/Makefile" ;;
+  "test/Programs/SingleSource/UnitTests/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/UnitTests/Makefile" ;;
+  "tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
+  "tools/analyze/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/analyze/Makefile" ;;
+  "tools/as/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/as/Makefile" ;;
+  "tools/bugpoint/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/bugpoint/Makefile" ;;
+  "tools/dis/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/dis/Makefile" ;;
+  "tools/extract/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/extract/Makefile" ;;
+  "tools/gccas/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/gccas/Makefile" ;;
+  "tools/gccld/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/gccld/Makefile" ;;
+  "tools/link/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/link/Makefile" ;;
+  "tools/llc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llc/Makefile" ;;
+  "tools/lli/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/lli/Makefile" ;;
+  "tools/opt/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/opt/Makefile" ;;
+  "tools/llee/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llee/Makefile" ;;
+  "tools/llvm-as/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llvm-as/Makefile" ;;
+  "tools/llvm-dis/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llvm-dis/Makefile" ;;
+  "utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Makefile" ;;
+  "utils/Burg/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Burg/Makefile" ;;
+  "utils/Burg/Doc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Burg/Doc/Makefile" ;;
+  "utils/TableGen/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/TableGen/Makefile" ;;
+  "www/docs/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS www/docs/Makefile" ;;
+  "projects/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/Makefile" ;;
+  "projects/sample/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/Makefile" ;;
+  "projects/sample/Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/Makefile.common" ;;
+  "projects/sample/Makefile.config" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/Makefile.config" ;;
+  "projects/sample/lib/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/lib/Makefile" ;;
+  "projects/sample/lib/sample/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/lib/sample/Makefile" ;;
+  "projects/sample/tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/tools/Makefile" ;;
+  "projects/sample/tools/sample/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/sample/tools/sample/Makefile" ;;
+  "projects/ModuleMaker/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/ModuleMaker/Makefile" ;;
+  "projects/ModuleMaker/Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/ModuleMaker/Makefile.common" ;;
+  "projects/ModuleMaker/tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/ModuleMaker/tools/Makefile" ;;
+  "projects/ModuleMaker/tools/ModuleMaker/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/ModuleMaker/tools/ModuleMaker/Makefile" ;;
   "include/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/Config/config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -22789,6 +23638,7 @@
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -22931,7 +23781,6 @@
 s, at SPEC_ROOT@,$SPEC_ROOT,;t t
 s, at BCR@,$BCR,;t t
 s, at PAPIDIR@,$PAPIDIR,;t t
-s, at OBJROOT@,$OBJROOT,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
@@ -23358,6 +24207,238 @@
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile Makefile ;;
+    Makefile.common ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.common Makefile.common ;;
+    Makefile.rules ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.rules Makefile.rules ;;
+    lib/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Makefile lib/Makefile ;;
+    lib/Analysis/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Analysis/Makefile lib/Analysis/Makefile ;;
+    lib/Analysis/DataStructure/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Analysis/DataStructure/Makefile lib/Analysis/DataStructure/Makefile ;;
+    lib/Analysis/IPA/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Analysis/IPA/Makefile lib/Analysis/IPA/Makefile ;;
+    lib/Analysis/LiveVar/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Analysis/LiveVar/Makefile lib/Analysis/LiveVar/Makefile ;;
+    lib/AsmParser/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/AsmParser/Makefile lib/AsmParser/Makefile ;;
+    lib/Bytecode/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Bytecode/Makefile lib/Bytecode/Makefile ;;
+    lib/Bytecode/Reader/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Bytecode/Reader/Makefile lib/Bytecode/Reader/Makefile ;;
+    lib/Bytecode/Writer/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Bytecode/Writer/Makefile lib/Bytecode/Writer/Makefile ;;
+    lib/CWriter/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CWriter/Makefile lib/CWriter/Makefile ;;
+    lib/CodeGen/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/Makefile lib/CodeGen/Makefile ;;
+    lib/CodeGen/InstrSched/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/InstrSched/Makefile lib/CodeGen/InstrSched/Makefile ;;
+    lib/CodeGen/InstrSelection/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/InstrSelection/Makefile lib/CodeGen/InstrSelection/Makefile ;;
+    lib/CodeGen/ModuloScheduling/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/ModuloScheduling/Makefile lib/CodeGen/ModuloScheduling/Makefile ;;
+    lib/CodeGen/PostOpts/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/PostOpts/Makefile lib/CodeGen/PostOpts/Makefile ;;
+    lib/CodeGen/PreOpts/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/PreOpts/Makefile lib/CodeGen/PreOpts/Makefile ;;
+    lib/CodeGen/RegAlloc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/RegAlloc/Makefile lib/CodeGen/RegAlloc/Makefile ;;
+    lib/CodeGen/SelectionDAG/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/SelectionDAG/Makefile lib/CodeGen/SelectionDAG/Makefile ;;
+    lib/ExecutionEngine/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/ExecutionEngine/Makefile lib/ExecutionEngine/Makefile ;;
+    lib/ExecutionEngine/Interpreter/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/ExecutionEngine/Interpreter/Makefile lib/ExecutionEngine/Interpreter/Makefile ;;
+    lib/ExecutionEngine/JIT/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/ExecutionEngine/JIT/Makefile lib/ExecutionEngine/JIT/Makefile ;;
+    lib/Support/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Support/Makefile lib/Support/Makefile ;;
+    lib/Target/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Target/Makefile lib/Target/Makefile ;;
+    lib/Target/Sparc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Target/Sparc/Makefile lib/Target/Sparc/Makefile ;;
+    lib/Target/X86/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Target/X86/Makefile lib/Target/X86/Makefile ;;
+    lib/Transforms/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Makefile lib/Transforms/Makefile ;;
+    lib/Transforms/Hello/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Hello/Makefile lib/Transforms/Hello/Makefile ;;
+    lib/Transforms/IPO/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/IPO/Makefile lib/Transforms/IPO/Makefile ;;
+    lib/Transforms/Instrumentation/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Instrumentation/Makefile lib/Transforms/Instrumentation/Makefile ;;
+    lib/Transforms/Instrumentation/ProfilePaths/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Instrumentation/ProfilePaths/Makefile lib/Transforms/Instrumentation/ProfilePaths/Makefile ;;
+    lib/Transforms/Scalar/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Scalar/Makefile lib/Transforms/Scalar/Makefile ;;
+    lib/Transforms/Utils/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/Transforms/Utils/Makefile lib/Transforms/Utils/Makefile ;;
+    lib/VMCore/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/VMCore/Makefile lib/VMCore/Makefile ;;
+    runtime/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/Makefile runtime/Makefile ;;
+    runtime/GCCLibraries/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/Makefile runtime/GCCLibraries/Makefile ;;
+    runtime/GCCLibraries/crtend/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/crtend/Makefile runtime/GCCLibraries/crtend/Makefile ;;
+    runtime/GCCLibraries/libc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libc/Makefile runtime/GCCLibraries/libc/Makefile ;;
+    runtime/GCCLibraries/libg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libg/Makefile runtime/GCCLibraries/libg/Makefile ;;
+    runtime/GCCLibraries/libgcc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libgcc/Makefile runtime/GCCLibraries/libgcc/Makefile ;;
+    runtime/GCCLibraries/libm/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libm/Makefile runtime/GCCLibraries/libm/Makefile ;;
+    runtime/GCCLibraries/libmalloc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libmalloc/Makefile runtime/GCCLibraries/libmalloc/Makefile ;;
+    runtime/GCCLibraries/libucb/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libucb/Makefile runtime/GCCLibraries/libucb/Makefile ;;
+    runtime/libdummy/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/libdummy/Makefile runtime/libdummy/Makefile ;;
+    runtime/libtrace/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/libtrace/Makefile runtime/libtrace/Makefile ;;
+    test/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Makefile test/Makefile ;;
+    test/Makefile.tests ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Makefile.tests test/Makefile.tests ;;
+    test/Programs/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/Makefile test/Programs/Makefile ;;
+    test/Programs/Makefile.programs ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/Makefile.programs test/Programs/Makefile.programs ;;
+    test/Programs/TEST.aa.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.aa.Makefile test/Programs/TEST.aa.Makefile ;;
+    test/Programs/TEST.dsgraph.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.dsgraph.report test/Programs/TEST.dsgraph.report ;;
+    test/Programs/TEST.micro.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.micro.report test/Programs/TEST.micro.report ;;
+    test/Programs/TEST.aa.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.aa.report test/Programs/TEST.aa.report ;;
+    test/Programs/TEST.example.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.example.Makefile test/Programs/TEST.example.Makefile ;;
+    test/Programs/TEST.nightly.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.nightly.Makefile test/Programs/TEST.nightly.Makefile ;;
+    test/Programs/TEST.buildrepo.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.buildrepo.Makefile test/Programs/TEST.buildrepo.Makefile ;;
+    test/Programs/TEST.jit.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.jit.Makefile test/Programs/TEST.jit.Makefile ;;
+    test/Programs/TEST.nightly.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.nightly.report test/Programs/TEST.nightly.report ;;
+    test/Programs/TEST.dsgraph.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.dsgraph.Makefile test/Programs/TEST.dsgraph.Makefile ;;
+    test/Programs/TEST.jit.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.jit.report test/Programs/TEST.jit.report ;;
+    test/Programs/TEST.typesafe.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.typesafe.Makefile test/Programs/TEST.typesafe.Makefile ;;
+    test/Programs/TEST.dsgraph.gnuplot ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.dsgraph.gnuplot test/Programs/TEST.dsgraph.gnuplot ;;
+    test/Programs/TEST.micro.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.micro.Makefile test/Programs/TEST.micro.Makefile ;;
+    test/Programs/External/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/Makefile test/Programs/External/Makefile ;;
+    test/Programs/External/SPEC/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/Makefile test/Programs/External/SPEC/Makefile ;;
+    test/Programs/External/SPEC/CFP2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/Makefile test/Programs/External/SPEC/CFP2000/Makefile ;;
+    test/Programs/External/SPEC/CFP2000/179.art/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/179.art/Makefile test/Programs/External/SPEC/CFP2000/179.art/Makefile ;;
+    test/Programs/External/SPEC/CFP2000/183.equake/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/183.equake/Makefile test/Programs/External/SPEC/CFP2000/183.equake/Makefile ;;
+    test/Programs/External/SPEC/CFP2000/188.ammp/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/188.ammp/Makefile test/Programs/External/SPEC/CFP2000/188.ammp/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/Makefile test/Programs/External/SPEC/CINT2000/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/164.gzip/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/164.gzip/Makefile test/Programs/External/SPEC/CINT2000/164.gzip/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/175.vpr/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/175.vpr/Makefile test/Programs/External/SPEC/CINT2000/175.vpr/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/176.gcc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/176.gcc/Makefile test/Programs/External/SPEC/CINT2000/176.gcc/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/181.mcf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/181.mcf/Makefile test/Programs/External/SPEC/CINT2000/181.mcf/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/186.crafty/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/186.crafty/Makefile test/Programs/External/SPEC/CINT2000/186.crafty/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/197.parser/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/197.parser/Makefile test/Programs/External/SPEC/CINT2000/197.parser/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/254.gap/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/254.gap/Makefile test/Programs/External/SPEC/CINT2000/254.gap/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/255.vortex/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/255.vortex/Makefile test/Programs/External/SPEC/CINT2000/255.vortex/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile ;;
+    test/Programs/External/SPEC/CINT2000/300.twolf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CINT2000/300.twolf/Makefile test/Programs/External/SPEC/CINT2000/300.twolf/Makefile ;;
+    test/Programs/LLVMSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/LLVMSource/Makefile test/Programs/LLVMSource/Makefile ;;
+    test/Programs/MultiSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Makefile test/Programs/MultiSource/Makefile ;;
+    test/Programs/MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Makefile.multisrc test/Programs/MultiSource/Makefile.multisrc ;;
+    test/Programs/MultiSource/Burg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Burg/Makefile test/Programs/MultiSource/Burg/Makefile ;;
+    test/Programs/MultiSource/Fhourstones/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Fhourstones/Makefile test/Programs/MultiSource/Fhourstones/Makefile ;;
+    test/Programs/MultiSource/McCat/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/Makefile test/Programs/MultiSource/McCat/Makefile ;;
+    test/Programs/MultiSource/McCat/01-qbsort/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/01-qbsort/Makefile test/Programs/MultiSource/McCat/01-qbsort/Makefile ;;
+    test/Programs/MultiSource/McCat/03-testtrie/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/03-testtrie/Makefile test/Programs/MultiSource/McCat/03-testtrie/Makefile ;;
+    test/Programs/MultiSource/McCat/04-bisect/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/04-bisect/Makefile test/Programs/MultiSource/McCat/04-bisect/Makefile ;;
+    test/Programs/MultiSource/McCat/05-eks/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/05-eks/Makefile test/Programs/MultiSource/McCat/05-eks/Makefile ;;
+    test/Programs/MultiSource/McCat/08-main/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/08-main/Makefile test/Programs/MultiSource/McCat/08-main/Makefile ;;
+    test/Programs/MultiSource/McCat/09-vor/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/09-vor/Makefile test/Programs/MultiSource/McCat/09-vor/Makefile ;;
+    test/Programs/MultiSource/McCat/12-IOtest/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/12-IOtest/Makefile test/Programs/MultiSource/McCat/12-IOtest/Makefile ;;
+    test/Programs/MultiSource/McCat/15-trie/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/15-trie/Makefile test/Programs/MultiSource/McCat/15-trie/Makefile ;;
+    test/Programs/MultiSource/McCat/17-bintr/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/17-bintr/Makefile test/Programs/MultiSource/McCat/17-bintr/Makefile ;;
+    test/Programs/MultiSource/McCat/18-imp/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/McCat/18-imp/Makefile test/Programs/MultiSource/McCat/18-imp/Makefile ;;
+    test/Programs/MultiSource/Olden/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/Makefile test/Programs/MultiSource/Olden/Makefile ;;
+    test/Programs/MultiSource/Olden/bh/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/bh/Makefile test/Programs/MultiSource/Olden/bh/Makefile ;;
+    test/Programs/MultiSource/Olden/bisort/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/bisort/Makefile test/Programs/MultiSource/Olden/bisort/Makefile ;;
+    test/Programs/MultiSource/Olden/em3d/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/em3d/Makefile test/Programs/MultiSource/Olden/em3d/Makefile ;;
+    test/Programs/MultiSource/Olden/health/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/health/Makefile test/Programs/MultiSource/Olden/health/Makefile ;;
+    test/Programs/MultiSource/Olden/mst/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/mst/Makefile test/Programs/MultiSource/Olden/mst/Makefile ;;
+    test/Programs/MultiSource/Olden/perimeter/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/perimeter/Makefile test/Programs/MultiSource/Olden/perimeter/Makefile ;;
+    test/Programs/MultiSource/Olden/power/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/power/Makefile test/Programs/MultiSource/Olden/power/Makefile ;;
+    test/Programs/MultiSource/Olden/treeadd/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/treeadd/Makefile test/Programs/MultiSource/Olden/treeadd/Makefile ;;
+    test/Programs/MultiSource/Olden/tsp/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/tsp/Makefile test/Programs/MultiSource/Olden/tsp/Makefile ;;
+    test/Programs/MultiSource/Olden/voronoi/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Olden/voronoi/Makefile test/Programs/MultiSource/Olden/voronoi/Makefile ;;
+    test/Programs/MultiSource/OptimizerEval/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/OptimizerEval/Makefile test/Programs/MultiSource/OptimizerEval/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/Makefile test/Programs/MultiSource/Ptrdist/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/anagram/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/anagram/Makefile test/Programs/MultiSource/Ptrdist/anagram/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/bc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/bc/Makefile test/Programs/MultiSource/Ptrdist/bc/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/ft/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/ft/Makefile test/Programs/MultiSource/Ptrdist/ft/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/ks/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/ks/Makefile test/Programs/MultiSource/Ptrdist/ks/Makefile ;;
+    test/Programs/MultiSource/Ptrdist/yacr2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Ptrdist/yacr2/Makefile test/Programs/MultiSource/Ptrdist/yacr2/Makefile ;;
+    test/Programs/MultiSource/aha/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/aha/Makefile test/Programs/MultiSource/aha/Makefile ;;
+    test/Programs/MultiSource/llubenchmark/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/llubenchmark/Makefile test/Programs/MultiSource/llubenchmark/Makefile ;;
+    test/Programs/MultiSource/sgefa/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/sgefa/Makefile test/Programs/MultiSource/sgefa/Makefile ;;
+    test/Programs/MultiSource/sim/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/sim/Makefile test/Programs/MultiSource/sim/Makefile ;;
+    test/Programs/NoSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Makefile test/Programs/NoSource/Makefile ;;
+    test/Programs/NoSource/Flex/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Flex/Makefile test/Programs/NoSource/Flex/Makefile ;;
+    test/Programs/NoSource/Larn/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Larn/Makefile test/Programs/NoSource/Larn/Makefile ;;
+    test/Programs/NoSource/Moria-5.5.2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Moria-5.5.2/Makefile test/Programs/NoSource/Moria-5.5.2/Makefile ;;
+    test/Programs/NoSource/Povray31/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Povray31/Makefile test/Programs/NoSource/Povray31/Makefile ;;
+    test/Programs/NoSource/SPEC/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/Makefile test/Programs/NoSource/SPEC/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/Makefile test/Programs/NoSource/SPEC/CINT2000/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile ;;
+    test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile ;;
+    test/Programs/NoSource/m4/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/m4/Makefile test/Programs/NoSource/m4/Makefile ;;
+    test/Programs/SingleSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Makefile test/Programs/SingleSource/Makefile ;;
+    test/Programs/SingleSource/Makefile.singlesrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Makefile.singlesrc test/Programs/SingleSource/Makefile.singlesrc ;;
+    test/Programs/SingleSource/CustomChecked/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/CustomChecked/Makefile test/Programs/SingleSource/CustomChecked/Makefile ;;
+    test/Programs/SingleSource/Shootout/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Shootout/Makefile test/Programs/SingleSource/Shootout/Makefile ;;
+    test/Programs/SingleSource/Stanford/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Stanford/Makefile test/Programs/SingleSource/Stanford/Makefile ;;
+    test/Programs/SingleSource/UnitTests/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/UnitTests/Makefile test/Programs/SingleSource/UnitTests/Makefile ;;
+    tools/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/Makefile tools/Makefile ;;
+    tools/analyze/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/analyze/Makefile tools/analyze/Makefile ;;
+    tools/as/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/as/Makefile tools/as/Makefile ;;
+    tools/bugpoint/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/bugpoint/Makefile tools/bugpoint/Makefile ;;
+    tools/dis/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/dis/Makefile tools/dis/Makefile ;;
+    tools/extract/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/extract/Makefile tools/extract/Makefile ;;
+    tools/gccas/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/gccas/Makefile tools/gccas/Makefile ;;
+    tools/gccld/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/gccld/Makefile tools/gccld/Makefile ;;
+    tools/link/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/link/Makefile tools/link/Makefile ;;
+    tools/llc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llc/Makefile tools/llc/Makefile ;;
+    tools/lli/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/lli/Makefile tools/lli/Makefile ;;
+    tools/opt/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/opt/Makefile tools/opt/Makefile ;;
+    tools/llee/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llee/Makefile tools/llee/Makefile ;;
+    tools/llvm-as/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llvm-as/Makefile tools/llvm-as/Makefile ;;
+    tools/llvm-dis/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llvm-dis/Makefile tools/llvm-dis/Makefile ;;
+    utils/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/Makefile utils/Makefile ;;
+    utils/Burg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/Burg/Makefile utils/Burg/Makefile ;;
+    utils/Burg/Doc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/Burg/Doc/Makefile utils/Burg/Doc/Makefile ;;
+    utils/TableGen/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/TableGen/Makefile utils/TableGen/Makefile ;;
+    www/docs/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/www/docs/Makefile www/docs/Makefile ;;
+    projects/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/Makefile projects/Makefile ;;
+    projects/sample/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/Makefile projects/sample/Makefile ;;
+    projects/sample/Makefile.common ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/Makefile.common projects/sample/Makefile.common ;;
+    projects/sample/Makefile.config ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/Makefile.config projects/sample/Makefile.config ;;
+    projects/sample/lib/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/lib/Makefile projects/sample/lib/Makefile ;;
+    projects/sample/lib/sample/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/lib/sample/Makefile projects/sample/lib/sample/Makefile ;;
+    projects/sample/tools/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/tools/Makefile projects/sample/tools/Makefile ;;
+    projects/sample/tools/sample/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/sample/tools/sample/Makefile projects/sample/tools/sample/Makefile ;;
+    projects/ModuleMaker/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/ModuleMaker/Makefile projects/ModuleMaker/Makefile ;;
+    projects/ModuleMaker/Makefile.common ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/ModuleMaker/Makefile.common projects/ModuleMaker/Makefile.common ;;
+    projects/ModuleMaker/tools/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/ModuleMaker/tools/Makefile projects/ModuleMaker/tools/Makefile ;;
+    projects/ModuleMaker/tools/ModuleMaker/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/projects/ModuleMaker/tools/ModuleMaker/Makefile projects/ModuleMaker/tools/ModuleMaker/Makefile ;;
+  esac
 done
 _ACEOF
 




From criswell at cs.uiuc.edu  Sat Sep  6 10:21:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Sat Sep  6 10:21:01 2003
Subject: [llvm-commits] CVS: llvm/utils/Burg/Makefile
Message-ID: <200309061520.KAA13576@choi.cs.uiuc.edu>


Changes in directory llvm/utils/Burg:

Makefile updated: 1.17 -> 1.18

---
Log message:

Checkin of autoconf-style object root.

Updated Makefile for new autoconf-style object root.


---
Diffs of the changes:

Index: llvm/utils/Burg/Makefile
diff -u llvm/utils/Burg/Makefile:1.17 llvm/utils/Burg/Makefile:1.18
--- llvm/utils/Burg/Makefile:1.17	Thu Aug 21 16:47:12 2003
+++ llvm/utils/Burg/Makefile	Sat Sep  6 10:20:15 2003
@@ -1,13 +1,15 @@
 LEVEL = ../..
 TOOLNAME = burg
-ExtraSource = gram.tab.c
+ExtraSource = $(SourceDir)/gram.tab.c
 
 include $(LEVEL)/Makefile.common
 
-gram.tab.c gram.tab.h:: gram.yc
-	$(VERB) $(BISON) -o gram.tab.c -d $<
+VPATH=$(SourceDir)
 
-lex.c: gram.tab.h
+$(SourceDir)/gram.tab.c $(SourceDir)/gram.tab.h:: gram.yc
+	$(VERB) $(BISON) -o $(SourceDir)/gram.tab.c -d $<
+
+$(SourceDir)/lex.c: $(SourceDir)/gram.tab.h
 
 clean::
 	rm -ff gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp




From lattner at cs.uiuc.edu  Sun Sep  7 00:10:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Sep  7 00:10:02 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/FileLexer.l
Message-ID: <200309070509.AAA20276@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

FileLexer.l updated: 1.13 -> 1.14

---
Log message:

Remove unneeded #include


---
Diffs of the changes:

Index: llvm/utils/TableGen/FileLexer.l
diff -u llvm/utils/TableGen/FileLexer.l:1.13 llvm/utils/TableGen/FileLexer.l:1.14
--- llvm/utils/TableGen/FileLexer.l:1.13	Wed Aug 27 08:41:57 2003
+++ llvm/utils/TableGen/FileLexer.l	Sun Sep  7 00:09:32 2003
@@ -21,7 +21,6 @@
 
 %{
 #include "Record.h"
-#include "Support/CommandLine.h"
 typedef std::pair<Record*, std::vector<Init*>*> SubClassRefTy;
 #include "FileParser.h"
 




From brukman at cs.uiuc.edu  Sun Sep  7 15:25:13 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Sun Sep  7 15:25:13 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/TableGen.cpp
Message-ID: <200309072013.PAA18777@zion.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

TableGen.cpp updated: 1.20 -> 1.21

---
Log message:

Fixed spelling of `intentionally'.


---
Diffs of the changes:

Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.20 llvm/utils/TableGen/TableGen.cpp:1.21
--- llvm/utils/TableGen/TableGen.cpp:1.20	Wed Aug 27 08:41:57 2003
+++ llvm/utils/TableGen/TableGen.cpp	Sun Sep  7 15:12:52 2003
@@ -193,9 +193,9 @@
 }
 
 // ParseMachineCode - Try to split the vector of instructions (which is
-// intentially taken by-copy) in half, narrowing down the possible instructions
-// that we may have found.  Eventually, this list will get pared down to zero or
-// one instruction, in which case we have a match or failure.
+// intentionally taken by-copy) in half, narrowing down the possible
+// instructions that we may have found.  Eventually, this list will get pared
+// down to zero or one instruction, in which case we have a match or failure.
 //
 static Record *ParseMachineCode(std::vector<Record*>::iterator InstsB, 
 				std::vector<Record*>::iterator InstsE,




From brukman at cs.uiuc.edu  Sun Sep  7 22:18:03 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Sun Sep  7 22:18:03 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp
Message-ID: <200309080308.WAA19417@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.33 -> 1.34

---
Log message:

Spell `occurrence' correctly.


---
Diffs of the changes:

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.33 llvm/lib/VMCore/SymbolTable.cpp:1.34
--- llvm/lib/VMCore/SymbolTable.cpp:1.33	Thu Sep  4 18:38:22 2003
+++ llvm/lib/VMCore/SymbolTable.cpp	Sun Sep  7 22:08:43 2003
@@ -293,7 +293,7 @@
   if (TPI != end()) {  
     // Loop over all of the types in the symbol table, replacing any references
     // to OldType with references to NewType.  Note that there may be multiple
-    // occurances, and although we only need to remove one at a time, it's
+    // occurrences, and although we only need to remove one at a time, it's
     // faster to remove them all in one pass.
     //
     VarMap &TyPlane = TPI->second;