From sabre at nondot.org  Mon Jan 15 00:25:55 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 00:25:55 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README.txt
Message-ID: <200701150625.l0F6PtmK019671@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

README.txt updated: 1.151 -> 1.152
---
Log message:

add some notes


---
Diffs of the changes:  (+68 -0)

 README.txt |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+)


Index: llvm/lib/Target/X86/README.txt
diff -u llvm/lib/Target/X86/README.txt:1.151 llvm/lib/Target/X86/README.txt:1.152
--- llvm/lib/Target/X86/README.txt:1.151	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/README.txt	Mon Jan 15 00:25:39 2007
@@ -762,3 +762,71 @@
 We should inline lrintf and probably other libc functions.
 
 //===---------------------------------------------------------------------===//
+
+Start using the flags more.  For example, compile:
+
+int add_zf(int *x, int y, int a, int b) {
+     if ((*x += y) == 0)
+          return a;
+     else
+          return b;
+}
+
+to:
+       addl    %esi, (%rdi)
+       movl    %edx, %eax
+       cmovne  %ecx, %eax
+       ret
+instead of:
+
+_add_zf:
+        addl (%rdi), %esi
+        movl %esi, (%rdi)
+        testl %esi, %esi
+        cmove %edx, %ecx
+        movl %ecx, %eax
+        ret
+
+and:
+
+int add_zf(int *x, int y, int a, int b) {
+     if ((*x + y) < 0)
+          return a;
+     else
+          return b;
+}
+
+to:
+
+add_zf:
+        addl    (%rdi), %esi
+        movl    %edx, %eax
+        cmovns  %ecx, %eax
+        ret
+
+instead of:
+
+_add_zf:
+        addl (%rdi), %esi
+        testl %esi, %esi
+        cmovs %edx, %ecx
+        movl %ecx, %eax
+        ret
+
+//===---------------------------------------------------------------------===//
+
+This:
+#include <math.h>
+int foo(double X) { return isnan(X); }
+
+compiles to (-m64):
+
+_foo:
+        pxor %xmm1, %xmm1
+        ucomisd %xmm1, %xmm0
+        setp %al
+        movzbl %al, %eax
+        ret
+
+the pxor is not needed, we could compare the value against itself.
+





From sabre at nondot.org  Mon Jan 15 00:27:52 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 00:27:52 -0600
Subject: [llvm-commits] CVS: llvm/lib/Analysis/ConstantFolding.cpp
Message-ID: <200701150627.l0F6Rq48019753@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

ConstantFolding.cpp updated: 1.9 -> 1.10
---
Log message:

Constant fold llvm.powi.*.  This speeds up tramp3d--v4 by 9.5%


---
Diffs of the changes:  (+12 -1)

 ConstantFolding.cpp |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)


Index: llvm/lib/Analysis/ConstantFolding.cpp
diff -u llvm/lib/Analysis/ConstantFolding.cpp:1.9 llvm/lib/Analysis/ConstantFolding.cpp:1.10
--- llvm/lib/Analysis/ConstantFolding.cpp:1.9	Sun Jan  7 02:19:47 2007
+++ llvm/lib/Analysis/ConstantFolding.cpp	Mon Jan 15 00:27:37 2007
@@ -40,6 +40,8 @@
   case Intrinsic::bswap_i16:
   case Intrinsic::bswap_i32:
   case Intrinsic::bswap_i64:
+  case Intrinsic::powi_f32:
+  case Intrinsic::powi_f64:
   // FIXME: these should be constant folded as well
   //case Intrinsic::ctpop_i8:
   //case Intrinsic::ctpop_i16:
@@ -186,8 +188,17 @@
           double V = fmod(Op1V, Op2V);
           if (errno == 0)
             return ConstantFP::get(Ty, V);
-        } else if (Name == "atan2")
+        } else if (Name == "atan2") {
           return ConstantFP::get(Ty, atan2(Op1V,Op2V));
+        }
+      } else if (ConstantInt *Op2C = dyn_cast<ConstantInt>(Operands[1])) {
+        if (Name == "llvm.powi.f32") {
+          return ConstantFP::get(Ty, std::pow((float)Op1V,
+                                              (int)Op2C->getZExtValue()));
+        } else if (Name == "llvm.powi.f64") {
+          return ConstantFP::get(Ty, std::pow((double)Op1V,
+                                              (int)Op2C->getZExtValue()));
+        }
       }
     }
   }





From sabre at nondot.org  Mon Jan 15 00:51:40 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 00:51:40 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/Transforms/InstCombine/alloca.ll
Message-ID: <200701150651.l0F6peH4020147@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Transforms/InstCombine:

alloca.ll updated: 1.2 -> 1.3
---
Log message:

add a simple case where instcombine can detect and remove a dead alloca


---
Diffs of the changes:  (+13 -0)

 alloca.ll |   13 +++++++++++++
 1 files changed, 13 insertions(+)


Index: llvm/test/Regression/Transforms/InstCombine/alloca.ll
diff -u llvm/test/Regression/Transforms/InstCombine/alloca.ll:1.2 llvm/test/Regression/Transforms/InstCombine/alloca.ll:1.3
--- llvm/test/Regression/Transforms/InstCombine/alloca.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Regression/Transforms/InstCombine/alloca.ll	Mon Jan 15 00:51:25 2007
@@ -12,3 +12,16 @@
 	call void(...)* %use({}* %Z)
 	ret void
 }
+
+void %test2() {
+	%A = alloca int    ;; dead.
+	store int 123, int* %A
+	ret void
+}
+
+void %test3() {
+	%A = alloca {int}    ;; dead.
+	%B = getelementptr {int}* %A, int 0, uint 0
+	store int 123, int* %B
+	ret void
+}





From sabre at nondot.org  Mon Jan 15 00:52:12 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 00:52:12 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200701150652.l0F6qCTB020168@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.597 -> 1.598
---
Log message:

delete stores to allocas with one use.  This is a trivial form of DSE which
often kicks in for ?: expressions.


---
Diffs of the changes:  (+18 -0)

 InstructionCombining.cpp |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.597 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.598
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.597	Sun Jan 14 20:27:26 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Jan 15 00:51:56 2007
@@ -8237,6 +8237,24 @@
     ++NumCombined;
     return 0;
   }
+  
+  // If the RHS is an alloca with a single use, zapify the store, making the
+  // alloca dead.
+  if (Ptr->hasOneUse()) {
+    if (isa<AllocaInst>(Ptr)) {
+      EraseInstFromFunction(SI);
+      ++NumCombined;
+      return 0;
+    }
+    
+    if (GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(Ptr))
+      if (isa<AllocaInst>(GEP->getOperand(0)) &&
+          GEP->getOperand(0)->hasOneUse()) {
+        EraseInstFromFunction(SI);
+        ++NumCombined;
+        return 0;
+      }
+  }
 
   // Do really simple DSE, to catch cases where there are several consequtive
   // stores to the same location, separated by a few arithmetic operations. This





From sabre at nondot.org  Mon Jan 15 01:03:10 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 01:03:10 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200701150703.l0F73A4b020365@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.598 -> 1.599
---
Log message:

simplify some code now that types are signless


---
Diffs of the changes:  (+12 -46)

 InstructionCombining.cpp |   58 +++++++++--------------------------------------
 1 files changed, 12 insertions(+), 46 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.598 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.599
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.598	Mon Jan 15 00:51:56 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Jan 15 01:02:54 2007
@@ -1927,21 +1927,6 @@
   return (CI->getZExtValue() & (~0ULL >> (64-NumBits))) == (1ULL << (NumBits-1));
 }
 
-/// RemoveNoopCast - Strip off nonconverting casts from the value.
-///
-static Value *RemoveNoopCast(Value *V) {
-  if (CastInst *CI = dyn_cast<CastInst>(V)) {
-    const Type *CTy = CI->getType();
-    const Type *OpTy = CI->getOperand(0)->getType();
-    if (CTy->isInteger() && OpTy->isInteger()) {
-      if (CTy->getPrimitiveSizeInBits() == OpTy->getPrimitiveSizeInBits())
-        return RemoveNoopCast(CI->getOperand(0));
-    } else if (isa<PointerType>(CTy) && isa<PointerType>(OpTy))
-      return RemoveNoopCast(CI->getOperand(0));
-  }
-  return V;
-}
-
 Instruction *InstCombiner::visitSub(BinaryOperator &I) {
   Value *Op0 = I.getOperand(0), *Op1 = I.getOperand(1);
 
@@ -1967,21 +1952,17 @@
     if (match(Op1, m_Not(m_Value(X))))
       return BinaryOperator::createAdd(X,
                     ConstantExpr::getAdd(C, ConstantInt::get(I.getType(), 1)));
-    // -((uint)X >> 31) -> ((int)X >> 31)
-    // -((int)X >> 31) -> ((uint)X >> 31)
+    // -(X >>u 31) -> (X >>s 31)
+    // -(X >>s 31) -> (X >>u 31)
     if (C->isNullValue()) {
-      Value *NoopCastedRHS = RemoveNoopCast(Op1);
-      if (ShiftInst *SI = dyn_cast<ShiftInst>(NoopCastedRHS))
+      if (ShiftInst *SI = dyn_cast<ShiftInst>(Op1))
         if (SI->getOpcode() == Instruction::LShr) {
           if (ConstantInt *CU = dyn_cast<ConstantInt>(SI->getOperand(1))) {
             // Check to see if we are shifting out everything but the sign bit.
             if (CU->getZExtValue() == 
                 SI->getType()->getPrimitiveSizeInBits()-1) {
               // Ok, the transformation is safe.  Insert AShr.
-              // FIXME: Once integer types are signless, this cast should be 
-              // removed.  
-              Value *ShiftOp = SI->getOperand(0); 
-              return new ShiftInst(Instruction::AShr, ShiftOp, CU,
+              return new ShiftInst(Instruction::AShr, SI->getOperand(0), CU,
                                    SI->getName());
             }
           }
@@ -1991,7 +1972,6 @@
             // Check to see if we are shifting out everything but the sign bit.
             if (CU->getZExtValue() == 
                 SI->getType()->getPrimitiveSizeInBits()-1) {
-              
               // Ok, the transformation is safe.  Insert LShr. 
               return new ShiftInst(Instruction::LShr, SI->getOperand(0), CU, 
                                    SI->getName());
@@ -7664,28 +7644,14 @@
   for (unsigned i = 1, e = GEP.getNumOperands(); i != e; ++i, ++GTI)
     if (isa<SequentialType>(*GTI)) {
       if (CastInst *CI = dyn_cast<CastInst>(GEP.getOperand(i))) {
-        Value *Src = CI->getOperand(0);
-        const Type *SrcTy = Src->getType();
-        const Type *DestTy = CI->getType();
-        if (Src->getType()->isInteger()) {
-          if (SrcTy->getPrimitiveSizeInBits() ==
-                       DestTy->getPrimitiveSizeInBits()) {
-            // We can always eliminate a cast from ulong or long to the other.
-            // We can always eliminate a cast from uint to int or the other on
-            // 32-bit pointer platforms.
-            if (DestTy->getPrimitiveSizeInBits() >= TD->getPointerSizeInBits()){
-              MadeChange = true;
-              GEP.setOperand(i, Src);
-            }
-          } else if (SrcTy->getPrimitiveSizeInBits() < 
-                     DestTy->getPrimitiveSizeInBits() &&
-                     SrcTy->getPrimitiveSizeInBits() == 32) {
-            // We can eliminate a cast from [u]int to [u]long iff the target 
-            // is a 32-bit pointer target.
-            if (SrcTy->getPrimitiveSizeInBits() >= TD->getPointerSizeInBits()) {
-              MadeChange = true;
-              GEP.setOperand(i, Src);
-            }
+        if (CI->getOpcode() == Instruction::ZExt ||
+            CI->getOpcode() == Instruction::SExt) {
+          const Type *SrcTy = CI->getOperand(0)->getType();
+          // We can eliminate a cast from i32 to i64 iff the target 
+          // is a 32-bit pointer target.
+          if (SrcTy->getPrimitiveSizeInBits() >= TD->getPointerSizeInBits()) {
+            MadeChange = true;
+            GEP.setOperand(i, CI->getOperand(0));
           }
         }
       }





From sabre at nondot.org  Mon Jan 15 01:29:44 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 01:29:44 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/Transforms/InstCombine/phi.ll
Message-ID: <200701150729.l0F7Ti9k020785@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Transforms/InstCombine:

phi.ll updated: 1.14 -> 1.15
---
Log message:

new testcase


---
Diffs of the changes:  (+12 -0)

 phi.ll |   12 ++++++++++++
 1 files changed, 12 insertions(+)


Index: llvm/test/Regression/Transforms/InstCombine/phi.ll
diff -u llvm/test/Regression/Transforms/InstCombine/phi.ll:1.14 llvm/test/Regression/Transforms/InstCombine/phi.ll:1.15
--- llvm/test/Regression/Transforms/InstCombine/phi.ll:1.14	Fri Dec  1 22:23:09 2006
+++ llvm/test/Regression/Transforms/InstCombine/phi.ll	Mon Jan 15 01:29:29 2007
@@ -1,6 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep phi
 
 implementation
@@ -65,3 +66,14 @@
         ret uint %B
 }
 
+int %test7(int %A, bool %b) {
+BB0: br label %Loop
+
+Loop:
+        %B = phi int [%A, %BB0], [%C, %Loop]    ; PHI is dead.
+	%C = add int %B, 123
+        br bool %b, label %Loop, label %Exit
+Exit:
+        ret int 0
+}
+





From sabre at nondot.org  Mon Jan 15 01:30:21 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 01:30:21 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200701150730.l0F7UL5G020813@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.599 -> 1.600
---
Log message:

Implement InstCombine/phi.ll:test7, deletion of trivial value loops for
induction variables.


---
Diffs of the changes:  (+16 -2)

 InstructionCombining.cpp |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.599 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.600
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.599	Mon Jan 15 01:02:54 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Jan 15 01:30:06 2007
@@ -7595,13 +7595,27 @@
   // If this is a trivial cycle in the PHI node graph, remove it.  Basically, if
   // this PHI only has a single use (a PHI), and if that PHI only has one use (a
   // PHI)... break the cycle.
-  if (PN.hasOneUse())
-    if (PHINode *PU = dyn_cast<PHINode>(PN.use_back())) {
+  if (PN.hasOneUse()) {
+    Instruction *PHIUser = cast<Instruction>(PN.use_back());
+    if (PHINode *PU = dyn_cast<PHINode>(PHIUser)) {
       std::set<PHINode*> PotentiallyDeadPHIs;
       PotentiallyDeadPHIs.insert(&PN);
       if (DeadPHICycle(PU, PotentiallyDeadPHIs))
         return ReplaceInstUsesWith(PN, UndefValue::get(PN.getType()));
     }
+   
+    // If this phi has a single use, and if that use just computes a value for
+    // the next iteration of a loop, delete the phi.  This occurs with unused
+    // induction variables, e.g. "for (int j = 0; ; ++j);".  Detecting this
+    // common case here is good because the only other things that catch this
+    // are induction variable analysis (sometimes) and ADCE, which is only run
+    // late.
+    if (PHIUser->hasOneUse() &&
+        (isa<BinaryOperator>(PHIUser) || isa<GetElementPtrInst>(PHIUser)) &&
+        PHIUser->use_back() == &PN) {
+      return ReplaceInstUsesWith(PN, UndefValue::get(PN.getType()));
+    }
+  }
 
   return 0;
 }





From sabre at nondot.org  Mon Jan 15 01:42:06 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 01:42:06 -0600
Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp
Message-ID: <200701150742.l0F7g65Z021028@zion.cs.uiuc.edu>



Changes in directory llvm/tools/gccas:

gccas.cpp updated: 1.123 -> 1.124
---
Log message:

Run an instcombine pass after inlining but before scalarrepl.  This allows 
instcombine to clean up the code, which makes more code suitable for SRoA.
This helps C++ code in particular, e.g. speeding up tramp3d by 31%.


---
Diffs of the changes:  (+1 -0)

 gccas.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/tools/gccas/gccas.cpp
diff -u llvm/tools/gccas/gccas.cpp:1.123 llvm/tools/gccas/gccas.cpp:1.124
--- llvm/tools/gccas/gccas.cpp:1.123	Wed Dec  6 19:30:31 2006
+++ llvm/tools/gccas/gccas.cpp	Mon Jan 15 01:41:51 2007
@@ -102,6 +102,7 @@
 
   addPass(PM, createRaisePointerReferencesPass());// Recover type information
   addPass(PM, createTailDuplicationPass());      // Simplify cfg by copying code
+  addPass(PM, createInstructionCombiningPass()); // Cleanup for scalarrepl.
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's





From clattner at apple.com  Mon Jan 15 01:42:40 2007
From: clattner at apple.com (Chris Lattner)
Date: Sun, 14 Jan 2007 23:42:40 -0800
Subject: [llvm-commits]  match gccas pass ordering change
Message-ID: <2A9EE0C7-C9A5-456A-B5F0-E102AB731A72@apple.com>

Run an instcombine pass after inlining but before scalarrepl.  This  
allows instcombine to clean up the code, which makes more code  
suitable for SRoA.This helps C++ code in particular, e.g. speeding up  
tramp3d by 31%.


Index: llvm-backend.cpp
===================================================================
--- llvm-backend.cpp    (revision 122440)
+++ llvm-backend.cpp    (working copy)
@@ -245,6 +245,7 @@
      }

      PM->add(createTailDuplicationPass());      // Simplify cfg by  
copying code
+    PM->add(createInstructionCombiningPass()); // Cleanup for  
scalarrepl.
      PM->add(createCFGSimplificationPass());    // Merge & remove BBs
      PM->add(createScalarReplAggregatesPass()); // Break up  
aggregate allocas
      PM->add(createInstructionCombiningPass()); // Combine silly seq's



From nicholas at mxc.ca  Mon Jan 15 08:30:22 2007
From: nicholas at mxc.ca (Nick Lewycky)
Date: Mon, 15 Jan 2007 08:30:22 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
Message-ID: <200701151430.l0FEUMSZ008323@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

PredicateSimplifier.cpp updated: 1.47 -> 1.48
---
Log message:

Don't print address of ETNode. Print the DFSNumIn which uniquely identifies
the basic block and is stable across runs in gdb or valgrind.

Make Node::update handle edges which dominate and are tighter than
existing edges.

Replace makeEqual's "squeeze theorem" code. Fixes miscompilation.

Gate the calls to defToOps and opsToDef. Before this, we were getting IG
edges about values which weren't even defined in the dominated area. This
reduces the size of the IG by about half.


---
Diffs of the changes:  (+65 -34)

 PredicateSimplifier.cpp |   99 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 65 insertions(+), 34 deletions(-)


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.47 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.48
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.47	Fri Jan 12 20:05:28 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Mon Jan 15 08:30:07 2007
@@ -263,7 +263,7 @@
               "000024", "000025", "    u>", "   u>=", "    u<", "   u<=",
               "    !=", "000031" };
           os << "  " << names[NI->LV] << " " << NI->To
-             << "(" << NI->Subtree << ")\n";
+             << " (" << NI->Subtree->getDFSNumIn() << ")\n";
         }
       }
 #endif
@@ -313,15 +313,24 @@
           LatticeVal LV = static_cast<LatticeVal>(I->LV & R);
           assert(validPredicate(LV) && "Invalid union of lattice values.");
           if (LV != I->LV) {
-            if (Subtree == I->Subtree)
-              I->LV = LV;
-            else {
+            if (Subtree != I->Subtree) {
               assert(Subtree->DominatedBy(I->Subtree) &&
                      "Find returned subtree that doesn't apply.");
 
               Edge edge(n, R, Subtree);
               iterator Insert = std::lower_bound(begin(), end(), edge);
-              Relations.insert(Insert, edge);
+              Relations.insert(Insert, edge); // invalidates I
+              I = find(n, Subtree);
+            }
+
+            // Also, we have to tighten any edge that Subtree dominates.
+            for (iterator B = begin(); I->To == n; --I) {
+              if (I->Subtree->DominatedBy(Subtree)) {
+                LatticeVal LV = static_cast<LatticeVal>(I->LV & R);
+                assert(validPredicate(LV) && "Invalid union of lattice values.");
+                I->LV = LV;
+              }
+              if (I == B) break;
             }
           }
         }
@@ -646,7 +655,8 @@
     for (NodeMapType::const_iterator I = NodeMap.begin(), E = NodeMap.end();
          I != E; ++I) {
       Node *N = node(I->index);
-      os << *I->V << " == " << I->index << "(" << I->Subtree << ")\n";
+      os << *I->V << " == " << I->index
+         << "(" << I->Subtree->getDFSNumIn() << ")\n";
       if (VisitedNodes.insert(N).second) {
         os << I->index << ". ";
         if (!N->getValue()) os << "(deleted node)\n";
@@ -819,27 +829,28 @@
         // We can't just merge %x and %y because the relationship with %z would
         // be EQ and that's invalid. What we're doing is looking for any nodes
         // %z such that %x <= %z and %y >= %z, and vice versa.
-        //
-        // Also handle %a <= %b and %c <= %a when adding %b <= %c.
 
         Node *N1 = IG.node(n1);
-        Node::iterator end = N1->end();
-        for (unsigned i = 0; i < Remove.size(); ++i) {
-          Node *N = IG.node(Remove[i]);
-          Value *V = N->getValue();
-          for (Node::iterator I = N->begin(), E = N->end(); I != E; ++I) {
-            if (I->LV & EQ_BIT) {
-              if (Top == I->Subtree || Top->DominatedBy(I->Subtree)) {
-                Node::iterator NI = N1->find(I->To, Top);
-                if (NI != end) {
-                  if (!(NI->LV & EQ_BIT)) return false;
-                  if (isRelatedBy(V, IG.node(NI->To)->getValue(),
-                                  ICmpInst::ICMP_NE))
-                    return false;
-                  Remove.insert(NI->To);
-                }
-              }
-            }
+        Node *N2 = IG.node(n2);
+        Node::iterator end = N2->end();
+
+        // Find the intersection between N1 and N2 which is dominated by
+        // Top. If we find %x where N1 <= %x <= N2 (or >=) then add %x to
+        // Remove.
+        for (Node::iterator I = N1->begin(), E = N1->end(); I != E; ++I) {
+          if (!(I->LV & EQ_BIT) || !Top->DominatedBy(I->Subtree)) continue;
+
+          unsigned ILV_s = I->LV & (SLT_BIT|SGT_BIT);
+          unsigned ILV_u = I->LV & (ULT_BIT|UGT_BIT);
+          Node::iterator NI = N2->find(I->To, Top);
+          if (NI != end) {
+            LatticeVal NILV = reversePredicate(NI->LV);
+            unsigned NILV_s = NILV & (SLT_BIT|SGT_BIT);
+            unsigned NILV_u = NILV & (ULT_BIT|UGT_BIT);
+
+            if ((ILV_s != (SLT_BIT|SGT_BIT) && ILV_s == NILV_s) ||
+                (ILV_u != (ULT_BIT|UGT_BIT) && ILV_u == NILV_u))
+              Remove.insert(I->To);
           }
         }
 
@@ -973,13 +984,19 @@
       for (Value *R = V2; i == 0 || i < Remove.size(); ++i) {
         if (i) R = IG.node(Remove[i])->getValue(); // skip n2.
 
-        if (Instruction *I2 = dyn_cast<Instruction>(R)) defToOps(I2);
+        if (Instruction *I2 = dyn_cast<Instruction>(R)) {
+          if (below(I2) ||
+              Top->DominatedBy(Forest->getNodeForBlock(I2->getParent())))
+          defToOps(I2);
+        }
         for (Value::use_iterator UI = V2->use_begin(), UE = V2->use_end();
              UI != UE;) {
           Use &TheUse = UI.getUse();
           ++UI;
           if (Instruction *I = dyn_cast<Instruction>(TheUse.getUser())) {
-            opsToDef(I);
+            if (below(I) ||
+                Top->DominatedBy(Forest->getNodeForBlock(I->getParent())))
+              opsToDef(I);
           }
         }
       }
@@ -1367,25 +1384,38 @@
 
             IG.addInequality(n1, n2, Top, LV);
 
-            if (Instruction *I1 = dyn_cast<Instruction>(O.LHS)) defToOps(I1);
+            if (Instruction *I1 = dyn_cast<Instruction>(O.LHS)) {
+              if (below(I1) ||
+                  Top->DominatedBy(Forest->getNodeForBlock(I1->getParent())))
+                defToOps(I1);
+            }
             if (isa<Instruction>(O.LHS) || isa<Argument>(O.LHS)) {
               for (Value::use_iterator UI = O.LHS->use_begin(),
                    UE = O.LHS->use_end(); UI != UE;) {
                 Use &TheUse = UI.getUse();
                 ++UI;
                 if (Instruction *I = dyn_cast<Instruction>(TheUse.getUser())) {
-                  opsToDef(I);
+                  if (below(I) ||
+                      Top->DominatedBy(Forest->getNodeForBlock(I->getParent())))
+                    opsToDef(I);
                 }
               }
             }
-            if (Instruction *I2 = dyn_cast<Instruction>(O.RHS)) defToOps(I2);
+            if (Instruction *I2 = dyn_cast<Instruction>(O.RHS)) {
+              if (below(I2) ||
+                  Top->DominatedBy(Forest->getNodeForBlock(I2->getParent())))
+              defToOps(I2);
+            }
             if (isa<Instruction>(O.RHS) || isa<Argument>(O.RHS)) {
               for (Value::use_iterator UI = O.RHS->use_begin(),
                    UE = O.RHS->use_end(); UI != UE;) {
                 Use &TheUse = UI.getUse();
                 ++UI;
                 if (Instruction *I = dyn_cast<Instruction>(TheUse.getUser())) {
-                  opsToDef(I);
+                  if (below(I) ||
+                      Top->DominatedBy(Forest->getNodeForBlock(I->getParent())))
+
+                    opsToDef(I);
                 }
               }
             }
@@ -1466,7 +1496,8 @@
     void visitBasicBlock(DominatorTree::Node *Node) {
       BasicBlock *BB = Node->getBlock();
       ETNode *ET = Forest->getNodeForBlock(BB);
-      DOUT << "Entering Basic Block: " << BB->getName() << " (" << ET << ")\n";
+      DOUT << "Entering Basic Block: " << BB->getName()
+           << " (" << ET->getDFSNumIn() << ")\n";
       for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E;) {
         visitInstruction(I++, Node, ET);
       }
@@ -1572,7 +1603,7 @@
          I != E; ++I) {
       BasicBlock *Dest = (*I)->getBlock();
       DOUT << "Branch thinking about %" << Dest->getName()
-           << "(" << PS->Forest->getNodeForBlock(Dest) << ")\n";
+           << "(" << PS->Forest->getNodeForBlock(Dest)->getDFSNumIn() << ")\n";
 
       if (Dest == TrueDest) {
         DOUT << "(" << DTNode->getBlock()->getName() << ") true set:\n";
@@ -1602,7 +1633,7 @@
          I != E; ++I) {
       BasicBlock *BB = (*I)->getBlock();
       DOUT << "Switch thinking about BB %" << BB->getName()
-           << "(" << PS->Forest->getNodeForBlock(BB) << ")\n";
+           << "(" << PS->Forest->getNodeForBlock(BB)->getDFSNumIn() << ")\n";
 
       VRPSolver VRP(IG, UB, PS->Forest, PS->modified, BB);
       if (BB == SI.getDefaultDest()) {





From baldrick at free.fr  Mon Jan 15 09:03:05 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Jan 2007 16:03:05 +0100
Subject: [llvm-commits] llvm-convert.cpp compile fix
Message-ID: <200701151603.12612.baldrick@free.fr>

Something like this is needed to get current llvm-gcc4 to compile.

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 248)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -221,7 +221,7 @@
           // If this is just a mismatch between integer types, this is due
           // to K&R prototypes, where the forward proto defines the arg as int
           // and the actual impls is a short or char.
-          assert(ArgVal->getType() == Type::Int32Ty && LLVMTy->isIntegral() &&
+          assert(ArgVal->getType() == Type::Int32Ty && LLVMTy->isInteger() &&
                  "Lowerings don't match?");
           ArgVal = new TruncInst(ArgVal, LLVMTy, NameStack.back(), CurBB);
         }


From baldrick at free.fr  Mon Jan 15 09:06:20 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Jan 2007 16:06:20 +0100
Subject: [llvm-commits] llvm-convert.cpp: abort on unhandled expression
Message-ID: <200701151606.21629.baldrick@free.fr>

Neater than just segfaulting, which in my experience is what happens
a bit later without this.

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 248)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -496,7 +496,7 @@
   default:
     std::cerr << "Unhandled expression!\n";
     debug_tree(exp);
-    break;
+    abort();
   case EH_FILTER_EXPR:
   case CATCH_EXPR: {
     static bool PrintedWarning = false;


From baldrick at free.fr  Mon Jan 15 09:07:46 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Jan 2007 16:07:46 +0100
Subject: [llvm-commits] Fix obvious thinko/typo in EmitMinMaxExpr
Message-ID: <200701151607.46719.baldrick@free.fr>

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 248)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -2568,7 +2574,7 @@
   Instruction::CastOps opcode = CastInst::getCastOpcode(LHS, LHSIsSigned, Ty, 
                                                         TyIsSigned);
   LHS = CastToType(opcode, LHS, Ty);
-  opcode = CastInst::getCastOpcode(LHS, LHSIsSigned, Ty, TyIsSigned);
+  opcode = CastInst::getCastOpcode(RHS, RHSIsSigned, Ty, TyIsSigned);
   RHS = CastToType(opcode, RHS, Ty);
   
   Value *Compare;


From baldrick at free.fr  Mon Jan 15 09:11:08 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Jan 2007 16:11:08 +0100
Subject: [llvm-commits] Support VIEW_CONVERT_EXPR in
	TreeConstantToLLVM::Convert
Message-ID: <200701151611.09042.baldrick@free.fr>

Ignore the type change - constants don't care.

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 248)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -4260,6 +4380,7 @@
   case PLUS_EXPR:
   case MINUS_EXPR:    return ConvertBinOp_CST(exp);
   case CONSTRUCTOR:   return ConvertCONSTRUCTOR(exp);
+  case VIEW_CONVERT_EXPR: return Convert(TREE_OPERAND(exp, 0));
   case ADDR_EXPR:     
     return ConstantExpr::getBitCast(EmitLV(TREE_OPERAND(exp, 0)),
                                  ConvertType(TREE_TYPE(exp)));


From baldrick at free.fr  Mon Jan 15 11:09:20 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Jan 2007 18:09:20 +0100
Subject: [llvm-commits] llvm-gcc: sign matters for EXACT_DIV_EXPR
Message-ID: <200701151809.21614.baldrick@free.fr>

EXACT_DIV_EXPR can be used on signed operands, so it is wrong to always
turn it into UDiv.  Since EXACT_DIV_EXPR always gives the same result as
TRUNC_DIV_EXPR (it exists in gcc because it might give that result faster
on some targets, not because it gives a different result), it is pointless
to distinguish between the two in LLVM.

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 248)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -591,14 +591,12 @@
   case MINUS_EXPR:Result = EmitBinOp(exp, DestLoc, Instruction::Sub);break;
   case MULT_EXPR: Result = EmitBinOp(exp, DestLoc, Instruction::Mul);break;
   case TRUNC_DIV_EXPR: 
+  case EXACT_DIV_EXPR: 
     if (TYPE_UNSIGNED(TREE_TYPE(exp)))
       Result = EmitBinOp(exp, DestLoc, Instruction::UDiv);
     else 
       Result = EmitBinOp(exp, DestLoc, Instruction::SDiv);
     break;
-  case EXACT_DIV_EXPR: 
-    Result = EmitBinOp(exp, DestLoc, Instruction::UDiv);
-    break;
   case RDIV_EXPR:      
     Result = EmitBinOp(exp, DestLoc, Instruction::FDiv);
     break;


From clattner at apple.com  Mon Jan 15 11:31:43 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 09:31:43 -0800
Subject: [llvm-commits] Fix obvious thinko/typo in EmitMinMaxExpr
In-Reply-To: <200701151607.46719.baldrick@free.fr>
References: <200701151607.46719.baldrick@free.fr>
Message-ID: <96FDA38A-5272-4DB3-AA78-41833E47261C@apple.com>

Applied, thanks!

On Jan 15, 2007, at 7:07 AM, Duncan Sands wrote:

> Index: gcc/llvm-convert.cpp
> ===================================================================
> --- gcc/llvm-convert.cpp	(revision 248)
> +++ gcc/llvm-convert.cpp	(working copy)
> @@ -2568,7 +2574,7 @@
>    Instruction::CastOps opcode = CastInst::getCastOpcode(LHS,  
> LHSIsSigned, Ty,
>                                                          TyIsSigned);
>    LHS = CastToType(opcode, LHS, Ty);
> -  opcode = CastInst::getCastOpcode(LHS, LHSIsSigned, Ty, TyIsSigned);
> +  opcode = CastInst::getCastOpcode(RHS, RHSIsSigned, Ty, TyIsSigned);
>    RHS = CastToType(opcode, RHS, Ty);
>
>    Value *Compare;
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Jan 15 11:32:13 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 09:32:13 -0800
Subject: [llvm-commits] llvm-convert.cpp compile fix
In-Reply-To: <200701151603.12612.baldrick@free.fr>
References: <200701151603.12612.baldrick@free.fr>
Message-ID: <6702EB6D-843F-4CBE-ABBE-DDF8678EB2A8@apple.com>

This is already in the repository, but must not have hit the mirror yet.

-Chris

On Jan 15, 2007, at 7:03 AM, Duncan Sands wrote:

> Something like this is needed to get current llvm-gcc4 to compile.
>
> Index: gcc/llvm-convert.cpp
> ===================================================================
> --- gcc/llvm-convert.cpp	(revision 248)
> +++ gcc/llvm-convert.cpp	(working copy)
> @@ -221,7 +221,7 @@
>            // If this is just a mismatch between integer types,  
> this is due
>            // to K&R prototypes, where the forward proto defines  
> the arg as int
>            // and the actual impls is a short or char.
> -          assert(ArgVal->getType() == Type::Int32Ty && LLVMTy- 
> >isIntegral() &&
> +          assert(ArgVal->getType() == Type::Int32Ty && LLVMTy- 
> >isInteger() &&
>                   "Lowerings don't match?");
>            ArgVal = new TruncInst(ArgVal, LLVMTy, NameStack.back(),  
> CurBB);
>          }
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Jan 15 11:34:27 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 09:34:27 -0800
Subject: [llvm-commits] Support VIEW_CONVERT_EXPR
	in	TreeConstantToLLVM::Convert
In-Reply-To: <200701151611.09042.baldrick@free.fr>
References: <200701151611.09042.baldrick@free.fr>
Message-ID: <A7E417AD-4F7E-467B-9F07-30DF87ACD040@apple.com>

Applied, thanks!

-Chris

On Jan 15, 2007, at 7:11 AM, Duncan Sands wrote:

> Ignore the type change - constants don't care.
>
> Index: gcc/llvm-convert.cpp
> ===================================================================
> --- gcc/llvm-convert.cpp	(revision 248)
> +++ gcc/llvm-convert.cpp	(working copy)
> @@ -4260,6 +4380,7 @@
>    case PLUS_EXPR:
>    case MINUS_EXPR:    return ConvertBinOp_CST(exp);
>    case CONSTRUCTOR:   return ConvertCONSTRUCTOR(exp);
> +  case VIEW_CONVERT_EXPR: return Convert(TREE_OPERAND(exp, 0));
>    case ADDR_EXPR:
>      return ConstantExpr::getBitCast(EmitLV(TREE_OPERAND(exp, 0)),
>                                   ConvertType(TREE_TYPE(exp)));
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Jan 15 11:36:10 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 09:36:10 -0800
Subject: [llvm-commits] llvm-gcc: sign matters for EXACT_DIV_EXPR
In-Reply-To: <200701151809.21614.baldrick@free.fr>
References: <200701151809.21614.baldrick@free.fr>
Message-ID: <C303A304-DAE8-404E-A29A-AC3174F9815B@apple.com>

Applied, thanks!

On Jan 15, 2007, at 9:09 AM, Duncan Sands wrote:

> EXACT_DIV_EXPR can be used on signed operands, so it is wrong to  
> always
> turn it into UDiv.  Since EXACT_DIV_EXPR always gives the same  
> result as
> TRUNC_DIV_EXPR (it exists in gcc because it might give that result  
> faster
> on some targets, not because it gives a different result), it is  
> pointless
> to distinguish between the two in LLVM.



From sabre at nondot.org  Mon Jan 15 11:55:38 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 11:55:38 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200701151755.l0FHtcqO013499@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.600 -> 1.601
---
Log message:

Fix a regression in my isIntegral patch that broke 471.omnetpp.  This is 
because TargetData::getTypeSize() returns the same for i1 and i8.  This fix
is not right for the full generality of bitwise types, but it fixes the
regression.


---
Diffs of the changes:  (+8 -6)

 InstructionCombining.cpp |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.600 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.601
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.600	Mon Jan 15 01:30:06 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Jan 15 11:55:20 2007
@@ -7978,8 +7978,8 @@
   if (const PointerType *SrcTy = dyn_cast<PointerType>(CastOp->getType())) {
     const Type *SrcPTy = SrcTy->getElementType();
 
-    if (DestPTy->isInteger() || isa<PointerType>(DestPTy) || 
-        isa<PackedType>(DestPTy)) {
+    if ((DestPTy->isInteger() && DestPTy != Type::Int1Ty) ||
+        isa<PointerType>(DestPTy) || isa<PackedType>(DestPTy)) {
       // If the source is an array, the code below will not succeed.  Check to
       // see if a trivial 'gep P, 0, 0' will help matters.  Only do this for
       // constants.
@@ -7992,8 +7992,8 @@
             SrcPTy = SrcTy->getElementType();
           }
 
-      if ((SrcPTy->isInteger() || isa<PointerType>(SrcPTy) || 
-           isa<PackedType>(SrcPTy)) &&
+      if (((SrcPTy->isInteger() && SrcPTy != Type::Int1Ty) ||
+           isa<PointerType>(SrcPTy) || isa<PackedType>(SrcPTy)) &&
           // Do not allow turning this into a load of an integer, which is then
           // casted to a pointer, this pessimizes pointer analysis a lot.
           (isa<PointerType>(SrcPTy) == isa<PointerType>(LI.getType())) &&
@@ -8166,7 +8166,8 @@
   if (const PointerType *SrcTy = dyn_cast<PointerType>(CastOp->getType())) {
     const Type *SrcPTy = SrcTy->getElementType();
 
-    if (DestPTy->isInteger() || isa<PointerType>(DestPTy)) {
+    if ((DestPTy->isInteger() && DestPTy != Type::Int1Ty) ||
+        isa<PointerType>(DestPTy)) {
       // If the source is an array, the code below will not succeed.  Check to
       // see if a trivial 'gep P, 0, 0' will help matters.  Only do this for
       // constants.
@@ -8179,7 +8180,8 @@
             SrcPTy = SrcTy->getElementType();
           }
 
-      if ((SrcPTy->isInteger() || isa<PointerType>(SrcPTy)) &&
+      if (((SrcPTy->isInteger() && SrcPTy != Type::Int1Ty) ||
+           isa<PointerType>(SrcPTy)) &&
           IC.getTargetData().getTypeSize(SrcPTy) ==
                IC.getTargetData().getTypeSize(DestPTy)) {
 





From clattner at apple.com  Mon Jan 15 12:24:14 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 10:24:14 -0800
Subject: [llvm-commits] CVS: llvm/docs/BytecodeFormat.html LangRef.html
In-Reply-To: <200701121921.l0CJLJax012321@zion.cs.uiuc.edu>
References: <200701121921.l0CJLJax012321@zion.cs.uiuc.edu>
Message-ID: <13BF1963-8D97-4E90-9935-228E840EB3DF@apple.com>

Nice work Anton, some comments below:

> @@ -1082,7 +1081,11 @@
>        <td class="td_left">If this bit is set, a SectionID follows  
> this vbr.</td>
>      </tr>
>      <tr>
> -      <td><a href="#bit">bit(10-31)</a></td>
> +      <td><a href="#bit">bit(10-12)</a></td>
> +      <td class="td_left">Visibility style: 0=Default, 1=Hidden.</td>
> +    </tr>
> +    <tr>
> +      <td><a href="#bit">bit(13-31)</a></td>
>        <td class="td_left">Currently unassigned.</td>
>      </tr>
>    </tbody>

Why reserve 3 bits for visibility?

> +<!--  
> ______________________________________________________________________ 
> _ -->
> +<div class="doc_subsubsection"><a  
> name="funclinkage_and_visibility">Linkage and
> +    visibility word</a>
> +</div>
> +<div class="doc_text">
> +
> +<table>
> +  <tbody>
> +    <tr>
> +      <th><b>Type</b></th>
> +      <th class="td_left"><b>Field Description</b></th>
> +    </tr>
> +    <tr>
> +      <td><a href="#bit">bit(0-15)</a></td>
> +      <td class="td_left">The linkage type of the function:  
> 0=External, 1=Weak,
> +2=Appending, 3=Internal, 4=LinkOnce, 5=DllImport,  
> 6=DllExport<sup>1</sup></td>
> +    </tr>
> +    <tr>
> +      <td><a href="#bit">bit(16-31)</a></td>
> +      <td class="td_left">Visibility style: 0=Default, 1=Hidden.</td>

Why reserve 16 bits for visibility? :)


Also, please add some info to LangRef.html about visibility.  Thanks!

-Chris


From reid at x10sys.com  Mon Jan 15 12:27:55 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 15 Jan 2007 12:27:55 -0600
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200701151827.l0FIRtA9014087@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.198 -> 1.199
---
Log message:

Update documentation for parameter attributes for the syntax change.


---
Diffs of the changes:  (+11 -9)

 LangRef.html |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.198 llvm/docs/LangRef.html:1.199
--- llvm/docs/LangRef.html:1.198	Sun Jan 14 19:54:13 2007
+++ llvm/docs/LangRef.html	Mon Jan 15 12:27:39 2007
@@ -687,27 +687,29 @@
   type so two functions types that differ only by the parameter attributes 
   are different function types.</p>
 
-  <p>Parameter attributes consist of an at sign (@) followed by either a single
-  keyword or a comma separate list of keywords enclosed in parentheses. For
+  <p>Parameter attributes are simple keywords that follow the type specified. If
+  multiple parameter attributes are needed, they are space separated. For 
   example:</p><pre>
-    %someFunc = i16 @zext (i8 @(sext) %someParam)
-    %someFunc = i16 @zext (i8 @zext %someParam)</pre>
+    %someFunc = i16 (i8 sext %someParam) zext
+    %someFunc = i16 (i8 zext %someParam) zext</pre>
   <p>Note that the two function types above are unique because the parameter has
-  a different attribute (@sext in the first one, @zext in the second).</p>
+  a different attribute (sext in the first one, zext in the second). Also note
+  that the attribute for the function result (zext) comes immediately after the
+  argument list.</p>
 
   <p>Currently, only the following parameter attributes are defined:</p>
   <dl>
-    <dt><tt>@zext</tt></dt>
+    <dt><tt>zext</tt></dt>
     <dd>This indicates that the parameter should be zero extended just before
     a call to this function.</dd>
-    <dt><tt>@sext</tt></dt>
+    <dt><tt>sext</tt></dt>
     <dd>This indicates that the parameter should be sign extended just before
     a call to this function.</dd>
   </dl>
 
   <p>The current motivation for parameter attributes is to enable the sign and
   zero extend information necessary for the C calling convention to be passed
-  from the front end to LLVM. The <tt>@zext</tt> and <tt>@sext</tt> attributes
+  from the front end to LLVM. The <tt>zext</tt> and <tt>sext</tt> attributes
   are used by the code generator to perform the required extension. However, 
   parameter attributes are an orthogonal feature to calling conventions and
   may be used for other purposes in the future.</p>
@@ -4485,7 +4487,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/01/15 01:54:13 $
+  Last modified: $Date: 2007/01/15 18:27:39 $
 </address>
 </body>
 </html>





From sabre at nondot.org  Mon Jan 15 12:28:34 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 12:28:34 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200701151828.l0FISYEF014147@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.253 -> 1.254
---
Log message:

make this more efficient in release builds (time and space)



---
Diffs of the changes:  (+2 -6)

 AsmWriter.cpp |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.253 llvm/lib/VMCore/AsmWriter.cpp:1.254
--- llvm/lib/VMCore/AsmWriter.cpp:1.253	Sun Jan 14 20:27:26 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Mon Jan 15 12:28:18 2007
@@ -873,11 +873,9 @@
       abort();
     }
     switch (GV->getVisibility()) {
+    default: assert(0 && "Invalid visibility style!");
     case GlobalValue::DefaultVisibility: break;
     case GlobalValue::HiddenVisibility: Out << "hidden "; break;
-    default:
-     cerr << "Invalid visibility style!\n";
-     abort();
     }
   }
   
@@ -982,11 +980,9 @@
       abort();
     }
     switch (F->getVisibility()) {
+    default: assert(0 && "Invalid visibility style!");
     case GlobalValue::DefaultVisibility: break;
     case GlobalValue::HiddenVisibility: Out << "hidden "; break;
-    default:
-     cerr << "Invalid visibility style!\n";
-     abort();
     }
   }
 





From reid at x10sys.com  Mon Jan 15 12:28:50 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 15 Jan 2007 12:28:50 -0600
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200701151828.l0FISobf014230@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.199 -> 1.200
---
Log message:

One more @ to remove.


---
Diffs of the changes:  (+2 -2)

 LangRef.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.199 llvm/docs/LangRef.html:1.200
--- llvm/docs/LangRef.html:1.199	Mon Jan 15 12:27:39 2007
+++ llvm/docs/LangRef.html	Mon Jan 15 12:28:34 2007
@@ -928,7 +928,7 @@
     <td class="left">function taking an <tt>i32</tt>, returning an <tt>i32</tt>
     </td>
   </tr><tr class="layout">
-    <td class="left"><tt>float&nbsp;(i16&nbsp;@sext,&nbsp;i32&nbsp;*)&nbsp;*
+    <td class="left"><tt>float&nbsp;(i16&nbsp;sext,&nbsp;i32&nbsp;*)&nbsp;*
     </tt></td>
     <td class="left"><a href="#t_pointer">Pointer</a> to a function that takes 
       an <tt>i16</tt> that should be sign extended and a 
@@ -4487,7 +4487,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/01/15 18:27:39 $
+  Last modified: $Date: 2007/01/15 18:28:34 $
 </address>
 </body>
 </html>





From sabre at nondot.org  Mon Jan 15 12:32:40 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 12:32:40 -0600
Subject: [llvm-commits] CVS: llvm/test/Regression/CodeGen/X86/test-hidden.ll
Message-ID: <200701151832.l0FIWeD7014466@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CodeGen/X86:

test-hidden.ll updated: 1.1 -> 1.2
---
Log message:

test darwin too! :)


---
Diffs of the changes:  (+2 -1)

 test-hidden.ll |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/test/Regression/CodeGen/X86/test-hidden.ll
diff -u llvm/test/Regression/CodeGen/X86/test-hidden.ll:1.1 llvm/test/Regression/CodeGen/X86/test-hidden.ll:1.2
--- llvm/test/Regression/CodeGen/X86/test-hidden.ll:1.1	Fri Jan 12 13:20:47 2007
+++ llvm/test/Regression/CodeGen/X86/test-hidden.ll	Mon Jan 15 12:32:24 2007
@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu | grep ".hidden" | wc -l | grep 2 
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu | grep ".hidden" | wc -l | grep 2 &&
+; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8.8.0 | grep ".private_extern" | wc -l | grep 2 
 
 %struct.Person = type { i32 }
 %a = hidden global i32 0





From jeffc at jolt-lang.org  Mon Jan 15 14:27:37 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Mon, 15 Jan 2007 14:27:37 -0600
Subject: [llvm-commits] CVS: llvm/win32/CodeGen/CodeGen.vcproj
Message-ID: <200701152027.l0FKRbDv016519@zion.cs.uiuc.edu>



Changes in directory llvm/win32/CodeGen:

CodeGen.vcproj updated: 1.25 -> 1.26
---
Log message:

Unbreak VC++ build.

---
Diffs of the changes:  (+3 -0)

 CodeGen.vcproj |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/win32/CodeGen/CodeGen.vcproj
diff -u llvm/win32/CodeGen/CodeGen.vcproj:1.25 llvm/win32/CodeGen/CodeGen.vcproj:1.26
--- llvm/win32/CodeGen/CodeGen.vcproj:1.25	Sun Nov  5 13:31:28 2006
+++ llvm/win32/CodeGen/CodeGen.vcproj	Mon Jan 15 14:27:18 2007
@@ -292,6 +292,9 @@
 				RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h">
 			</File>
 			<File





From jeffc at jolt-lang.org  Mon Jan 15 14:27:38 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Mon, 15 Jan 2007 14:27:38 -0600
Subject: [llvm-commits] CVS: llvm/lib/Analysis/ScalarEvolution.cpp
Message-ID: <200701152027.l0FKRc0j016524@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

ScalarEvolution.cpp updated: 1.88 -> 1.89
---
Log message:

Unbreak VC++ build.

---
Diffs of the changes:  (+1 -1)

 ScalarEvolution.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.88 llvm/lib/Analysis/ScalarEvolution.cpp:1.89
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.88	Sun Jan 14 20:27:26 2007
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Mon Jan 15 14:27:18 2007
@@ -1929,7 +1929,7 @@
     // Couldn't symbolically evaluate.
     if (!CondVal) return UnknownValue;
 
-    if (CondVal->getZExtValue() == ExitWhen) {
+    if (CondVal->getZExtValue() == uint64_t(ExitWhen)) {
       ConstantEvolutionLoopExitValue[PN] = PHIVal;
       ++NumBruteForceTripCountsComputed;
       return SCEVConstant::get(ConstantInt::get(Type::Int32Ty, IterationNum));





From jeffc at jolt-lang.org  Mon Jan 15 14:27:41 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Mon, 15 Jan 2007 14:27:41 -0600
Subject: [llvm-commits] CVS: llvm/win32/VMCore/VMCore.vcproj
Message-ID: <200701152027.l0FKRf0r016529@zion.cs.uiuc.edu>



Changes in directory llvm/win32/VMCore:

VMCore.vcproj updated: 1.25 -> 1.26
---
Log message:

Unbreak VC++ build.

---
Diffs of the changes:  (+3 -0)

 VMCore.vcproj |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/win32/VMCore/VMCore.vcproj
diff -u llvm/win32/VMCore/VMCore.vcproj:1.25 llvm/win32/VMCore/VMCore.vcproj:1.26
--- llvm/win32/VMCore/VMCore.vcproj:1.25	Mon Jan  8 14:17:17 2007
+++ llvm/win32/VMCore/VMCore.vcproj	Mon Jan 15 14:27:18 2007
@@ -291,6 +291,9 @@
 				RelativePath="..\..\include\llvm\PassManager.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\PassManagers.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\PassSupport.h">
 			</File>
 			<File





From jeffc at jolt-lang.org  Mon Jan 15 14:27:42 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Mon, 15 Jan 2007 14:27:42 -0600
Subject: [llvm-commits] CVS: llvm/win32/llc/llc.vcproj
Message-ID: <200701152027.l0FKRgSH016534@zion.cs.uiuc.edu>



Changes in directory llvm/win32/llc:

llc.vcproj updated: 1.9 -> 1.10
---
Log message:

Unbreak VC++ build.

---
Diffs of the changes:  (+2 -2)

 llc.vcproj |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/win32/llc/llc.vcproj
diff -u llvm/win32/llc/llc.vcproj:1.9 llvm/win32/llc/llc.vcproj:1.10
--- llvm/win32/llc/llc.vcproj:1.9	Sun Jan 29 22:07:07 2006
+++ llvm/win32/llc/llc.vcproj	Mon Jan 15 14:27:18 2007
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"





From jeffc at jolt-lang.org  Mon Jan 15 14:27:43 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Mon, 15 Jan 2007 14:27:43 -0600
Subject: [llvm-commits] CVS: llvm/win32/CBackend/CBackend.vcproj
Message-ID: <200701152027.l0FKRhCW016537@zion.cs.uiuc.edu>



Changes in directory llvm/win32/CBackend:

CBackend.vcproj updated: 1.5 -> 1.6
---
Log message:

Unbreak VC++ build.

---
Diffs of the changes:  (+1 -1)

 CBackend.vcproj |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/win32/CBackend/CBackend.vcproj
diff -u llvm/win32/CBackend/CBackend.vcproj:1.5 llvm/win32/CBackend/CBackend.vcproj:1.6
--- llvm/win32/CBackend/CBackend.vcproj:1.5	Sun Jan 29 22:07:07 2006
+++ llvm/win32/CBackend/CBackend.vcproj	Mon Jan 15 14:27:18 2007
@@ -109,7 +109,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\lib\Target\CBackend\Writer.cpp">
+				RelativePath="..\..\lib\Target\CBackend\CBackend.cpp">
 			</File>
 		</Filter>
 		<Filter





From dpatel at apple.com  Mon Jan 15 14:32:09 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 14:32:09 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701152032.l0FKW9Ql016641@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.120 -> 1.121
---
Log message:

Do not record last users of Pass Manager.


---
Diffs of the changes:  (+7 -2)

 PassManager.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.120 llvm/lib/VMCore/PassManager.cpp:1.121
--- llvm/lib/VMCore/PassManager.cpp:1.120	Fri Jan 12 14:07:16 2007
+++ llvm/lib/VMCore/PassManager.cpp	Mon Jan 15 14:31:54 2007
@@ -594,8 +594,13 @@
       }
     }
 
-    LastUses.push_back(P);
-    TPM->setLastUser(LastUses, P);
+    // Set P as P's last user until someone starts using P.
+    // However, if P is a Pass Manager then it does not need
+    // to record its last user.
+    if (!dynamic_cast<PMDataManager *>(P)) {
+      LastUses.push_back(P);
+      TPM->setLastUser(LastUses, P);
+    }
 
     // Take a note of analysis required and made available by this pass.
     // Remove the analysis not preserved by this pass





From clattner at apple.com  Mon Jan 15 16:56:13 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 14:56:13 -0800
Subject: [llvm-commits] Potential Patch for PR1095
In-Reply-To: <B4457110-0795-4F13-8735-A704FF258F2F@gmail.com>
References: <B4457110-0795-4F13-8735-A704FF258F2F@gmail.com>
Message-ID: <8B72A52A-C2EB-44A4-A9C9-A3A72C296046@apple.com>

On Jan 9, 2007, at 12:25 AM, Bill Wendling wrote:
> Hi all,

Hey Bill, sorry for the delay.

> I would like someone to review this patch for PR1095. This gives us  
> a "dialect" for the assembler code if we're given something like:
>
> 	__asm__("{cntlz|cntlzw} ...
>
> Before, we were defaulting to the first one. But there are some  
> platforms which need the second form.

This patch is very close.  Comments below:

Please add a .ll file regression test to llvm/test/Regression/CodeGen/ 
PowerPC.


--- include/llvm/Target/TargetAsmInfo.h	21 Dec 2006 21:24:35 -0000	1.18
+++ include/llvm/Target/TargetAsmInfo.h	9 Jan 2007 08:21:25 -0000
@@ -27,6 +27,11 @@
    /// properties and features specific to the target.
    class TargetAsmInfo {
    protected:
+    enum AsmDialect {
+      ASM_ATT,
+      ASM_INTEL
+    };
+

The meaning of the various dialects vary across the targets.  This  
enum should move into the X86 backend.  The PowerPC backend should  
use PPC_OLD_MNEMONICS = 0 and PPC_NEW_MNEMONICS = 1.  Darwin should  
use new mnemonics of course.


@@ -128,6 +133,11 @@
      /// Otherwise, it emits ".align log2(N)", e.g. 3 to align to an  
8 byte
      /// boundary.
      bool AlignmentIsInBytes;              // Defaults to true
+
+    //===--- Assembler Dialect Information  
--------------------------------===//
+
+    /// AssemblerDialect - Which dialect of an assembler variant to  
use.
+    AsmDialect AssemblerDialect;         // Defaults to ASM_ATT

Please make this just an 'unsigned' and group it with InlineAsmStart/ 
InlineAsmEnd.  You could make the group comment be "Inline Asm  
Directives" or something.

Otherwise, the patch looks great.  Please make these changes and  
apply it.

Thanks Bill!

-Chris


From dpatel at apple.com  Mon Jan 15 16:58:06 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 14:58:06 -0800
Subject: [llvm-commits] [PATCH] delete ManagedStatics
Message-ID: <D53071CA-AA9E-46B5-BCB2-F6F043B287BE@apple.com>

Right now, ManagedStatics are not deleted (through llvm_shutdown) by  
llvm-gcc.
Here is the patch.

OK to install?
Thanks,
-
Devang

Index: llvm-backend.cpp
===================================================================
--- llvm-backend.cpp    (revision 122487)
+++ llvm-backend.cpp    (working copy)
@@ -45,6 +45,7 @@ Software Foundation, 59 Temple Place - S
  #include "llvm/Transforms/IPO.h"
  #include "llvm/ADT/StringExtras.h"
  #include "llvm/Support/Streams.h"
+#include "llvm/Support/ManagedStatic.h"
  #include <cassert>
  #undef VISIBILITY_HIDDEN
  extern "C" {
@@ -358,6 +359,7 @@ static void CreateStructorsList(std::vec
  // llvm_asm_file_end - Finish the .s file.
  void llvm_asm_file_end(void) {
    timevar_push(TV_LLVM_PERFILE);
+  llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.

    // Add an llvm.global_ctors global if needed.
    if (!StaticCtors.empty())



From clattner at apple.com  Mon Jan 15 17:01:12 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 15 Jan 2007 15:01:12 -0800
Subject: [llvm-commits] [PATCH] delete ManagedStatics
In-Reply-To: <D53071CA-AA9E-46B5-BCB2-F6F043B287BE@apple.com>
References: <D53071CA-AA9E-46B5-BCB2-F6F043B287BE@apple.com>
Message-ID: <B562695C-BB93-4E4E-90B4-48DA1FDA9F53@apple.com>


On Jan 15, 2007, at 2:58 PM, Devang Patel wrote:

> Right now, ManagedStatics are not deleted (through llvm_shutdown) by
> llvm-gcc.
> Here is the patch.

Ahhh, right.  Yep, looks good.  Nice detective work,

-Chris

> OK to install?
> Thanks,
> -
> Devang
>
> Index: llvm-backend.cpp
> ===================================================================
> --- llvm-backend.cpp    (revision 122487)
> +++ llvm-backend.cpp    (working copy)
> @@ -45,6 +45,7 @@ Software Foundation, 59 Temple Place - S
>   #include "llvm/Transforms/IPO.h"
>   #include "llvm/ADT/StringExtras.h"
>   #include "llvm/Support/Streams.h"
> +#include "llvm/Support/ManagedStatic.h"
>   #include <cassert>
>   #undef VISIBILITY_HIDDEN
>   extern "C" {
> @@ -358,6 +359,7 @@ static void CreateStructorsList(std::vec
>   // llvm_asm_file_end - Finish the .s file.
>   void llvm_asm_file_end(void) {
>     timevar_push(TV_LLVM_PERFILE);
> +  llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
>
>     // Add an llvm.global_ctors global if needed.
>     if (!StaticCtors.empty())
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Mon Jan 15 17:07:15 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 17:07:15 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManagers.h
Message-ID: <200701152307.l0FN7Fgt019407@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

PassManagers.h updated: 1.2 -> 1.3
---
Log message:

Remove extra white spaces. Fix comments.


---
Diffs of the changes:  (+2 -2)

 PassManagers.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.2 llvm/include/llvm/PassManagers.h:1.3
--- llvm/include/llvm/PassManagers.h:1.2	Fri Jan 12 14:07:16 2007
+++ llvm/include/llvm/PassManagers.h	Mon Jan 15 17:06:56 2007
@@ -1,4 +1,4 @@
-//===- PassManager.cpp - LLVM Pass Infrastructure Implementation ----------===//
+//===- llvm/PassManager.h - Pass Inftrastructre classes  --------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the LLVM Pass Manager infrastructure. 
+// This file declares the LLVM Pass Manager infrastructure. 
 //
 //===----------------------------------------------------------------------===//
 





From dpatel at apple.com  Mon Jan 15 17:07:15 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 17:07:15 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701152307.l0FN7FGn019412@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.121 -> 1.122
---
Log message:

Remove extra white spaces. Fix comments.


---
Diffs of the changes:  (+1 -1)

 PassManager.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.121 llvm/lib/VMCore/PassManager.cpp:1.122
--- llvm/lib/VMCore/PassManager.cpp:1.121	Mon Jan 15 14:31:54 2007
+++ llvm/lib/VMCore/PassManager.cpp	Mon Jan 15 17:06:56 2007
@@ -559,7 +559,7 @@
 /// Add pass P into the PassVector. Update 
 /// AvailableAnalysis appropriately if ProcessAnalysis is true.
 void PMDataManager::add(Pass *P, 
-                                     bool ProcessAnalysis) {
+                        bool ProcessAnalysis) {
 
   // This manager is going to manage pass P. Set up analysis resolver
   // to connect them.





From isanbard at gmail.com  Mon Jan 15 17:58:57 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 15:58:57 -0800
Subject: [llvm-commits] Potential Patch for PR1095
In-Reply-To: <8B72A52A-C2EB-44A4-A9C9-A3A72C296046@apple.com>
References: <B4457110-0795-4F13-8735-A704FF258F2F@gmail.com>
	<8B72A52A-C2EB-44A4-A9C9-A3A72C296046@apple.com>
Message-ID: <16e5fdf90701151558t71fa367cma48297a37cac6626@mail.gmail.com>

On 1/15/07, Chris Lattner <clattner at apple.com> wrote:
> On Jan 9, 2007, at 12:25 AM, Bill Wendling wrote:
> > Hi all,
>
> Hey Bill, sorry for the delay.
>
Not a prob :-)

> > I would like someone to review this patch for PR1095. This gives us
> > a "dialect" for the assembler code if we're given something like:
> >
> >       __asm__("{cntlz|cntlzw} ...
> >
> > Before, we were defaulting to the first one. But there are some
> > platforms which need the second form.
>
> This patch is very close.  Comments below:
>
> Please add a .ll file regression test to llvm/test/Regression/CodeGen/
> PowerPC.
>
Will do.

>
> --- include/llvm/Target/TargetAsmInfo.h 21 Dec 2006 21:24:35 -0000      1.18
> +++ include/llvm/Target/TargetAsmInfo.h 9 Jan 2007 08:21:25 -0000
> @@ -27,6 +27,11 @@
>     /// properties and features specific to the target.
>     class TargetAsmInfo {
>     protected:
> +    enum AsmDialect {
> +      ASM_ATT,
> +      ASM_INTEL
> +    };
> +
>
> The meaning of the various dialects vary across the targets.  This
> enum should move into the X86 backend.  The PowerPC backend should
> use PPC_OLD_MNEMONICS = 0 and PPC_NEW_MNEMONICS = 1.  Darwin should
> use new mnemonics of course.
>
Ah! This makes more sense now. I was worried that just having "ATT"
and "INTEL" was wrong.

>
> @@ -128,6 +133,11 @@
>       /// Otherwise, it emits ".align log2(N)", e.g. 3 to align to an
> 8 byte
>       /// boundary.
>       bool AlignmentIsInBytes;              // Defaults to true
> +
> +    //===--- Assembler Dialect Information
> --------------------------------===//
> +
> +    /// AssemblerDialect - Which dialect of an assembler variant to
> use.
> +    AsmDialect AssemblerDialect;         // Defaults to ASM_ATT
>
> Please make this just an 'unsigned' and group it with InlineAsmStart/
> InlineAsmEnd.  You could make the group comment be "Inline Asm
> Directives" or something.
>
Okay.

> Otherwise, the patch looks great.  Please make these changes and
> apply it.
>
Will do! It'll probably be later today/tonight.

> Thanks Bill!
>
Thanks for the review! :-)

-bw


From dpatel at apple.com  Mon Jan 15 20:00:54 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 20:00:54 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManagers.h
Message-ID: <200701160200.l0G20sUm022638@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

PassManagers.h updated: 1.3 -> 1.4
---
Log message:

Code refactoring.


---
Diffs of the changes:  (+8 -0)

 PassManagers.h |    8 ++++++++
 1 files changed, 8 insertions(+)


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.3 llvm/include/llvm/PassManagers.h:1.4
--- llvm/include/llvm/PassManagers.h:1.3	Mon Jan 15 17:06:56 2007
+++ llvm/include/llvm/PassManagers.h	Mon Jan 15 20:00:38 2007
@@ -86,6 +86,13 @@
 
 namespace llvm {
 
+/// FunctionPassManager and PassManager, two top level managers, serve 
+/// as the public interface of pass manager infrastructure.
+enum TopLevelManagerType {
+  TLM_Function,  // FunctionPassManager
+  TLM_Pass       // PassManager
+};
+    
 //===----------------------------------------------------------------------===//
 // PMTopLevelManager
 //
@@ -118,6 +125,7 @@
   /// then return NULL.
   Pass *findAnalysisPass(AnalysisID AID);
 
+  PMTopLevelManager(enum TopLevelManagerType t);
   virtual ~PMTopLevelManager(); 
 
   /// Add immutable pass and initialize it.





From dpatel at apple.com  Mon Jan 15 20:00:55 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Jan 2007 20:00:55 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701160200.l0G20tLw022643@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.122 -> 1.123
---
Log message:

Code refactoring.


---
Diffs of the changes:  (+21 -18)

 PassManager.cpp |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.122 llvm/lib/VMCore/PassManager.cpp:1.123
--- llvm/lib/VMCore/PassManager.cpp:1.122	Mon Jan 15 17:06:56 2007
+++ llvm/lib/VMCore/PassManager.cpp	Mon Jan 15 20:00:38 2007
@@ -112,7 +112,8 @@
                                 public PMTopLevelManager {
 public:
 
-  FunctionPassManagerImpl(int Depth) : PMDataManager(Depth) { }
+  FunctionPassManagerImpl(int Depth) : PMDataManager(Depth),
+                                       PMTopLevelManager(TLM_Function) { }
 
   /// add - Add a pass to the queue of passes to run.  This passes ownership of
   /// the Pass to the PassManager.  When the PassManager is destroyed, the pass
@@ -151,13 +152,6 @@
       addImmutablePass(IP);
       recordAvailableAnalysis(IP);
     } else {
-      // Assign manager
-      if (activeStack.empty()) {
-        FPPassManager *FPP = new FPPassManager(getDepth() + 1);
-        FPP->setTopLevelManager(this->getTopLevelManager());
-        addPassManager(FPP);
-        activeStack.push(FPP);
-      }
       P->assignPassManager(activeStack);
     }
 
@@ -220,7 +214,8 @@
 
 public:
 
-  PassManagerImpl(int Depth) : PMDataManager(Depth) { }
+  PassManagerImpl(int Depth) : PMDataManager(Depth),
+                               PMTopLevelManager(TLM_Pass) { }
 
   /// add - Add a pass to the queue of passes to run.  This passes ownership of
   /// the Pass to the PassManager.  When the PassManager is destroyed, the pass
@@ -251,15 +246,6 @@
       addImmutablePass(IP);
       recordAvailableAnalysis(IP);
     } else {
-
-      // Assign manager
-      if (activeStack.empty()) {
-        MPPassManager *MPP = new MPPassManager(getDepth() + 1);
-        MPP->setTopLevelManager(this->getTopLevelManager());
-        addPassManager(MPP);
-        activeStack.push(MPP);
-      }
-      
       P->assignPassManager(activeStack);
     }
 
@@ -331,6 +317,23 @@
 //===----------------------------------------------------------------------===//
 // PMTopLevelManager implementation
 
+/// Initialize top level manager. Create first pass manager.
+PMTopLevelManager::PMTopLevelManager (enum TopLevelManagerType t) {
+
+  if (t == TLM_Pass) {
+    MPPassManager *MPP = new MPPassManager(1);
+    MPP->setTopLevelManager(this);
+    addPassManager(MPP);
+    activeStack.push(MPP);
+  } 
+  else if (t == TLM_Function) {
+    FPPassManager *FPP = new FPPassManager(1);
+    FPP->setTopLevelManager(this);
+    addPassManager(FPP);
+    activeStack.push(FPP);
+  } 
+}
+
 /// Set pass P as the last user of the given analysis passes.
 void PMTopLevelManager::setLastUser(std::vector<Pass *> &AnalysisPasses, 
                                     Pass *P) {





From rspencer at reidspencer.com  Mon Jan 15 21:32:28 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Tue, 16 Jan 2007 03:32:28 +0000
Subject: [llvm-commits] [llvm-gcc] Potential bug in iasm_extra_clobbers ??
Message-ID: <1168918348.7860.233.camel@bashful.x10sys.com>

Applites,

While I've been perusing c-common.c, I have found a warning that you
might not be seeing because of compiler differences:

../../src-2/gcc/c-common.c: In function ?iasm_extra_clobbers?:
../../src-2/gcc/c-common.c:7017: warning: comparison of unsigned expression < 0 is always false

This comes from this function:

> static void
> iasm_extra_clobbers (const char *opcode, tree *clobbersp)
> {
>   struct iasm_op_clobber db[] = { IASM_EXTRA_CLOBBERS };

Note number of elements of db is 1.

>   struct iasm_op_clobber key;
>   struct iasm_op_clobber *r;
>   const char **clobbers;
>   int num;
> 
> /* APPLE LOCAL LLVM */
> #if defined(TARGET_IASM_EXTRA_CLOBBERS) && defined(ENABLE_CHECKING)
>   /* Ensure that the table is sorted. */
>   static int once;
>   if (once == 0)
>     {
>       size_t i;
>       once = 1;
>       for (i=0; i < sizeof (db) / sizeof(db[0]) - 1; ++i)

Are you sure you want to subtract one from the size computation? Perhaps
at one time this was null terminated? In any event (sizeof(db) /
sizeof(db[0])) == 1, which if you subtract 1 from it is causing the
unsigned range warning on the comparison with i.

Not sure if this matters, but thought I'd point it out.

>         gcc_assert (iasm_op_clobber_comp (&db[i+1], &db[i]) >= 0);
>     }
> #endif
> 



From isanbard at gmail.com  Mon Jan 15 21:42:23 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:23 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp
Message-ID: <200701160342.l0G3gNbJ024565@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.135 -> 1.136
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+3 -3)

 AsmPrinter.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.135 llvm/lib/CodeGen/AsmPrinter.cpp:1.136
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.135	Sun Jan 14 20:27:26 2007
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Mon Jan 15 21:42:04 2007
@@ -698,9 +698,9 @@
   
   O << TAI->getInlineAsmStart() << "\n\t";
 
-  // The variant of the current asmprinter: FIXME: change.
-  int AsmPrinterVariant = 0;
-  
+  // The variant of the current asmprinter.
+  int AsmPrinterVariant = TAI->getAssemblerDialect();
+
   int CurVariant = -1;            // The number of the {.|.|.} region we are in.
   const char *LastEmitted = AsmStr; // One past the last character emitted.
   





From isanbard at gmail.com  Mon Jan 15 21:42:27 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:27 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll
Message-ID: <200701160342.l0G3gRUL024572@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CodeGen/PowerPC:

2007-01-15-AsmDialect.ll added (r1.1)
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+26 -0)

 2007-01-15-AsmDialect.ll |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+)


Index: llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll
diff -c /dev/null llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll:1.1
*** /dev/null	Mon Jan 15 21:42:14 2007
--- llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll	Mon Jan 15 21:42:04 2007
***************
*** 0 ****
--- 1,26 ----
+ ; RUN: llvm-as < %s | llc -march=ppc32 | grep cntlzw
+ 
+ define i32 %foo() {
+ entry:
+ 	%retval = alloca i32, align 4		; <i32*> [#uses=2]
+ 	%tmp = alloca i32, align 4		; <i32*> [#uses=2]
+ 	%ctz_x = alloca i32, align 4		; <i32*> [#uses=3]
+ 	%ctz_c = alloca i32, align 4		; <i32*> [#uses=2]
+ 	"alloca point" = bitcast i32 0 to i32		; <i32> [#uses=0]
+ 	store i32 61440, i32* %ctz_x
+ 	%tmp = load i32* %ctz_x		; <i32> [#uses=1]
+ 	%tmp1 = sub i32 0, %tmp		; <i32> [#uses=1]
+ 	%tmp2 = load i32* %ctz_x		; <i32> [#uses=1]
+ 	%tmp3 = and i32 %tmp1, %tmp2		; <i32> [#uses=1]
+ 	%tmp4 = call i32 asm "$(cntlz$|cntlzw$) $0,$1", "=r,r,~{dirflag},~{fpsr},~{flags}"( i32 %tmp3 )		; <i32> [#uses=1]
+ 	store i32 %tmp4, i32* %ctz_c
+ 	%tmp5 = load i32* %ctz_c		; <i32> [#uses=1]
+ 	store i32 %tmp5, i32* %tmp
+ 	%tmp6 = load i32* %tmp		; <i32> [#uses=1]
+ 	store i32 %tmp6, i32* %retval
+ 	br label %return
+ 
+ return:		; preds = %entry
+ 	%retval = load i32* %retval		; <i32> [#uses=1]
+ 	ret i32 %retval
+ }





From isanbard at gmail.com  Mon Jan 15 21:42:30 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:30 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetAsmInfo.cpp
Message-ID: <200701160342.l0G3gUte024577@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetAsmInfo.cpp updated: 1.12 -> 1.13
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+1 -0)

 TargetAsmInfo.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/Target/TargetAsmInfo.cpp
diff -u llvm/lib/Target/TargetAsmInfo.cpp:1.12 llvm/lib/Target/TargetAsmInfo.cpp:1.13
--- llvm/lib/Target/TargetAsmInfo.cpp:1.12	Sun Jan 14 00:27:21 2007
+++ llvm/lib/Target/TargetAsmInfo.cpp	Mon Jan 15 21:42:04 2007
@@ -32,6 +32,7 @@
   FunctionAddrSuffix(""),
   InlineAsmStart("#APP"),
   InlineAsmEnd("#NO_APP"),
+  AssemblerDialect(0),
   ZeroDirective("\t.zero\t"),
   ZeroDirectiveSuffix(0),
   AsciiDirective("\t.ascii\t"),





From isanbard at gmail.com  Mon Jan 15 21:42:30 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:30 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetAsmInfo.h
Message-ID: <200701160342.l0G3gUAn024584@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetAsmInfo.h updated: 1.19 -> 1.20
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+8 -2)

 TargetAsmInfo.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Target/TargetAsmInfo.h
diff -u llvm/include/llvm/Target/TargetAsmInfo.h:1.19 llvm/include/llvm/Target/TargetAsmInfo.h:1.20
--- llvm/include/llvm/Target/TargetAsmInfo.h:1.19	Sun Jan 14 00:27:21 2007
+++ llvm/include/llvm/Target/TargetAsmInfo.h	Mon Jan 15 21:42:04 2007
@@ -89,7 +89,10 @@
     /// emit before and after an inline assembly statement.
     const char *InlineAsmStart;           // Defaults to "#APP\n"
     const char *InlineAsmEnd;             // Defaults to "#NO_APP\n"
-    
+
+    /// AssemblerDialect - Which dialect of an assembler variant to use.
+    unsigned AssemblerDialect;            // Defaults to 0
+
     //===--- Data Emission Directives -------------------------------------===//
 
     /// ZeroDirective - this should be set to the directive used to get some
@@ -128,7 +131,7 @@
     /// Otherwise, it emits ".align log2(N)", e.g. 3 to align to an 8 byte
     /// boundary.
     bool AlignmentIsInBytes;              // Defaults to true
-    
+
     //===--- Section Switching Directives ---------------------------------===//
     
     /// SwitchToSectionDirective - This is the directive used when we want to
@@ -343,6 +346,9 @@
     const char *getInlineAsmEnd() const {
       return InlineAsmEnd;
     }
+    unsigned getAssemblerDialect() const {
+      return AssemblerDialect;
+    }
     const char *getZeroDirective() const {
       return ZeroDirective;
     }





From isanbard at gmail.com  Mon Jan 15 21:42:30 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:30 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
	X86TargetAsmInfo.h
Message-ID: <200701160342.l0G3gU2G024591@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetAsmInfo.cpp updated: 1.25 -> 1.26
X86TargetAsmInfo.h updated: 1.3 -> 1.4
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+8 -1)

 X86TargetAsmInfo.cpp |    7 +++++++
 X86TargetAsmInfo.h   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.25 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.26
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.25	Sun Jan 14 20:27:26 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Mon Jan 15 21:42:04 2007
@@ -21,6 +21,12 @@
 #include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
+// ASM variant to use.
+enum {
+  X86_ATT   = 0,
+  X86_INTEL = 1
+};
+
 static const char* x86_asm_table[] = {"{si}", "S",
                                       "{di}", "D",
                                       "{ax}", "a",
@@ -38,6 +44,7 @@
   // FIXME - Should be simplified.
 
   AsmTransCBE = x86_asm_table;
+  AssemblerDialect = X86_ATT;
   
   switch (Subtarget->TargetType) {
   case X86Subtarget::isDarwin:


Index: llvm/lib/Target/X86/X86TargetAsmInfo.h
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.h:1.3 llvm/lib/Target/X86/X86TargetAsmInfo.h:1.4
--- llvm/lib/Target/X86/X86TargetAsmInfo.h:1.3	Tue Nov 28 19:14:06 2006
+++ llvm/lib/Target/X86/X86TargetAsmInfo.h	Mon Jan 15 21:42:04 2007
@@ -17,7 +17,7 @@
 #include "llvm/Target/TargetAsmInfo.h"
 
 namespace llvm {
-  
+
   // Forward declaration.
   class X86TargetMachine;
 





From isanbard at gmail.com  Mon Jan 15 21:42:30 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 21:42:30 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
Message-ID: <200701160342.l0G3gURu024594@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCTargetAsmInfo.cpp updated: 1.11 -> 1.12
---
Log message:

Fix for PR1095: http://llvm.org/PR1095 :
LLVM would miscompile ASM dialects when compiling for PPC. Added dialects for
the X86 and PPC backends. It defaults to "0", the first variant of a compound
inline asm expression.



---
Diffs of the changes:  (+8 -0)

 PPCTargetAsmInfo.cpp |    8 ++++++++
 1 files changed, 8 insertions(+)


Index: llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.11 llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.12
--- llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.11	Sun Jan 14 00:37:54 2007
+++ llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp	Mon Jan 15 21:42:04 2007
@@ -16,6 +16,12 @@
 #include "llvm/Function.h"
 using namespace llvm;
 
+// ASM variant to use.
+enum {
+  PPC_OLD_MNEMONICS = 0,
+  PPC_NEW_MNEMONICS = 1
+};
+
 PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
   bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
   
@@ -26,6 +32,7 @@
   LCOMMDirective = "\t.lcomm\t";
   InlineAsmStart = "# InlineAsm Start";
   InlineAsmEnd = "# InlineAsm End";
+  AssemblerDialect = PPC_OLD_MNEMONICS;
   
   NeedsSet = true;
   AddressSize = isPPC64 ? 8 : 4;
@@ -56,6 +63,7 @@
   UsedDirective = "\t.no_dead_strip\t";
   WeakRefDirective = "\t.weak_reference\t";
   HiddenDirective = "\t.private_extern\t";
+  AssemblerDialect = PPC_NEW_MNEMONICS;
 }
 
 LinuxTargetAsmInfo::LinuxTargetAsmInfo(const PPCTargetMachine &TM)





From isanbard at gmail.com  Mon Jan 15 22:13:19 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 22:13:19 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200701160413.l0G4DJcD025155@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetAsmInfo.cpp updated: 1.26 -> 1.27
---
Log message:

Make inline ASM the INTEL one if it's in that emission mode.


---
Diffs of the changes:  (+4 -2)

 X86TargetAsmInfo.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.26 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.27
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.26	Mon Jan 15 21:42:04 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Mon Jan 15 22:13:03 2007
@@ -137,12 +137,12 @@
     DwarfRangesSection =  "\t.section\t.debug_ranges,\"dr\"";
     DwarfMacInfoSection = "\t.section\t.debug_macinfo,\"dr\"";
     break;
-    
-    break;
+
   case X86Subtarget::isWindows:
     GlobalPrefix = "_";
     HasDotTypeDotSizeDirective = false;
     break;
+
   default: break;
   }
   
@@ -169,6 +169,8 @@
     TextSectionStartSuffix = "\tsegment 'CODE'";
     DataSectionStartSuffix = "\tsegment 'DATA'";
     SectionEndDirectiveSuffix = "\tends\n";
+
+    AssemblerDialect = X86_INTEL;
   }
 }
 





From isanbard at gmail.com  Mon Jan 15 22:15:36 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Jan 2007 22:15:36 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll
Message-ID: <200701160415.l0G4FajU025207@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CodeGen/PowerPC:

2007-01-15-AsmDialect.ll updated: 1.1 -> 1.2
---
Log message:

Added a -mtriple flag to force darwin backend.


---
Diffs of the changes:  (+1 -1)

 2007-01-15-AsmDialect.ll |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll
diff -u llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll:1.1 llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll:1.2
--- llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll:1.1	Mon Jan 15 21:42:04 2007
+++ llvm/test/Regression/CodeGen/PowerPC/2007-01-15-AsmDialect.ll	Mon Jan 15 22:15:20 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep cntlzw
+; RUN: llvm-as < %s | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 | grep cntlzw
 
 define i32 %foo() {
 entry:





From rspencer at reidspencer.com  Mon Jan 15 22:49:01 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Tue, 16 Jan 2007 04:49:01 +0000
Subject: [llvm-commits] [llvm-gcc] BITWIDTH.patch (for review only)
Message-ID: <1168922941.7860.240.camel@bashful.x10sys.com>

Here's a patch to give llvm-gcc the ability to specify arbitrary bit
widths with a new "bitwidth" attribute. The attribute is used like this:

int __attribute__((bitwidth(17)));

int __attribute__((bitwidth(23))) My32BitInt;

struct MyStruct {
  int __attribute__((bitwidth(5))) My5BitField;
  My32BitInt My32BitField;
};

void func(int __attribute__((bitwidth(23))) ) {...}

etc.

Note that no LLVM backend can currently handle this. I will be working
on making either the CBackEnd or LLI handle these correctly. Other
targets may or may not get implemented.

This patch has not been tested well (just Dejagnu) so please do not
apply it.

Reid.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: BITWIDTH.patch
Type: text/x-patch
Size: 8061 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/a571ff5f/attachment.bin 

From sabre at nondot.org  Mon Jan 15 22:55:41 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 22:55:41 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200701160455.l0G4tfdg026114@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.265 -> 1.266
---
Log message:

add options to view the dags before the first or second pass of dag combine.


---
Diffs of the changes:  (+18 -0)

 DAGCombiner.cpp |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.265 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.266
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.265	Mon Jan  8 17:04:05 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Mon Jan 15 22:55:25 2007
@@ -46,6 +46,20 @@
 STATISTIC(PostIndexedNodes, "Number of post-indexed nodes created");
 
 namespace {
+#ifndef NDEBUG
+  static cl::opt<bool>
+    ViewDAGCombine1("view-dag-combine1-dags", cl::Hidden,
+                    cl::desc("Pop up a window to show dags before the first "
+                             "dag combine pass"));
+  static cl::opt<bool>
+    ViewDAGCombine2("view-dag-combine2-dags", cl::Hidden,
+                    cl::desc("Pop up a window to show dags before the second "
+                             "dag combine pass"));
+#else
+  static const bool ViewDAGCombine1 = false;
+  static const bool ViewDAGCombine2 = false;
+#endif
+  
   static cl::opt<bool>
     CombinerAA("combiner-alias-analysis", cl::Hidden,
                cl::desc("Turn on alias analysis during testing"));
@@ -4512,6 +4526,10 @@
 // SelectionDAG::Combine - This is the entry point for the file.
 //
 void SelectionDAG::Combine(bool RunningAfterLegalize, AliasAnalysis &AA) {
+  if (!RunningAfterLegalize && ViewDAGCombine1)
+    viewGraph();
+  if (RunningAfterLegalize && ViewDAGCombine2)
+    viewGraph();
   /// run - This is the main entry point to this class.
   ///
   DAGCombiner(*this, AA).Run(RunningAfterLegalize);





From sabre at nondot.org  Mon Jan 15 23:59:06 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Jan 2007 23:59:06 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/CodeGen/Generic/2007-01-15-LoadSelectCycle.ll
Message-ID: <200701160559.l0G5x6v1027405@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CodeGen/Generic:

2007-01-15-LoadSelectCycle.ll added (r1.1)
---
Log message:

new testcase for PR1114: http://llvm.org/PR1114 


---
Diffs of the changes:  (+12 -0)

 2007-01-15-LoadSelectCycle.ll |   12 ++++++++++++
 1 files changed, 12 insertions(+)


Index: llvm/test/Regression/CodeGen/Generic/2007-01-15-LoadSelectCycle.ll
diff -c /dev/null llvm/test/Regression/CodeGen/Generic/2007-01-15-LoadSelectCycle.ll:1.1
*** /dev/null	Mon Jan 15 23:59:00 2007
--- llvm/test/Regression/CodeGen/Generic/2007-01-15-LoadSelectCycle.ll	Mon Jan 15 23:58:50 2007
***************
*** 0 ****
--- 1,12 ----
+ ; RUN: llvm-as < %s | llc
+ ; PR1114
+ 
+ declare i1 %foo()
+ 
+ define i32 %test(i32* %A, i32* %B) {
+ 	%a = load i32* %A
+ 	%b = load i32* %B
+ 	%cond = call i1 %foo()
+ 	%c = select i1 %cond, i32 %a, i32 %b
+ 	ret i32 %c
+ }





From sabre at nondot.org  Tue Jan 16 00:00:15 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 00:00:15 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200701160600.l0G60Fwr027455@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.266 -> 1.267
---
Log message:

Fix PR1114: http://llvm.org/PR1114  and CodeGen/Generic/2007-01-15-LoadSelectCycle.ll by being
careful when folding "c ? load p : load q" that C doesn't reach either load.
If so, folding this into load (c ? p : q) will induce a cycle in the graph.


---
Diffs of the changes:  (+41 -25)

 DAGCombiner.cpp |   66 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 41 insertions(+), 25 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.266 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.267
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.266	Mon Jan 15 22:55:25 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Mon Jan 15 23:59:59 2007
@@ -3709,36 +3709,52 @@
         // the right thing to do, but nothing uses srcvalues now.  When they do,
         // turn SrcValue into a list of locations.
         SDOperand Addr;
-        if (TheSelect->getOpcode() == ISD::SELECT)
-          Addr = DAG.getNode(ISD::SELECT, LLD->getBasePtr().getValueType(),
-                             TheSelect->getOperand(0), LLD->getBasePtr(),
-                             RLD->getBasePtr());
-        else
-          Addr = DAG.getNode(ISD::SELECT_CC, LLD->getBasePtr().getValueType(),
+        if (TheSelect->getOpcode() == ISD::SELECT) {
+          // Check that the condition doesn't reach either load.  If so, folding
+          // this will induce a cycle into the DAG.
+          if (!LLD->isPredecessor(TheSelect->getOperand(0).Val) &&
+              !RLD->isPredecessor(TheSelect->getOperand(0).Val)) {
+            Addr = DAG.getNode(ISD::SELECT, LLD->getBasePtr().getValueType(),
+                               TheSelect->getOperand(0), LLD->getBasePtr(),
+                               RLD->getBasePtr());
+          }
+        } else {
+          // Check that the condition doesn't reach either load.  If so, folding
+          // this will induce a cycle into the DAG.
+          if (!LLD->isPredecessor(TheSelect->getOperand(0).Val) &&
+              !RLD->isPredecessor(TheSelect->getOperand(0).Val) &&
+              !LLD->isPredecessor(TheSelect->getOperand(1).Val) &&
+              !RLD->isPredecessor(TheSelect->getOperand(1).Val)) {
+            Addr = DAG.getNode(ISD::SELECT_CC, LLD->getBasePtr().getValueType(),
                              TheSelect->getOperand(0),
                              TheSelect->getOperand(1), 
                              LLD->getBasePtr(), RLD->getBasePtr(),
                              TheSelect->getOperand(4));
-      
-        SDOperand Load;
-        if (LLD->getExtensionType() == ISD::NON_EXTLOAD)
-          Load = DAG.getLoad(TheSelect->getValueType(0), LLD->getChain(),
-                             Addr,LLD->getSrcValue(), LLD->getSrcValueOffset());
-        else {
-          Load = DAG.getExtLoad(LLD->getExtensionType(),
-                                TheSelect->getValueType(0),
-                                LLD->getChain(), Addr, LLD->getSrcValue(),
-                                LLD->getSrcValueOffset(),
-                                LLD->getLoadedVT());
+          }
+        }
+        
+        if (Addr.Val) {
+          SDOperand Load;
+          if (LLD->getExtensionType() == ISD::NON_EXTLOAD)
+            Load = DAG.getLoad(TheSelect->getValueType(0), LLD->getChain(),
+                               Addr,LLD->getSrcValue(), 
+                               LLD->getSrcValueOffset());
+          else {
+            Load = DAG.getExtLoad(LLD->getExtensionType(),
+                                  TheSelect->getValueType(0),
+                                  LLD->getChain(), Addr, LLD->getSrcValue(),
+                                  LLD->getSrcValueOffset(),
+                                  LLD->getLoadedVT());
+          }
+          // Users of the select now use the result of the load.
+          CombineTo(TheSelect, Load);
+        
+          // Users of the old loads now use the new load's chain.  We know the
+          // old-load value is dead now.
+          CombineTo(LHS.Val, Load.getValue(0), Load.getValue(1));
+          CombineTo(RHS.Val, Load.getValue(0), Load.getValue(1));
+          return true;
         }
-        // Users of the select now use the result of the load.
-        CombineTo(TheSelect, Load);
-      
-        // Users of the old loads now use the new load's chain.  We know the
-        // old-load value is dead now.
-        CombineTo(LHS.Val, Load.getValue(0), Load.getValue(1));
-        CombineTo(RHS.Val, Load.getValue(0), Load.getValue(1));
-        return true;
       }
     }
   }





From sabre at nondot.org  Tue Jan 16 00:40:04 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 00:40:04 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/README.txt
Message-ID: <200701160640.l0G6e4rQ028299@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

README.txt updated: 1.53 -> 1.54
---
Log message:

add a note: we need whole-function selectiondags :)


---
Diffs of the changes:  (+28 -0)

 README.txt |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+)


Index: llvm/lib/Target/README.txt
diff -u llvm/lib/Target/README.txt:1.53 llvm/lib/Target/README.txt:1.54
--- llvm/lib/Target/README.txt:1.53	Sat Dec 23 00:05:41 2006
+++ llvm/lib/Target/README.txt	Tue Jan 16 00:39:48 2007
@@ -387,3 +387,31 @@
 to enable further optimizations.
 
 //===---------------------------------------------------------------------===//
+
+Consider:
+
+typedef unsigned U32;
+typedef unsigned long long U64;
+int test (U32 *inst, U64 *regs) {
+    U64 effective_addr2;
+    U32 temp = *inst;
+    int r1 = (temp >> 20) & 0xf;
+    int b2 = (temp >> 16) & 0xf;
+    effective_addr2 = temp & 0xfff;
+    if (b2) effective_addr2 += regs[b2];
+    b2 = (temp >> 12) & 0xf;
+    if (b2) effective_addr2 += regs[b2];
+    effective_addr2 &= regs[4];
+     if ((effective_addr2 & 3) == 0)
+        return 1;
+    return 0;
+}
+
+Note that only the low 2 bits of effective_addr2 are used.  On 32-bit systems,
+we don't eliminate the computation of the top half of effective_addr2 because
+we don't have whole-function selection dags.  On x86, this means we use one
+extra register for the function when effective_addr2 is declared as U64 than
+when it is declared U32.
+
+//===---------------------------------------------------------------------===//
+





From gordonhenriksen at mac.com  Tue Jan 16 00:48:49 2007
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Tue, 16 Jan 2007 01:48:49 -0500
Subject: [llvm-commits] [patch] PR918
Message-ID: <6B56B8C9-B881-49C7-813B-D36BD8A3BDF9@mac.com>

The attached patch fixes http://llvm.org/PR918 by preventing the C  
backend from emitting the problematic array typedefs. There's also a  
regression test.

? Gordon

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR918.tar.gz
Type: application/x-gzip
Size: 1042 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/ebdbab3f/attachment.gz 

From sabre at nondot.org  Tue Jan 16 01:21:43 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 01:21:43 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/CodeGen/CBackend/2007-01-15-NamedArrayType.ll
Message-ID: <200701160721.l0G7Lh3u029208@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CodeGen/CBackend:

2007-01-15-NamedArrayType.ll added (r1.1)
---
Log message:

testcase for PR918: http://llvm.org/PR918 


---
Diffs of the changes:  (+11 -0)

 2007-01-15-NamedArrayType.ll |   11 +++++++++++
 1 files changed, 11 insertions(+)


Index: llvm/test/Regression/CodeGen/CBackend/2007-01-15-NamedArrayType.ll
diff -c /dev/null llvm/test/Regression/CodeGen/CBackend/2007-01-15-NamedArrayType.ll:1.1
*** /dev/null	Tue Jan 16 01:21:38 2007
--- llvm/test/Regression/CodeGen/CBackend/2007-01-15-NamedArrayType.ll	Tue Jan 16 01:21:28 2007
***************
*** 0 ****
--- 1,11 ----
+ ; RUN: llvm-as < %s | llc -march=c | not grep fixarray_array3
+ ; PR918
+ 
+ %structtype_s = type { i32 }
+ %fixarray_array3 = type [3 x %structtype_s]
+ 
+ define i32 %witness(%fixarray_array3* %p) {
+     %q = getelementptr %fixarray_array3* %p, i32 0, i32 0, i32 0
+     %v = load i32* %q
+     ret i32 %v
+ }





From sabre at nondot.org  Tue Jan 16 01:22:39 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 01:22:39 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200701160722.l0G7MdTh029263@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.317 -> 1.318
---
Log message:

Fix PR918: http://llvm.org/PR918  by only using typedefs to name struct types.  This makes the later
type ordering stuff work better.  This fixes PR918: http://llvm.org/PR918  and 
CodeGen/CBackend/2007-01-15-NamedArrayType.ll

Patch by Gordon Henriksen.



---
Diffs of the changes:  (+15 -8)

 CBackend.cpp |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.317 llvm/lib/Target/CBackend/CBackend.cpp:1.318
--- llvm/lib/Target/CBackend/CBackend.cpp:1.317	Sun Jan 14 20:27:26 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Tue Jan 16 01:22:23 2007
@@ -269,13 +269,19 @@
   for (TypeSymbolTable::iterator TI = TST.begin(), TE = TST.end();
        TI != TE; ) {
     TypeSymbolTable::iterator I = TI++;
-
-    // If this is not used, remove it from the symbol table.
-    std::set<const Type *>::iterator UTI = UT.find(I->second);
-    if (UTI == UT.end())
+    
+    // If this isn't a struct type, remove it from our set of types to name.
+    // This simplifies emission later.
+    if (!isa<StructType>(I->second)) {
       TST.remove(I);
-    else
-      UT.erase(UTI);    // Only keep one name for this type.
+    } else {
+      // If this is not used, remove it from the symbol table.
+      std::set<const Type *>::iterator UTI = UT.find(I->second);
+      if (UTI == UT.end())
+        TST.remove(I);
+      else
+        UT.erase(UTI);    // Only keep one name for this type.
+    }
   }
 
   // UT now contains types that are not named.  Loop over it, naming
@@ -1694,10 +1700,11 @@
 
   Out << '\n';
 
-  // Now we can print out typedefs...
+  // Now we can print out typedefs.  Above, we guaranteed that this can only be
+  // for struct types.
   Out << "/* Typedefs */\n";
   for (I = TST.begin(); I != End; ++I) {
-    const Type *Ty = cast<Type>(I->second);
+    const StructType *Ty = cast<StructType>(I->second);
     std::string Name = "l_" + Mang->makeNameProper(I->first);
     Out << "typedef ";
     printType(Out, Ty, false, Name);





From asl at math.spbu.ru  Tue Jan 16 02:17:35 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 16 Jan 2007 11:17:35 +0300
Subject: [llvm-commits] CVS:
	llvm/lib/Target/X86/X86TargetAsmInfo.cpp	X86TargetAsmInfo.h
In-Reply-To: <200701160342.l0G3gU2G024591.SS1897SS@zion.cs.uiuc.edu>
References: <200701160342.l0G3gU2G024591.SS1897SS@zion.cs.uiuc.edu>
Message-ID: <1168935455.14117.1.camel@asl.dorms.spbu.ru>

Hello, Bill.

> +// ASM variant to use.
> +enum {
> +  X86_ATT   = 0,
> +  X86_INTEL = 1
> +};
There is already assembler flavour defined in Subtarget. Why do you need
some more?

-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.




From isanbard at gmail.com  Tue Jan 16 02:57:31 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 00:57:31 -0800
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
	X86TargetAsmInfo.h
In-Reply-To: <1168935455.14117.1.camel@asl.dorms.spbu.ru>
References: <200701160342.l0G3gU2G024591.SS1897SS@zion.cs.uiuc.edu>
	<1168935455.14117.1.camel@asl.dorms.spbu.ru>
Message-ID: <D17C4F3F-8E6A-4BE1-98C5-D387226267A2@gmail.com>

On Jan 16, 2007, at 12:17 AM, Anton Korobeynikov wrote:

> Hello, Bill.
>
>> +// ASM variant to use.
>> +enum {
>> +  X86_ATT   = 0,
>> +  X86_INTEL = 1
>> +};
> There is already assembler flavour defined in Subtarget. Why do you  
> need
> some more?
>
Hmm...Good question. It should use this information to at least  
update the TargetAsmInfo structure. Thanks for catching this.

-bw




From isanbard at gmail.com  Tue Jan 16 03:29:38 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 03:29:38 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCSubtarget.cpp
	PPCSubtarget.h PPCTargetAsmInfo.cpp
Message-ID: <200701160929.l0G9TcR3007633@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCSubtarget.cpp updated: 1.27 -> 1.28
PPCSubtarget.h updated: 1.20 -> 1.21
PPCTargetAsmInfo.cpp updated: 1.12 -> 1.13
---
Log message:

Instead of yet another enum indicating the "assembly language flavor",
just use the one that's in the subtarget.



---
Diffs of the changes:  (+16 -9)

 PPCSubtarget.cpp     |    3 +++
 PPCSubtarget.h       |   13 ++++++++++++-
 PPCTargetAsmInfo.cpp |    9 +--------
 3 files changed, 16 insertions(+), 9 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCSubtarget.cpp
diff -u llvm/lib/Target/PowerPC/PPCSubtarget.cpp:1.27 llvm/lib/Target/PowerPC/PPCSubtarget.cpp:1.28
--- llvm/lib/Target/PowerPC/PPCSubtarget.cpp:1.27	Mon Dec 11 17:22:45 2006
+++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp	Tue Jan 16 03:29:16 2007
@@ -112,6 +112,9 @@
   // Set up darwin-specific properties.
   if (IsDarwin) {
     HasLazyResolverStubs = true;
+    AsmFlavor = NewMnemonic;
+  } else {
+    AsmFlavor = OldMnemonic;
   }
 }
 


Index: llvm/lib/Target/PowerPC/PPCSubtarget.h
diff -u llvm/lib/Target/PowerPC/PPCSubtarget.h:1.20 llvm/lib/Target/PowerPC/PPCSubtarget.h:1.21
--- llvm/lib/Target/PowerPC/PPCSubtarget.h:1.20	Tue Dec 12 14:57:08 2006
+++ llvm/lib/Target/PowerPC/PPCSubtarget.h	Tue Jan 16 03:29:16 2007
@@ -40,6 +40,10 @@
 class TargetMachine;
   
 class PPCSubtarget : public TargetSubtarget {
+public:
+  enum AsmWriterFlavorTy {
+    OldMnemonic, NewMnemonic, Unset
+  };
 protected:
   const TargetMachine &TM;
   
@@ -53,6 +57,9 @@
   /// Which cpu directive was used.
   unsigned DarwinDirective;
 
+  /// AsmFlavor - Which PPC asm dialect to use.
+  AsmWriterFlavorTy AsmFlavor;
+
   /// Used by the ISel to turn in optimizations for POWER4-derived architectures
   bool IsGigaProcessor;
   bool Has64BitSupport;
@@ -120,8 +127,12 @@
   bool hasSTFIWX() const { return HasSTFIWX; }
   bool hasAltivec() const { return HasAltivec; }
   bool isGigaProcessor() const { return IsGigaProcessor; }
-  
+
   bool isDarwin() const { return IsDarwin; }
+
+  unsigned getAsmFlavor() const {
+    return AsmFlavor != Unset ? unsigned(AsmFlavor) : 0;
+  }
 };
 } // End llvm namespace
 


Index: llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.12 llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.13
--- llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.12	Mon Jan 15 21:42:04 2007
+++ llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp	Tue Jan 16 03:29:16 2007
@@ -16,12 +16,6 @@
 #include "llvm/Function.h"
 using namespace llvm;
 
-// ASM variant to use.
-enum {
-  PPC_OLD_MNEMONICS = 0,
-  PPC_NEW_MNEMONICS = 1
-};
-
 PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
   bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
   
@@ -32,7 +26,7 @@
   LCOMMDirective = "\t.lcomm\t";
   InlineAsmStart = "# InlineAsm Start";
   InlineAsmEnd = "# InlineAsm End";
-  AssemblerDialect = PPC_OLD_MNEMONICS;
+  AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor();
   
   NeedsSet = true;
   AddressSize = isPPC64 ? 8 : 4;
@@ -63,7 +57,6 @@
   UsedDirective = "\t.no_dead_strip\t";
   WeakRefDirective = "\t.weak_reference\t";
   HiddenDirective = "\t.private_extern\t";
-  AssemblerDialect = PPC_NEW_MNEMONICS;
 }
 
 LinuxTargetAsmInfo::LinuxTargetAsmInfo(const PPCTargetMachine &TM)





From isanbard at gmail.com  Tue Jan 16 03:29:38 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 03:29:38 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86Subtarget.h
	X86TargetAsmInfo.cpp
Message-ID: <200701160929.l0G9Tci9007634@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86Subtarget.h updated: 1.26 -> 1.27
X86TargetAsmInfo.cpp updated: 1.27 -> 1.28
---
Log message:

Instead of yet another enum indicating the "assembly language flavor",
just use the one that's in the subtarget.



---
Diffs of the changes:  (+6 -9)

 X86Subtarget.h       |    4 ++++
 X86TargetAsmInfo.cpp |   11 ++---------
 2 files changed, 6 insertions(+), 9 deletions(-)


Index: llvm/lib/Target/X86/X86Subtarget.h
diff -u llvm/lib/Target/X86/X86Subtarget.h:1.26 llvm/lib/Target/X86/X86Subtarget.h:1.27
--- llvm/lib/Target/X86/X86Subtarget.h:1.26	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/X86Subtarget.h	Tue Jan 16 03:29:17 2007
@@ -111,6 +111,10 @@
   bool has3DNow() const { return X863DNowLevel >= ThreeDNow; }
   bool has3DNowA() const { return X863DNowLevel >= ThreeDNowA; }
 
+  unsigned getAsmFlavor() const {
+    return AsmFlavor != Unset ? unsigned(AsmFlavor) : 0;
+  }
+
   bool isFlavorAtt() const { return AsmFlavor == ATT; }
   bool isFlavorIntel() const { return AsmFlavor == Intel; }
 


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.27 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.28
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.27	Mon Jan 15 22:13:03 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Tue Jan 16 03:29:17 2007
@@ -21,12 +21,6 @@
 #include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
-// ASM variant to use.
-enum {
-  X86_ATT   = 0,
-  X86_INTEL = 1
-};
-
 static const char* x86_asm_table[] = {"{si}", "S",
                                       "{di}", "D",
                                       "{ax}", "a",
@@ -44,7 +38,6 @@
   // FIXME - Should be simplified.
 
   AsmTransCBE = x86_asm_table;
-  AssemblerDialect = X86_ATT;
   
   switch (Subtarget->TargetType) {
   case X86Subtarget::isDarwin:
@@ -169,9 +162,9 @@
     TextSectionStartSuffix = "\tsegment 'CODE'";
     DataSectionStartSuffix = "\tsegment 'DATA'";
     SectionEndDirectiveSuffix = "\tends\n";
-
-    AssemblerDialect = X86_INTEL;
   }
+
+  AssemblerDialect = Subtarget->getAsmFlavor();
 }
 
 bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {





From asl at math.spbu.ru  Tue Jan 16 10:42:13 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 16 Jan 2007 10:42:13 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86COFF.h
	X86ATTAsmPrinter.cpp X86AsmPrinter.cpp
Message-ID: <200701161642.l0GGgDFQ015379@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86COFF.h added (r1.1)
X86ATTAsmPrinter.cpp updated: 1.89 -> 1.90
X86AsmPrinter.cpp updated: 1.227 -> 1.228
---
Log message:

Emit symbol type information for ELF/COFF targets


---
Diffs of the changes:  (+128 -6)

 X86ATTAsmPrinter.cpp |   27 ++++++++++++---
 X86AsmPrinter.cpp    |   18 +++++++++-
 X86COFF.h            |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 6 deletions(-)


Index: llvm/lib/Target/X86/X86COFF.h
diff -c /dev/null llvm/lib/Target/X86/X86COFF.h:1.1
*** /dev/null	Tue Jan 16 10:42:07 2007
--- llvm/lib/Target/X86/X86COFF.h	Tue Jan 16 10:41:57 2007
***************
*** 0 ****
--- 1,89 ----
+ //===--- X86COFF.h - Some definitions from COFF documentations ------------===//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file just defines some symbols found in COFF documentation. They are
+ // used to emit function type information for COFF targets (Cygwin/Mingw32).
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef X86COFF_H
+ #define X86COFF_H
+ 
+ namespace COFF 
+ {
+ enum StorageClass {
+   C_EFCN =   -1,  // physical end of function
+   C_NULL    = 0,
+   C_AUTO    = 1,  // external definition
+   C_EXT     = 2,  // external symbol
+   C_STAT    = 3,  // static
+   C_REG     = 4,  // register variable
+   C_EXTDEF  = 5,  // external definition
+   C_LABEL   = 6,  // label
+   C_ULABEL  = 7,  // undefined label
+   C_MOS     = 8,  // member of structure
+   C_ARG     = 9,  // function argument
+   C_STRTAG  = 10, // structure tag
+   C_MOU     = 11, // member of union
+   C_UNTAG   = 12, // union tag
+   C_TPDEF   = 13, // type definition
+   C_USTATIC = 14, // undefined static
+   C_ENTAG   = 15, // enumeration tag
+   C_MOE     = 16, // member of enumeration
+   C_REGPARM = 17, // register parameter
+   C_FIELD   = 18, // bit field
+ 
+   C_BLOCK  = 100, // ".bb" or ".eb"
+   C_FCN    = 101, // ".bf" or ".ef"
+   C_EOS    = 102, // end of structure
+   C_FILE   = 103, // file name
+   C_LINE   = 104, // dummy class for line number entry
+   C_ALIAS  = 105, // duplicate tag
+   C_HIDDEN = 106
+ };
+ 
+ enum SymbolType {
+   T_NULL   = 0,  // no type info
+   T_ARG    = 1,  // function argument (only used by compiler)
+   T_VOID   = 1,
+   T_CHAR   = 2,  // character
+   T_SHORT  = 3,  // short integer
+   T_INT    = 4,  // integer
+   T_LONG   = 5,  // long integer
+   T_FLOAT  = 6,  // floating point
+   T_DOUBLE = 7,  // double word
+   T_STRUCT = 8,  // structure
+   T_UNION  = 9,  // union
+   T_ENUM   = 10, // enumeration
+   T_MOE    = 11, // member of enumeration
+   T_UCHAR  = 12, // unsigned character
+   T_USHORT = 13, // unsigned short
+   T_UINT   = 14, // unsigned integer
+   T_ULONG  = 15  // unsigned long
+ };
+ 
+ enum SymbolDerivedType {
+   DT_NON = 0, // no derived type
+   DT_PTR = 1, // pointer
+   DT_FCN = 2, // function
+   DT_ARY = 3  // array
+ };
+ 
+ enum TypePacking {
+   N_BTMASK = 017,
+   N_TMASK = 060,
+   N_TMASK1 = 0300,
+   N_TMASK2 = 0360,
+   N_BTSHFT = 4,
+   N_TSHIFT = 2
+ };
+ 
+ }
+ 
+ #endif // X86COFF_H


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.89 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.90
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.89	Sun Jan 14 00:29:53 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Tue Jan 16 10:41:57 2007
@@ -16,6 +16,7 @@
 #define DEBUG_TYPE "asm-printer"
 #include "X86ATTAsmPrinter.h"
 #include "X86.h"
+#include "X86COFF.h"
 #include "X86MachineFunctionInfo.h"
 #include "X86TargetMachine.h"
 #include "X86TargetAsmInfo.h"
@@ -128,7 +129,17 @@
   if (F->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
       O << Directive << CurrentFnName << "\n";
-  
+
+  if (Subtarget->isTargetELF())
+    O << "\t.type " << CurrentFnName << ", at function\n";
+  else if (Subtarget->isTargetCygMing()) {
+    O << "\t.def\t " << CurrentFnName
+      << ";\t.scl\t" <<
+      (F->getLinkage() == Function::InternalLinkage ? COFF::C_STAT : COFF::C_EXT)
+      << ";\t.type\t" << (COFF::DT_FCN << COFF::N_BTSHFT)
+      << ";\t.endef\n";
+  }
+
   O << CurrentFnName << ":\n";
   // Add some workaround for linkonce linkage on Cygwin\MinGW
   if (Subtarget->isTargetCygMing() &&
@@ -289,10 +300,16 @@
       }       
       O << Name;
 
-      if (Subtarget->isPICStyleGOT() && isCallOp && isa<Function>(GV)) {
-        // Assemble call via PLT for non-local symbols
-        if (!isHidden || isExt)
-          O << "@PLT";
+      if (isCallOp && isa<Function>(GV)) {
+        if (Subtarget->isPICStyleGOT()) {
+          // Assemble call via PLT for non-local symbols
+          if (!isHidden || GV->isExternal())
+            O << "@PLT";
+        }
+        if (Subtarget->isTargetCygMing() && GV->isExternal()) {
+          // Save function name for later type emission
+          FnStubs.insert(Name);
+        }
       }
     }
 


Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.227 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.228
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.227	Sun Jan 14 00:29:53 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Tue Jan 16 10:41:57 2007
@@ -16,6 +16,7 @@
 
 #include "X86AsmPrinter.h"
 #include "X86ATTAsmPrinter.h"
+#include "X86COFF.h"
 #include "X86IntelAsmPrinter.h"
 #include "X86MachineFunctionInfo.h"
 #include "X86Subtarget.h"
@@ -249,6 +250,9 @@
     if (I->hasHiddenVisibility())
       if (const char *Directive = TAI->getHiddenDirective())
         O << Directive << name << "\n";
+    
+    if (Subtarget->isTargetELF())
+      O << "\t.type " << name << ", at object\n";
   }
   
   // Output linker support code for dllexported globals
@@ -308,7 +312,19 @@
     // linker can safely perform dead code stripping.  Since LLVM never
     // generates code that does this, it is always safe to set.
     O << "\t.subsections_via_symbols\n";
-  } else if (Subtarget->isTargetELF() || Subtarget->isTargetCygMing()) {
+  } else if (Subtarget->isTargetCygMing()) {
+    // Emit type information for external functions
+    for (std::set<std::string>::iterator i = FnStubs.begin(), e = FnStubs.end();
+         i != e; ++i) {
+      O << "\t.def\t " << *i
+        << ";\t.scl\t" << COFF::C_EXT
+        << ";\t.type\t" << (COFF::DT_FCN << COFF::N_BTSHFT)
+        << ";\t.endef\n";
+    }
+    
+    // Emit final debug information.
+    DW.EndModule();    
+  } else if (Subtarget->isTargetELF()) {
     // Emit final debug information.
     DW.EndModule();
   }





From rspencer at reidspencer.com  Tue Jan 16 10:52:42 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Tue, 16 Jan 2007 08:52:42 -0800
Subject: [llvm-commits] CVS:
	llvm/lib/Target/X86/X86COFF.h	X86ATTAsmPrinter.cpp X86AsmPrinter.cpp
In-Reply-To: <200701161642.l0GGgDFQ015379@zion.cs.uiuc.edu>
References: <200701161642.l0GGgDFQ015379@zion.cs.uiuc.edu>
Message-ID: <1168966362.12773.5.camel@bashful.x10sys.com>

On Tue, 2007-01-16 at 10:42 -0600, Anton Korobeynikov wrote:
> 
> Changes in directory llvm/lib/Target/X86:
> 
> X86COFF.h added (r1.1)
> X86ATTAsmPrinter.cpp updated: 1.89 -> 1.90
> X86AsmPrinter.cpp updated: 1.227 -> 1.228
> ---
> Log message:
> 
> Emit symbol type information for ELF/COFF targets

Anton, a few comments.

> 
> 
> ---
> Diffs of the changes:  (+128 -6)
> 
>  X86ATTAsmPrinter.cpp |   27 ++++++++++++---
>  X86AsmPrinter.cpp    |   18 +++++++++-
>  X86COFF.h            |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 128 insertions(+), 6 deletions(-)
> 
> 
> Index: llvm/lib/Target/X86/X86COFF.h
> diff -c /dev/null llvm/lib/Target/X86/X86COFF.h:1.1
> *** /dev/null	Tue Jan 16 10:42:07 2007
> --- llvm/lib/Target/X86/X86COFF.h	Tue Jan 16 10:41:57 2007
> ***************
> *** 0 ****
> --- 1,89 ----
> + //===--- X86COFF.h - Some definitions from COFF documentations ------------===//
> + //
> + //                     The LLVM Compiler Infrastructure
> + //
> + // This file was developed by the LLVM research group and is distributed under

This was developed by you, not the LLVM research group :)

> + // the University of Illinois Open Source License. See LICENSE.TXT for details.
> + //
> + //===----------------------------------------------------------------------===//
> + //
> + // This file just defines some symbols found in COFF documentation. They are
> + // used to emit function type information for COFF targets (Cygwin/Mingw32).
> + //
> + //===----------------------------------------------------------------------===//
> + 
> + #ifndef X86COFF_H
> + #define X86COFF_H
> + 
> + namespace COFF 
> + {

Please provide a comment for StorageClass

> + enum StorageClass {
> +   C_EFCN =   -1,  // physical end of function

Please use ///< for comment so doxygen picks them up. Same for all those
below.

> +   C_NULL    = 0,

Perhaps explain this one's usage in a comment

> +   C_AUTO    = 1,  // external definition
> +   C_EXT     = 2,  // external symbol
> +   C_STAT    = 3,  // static
> +   C_REG     = 4,  // register variable
> +   C_EXTDEF  = 5,  // external definition
> +   C_LABEL   = 6,  // label
> +   C_ULABEL  = 7,  // undefined label
> +   C_MOS     = 8,  // member of structure
> +   C_ARG     = 9,  // function argument
> +   C_STRTAG  = 10, // structure tag
> +   C_MOU     = 11, // member of union
> +   C_UNTAG   = 12, // union tag
> +   C_TPDEF   = 13, // type definition
> +   C_USTATIC = 14, // undefined static
> +   C_ENTAG   = 15, // enumeration tag
> +   C_MOE     = 16, // member of enumeration
> +   C_REGPARM = 17, // register parameter
> +   C_FIELD   = 18, // bit field
> + 
> +   C_BLOCK  = 100, // ".bb" or ".eb"
> +   C_FCN    = 101, // ".bf" or ".ef"
> +   C_EOS    = 102, // end of structure
> +   C_FILE   = 103, // file name
> +   C_LINE   = 104, // dummy class for line number entry
> +   C_ALIAS  = 105, // duplicate tag
> +   C_HIDDEN = 106
> + };
> + 
> + enum SymbolType {

Comment needed.

> +   T_NULL   = 0,  // no type info

Again, ///<

> +   T_ARG    = 1,  // function argument (only used by compiler)
> +   T_VOID   = 1,
Comment needed.
> +   T_CHAR   = 2,  // character
> +   T_SHORT  = 3,  // short integer
> +   T_INT    = 4,  // integer
> +   T_LONG   = 5,  // long integer
> +   T_FLOAT  = 6,  // floating point
> +   T_DOUBLE = 7,  // double word
> +   T_STRUCT = 8,  // structure
> +   T_UNION  = 9,  // union
> +   T_ENUM   = 10, // enumeration
> +   T_MOE    = 11, // member of enumeration
> +   T_UCHAR  = 12, // unsigned character
> +   T_USHORT = 13, // unsigned short
> +   T_UINT   = 14, // unsigned integer
> +   T_ULONG  = 15  // unsigned long
> + };
> + 
> + enum SymbolDerivedType {
Comments.
> +   DT_NON = 0, // no derived type
> +   DT_PTR = 1, // pointer
> +   DT_FCN = 2, // function
> +   DT_ARY = 3  // array
> + };
> + 
> + enum TypePacking {
> +   N_BTMASK = 017,

Please add comments for each of these. Also, are octal values the most
appropriate here? Hex values are more understandable to most.

> +   N_TMASK = 060,
> +   N_TMASK1 = 0300,
> +   N_TMASK2 = 0360,
> +   N_BTSHFT = 4,
> +   N_TSHIFT = 2
> + };
> + 
> + }
> + 
> + #endif // X86COFF_H
> 
> 
> Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
> diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.89 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.90
> --- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.89	Sun Jan 14 00:29:53 2007
> +++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Tue Jan 16 10:41:57 2007
> @@ -16,6 +16,7 @@
>  #define DEBUG_TYPE "asm-printer"
>  #include "X86ATTAsmPrinter.h"
>  #include "X86.h"
> +#include "X86COFF.h"
>  #include "X86MachineFunctionInfo.h"
>  #include "X86TargetMachine.h"
>  #include "X86TargetAsmInfo.h"
> @@ -128,7 +129,17 @@
>    if (F->hasHiddenVisibility())
>      if (const char *Directive = TAI->getHiddenDirective())
>        O << Directive << CurrentFnName << "\n";
> -  
> +
> +  if (Subtarget->isTargetELF())
> +    O << "\t.type " << CurrentFnName << ", at function\n";
> +  else if (Subtarget->isTargetCygMing()) {
> +    O << "\t.def\t " << CurrentFnName
> +      << ";\t.scl\t" <<
> +      (F->getLinkage() == Function::InternalLinkage ? COFF::C_STAT : COFF::C_EXT)
> +      << ";\t.type\t" << (COFF::DT_FCN << COFF::N_BTSHFT)
> +      << ";\t.endef\n";
> +  }
> +
>    O << CurrentFnName << ":\n";
>    // Add some workaround for linkonce linkage on Cygwin\MinGW
>    if (Subtarget->isTargetCygMing() &&
> @@ -289,10 +300,16 @@
>        }       
>        O << Name;
>  
> -      if (Subtarget->isPICStyleGOT() && isCallOp && isa<Function>(GV)) {
> -        // Assemble call via PLT for non-local symbols
> -        if (!isHidden || isExt)
> -          O << "@PLT";
> +      if (isCallOp && isa<Function>(GV)) {
> +        if (Subtarget->isPICStyleGOT()) {
> +          // Assemble call via PLT for non-local symbols

Please define what PLT means in the comment.

> +          if (!isHidden || GV->isExternal())
> +            O << "@PLT";
> +        }
> +        if (Subtarget->isTargetCygMing() && GV->isExternal()) {
> +          // Save function name for later type emission
> +          FnStubs.insert(Name);
> +        }
>        }
>      }
>  
> 
> 
> Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
> diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.227 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.228
> --- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.227	Sun Jan 14 00:29:53 2007
> +++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Tue Jan 16 10:41:57 2007
> @@ -16,6 +16,7 @@
>  
>  #include "X86AsmPrinter.h"
>  #include "X86ATTAsmPrinter.h"
> +#include "X86COFF.h"
>  #include "X86IntelAsmPrinter.h"
>  #include "X86MachineFunctionInfo.h"
>  #include "X86Subtarget.h"
> @@ -249,6 +250,9 @@
>      if (I->hasHiddenVisibility())
>        if (const char *Directive = TAI->getHiddenDirective())
>          O << Directive << name << "\n";
> +    
> +    if (Subtarget->isTargetELF())
> +      O << "\t.type " << name << ", at object\n";
>    }
>    
>    // Output linker support code for dllexported globals
> @@ -308,7 +312,19 @@
>      // linker can safely perform dead code stripping.  Since LLVM never
>      // generates code that does this, it is always safe to set.
>      O << "\t.subsections_via_symbols\n";
> -  } else if (Subtarget->isTargetELF() || Subtarget->isTargetCygMing()) {
> +  } else if (Subtarget->isTargetCygMing()) {
> +    // Emit type information for external functions
> +    for (std::set<std::string>::iterator i = FnStubs.begin(), e = FnStubs.end();
> +         i != e; ++i) {
> +      O << "\t.def\t " << *i
> +        << ";\t.scl\t" << COFF::C_EXT
> +        << ";\t.type\t" << (COFF::DT_FCN << COFF::N_BTSHFT)
> +        << ";\t.endef\n";
> +    }
> +    
> +    // Emit final debug information.
> +    DW.EndModule();    
> +  } else if (Subtarget->isTargetELF()) {
>      // Emit final debug information.
>      DW.EndModule();
>    }
> 
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From sabre at nondot.org  Tue Jan 16 11:51:56 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 11:51:56 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86Subtarget.h
Message-ID: <200701161751.l0GHpusM016890@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86Subtarget.h updated: 1.27 -> 1.28
---
Log message:

document some subtlety


---
Diffs of the changes:  (+3 -1)

 X86Subtarget.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86Subtarget.h
diff -u llvm/lib/Target/X86/X86Subtarget.h:1.27 llvm/lib/Target/X86/X86Subtarget.h:1.28
--- llvm/lib/Target/X86/X86Subtarget.h:1.27	Tue Jan 16 03:29:17 2007
+++ llvm/lib/Target/X86/X86Subtarget.h	Tue Jan 16 11:51:40 2007
@@ -32,7 +32,9 @@
 class X86Subtarget : public TargetSubtarget {
 public:
   enum AsmWriterFlavorTy {
-    ATT, Intel, Unset
+    // Note: This numbering has to match the GCC assembler dialects for inline
+    // asm alternatives to work right.
+    ATT = 0, Intel = 1, Unset
   };
 protected:
   enum X86SSEEnum {





From llvm at cs.uiuc.edu  Tue Jan 16 12:05:42 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 12:05:42 -0600
Subject: [llvm-commits] CVS: llvm/test/Regression/Integer/
Message-ID: <200701161805.l0GI5g7t017328@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Integer:

---
Log message:

Directory /var/cvs/llvm/llvm/test/Regression/Integer added to the repository


---
Diffs of the changes:  (+0 -0)

 0 files changed





From sabre at nondot.org  Tue Jan 16 12:03:00 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 12:03:00 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200701161803.l0GI30IR017265@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.318 -> 1.319
---
Log message:

Fix SMG2000 with the CBE: opaque types need names too.


---
Diffs of the changes:  (+8 -10)

 CBackend.cpp |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.318 llvm/lib/Target/CBackend/CBackend.cpp:1.319
--- llvm/lib/Target/CBackend/CBackend.cpp:1.318	Tue Jan 16 01:22:23 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Tue Jan 16 12:02:45 2007
@@ -272,7 +272,7 @@
     
     // If this isn't a struct type, remove it from our set of types to name.
     // This simplifies emission later.
-    if (!isa<StructType>(I->second)) {
+    if (!isa<StructType>(I->second) && !isa<OpaqueType>(I->second)) {
       TST.remove(I);
     } else {
       // If this is not used, remove it from the symbol table.
@@ -1691,23 +1691,21 @@
 
   // Print out forward declarations for structure types before anything else!
   Out << "/* Structure forward decls */\n";
-  for (; I != End; ++I)
-    if (const Type *STy = dyn_cast<StructType>(I->second)) {
-      std::string Name = "struct l_" + Mang->makeNameProper(I->first);
-      Out << Name << ";\n";
-      TypeNames.insert(std::make_pair(STy, Name));
-    }
+  for (; I != End; ++I) {
+    std::string Name = "struct l_" + Mang->makeNameProper(I->first);
+    Out << Name << ";\n";
+    TypeNames.insert(std::make_pair(I->second, Name));
+  }
 
   Out << '\n';
 
   // Now we can print out typedefs.  Above, we guaranteed that this can only be
-  // for struct types.
+  // for struct or opaque types.
   Out << "/* Typedefs */\n";
   for (I = TST.begin(); I != End; ++I) {
-    const StructType *Ty = cast<StructType>(I->second);
     std::string Name = "l_" + Mang->makeNameProper(I->first);
     Out << "typedef ";
-    printType(Out, Ty, false, Name);
+    printType(Out, I->second, false, Name);
     Out << ";\n";
   }
 





From reid at x10sys.com  Tue Jan 16 12:08:38 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 12:08:38 -0600
Subject: [llvm-commits] CVS: llvm/test/Regression/Integer/.cvsignore
	BitArith.ll BitBit.ll BitCast.ll BitIcmp.ll BitMem.ll
	BitMisc.ll BitPacked.ll a15.ll a15.ll.out a17.ll a17.ll.out
	a31.ll a31.ll.out a33.ll a33.ll.out a63.ll a63.ll.out a7.ll
	a7.ll.out a9.ll a9.ll.out alignment_bt.ll basictest_bt.ll
	calltest_bt.ll cfgstructures_bt.ll constexpr_bt.ll
	constpointer_bt.ll dg.exp fold-fpcast_bt.ll
	forwardreftest_bt.ll globalredefinition_bt.ll
	globalvars_bt.ll indirectcall2_bt.ll indirectcall_bt.ll
	instructions_bt.ll newcasts_bt.ll opaquetypes_bt.ll
	packed_bt.ll packed_cmp_bt.ll packed_struct_bt.ll
	paramattrs_bt.ll properties_bt.ll prototype_bt.ll
	recursivetype_bt.ll simplecalltest_bt.ll small_bt.ll
	testalloca_bt.ll testarith_bt.ll testconstants_bt.ll
	testicmp_bt.ll testlogical_bt.ll testlogical_new_bt.ll
	testmemory_bt.ll testswitch_bt.ll testvarargs_bt.ll
	undefined_bt.ll unreachable_bt.ll varargs_bt.ll varargs_new_bt.ll
Message-ID: <200701161808.l0GI8cMH017502@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Integer:

.cvsignore added (r1.1)
BitArith.ll added (r1.1)
BitBit.ll added (r1.1)
BitCast.ll added (r1.1)
BitIcmp.ll added (r1.1)
BitMem.ll added (r1.1)
BitMisc.ll added (r1.1)
BitPacked.ll added (r1.1)
a15.ll added (r1.1)
a15.ll.out added (r1.1)
a17.ll added (r1.1)
a17.ll.out added (r1.1)
a31.ll added (r1.1)
a31.ll.out added (r1.1)
a33.ll added (r1.1)
a33.ll.out added (r1.1)
a63.ll added (r1.1)
a63.ll.out added (r1.1)
a7.ll added (r1.1)
a7.ll.out added (r1.1)
a9.ll added (r1.1)
a9.ll.out added (r1.1)
alignment_bt.ll added (r1.1)
basictest_bt.ll added (r1.1)
calltest_bt.ll added (r1.1)
cfgstructures_bt.ll added (r1.1)
constexpr_bt.ll added (r1.1)
constpointer_bt.ll added (r1.1)
dg.exp added (r1.1)
fold-fpcast_bt.ll added (r1.1)
forwardreftest_bt.ll added (r1.1)
globalredefinition_bt.ll added (r1.1)
globalvars_bt.ll added (r1.1)
indirectcall2_bt.ll added (r1.1)
indirectcall_bt.ll added (r1.1)
instructions_bt.ll added (r1.1)
newcasts_bt.ll added (r1.1)
opaquetypes_bt.ll added (r1.1)
packed_bt.ll added (r1.1)
packed_cmp_bt.ll added (r1.1)
packed_struct_bt.ll added (r1.1)
paramattrs_bt.ll added (r1.1)
properties_bt.ll added (r1.1)
prototype_bt.ll added (r1.1)
recursivetype_bt.ll added (r1.1)
simplecalltest_bt.ll added (r1.1)
small_bt.ll added (r1.1)
testalloca_bt.ll added (r1.1)
testarith_bt.ll added (r1.1)
testconstants_bt.ll added (r1.1)
testicmp_bt.ll added (r1.1)
testlogical_bt.ll added (r1.1)
testlogical_new_bt.ll added (r1.1)
testmemory_bt.ll added (r1.1)
testswitch_bt.ll added (r1.1)
testvarargs_bt.ll added (r1.1)
undefined_bt.ll added (r1.1)
unreachable_bt.ll added (r1.1)
varargs_bt.ll added (r1.1)
varargs_new_bt.ll added (r1.1)
---
Log message:

New test cases for bit accurate integers developed by Guoling Han.


---
Diffs of the changes:  (+1669 -0)

 .cvsignore               |    1 
 BitArith.ll              |   26 +++++++++++
 BitBit.ll                |   26 +++++++++++
 BitCast.ll               |   28 ++++++++++++
 BitIcmp.ll               |   46 +++++++++++++++++++
 BitMem.ll                |   34 ++++++++++++++
 BitMisc.ll               |   25 ++++++++++
 BitPacked.ll             |   23 +++++++++
 a15.ll                   |   23 +++++++++
 a15.ll.out               |   18 +++++++
 a17.ll                   |   22 +++++++++
 a17.ll.out               |   18 +++++++
 a31.ll                   |   22 +++++++++
 a31.ll.out               |   18 +++++++
 a33.ll                   |   23 +++++++++
 a33.ll.out               |   18 +++++++
 a63.ll                   |   22 +++++++++
 a63.ll.out               |   18 +++++++
 a7.ll                    |   23 +++++++++
 a7.ll.out                |   18 +++++++
 a9.ll                    |   23 +++++++++
 a9.ll.out                |   18 +++++++
 alignment_bt.ll          |   21 +++++++++
 basictest_bt.ll          |   34 ++++++++++++++
 calltest_bt.ll           |   35 +++++++++++++++
 cfgstructures_bt.ll      |   57 ++++++++++++++++++++++++
 constexpr_bt.ll          |   84 ++++++++++++++++++++++++++++++++++++
 constpointer_bt.ll       |   33 ++++++++++++++
 dg.exp                   |    3 +
 fold-fpcast_bt.ll        |   18 +++++++
 forwardreftest_bt.ll     |   34 ++++++++++++++
 globalredefinition_bt.ll |   18 +++++++
 globalvars_bt.ll         |   27 +++++++++++
 indirectcall2_bt.ll      |   25 ++++++++++
 indirectcall_bt.ll       |   54 +++++++++++++++++++++++
 instructions_bt.ll       |   26 +++++++++++
 newcasts_bt.ll           |   28 ++++++++++++
 opaquetypes_bt.ll        |   61 ++++++++++++++++++++++++++
 packed_bt.ll             |   17 +++++++
 packed_cmp_bt.ll         |   58 +++++++++++++++++++++++++
 packed_struct_bt.ll      |   33 ++++++++++++++
 paramattrs_bt.ll         |   20 ++++++++
 properties_bt.ll         |   10 ++++
 prototype_bt.ll          |   14 ++++++
 recursivetype_bt.ll      |  109 +++++++++++++++++++++++++++++++++++++++++++++++
 simplecalltest_bt.ll     |   29 ++++++++++++
 small_bt.ll              |   14 ++++++
 testalloca_bt.ll         |   29 ++++++++++++
 testarith_bt.ll          |   19 ++++++++
 testconstants_bt.ll      |   33 ++++++++++++++
 testicmp_bt.ll           |   24 ++++++++++
 testlogical_bt.ll        |   14 ++++++
 testlogical_new_bt.ll    |   16 ++++++
 testmemory_bt.ll         |   46 +++++++++++++++++++
 testswitch_bt.ll         |   25 ++++++++++
 testvarargs_bt.ll        |   15 ++++++
 undefined_bt.ll          |   19 ++++++++
 unreachable_bt.ll        |   17 +++++++
 varargs_bt.ll            |   24 ++++++++++
 varargs_new_bt.ll        |   33 ++++++++++++++
 60 files changed, 1669 insertions(+)


Index: llvm/test/Regression/Integer/.cvsignore
diff -c /dev/null llvm/test/Regression/Integer/.cvsignore:1.1
*** /dev/null	Tue Jan 16 12:08:32 2007
--- llvm/test/Regression/Integer/.cvsignore	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1 ----
+ Output


Index: llvm/test/Regression/Integer/BitArith.ll
diff -c /dev/null llvm/test/Regression/Integer/BitArith.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitArith.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,26 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ declare void "foo"(i31 %i, i63 %j, i10 %k)
+ 
+ implementation
+ 
+ ; foo test basic arith operations
+ define void "foo"(i31 %i, i63 %j, i10 %k)
+ begin
+ 	%t1 = trunc i63 %j to i31 
+         %t2 = add i31 %t1, %i
+         %t20 = add i31 3, %t1
+         %t3 = zext i31 %i to i63
+         %t4 = sub i63 %t3, %j
+         %t40 = sub i63 %j, -100 
+         %t5 = mul i10 %k, 7
+         %t6 = sdiv i63 %j, -2
+         %t7 = udiv i63 %j, %t3
+         %t8 = urem i10 %k, 10
+         %t9 = srem i10 %k, -10
+ 	ret void
+ end
+ 


Index: llvm/test/Regression/Integer/BitBit.ll
diff -c /dev/null llvm/test/Regression/Integer/BitBit.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitBit.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,26 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ 
+ declare void "foo"(i31 %i, i17 %j)
+ 
+ implementation
+ 
+ ; foo test basic bitwise operations
+ define void "foo"(i31 %i, i33 %j)
+ begin
+ 	%t1 = trunc i33 %j to i31 
+         %t2 = and i31 %t1, %i
+         %t3 = sext i31 %i to i33
+         %t4 = or i33 %t3, %j 
+         %t5 = xor i31 %t2, 7 
+         %t6 = shl i31 %i, i8 2
+         %t7 = trunc i31 %i to i8
+         %t8 = shl i8 %t7, i8 3
+         %t9 = lshr i33 %j, i8 31
+         %t10 = ashr i33 %j, i8 %t7
+ 	ret void
+ end
+ 


Index: llvm/test/Regression/Integer/BitCast.ll
diff -c /dev/null llvm/test/Regression/Integer/BitCast.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitCast.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,28 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ declare void "foo"(i31 %i, i1280 %j, i1 %k, float %f)
+ 
+ implementation
+ 
+ ; foo test basic arith operations
+ define void "foo"(i31 %i, i1280 %j, i1 %k, float %f)
+ begin
+ 	%t1 = trunc i1280 %j to i31
+         %t2 = trunc i31 %t1 to i1
+  
+         %t3 = zext i31 %i to i1280
+         %t4 = sext i31 %i to i1280
+ 
+         %t5 = fptoui float 3.14159 to i31
+         %t6 = uitofp i31 %t5 to double
+ 
+         %t7 = fptosi double -1234.5678 to i28
+         %t8 = sitofp i8 -1 to double
+         %t9 = uitofp i8 255 to double
+         
+ 	ret void
+ end
+ 


Index: llvm/test/Regression/Integer/BitIcmp.ll
diff -c /dev/null llvm/test/Regression/Integer/BitIcmp.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitIcmp.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,46 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ 
+ implementation
+ 
+ define i55 "simpleIcmp"(i55 %i0, i55 %j0)
+ begin
+ 	%t1 = icmp eq i55 %i0, %j0
+ 	%t2 = icmp ne i55 %i0, %j0
+ 	%t3 = icmp ult i55 %i0, %j0
+         %t4 = icmp sgt i55 %i0, %j0
+ 	%t5 = icmp ule i55 %i0, %j0
+         %t6 = icmp sge i55 %i0, %j0
+ 
+ 	%t7 = icmp eq i55 %i0, 1098765432
+         %t8 = icmp ne i55 %i0, -31415926
+ 
+         %t9 = icmp ult i55 10000, %j0
+         %t10 = icmp sgt i55 -10000, %j0
+ 
+ 	ret i55 %i0
+ end
+ 
+ define i31 "phitest"(i12 %i)
+ begin
+ 
+ HasArg:
+         %n1 = add i12 1, %i
+         br label %Continue
+         
+ Continue:
+         %n = phi i12 [%n1, %HasArg], [%next, %Continue]
+         %next = add i12 1, %n
+         br label %Continue
+ end
+ 
+ define i18 "select"(i18 %i)
+ begin
+         %t = icmp sgt i18 %i, 100
+         %k = select i1 %t, i18 %i, i18 999
+         ret i18 %k
+ end
+ 


Index: llvm/test/Regression/Integer/BitMem.ll
diff -c /dev/null llvm/test/Regression/Integer/BitMem.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitMem.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,34 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ declare void "foo"()
+ 
+ 
+ implementation
+ 
+ ; foo test basic arith operations
+ define void "foo"()
+ begin
+ 	%t1 = malloc i31, i32 4
+         %t2 = malloc i31, i32 7, align 1024
+         %t3 = malloc [4 x i15]
+ 
+ 
+         %idx = getelementptr [4 x i15]* %t3, i64 0, i64 2
+         store i15 -123, i15* %idx
+ 
+         free [4 x i15]* %t3
+         free i31* %t2
+         free i31* %t1
+         
+         %t4 = alloca i12, i32 100
+         free i12* %t4
+ 
+         %t5 = alloca i31
+         store i31 -123, i31* %t5
+ 
+         free i31* %t5
+ 	ret void
+ end


Index: llvm/test/Regression/Integer/BitMisc.ll
diff -c /dev/null llvm/test/Regression/Integer/BitMisc.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitMisc.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,25 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ %MyVar     = external global i19
+ %MyIntList = external global { i39 *, i19 }
+              external global i19      ; i19*:0
+ 
+ %AConst    = constant i19 -123
+ 
+ %AString   = constant [4 x i8] c"test"
+ 
+ %ZeroInit  = global { [100 x i19 ], [40 x float ] } { [100 x i19] zeroinitializer,
+                                                       [40  x float] zeroinitializer }
+ 
+ implementation
+ 
+ define i19 "foo"(i19 %blah)
+ begin
+ 	store i19 5, i19 *%MyVar
+ 	%idx = getelementptr { i39 *, i19 } * %MyIntList, i64 0, i32 1
+   	store i19 12, i19* %idx
+   	ret i19 %blah
+ end


Index: llvm/test/Regression/Integer/BitPacked.ll
diff -c /dev/null llvm/test/Regression/Integer/BitPacked.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/BitPacked.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,23 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ %foo1 = external global <4 x float>;
+ %foo2 = external global <2 x i10>;
+ 
+ implementation   ; Functions:
+ 
+ define void %main() 
+ {
+         store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* %foo1
+         store <2 x i10> <i10 4, i10 4>, <2 x i10>* %foo2
+ 	%l1 = load <4 x float>* %foo1
+         %l2 = load <2 x i10>* %foo2
+         %r1 = extractelement <2 x i10> %l2, i32 1    
+         %r2 = extractelement <2 x i10> %l2, i32 0
+         %t = mul i10 %r1, %r2
+         %r3 = insertelement <2 x i10> %l2, i10 %t, i32 0    
+         store <2 x i10> %r3, <2 x i10>* %foo2
+         ret void
+ }


Index: llvm/test/Regression/Integer/a15.ll
diff -c /dev/null llvm/test/Regression/Integer/a15.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a15.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,23 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 15 bits
+ ;
+ %b = constant i15 add(i15 32767, i15 1)
+ %c = constant i15 add(i15 32767, i15 32767)
+ %d = constant i15 add(i15 32760, i15 8)
+ %e = constant i15 sub(i15 0 , i15 1)
+ %f = constant i15 sub(i15 0 , i15 32767)
+ %g = constant i15 sub(i15 2 , i15 32767)
+ 
+ %h = constant i15 shl(i15 1 , i8 15)
+ %i = constant i15 shl(i15 1 , i8 14)
+ %j = constant i15 lshr(i15 32767 , i8 14)
+ %k = constant i15 lshr(i15 32767 , i8 15)
+ %l = constant i15 ashr(i15 32767 , i8 14)
+ %m = constant i15 ashr(i15 32767 , i8 15)
+ 
+ %n = constant i15 mul(i15 32767, i15 2)
+ %o = constant i15 trunc( i16 32768  to i15 )
+ %p = constant i15 trunc( i16 32767  to i15 )
+  


Index: llvm/test/Regression/Integer/a15.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a15.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a15.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i15 0		; <i15*> [#uses=0]
+ %c = constant i15 -2		; <i15*> [#uses=0]
+ %d = constant i15 0		; <i15*> [#uses=0]
+ %e = constant i15 -1		; <i15*> [#uses=0]
+ %f = constant i15 1		; <i15*> [#uses=0]
+ %g = constant i15 3		; <i15*> [#uses=0]
+ %h = constant i15 0		; <i15*> [#uses=0]
+ %i = constant i15 -16384		; <i15*> [#uses=0]
+ %j = constant i15 1		; <i15*> [#uses=0]
+ %k = constant i15 0		; <i15*> [#uses=0]
+ %l = constant i15 -1		; <i15*> [#uses=0]
+ %m = constant i15 -1		; <i15*> [#uses=0]
+ %n = constant i15 -2		; <i15*> [#uses=0]
+ %o = constant i15 0		; <i15*> [#uses=0]
+ %p = constant i15 -1		; <i15*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a17.ll
diff -c /dev/null llvm/test/Regression/Integer/a17.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a17.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,22 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 17 bits
+ ;
+ %b = constant i17 add(i17 131071, i17 1)
+ %c = constant i17 add(i17 131071, i17 131071)
+ %d = constant i17 add(i17 131064, i17 8)
+ %e = constant i17 sub(i17 0 , i17 1)
+ %f = constant i17 sub(i17 0 , i17 131071)
+ %g = constant i17 sub(i17 2 , i17 131071)
+ 
+ %h = constant i17 shl(i17 1 , i8 17)
+ %i = constant i17 shl(i17 1 , i8 16)
+ %j = constant i17 lshr(i17 131071 , i8 16)
+ %k = constant i17 lshr(i17 131071 , i8 17)
+ %l = constant i17 ashr(i17 131071 , i8 16)
+ %m = constant i17 ashr(i17 131071 , i8 17)
+ 
+ %n = constant i17 mul(i17 131071, i17 2) 
+ %o = constant i17 trunc( i18 131072  to i17 )
+ %p = constant i17 trunc( i18 131071  to i17 )


Index: llvm/test/Regression/Integer/a17.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a17.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a17.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i17 0		; <i17*> [#uses=0]
+ %c = constant i17 -2		; <i17*> [#uses=0]
+ %d = constant i17 0		; <i17*> [#uses=0]
+ %e = constant i17 -1		; <i17*> [#uses=0]
+ %f = constant i17 1		; <i17*> [#uses=0]
+ %g = constant i17 3		; <i17*> [#uses=0]
+ %h = constant i17 0		; <i17*> [#uses=0]
+ %i = constant i17 -65536		; <i17*> [#uses=0]
+ %j = constant i17 1		; <i17*> [#uses=0]
+ %k = constant i17 0		; <i17*> [#uses=0]
+ %l = constant i17 -1		; <i17*> [#uses=0]
+ %m = constant i17 -1		; <i17*> [#uses=0]
+ %n = constant i17 -2		; <i17*> [#uses=0]
+ %o = constant i17 0		; <i17*> [#uses=0]
+ %p = constant i17 -1		; <i17*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a31.ll
diff -c /dev/null llvm/test/Regression/Integer/a31.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a31.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,22 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 31 bits
+ ;
+ %b = constant i31 add(i31 2147483647, i31 1)
+ %c = constant i31 add(i31 2147483647, i31 2147483647)
+ %d = constant i31 add(i31 2147483640, i31 8)
+ %e = constant i31 sub(i31 0 , i31 1)
+ %f = constant i31 sub(i31 0 , i31 2147483647)
+ %g = constant i31 sub(i31 2 , i31 2147483647)
+ 
+ %h = constant i31 shl(i31 1 , i8 31)
+ %i = constant i31 shl(i31 1 , i8 30)
+ %j = constant i31 lshr(i31 2147483647 , i8 30)
+ %k = constant i31 lshr(i31 2147483647 , i8 31)
+ %l = constant i31 ashr(i31 2147483647 , i8 30)
+ %m = constant i31 ashr(i31 2147483647 , i8 31)
+ 
+ %n = constant i31 mul(i31 2147483647, i31 2)
+ %o = constant i31 trunc( i32 2147483648  to i31 )
+ %p = constant i31 trunc( i32 2147483647  to i31 ) 


Index: llvm/test/Regression/Integer/a31.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a31.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a31.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i31 0		; <i31*> [#uses=0]
+ %c = constant i31 -2		; <i31*> [#uses=0]
+ %d = constant i31 0		; <i31*> [#uses=0]
+ %e = constant i31 -1		; <i31*> [#uses=0]
+ %f = constant i31 1		; <i31*> [#uses=0]
+ %g = constant i31 3		; <i31*> [#uses=0]
+ %h = constant i31 0		; <i31*> [#uses=0]
+ %i = constant i31 -1073741824		; <i31*> [#uses=0]
+ %j = constant i31 1		; <i31*> [#uses=0]
+ %k = constant i31 0		; <i31*> [#uses=0]
+ %l = constant i31 -1		; <i31*> [#uses=0]
+ %m = constant i31 -1		; <i31*> [#uses=0]
+ %n = constant i31 -2		; <i31*> [#uses=0]
+ %o = constant i31 0		; <i31*> [#uses=0]
+ %p = constant i31 -1		; <i31*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a33.ll
diff -c /dev/null llvm/test/Regression/Integer/a33.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a33.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,23 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 33 bits
+ ;
+ %b = constant i33 add(i33 8589934591, i33 1)
+ %c = constant i33 add(i33 8589934591, i33 8589934591)
+ %d = constant i33 add(i33 8589934584, i33 8)
+ %e = constant i33 sub(i33 0 , i33 1)
+ %f = constant i33 sub(i33 0 , i33 8589934591)
+ %g = constant i33 sub(i33 2 , i33 8589934591)
+ 
+ %h = constant i33 shl(i33 1 , i8 33)
+ %i = constant i33 shl(i33 1 , i8 32)
+ %j = constant i33 lshr(i33 8589934591 , i8 32)
+ %k = constant i33 lshr(i33 8589934591 , i8 33)
+ %l = constant i33 ashr(i33 8589934591 , i8 32)
+ %m = constant i33 ashr(i33 8589934591 , i8 33)
+ 
+ %n = constant i33 mul(i33 8589934591, i33 2)
+ %o = constant i33 trunc( i34 8589934592 to i33 )
+ %p = constant i33 trunc( i34 8589934591  to i33 )
+  


Index: llvm/test/Regression/Integer/a33.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a33.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a33.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i33 0		; <i33*> [#uses=0]
+ %c = constant i33 -2		; <i33*> [#uses=0]
+ %d = constant i33 0		; <i33*> [#uses=0]
+ %e = constant i33 -1		; <i33*> [#uses=0]
+ %f = constant i33 1		; <i33*> [#uses=0]
+ %g = constant i33 3		; <i33*> [#uses=0]
+ %h = constant i33 0		; <i33*> [#uses=0]
+ %i = constant i33 -4294967296		; <i33*> [#uses=0]
+ %j = constant i33 1		; <i33*> [#uses=0]
+ %k = constant i33 0		; <i33*> [#uses=0]
+ %l = constant i33 -1		; <i33*> [#uses=0]
+ %m = constant i33 -1		; <i33*> [#uses=0]
+ %n = constant i33 -2		; <i33*> [#uses=0]
+ %o = constant i33 0		; <i33*> [#uses=0]
+ %p = constant i33 -1		; <i33*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a63.ll
diff -c /dev/null llvm/test/Regression/Integer/a63.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a63.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,22 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 63 bits
+ ;
+ %b = constant i63 add(i63 9223372036854775807, i63 1)
+ %c = constant i63 add(i63 9223372036854775807, i63 9223372036854775807)
+ %d = constant i63 add(i63 9223372036854775800, i63 8)
+ %e = constant i63 sub(i63 0 , i63 1)
+ %f = constant i63 sub(i63 0 , i63 9223372036854775807)
+ %g = constant i63 sub(i63 2 , i63 9223372036854775807)
+ 
+ %h = constant i63 shl(i63 1 , i8 63)
+ %i = constant i63 shl(i63 1 , i8 62)
+ %j = constant i63 lshr(i63 9223372036854775807 , i8 62)
+ %k = constant i63 lshr(i63 9223372036854775807 , i8 63)
+ %l = constant i63 ashr(i63 9223372036854775807 , i8 62)
+ %m = constant i63 ashr(i63 9223372036854775807 , i8 63)
+ 
+ %n = constant i63 mul(i63 9223372036854775807, i63 2) 
+ %o = constant i63 trunc( i64 9223372036854775808 to i63 )
+ %p = constant i63 trunc( i64 9223372036854775807  to i63 )


Index: llvm/test/Regression/Integer/a63.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a63.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a63.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i63 0		; <i63*> [#uses=0]
+ %c = constant i63 -2		; <i63*> [#uses=0]
+ %d = constant i63 0		; <i63*> [#uses=0]
+ %e = constant i63 -1		; <i63*> [#uses=0]
+ %f = constant i63 1		; <i63*> [#uses=0]
+ %g = constant i63 3		; <i63*> [#uses=0]
+ %h = constant i63 0		; <i63*> [#uses=0]
+ %i = constant i63 -4611686018427387904		; <i63*> [#uses=0]
+ %j = constant i63 1		; <i63*> [#uses=0]
+ %k = constant i63 0		; <i63*> [#uses=0]
+ %l = constant i63 -1		; <i63*> [#uses=0]
+ %m = constant i63 -1		; <i63*> [#uses=0]
+ %n = constant i63 -2		; <i63*> [#uses=0]
+ %o = constant i63 0		; <i63*> [#uses=0]
+ %p = constant i63 -1		; <i63*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a7.ll
diff -c /dev/null llvm/test/Regression/Integer/a7.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a7.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,23 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 7 bits
+ ;
+ %b = constant i7 add(i7 127, i7 1)
+ %c = constant i7 add(i7 127, i7 127)
+ %d = constant i7 add(i7 120, i7 8)
+ %e = constant i7 sub(i7 0 , i7 1)
+ %f = constant i7 sub(i7 0 , i7 127)
+ %g = constant i7 sub(i7 2 , i7 127)
+ 
+ %h = constant i7 shl(i7 1 , i8 7)
+ %i = constant i7 shl(i7 1 , i8 6)
+ %j = constant i7 lshr(i7 127 , i8 6)
+ %k = constant i7 lshr(i7 127 , i8 7)
+ %l = constant i7 ashr(i7 127 , i8 6)
+ %m = constant i7 ashr(i7 127 , i8 7)
+ 
+ %n = constant i7 mul(i7 127, i7 2)
+ %o = constant i7 trunc( i8 128  to i7 )
+ %p = constant i7 trunc( i8 255  to i7 )
+  


Index: llvm/test/Regression/Integer/a7.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a7.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a7.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i7 0		; <i7*> [#uses=0]
+ %c = constant i7 -2		; <i7*> [#uses=0]
+ %d = constant i7 0		; <i7*> [#uses=0]
+ %e = constant i7 -1		; <i7*> [#uses=0]
+ %f = constant i7 1		; <i7*> [#uses=0]
+ %g = constant i7 3		; <i7*> [#uses=0]
+ %h = constant i7 0		; <i7*> [#uses=0]
+ %i = constant i7 -64		; <i7*> [#uses=0]
+ %j = constant i7 1		; <i7*> [#uses=0]
+ %k = constant i7 0		; <i7*> [#uses=0]
+ %l = constant i7 -1		; <i7*> [#uses=0]
+ %m = constant i7 -1		; <i7*> [#uses=0]
+ %n = constant i7 -2		; <i7*> [#uses=0]
+ %o = constant i7 0		; <i7*> [#uses=0]
+ %p = constant i7 -1		; <i7*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/a9.ll
diff -c /dev/null llvm/test/Regression/Integer/a9.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a9.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,23 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t.ll
+ ; RUN: diff %t.ll %s.out
+ 
+ ; test 9 bits
+ ;
+ %b = constant i9 add(i9 511, i9 1)
+ %c = constant i9 add(i9 511, i9 511)
+ %d = constant i9 add(i9 504, i9 8)
+ %e = constant i9 sub(i9 0 , i9 1)
+ %f = constant i9 sub(i9 0 , i9 511)
+ %g = constant i9 sub(i9 2 , i9 511)
+ 
+ %h = constant i9 shl(i9 1 , i8 9)
+ %i = constant i9 shl(i9 1 , i8 8)
+ %j = constant i9 lshr(i9 511 , i8 8)
+ %k = constant i9 lshr(i9 511 , i8 9)
+ %l = constant i9 ashr(i9 511 , i8 8)
+ %m = constant i9 ashr(i9 511 , i8 9)
+ 
+ %n = constant i9 mul(i9 511, i9 2)
+ %o = constant i9 trunc( i10 512  to i9 )
+ %p = constant i9 trunc( i10 511  to i9 )
+ 


Index: llvm/test/Regression/Integer/a9.ll.out
diff -c /dev/null llvm/test/Regression/Integer/a9.ll.out:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/a9.ll.out	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; ModuleID = '<stdin>'
+ %b = constant i9 0		; <i9*> [#uses=0]
+ %c = constant i9 -2		; <i9*> [#uses=0]
+ %d = constant i9 0		; <i9*> [#uses=0]
+ %e = constant i9 -1		; <i9*> [#uses=0]
+ %f = constant i9 1		; <i9*> [#uses=0]
+ %g = constant i9 3		; <i9*> [#uses=0]
+ %h = constant i9 0		; <i9*> [#uses=0]
+ %i = constant i9 -256		; <i9*> [#uses=0]
+ %j = constant i9 1		; <i9*> [#uses=0]
+ %k = constant i9 0		; <i9*> [#uses=0]
+ %l = constant i9 -1		; <i9*> [#uses=0]
+ %m = constant i9 -1		; <i9*> [#uses=0]
+ %n = constant i9 -2		; <i9*> [#uses=0]
+ %o = constant i9 0		; <i9*> [#uses=0]
+ %p = constant i9 -1		; <i9*> [#uses=0]
+ 
+ implementation   ; Functions:


Index: llvm/test/Regression/Integer/alignment_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/alignment_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/alignment_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,21 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %X = global i19 4, align 16
+ 
+ define i19 *%test() align 32 {
+ 	%X = alloca i19, align 4
+ 	%Y = alloca i51, i32 42, align 16
+ 	%Z = alloca i32, align 0
+ 	ret i19 *%X
+ }
+ 
+ define i19 *%test2() {
+ 	%X = malloc i19, align 4
+ 	%Y = malloc i51, i32 42, align 16
+ 	%Z = malloc i32, align 0
+ 	ret i19 *%X
+ }
+ 
+ 


Index: llvm/test/Regression/Integer/basictest_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/basictest_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/basictest_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,34 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ ; Test "stripped" format where nothing is symbolic... this is how the bytecode
+ ; format looks anyways (except for negative vs positive offsets)...
+ ;
+ define void "void"(i39, i39)   ; Def %0, %1
+ begin
+ 	add i39 0, 0      ; Def 2
+ 	sub i39 0, 4      ; Def 3
+ 	br label %1
+ 
+ ; <label>:1		; preds = %1, %0
+ 	add i39 %0, %1    ; Def 4
+ 	sub i39 %4, %3    ; Def 5
+ 	icmp sle i39 %5, %2  ; Def 0 - i1 plane
+ 	br i1 %0, label %2, label %1
+ 
+ ; <label>:2		; preds = %1
+ 	add i39 %0, %1    ; Def 6
+ 	sub i39 %4, %3    ; Def 7
+ 	icmp sle i39 %7, %2  ; Def 1 - i1 plane
+ 	ret void
+ end
+ 
+ ; This function always returns zero
+ define i39 "zarro"()
+ begin
+ Startup:
+ 	ret i39 0
+ end


Index: llvm/test/Regression/Integer/calltest_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/calltest_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/calltest_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,35 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %FunTy = type i28(i28)
+ 
+ declare i28 "test"(...)   ; Test differences of prototype
+ declare i28 "test"()      ; Differ only by vararg
+ 
+ implementation
+ 
+ define void "invoke"(%FunTy *%x) {
+ 	%foo = call %FunTy* %x(i28 123)
+ 	%foo2 = tail call %FunTy* %x(i28 123)
+ 	ret void
+ }
+ 
+ define i28 "main"(i28 %argc)   ; TODO: , sbyte **argv, sbyte **envp)
+ begin
+         %retval = call i28 (i28) *%test(i28 %argc)
+         %two    = add i28 %retval, %retval
+ 	%retval2 = invoke i28 %test(i28 %argc)
+ 		   to label %Next unwind label %Error
+ Next:
+ 	%two2 = add i28 %two, %retval2
+ 	call void %invoke (%FunTy* %test)
+         ret i28 %two2
+ Error:
+ 	ret i28 -1
+ end
+ 
+ define i28 "test"(i28 %i0)
+ begin
+     ret i28 %i0
+ end


Index: llvm/test/Regression/Integer/cfgstructures_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/cfgstructures_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/cfgstructures_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,57 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ ;; This is an irreducible flow graph
+ 
+ 
+ define void "irreducible"(i1 %cond)
+ begin
+ 	br i1 %cond, label %X, label %Y
+ 
+ X:
+ 	br label %Y
+ Y:
+ 	br label %X
+ end
+ 
+ ;; This is a pair of loops that share the same header
+ 
+ define void "sharedheader"(i1 %cond)
+ begin
+ 	br label %A
+ A:
+ 	br i1 %cond, label %X, label %Y
+ 
+ X:
+ 	br label %A
+ Y:
+ 	br label %A
+ end
+ 
+ ;; This is a simple nested loop
+ define void "nested"(i1 %cond1, i1 %cond2, i1 %cond3)
+ begin
+ 	br label %Loop1
+ 
+ Loop1:
+ 	br label %Loop2
+ 
+ Loop2:
+ 	br label %Loop3
+ 
+ Loop3:
+ 	br i1 %cond3, label %Loop3, label %L3Exit
+ 
+ L3Exit:
+ 	br i1 %cond2, label %Loop2, label %L2Exit
+ 
+ L2Exit:
+ 	br i1 %cond1, label %Loop1, label %L1Exit
+ 
+ L1Exit:
+ 	ret void
+ end
+ 


Index: llvm/test/Regression/Integer/constexpr_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/constexpr_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/constexpr_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,84 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ ; This testcase is for testing expressions constructed from
+ ; constant values, including constant pointers to globals.
+ ;
+ 
+ ;;-------------------------------
+ ;; Test constant cast expressions
+ ;;-------------------------------
+ 
+ global i63 0x00001     ; hexadecimal unsigned integer constants
+ global i63  0x012312   ; hexadecimal signed integer constants
+ 
+ %t2 = global i33* %t1                             ;; Forward reference without cast
+ %t3 = global i33* bitcast (i33* %t1 to i33*)       ;; Forward reference with cast
+ %t1 = global i33 4                                ;; i32* %0
+ %t4 = global i33** bitcast (i33** %t3 to i33**)     ;; Cast of a previous cast
+ %t5 = global i33** %t3                           ;; Reference to a previous cast
+ %t6 = global i33*** %t4
+ %t7 = global float* inttoptr (i32 12345678 to float*) ;; Cast ordinary value to ptr
+ %t9 = global i33 fp2uint (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
+ 
+ global i32* bitcast (float* %0 to i32*)   ;; Forward numeric reference
+ global float* %0                       ;; Duplicate forward numeric reference
+ global float 0.0
+ 
+ 
+ ;;---------------------------------------------------
+ ;; Test constant getelementpr expressions for arrays
+ ;;---------------------------------------------------
+ 
+ %array  = constant [2 x i33] [ i33 12, i33 52 ]
+ %arrayPtr = global i33* getelementptr ([2 x i33]* %array, i64 0, i64 0)    ;; i33* &%array[0][0]
+ %arrayPtr5 = global i33** getelementptr (i33** %arrayPtr, i64 5)    ;; i33* &%arrayPtr[5]
+ 
+ %somestr = constant [11x i8] c"hello world"
+ %char5  = global i8* getelementptr([11x i8]* %somestr, i64 0, i64 5)
+ 
+ ;; cast of getelementptr
+ %char8a = global i33* sext (i8* getelementptr([11x i8]* %somestr, i64 0, i64 8) to i33*)
+ 
+ ;; getelementptr containing casts
+ %char8b = global i8* getelementptr([11x i8]* %somestr, i64 sext (i8 0 to i64), i64 sext (i8 8 to i64))
+ 
+ ;;-------------------------------------------------------
+ ;; TODO: Test constant getelementpr expressions for structures
+ ;;-------------------------------------------------------
+ 
+ %SType  = type { i33 , {float, {i8} }, i64 } ;; struct containing struct
+ %SAType = type { i33 , {[2x float], i64} } ;; struct containing array
+ 
+ %S1 = global %SType* null			;; Global initialized to NULL
+ %S2c = constant %SType { i33 1, {float,{i8}} {float 2.0, {i8} {i8 3}}, i64 4}
+ 
+ %S3c = constant %SAType { i33 1, {[2x float], i64} {[2x float] [float 2.0, float 3.0], i64 4} }
+ 
+ %S1ptr = global %SType** %S1		    ;; Ref. to global S1
+ %S2  = global %SType* %S2c		    ;; Ref. to constant S2
+ %S3  = global %SAType* %S3c		    ;; Ref. to constant S3
+ 
+ 					    ;; Pointer to float (**%S1).1.0
+ %S1fld1a = global float* getelementptr (%SType* %S2c, i64 0, i32 1, i32 0)
+ 					    ;; Another ptr to the same!
+ %S1fld1b = global float* getelementptr (%SType* %S2c, i64 0, i32 1, i32 0)
+ 
+ %S1fld1bptr = global float** %S1fld1b	    ;; Ref. to previous pointer
+ 
+ 					    ;; Pointer to i8 (**%S2).1.1.0
+ %S2fld3 = global i8* getelementptr (%SType* %S2c, i64 0, i32 1, i32 1, i32 0) 
+ 
+ 					    ;; Pointer to float (**%S2).1.0[0]
+ ;%S3fld3 = global float* getelementptr (%SAType** %S3, i64 0, i64 0, i32 1, i32 0, i64 0) 
+ 
+ ;;---------------------------------------------------------
+ ;; TODO: Test constant expressions for unary and binary operators
+ ;;---------------------------------------------------------
+ 
+ ;;---------------------------------------------------
+ 
+ implementation
+ 


Index: llvm/test/Regression/Integer/constpointer_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/constpointer_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/constpointer_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,33 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ ; This testcase is primarily used for testing that global values can be used as 
+ ; constant pointer initializers.  This is tricky because they can be forward
+ ; declared and involves an icky bytecode encoding.  There is no meaningful 
+ ; optimization that can be performed on this file, it is just here to test 
+ ; assembly and disassembly.
+ ;
+ 
+ 
+ %t3 = global i40 * %t1           ;; Forward reference
+ %t1 = global i40 4
+ %t4 = global i40 ** %t3		 ;; reference to reference
+ 
+ %t2 = global i40 * %t1
+ 
+ global float * %0                ;; Forward numeric reference
+ global float * %0                ;; Duplicate forward numeric reference
+ global float 0.0
+ global float * %0                ;; Numeric reference
+ 
+ 
+ %fptr = global void() * %f       ;; Forward ref method defn
+ declare void "f"()               ;; External method
+ 
+ %sptr1   = global [11x i8]* %somestr		;; Forward ref to a constant
+ %somestr = constant [11x i8] c"hello world"
+ %sptr2   = global [11x i8]* %somestr
+ 
+ implementation
+ 


Index: llvm/test/Regression/Integer/dg.exp
diff -c /dev/null llvm/test/Regression/Integer/dg.exp:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/dg.exp	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,3 ----
+ load_lib llvm-dg.exp
+ 
+ llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version


Index: llvm/test/Regression/Integer/fold-fpcast_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/fold-fpcast_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/fold-fpcast_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; RUN: llvm-as < %s | llvm-dis | not grep bitcast
+ 
+ define i60 %test1() {
+    ret i60 fptoui(float 3.7 to i60)
+ }
+ 
+ define float %test2() {
+   ret float uitofp(i60 17 to float)
+ }
+ 
+ define i64 %test3() {
+   ret i64 bitcast (double 3.1415926 to i64)
+ }
+ 
+ define double %test4() {
+   ret double bitcast (i64 42 to double)
+ }
+ 


Index: llvm/test/Regression/Integer/forwardreftest_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/forwardreftest_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/forwardreftest_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,34 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+   %myty = type i55 
+   %myfn = type float (i55,double,i55,i16)
+   type i55(%myfn*)
+   type i55(i55)
+   type i55(i55(i55)*)
+ 
+   %thisfuncty = type i55 (i55) *
+ implementation
+ 
+ declare void %F(%thisfuncty, %thisfuncty, %thisfuncty)
+ 
+ ; This function always returns zero
+ define i55 %zarro(i55 %Func)
+ begin
+ Startup:
+     add i55 0, 10
+     ret i55 0 
+ end
+ 
+ define i55 %test(i55) 
+ begin
+     call void %F(%thisfuncty %zarro, %thisfuncty %test, %thisfuncty %foozball)
+     ret i55 0
+ end
+ 
+ define i55 %foozball(i55)
+ begin
+     ret i55 0
+ end
+ 


Index: llvm/test/Regression/Integer/globalredefinition_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/globalredefinition_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/globalredefinition_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,18 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ ; Test forward references and redefinitions of globals
+ 
+ %A = global i17* %B
+ %B = global i17 7
+ 
+ declare void %X()
+ 
+ declare void %X()
+ 
+ define void %X() {
+   ret void
+ }
+ 
+ declare void %X()


Index: llvm/test/Regression/Integer/globalvars_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/globalvars_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/globalvars_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,27 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ 
+ %MyVar     = external global i27
+ %MyIntList = external global { \2 *, i27 }
+              external global i27      ; i27*:0
+ 
+ %AConst    = constant i27 123
+ 
+ %AString   = constant [4 x i8] c"test"
+ 
+ %ZeroInit  = global { [100 x i27 ], [40 x float ] } { [100 x i27] zeroinitializer,
+                                                       [40  x float] zeroinitializer }
+ 
+ implementation
+ 
+ define i27 "foo"(i27 %blah)
+ begin
+ 	store i27 5, i27 *%MyVar
+ 	%idx = getelementptr { \2 *, i27 } * %MyIntList, i64 0, i27 1
+   	store i27 12, i27* %idx
+   	ret i27 %blah
+ end
+ 


Index: llvm/test/Regression/Integer/indirectcall2_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/indirectcall2_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/indirectcall2_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,25 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ define i63 "test"(i63 %X)
+ begin
+ 	ret i63 %X
+ end
+ 
+ define i63 "fib"(i63 %n)
+ begin
+   %T = icmp ult i63 %n, 2       ; {i1}:0
+   br i1 %T, label %BaseCase, label %RecurseCase
+ 
+ RecurseCase:
+   %result = call i63 %test(i63 %n)
+   br label %BaseCase
+ 
+ BaseCase:
+   %X = phi i63 [1, %0], [2, %RecurseCase]
+   ret i63 %X
+ end
+ 


Index: llvm/test/Regression/Integer/indirectcall_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/indirectcall_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/indirectcall_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,54 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ declare i32 "atoi"(i8 *)
+ 
+ define i63 "fib"(i63 %n)
+ begin
+   icmp ult i63 %n, 2       ; {i1}:0
+   br i1 %0, label %BaseCase, label %RecurseCase
+ 
+ BaseCase:
+   ret i63 1
+ 
+ RecurseCase:
+   %n2 = sub i63 %n, 2
+   %n1 = sub i63 %n, 1
+   %f2 = call i63(i63) * %fib(i63 %n2)
+   %f1 = call i63(i63) * %fib(i63 %n1)
+   %result = add i63 %f2, %f1
+   ret i63 %result
+ end
+ 
+ define i63 "realmain"(i32 %argc, i8 ** %argv)
+ begin
+   icmp eq i32 %argc, 2      ; {i1}:0
+   br i1 %0, label %HasArg, label %Continue
+ HasArg:
+   ; %n1 = atoi(argv[1])
+   %n1 = add i32 1, 1
+   br label %Continue
+ 
+ Continue:
+   %n = phi i32 [%n1, %HasArg], [1, %0]
+   %N = sext i32 %n to i63
+   %F = call i63(i63) *%fib(i63 %N)
+   ret i63 %F
+ end
+ 
+ define i63 "trampoline"(i63 %n, i63(i63)* %fibfunc)
+ begin
+   %F = call i63(i63) *%fibfunc(i63 %n)
+   ret i63 %F
+ end
+ 
+ define i32 "main"()
+ begin
+   %Result = call i63 %trampoline(i63 10, i63(i63) *%fib)
+   %Result = trunc i63 %Result to i32
+   ret i32 %Result
+ end
+ 


Index: llvm/test/Regression/Integer/instructions_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/instructions_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/instructions_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,26 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ define i39 %test_extractelement(<4 x i39> %V) {
+         %R = extractelement <4 x i39> %V, i39 1
+         ret i39 %R
+ }
+ 
+ define <4 x i39> %test_insertelement(<4 x i39> %V) {
+         %R = insertelement <4 x i39> %V, i39 0, i39 0
+         ret <4 x i39> %R
+ }
+ 
+ define <4 x i39> %test_shufflevector_u(<4 x i39> %V) {
+         %R = shufflevector <4 x i39> %V, <4 x i39> %V, 
+                   <4 x i39> < i39 1, i39 undef, i39 7, i39 2>
+         ret <4 x i39> %R
+ }
+ 
+ define <4 x float> %test_shufflevector_f(<4 x float> %V) {
+         %R = shufflevector <4 x float> %V, <4 x float> undef, 
+                   <4 x i32> < i32 1, i32 undef, i32 7, i32 2>
+         ret <4 x float> %R
+ }


Index: llvm/test/Regression/Integer/newcasts_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/newcasts_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/newcasts_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,28 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ define void "NewCasts" (i17 %x) {
+   %a = zext i17 %x to i32
+   %b = sext i17 %x to i32
+   %c = trunc i17 %x to i8
+   %d = uitofp i17 %x to float
+   %e = sitofp i17 %x to double
+   %f = fptoui float %d to i17
+   %g = fptosi double %e to i17 
+   %i = fpext float %d to double
+   %j = fptrunc double %i to float
+   %k = bitcast i32 %a to float
+   %l = inttoptr i17 %x to i32*
+   %m = ptrtoint i32* %l to i64
+   ret void
+ }
+ 
+ 
+ define i17 "ZExtConst" () {
+   ret i17 trunc ( i32 zext ( i17 42 to i32) to i17 )
+ }
+ 
+ define i17 "SExtConst" () {
+   ret i17 trunc (i32 sext (i17 42 to i32) to i17 )
+ }


Index: llvm/test/Regression/Integer/opaquetypes_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/opaquetypes_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/opaquetypes_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,61 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ ; This test case is used to test opaque type processing, forward references,
+ ; and recursive types.  Oh my.
+ ; 
+ 
+ %SQ1 = type { i31 }
+ %ITy = type opaque
+ %SQ2 = type { %ITy }
+ %ITy = type i31
+ 
+ 
+ %CCC = type { \2* }
+ %BBB = type { \2*, \2 * }
+ %AAA = type { \2*, {\2*}, [12x{\2*}], {[1x{\2*}]} }
+ 
+ ; Test numbered types
+ type %CCC
+ type %BBB
+ %Composite = type { %0, %1 }
+ 
+ ; Test simple opaque type resolution...
+ %i31ty = type opaque
+ %i31ty = type i31
+ 
+ ; Perform a simple forward reference...
+ %ty1 = type { %ty2, i31 }
+ %ty2 = type float
+ 
+ ; Do a recursive type...
+ %list = type { %list * }
+ %listp = type { %listp } *
+ 
+ ; Do two mutually recursive types...
+ %TyA = type { %ty2, %TyB * }
+ %TyB = type { double, %TyA * }
+ 
+ ; A complex recursive type...
+ %Y = type { {%Y*}, %Y* }
+ %Z = type { { %Z * }, [12x%Z] *, {{{ %Z * }}} }
+ 
+ ; More ridiculous test cases...
+ %A = type [ 123x %A*]
+ %M = type %M (%M, %M) *
+ %P = type %P*
+ 
+ ; Recursive ptrs
+ %u = type %v*
+ %v = type %u*
+ 
+ ; Test the parser for unnamed recursive types...
+ %P1 = type \1 *
+ %Y1 = type { { \3 * }, \2 * }
+ %Z1 = type { { \3 * }, [12x\3] *, { { { \5 * } } } }
+ 
+ implementation
+ 
+ 
+ 


Index: llvm/test/Regression/Integer/packed_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/packed_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/packed_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,17 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %foo1 = external global <4 x float>;
+ %foo2 = external global <2 x i10>;
+ 
+ implementation   ; Functions:
+ 
+ define void %main() 
+ {
+         store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* %foo1
+         store <2 x i10> <i10 4, i10 4>, <2 x i10>* %foo2
+ 	%l1 = load <4 x float>* %foo1
+         %l2 = load <2 x i10>* %foo2
+         ret void
+ }


Index: llvm/test/Regression/Integer/packed_cmp_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/packed_cmp_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/packed_cmp_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,58 ----
+ ; This test checks to make sure that NE and EQ comparisons of
+ ; vector types work.
+ ; RUN: llvm-as < %s | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ %ivec_type = type <4 x i9> 
+ %ivec1  = constant %ivec_type < i9 1, i9 1, i9 1, i9 1 >
+ %ivec2  = constant %ivec_type < i9 0, i9 0, i9 0, i9 0 >
+ 
+ %fvec_type = type <4 x float>
+ %fvec1 = constant %fvec_type <float 1.0, float 1.0, float 1.0, float 1.0>
+ %fvec2 = constant %fvec_type <float 0.0, float 0.0, float 0.0, float 0.0>
+ 
+ implementation   ; Functions:
+ 
+ define bool %ivectest1() {
+     %v1 = load %ivec_type* getelementptr(%ivec_type* %ivec1, i32 0)
+     %v2 = load %ivec_type* getelementptr(%ivec_type* %ivec2, i32 0)
+     %res = icmp ne %ivec_type %v1, %v2
+     ret bool %res
+ }
+ 
+ define bool %ivectest2() {
+     %v1 = load %ivec_type* getelementptr(%ivec_type* %ivec1, i32 0)
+     %v2 = load %ivec_type* getelementptr(%ivec_type* %ivec2, i32 0)
+     %res = icmp eq %ivec_type %v1, %v2
+     ret bool %res
+ }
+ 
+ define bool %fvectest1() {
+     %v1 = load %fvec_type* %fvec1
+     %v2 = load %fvec_type* %fvec2
+     %res = fcmp one %fvec_type %v1, %v2
+     ret bool %res
+ }
+ 
+ define bool %fvectest2() {
+     %v1 = load %fvec_type* %fvec1
+     %v2 = load %fvec_type* %fvec2
+     %res = fcmp oeq %fvec_type %v1, %v2
+     ret bool %res
+ }
+ 
+ define bool %fvectest3() {
+     %v1 = load %fvec_type* %fvec1
+     %v2 = load %fvec_type* %fvec2
+     %res = fcmp une %fvec_type %v1, %v2
+     ret bool %res
+ }
+ 
+ define bool %fvectest4() {
+     %v1 = load %fvec_type* %fvec1
+     %v2 = load %fvec_type* %fvec2
+     %res = fcmp ueq %fvec_type %v1, %v2
+     ret bool %res
+ }


Index: llvm/test/Regression/Integer/packed_struct_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/packed_struct_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/packed_struct_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,33 ----
+ ; RUN: llvm-as < %s | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll &&
+ ; RUN: not grep cast %t2.ll &&
+ ; RUN: grep "<{" %t2.ll
+ 
+ %struct.anon = type <{ i8, i35, i35, i35 }>
+ %foos = external global %struct.anon 
+ %bara = external global [2 x <{ i35, i8 }>]
+ 
+ ;initializers should work for packed and non-packed the same way
+ %E1 = global <{i8, i35, i35}> <{i8 1, i35 2, i35 3}>
+ %E2 = global {i8, i35, i35} {i8 4, i35 5, i35 6}
+ 
+ implementation   ; Functions:
+ 
+ define i35 %main() 
+ {
+         %tmp = load i35*  getelementptr (%struct.anon* %foos, i32 0, i32 1)            ; <i35> [#uses=1]
+         %tmp3 = load i35* getelementptr (%struct.anon* %foos, i32 0, i32 2)            ; <i35> [#uses=1]
+         %tmp6 = load i35* getelementptr (%struct.anon* %foos, i32 0, i32 3)            ; <i35> [#uses=1]
+         %tmp4 = add i35 %tmp3, %tmp             ; <i35> [#uses=1]
+         %tmp7 = add i35 %tmp4, %tmp6            ; <i35> [#uses=1]
+         ret i35 %tmp7
+ }
+ 
+ define i35 %bar() {
+ entry:
+         %tmp = load i35* getelementptr([2 x <{ i35, i8 }>]* %bara, i32 0, i32 0, i32 0 )            ; <i35> [#uses=1]
+         %tmp4 = load i35* getelementptr ([2 x <{ i35, i8 }>]* %bara, i32 0, i32 1, i32 0)           ; <i35> [#uses=1]
+         %tmp5 = add i35 %tmp4, %tmp             ; <i35> [#uses=1]
+         ret i35 %tmp5
+ }


Index: llvm/test/Regression/Integer/paramattrs_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/paramattrs_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/paramattrs_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,20 ----
+ ; RUN: llvm-as < %s | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %ZFunTy = type i33(i8 zext)
+ %SFunTy = type i33(i8 sext)
+ 
+ declare i16 "test"(i16 sext %arg) sext 
+ declare i8 "test2" (i16 zext %a2) zext 
+ 
+ implementation
+ 
+ define i33 %main(i33 %argc, i8 **%argv) {
+     %val = trunc i33 %argc to i16
+     %res = call i16 (i16 sext) sext *%test(i16 %val)
+     %two = add i16 %res, %res
+     %res = call i8 %test2(i16 %two zext) zext 
+     %retVal = sext i16 %two to i33
+     ret i33 %retVal
+ }


Index: llvm/test/Regression/Integer/properties_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/properties_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/properties_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,10 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ target endian = little
+ target pointersize = 32
+ target triple = "proc-vend-sys"
+ deplibs = [ "m", "c" ]
+ 


Index: llvm/test/Regression/Integer/prototype_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/prototype_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/prototype_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,14 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ declare i31 "bar"(i31 %in) 
+ 
+ define i31 "foo"(i31 %blah)
+ begin
+   %xx = call i31 %bar(i31 %blah)
+   ret i31 %xx
+ end
+ 


Index: llvm/test/Regression/Integer/recursivetype_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/recursivetype_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/recursivetype_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,109 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ ; This file contains the output from the following compiled C code:
+ ; typedef struct list {
+ ;   struct list *Next;
+ ;   i32 Data;
+ ; } list;
+ ;
+ ; // Iterative insert fn
+ ; void InsertIntoListTail(list **L, i32 Data) {
+ ;   while (*L)
+ ;     L = &(*L)->Next;
+ ;   *L = (list*)malloc(sizeof(list));
+ ;   (*L)->Data = Data;
+ ;   (*L)->Next = 0;
+ ; }
+ ;
+ ; // Recursive list search fn
+ ; list *FindData(list *L, i32 Data) {
+ ;   if (L == 0) return 0;
+ ;   if (L->Data == Data) return L;
+ ;   return FindData(L->Next, Data);
+ ; }
+ ;
+ ; void DoListStuff() {
+ ;   list *MyList = 0;
+ ;   InsertIntoListTail(&MyList, 100);
+ ;   InsertIntoListTail(&MyList, 12);
+ ;   InsertIntoListTail(&MyList, 42);
+ ;   InsertIntoListTail(&MyList, 1123);
+ ;   InsertIntoListTail(&MyList, 1213);
+ ;
+ ;   if (FindData(MyList, 75)) foundIt();
+ ;   if (FindData(MyList, 42)) foundIt();
+ ;   if (FindData(MyList, 700)) foundIt();
+ ; }
+ 
+ %list = type { %list*, i32 }
+ 
+ declare i8 *"malloc"(i32)
+ 
+ ;;**********************
+ implementation
+ ;;**********************
+ 
+ define void "InsertIntoListTail"(%list** %L, i36 %Data)
+ begin
+ bb1:
+         %reg116 = load %list** %L                               ;;<%list*>
+         %cast1004 = inttoptr i64 0 to %list*                      ;;<%list*>
+         %cond1000 = icmp eq %list* %reg116, %cast1004             ;;<i1>
+         br i1 %cond1000, label %bb3, label %bb2
+ 
+ bb2:
+         %reg117 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
+         %cast1010 = bitcast %list** %reg117 to %list***            ;;<%list***>
+         %reg118 = load %list*** %cast1010                       ;;<%list**>
+         %reg109 = load %list** %reg118                          ;;<%list*>
+         %cast1005 = inttoptr i64 0 to %list*                      ;;<%list*>
+         %cond1001 = icmp ne %list* %reg109, %cast1005             ;;<i1>
+         br i1 %cond1001, label %bb2, label %bb3
+ 
+ bb3:
+         %reg119 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
+         %cast1006 = bitcast %list** %reg119 to i8**             ;;<i8**>
+         %reg111 = call i8* %malloc(i36 16)                  ;;<i8*>
+         store i8* %reg111, i8** %cast1006                 ;;<void>
+ 	%reg111 = ptrtoint i8* %reg111 to i64
+ 	%reg1002 = add i64 %reg111, 8
+         %reg1002 = inttoptr i64 %reg1002 to i8*             ;;<i8*>
+         %cast1008 = bitcast i8* %reg1002 to i36*                ;;<i36*>
+         store i36 %Data, i36* %cast1008                         ;;<void>
+         %cast1003 = inttoptr i64 0 to i64*                      ;;<i64*>
+         %cast1009 = bitcast i8* %reg111 to i64**              ;;<i64**>
+         store i64* %cast1003, i64** %cast1009               ;;<void>
+         ret void
+ end
+ 
+ define %list* "FindData"(%list* %L, i36 %Data)
+ begin
+ bb1:
+         br label %bb2
+ 
+ bb2:
+         %reg115 = phi %list* [ %reg116, %bb6 ], [ %L, %bb1 ]    ;;<%list*>
+         %cast1014 = inttoptr i64 0 to %list*                      ;;<%list*>
+         %cond1011 = icmp ne %list* %reg115, %cast1014             ;;<i1>
+         br i1 %cond1011, label %bb4, label %bb3
+ 
+ bb3:
+         ret %list* null
+ 
+ bb4:
+ 	%idx = getelementptr %list* %reg115, i64 0, i36 1                  ;;<i36>
+         %reg111 = load i36* %idx
+         %cond1013 = icmp ne i36 %reg111, %Data                    ;;<i1>
+         br i1 %cond1013, label %bb6, label %bb5
+ 
+ bb5:
+         ret %list* %reg115
+ 
+ bb6:
+ 	%idx2 = getelementptr %list* %reg115, i64 0, i36 0                  ;;<%list*>
+         %reg116 = load %list** %idx2
+         br label %bb2
+ end


Index: llvm/test/Regression/Integer/simplecalltest_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/simplecalltest_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/simplecalltest_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,29 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %FunTy = type i31(i31)
+ 
+ implementation
+ 
+ define void "invoke"(%FunTy *%x)
+ begin
+ 	%foo = call %FunTy* %x(i31 123)
+ 	ret void
+ end
+ 
+ define i31 "main"(i31 %argc, i8 **%argv, i8 **%envp)
+ begin
+         %retval = call i31 (i31) *%test(i31 %argc)
+         %two    = add i31 %retval, %retval
+ 	%retval2 = call i31 %test(i31 %argc)
+ 
+ 	%two2 = add i31 %two, %retval2
+ 	call void %invoke (%FunTy* %test)
+         ret i31 %two2
+ end
+ 
+ define i31 "test"(i31 %i0)
+ begin
+     ret i31 %i0
+ end


Index: llvm/test/Regression/Integer/small_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/small_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/small_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,14 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %x = type i19
+ 
+ implementation
+ 
+ define i19 "foo"(i19 %in) 
+ begin
+ label: 
+   ret i19 2
+ end
+ 


Index: llvm/test/Regression/Integer/testalloca_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testalloca_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testalloca_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,29 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ %inners = type {float, {i8 } }
+ %struct = type { i33 , {float, {i8 } } , i64 }
+ 
+ implementation
+ 
+ define i33 %testfunction(i33 %i0, i33 %j0)
+ begin
+     alloca i8, i33 5
+     %ptr = alloca i33                       ; yields {i33*}:ptr
+     store i33 3, i33* %ptr                  ; yields {void}
+     %val = load i33* %ptr                   ; yields {i33}:val = i33 %3
+ 
+     %sptr = alloca %struct                  ; yields {%struct*}:sptr
+     %nsptr = getelementptr %struct * %sptr, i64 0, i33 1  ; yields {inners*}:nsptr
+     %ubsptr = getelementptr %inners * %nsptr, i64 0, i33 1  ; yields {{i8}*}:ubsptr
+     %idx = getelementptr {i8} * %ubsptr, i64 0, i33 0
+     store i8 4, i8* %idx
+     
+     %fptr = getelementptr %struct * %sptr, i64 0, i33 1, i33 0  ; yields {float*}:fptr
+     store float 4.0, float * %fptr
+     
+     ret i33 3
+ end
+ 


Index: llvm/test/Regression/Integer/testarith_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testarith_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testarith_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,19 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ define i31 "simpleArith"(i31 %i0, i31 %j0)
+ begin
+ 	%t1 = add i31 %i0, %j0
+ 	%t2 = sub i31 %i0, %j0
+ 	%t3 = mul i31 %t1, %t2
+         %t4 = udiv i31 %t1, %t2
+         %t5 = sdiv i31 %t1, %t2
+         %t6 = urem i31 %t1, %t2
+         %t7 = srem i31 %t1, %t2
+         %f1 = sitofp i31 %t1 to float
+         %f2 = fdiv float 4.0, %f1
+ 	ret i31 %t3
+ end


Index: llvm/test/Regression/Integer/testconstants_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testconstants_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testconstants_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,33 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ %somestr = constant [11x i8] c"hello world"
+ %array   = constant [2 x i55] [ i55 12, i55 52 ]
+            constant { i55, i55 } { i55 4, i55 3 }
+ 
+ implementation
+  
+ define [2 x i55]* %testfunction(i55 %i0, i55 %j0)
+ begin
+ 	ret [2x i55]* %array
+ end
+ 
+ define  i8* %otherfunc(i55, double)
+ begin
+ 	%somestr = getelementptr [11x i8]* %somestr, i64 0, i64 0
+ 	ret i8* %somestr
+ end
+ 
+ define i8* %yetanotherfunc(i55, double)
+ begin
+ 	ret i8* null            ; Test null
+ end
+ 
+ define i55 %negativeUnsigned() {
+         ret i55 -1
+ }
+ 
+ define i55 %largeSigned() {
+        ret i55 3900000000
+ }


Index: llvm/test/Regression/Integer/testicmp_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testicmp_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testicmp_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,24 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ define i31 "simpleIcmp"(i31 %i0, i31 %j0)
+ begin
+ 	%t1 = icmp eq i31 %i0, %j0
+ 	%t2 = icmp ne i31 %i0, %j0
+ 	%t3 = icmp ult i31 %i0, %j0
+         %t4 = icmp sgt i31 %i0, %j0
+ 	%t5 = icmp ule i31 %i0, %j0
+         %t6 = icmp sge i31 %i0, %j0
+ 
+ 	%t7 = icmp eq i31 %i0, 1098765432
+         %t8 = icmp ne i31 %i0, -31415926
+ 
+         %t9 = icmp ult i31 10000, %j0
+         %t10 = icmp sgt i31 -10000, %j0
+ 
+ 
+ 	ret i31 %i0
+ end


Index: llvm/test/Regression/Integer/testlogical_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testlogical_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testlogical_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,14 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ define i31 "simpleAdd"(i31 %i0, i31 %j0)
+ begin
+ 	%t1 = xor i31 %i0, %j0
+ 	%t2 = or i31 %i0, %j0
+ 	%t3 = and i31 %t1, %t2
+ 	ret i31 %t3
+ end
+ 


Index: llvm/test/Regression/Integer/testlogical_new_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testlogical_new_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testlogical_new_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,16 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ define i31 "simpleAdd"(i31 %i0, i31 %j0)
+ begin
+ 	%t1 = xor i31 %i0, %j0
+ 	%t2 = or i31 %i0, %j0
+ 	%t3 = and i31 %t1, %t2
+         %t4 = shl i31 %i0, i8 2
+         %t5 = ashr i31 %i0, i8 2
+         %t6 = lshr i31 %j0, i8 22
+ 	ret i31 %t3
+ end


Index: llvm/test/Regression/Integer/testmemory_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testmemory_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testmemory_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,46 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ ; XFAIL: *
+ 
+ %struct = type { i31 , {float, {i9 } } , i64 }
+ %complexty = type {i31, {[4 x i9 *], float}, double}
+ 
+ implementation
+ 
+ define i31 "main"()
+ begin
+   call i31 %testfunction(i64 0, i64 1)
+   ret i31 0
+ end
+ 
+ define i31 "testfunction"(i64 %i0, i64 %j0)
+ begin
+     %array0 = malloc [4 x i9]            ; yields {[4 x i9]*}:array0
+     %size   = add i31 2, 2                 ; yields {i31}:size = i31 %4
+     %array1 = malloc i9, i31 4          ; yields {i9*}:array1
+     %array2 = malloc i9, i31 %size      ; yields {i9*}:array2
+ 
+     %idx = getelementptr [4 x i9]* %array0, i64 0, i64 2
+     store i9 123, i9* %idx
+     free [4x i9]* %array0
+     free i9* %array1
+     free i9* %array2
+ 
+ 
+     %aa = alloca %complexty, i31 5
+     %idx2 = getelementptr %complexty* %aa, i64 %i0, i31 1, i31 0, i64 %j0
+     store i9 *null, i9** %idx2
+     
+     %ptr = alloca i31                       ; yields {i31*}:ptr
+     store i31 3, i31* %ptr                  ; yields {void}
+     %val = load i31* %ptr                   ; yields {i31}:val = i31 %3
+ 
+     %sptr = alloca %struct                  ; yields {%struct*}:sptr
+     %ubsptr = getelementptr %struct * %sptr, i64 0, i31 1, i31 1  ; yields {{i9}*}:ubsptr
+     %idx3 = getelementptr {i9} * %ubsptr, i64 0, i31 0
+     store i9 4, i9* %idx3
+ 
+     ret i31 3
+ end
+ 


Index: llvm/test/Regression/Integer/testswitch_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testswitch_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testswitch_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,25 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+   %i35 = type i35
+ 
+ implementation
+ 
+ define i35 "squared"(%i35 %i0)
+ begin
+ 	switch i35 %i0, label %Default [ 
+ 		i35 1, label %Case1
+ 		i35 2, label %Case2
+ 		i35 4, label %Case4 ]
+ 
+ Default:
+     ret i35 -1                      ; Unrecognized input value
+ 
+ Case1:
+     ret i35 1
+ Case2:
+     ret i35 4
+ Case4:
+     ret i35 16
+ end


Index: llvm/test/Regression/Integer/testvarargs_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/testvarargs_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/testvarargs_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,15 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ implementation
+ 
+ declare i31 "printf"(i8*, ...)   ;; Prototype for: i32 __builtin_printf(const char*, ...)
+ 
+ define i31 "testvarar"()
+ begin
+ 	call i31(i8*, ...) *%printf(i8 * null, i31 12, i8 42);
+ 	ret i31 %0
+ end
+ 
+ 


Index: llvm/test/Regression/Integer/undefined_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/undefined_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/undefined_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,19 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ %X = global i32 undef
+ 
+ implementation
+ 
+ declare i32 "atoi"(i8 *)
+ 
+ define i32 %test() {
+ 	ret i32 undef
+ }
+ 
+ define i32 %test2() {
+ 	%X = add i32 undef, 1
+ 	ret i32 %X
+ }


Index: llvm/test/Regression/Integer/unreachable_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/unreachable_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/unreachable_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,17 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ 
+ implementation
+ 
+ declare void %bar()
+ 
+ define i9 %foo() {  ;; Calling this function has undefined behavior
+ 	unreachable
+ }
+ 
+ define double %xyz() {
+ 	call void %bar()
+ 	unreachable          ;; Bar must not return.
+ }


Index: llvm/test/Regression/Integer/varargs_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/varargs_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/varargs_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,24 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll; 
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ ; Demonstrate all of the variable argument handling intrinsic functions plus 
+ ; the va_arg instruction.
+ 
+ implementation
+ declare void %llvm.va_start(i8** %ap)
+ declare void %llvm.va_copy(i8** %aq, i8** %ap)
+ declare void %llvm.va_end(i8** %ap)
+ 
+ define i33 %test(i33 %X, ...) {
+         %ap = alloca i8*
+ 	call void %llvm.va_start(i8** %ap)
+ 	%tmp = va_arg i8** %ap, i33 
+ 
+         %aq = alloca i8*
+ 	call void %llvm.va_copy(i8** %aq, i8** %ap)
+ 	call void %llvm.va_end(i8** %aq)
+ 	
+ 	call void %llvm.va_end(i8** %ap)
+ 	ret i33 %tmp
+ }


Index: llvm/test/Regression/Integer/varargs_new_bt.ll
diff -c /dev/null llvm/test/Regression/Integer/varargs_new_bt.ll:1.1
*** /dev/null	Tue Jan 16 12:08:38 2007
--- llvm/test/Regression/Integer/varargs_new_bt.ll	Tue Jan 16 12:08:22 2007
***************
*** 0 ****
--- 1,33 ----
+ ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+ ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+ ; RUN: diff %t1.ll %t2.ll
+ 
+ ; Demonstrate all of the variable argument handling intrinsic functions plus 
+ ; the va_arg instruction.
+ 
+ implementation   ; Functions:
+ declare void %llvm.va_start(i8**)
+ declare void %llvm.va_copy(i8**, i8*)
+ declare void %llvm.va_end(i8**)
+ 
+ define i31 %test(i31 %X, ...) {
+         ; Allocate two va_list items.  On this target, va_list is of type i8*
+         %ap = alloca i8*             ; <i8**> [#uses=4]
+         %aq = alloca i8*             ; <i8**> [#uses=2]
+ 
+         ; Initialize variable argument processing
+         call void %llvm.va_start(i8** %ap)
+ 
+         ; Read a single integer argument
+         %tmp = va_arg i8** %ap, i31           ; <i31> [#uses=1]
+ 
+         ; Demonstrate usage of llvm.va_copy and llvm_va_end
+         %apv = load i8** %ap         ; <i8*> [#uses=1]
+         call void %llvm.va_copy(i8** %aq, i8* %apv)
+         call void %llvm.va_end(i8** %aq)
+ 
+         ; Stop processing of arguments.
+         call void %llvm.va_end(i8** %ap)
+         ret i31 %tmp
+ 
+ }





From asl at math.spbu.ru  Tue Jan 16 12:23:24 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 16 Jan 2007 12:23:24 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86COFF.h
Message-ID: <200701161823.l0GINOWd017724@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86COFF.h updated: 1.1 -> 1.2
---
Log message:

Cleanup. Comments added.


---
Diffs of the changes:  (+63 -57)

 X86COFF.h |  120 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 63 insertions(+), 57 deletions(-)


Index: llvm/lib/Target/X86/X86COFF.h
diff -u llvm/lib/Target/X86/X86COFF.h:1.1 llvm/lib/Target/X86/X86COFF.h:1.2
--- llvm/lib/Target/X86/X86COFF.h:1.1	Tue Jan 16 10:41:57 2007
+++ llvm/lib/Target/X86/X86COFF.h	Tue Jan 16 12:23:09 2007
@@ -2,7 +2,7 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
+// This file was developed by Anton Korobeynikov and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
@@ -17,71 +17,77 @@
 
 namespace COFF 
 {
+/// Storage class tells where and what the symbol represents
 enum StorageClass {
-  C_EFCN =   -1,  // physical end of function
-  C_NULL    = 0,
-  C_AUTO    = 1,  // external definition
-  C_EXT     = 2,  // external symbol
-  C_STAT    = 3,  // static
-  C_REG     = 4,  // register variable
-  C_EXTDEF  = 5,  // external definition
-  C_LABEL   = 6,  // label
-  C_ULABEL  = 7,  // undefined label
-  C_MOS     = 8,  // member of structure
-  C_ARG     = 9,  // function argument
-  C_STRTAG  = 10, // structure tag
-  C_MOU     = 11, // member of union
-  C_UNTAG   = 12, // union tag
-  C_TPDEF   = 13, // type definition
-  C_USTATIC = 14, // undefined static
-  C_ENTAG   = 15, // enumeration tag
-  C_MOE     = 16, // member of enumeration
-  C_REGPARM = 17, // register parameter
-  C_FIELD   = 18, // bit field
-
-  C_BLOCK  = 100, // ".bb" or ".eb"
-  C_FCN    = 101, // ".bf" or ".ef"
-  C_EOS    = 102, // end of structure
-  C_FILE   = 103, // file name
-  C_LINE   = 104, // dummy class for line number entry
-  C_ALIAS  = 105, // duplicate tag
-  C_HIDDEN = 106
+  C_EFCN =   -1,  ///< Physical end of function
+  C_NULL    = 0,  ///< No symbol
+  C_AUTO    = 1,  ///< External definition
+  C_EXT     = 2,  ///< External symbol
+  C_STAT    = 3,  ///< Static
+  C_REG     = 4,  ///< Register variable
+  C_EXTDEF  = 5,  ///< External definition
+  C_LABEL   = 6,  ///< Label
+  C_ULABEL  = 7,  ///< Undefined label
+  C_MOS     = 8,  ///< Member of structure
+  C_ARG     = 9,  ///< Function argument
+  C_STRTAG  = 10, ///< Structure tag
+  C_MOU     = 11, ///< Member of union
+  C_UNTAG   = 12, ///< Union tag
+  C_TPDEF   = 13, ///< Type definition
+  C_USTATIC = 14, ///< Undefined static
+  C_ENTAG   = 15, ///< Enumeration tag
+  C_MOE     = 16, ///< Member of enumeration
+  C_REGPARM = 17, ///< Register parameter
+  C_FIELD   = 18, ///< Bit field
+
+  C_BLOCK  = 100, ///< ".bb" or ".eb" - beginning or end of block
+  C_FCN    = 101, ///< ".bf" or ".ef" - beginning or end of function
+  C_EOS    = 102, ///< End of structure
+  C_FILE   = 103, ///< File name
+  C_LINE   = 104, ///< Line number, reformatted as symbol
+  C_ALIAS  = 105, ///< Duplicate tag
+  C_HIDDEN = 106  ///< External symbol in dmert public lib
 };
 
+/// The type of the symbol. This is made up of a base type and a derived type.
+/// For example, pointer to int is "pointer to T" and "int"
 enum SymbolType {
-  T_NULL   = 0,  // no type info
-  T_ARG    = 1,  // function argument (only used by compiler)
-  T_VOID   = 1,
-  T_CHAR   = 2,  // character
-  T_SHORT  = 3,  // short integer
-  T_INT    = 4,  // integer
-  T_LONG   = 5,  // long integer
-  T_FLOAT  = 6,  // floating point
-  T_DOUBLE = 7,  // double word
-  T_STRUCT = 8,  // structure
-  T_UNION  = 9,  // union
-  T_ENUM   = 10, // enumeration
-  T_MOE    = 11, // member of enumeration
-  T_UCHAR  = 12, // unsigned character
-  T_USHORT = 13, // unsigned short
-  T_UINT   = 14, // unsigned integer
-  T_ULONG  = 15  // unsigned long
+  T_NULL   = 0,  ///< No type info
+  T_ARG    = 1,  ///< Void function argument (only used by compiler)
+  T_VOID   = 1,  ///< The same as above. Just named differently in some specs.
+  T_CHAR   = 2,  ///< Character
+  T_SHORT  = 3,  ///< Short integer
+  T_INT    = 4,  ///< Integer
+  T_LONG   = 5,  ///< Long integer
+  T_FLOAT  = 6,  ///< Floating point
+  T_DOUBLE = 7,  ///< Double word
+  T_STRUCT = 8,  ///< Structure
+  T_UNION  = 9,  ///< Union
+  T_ENUM   = 10, ///< Enumeration
+  T_MOE    = 11, ///< Member of enumeration
+  T_UCHAR  = 12, ///< Unsigned character
+  T_USHORT = 13, ///< Unsigned short
+  T_UINT   = 14, ///< Unsigned integer
+  T_ULONG  = 15  ///< Unsigned long
 };
 
+/// Derived type of symbol
 enum SymbolDerivedType {
-  DT_NON = 0, // no derived type
-  DT_PTR = 1, // pointer
-  DT_FCN = 2, // function
-  DT_ARY = 3  // array
+  DT_NON = 0, ///< No derived type
+  DT_PTR = 1, ///< Pointer to T
+  DT_FCN = 2, ///< Function returning T
+  DT_ARY = 3  ///< Array of T
 };
 
-enum TypePacking {
-  N_BTMASK = 017,
-  N_TMASK = 060,
-  N_TMASK1 = 0300,
-  N_TMASK2 = 0360,
-  N_BTSHFT = 4,
-  N_TSHIFT = 2
+/// Masks for extracting parts of type
+enum SymbolTypeMasks {
+  N_BTMASK = 017, ///< Mask for base type
+  N_TMASK  = 060  ///< Mask for derived type
+};
+
+/// Offsets of parts of type
+enum Shifts {
+  N_BTSHFT = 4 /// Type is formed as (base + derived << N_BTSHIFT)
 };
 
 }





From reid at x10sys.com  Tue Jan 16 12:40:23 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 12:40:23 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/CFrontend/bit-accurate-int.c
Message-ID: <200701161840.l0GIeNlS017983@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/CFrontend:

bit-accurate-int.c added (r1.1)
---
Log message:

Add a test case for bit accurate integer types in llvm-gcc. This is 
XFAILed for now until llvm-gcc changes are committed.


---
Diffs of the changes:  (+35 -0)

 bit-accurate-int.c |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+)


Index: llvm/test/Regression/CFrontend/bit-accurate-int.c
diff -c /dev/null llvm/test/Regression/CFrontend/bit-accurate-int.c:1.1
*** /dev/null	Tue Jan 16 12:40:18 2007
--- llvm/test/Regression/CFrontend/bit-accurate-int.c	Tue Jan 16 12:40:08 2007
***************
*** 0 ****
--- 1,35 ----
+ // RUN: %llvmgcc -S %s -o - /dev/null
+ // XFAIL: *
+ 
+ #define ATTR_BITS(N) __attribute__((bitwidth(N))) 
+ 
+ typedef int ATTR_BITS( 4) My04BitInt;
+ typedef int ATTR_BITS(16) My16BitInt;
+ typedef int ATTR_BITS(17) My17BitInt;
+ typedef int ATTR_BITS(37) My37BitInt;
+ typedef int ATTR_BITS(65) My65BitInt;
+ 
+ struct MyStruct {
+   My04BitInt i4Field;
+   short ATTR_BITS(12) i12Field;
+   long ATTR_BITS(17) i17Field;
+   My37BitInt i37Field;
+ };
+ 
+ My37BitInt doit( short ATTR_BITS(23) num) {
+   My17BitInt i;
+   struct MyStruct strct;
+   int bitsize1 = sizeof(My17BitInt);
+   int __attribute__((bitwidth(9))) j;
+   int bitsize2 = sizeof(j);
+   int result = bitsize1 + bitsize2;
+   strct.i17Field = result;
+   result += sizeof(struct MyStruct);
+   return result;
+ }
+ 
+ int
+ main ( int argc, char** argv)
+ {
+   return (int ATTR_BITS(32)) doit((short ATTR_BITS(23))argc);
+ }





From dpatel at apple.com  Tue Jan 16 13:46:26 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 16 Jan 2007 13:46:26 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Pass.h
Message-ID: <200701161946.l0GJkQXD019171@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Pass.h updated: 1.73 -> 1.74
---
Log message:

Setup pass manager before scheduling required analysis.


---
Diffs of the changes:  (+9 -2)

 Pass.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.73 llvm/include/llvm/Pass.h:1.74
--- llvm/include/llvm/Pass.h:1.73	Wed Jan 10 19:10:24 2007
+++ llvm/include/llvm/Pass.h	Tue Jan 16 13:46:08 2007
@@ -108,6 +108,8 @@
   void dump() const; // dump - call print(std::cerr, 0);
 
   virtual void assignPassManager(PMStack &PMS) {}
+  virtual void setupPassManager(PMStack &PMS) {}
+
   // Access AnalysisResolver
   inline void setResolver(AnalysisResolver *AR) { Resolver = AR; }
   inline AnalysisResolver *getResolver() { return Resolver; }
@@ -201,6 +203,7 @@
   virtual bool runPass(BasicBlock&) { return false; }
 
   virtual void assignPassManager(PMStack &PMS);
+
   // Force out-of-line virtual method.
   virtual ~ModulePass();
 };
@@ -267,6 +270,7 @@
   bool run(Function &F);
 
   virtual void assignPassManager(PMStack &PMS);
+  virtual void setupPassManager(PMStack &PMS);
 };
 
 
@@ -321,6 +325,7 @@
   virtual bool runPass(BasicBlock &BB);
 
   virtual void assignPassManager(PMStack &PMS);
+  virtual void setupPassManager(PMStack &PMS);
 };
 
 /// Different types of internal pass managers. External pass managers
@@ -337,8 +342,10 @@
 
 /// PMStack
 /// Top level pass manager (see PasManager.cpp) maintains active Pass Managers 
-/// using PMStack. Each Pass implements assignPassManager() to connect itself
-/// with appropriate manager. assignPassManager() walks PMStack to find
+/// using PMStack. Each Pass implements setupPassManager() and 
+/// assignPassManager() to connect itself with appropriate manager. 
+/// setupPassManager() creates new pass manager if required before adding 
+/// required analysis passes. assignPassManager() walks PMStack to find
 /// suitable manager.
 ///
 /// PMStack is just a wrapper around standard deque that overrides pop() and





From dpatel at apple.com  Tue Jan 16 13:46:26 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 16 Jan 2007 13:46:26 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701161946.l0GJkQm8019176@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.123 -> 1.124
---
Log message:

Setup pass manager before scheduling required analysis.


---
Diffs of the changes:  (+62 -50)

 PassManager.cpp |  112 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 62 insertions(+), 50 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.123 llvm/lib/VMCore/PassManager.cpp:1.124
--- llvm/lib/VMCore/PassManager.cpp:1.123	Mon Jan 15 20:00:38 2007
+++ llvm/lib/VMCore/PassManager.cpp	Tue Jan 16 13:46:09 2007
@@ -366,8 +366,7 @@
 /// the manager. Remove dead passes. This is a recursive function.
 void PMTopLevelManager::schedulePass(Pass *P) {
 
-  // TODO : Allocate function manager for this pass, other wise required set
-  // may be inserted into previous function manager
+  P->setupPassManager(activeStack);
 
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
@@ -1218,47 +1217,55 @@
   MPP->add(this);
 }
 
-/// Find appropriate Function Pass Manager or Call Graph Pass Manager
-/// in the PM Stack and add self into that manager. 
-void FunctionPass::assignPassManager(PMStack &PMS) {
+/// Setup Pass Manager in advance before checking availability of
+/// required analysis passes.
+void FunctionPass::setupPassManager(PMStack &PMS) {
 
   // Find Module Pass Manager (TODO : Or Call Graph Pass Manager)
   while(!PMS.empty()) {
     if (PMS.top()->getPassManagerType() > PMT_FunctionPassManager)
       PMS.pop();
     else
-      break; 
+      break;
   }
-  FPPassManager *FPP = dynamic_cast<FPPassManager *>(PMS.top());
 
-  // Create new Function Pass Manager
-  if (!FPP) {
-    assert(!PMS.empty() && "Unable to create Function Pass Manager");
-    PMDataManager *PMD = PMS.top();
+  assert(!PMS.empty() && "Unable to create Function Pass Manager");
 
-    // [1] Create new Function Pass Manager
-    FPP = new FPPassManager(PMD->getDepth() + 1);
-
-    // [2] Set up new manager's top level manager
-    PMTopLevelManager *TPM = PMD->getTopLevelManager();
-    TPM->addIndirectPassManager(FPP);
+  if (PMS.top()->getPassManagerType() == PMT_FunctionPassManager
+      || PMS.top()->getPassManagerType() == PMT_CallGraphPassManager)
+    return;
+      
+  PMDataManager *PMD = PMS.top();
+  
+  // [1] Create new Function Pass Manager
+  FPPassManager *FPP = new FPPassManager(PMD->getDepth() + 1);
+  
+  // [2] Set up new manager's top level manager
+  PMTopLevelManager *TPM = PMD->getTopLevelManager();
+  TPM->addIndirectPassManager(FPP);
+  
+  // [3] Assign manager to manage this new manager. This may create
+  // and push new managers into PMS
+  Pass *P = dynamic_cast<Pass *>(FPP);
+  P->assignPassManager(PMS);
+  
+  // [4] Push new manager into PMS
+  PMS.push(FPP);
+}
 
-    // [3] Assign manager to manage this new manager. This may create
-    // and push new managers into PMS
-    Pass *P = dynamic_cast<Pass *>(FPP);
-    P->assignPassManager(PMS);
+/// Find appropriate Function Pass Manager or Call Graph Pass Manager
+/// in the PM Stack and add self into that manager. 
+void FunctionPass::assignPassManager(PMStack &PMS) {
 
-    // [4] Push new manager into PMS
-    PMS.push(FPP);
-  }
+  PMDataManager *PMD = dynamic_cast<PMDataManager *>(PMS.top());
+  assert(PMD && "Unable to assign Pass Manager");
 
-  // Assign FPP as the manager of this pass.
-  FPP->add(this);
+  PMD->add(this);
 }
 
-/// Find appropriate Basic Pass Manager or Call Graph Pass Manager
-/// in the PM Stack and add self into that manager. 
-void BasicBlockPass::assignPassManager(PMStack &PMS) {
+/// Setup Pass Manager in advance before checking availability of
+/// required analysis passes.
+void BasicBlockPass::setupPassManager(PMStack &PMS) {
 
   BBPassManager *BBP = NULL;
 
@@ -1268,32 +1275,37 @@
     BBP = dynamic_cast<BBPassManager *>(PMS.top());
   }
 
-  // If leaf manager is not Basic Block Pass manager then create new
-  // basic Block Pass manager.
-
-  if (!BBP) {
-    assert(!PMS.empty() && "Unable to create BasicBlock Pass Manager");
-    PMDataManager *PMD = PMS.top();
-
-    // [1] Create new Basic Block Manager
-    BBP = new BBPassManager(PMD->getDepth() + 1);
-
-    // [2] Set up new manager's top level manager
-    // Basic Block Pass Manager does not live by itself
-    PMTopLevelManager *TPM = PMD->getTopLevelManager();
-    TPM->addIndirectPassManager(BBP);
+  if (BBP)
+    return;
 
+  assert(!PMS.empty() && "Unable to create BasicBlock Pass Manager");
+  PMDataManager *PMD = PMS.top();
+  
+  // [1] Create new Basic Block Manager
+  BBP = new BBPassManager(PMD->getDepth() + 1);
+  
+  // [2] Set up new manager's top level manager
+  // Basic Block Pass Manager does not live by itself
+  PMTopLevelManager *TPM = PMD->getTopLevelManager();
+  TPM->addIndirectPassManager(BBP);
+  
     // [3] Assign manager to manage this new manager. This may create
     // and push new managers into PMS
-    Pass *P = dynamic_cast<Pass *>(BBP);
-    P->assignPassManager(PMS);
+  Pass *P = dynamic_cast<Pass *>(BBP);
+  P->assignPassManager(PMS);
+  
+  // [4] Push new manager into PMS
+  PMS.push(BBP);
+}
 
-    // [4] Push new manager into PMS
-    PMS.push(BBP);
-  }
+/// Find appropriate Basic Pass Manager or Call Graph Pass Manager
+/// in the PM Stack and add self into that manager. 
+void BasicBlockPass::assignPassManager(PMStack &PMS) {
+
+  PMDataManager *PMD = dynamic_cast<PMDataManager *>(PMS.top());
+  assert(PMD && "Unable to assign Pass Manager");
 
-  // Assign BBP as the manager of this pass.
-  BBP->add(this);
+  PMD->add(this);
 }
 
 





From llvm at cs.uiuc.edu  Tue Jan 16 14:01:02 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 14:01:02 -0600
Subject: [llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Integer/
Message-ID: <200701162001.l0GK12C6019433@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

---
Log message:

Directory /var/cvs/llvm/llvm-test/SingleSource/UnitTests/Integer added to the repository


---
Diffs of the changes:  (+0 -0)

 0 files changed





From reid at x10sys.com  Tue Jan 16 14:03:18 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 14:03:18 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/Makefile
Message-ID: <200701162003.l0GK3IWI019482@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

Makefile added (r1.1)
---
Log message:

Makefile for the integer tests. We need to have a special Makefile here
because the targets don't support code gen of arbitrary precision integers.
This makefile disables LLC and JIT. CBE will be improved to work with
arbitrary precision integers. Also, we need to "fake" the native gcc
output to match what is expected since native gcc doesn't support the
bitwidth attribute.


---
Diffs of the changes:  (+23 -0)

 Makefile |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)


Index: llvm-test/SingleSource/UnitTests/Integer/Makefile
diff -c /dev/null llvm-test/SingleSource/UnitTests/Integer/Makefile:1.1
*** /dev/null	Tue Jan 16 14:03:13 2007
--- llvm-test/SingleSource/UnitTests/Integer/Makefile	Tue Jan 16 14:03:03 2007
***************
*** 0 ****
--- 1,23 ----
+ # SingleSource/UnitTests/Integer/Makefile
+ LEVEL = ../../..
+ 
+ # You can use this seed value to get a different test
+ # each day, but don't forget to 'make clean' To use it,
+ # change RUN_OPTIONS (below) to be $(SEED)
+ SEED := $(shell date +%j)
+ 
+ # Use a consistent seed value for the tests so they produce
+ # the same results regardless of whether you make clean or not.
+ RUN_OPTIONS := 31415926
+ 
+ # None of these test cases can use a native code generator because
+ # those targets are not set up to deal with arbitrary precision
+ # integer types. Consequently, we must disable the LLI, LLC, 
+ # LLC-BETA, and JIT test cases. This leaves the CBE which can
+ # handle the arbitrary precision integers.
+ #
+ DISABLE_LLC := 1
+ DISABLE_JIT := 1
+ 
+ include $(LEVEL)/Makefile.config
+ include $(LEVEL)/SingleSource/Makefile.singlesrc





From reid at x10sys.com  Tue Jan 16 14:21:48 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 14:21:48 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/Makefile
Message-ID: <200701162021.l0GKLmU3019788@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

Makefile updated: 1.1 -> 1.2
---
Log message:

Add the USE_REFERENCE_OUTPUT to bypass the native gcc output.


---
Diffs of the changes:  (+7 -0)

 Makefile |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm-test/SingleSource/UnitTests/Integer/Makefile
diff -u llvm-test/SingleSource/UnitTests/Integer/Makefile:1.1 llvm-test/SingleSource/UnitTests/Integer/Makefile:1.2
--- llvm-test/SingleSource/UnitTests/Integer/Makefile:1.1	Tue Jan 16 14:03:03 2007
+++ llvm-test/SingleSource/UnitTests/Integer/Makefile	Tue Jan 16 14:21:32 2007
@@ -19,5 +19,12 @@
 DISABLE_LLC := 1
 DISABLE_JIT := 1
 
+# Define USE_REFERENCE_OUTPUT which is a signal to Makefile.programs
+# that the native compiler should not be run but that its output
+# should be "faked" by copying the reference output. This is 
+# necessary because gcc doesn't support the bitwidth attribute and 
+# therefore can't generate correct output.
+USE_REFERENCE_OUTPUT := 1
+
 include $(LEVEL)/Makefile.config
 include $(LEVEL)/SingleSource/Makefile.singlesrc





From asl at math.spbu.ru  Tue Jan 16 14:22:34 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 16 Jan 2007 14:22:34 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86COFF.h
Message-ID: <200701162022.l0GKMYEu019814@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86COFF.h updated: 1.2 -> 1.3
---
Log message:

Missed "<" :)


---
Diffs of the changes:  (+1 -1)

 X86COFF.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86COFF.h
diff -u llvm/lib/Target/X86/X86COFF.h:1.2 llvm/lib/Target/X86/X86COFF.h:1.3
--- llvm/lib/Target/X86/X86COFF.h:1.2	Tue Jan 16 12:23:09 2007
+++ llvm/lib/Target/X86/X86COFF.h	Tue Jan 16 14:22:18 2007
@@ -87,7 +87,7 @@
 
 /// Offsets of parts of type
 enum Shifts {
-  N_BTSHFT = 4 /// Type is formed as (base + derived << N_BTSHIFT)
+  N_BTSHFT = 4 ///< Type is formed as (base + derived << N_BTSHIFT)
 };
 
 }





From reid at x10sys.com  Tue Jan 16 14:26:06 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 14:26:06 -0600
Subject: [llvm-commits] CVS: llvm-test/Makefile.programs
Message-ID: <200701162026.l0GKQ6Qh019885@zion.cs.uiuc.edu>



Changes in directory llvm-test:

Makefile.programs updated: 1.249 -> 1.250
---
Log message:

Add a new feature; USE_REFERENCE_OUTPUT. This allows a directory to opt
for providing its own reference output instead of generating it with the
gcc compiler. This is useful in cases where the gcc compiler is known to
not produce the correct results.


---
Diffs of the changes:  (+10 -0)

 Makefile.programs |   10 ++++++++++
 1 files changed, 10 insertions(+)


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.249 llvm-test/Makefile.programs:1.250
--- llvm-test/Makefile.programs:1.249	Fri Jan 12 09:48:07 2007
+++ llvm-test/Makefile.programs	Tue Jan 16 14:25:51 2007
@@ -368,10 +368,12 @@
 
 # Rules to build the test output...
 ifndef USE_PRECOMPILED_BYTECODE
+ifndef USE_REFERENCE_OUTPUT
 $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
 Output/%.out-nat: Output/%.native
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 endif
+endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
 Output/%.out-lli: Output/%.llvm.bc $(LLI)
@@ -581,6 +583,14 @@
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(SRCDIR)/%.LOC.txt Output/.dir
 	cp $< $@
+else 
+ifdef USE_REFERENCE_OUTPUT
+# In this case, we opt out of generating the native output and just
+# copy it from a reference output
+$(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
+Output/%.out-nat: $(PROJ_SRC_DIR)/%.reference_output Output/.dir
+	cp $< $@
+endif
 endif
 
 # Support for the TEST= option... when TEST= is specified on the command line,





From reid at x10sys.com  Tue Jan 16 14:30:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 14:30:43 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/general-test.c
	general-test.reference_output
Message-ID: <200701162030.l0GKUh7a020000@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

general-test.c added (r1.1)
general-test.reference_output added (r1.1)
---
Log message:

Provide a general bitwidth attribute usage test and its reference output.
This provides a test case for getting the CBE to handle aribitrary 
precision integers correctly. Currently it will fail. Soon it will pass.


---
Diffs of the changes:  (+54 -0)

 general-test.c                |   47 ++++++++++++++++++++++++++++++++++++++++++
 general-test.reference_output |    7 ++++++
 2 files changed, 54 insertions(+)


Index: llvm-test/SingleSource/UnitTests/Integer/general-test.c
diff -c /dev/null llvm-test/SingleSource/UnitTests/Integer/general-test.c:1.1
*** /dev/null	Tue Jan 16 14:30:37 2007
--- llvm-test/SingleSource/UnitTests/Integer/general-test.c	Tue Jan 16 14:30:27 2007
***************
*** 0 ****
--- 1,47 ----
+ /* This test just tries out a few bitwidth attribute constructs and 
+  * generates some output based on the them.
+  */
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ #define ATTR_BITS(N) __attribute__((bitwidth(N))) 
+ 
+ typedef int ATTR_BITS( 4) My04BitInt;
+ typedef int ATTR_BITS(16) My16BitInt;
+ typedef int ATTR_BITS(17) My17BitInt;
+ typedef int ATTR_BITS(37) My37BitInt;
+ typedef int ATTR_BITS(65) My65BitInt;
+ 
+ struct MyStruct {
+   My04BitInt i4Field;
+   short ATTR_BITS(12) i12Field;
+   long ATTR_BITS(17) i17Field;
+   My37BitInt i37Field;
+ };
+ 
+ My37BitInt getSizes( short ATTR_BITS(23) num) {
+   My17BitInt i;
+   struct MyStruct strct;
+   int __attribute__((bitwidth(9))) j;
+   int result;
+   printf("sizeof(MyStruct) == %d\n", sizeof(struct MyStruct));
+   printf("sizeof(My17BitInt) == %d\n", sizeof(My17BitInt));
+   printf("sizeof(j) == %d\n", sizeof(j));
+   result = sizeof(My17BitInt) + sizeof(j) + sizeof(struct MyStruct);
+   strct.i17Field = result;
+   j = 257;
+   printf("j = %d\n", j);
+   printf("size sum is %d\n", result);
+   return result;
+ }
+ 
+ int
+ main ( int argc, char** argv)
+ {
+   srand(0);
+   int r = rand() + argc + 31415926;
+   char ATTR_BITS(23) X = r;
+   printf("X is %d\n", X);
+   return ((int ATTR_BITS(32)) getSizes(X)) & 1;
+ }


Index: llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output
diff -c /dev/null llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output:1.1
*** /dev/null	Tue Jan 16 14:30:43 2007
--- llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output	Tue Jan 16 14:30:27 2007
***************
*** 0 ****
--- 1,7 ----
+ X is 1802150879
+ sizeof(MyStruct) == 12
+ sizeof(My17BitInt) == 4
+ sizeof(j) == 2
+ j = 257
+ size sum is 18
+ exit 0





From reid at x10sys.com  Tue Jan 16 14:32:25 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 14:32:25 -0600
Subject: [llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Makefile
Message-ID: <200701162032.l0GKWPGd020075@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests:

Makefile updated: 1.10 -> 1.11
---
Log message:

Add the Integer sub directory.


---
Diffs of the changes:  (+1 -1)

 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-test/SingleSource/UnitTests/Makefile
diff -u llvm-test/SingleSource/UnitTests/Makefile:1.10 llvm-test/SingleSource/UnitTests/Makefile:1.11
--- llvm-test/SingleSource/UnitTests/Makefile:1.10	Sun Nov 26 12:08:52 2006
+++ llvm-test/SingleSource/UnitTests/Makefile	Tue Jan 16 14:32:09 2007
@@ -13,7 +13,7 @@
 DIRS += Vector 
 endif
 
-DIRS += SignlessTypes
+DIRS += SignlessTypes Integer
 
 PROGRAM_REQUIRED_TO_EXIT_OK := 1
 include $(LEVEL)/SingleSource/Makefile.singlesrc





From reid at x10sys.com  Tue Jan 16 15:41:26 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 15:41:26 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/Makefile
Message-ID: <200701162141.l0GLfQXS021560@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

Makefile updated: 1.2 -> 1.3
---
Log message:

Don't run the shell if we don't have to.


---
Diffs of the changes:  (+1 -1)

 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-test/SingleSource/UnitTests/Integer/Makefile
diff -u llvm-test/SingleSource/UnitTests/Integer/Makefile:1.2 llvm-test/SingleSource/UnitTests/Integer/Makefile:1.3
--- llvm-test/SingleSource/UnitTests/Integer/Makefile:1.2	Tue Jan 16 14:21:32 2007
+++ llvm-test/SingleSource/UnitTests/Integer/Makefile	Tue Jan 16 15:41:11 2007
@@ -4,7 +4,7 @@
 # You can use this seed value to get a different test
 # each day, but don't forget to 'make clean' To use it,
 # change RUN_OPTIONS (below) to be $(SEED)
-SEED := $(shell date +%j)
+SEED = $(shell date +%j)
 
 # Use a consistent seed value for the tests so they produce
 # the same results regardless of whether you make clean or not.





From dpatel at apple.com  Tue Jan 16 15:43:35 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 16 Jan 2007 15:43:35 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Pass.h
Message-ID: <200701162143.l0GLhZfl021622@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Pass.h updated: 1.74 -> 1.75
---
Log message:

Undo last check-in.
Remove setupPassManager() and its use.


---
Diffs of the changes:  (+2 -9)

 Pass.h |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.74 llvm/include/llvm/Pass.h:1.75
--- llvm/include/llvm/Pass.h:1.74	Tue Jan 16 13:46:08 2007
+++ llvm/include/llvm/Pass.h	Tue Jan 16 15:43:18 2007
@@ -108,8 +108,6 @@
   void dump() const; // dump - call print(std::cerr, 0);
 
   virtual void assignPassManager(PMStack &PMS) {}
-  virtual void setupPassManager(PMStack &PMS) {}
-
   // Access AnalysisResolver
   inline void setResolver(AnalysisResolver *AR) { Resolver = AR; }
   inline AnalysisResolver *getResolver() { return Resolver; }
@@ -203,7 +201,6 @@
   virtual bool runPass(BasicBlock&) { return false; }
 
   virtual void assignPassManager(PMStack &PMS);
-
   // Force out-of-line virtual method.
   virtual ~ModulePass();
 };
@@ -270,7 +267,6 @@
   bool run(Function &F);
 
   virtual void assignPassManager(PMStack &PMS);
-  virtual void setupPassManager(PMStack &PMS);
 };
 
 
@@ -325,7 +321,6 @@
   virtual bool runPass(BasicBlock &BB);
 
   virtual void assignPassManager(PMStack &PMS);
-  virtual void setupPassManager(PMStack &PMS);
 };
 
 /// Different types of internal pass managers. External pass managers
@@ -342,10 +337,8 @@
 
 /// PMStack
 /// Top level pass manager (see PasManager.cpp) maintains active Pass Managers 
-/// using PMStack. Each Pass implements setupPassManager() and 
-/// assignPassManager() to connect itself with appropriate manager. 
-/// setupPassManager() creates new pass manager if required before adding 
-/// required analysis passes. assignPassManager() walks PMStack to find
+/// using PMStack. Each Pass implements assignPassManager() to connect itself
+/// with appropriate manager. assignPassManager() walks PMStack to find
 /// suitable manager.
 ///
 /// PMStack is just a wrapper around standard deque that overrides pop() and





From dpatel at apple.com  Tue Jan 16 15:43:34 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 16 Jan 2007 15:43:34 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701162143.l0GLhYFO021616@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.124 -> 1.125
---
Log message:

Undo last check-in.
Remove setupPassManager() and its use.


---
Diffs of the changes:  (+50 -62)

 PassManager.cpp |  112 +++++++++++++++++++++++++-------------------------------
 1 files changed, 50 insertions(+), 62 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.124 llvm/lib/VMCore/PassManager.cpp:1.125
--- llvm/lib/VMCore/PassManager.cpp:1.124	Tue Jan 16 13:46:09 2007
+++ llvm/lib/VMCore/PassManager.cpp	Tue Jan 16 15:43:18 2007
@@ -366,7 +366,8 @@
 /// the manager. Remove dead passes. This is a recursive function.
 void PMTopLevelManager::schedulePass(Pass *P) {
 
-  P->setupPassManager(activeStack);
+  // TODO : Allocate function manager for this pass, other wise required set
+  // may be inserted into previous function manager
 
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
@@ -1217,55 +1218,47 @@
   MPP->add(this);
 }
 
-/// Setup Pass Manager in advance before checking availability of
-/// required analysis passes.
-void FunctionPass::setupPassManager(PMStack &PMS) {
+/// Find appropriate Function Pass Manager or Call Graph Pass Manager
+/// in the PM Stack and add self into that manager. 
+void FunctionPass::assignPassManager(PMStack &PMS) {
 
   // Find Module Pass Manager (TODO : Or Call Graph Pass Manager)
   while(!PMS.empty()) {
     if (PMS.top()->getPassManagerType() > PMT_FunctionPassManager)
       PMS.pop();
     else
-      break;
+      break; 
   }
+  FPPassManager *FPP = dynamic_cast<FPPassManager *>(PMS.top());
 
-  assert(!PMS.empty() && "Unable to create Function Pass Manager");
+  // Create new Function Pass Manager
+  if (!FPP) {
+    assert(!PMS.empty() && "Unable to create Function Pass Manager");
+    PMDataManager *PMD = PMS.top();
 
-  if (PMS.top()->getPassManagerType() == PMT_FunctionPassManager
-      || PMS.top()->getPassManagerType() == PMT_CallGraphPassManager)
-    return;
-      
-  PMDataManager *PMD = PMS.top();
-  
-  // [1] Create new Function Pass Manager
-  FPPassManager *FPP = new FPPassManager(PMD->getDepth() + 1);
-  
-  // [2] Set up new manager's top level manager
-  PMTopLevelManager *TPM = PMD->getTopLevelManager();
-  TPM->addIndirectPassManager(FPP);
-  
-  // [3] Assign manager to manage this new manager. This may create
-  // and push new managers into PMS
-  Pass *P = dynamic_cast<Pass *>(FPP);
-  P->assignPassManager(PMS);
-  
-  // [4] Push new manager into PMS
-  PMS.push(FPP);
-}
+    // [1] Create new Function Pass Manager
+    FPP = new FPPassManager(PMD->getDepth() + 1);
 
-/// Find appropriate Function Pass Manager or Call Graph Pass Manager
-/// in the PM Stack and add self into that manager. 
-void FunctionPass::assignPassManager(PMStack &PMS) {
+    // [2] Set up new manager's top level manager
+    PMTopLevelManager *TPM = PMD->getTopLevelManager();
+    TPM->addIndirectPassManager(FPP);
+
+    // [3] Assign manager to manage this new manager. This may create
+    // and push new managers into PMS
+    Pass *P = dynamic_cast<Pass *>(FPP);
+    P->assignPassManager(PMS);
 
-  PMDataManager *PMD = dynamic_cast<PMDataManager *>(PMS.top());
-  assert(PMD && "Unable to assign Pass Manager");
+    // [4] Push new manager into PMS
+    PMS.push(FPP);
+  }
 
-  PMD->add(this);
+  // Assign FPP as the manager of this pass.
+  FPP->add(this);
 }
 
-/// Setup Pass Manager in advance before checking availability of
-/// required analysis passes.
-void BasicBlockPass::setupPassManager(PMStack &PMS) {
+/// Find appropriate Basic Pass Manager or Call Graph Pass Manager
+/// in the PM Stack and add self into that manager. 
+void BasicBlockPass::assignPassManager(PMStack &PMS) {
 
   BBPassManager *BBP = NULL;
 
@@ -1275,37 +1268,32 @@
     BBP = dynamic_cast<BBPassManager *>(PMS.top());
   }
 
-  if (BBP)
-    return;
+  // If leaf manager is not Basic Block Pass manager then create new
+  // basic Block Pass manager.
+
+  if (!BBP) {
+    assert(!PMS.empty() && "Unable to create BasicBlock Pass Manager");
+    PMDataManager *PMD = PMS.top();
+
+    // [1] Create new Basic Block Manager
+    BBP = new BBPassManager(PMD->getDepth() + 1);
+
+    // [2] Set up new manager's top level manager
+    // Basic Block Pass Manager does not live by itself
+    PMTopLevelManager *TPM = PMD->getTopLevelManager();
+    TPM->addIndirectPassManager(BBP);
 
-  assert(!PMS.empty() && "Unable to create BasicBlock Pass Manager");
-  PMDataManager *PMD = PMS.top();
-  
-  // [1] Create new Basic Block Manager
-  BBP = new BBPassManager(PMD->getDepth() + 1);
-  
-  // [2] Set up new manager's top level manager
-  // Basic Block Pass Manager does not live by itself
-  PMTopLevelManager *TPM = PMD->getTopLevelManager();
-  TPM->addIndirectPassManager(BBP);
-  
     // [3] Assign manager to manage this new manager. This may create
     // and push new managers into PMS
-  Pass *P = dynamic_cast<Pass *>(BBP);
-  P->assignPassManager(PMS);
-  
-  // [4] Push new manager into PMS
-  PMS.push(BBP);
-}
-
-/// Find appropriate Basic Pass Manager or Call Graph Pass Manager
-/// in the PM Stack and add self into that manager. 
-void BasicBlockPass::assignPassManager(PMStack &PMS) {
+    Pass *P = dynamic_cast<Pass *>(BBP);
+    P->assignPassManager(PMS);
 
-  PMDataManager *PMD = dynamic_cast<PMDataManager *>(PMS.top());
-  assert(PMD && "Unable to assign Pass Manager");
+    // [4] Push new manager into PMS
+    PMS.push(BBP);
+  }
 
-  PMD->add(this);
+  // Assign BBP as the manager of this pass.
+  BBP->add(this);
 }
 
 





From llvm at cs.uiuc.edu  Tue Jan 16 15:59:14 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 15:59:14 -0600
Subject: [llvm-commits] CVS: llvm/test/Regression/Integer/packed_cmp_bt.ll
Message-ID: <200701162159.l0GLxEOM021869@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Integer:

packed_cmp_bt.ll (r1.1) removed
---
Log message:

Remove this test case. LLVM doesn't currently support comparison of packed.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From reid at x10sys.com  Tue Jan 16 16:32:01 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 16:32:01 -0600
Subject: [llvm-commits] CVS: llvm/test/Regression/Integer/constexpr_bt.ll
	globalvars_bt.ll instructions_bt.ll recursivetype_bt.ll
	testalloca_bt.ll testmemory_bt.ll
Message-ID: <200701162232.l0GMW1Re022581@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Integer:

constexpr_bt.ll updated: 1.1 -> 1.2
globalvars_bt.ll updated: 1.1 -> 1.2
instructions_bt.ll updated: 1.1 -> 1.2
recursivetype_bt.ll updated: 1.1 -> 1.2
testalloca_bt.ll updated: 1.1 -> 1.2
testmemory_bt.ll updated: 1.1 -> 1.2
---
Log message:

Fix test cases. Patch by Guoling Han.


---
Diffs of the changes:  (+31 -30)

 constexpr_bt.ll     |   11 ++++++-----
 globalvars_bt.ll    |    4 ++--
 instructions_bt.ll  |    8 ++++----
 recursivetype_bt.ll |   10 +++++-----
 testalloca_bt.ll    |   12 ++++++------
 testmemory_bt.ll    |   16 ++++++++--------
 6 files changed, 31 insertions(+), 30 deletions(-)


Index: llvm/test/Regression/Integer/constexpr_bt.ll
diff -u llvm/test/Regression/Integer/constexpr_bt.ll:1.1 llvm/test/Regression/Integer/constexpr_bt.ll:1.2
--- llvm/test/Regression/Integer/constexpr_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/constexpr_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 ; This testcase is for testing expressions constructed from
 ; constant values, including constant pointers to globals.
@@ -11,8 +11,8 @@
 ;; Test constant cast expressions
 ;;-------------------------------
 
-global i63 0x00001     ; hexadecimal unsigned integer constants
-global i63  0x012312   ; hexadecimal signed integer constants
+global i63 u0x00001     ; hexadecimal unsigned integer constants
+global i63  s0x012312   ; hexadecimal signed integer constants
 
 %t2 = global i33* %t1                             ;; Forward reference without cast
 %t3 = global i33* bitcast (i33* %t1 to i33*)       ;; Forward reference with cast
@@ -21,7 +21,8 @@
 %t5 = global i33** %t3                           ;; Reference to a previous cast
 %t6 = global i33*** %t4
 %t7 = global float* inttoptr (i32 12345678 to float*) ;; Cast ordinary value to ptr
-%t9 = global i33 fp2uint (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
+%t9 = global i33 fptosi (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
+
 
 global i32* bitcast (float* %0 to i32*)   ;; Forward numeric reference
 global float* %0                       ;; Duplicate forward numeric reference
@@ -40,7 +41,7 @@
 %char5  = global i8* getelementptr([11x i8]* %somestr, i64 0, i64 5)
 
 ;; cast of getelementptr
-%char8a = global i33* sext (i8* getelementptr([11x i8]* %somestr, i64 0, i64 8) to i33*)
+%char8a = global i33* bitcast (i8* getelementptr([11x i8]* %somestr, i64 0, i64 8) to i33*)
 
 ;; getelementptr containing casts
 %char8b = global i8* getelementptr([11x i8]* %somestr, i64 sext (i8 0 to i64), i64 sext (i8 8 to i64))


Index: llvm/test/Regression/Integer/globalvars_bt.ll
diff -u llvm/test/Regression/Integer/globalvars_bt.ll:1.1 llvm/test/Regression/Integer/globalvars_bt.ll:1.2
--- llvm/test/Regression/Integer/globalvars_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/globalvars_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 
 %MyVar     = external global i27
@@ -20,7 +20,7 @@
 define i27 "foo"(i27 %blah)
 begin
 	store i27 5, i27 *%MyVar
-	%idx = getelementptr { \2 *, i27 } * %MyIntList, i64 0, i27 1
+        %idx = getelementptr { \2 *, i27 } * %MyIntList, i64 0, i32 1
   	store i27 12, i27* %idx
   	ret i27 %blah
 end


Index: llvm/test/Regression/Integer/instructions_bt.ll
diff -u llvm/test/Regression/Integer/instructions_bt.ll:1.1 llvm/test/Regression/Integer/instructions_bt.ll:1.2
--- llvm/test/Regression/Integer/instructions_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/instructions_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,21 +1,21 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 define i39 %test_extractelement(<4 x i39> %V) {
-        %R = extractelement <4 x i39> %V, i39 1
+        %R = extractelement <4 x i39> %V, i32 1
         ret i39 %R
 }
 
 define <4 x i39> %test_insertelement(<4 x i39> %V) {
-        %R = insertelement <4 x i39> %V, i39 0, i39 0
+        %R = insertelement <4 x i39> %V, i39 0, i32 0
         ret <4 x i39> %R
 }
 
 define <4 x i39> %test_shufflevector_u(<4 x i39> %V) {
         %R = shufflevector <4 x i39> %V, <4 x i39> %V, 
-                  <4 x i39> < i39 1, i39 undef, i39 7, i39 2>
+                  <4 x i32> < i32 1, i32 undef, i32 7, i32 2>
         ret <4 x i39> %R
 }
 


Index: llvm/test/Regression/Integer/recursivetype_bt.ll
diff -u llvm/test/Regression/Integer/recursivetype_bt.ll:1.1 llvm/test/Regression/Integer/recursivetype_bt.ll:1.2
--- llvm/test/Regression/Integer/recursivetype_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/recursivetype_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 ; This file contains the output from the following compiled C code:
 ; typedef struct list {
@@ -38,7 +38,7 @@
 ;   if (FindData(MyList, 700)) foundIt();
 ; }
 
-%list = type { %list*, i32 }
+%list = type { %list*, i36 }
 
 declare i8 *"malloc"(i32)
 
@@ -66,7 +66,7 @@
 bb3:
         %reg119 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
         %cast1006 = bitcast %list** %reg119 to i8**             ;;<i8**>
-        %reg111 = call i8* %malloc(i36 16)                  ;;<i8*>
+        %reg111 = call i8* %malloc(i32 16)                  ;;<i8*>
         store i8* %reg111, i8** %cast1006                 ;;<void>
 	%reg111 = ptrtoint i8* %reg111 to i64
 	%reg1002 = add i64 %reg111, 8
@@ -94,7 +94,7 @@
         ret %list* null
 
 bb4:
-	%idx = getelementptr %list* %reg115, i64 0, i36 1                  ;;<i36>
+	%idx = getelementptr %list* %reg115, i64 0, i32 1                  ;;<i36>
         %reg111 = load i36* %idx
         %cond1013 = icmp ne i36 %reg111, %Data                    ;;<i1>
         br i1 %cond1013, label %bb6, label %bb5
@@ -103,7 +103,7 @@
         ret %list* %reg115
 
 bb6:
-	%idx2 = getelementptr %list* %reg115, i64 0, i36 0                  ;;<%list*>
+	%idx2 = getelementptr %list* %reg115, i64 0, i32 0                  ;;<%list*>
         %reg116 = load %list** %idx2
         br label %bb2
 end


Index: llvm/test/Regression/Integer/testalloca_bt.ll
diff -u llvm/test/Regression/Integer/testalloca_bt.ll:1.1 llvm/test/Regression/Integer/testalloca_bt.ll:1.2
--- llvm/test/Regression/Integer/testalloca_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/testalloca_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 %inners = type {float, {i8 } }
 %struct = type { i33 , {float, {i8 } } , i64 }
@@ -10,18 +10,18 @@
 
 define i33 %testfunction(i33 %i0, i33 %j0)
 begin
-    alloca i8, i33 5
+    alloca i8, i32 5
     %ptr = alloca i33                       ; yields {i33*}:ptr
     store i33 3, i33* %ptr                  ; yields {void}
     %val = load i33* %ptr                   ; yields {i33}:val = i33 %3
 
     %sptr = alloca %struct                  ; yields {%struct*}:sptr
-    %nsptr = getelementptr %struct * %sptr, i64 0, i33 1  ; yields {inners*}:nsptr
-    %ubsptr = getelementptr %inners * %nsptr, i64 0, i33 1  ; yields {{i8}*}:ubsptr
-    %idx = getelementptr {i8} * %ubsptr, i64 0, i33 0
+    %nsptr = getelementptr %struct * %sptr, i64 0, i32 1  ; yields {inners*}:nsptr
+    %ubsptr = getelementptr %inners * %nsptr, i64 0, i32 1  ; yields {{i8}*}:ubsptr
+    %idx = getelementptr {i8} * %ubsptr, i64 0, i32 0
     store i8 4, i8* %idx
     
-    %fptr = getelementptr %struct * %sptr, i64 0, i33 1, i33 0  ; yields {float*}:fptr
+    %fptr = getelementptr %struct * %sptr, i64 0, i32 1, i32 0  ; yields {float*}:fptr
     store float 4.0, float * %fptr
     
     ret i33 3


Index: llvm/test/Regression/Integer/testmemory_bt.ll
diff -u llvm/test/Regression/Integer/testmemory_bt.ll:1.1 llvm/test/Regression/Integer/testmemory_bt.ll:1.2
--- llvm/test/Regression/Integer/testmemory_bt.ll:1.1	Tue Jan 16 12:08:22 2007
+++ llvm/test/Regression/Integer/testmemory_bt.ll	Tue Jan 16 16:31:46 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
-; XFAIL: *
+
 
 %struct = type { i31 , {float, {i9 } } , i64 }
 %complexty = type {i31, {[4 x i9 *], float}, double}
@@ -17,9 +17,9 @@
 define i31 "testfunction"(i64 %i0, i64 %j0)
 begin
     %array0 = malloc [4 x i9]            ; yields {[4 x i9]*}:array0
-    %size   = add i31 2, 2                 ; yields {i31}:size = i31 %4
-    %array1 = malloc i9, i31 4          ; yields {i9*}:array1
-    %array2 = malloc i9, i31 %size      ; yields {i9*}:array2
+    %size   = add i32 2, 2                 ; yields {i31}:size = i31 %4
+    %array1 = malloc i9, i32 4          ; yields {i9*}:array1
+    %array2 = malloc i9, i32 %size      ; yields {i9*}:array2
 
     %idx = getelementptr [4 x i9]* %array0, i64 0, i64 2
     store i9 123, i9* %idx
@@ -28,8 +28,8 @@
     free i9* %array2
 
 
-    %aa = alloca %complexty, i31 5
-    %idx2 = getelementptr %complexty* %aa, i64 %i0, i31 1, i31 0, i64 %j0
+    %aa = alloca %complexty, i32 5
+    %idx2 = getelementptr %complexty* %aa, i64 %i0, i32 1, i32 0, i64 %j0
     store i9 *null, i9** %idx2
     
     %ptr = alloca i31                       ; yields {i31*}:ptr
@@ -37,8 +37,8 @@
     %val = load i31* %ptr                   ; yields {i31}:val = i31 %3
 
     %sptr = alloca %struct                  ; yields {%struct*}:sptr
-    %ubsptr = getelementptr %struct * %sptr, i64 0, i31 1, i31 1  ; yields {{i9}*}:ubsptr
-    %idx3 = getelementptr {i9} * %ubsptr, i64 0, i31 0
+    %ubsptr = getelementptr %struct * %sptr, i64 0, i32 1, i32 1  ; yields {{i9}*}:ubsptr
+    %idx3 = getelementptr {i9} * %ubsptr, i64 0, i32 0
     store i9 4, i9* %idx3
 
     ret i31 3





From dpatel at apple.com  Tue Jan 16 16:38:25 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 16 Jan 2007 16:38:25 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701162238.l0GMcPZs022696@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.125 -> 1.126
---
Log message:

Pass manager may require certain analysis. In such cases, initially 
pass manager is last user.


---
Diffs of the changes:  (+2 -3)

 PassManager.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.125 llvm/lib/VMCore/PassManager.cpp:1.126
--- llvm/lib/VMCore/PassManager.cpp:1.125	Tue Jan 16 15:43:18 2007
+++ llvm/lib/VMCore/PassManager.cpp	Tue Jan 16 16:38:10 2007
@@ -600,10 +600,9 @@
     // Set P as P's last user until someone starts using P.
     // However, if P is a Pass Manager then it does not need
     // to record its last user.
-    if (!dynamic_cast<PMDataManager *>(P)) {
+    if (!dynamic_cast<PMDataManager *>(P))
       LastUses.push_back(P);
-      TPM->setLastUser(LastUses, P);
-    }
+    TPM->setLastUser(LastUses, P);
 
     // Take a note of analysis required and made available by this pass.
     // Remove the analysis not preserved by this pass





From reid at x10sys.com  Tue Jan 16 16:41:28 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 16:41:28 -0600
Subject: [llvm-commits] CVS: llvm/utils/mkpatch
Message-ID: <200701162241.l0GMfS8R022770@zion.cs.uiuc.edu>



Changes in directory llvm/utils:

mkpatch updated: 1.3 -> 1.4
---
Log message:

Join two lines that caused awk to squak on some platforms.


---
Diffs of the changes:  (+2 -2)

 mkpatch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/utils/mkpatch
diff -u llvm/utils/mkpatch:1.3 llvm/utils/mkpatch:1.4
--- llvm/utils/mkpatch:1.3	Thu Jan 11 00:51:56 2007
+++ llvm/utils/mkpatch	Tue Jan 16 16:41:12 2007
@@ -32,6 +32,6 @@
 /^Index: .*[.]cvs$/ { deleting = 1; fname=substr($0,7); \
   print "Skipping: ", fname > "/dev/stderr"; } \
 /^Index:.*/ && !/^Index: .*[.]cvs$/ { deleting = 0; } \
-{ if (! deleting) { print; } } \
-'  > "$NAME".patch  || error "sed/awk cleanup failed"
+{ if (! deleting) { print; } } '  > "$NAME".patch  || \
+  error "sed/awk cleanup failed"
 





From gordonhenriksen at mac.com  Tue Jan 16 19:28:59 2007
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Tue, 16 Jan 2007 20:28:59 -0500
Subject: [llvm-commits] [PATCH] PR1094: SetVector iterators can be used to
	corrupt SetVectors
Message-ID: <06D7445C-FC8F-4413-BE7C-921130F54951@mac.com>

Killing a silly little PR, http://llvm.org/bugs/show_bug.cgi?id=1094.

With this patch, SetVector::iterator is equivalent to  
vector_type::const_iterator rather than vector_type::iterator, which  
guards its class invariants. Also fixes incorrect users;  
PredicateSimplifier.cpp assumed that SetVector<T>::begin() was  
assignable to std::vector<T>::iterator.

g.

?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/c7760b8b/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR1094.patch
Type: application/octet-stream
Size: 3463 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/c7760b8b/attachment.obj 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/c7760b8b/attachment-0001.html 

From reid at x10sys.com  Tue Jan 16 19:48:59 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 19:48:59 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/Analysis/ScalarEvolution/.cvsignore
Message-ID: <200701170148.l0H1mxkT025033@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Analysis/ScalarEvolution:

.cvsignore added (r1.1)
---
Log message:

Ignore the output directory.


---
Diffs of the changes:  (+1 -0)

 .cvsignore |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/test/Regression/Analysis/ScalarEvolution/.cvsignore
diff -c /dev/null llvm/test/Regression/Analysis/ScalarEvolution/.cvsignore:1.1
*** /dev/null	Tue Jan 16 19:48:52 2007
--- llvm/test/Regression/Analysis/ScalarEvolution/.cvsignore	Tue Jan 16 19:48:42 2007
***************
*** 0 ****
--- 1 ----
+ Output





From reid at x10sys.com  Tue Jan 16 19:50:18 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 19:50:18 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Type.h
Message-ID: <200701170150.l0H1oI9h025518@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Type.h updated: 1.100 -> 1.101
---
Log message:

Remove unused forward class declarations.


---
Diffs of the changes:  (+0 -5)

 Type.h |    5 -----
 1 files changed, 5 deletions(-)


Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.100 llvm/include/llvm/Type.h:1.101
--- llvm/include/llvm/Type.h:1.100	Sun Jan 14 20:27:26 2007
+++ llvm/include/llvm/Type.h	Tue Jan 16 19:49:59 2007
@@ -22,13 +22,8 @@
 
 namespace llvm {
 
-class ArrayType;
 class DerivedType;
-class FunctionType;
-class OpaqueType;
 class PointerType;
-class StructType;
-class PackedType;
 class TypeMapBase;
 
 /// This file contains the declaration of the Type class.  For more "Type" type





From reid at x10sys.com  Tue Jan 16 20:15:03 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:15:03 -0600
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200701170215.l0H2F3lc006527@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.263 -> 1.264
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Adjust configuration for Stacker's new name: llvm-stacker. 


---
Diffs of the changes:  (+13 -13)

 configure |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)


Index: llvm/configure
diff -u llvm/configure:1.263 llvm/configure:1.264
--- llvm/configure:1.263	Fri Jan 12 12:22:38 2007
+++ llvm/configure	Tue Jan 16 20:14:46 2007
@@ -938,8 +938,8 @@
 F77
 FFLAGS'
 ac_subdirs_all='projects/sample
-projects/Stacker
 projects/privbracket
+projects/llvm-stacker
 projects/llvm-test
 projects/llvm-reopt
 projects/llvm-gcc
@@ -2060,26 +2060,26 @@
 do
   if test -d ${srcdir}/projects/${i} ; then
     case ${i} in
-      "CVS") ;;
-      "sample")       subdirs="$subdirs projects/sample"
+      CVS) ;;
+      sample)       subdirs="$subdirs projects/sample"
     ;;
-      "Stacker")      subdirs="$subdirs projects/Stacker"
-   ;;
-      "privbracket")  subdirs="$subdirs projects/privbracket"
+      privbracket)  subdirs="$subdirs projects/privbracket"
+ ;;
+      llvm-stacker) subdirs="$subdirs projects/llvm-stacker"
  ;;
-      "llvm-test")    subdirs="$subdirs projects/llvm-test"
+      llvm-test)    subdirs="$subdirs projects/llvm-test"
  ;;
-      "llvm-reopt")   subdirs="$subdirs projects/llvm-reopt"
+      llvm-reopt)   subdirs="$subdirs projects/llvm-reopt"
 ;;
-      "llvm-gcc")     subdirs="$subdirs projects/llvm-gcc"
+      llvm-gcc)     subdirs="$subdirs projects/llvm-gcc"
   ;;
-      "llvm-java")    subdirs="$subdirs projects/llvm-java"
+      llvm-java)    subdirs="$subdirs projects/llvm-java"
  ;;
-      "llvm-tv")      subdirs="$subdirs projects/llvm-tv"
+      llvm-tv)      subdirs="$subdirs projects/llvm-tv"
    ;;
-      "llvm-poolalloc") subdirs="$subdirs projects/llvm-poolalloc"
+      llvm-poolalloc) subdirs="$subdirs projects/llvm-poolalloc"
  ;;
-      "llvm-kernel")  subdirs="$subdirs projects/llvm-kernel"
+      llvm-kernel)  subdirs="$subdirs projects/llvm-kernel"
  ;;
       *)
         { echo "$as_me:$LINENO: WARNING: Unknown project (${i}) won't be configured automatically" >&5





From reid at x10sys.com  Tue Jan 16 20:15:03 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:15:03 -0600
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac
Message-ID: <200701170215.l0H2F3ZJ006524@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.258 -> 1.259
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Adjust configuration for Stacker's new name: llvm-stacker. 


---
Diffs of the changes:  (+11 -11)

 configure.ac |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.258 llvm/autoconf/configure.ac:1.259
--- llvm/autoconf/configure.ac:1.258	Fri Jan 12 12:22:38 2007
+++ llvm/autoconf/configure.ac	Tue Jan 16 20:14:46 2007
@@ -66,17 +66,17 @@
 do
   if test -d ${srcdir}/projects/${i} ; then
     case ${i} in
-      "CVS") ;;
-      "sample")       AC_CONFIG_SUBDIRS([projects/sample])    ;;
-      "Stacker")      AC_CONFIG_SUBDIRS([projects/Stacker])   ;;
-      "privbracket")  AC_CONFIG_SUBDIRS([projects/privbracket]) ;;
-      "llvm-test")    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
-      "llvm-reopt")   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
-      "llvm-gcc")     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
-      "llvm-java")    AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;
-      "llvm-tv")      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
-      "llvm-poolalloc") AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;;
-      "llvm-kernel")  AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;;
+      CVS) ;;
+      sample)       AC_CONFIG_SUBDIRS([projects/sample])    ;;
+      privbracket)  AC_CONFIG_SUBDIRS([projects/privbracket]) ;;
+      llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;;
+      llvm-test)    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
+      llvm-reopt)   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
+      llvm-gcc)     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
+      llvm-java)    AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;
+      llvm-tv)      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
+      llvm-poolalloc) AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;;
+      llvm-kernel)  AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;;
       *)              
         AC_MSG_WARN([Unknown project (${i}) won't be configured automatically])
         ;;





From llvm at cs.uiuc.edu  Tue Jan 16 20:19:21 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:19:21 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/Makefile
Message-ID: <200701170219.l0H2JLNl006709@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib:

Makefile (r1.8) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:19:22 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:19:22 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/Makefile
Message-ID: <200701170219.l0H2JMi1006715@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools:

Makefile (r1.3) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From reid at x10sys.com  Tue Jan 16 20:19:22 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:19:22 -0600
Subject: [llvm-commits] CVS: llvm/projects/Makefile
Message-ID: <200701170219.l0H2JMBD006721@zion.cs.uiuc.edu>



Changes in directory llvm/projects:

Makefile updated: 1.15 -> 1.16
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -7)

 Makefile |    7 -------
 1 files changed, 7 deletions(-)


Index: llvm/projects/Makefile
diff -u llvm/projects/Makefile:1.15 llvm/projects/Makefile:1.16
--- llvm/projects/Makefile:1.15	Fri Sep 29 19:24:20 2006
+++ llvm/projects/Makefile	Tue Jan 16 20:18:43 2007
@@ -14,14 +14,7 @@
 
 # Sparc cannot link shared libraries (libtool problem?) which Stacker uses
 ifeq ($(ARCH), Sparc)
-DIRS := $(filter-out Stacker, $(DIRS))
 DIRS := $(filter-out sample, $(DIRS))
 endif
 
-
-# Universal builds can't build stacker, which uses llvm-gcc -S.
-ifdef UNIVERSAL
-DIRS := $(filter-out Stacker, $(DIRS))
-endif
-
 include $(PROJ_SRC_ROOT)/Makefile.rules





From llvm at cs.uiuc.edu  Tue Jan 16 20:19:38 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:19:38 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/runtime/Makefile
	stacker_rt.c
Message-ID: <200701170219.l0H2JcEv006734@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/runtime:

Makefile (r1.6) removed
stacker_rt.c (r1.11) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:19:58 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:19:58 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/stkrc/Makefile st
	stkrc.cpp
Message-ID: <200701170219.l0H2Jw7p006755@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools/stkrc:

Makefile (r1.12) removed
st (r1.3) removed
stkrc.cpp (r1.13) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:20:13 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:20:13 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/.cvsignore Makefile
	Makefile.common.in configure
Message-ID: <200701170220.l0H2KDPP006776@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker:

.cvsignore (r1.1) removed
Makefile (r1.10) removed
Makefile.common.in (r1.2) removed
configure (r1.4) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:20:24 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:20:24 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/samples/Makefile
	fibonacci.st goof.st hello.st prime.st
Message-ID: <200701170220.l0H2KOiQ006788@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/samples:

Makefile (r1.8) removed
fibonacci.st (r1.1) removed
goof.st (r1.2) removed
hello.st (r1.1) removed
prime.st (r1.2) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:21:07 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:21:07 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/autoconf/.cvsignore
	AutoRegen.sh LICENSE.TXT acinclude.m4 config.guess config.sub
	configure.ac install-sh ltmain.sh mkinstalldirs
Message-ID: <200701170221.l0H2L71d006816@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/autoconf:

.cvsignore (r1.1) removed
AutoRegen.sh (r1.1) removed
LICENSE.TXT (r1.1) removed
acinclude.m4 (r1.1) removed
config.guess (r1.1) removed
config.sub (r1.1) removed
configure.ac (r1.4) removed
install-sh (r1.1) removed
ltmain.sh (r1.1) removed
mkinstalldirs (r1.1) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From llvm at cs.uiuc.edu  Tue Jan 16 20:21:20 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:21:20 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/compiler/.cvsignore
	Lexer.cpp.cvs Lexer.l Lexer.l.cvs Makefile README
	StackerCompiler.cpp StackerCompiler.h StackerParser.cpp.cvs
	StackerParser.h.cvs StackerParser.y StackerParser.y.cvs
Message-ID: <200701170221.l0H2LKO8006831@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/compiler:

.cvsignore (r1.1) removed
Lexer.cpp.cvs (r1.1) removed
Lexer.l (r1.4) removed
Lexer.l.cvs (r1.1) removed
Makefile (r1.10) removed
README (r1.1) removed
StackerCompiler.cpp (r1.30) removed
StackerCompiler.h (r1.8) removed
StackerParser.cpp.cvs (r1.1) removed
StackerParser.h.cvs (r1.1) removed
StackerParser.y (r1.7) removed
StackerParser.y.cvs (r1.1) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From reid at x10sys.com  Tue Jan 16 20:22:37 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:22:37 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/SetVector.h
Message-ID: <200701170222.l0H2MbFs006894@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

SetVector.h updated: 1.10 -> 1.11
---
Log message:

For PR1094: http://llvm.org/PR1094 :
Make the SetVector::iterator be the vector's const_iterator.


---
Diffs of the changes:  (+3 -2)

 SetVector.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/ADT/SetVector.h
diff -u llvm/include/llvm/ADT/SetVector.h:1.10 llvm/include/llvm/ADT/SetVector.h:1.11
--- llvm/include/llvm/ADT/SetVector.h:1.10	Thu Apr 21 15:13:50 2005
+++ llvm/include/llvm/ADT/SetVector.h	Tue Jan 16 20:22:18 2007
@@ -37,7 +37,7 @@
   typedef const T& const_reference;
   typedef std::set<value_type> set_type;
   typedef std::vector<value_type> vector_type;
-  typedef typename vector_type::iterator iterator;
+  typedef typename vector_type::const_iterator iterator;
   typedef typename vector_type::const_iterator const_iterator;
   typedef typename vector_type::size_type size_type;
 
@@ -112,7 +112,8 @@
   /// @brief Remove an item from the set vector.
   void remove(const value_type& X) {
     if (0 < set_.erase(X)) {
-      iterator I = std::find(vector_.begin(),vector_.end(),X);
+      typename vector_type::iterator I =
+        std::find(vector_.begin(), vector_.end(), X);
       assert(I != vector_.end() && "Corrupted SetVector instances!");
       vector_.erase(I);
     }





From reid at x10sys.com  Tue Jan 16 20:23:54 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:23:54 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
Message-ID: <200701170223.l0H2NsrO006975@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

PredicateSimplifier.cpp updated: 1.48 -> 1.49
---
Log message:

For PR1094: http://llvm.org/PR1094 :
Adjust the use of SetVector for changes in SetVector's interface.
Patch by Gordon Henriksen.


---
Diffs of the changes:  (+4 -4)

 PredicateSimplifier.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.48 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.49
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.48	Mon Jan 15 08:30:07 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Tue Jan 16 20:23:37 2007
@@ -857,8 +857,8 @@
         // See if one of the nodes about to be removed is actually a better
         // canonical choice than n1.
         unsigned orig_n1 = n1;
-        std::vector<unsigned>::iterator DontRemove = Remove.end();
-        for (std::vector<unsigned>::iterator I = Remove.begin()+1 /* skip n2 */,
+        SetVector<unsigned>::iterator DontRemove = Remove.end();
+        for (SetVector<unsigned>::iterator I = Remove.begin()+1 /* skip n2 */,
              E = Remove.end(); I != E; ++I) {
           unsigned n = *I;
           Value *V = IG.node(n)->getValue();
@@ -949,7 +949,7 @@
 
       // Migrate relationships from removed nodes to N1.
       Node *N1 = IG.node(n1);
-      for (std::vector<unsigned>::iterator I = Remove.begin(), E = Remove.end();
+      for (SetVector<unsigned>::iterator I = Remove.begin(), E = Remove.end();
            I != E; ++I) {
         unsigned n = *I;
         Node *N = IG.node(n);
@@ -972,7 +972,7 @@
       if (!n2)
         IG.addEquality(n1, V2, Top);
       else {
-        for (std::vector<unsigned>::iterator I = Remove.begin(),
+        for (SetVector<unsigned>::iterator I = Remove.begin(),
              E = Remove.end(); I != E; ++I) {
           IG.addEquality(n1, IG.node(*I)->getValue(), Top);
         }





From llvm at cs.uiuc.edu  Tue Jan 16 20:25:26 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 16 Jan 2007 20:25:26 -0600
Subject: [llvm-commits] CVS: llvm/projects/Stacker/test/Makefile abs.st
	add.st and.st decr.st div.st drop.st drop2.st dup.st dup2.st
	eq.st false.st ge.st gt.st incr.st le.st lt.st max.st
	memory.st min.st mod.st mul.st ne.st neg.st nip.st nip2.st
	or.st out_chr.st out_num.st out_str.st over.st over2.st
	pick.st recurse.st return.st roll.st rot.st rot2.st rrot.st
	rrot2.st runtests select.st shl.st shr.st space.st
	star_slash.st sub.st swap.st swap2.st tab.st testing.st
	true.st tuck.st tuck2.st while.st xor.st
Message-ID: <200701170225.l0H2PQY6007045@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/test:

Makefile (r1.11) removed
abs.st (r1.1) removed
add.st (r1.1) removed
and.st (r1.1) removed
decr.st (r1.1) removed
div.st (r1.1) removed
drop.st (r1.1) removed
drop2.st (r1.1) removed
dup.st (r1.1) removed
dup2.st (r1.1) removed
eq.st (r1.1) removed
false.st (r1.1) removed
ge.st (r1.1) removed
gt.st (r1.1) removed
incr.st (r1.1) removed
le.st (r1.1) removed
lt.st (r1.1) removed
max.st (r1.1) removed
memory.st (r1.1) removed
min.st (r1.1) removed
mod.st (r1.1) removed
mul.st (r1.1) removed
ne.st (r1.1) removed
neg.st (r1.1) removed
nip.st (r1.1) removed
nip2.st (r1.1) removed
or.st (r1.1) removed
out_chr.st (r1.1) removed
out_num.st (r1.1) removed
out_str.st (r1.1) removed
over.st (r1.1) removed
over2.st (r1.1) removed
pick.st (r1.1) removed
recurse.st (r1.1) removed
return.st (r1.1) removed
roll.st (r1.1) removed
rot.st (r1.1) removed
rot2.st (r1.1) removed
rrot.st (r1.1) removed
rrot2.st (r1.1) removed
runtests (r1.2) removed
select.st (r1.1) removed
shl.st (r1.1) removed
shr.st (r1.1) removed
space.st (r1.1) removed
star_slash.st (r1.1) removed
sub.st (r1.1) removed
swap.st (r1.1) removed
swap2.st (r1.1) removed
tab.st (r1.1) removed
testing.st (r1.1) removed
true.st (r1.1) removed
tuck.st (r1.1) removed
tuck2.st (r1.1) removed
while.st (r1.1) removed
xor.st (r1.1) removed
---
Log message:

For PR1074: http://llvm.org/PR1074 :
Remove the projects/Stacker directory. LLVM is now free of dependency
on llvm-gcc.


---
Diffs of the changes:  (+0 -0)

 0 files changed





From reid at x10sys.com  Tue Jan 16 20:45:35 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:45:35 -0600
Subject: [llvm-commits] CVS:
	llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast.ll
	2007-01-16-CrashOnBadCast2.ll
Message-ID: <200701170245.l0H2jZ3R007478@zion.cs.uiuc.edu>



Changes in directory llvm/test/Regression/Assembler:

2007-01-16-CrashOnBadCast.ll added (r1.1)
2007-01-16-CrashOnBadCast2.ll added (r1.1)
---
Log message:

Test cases for PR1117: http://llvm.org/PR1117 .


---
Diffs of the changes:  (+13 -0)

 2007-01-16-CrashOnBadCast.ll  |    8 ++++++++
 2007-01-16-CrashOnBadCast2.ll |    5 +++++
 2 files changed, 13 insertions(+)


Index: llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast.ll
diff -c /dev/null llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast.ll:1.1
*** /dev/null	Tue Jan 16 20:45:29 2007
--- llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast.ll	Tue Jan 16 20:45:19 2007
***************
*** 0 ****
--- 1,8 ----
+ ; PR1117
+ ; RUN: llvm-as < %s 2>&1 > /dev/null | \
+ ; RUN:  grep "invalid cast opcode for cast from"
+ 
+ define i8* %nada(i64 %X) {
+     %result = trunc i64 %X to i8*
+     ret i8* %result
+ }


Index: llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast2.ll
diff -c /dev/null llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast2.ll:1.1
*** /dev/null	Tue Jan 16 20:45:35 2007
--- llvm/test/Regression/Assembler/2007-01-16-CrashOnBadCast2.ll	Tue Jan 16 20:45:19 2007
***************
*** 0 ****
--- 1,5 ----
+ ; PR1117
+ ; RUN: llvm-as < %s 2>&1 > /dev/null | \
+ ; RUN:  grep "invalid cast opcode for cast from"
+ 
+ %X = constant i8* trunc (i64 0 to i8*)





From reid at x10sys.com  Tue Jan 16 20:46:30 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:46:30 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/InstrTypes.h
Message-ID: <200701170246.l0H2kU8A007508@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

InstrTypes.h updated: 1.59 -> 1.60
---
Log message:

For PR1117: http://llvm.org/PR1117 :
Expose the previously hidden checkCast function as CastInst::castIsValid.


---
Diffs of the changes:  (+6 -0)

 InstrTypes.h |    6 ++++++
 1 files changed, 6 insertions(+)


Index: llvm/include/llvm/InstrTypes.h
diff -u llvm/include/llvm/InstrTypes.h:1.59 llvm/include/llvm/InstrTypes.h:1.60
--- llvm/include/llvm/InstrTypes.h:1.59	Mon Jan  1 20:08:27 2007
+++ llvm/include/llvm/InstrTypes.h	Tue Jan 16 20:46:11 2007
@@ -459,6 +459,12 @@
   /// @brief Return the destination type, as a convenience
   const Type* getDestTy() const { return getType(); }
 
+  /// This method can be used to determine if a cast from S to DstTy using
+  /// Opcode op is valid or not. 
+  /// @returns true iff the proposed cast is valid.
+  /// @brief Determine if a cast is valid without creating one.
+  static bool castIsValid(Instruction::CastOps op, Value *S, const Type *DstTy);
+
   /// @brief Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const CastInst *) { return true; }
   static inline bool classof(const Instruction *I) {





From reid at x10sys.com  Tue Jan 16 20:46:30 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:46:30 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Instructions.cpp
Message-ID: <200701170246.l0H2kUQ1007513@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Instructions.cpp updated: 1.63 -> 1.64
---
Log message:

For PR1117: http://llvm.org/PR1117 :
Expose the previously hidden checkCast function as CastInst::castIsValid.


---
Diffs of the changes:  (+29 -29)

 Instructions.cpp |   58 +++++++++++++++++++++++++++----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)


Index: llvm/lib/VMCore/Instructions.cpp
diff -u llvm/lib/VMCore/Instructions.cpp:1.63 llvm/lib/VMCore/Instructions.cpp:1.64
--- llvm/lib/VMCore/Instructions.cpp:1.63	Sun Jan 14 20:27:26 2007
+++ llvm/lib/VMCore/Instructions.cpp	Tue Jan 16 20:46:11 2007
@@ -1603,9 +1603,9 @@
 
 // Provide a way to get a "cast" where the cast opcode is inferred from the 
 // types and size of the operand. This, basically, is a parallel of the 
-// logic in the checkCast function below.  This axiom should hold:
-//   checkCast( getCastOpcode(Val, Ty), Val, Ty)
-// should not assert in checkCast. In other words, this produces a "correct"
+// logic in the castIsValid function below.  This axiom should hold:
+//   castIsValid( getCastOpcode(Val, Ty), Val, Ty)
+// should not assert in castIsValid. In other words, this produces a "correct"
 // casting opcode for the arguments passed to it.
 Instruction::CastOps
 CastInst::getCastOpcode(
@@ -1699,8 +1699,8 @@
 /// could be broken out into the separate constructors but it is useful to have
 /// it in one place and to eliminate the redundant code for getting the sizes
 /// of the types involved.
-static bool 
-checkCast(Instruction::CastOps op, Value *S, const Type *DstTy) {
+bool 
+CastInst::castIsValid(Instruction::CastOps op, Value *S, const Type *DstTy) {
 
   // Check for type sanity on the arguments
   const Type *SrcTy = S->getType();
@@ -1754,144 +1754,144 @@
 TruncInst::TruncInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, Trunc, S, Name, InsertBefore) {
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal Trunc");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal Trunc");
 }
 
 TruncInst::TruncInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, Trunc, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal Trunc");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal Trunc");
 }
 
 ZExtInst::ZExtInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 )  : CastInst(Ty, ZExt, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal ZExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal ZExt");
 }
 
 ZExtInst::ZExtInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 )  : CastInst(Ty, ZExt, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal ZExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal ZExt");
 }
 SExtInst::SExtInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, SExt, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal SExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal SExt");
 }
 
 SExtInst::SExtInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 )  : CastInst(Ty, SExt, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal SExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal SExt");
 }
 
 FPTruncInst::FPTruncInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, FPTrunc, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPTrunc");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPTrunc");
 }
 
 FPTruncInst::FPTruncInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, FPTrunc, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPTrunc");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPTrunc");
 }
 
 FPExtInst::FPExtInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, FPExt, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPExt");
 }
 
 FPExtInst::FPExtInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, FPExt, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPExt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPExt");
 }
 
 UIToFPInst::UIToFPInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, UIToFP, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal UIToFP");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal UIToFP");
 }
 
 UIToFPInst::UIToFPInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, UIToFP, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal UIToFP");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal UIToFP");
 }
 
 SIToFPInst::SIToFPInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, SIToFP, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal SIToFP");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal SIToFP");
 }
 
 SIToFPInst::SIToFPInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, SIToFP, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal SIToFP");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal SIToFP");
 }
 
 FPToUIInst::FPToUIInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, FPToUI, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPToUI");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPToUI");
 }
 
 FPToUIInst::FPToUIInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, FPToUI, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPToUI");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPToUI");
 }
 
 FPToSIInst::FPToSIInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, FPToSI, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPToSI");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPToSI");
 }
 
 FPToSIInst::FPToSIInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, FPToSI, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal FPToSI");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal FPToSI");
 }
 
 PtrToIntInst::PtrToIntInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, PtrToInt, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal PtrToInt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal PtrToInt");
 }
 
 PtrToIntInst::PtrToIntInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, PtrToInt, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal PtrToInt");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal PtrToInt");
 }
 
 IntToPtrInst::IntToPtrInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, IntToPtr, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal IntToPtr");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal IntToPtr");
 }
 
 IntToPtrInst::IntToPtrInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, IntToPtr, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal IntToPtr");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal IntToPtr");
 }
 
 BitCastInst::BitCastInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, BitCast, S, Name, InsertBefore) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal BitCast");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal BitCast");
 }
 
 BitCastInst::BitCastInst(
   Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd
 ) : CastInst(Ty, BitCast, S, Name, InsertAtEnd) { 
-  assert(checkCast(getOpcode(), S, Ty) && "Illegal BitCast");
+  assert(castIsValid(getOpcode(), S, Ty) && "Illegal BitCast");
 }
 
 //===----------------------------------------------------------------------===//





From reid at x10sys.com  Tue Jan 16 20:47:48 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:47:48 -0600
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200701170247.l0H2lmG7007551@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.310 -> 1.311
---
Log message:

For PR1117: http://llvm.org/PR1117 :
Make the assembler generate a nice error message if a bad cast instruction
is attempted instead of asserting out. This is made possible by the 
recently exposed method CastInst::castIsValid() which checks the validity
of any cast instruction.


---
Diffs of the changes:  (+12 -15)

 llvmAsmParser.y |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.310 llvm/lib/AsmParser/llvmAsmParser.y:1.311
--- llvm/lib/AsmParser/llvmAsmParser.y:1.310	Sun Jan 14 20:27:26 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Tue Jan 16 20:47:33 2007
@@ -1708,14 +1708,12 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
     Constant *Val = $3;
-    const Type *Ty = $5->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast constant expression from a non-primitive type: '" +
-                     Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast constant expression to a non-primitive type: '" +
-                Ty->getDescription() + "'!");
-    $$ = ConstantExpr::getCast($1, $3, $5->get());
+    const Type *DestTy = $5->get();
+    if (!CastInst::castIsValid($1, $3, DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    $$ = ConstantExpr::getCast($1, $3, DestTy);
     delete $5;
   }
   | GETELEMENTPTR '(' ConstVal IndexList ')' {
@@ -2647,13 +2645,12 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$4)->getDescription());
     Value* Val = $2;
-    const Type* Ty = $4->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast from a non-primitive type: '" +
-                Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!");
-    $$ = CastInst::create($1, Val, $4->get());
+    const Type* DestTy = $4->get();
+    if (!CastInst::castIsValid($1, Val, DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    $$ = CastInst::create($1, Val, DestTy);
     delete $4;
   }
   | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {





From reid at x10sys.com  Tue Jan 16 20:49:00 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 20:49:00 -0600
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
	llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200701170249.l0H2n00a007609@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.cpp.cvs updated: 1.55 -> 1.56
llvmAsmParser.h.cvs updated: 1.43 -> 1.44
llvmAsmParser.y.cvs updated: 1.56 -> 1.57
---
Log message:

Regenerate.


---
Diffs of the changes:  (+4291 -3221)

 llvmAsmParser.cpp.cvs | 7011 ++++++++++++++++++++++++++++----------------------
 llvmAsmParser.h.cvs   |  442 ++-
 llvmAsmParser.y.cvs   |   27 
 3 files changed, 4291 insertions(+), 3189 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.55 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.56
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.55	Sun Jan 14 20:27:26 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Tue Jan 16 20:48:45 2007
@@ -1,148 +1,338 @@
+/* A Bison parser, made by GNU Bison 2.1.  */
 
-/*  A Bison parser, made from /Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y
-    by GNU Bison version 1.28  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-#define YYBISON 1  /* Identify Bison output.  */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
+/* Substitute the variable and function names.  */
 #define yyparse llvmAsmparse
-#define yylex llvmAsmlex
+#define yylex   llvmAsmlex
 #define yyerror llvmAsmerror
-#define yylval llvmAsmlval
-#define yychar llvmAsmchar
+#define yylval  llvmAsmlval
+#define yychar  llvmAsmchar
 #define yydebug llvmAsmdebug
 #define yynerrs llvmAsmnerrs
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	SINTVAL	259
-#define	UINTVAL	260
-#define	FPVAL	261
-#define	VOID	262
-#define	INTTYPE	263
-#define	FLOAT	264
-#define	DOUBLE	265
-#define	LABEL	266
-#define	TYPE	267
-#define	VAR_ID	268
-#define	LABELSTR	269
-#define	STRINGCONSTANT	270
-#define	IMPLEMENTATION	271
-#define	ZEROINITIALIZER	272
-#define	TRUETOK	273
-#define	FALSETOK	274
-#define	BEGINTOK	275
-#define	ENDTOK	276
-#define	DECLARE	277
-#define	DEFINE	278
-#define	GLOBAL	279
-#define	CONSTANT	280
-#define	SECTION	281
-#define	VOLATILE	282
-#define	TO	283
-#define	DOTDOTDOT	284
-#define	NULL_TOK	285
-#define	UNDEF	286
-#define	INTERNAL	287
-#define	LINKONCE	288
-#define	WEAK	289
-#define	APPENDING	290
-#define	DLLIMPORT	291
-#define	DLLEXPORT	292
-#define	EXTERN_WEAK	293
-#define	OPAQUE	294
-#define	EXTERNAL	295
-#define	TARGET	296
-#define	TRIPLE	297
-#define	ENDIAN	298
-#define	POINTERSIZE	299
-#define	LITTLE	300
-#define	BIG	301
-#define	ALIGN	302
-#define	DEPLIBS	303
-#define	CALL	304
-#define	TAIL	305
-#define	ASM_TOK	306
-#define	MODULE	307
-#define	SIDEEFFECT	308
-#define	CC_TOK	309
-#define	CCC_TOK	310
-#define	CSRETCC_TOK	311
-#define	FASTCC_TOK	312
-#define	COLDCC_TOK	313
-#define	X86_STDCALLCC_TOK	314
-#define	X86_FASTCALLCC_TOK	315
-#define	DATALAYOUT	316
-#define	RET	317
-#define	BR	318
-#define	SWITCH	319
-#define	INVOKE	320
-#define	UNWIND	321
-#define	UNREACHABLE	322
-#define	ADD	323
-#define	SUB	324
-#define	MUL	325
-#define	UDIV	326
-#define	SDIV	327
-#define	FDIV	328
-#define	UREM	329
-#define	SREM	330
-#define	FREM	331
-#define	AND	332
-#define	OR	333
-#define	XOR	334
-#define	ICMP	335
-#define	FCMP	336
-#define	EQ	337
-#define	NE	338
-#define	SLT	339
-#define	SGT	340
-#define	SLE	341
-#define	SGE	342
-#define	ULT	343
-#define	UGT	344
-#define	ULE	345
-#define	UGE	346
-#define	OEQ	347
-#define	ONE	348
-#define	OLT	349
-#define	OGT	350
-#define	OLE	351
-#define	OGE	352
-#define	ORD	353
-#define	UNO	354
-#define	UEQ	355
-#define	UNE	356
-#define	MALLOC	357
-#define	ALLOCA	358
-#define	FREE	359
-#define	LOAD	360
-#define	STORE	361
-#define	GETELEMENTPTR	362
-#define	TRUNC	363
-#define	ZEXT	364
-#define	SEXT	365
-#define	FPTRUNC	366
-#define	FPEXT	367
-#define	BITCAST	368
-#define	UITOFP	369
-#define	SITOFP	370
-#define	FPTOUI	371
-#define	FPTOSI	372
-#define	INTTOPTR	373
-#define	PTRTOINT	374
-#define	PHI_TOK	375
-#define	SELECT	376
-#define	SHL	377
-#define	LSHR	378
-#define	ASHR	379
-#define	VAARG	380
-#define	EXTRACTELEMENT	381
-#define	INSERTELEMENT	382
-#define	SHUFFLEVECTOR	383
-#define	NORETURN	384
-#define	DEFAULT	385
-#define	HIDDEN	386
 
-#line 14 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ESINT64VAL = 258,
+     EUINT64VAL = 259,
+     SINTVAL = 260,
+     UINTVAL = 261,
+     FPVAL = 262,
+     VOID = 263,
+     INTTYPE = 264,
+     FLOAT = 265,
+     DOUBLE = 266,
+     LABEL = 267,
+     TYPE = 268,
+     VAR_ID = 269,
+     LABELSTR = 270,
+     STRINGCONSTANT = 271,
+     IMPLEMENTATION = 272,
+     ZEROINITIALIZER = 273,
+     TRUETOK = 274,
+     FALSETOK = 275,
+     BEGINTOK = 276,
+     ENDTOK = 277,
+     DECLARE = 278,
+     DEFINE = 279,
+     GLOBAL = 280,
+     CONSTANT = 281,
+     SECTION = 282,
+     VOLATILE = 283,
+     TO = 284,
+     DOTDOTDOT = 285,
+     NULL_TOK = 286,
+     UNDEF = 287,
+     INTERNAL = 288,
+     LINKONCE = 289,
+     WEAK = 290,
+     APPENDING = 291,
+     DLLIMPORT = 292,
+     DLLEXPORT = 293,
+     EXTERN_WEAK = 294,
+     OPAQUE = 295,
+     EXTERNAL = 296,
+     TARGET = 297,
+     TRIPLE = 298,
+     ENDIAN = 299,
+     POINTERSIZE = 300,
+     LITTLE = 301,
+     BIG = 302,
+     ALIGN = 303,
+     DEPLIBS = 304,
+     CALL = 305,
+     TAIL = 306,
+     ASM_TOK = 307,
+     MODULE = 308,
+     SIDEEFFECT = 309,
+     CC_TOK = 310,
+     CCC_TOK = 311,
+     CSRETCC_TOK = 312,
+     FASTCC_TOK = 313,
+     COLDCC_TOK = 314,
+     X86_STDCALLCC_TOK = 315,
+     X86_FASTCALLCC_TOK = 316,
+     DATALAYOUT = 317,
+     RET = 318,
+     BR = 319,
+     SWITCH = 320,
+     INVOKE = 321,
+     UNWIND = 322,
+     UNREACHABLE = 323,
+     ADD = 324,
+     SUB = 325,
+     MUL = 326,
+     UDIV = 327,
+     SDIV = 328,
+     FDIV = 329,
+     UREM = 330,
+     SREM = 331,
+     FREM = 332,
+     AND = 333,
+     OR = 334,
+     XOR = 335,
+     ICMP = 336,
+     FCMP = 337,
+     EQ = 338,
+     NE = 339,
+     SLT = 340,
+     SGT = 341,
+     SLE = 342,
+     SGE = 343,
+     ULT = 344,
+     UGT = 345,
+     ULE = 346,
+     UGE = 347,
+     OEQ = 348,
+     ONE = 349,
+     OLT = 350,
+     OGT = 351,
+     OLE = 352,
+     OGE = 353,
+     ORD = 354,
+     UNO = 355,
+     UEQ = 356,
+     UNE = 357,
+     MALLOC = 358,
+     ALLOCA = 359,
+     FREE = 360,
+     LOAD = 361,
+     STORE = 362,
+     GETELEMENTPTR = 363,
+     TRUNC = 364,
+     ZEXT = 365,
+     SEXT = 366,
+     FPTRUNC = 367,
+     FPEXT = 368,
+     BITCAST = 369,
+     UITOFP = 370,
+     SITOFP = 371,
+     FPTOUI = 372,
+     FPTOSI = 373,
+     INTTOPTR = 374,
+     PTRTOINT = 375,
+     PHI_TOK = 376,
+     SELECT = 377,
+     SHL = 378,
+     LSHR = 379,
+     ASHR = 380,
+     VAARG = 381,
+     EXTRACTELEMENT = 382,
+     INSERTELEMENT = 383,
+     SHUFFLEVECTOR = 384,
+     NORETURN = 385,
+     DEFAULT = 386,
+     HIDDEN = 387
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define SINTVAL 260
+#define UINTVAL 261
+#define FPVAL 262
+#define VOID 263
+#define INTTYPE 264
+#define FLOAT 265
+#define DOUBLE 266
+#define LABEL 267
+#define TYPE 268
+#define VAR_ID 269
+#define LABELSTR 270
+#define STRINGCONSTANT 271
+#define IMPLEMENTATION 272
+#define ZEROINITIALIZER 273
+#define TRUETOK 274
+#define FALSETOK 275
+#define BEGINTOK 276
+#define ENDTOK 277
+#define DECLARE 278
+#define DEFINE 279
+#define GLOBAL 280
+#define CONSTANT 281
+#define SECTION 282
+#define VOLATILE 283
+#define TO 284
+#define DOTDOTDOT 285
+#define NULL_TOK 286
+#define UNDEF 287
+#define INTERNAL 288
+#define LINKONCE 289
+#define WEAK 290
+#define APPENDING 291
+#define DLLIMPORT 292
+#define DLLEXPORT 293
+#define EXTERN_WEAK 294
+#define OPAQUE 295
+#define EXTERNAL 296
+#define TARGET 297
+#define TRIPLE 298
+#define ENDIAN 299
+#define POINTERSIZE 300
+#define LITTLE 301
+#define BIG 302
+#define ALIGN 303
+#define DEPLIBS 304
+#define CALL 305
+#define TAIL 306
+#define ASM_TOK 307
+#define MODULE 308
+#define SIDEEFFECT 309
+#define CC_TOK 310
+#define CCC_TOK 311
+#define CSRETCC_TOK 312
+#define FASTCC_TOK 313
+#define COLDCC_TOK 314
+#define X86_STDCALLCC_TOK 315
+#define X86_FASTCALLCC_TOK 316
+#define DATALAYOUT 317
+#define RET 318
+#define BR 319
+#define SWITCH 320
+#define INVOKE 321
+#define UNWIND 322
+#define UNREACHABLE 323
+#define ADD 324
+#define SUB 325
+#define MUL 326
+#define UDIV 327
+#define SDIV 328
+#define FDIV 329
+#define UREM 330
+#define SREM 331
+#define FREM 332
+#define AND 333
+#define OR 334
+#define XOR 335
+#define ICMP 336
+#define FCMP 337
+#define EQ 338
+#define NE 339
+#define SLT 340
+#define SGT 341
+#define SLE 342
+#define SGE 343
+#define ULT 344
+#define UGT 345
+#define ULE 346
+#define UGE 347
+#define OEQ 348
+#define ONE 349
+#define OLT 350
+#define OGT 351
+#define OLE 352
+#define OGE 353
+#define ORD 354
+#define UNO 355
+#define UEQ 356
+#define UNE 357
+#define MALLOC 358
+#define ALLOCA 359
+#define FREE 360
+#define LOAD 361
+#define STORE 362
+#define GETELEMENTPTR 363
+#define TRUNC 364
+#define ZEXT 365
+#define SEXT 366
+#define FPTRUNC 367
+#define FPEXT 368
+#define BITCAST 369
+#define UITOFP 370
+#define SITOFP 371
+#define FPTOUI 372
+#define FPTOSI 373
+#define INTTOPTR 374
+#define PTRTOINT 375
+#define PHI_TOK 376
+#define SELECT 377
+#define SHL 378
+#define LSHR 379
+#define ASHR 380
+#define VAARG 381
+#define EXTRACTELEMENT 382
+#define INSERTELEMENT 383
+#define SHUFFLEVECTOR 384
+#define NORETURN 385
+#define DEFAULT 386
+#define HIDDEN 387
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1011,8 +1201,28 @@
 }
 
 
-#line 883 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union {
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 883 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1058,1055 +1268,1506 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-#include <stdio.h>
+/* Line 196 of yacc.c.  */
+#line 1273 "llvmAsmParser.tab.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 219 of yacc.c.  */
+#line 1285 "llvmAsmParser.tab.c"
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
+#  endif
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
 
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short int yyss;
+  YYSTYPE yyvs;
+  };
 
-#define	YYFINAL		569
-#define	YYFLAG		-32768
-#define	YYNTBASE	147
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 386 ? yytranslate[x] : 225)
-
-static const short yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   137,
-   138,   135,     2,   134,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   142,
-   133,   143,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   139,   136,   141,     2,     2,     2,     2,     2,   146,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   140,
-     2,     2,   144,     2,   145,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-    97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-   107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-   127,   128,   129,   130,   131,   132
-};
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     4,     6,     8,    10,    12,    14,    16,    18,
-    20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
-    40,    42,    44,    46,    48,    50,    52,    54,    56,    58,
-    60,    62,    64,    66,    68,    70,    72,    74,    76,    78,
-    80,    82,    84,    86,    88,    90,    92,    94,    96,    98,
-   100,   102,   104,   106,   108,   110,   112,   114,   116,   119,
-   120,   122,   124,   126,   128,   130,   132,   134,   136,   137,
-   139,   140,   142,   144,   145,   147,   149,   151,   153,   154,
-   156,   158,   160,   162,   164,   166,   169,   171,   173,   174,
-   177,   179,   181,   182,   185,   186,   189,   190,   194,   197,
-   198,   200,   201,   205,   207,   210,   212,   214,   216,   218,
-   220,   222,   225,   227,   230,   236,   242,   248,   254,   258,
-   261,   267,   272,   275,   277,   279,   281,   285,   287,   291,
-   293,   294,   296,   300,   305,   309,   313,   318,   323,   327,
-   334,   340,   343,   346,   349,   352,   355,   358,   361,   364,
-   367,   370,   377,   383,   392,   399,   406,   414,   422,   429,
-   436,   445,   454,   458,   460,   462,   464,   466,   467,   469,
-   472,   473,   477,   478,   482,   486,   488,   492,   496,   497,
-   504,   505,   513,   514,   522,   525,   529,   531,   533,   535,
-   539,   543,   547,   551,   555,   559,   561,   562,   564,   566,
-   568,   569,   575,   579,   581,   585,   587,   588,   598,   600,
-   602,   607,   609,   611,   614,   618,   619,   621,   623,   625,
-   627,   629,   631,   633,   635,   637,   641,   643,   649,   651,
-   653,   655,   657,   660,   663,   666,   670,   673,   674,   676,
-   679,   682,   686,   696,   706,   715,   730,   732,   734,   741,
-   747,   750,   757,   765,   769,   775,   776,   777,   781,   784,
-   786,   792,   798,   805,   812,   817,   822,   829,   834,   839,
-   846,   853,   856,   865,   867,   869,   870,   874,   881,   885,
-   892,   895,   900,   907
-};
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined (__GNUC__) && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
 
-static const short yyrhs[] = {     5,
-     0,     6,     0,    69,     0,    70,     0,    71,     0,    72,
-     0,    73,     0,    74,     0,    75,     0,    76,     0,    77,
-     0,    78,     0,    79,     0,    80,     0,   109,     0,   110,
-     0,   111,     0,   112,     0,   113,     0,   114,     0,   115,
-     0,   116,     0,   117,     0,   118,     0,   119,     0,   120,
-     0,   123,     0,   124,     0,   125,     0,    83,     0,    84,
-     0,    85,     0,    86,     0,    87,     0,    88,     0,    89,
-     0,    90,     0,    91,     0,    92,     0,    93,     0,    94,
-     0,    95,     0,    96,     0,    97,     0,    98,     0,    99,
-     0,   100,     0,   101,     0,   102,     0,    89,     0,    90,
-     0,    91,     0,    92,     0,    19,     0,    20,     0,     9,
-     0,    10,     0,    11,     0,   197,   133,     0,     0,    33,
-     0,    35,     0,    34,     0,    36,     0,    38,     0,    37,
-     0,    39,     0,    41,     0,     0,   132,     0,     0,    37,
-     0,    39,     0,     0,    33,     0,    34,     0,    35,     0,
-    38,     0,     0,    56,     0,    57,     0,    58,     0,    59,
-     0,    60,     0,    61,     0,    55,     4,     0,   110,     0,
-   111,     0,     0,   164,   163,     0,   130,     0,   163,     0,
-     0,   166,   165,     0,     0,    48,     4,     0,     0,   134,
-    48,     4,     0,    27,    16,     0,     0,   169,     0,     0,
-   134,   172,   171,     0,   169,     0,    48,     4,     0,     9,
-     0,    10,     0,    11,     0,    12,     0,    40,     0,   173,
-     0,   174,   135,     0,   209,     0,   136,     4,     0,   174,
-   137,   178,   138,   166,     0,     8,   137,   178,   138,   166,
-     0,   139,     4,   140,   174,   141,     0,   142,     4,   140,
-   174,   143,     0,   144,   179,   145,     0,   144,   145,     0,
-   142,   144,   179,   145,   143,     0,   142,   144,   145,   143,
-     0,   174,   164,     0,   174,     0,     8,     0,   175,     0,
-   177,   134,   175,     0,   177,     0,   177,   134,    30,     0,
-    30,     0,     0,   174,     0,   179,   134,   174,     0,   174,
-   139,   182,   141,     0,   174,   139,   141,     0,   174,   146,
-    16,     0,   174,   142,   182,   143,     0,   174,   144,   182,
-   145,     0,   174,   144,   145,     0,   174,   142,   144,   182,
-   145,   143,     0,   174,   142,   144,   145,   143,     0,   174,
-    31,     0,   174,    32,     0,   174,   209,     0,   174,   181,
-     0,   174,    18,     0,   154,     3,     0,   154,     4,     0,
-     9,    19,     0,     9,    20,     0,   155,     7,     0,   150,
-   137,   180,    29,   174,   138,     0,   108,   137,   180,   220,
-   138,     0,   122,   137,   180,   134,   180,   134,   180,   138,
-     0,   148,   137,   180,   134,   180,   138,     0,   149,   137,
-   180,   134,   180,   138,     0,    81,   152,   137,   180,   134,
-   180,   138,     0,    82,   153,   137,   180,   134,   180,   138,
-     0,   151,   137,   180,   134,   180,   138,     0,   127,   137,
-   180,   134,   180,   138,     0,   128,   137,   180,   134,   180,
-   134,   180,   138,     0,   129,   137,   180,   134,   180,   134,
-   180,   138,     0,   182,   134,   180,     0,   180,     0,    25,
-     0,    26,     0,   185,     0,     0,   186,     0,   185,   186,
-     0,     0,    24,   187,   205,     0,     0,    23,   188,   206,
-     0,    53,    52,   192,     0,    17,     0,   156,    13,   174,
-     0,   156,    13,     8,     0,     0,   156,   159,   183,   180,
-   189,   171,     0,     0,   156,   157,   159,   183,   180,   190,
-   171,     0,     0,   156,   158,   159,   183,   174,   191,   171,
-     0,    42,   194,     0,    49,   133,   195,     0,    16,     0,
-    47,     0,    46,     0,    44,   133,   193,     0,    45,   133,
-     4,     0,    43,   133,    16,     0,    62,   133,    16,     0,
-   139,   196,   141,     0,   196,   134,    16,     0,    16,     0,
-     0,    14,     0,    16,     0,   197,     0,     0,   199,   134,
-   174,   164,   198,     0,   174,   164,   198,     0,   199,     0,
-   199,   134,    30,     0,    30,     0,     0,   162,   176,   197,
-   137,   200,   138,   166,   170,   167,     0,    21,     0,   144,
-     0,   161,   159,   201,   202,     0,    22,     0,   145,     0,
-   212,   204,     0,   160,   159,   201,     0,     0,    54,     0,
-     3,     0,     4,     0,     7,     0,    19,     0,    20,     0,
-    31,     0,    32,     0,    18,     0,   142,   182,   143,     0,
-   181,     0,    52,   207,    16,   134,    16,     0,   147,     0,
-   197,     0,   209,     0,   208,     0,   174,   210,     0,   212,
-   213,     0,   203,   213,     0,   214,   156,   215,     0,   214,
-   217,     0,     0,    15,     0,    63,   211,     0,    63,     8,
-     0,    64,    12,   210,     0,    64,     9,   210,   134,    12,
-   210,   134,    12,   210,     0,    65,   154,   210,   134,    12,
-   210,   139,   216,   141,     0,    65,   154,   210,   134,    12,
-   210,   139,   141,     0,    66,   162,   176,   210,   137,   219,
-   138,   166,    29,    12,   210,    67,    12,   210,     0,    67,
-     0,    68,     0,   216,   154,   208,   134,    12,   210,     0,
-   154,   208,   134,    12,   210,     0,   156,   222,     0,   174,
-   139,   210,   134,   210,   141,     0,   218,   134,   139,   210,
-   134,   210,   141,     0,   174,   210,   164,     0,   219,   134,
-   174,   210,   164,     0,     0,     0,   220,   134,   211,     0,
-    51,    50,     0,    50,     0,   148,   174,   210,   134,   210,
-     0,   149,   174,   210,   134,   210,     0,    81,   152,   174,
-   210,   134,   210,     0,    82,   153,   174,   210,   134,   210,
-     0,   151,   211,   134,   211,     0,   150,   211,    29,   174,
-     0,   122,   211,   134,   211,   134,   211,     0,   126,   211,
-   134,   174,     0,   127,   211,   134,   211,     0,   128,   211,
-   134,   211,   134,   211,     0,   129,   211,   134,   211,   134,
-   211,     0,   121,   218,     0,   221,   162,   176,   210,   137,
-   219,   138,   166,     0,   224,     0,    28,     0,     0,   103,
-   174,   168,     0,   103,   174,   134,     9,   210,   168,     0,
-   104,   174,   168,     0,   104,   174,   134,     9,   210,   168,
-     0,   105,   211,     0,   223,   106,   174,   210,     0,   223,
-   107,   211,   134,   174,   210,     0,   108,   174,   210,   220,
-     0
-};
+#endif
 
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short int yysigned_char;
 #endif
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-  1031,  1032,  1042,  1042,  1042,  1042,  1042,  1042,  1042,  1042,
-  1042,  1043,  1043,  1043,  1044,  1044,  1044,  1044,  1044,  1044,
-  1044,  1045,  1045,  1045,  1045,  1045,  1046,  1046,  1046,  1048,
-  1048,  1049,  1049,  1050,  1050,  1051,  1051,  1052,  1052,  1056,
-  1056,  1057,  1057,  1058,  1058,  1059,  1059,  1060,  1060,  1061,
-  1061,  1062,  1062,  1063,  1064,  1069,  1070,  1070,  1073,  1077,
-  1083,  1084,  1085,  1086,  1087,  1091,  1092,  1093,  1097,  1098,
-  1102,  1103,  1104,  1108,  1109,  1110,  1111,  1112,  1115,  1115,
-  1116,  1117,  1118,  1119,  1120,  1121,  1129,  1130,  1133,  1134,
-  1139,  1140,  1143,  1144,  1151,  1151,  1158,  1158,  1167,  1175,
-  1175,  1181,  1181,  1183,  1188,  1201,  1201,  1201,  1201,  1204,
-  1208,  1212,  1219,  1224,  1232,  1250,  1268,  1273,  1285,  1295,
-  1299,  1309,  1316,  1323,  1330,  1335,  1340,  1347,  1348,  1355,
-  1362,  1370,  1375,  1386,  1414,  1430,  1459,  1487,  1512,  1531,
-  1556,  1575,  1587,  1594,  1657,  1667,  1677,  1683,  1689,  1694,
-  1699,  1707,  1721,  1742,  1750,  1756,  1767,  1772,  1777,  1786,
-  1792,  1798,  1807,  1811,  1819,  1819,  1830,  1835,  1843,  1844,
-  1848,  1848,  1852,  1852,  1855,  1858,  1870,  1894,  1905,  1911,
-  1914,  1919,  1922,  1928,  1932,  1935,  1941,  1954,  1955,  1957,
-  1961,  1970,  1974,  1979,  1981,  1986,  1991,  2000,  2000,  2001,
-  2001,  2003,  2013,  2024,  2028,  2037,  2046,  2051,  2157,  2157,
-  2159,  2168,  2168,  2170,  2175,  2187,  2191,  2196,  2200,  2204,
-  2208,  2212,  2216,  2220,  2224,  2228,  2253,  2257,  2271,  2275,
-  2281,  2281,  2287,  2296,  2300,  2309,  2320,  2329,  2341,  2354,
-  2358,  2362,  2367,  2377,  2396,  2405,  2472,  2476,  2483,  2494,
-  2507,  2516,  2527,  2537,  2545,  2553,  2556,  2557,  2564,  2568,
-  2573,  2594,  2611,  2624,  2637,  2646,  2659,  2667,  2674,  2680,
-  2686,  2692,  2707,  2770,  2775,  2779,  2786,  2793,  2801,  2808,
-  2816,  2824,  2838,  2855
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  36
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1357
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  147
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  79
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  285
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  569
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   387
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     137,   138,   135,     2,   134,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     142,   133,   143,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   139,   136,   141,     2,     2,     2,     2,     2,   146,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     140,     2,     2,   144,     2,   145,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132
 };
-#endif
 
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short int yyprhs[] =
+{
+       0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
+      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
+      39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
+      59,    61,    63,    65,    67,    69,    71,    73,    75,    77,
+      79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
+      99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
+     119,   122,   123,   125,   127,   129,   131,   133,   135,   137,
+     139,   140,   142,   143,   145,   147,   148,   150,   152,   154,
+     156,   157,   159,   161,   163,   165,   167,   169,   172,   174,
+     176,   177,   180,   182,   184,   185,   188,   189,   192,   193,
+     197,   200,   201,   203,   204,   208,   210,   213,   215,   217,
+     219,   221,   223,   225,   228,   230,   233,   239,   245,   251,
+     257,   261,   264,   270,   275,   278,   280,   282,   284,   288,
+     290,   294,   296,   297,   299,   303,   308,   312,   316,   321,
+     326,   330,   337,   343,   346,   349,   352,   355,   358,   361,
+     364,   367,   370,   373,   380,   386,   395,   402,   409,   417,
+     425,   432,   439,   448,   457,   461,   463,   465,   467,   469,
+     470,   472,   475,   476,   480,   481,   485,   489,   491,   495,
+     499,   500,   507,   508,   516,   517,   525,   528,   532,   534,
+     536,   538,   542,   546,   550,   554,   558,   562,   564,   565,
+     567,   569,   571,   572,   578,   582,   584,   588,   590,   591,
+     601,   603,   605,   610,   612,   614,   617,   621,   622,   624,
+     626,   628,   630,   632,   634,   636,   638,   640,   644,   646,
+     652,   654,   656,   658,   660,   663,   666,   669,   673,   676,
+     677,   679,   682,   685,   689,   699,   709,   718,   733,   735,
+     737,   744,   750,   753,   760,   768,   772,   778,   779,   780,
+     784,   787,   789,   795,   801,   808,   815,   820,   825,   832,
+     837,   842,   849,   856,   859,   868,   870,   872,   873,   877,
+     884,   888,   895,   898,   903,   910
+};
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const short int yyrhs[] =
+{
+     185,     0,    -1,     5,    -1,     6,    -1,    69,    -1,    70,
+      -1,    71,    -1,    72,    -1,    73,    -1,    74,    -1,    75,
+      -1,    76,    -1,    77,    -1,    78,    -1,    79,    -1,    80,
+      -1,   109,    -1,   110,    -1,   111,    -1,   112,    -1,   113,
+      -1,   114,    -1,   115,    -1,   116,    -1,   117,    -1,   118,
+      -1,   119,    -1,   120,    -1,   123,    -1,   124,    -1,   125,
+      -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
+      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
+      -1,    93,    -1,    94,    -1,    95,    -1,    96,    -1,    97,
+      -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
+      -1,    89,    -1,    90,    -1,    91,    -1,    92,    -1,    19,
+      -1,    20,    -1,     9,    -1,    10,    -1,    11,    -1,   198,
+     133,    -1,    -1,    33,    -1,    35,    -1,    34,    -1,    36,
+      -1,    38,    -1,    37,    -1,    39,    -1,    41,    -1,    -1,
+     132,    -1,    -1,    37,    -1,    39,    -1,    -1,    33,    -1,
+      34,    -1,    35,    -1,    38,    -1,    -1,    56,    -1,    57,
+      -1,    58,    -1,    59,    -1,    60,    -1,    61,    -1,    55,
+       4,    -1,   110,    -1,   111,    -1,    -1,   165,   164,    -1,
+     130,    -1,   164,    -1,    -1,   167,   166,    -1,    -1,    48,
+       4,    -1,    -1,   134,    48,     4,    -1,    27,    16,    -1,
+      -1,   170,    -1,    -1,   134,   173,   172,    -1,   170,    -1,
+      48,     4,    -1,     9,    -1,    10,    -1,    11,    -1,    12,
+      -1,    40,    -1,   174,    -1,   175,   135,    -1,   210,    -1,
+     136,     4,    -1,   175,   137,   179,   138,   167,    -1,     8,
+     137,   179,   138,   167,    -1,   139,     4,   140,   175,   141,
+      -1,   142,     4,   140,   175,   143,    -1,   144,   180,   145,
+      -1,   144,   145,    -1,   142,   144,   180,   145,   143,    -1,
+     142,   144,   145,   143,    -1,   175,   165,    -1,   175,    -1,
+       8,    -1,   176,    -1,   178,   134,   176,    -1,   178,    -1,
+     178,   134,    30,    -1,    30,    -1,    -1,   175,    -1,   180,
+     134,   175,    -1,   175,   139,   183,   141,    -1,   175,   139,
+     141,    -1,   175,   146,    16,    -1,   175,   142,   183,   143,
+      -1,   175,   144,   183,   145,    -1,   175,   144,   145,    -1,
+     175,   142,   144,   183,   145,   143,    -1,   175,   142,   144,
+     145,   143,    -1,   175,    31,    -1,   175,    32,    -1,   175,
+     210,    -1,   175,   182,    -1,   175,    18,    -1,   155,     3,
+      -1,   155,     4,    -1,     9,    19,    -1,     9,    20,    -1,
+     156,     7,    -1,   151,   137,   181,    29,   175,   138,    -1,
+     108,   137,   181,   221,   138,    -1,   122,   137,   181,   134,
+     181,   134,   181,   138,    -1,   149,   137,   181,   134,   181,
+     138,    -1,   150,   137,   181,   134,   181,   138,    -1,    81,
+     153,   137,   181,   134,   181,   138,    -1,    82,   154,   137,
+     181,   134,   181,   138,    -1,   152,   137,   181,   134,   181,
+     138,    -1,   127,   137,   181,   134,   181,   138,    -1,   128,
+     137,   181,   134,   181,   134,   181,   138,    -1,   129,   137,
+     181,   134,   181,   134,   181,   138,    -1,   183,   134,   181,
+      -1,   181,    -1,    25,    -1,    26,    -1,   186,    -1,    -1,
+     187,    -1,   186,   187,    -1,    -1,    24,   188,   206,    -1,
+      -1,    23,   189,   207,    -1,    53,    52,   193,    -1,    17,
+      -1,   157,    13,   175,    -1,   157,    13,     8,    -1,    -1,
+     157,   160,   184,   181,   190,   172,    -1,    -1,   157,   158,
+     160,   184,   181,   191,   172,    -1,    -1,   157,   159,   160,
+     184,   175,   192,   172,    -1,    42,   195,    -1,    49,   133,
+     196,    -1,    16,    -1,    47,    -1,    46,    -1,    44,   133,
+     194,    -1,    45,   133,     4,    -1,    43,   133,    16,    -1,
+      62,   133,    16,    -1,   139,   197,   141,    -1,   197,   134,
+      16,    -1,    16,    -1,    -1,    14,    -1,    16,    -1,   198,
+      -1,    -1,   200,   134,   175,   165,   199,    -1,   175,   165,
+     199,    -1,   200,    -1,   200,   134,    30,    -1,    30,    -1,
+      -1,   163,   177,   198,   137,   201,   138,   167,   171,   168,
+      -1,    21,    -1,   144,    -1,   162,   160,   202,   203,    -1,
+      22,    -1,   145,    -1,   213,   205,    -1,   161,   160,   202,
+      -1,    -1,    54,    -1,     3,    -1,     4,    -1,     7,    -1,
+      19,    -1,    20,    -1,    31,    -1,    32,    -1,    18,    -1,
+     142,   183,   143,    -1,   182,    -1,    52,   208,    16,   134,
+      16,    -1,   148,    -1,   198,    -1,   210,    -1,   209,    -1,
+     175,   211,    -1,   213,   214,    -1,   204,   214,    -1,   215,
+     157,   216,    -1,   215,   218,    -1,    -1,    15,    -1,    63,
+     212,    -1,    63,     8,    -1,    64,    12,   211,    -1,    64,
+       9,   211,   134,    12,   211,   134,    12,   211,    -1,    65,
+     155,   211,   134,    12,   211,   139,   217,   141,    -1,    65,
+     155,   211,   134,    12,   211,   139,   141,    -1,    66,   163,
+     177,   211,   137,   220,   138,   167,    29,    12,   211,    67,
+      12,   211,    -1,    67,    -1,    68,    -1,   217,   155,   209,
+     134,    12,   211,    -1,   155,   209,   134,    12,   211,    -1,
+     157,   223,    -1,   175,   139,   211,   134,   211,   141,    -1,
+     219,   134,   139,   211,   134,   211,   141,    -1,   175,   211,
+     165,    -1,   220,   134,   175,   211,   165,    -1,    -1,    -1,
+     221,   134,   212,    -1,    51,    50,    -1,    50,    -1,   149,
+     175,   211,   134,   211,    -1,   150,   175,   211,   134,   211,
+      -1,    81,   153,   175,   211,   134,   211,    -1,    82,   154,
+     175,   211,   134,   211,    -1,   152,   212,   134,   212,    -1,
+     151,   212,    29,   175,    -1,   122,   212,   134,   212,   134,
+     212,    -1,   126,   212,   134,   175,    -1,   127,   212,   134,
+     212,    -1,   128,   212,   134,   212,   134,   212,    -1,   129,
+     212,   134,   212,   134,   212,    -1,   121,   219,    -1,   222,
+     163,   177,   211,   137,   220,   138,   167,    -1,   225,    -1,
+      28,    -1,    -1,   103,   175,   169,    -1,   103,   175,   134,
+       9,   211,   169,    -1,   104,   175,   169,    -1,   104,   175,
+     134,     9,   211,   169,    -1,   105,   212,    -1,   224,   106,
+     175,   211,    -1,   224,   107,   212,   134,   175,   211,    -1,
+     108,   175,   211,   221,    -1
+};
 
-static const char * const yytname[] = {   "$","error","$undefined.","ESINT64VAL",
-"EUINT64VAL","SINTVAL","UINTVAL","FPVAL","VOID","INTTYPE","FLOAT","DOUBLE","LABEL",
-"TYPE","VAR_ID","LABELSTR","STRINGCONSTANT","IMPLEMENTATION","ZEROINITIALIZER",
-"TRUETOK","FALSETOK","BEGINTOK","ENDTOK","DECLARE","DEFINE","GLOBAL","CONSTANT",
-"SECTION","VOLATILE","TO","DOTDOTDOT","NULL_TOK","UNDEF","INTERNAL","LINKONCE",
-"WEAK","APPENDING","DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","EXTERNAL",
-"TARGET","TRIPLE","ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL",
-"TAIL","ASM_TOK","MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK",
-"COLDCC_TOK","X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR",
-"SWITCH","INVOKE","UNWIND","UNREACHABLE","ADD","SUB","MUL","UDIV","SDIV","FDIV",
-"UREM","SREM","FREM","AND","OR","XOR","ICMP","FCMP","EQ","NE","SLT","SGT","SLE",
-"SGE","ULT","UGT","ULE","UGE","OEQ","ONE","OLT","OGT","OLE","OGE","ORD","UNO",
-"UEQ","UNE","MALLOC","ALLOCA","FREE","LOAD","STORE","GETELEMENTPTR","TRUNC",
-"ZEXT","SEXT","FPTRUNC","FPEXT","BITCAST","UITOFP","SITOFP","FPTOUI","FPTOSI",
-"INTTOPTR","PTRTOINT","PHI_TOK","SELECT","SHL","LSHR","ASHR","VAARG","EXTRACTELEMENT",
-"INSERTELEMENT","SHUFFLEVECTOR","NORETURN","DEFAULT","HIDDEN","'='","','","'*'",
-"'\\\\'","'('","')'","'['","'x'","']'","'<'","'>'","'{'","'}'","'c'","INTVAL",
-"ArithmeticOps","LogicalOps","CastOps","ShiftOps","IPredicates","FPredicates",
-"IntType","FPType","OptAssign","GVInternalLinkage","GVExternalLinkage","GVVisibilityStyle",
-"FunctionDeclareLinkage","FunctionDefineLinkage","OptCallingConv","ParamAttr",
-"OptParamAttrs","FuncAttr","OptFuncAttrs","OptAlign","OptCAlign","SectionString",
-"OptSection","GlobalVarAttributes","GlobalVarAttribute","PrimType","Types","ArgType",
-"ResultTypes","ArgTypeList","ArgTypeListI","TypeListI","ConstVal","ConstExpr",
-"ConstVector","GlobalType","Module","DefinitionList","Definition","@1","@2",
-"@3","@4","@5","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition",
-"LibList","Name","OptName","ArgListH","ArgList","FunctionHeaderH","BEGIN","FunctionHeader",
-"END","Function","FunctionProto","OptSideEffect","ConstValueRef","SymbolicValueRef",
-"ValueRef","ResolvedVal","BasicBlockList","BasicBlock","InstructionList","BBTerminatorInst",
-"JumpTable","Inst","PHIList","ValueRefList","IndexList","OptTailCall","InstVal",
-"OptVolatile","MemoryInst", NULL
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short int yyrline[] =
+{
+       0,  1031,  1031,  1032,  1042,  1042,  1042,  1042,  1042,  1042,
+    1042,  1042,  1042,  1043,  1043,  1043,  1044,  1044,  1044,  1044,
+    1044,  1044,  1045,  1045,  1045,  1045,  1045,  1045,  1046,  1046,
+    1046,  1048,  1048,  1049,  1049,  1050,  1050,  1051,  1051,  1052,
+    1052,  1056,  1056,  1057,  1057,  1058,  1058,  1059,  1059,  1060,
+    1060,  1061,  1061,  1062,  1062,  1063,  1064,  1069,  1070,  1070,
+    1073,  1077,  1083,  1084,  1085,  1086,  1087,  1091,  1092,  1093,
+    1097,  1098,  1102,  1103,  1104,  1108,  1109,  1110,  1111,  1112,
+    1115,  1116,  1117,  1118,  1119,  1120,  1121,  1122,  1129,  1130,
+    1133,  1134,  1139,  1140,  1143,  1144,  1151,  1152,  1158,  1159,
+    1167,  1175,  1176,  1181,  1182,  1183,  1188,  1201,  1201,  1201,
+    1201,  1204,  1208,  1212,  1219,  1224,  1232,  1250,  1268,  1273,
+    1285,  1295,  1299,  1309,  1316,  1323,  1330,  1335,  1340,  1347,
+    1348,  1355,  1362,  1370,  1375,  1386,  1414,  1430,  1459,  1487,
+    1512,  1531,  1556,  1575,  1587,  1594,  1657,  1667,  1677,  1683,
+    1689,  1694,  1699,  1707,  1719,  1740,  1748,  1754,  1765,  1770,
+    1775,  1784,  1790,  1796,  1805,  1809,  1817,  1817,  1828,  1833,
+    1841,  1842,  1846,  1846,  1850,  1850,  1853,  1856,  1868,  1892,
+    1903,  1903,  1912,  1912,  1920,  1920,  1930,  1933,  1939,  1952,
+    1953,  1955,  1959,  1968,  1972,  1977,  1979,  1984,  1989,  1998,
+    1998,  1999,  1999,  2001,  2011,  2022,  2026,  2035,  2044,  2049,
+    2155,  2155,  2157,  2166,  2166,  2168,  2173,  2185,  2189,  2194,
+    2198,  2202,  2206,  2210,  2214,  2218,  2222,  2226,  2251,  2255,
+    2269,  2273,  2279,  2279,  2285,  2294,  2298,  2307,  2318,  2327,
+    2339,  2352,  2356,  2360,  2365,  2375,  2394,  2403,  2470,  2474,
+    2481,  2492,  2505,  2514,  2525,  2535,  2543,  2551,  2554,  2555,
+    2562,  2566,  2571,  2592,  2609,  2622,  2635,  2644,  2656,  2664,
+    2671,  2677,  2683,  2689,  2704,  2767,  2772,  2776,  2783,  2790,
+    2798,  2805,  2813,  2821,  2835,  2852
 };
 #endif
 
-static const short yyr1[] = {     0,
-   147,   147,   148,   148,   148,   148,   148,   148,   148,   148,
-   148,   149,   149,   149,   150,   150,   150,   150,   150,   150,
-   150,   150,   150,   150,   150,   150,   151,   151,   151,   152,
-   152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-   153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
-   153,   153,   153,   153,   153,   154,   155,   155,   156,   156,
-   157,   157,   157,   157,   157,   158,   158,   158,   159,   159,
-   160,   160,   160,   161,   161,   161,   161,   161,   162,   162,
-   162,   162,   162,   162,   162,   162,   163,   163,   164,   164,
-   165,   165,   166,   166,   167,   167,   168,   168,   169,   170,
-   170,   171,   171,   172,   172,   173,   173,   173,   173,   174,
-   174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
-   174,   174,   175,   176,   176,   177,   177,   178,   178,   178,
-   178,   179,   179,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   181,   181,   181,   181,   181,   181,   181,   181,   181,
-   181,   181,   182,   182,   183,   183,   184,   184,   185,   185,
-   187,   186,   188,   186,   186,   186,   186,   186,   189,   186,
-   190,   186,   191,   186,   186,   186,   192,   193,   193,   194,
-   194,   194,   194,   195,   196,   196,   196,   197,   197,   198,
-   198,   199,   199,   200,   200,   200,   200,   201,   202,   202,
-   203,   204,   204,   205,   206,   207,   207,   208,   208,   208,
-   208,   208,   208,   208,   208,   208,   208,   208,   209,   209,
-   210,   210,   211,   212,   212,   213,   214,   214,   214,   215,
-   215,   215,   215,   215,   215,   215,   215,   215,   216,   216,
-   217,   218,   218,   219,   219,   219,   220,   220,   221,   221,
-   222,   222,   222,   222,   222,   222,   222,   222,   222,   222,
-   222,   222,   222,   222,   223,   223,   224,   224,   224,   224,
-   224,   224,   224,   224
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
+  "UINTVAL", "FPVAL", "VOID", "INTTYPE", "FLOAT", "DOUBLE", "LABEL",
+  "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
+  "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
+  "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
+  "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK",
+  "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
+  "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG",
+  "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT",
+  "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", "COLDCC_TOK",
+  "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR",
+  "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV",
+  "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "ICMP",
+  "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE",
+  "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO", "UEQ",
+  "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR",
+  "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST", "UITOFP",
+  "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
+  "SELECT", "SHL", "LSHR", "ASHR", "VAARG", "EXTRACTELEMENT",
+  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "DEFAULT", "HIDDEN", "'='",
+  "','", "'*'", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'",
+  "'{'", "'}'", "'c'", "$accept", "INTVAL", "ArithmeticOps", "LogicalOps",
+  "CastOps", "ShiftOps", "IPredicates", "FPredicates", "IntType", "FPType",
+  "OptAssign", "GVInternalLinkage", "GVExternalLinkage",
+  "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage",
+  "OptCallingConv", "ParamAttr", "OptParamAttrs", "FuncAttr",
+  "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", "OptSection",
+  "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", "Types",
+  "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", "TypeListI",
+  "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "Module",
+  "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock",
+  "BigOrLittle", "TargetDefinition", "LibrariesDefinition", "LibList",
+  "Name", "OptName", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN",
+  "FunctionHeader", "END", "Function", "FunctionProto", "OptSideEffect",
+  "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal",
+  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst",
+  "JumpTable", "Inst", "PHIList", "ValueRefList", "IndexList",
+  "OptTailCall", "InstVal", "OptVolatile", "MemoryInst", 0
 };
+#endif
 
-static const short yyr2[] = {     0,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
-     1,     1,     1,     1,     1,     1,     1,     1,     0,     1,
-     0,     1,     1,     0,     1,     1,     1,     1,     0,     1,
-     1,     1,     1,     1,     1,     2,     1,     1,     0,     2,
-     1,     1,     0,     2,     0,     2,     0,     3,     2,     0,
-     1,     0,     3,     1,     2,     1,     1,     1,     1,     1,
-     1,     2,     1,     2,     5,     5,     5,     5,     3,     2,
-     5,     4,     2,     1,     1,     1,     3,     1,     3,     1,
-     0,     1,     3,     4,     3,     3,     4,     4,     3,     6,
-     5,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     6,     5,     8,     6,     6,     7,     7,     6,     6,
-     8,     8,     3,     1,     1,     1,     1,     0,     1,     2,
-     0,     3,     0,     3,     3,     1,     3,     3,     0,     6,
-     0,     7,     0,     7,     2,     3,     1,     1,     1,     3,
-     3,     3,     3,     3,     3,     1,     0,     1,     1,     1,
-     0,     5,     3,     1,     3,     1,     0,     9,     1,     1,
-     4,     1,     1,     2,     3,     0,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     3,     1,     5,     1,     1,
-     1,     1,     2,     2,     2,     3,     2,     0,     1,     2,
-     2,     3,     9,     9,     8,    14,     1,     1,     6,     5,
-     2,     6,     7,     3,     5,     0,     0,     3,     2,     1,
-     5,     5,     6,     6,     4,     4,     6,     4,     4,     6,
-     6,     2,     8,     1,     1,     0,     3,     6,     3,     6,
-     2,     4,     6,     4
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short int yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,    61,    44,    42,    92,    40,    41,    91,
+     120,    93,    60,    62,   123,   125,    99
 };
+# endif
 
-static const short yydefact[] = {    60,
-   198,   199,   176,   173,   171,     0,     0,     0,    69,    60,
-   169,     0,    71,    74,     0,     0,     0,     0,   185,     0,
-     0,     0,    61,    63,    62,    64,    66,    65,    67,    68,
-    70,    69,    69,     0,   170,    59,    72,    73,    69,   174,
-    75,    76,    77,    78,    69,   238,   172,   238,     0,     0,
-     0,     0,   197,   186,   187,   175,     1,     2,   178,   106,
-   107,   108,   109,   110,     0,     0,     0,     0,   229,   111,
-   177,   230,   113,     0,     0,   165,   166,     0,    79,    79,
-   239,   235,    60,   212,   213,   214,   234,   192,   189,   188,
-   190,   191,   193,   196,     0,   131,   114,     0,     0,     0,
-     0,   120,   132,     0,   112,   131,     0,     0,   106,   107,
-   108,     0,     0,     0,   179,     0,    80,    81,    82,    83,
-    84,    85,     0,   215,     0,   276,   237,     0,   194,   130,
-    89,   126,   128,     0,     0,     0,     0,     0,     0,   119,
-     0,   181,   183,   149,   150,   147,   148,   151,   146,   142,
-   143,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-    12,    13,    14,     0,     0,     0,    15,    16,    17,    18,
-    19,    20,    21,    22,    23,    24,    25,    26,     0,    27,
-    28,    29,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   145,   144,   102,    86,   125,   124,     0,
-   209,   210,   211,   275,   260,     0,     0,     0,     0,    79,
-   247,   248,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   236,    79,
-   251,     0,   274,   195,   123,     0,    93,     0,     0,   122,
-     0,   133,    93,   102,   102,    30,    31,    32,    33,    34,
-    35,    36,    37,    38,    39,     0,    54,    55,    50,    51,
-    52,    53,    40,    41,    42,    43,    44,    45,    46,    47,
-    48,    49,     0,     0,     0,     0,     0,     0,   135,   164,
-     0,     0,     0,   139,     0,   136,     0,     0,     0,     0,
-     0,   180,     0,   259,   241,     0,   240,     0,     0,    56,
-     0,     0,     0,     0,    97,    97,   281,     0,     0,   272,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    87,    88,    90,   129,   127,   116,   117,   118,
-   121,   115,   182,   184,     0,     0,   257,     0,     0,     0,
-     0,     0,   134,   120,   132,     0,   137,   138,     0,     0,
-     0,     0,     0,     0,   104,   102,   207,   218,   219,   220,
-   225,   221,   222,   223,   224,   216,     0,   227,   232,   231,
-   233,     0,   242,     0,     0,     0,     0,     0,   277,     0,
-   279,   257,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    91,    92,    94,     0,
-     0,     0,     0,     0,     0,     0,   163,   141,     0,     0,
-     0,     0,     0,    99,   105,   103,   206,    89,   204,     0,
-   217,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   284,     0,     0,     0,   268,   269,     0,     0,     0,
-     0,   266,   265,     0,   282,     0,     0,     0,     0,   153,
-     0,     0,     0,     0,   140,     0,     0,     0,     0,   201,
-     0,    93,     0,   226,     0,     0,   256,     0,     0,    97,
-    98,    97,     0,     0,     0,     0,     0,   261,   262,   256,
-     0,     0,     0,   258,     0,   160,     0,     0,   155,   156,
-   152,   159,   200,   203,   205,    89,   100,     0,     0,     0,
-     0,     0,   263,   264,     0,   278,   280,     0,     0,   267,
-   270,   271,     0,   283,   157,   158,     0,     0,     0,   201,
-   101,    95,   228,     0,     0,    89,     0,    93,   252,     0,
-    93,   154,   161,   162,   202,     0,   208,     0,   245,     0,
-     0,   254,     0,     0,   253,   273,    96,   243,     0,   244,
-     0,    89,     0,     0,     0,   255,     0,     0,     0,     0,
-   250,     0,     0,   249,     0,   246,     0,     0,     0
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,   147,   148,   148,   149,   149,   149,   149,   149,   149,
+     149,   149,   149,   150,   150,   150,   151,   151,   151,   151,
+     151,   151,   151,   151,   151,   151,   151,   151,   152,   152,
+     152,   153,   153,   153,   153,   153,   153,   153,   153,   153,
+     153,   154,   154,   154,   154,   154,   154,   154,   154,   154,
+     154,   154,   154,   154,   154,   154,   154,   155,   156,   156,
+     157,   157,   158,   158,   158,   158,   158,   159,   159,   159,
+     160,   160,   161,   161,   161,   162,   162,   162,   162,   162,
+     163,   163,   163,   163,   163,   163,   163,   163,   164,   164,
+     165,   165,   166,   166,   167,   167,   168,   168,   169,   169,
+     170,   171,   171,   172,   172,   173,   173,   174,   174,   174,
+     174,   175,   175,   175,   175,   175,   175,   175,   175,   175,
+     175,   175,   175,   175,   176,   177,   177,   178,   178,   179,
+     179,   179,   179,   180,   180,   181,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+     181,   181,   181,   182,   182,   182,   182,   182,   182,   182,
+     182,   182,   182,   182,   183,   183,   184,   184,   185,   185,
+     186,   186,   188,   187,   189,   187,   187,   187,   187,   187,
+     190,   187,   191,   187,   192,   187,   187,   187,   193,   194,
+     194,   195,   195,   195,   195,   196,   197,   197,   197,   198,
+     198,   199,   199,   200,   200,   201,   201,   201,   201,   202,
+     203,   203,   204,   205,   205,   206,   207,   208,   208,   209,
+     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
+     210,   210,   211,   211,   212,   213,   213,   214,   215,   215,
+     215,   216,   216,   216,   216,   216,   216,   216,   216,   216,
+     217,   217,   218,   219,   219,   220,   220,   220,   221,   221,
+     222,   222,   223,   223,   223,   223,   223,   223,   223,   223,
+     223,   223,   223,   223,   223,   223,   224,   224,   225,   225,
+     225,   225,   225,   225,   225,   225
 };
 
-static const short yydefgoto[] = {    69,
-   190,   191,   192,   193,   256,   273,   112,   113,     9,    32,
-    33,    34,    39,    45,   123,   325,   235,   399,   328,   537,
-   379,   355,   522,   292,   356,    70,   114,   132,   200,   133,
-   134,   104,   280,   368,   281,    78,   567,    10,    11,    14,
-    13,   196,   244,   245,    56,    91,    19,    54,    95,    72,
-   494,   419,   420,   124,   203,    46,    86,    47,    40,   422,
-   369,    73,   371,   297,    48,    82,    83,   229,   541,   127,
-   310,   502,   402,   230,   231,   232,   233
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     1,     0,     1,     1,     0,     1,     1,     1,     1,
+       0,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       0,     2,     1,     1,     0,     2,     0,     2,     0,     3,
+       2,     0,     1,     0,     3,     1,     2,     1,     1,     1,
+       1,     1,     1,     2,     1,     2,     5,     5,     5,     5,
+       3,     2,     5,     4,     2,     1,     1,     1,     3,     1,
+       3,     1,     0,     1,     3,     4,     3,     3,     4,     4,
+       3,     6,     5,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     6,     5,     8,     6,     6,     7,     7,
+       6,     6,     8,     8,     3,     1,     1,     1,     1,     0,
+       1,     2,     0,     3,     0,     3,     3,     1,     3,     3,
+       0,     6,     0,     7,     0,     7,     2,     3,     1,     1,
+       1,     3,     3,     3,     3,     3,     3,     1,     0,     1,
+       1,     1,     0,     5,     3,     1,     3,     1,     0,     9,
+       1,     1,     4,     1,     1,     2,     3,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     1,     5,
+       1,     1,     1,     1,     2,     2,     2,     3,     2,     0,
+       1,     2,     2,     3,     9,     9,     8,    14,     1,     1,
+       6,     5,     2,     6,     7,     3,     5,     0,     0,     3,
+       2,     1,     5,     5,     6,     6,     4,     4,     6,     4,
+       4,     6,     6,     2,     8,     1,     1,     0,     3,     6,
+       3,     6,     2,     4,     6,     4
 };
 
-static const short yypact[] = {   399,
--32768,-32768,-32768,-32768,-32768,    12,   -43,    -5,    66,   525,
--32768,    47,   142,   122,    58,    63,    82,    88,-32768,   -33,
-   119,   789,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   -13,   -13,   222,-32768,-32768,-32768,-32768,   -13,-32768,
--32768,-32768,-32768,-32768,   -13,   123,-32768,    -6,   208,   218,
-   223,   224,   243,-32768,-32768,-32768,-32768,-32768,   124,-32768,
--32768,-32768,-32768,-32768,   267,   276,     8,    23,-32768,-32768,
-   121,-32768,-32768,   222,   222,-32768,-32768,  1043,   129,   129,
--32768,-32768,   239,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,   -45,   547,-32768,   143,   147,   118,
-   124,-32768,   121,   -94,-32768,   547,  1043,  1127,    42,   284,
-   285,   263,   286,   600,-32768,   290,-32768,-32768,-32768,-32768,
--32768,-32768,  1140,-32768,    -8,  1278,-32768,   279,-32768,-32768,
-   121,-32768,   162,   159,  1127,  1127,   156,   -70,  1127,-32768,
-   167,-32768,   121,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,   536,   499,   172,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   175,-32768,
--32768,-32768,   176,   178,   179,   691,  1183,   137,   302,   182,
-   183,   186,   190,-32768,-32768,   166,-32768,   124,   121,   239,
--32768,-32768,-32768,-32768,-32768,   251,  1195,    56,   319,   129,
--32768,-32768,   536,   499,  1127,  1127,  1127,  1127,  1127,  1127,
-  1127,  1127,  1127,  1127,  1127,  1127,  1127,  1127,-32768,   129,
--32768,   163,-32768,-32768,   164,   772,-32768,    41,   -27,-32768,
-   187,   121,-32768,   166,   166,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   192,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,   194,  1043,  1043,  1043,  1043,  1043,-32768,-32768,
-    20,   498,   -91,-32768,   -67,-32768,  1043,  1043,  1043,  1043,
-   -12,-32768,   195,-32768,   124,   744,-32768,   871,   871,-32768,
-   871,  1140,  1127,  1127,   -17,    29,-32768,   744,    60,   200,
-   201,   202,   203,   204,   205,   744,   744,   311,   207,  1140,
-  1127,  1127,-32768,-32768,-32768,-32768,-32768,   -86,-32768,-32768,
--32768,   -86,-32768,-32768,  1043,  1043,-32768,   210,   215,   216,
-   217,  1043,-32768,   199,   600,   -50,-32768,-32768,   220,   225,
-   328,   226,   346,   359,-32768,   166,  1026,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   310,  1043,-32768,-32768,-32768,
--32768,   231,-32768,   232,   871,   744,   744,     2,-32768,     5,
--32768,-32768,   871,   230,  1127,  1127,  1127,  1127,  1127,   236,
-   242,  1127,  1127,   871,   744,   246,-32768,-32768,-32768,   247,
-   248,     6,  1043,  1043,  1043,  1043,-32768,-32768,   234,  1043,
-  1043,  1127,  1043,-32768,-32768,-32768,-32768,   121,   249,   250,
--32768,   368,   -46,   373,   374,   254,   253,   260,   871,   393,
-   871,   269,   271,   871,   272,   121,-32768,   273,   275,   871,
-   871,   121,-32768,   277,-32768,  1127,  1043,  1043,  1127,-32768,
-   278,   280,   283,   287,-32768,   288,   293,   114,   295,     3,
-  1089,-32768,   291,-32768,   871,   871,  1127,   871,   871,   300,
--32768,   300,   871,   303,  1127,  1127,  1127,-32768,-32768,  1127,
-   744,   301,   304,-32768,  1043,-32768,  1043,  1043,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   121,    64,   394,   306,   299,
-   744,    35,-32768,-32768,   376,-32768,-32768,   305,   871,-32768,
--32768,-32768,   112,-32768,-32768,-32768,   307,   312,   313,     3,
--32768,   395,-32768,   432,    -4,-32768,  1127,-32768,-32768,   308,
--32768,-32768,-32768,-32768,-32768,   450,-32768,   871,-32768,   998,
-     9,   164,   744,     1,-32768,   -86,-32768,-32768,   321,-32768,
-   998,-32768,   444,   445,   324,   164,   871,   871,   447,   397,
--32768,   871,   455,-32768,   871,-32768,   468,   469,-32768
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned short int yydefact[] =
+{
+      61,   199,   200,   177,   174,   172,     0,     0,     0,    70,
+       0,    61,   170,     0,    72,    75,     0,     0,     0,     0,
+     186,     0,     0,     0,    62,    64,    63,    65,    67,    66,
+      68,    69,    71,    70,    70,     0,     1,   171,    60,    73,
+      74,    70,   175,    76,    77,    78,    79,    70,   239,   173,
+     239,     0,     0,     0,     0,   198,   187,   188,   176,     2,
+       3,   179,   107,   108,   109,   110,   111,     0,     0,     0,
+       0,   230,   112,   178,   231,   114,     0,     0,   166,   167,
+       0,    80,    80,   240,   236,    61,   213,   214,   215,   235,
+     193,   190,   189,   191,   192,   194,   197,     0,   132,   115,
+       0,     0,     0,     0,   121,   133,     0,   113,   132,     0,
+       0,   107,   108,   109,     0,     0,     0,   180,     0,    81,
+      82,    83,    84,    85,    86,     0,   216,     0,   277,   238,
+       0,   195,   131,    90,   127,   129,     0,     0,     0,     0,
+       0,     0,   120,     0,   182,   184,   150,   151,   148,   149,
+     152,   147,   143,   144,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,     0,     0,     0,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,     0,    28,    29,    30,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   146,   145,   103,    87,
+     126,   125,     0,   210,   211,   212,   276,   261,     0,     0,
+       0,     0,    80,   248,   249,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   237,    80,   252,     0,   275,   196,   124,     0,    94,
+       0,     0,   123,     0,   134,    94,   103,   103,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,     0,    55,
+      56,    51,    52,    53,    54,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,     0,     0,     0,     0,     0,
+       0,   136,   165,     0,     0,     0,   140,     0,   137,     0,
+       0,     0,     0,     0,   181,     0,   260,   242,     0,   241,
+       0,     0,    57,     0,     0,     0,     0,    98,    98,   282,
+       0,     0,   273,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    88,    89,    91,   130,   128,
+     117,   118,   119,   122,   116,   183,   185,     0,     0,   258,
+       0,     0,     0,     0,     0,   135,   121,   133,     0,   138,
+     139,     0,     0,     0,     0,     0,     0,   105,   103,   208,
+     219,   220,   221,   226,   222,   223,   224,   225,   217,     0,
+     228,   233,   232,   234,     0,   243,     0,     0,     0,     0,
+       0,   278,     0,   280,   258,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    92,
+      93,    95,     0,     0,     0,     0,     0,     0,     0,   164,
+     142,     0,     0,     0,     0,     0,   100,   106,   104,   207,
+      90,   205,     0,   218,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   285,     0,     0,     0,   269,   270,
+       0,     0,     0,     0,   267,   266,     0,   283,     0,     0,
+       0,     0,   154,     0,     0,     0,     0,   141,     0,     0,
+       0,     0,   202,     0,    94,     0,   227,     0,     0,   257,
+       0,     0,    98,    99,    98,     0,     0,     0,     0,     0,
+     262,   263,   257,     0,     0,     0,   259,     0,   161,     0,
+       0,   156,   157,   153,   160,   201,   204,   206,    90,   101,
+       0,     0,     0,     0,     0,   264,   265,     0,   279,   281,
+       0,     0,   268,   271,   272,     0,   284,   158,   159,     0,
+       0,     0,   202,   102,    96,   229,     0,     0,    90,     0,
+      94,   253,     0,    94,   155,   162,   163,   203,     0,   209,
+       0,   246,     0,     0,   255,     0,     0,   254,   274,    97,
+     244,     0,   245,     0,    90,     0,     0,     0,   256,     0,
+       0,     0,     0,   251,     0,     0,   250,     0,   247
 };
 
-static const short yypgoto[] = {-32768,
-   345,   347,   348,   349,   259,   262,  -208,-32768,   398,-32768,
--32768,    48,-32768,-32768,  -172,  -305,  -411,-32768,  -217,-32768,
-  -300,   -20,-32768,  -223,-32768,-32768,   -14,   252,  -260,-32768,
-   377,   382,   -58,  -112,  -184,   211,-32768,-32768,   477,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,     0,
-   -30,-32768,-32768,   411,-32768,-32768,-32768,-32768,-32768,-32768,
-  -492,   -73,   103,  -151,-32768,   446,-32768,-32768,-32768,-32768,
--32768,    13,   113,-32768,-32768,-32768,-32768
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short int yydefgoto[] =
+{
+      -1,    71,   192,   193,   194,   195,   258,   275,   114,   115,
+       9,    33,    34,    35,    41,    47,   125,   327,   237,   401,
+     330,   539,   381,   357,   524,   294,   358,    72,   116,   134,
+     202,   135,   136,   106,   282,   370,   283,    80,    10,    11,
+      12,    15,    14,   198,   246,   247,    58,    93,    20,    56,
+      97,    74,   496,   421,   422,   126,   205,    48,    88,    49,
+      42,   424,   371,    75,   373,   299,    50,    84,    85,   231,
+     543,   129,   312,   504,   404,   232,   233,   234,   235
 };
 
-
-#define	YYLAST		1407
-
-
-static const short yytable[] = {    12,
-   301,   194,   283,   285,   300,   381,   460,    71,    81,    12,
-   429,    99,   201,   431,   353,    84,     1,   300,     2,   115,
-   333,   334,   398,   323,   324,   332,   398,    57,    58,   553,
-   101,    60,    61,    62,    63,   354,     1,   302,     2,   139,
-   195,   375,   342,   397,   -56,   -56,    21,   549,   142,   430,
-   140,   347,   430,   103,    15,    16,    17,   320,   555,   394,
-   144,   145,    64,   139,   298,   307,   342,   299,   311,   312,
-   313,   314,   315,    18,   241,   318,   319,   348,    22,    74,
-    75,   131,    12,   342,   520,   103,    79,   342,   128,    20,
-   353,   131,    80,   143,   409,   129,   464,   346,    23,    24,
-    25,    26,    27,    28,    29,    53,    30,   105,   199,   106,
-   323,   324,   323,   324,   542,   330,   378,   105,    31,   106,
-   238,   239,    57,    58,   242,   101,    60,    61,    62,    63,
-   397,     1,   416,     2,    55,   202,   539,    81,    85,   449,
-   556,    57,    58,   450,   101,   109,   110,   111,    63,   550,
-     1,   100,     2,   342,    41,    42,    43,    64,    65,    44,
-   343,    66,   380,   105,    67,   106,    68,   102,   527,   506,
-   396,   507,   528,   323,   324,   105,    64,   106,    37,    36,
-    38,   329,   423,   116,   117,   118,   119,   120,   121,   122,
-    49,   398,   296,   397,   105,    50,   106,    31,   383,   293,
-   305,   306,   296,   308,   309,   296,   296,   296,   296,   296,
-   316,   317,   296,   296,    51,   337,   338,   339,   340,   341,
-    52,   131,   370,    88,   370,   370,    92,   370,   349,   350,
-   351,   352,   194,   435,   370,   437,   438,   439,   398,    93,
-   398,   443,   370,   370,   497,   527,    76,    77,   105,   531,
-   106,   491,     1,    65,     2,   105,    66,   106,    94,    67,
-    96,    68,   137,    89,    90,   146,   147,   345,   321,   322,
-    97,   195,    65,   323,   324,    66,   400,   401,    67,    98,
-    68,   284,   135,   407,   107,   108,   136,   199,   376,   377,
-   -57,   -58,   148,   197,   234,   236,   237,   484,   240,   291,
-   294,   370,   370,   370,   243,   199,   395,   296,   274,   370,
-   544,   275,   276,   546,   277,   278,   540,   286,   287,   288,
-   370,   370,   289,   510,   511,   512,   290,   300,   335,   331,
-   336,   357,   551,   384,   385,   386,   387,   388,   389,   392,
-   393,   408,   418,   403,   451,   452,   453,   454,   404,   405,
-   406,   456,   457,   410,   459,   370,   412,   370,   411,   413,
-   370,   414,   415,   421,   424,   425,   370,   370,   434,   440,
-   296,   436,   296,   296,   296,   441,   455,   442,   296,   446,
-   447,   448,   461,   463,   465,   466,   468,   462,   482,   483,
-   467,   370,   370,   469,   370,   370,   471,   458,  -168,   370,
-   372,   373,   449,   374,   473,   475,   476,   370,   477,   523,
-   382,   485,     1,   480,     2,     3,   487,   486,   390,   391,
-   488,     4,     5,   430,   498,   489,   517,   370,   518,   519,
-   490,   481,   492,   505,   296,   370,   509,   525,   515,   524,
-     6,   516,   536,   538,   532,   529,   496,     7,   545,   533,
-   534,     8,   501,   547,   554,   557,   558,   559,   562,   493,
-   296,   296,   296,   563,   370,   501,   565,   568,   569,   370,
-   225,   303,   226,   227,   228,   304,   521,   426,   427,   428,
-   126,   138,   141,   370,   370,   433,    35,   327,   370,   535,
-   125,   370,   513,    87,   432,     0,   444,   445,     0,     0,
-     0,     0,    57,    58,     0,   101,   109,   110,   111,    63,
-     0,     1,   543,     2,     0,     0,     0,   257,   258,   493,
-     0,     0,     0,     0,  -167,     0,     0,     0,     0,     0,
-     0,   470,     0,   472,     0,     0,   474,    64,     1,     0,
-     2,     3,   478,   479,     0,     0,     0,     4,     5,     0,
-     0,    57,    58,     0,   101,    60,    61,    62,    63,     0,
-     1,     0,     2,     0,     0,     0,     6,   499,   500,     0,
-   503,   504,     0,     7,     0,   508,   130,     8,     0,     0,
-     0,     0,     0,   514,     0,     0,    64,   259,   260,   261,
-   262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-   272,     0,     0,   526,    57,    58,     0,     0,     0,     0,
-     0,   530,     0,     1,     0,     2,     0,   149,   246,   247,
-   248,   249,   250,   251,   252,   253,   254,   255,     0,     0,
-   150,   151,     0,    65,     0,     0,    66,     0,     0,    67,
-   548,    68,   344,     0,     0,   552,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   560,
-   561,     0,     0,     0,   564,     0,     0,   566,   152,   153,
-   154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-   164,   165,    65,     0,     0,    66,     0,     0,    67,     0,
-    68,     0,     0,     0,     0,    57,    58,     0,   101,   109,
-   110,   111,    63,     0,     1,     0,     2,   166,   167,   168,
-   169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     0,   179,   180,   181,   182,     0,   183,   184,   185,     0,
-    64,     0,     0,     0,   105,     0,   106,     0,   186,     0,
-     0,   187,     0,   188,     0,   189,   358,   359,    57,    58,
-   360,     0,     0,     0,     0,     0,     0,     1,     0,     2,
-     0,   361,   362,   363,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   364,   365,    57,    58,     0,   101,
-    60,    61,    62,    63,     0,     1,     0,     2,     0,     0,
-     0,     0,     0,    57,    58,   366,    59,    60,    61,    62,
-    63,   326,     1,     0,     2,     0,     0,     0,     0,     0,
-     0,    64,   152,   153,   154,   155,   156,   157,   158,   159,
-   160,   161,   162,   163,   164,   165,    65,     0,    64,    66,
-     0,   279,    67,     0,    68,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-   175,   176,   177,   178,     0,   179,   180,   181,   182,     0,
-   183,   184,   185,   358,   359,    57,    58,   360,   105,     0,
-   106,     0,     0,     0,     1,   367,     2,     0,   361,   362,
-   363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   364,   365,     0,     0,     0,     0,    65,     0,     0,
-    66,     0,     0,    67,     0,    68,     0,     0,     0,     0,
-     0,     0,   366,     0,    65,     0,     0,    66,     0,     0,
-    67,     0,    68,     0,     0,     0,     0,     0,     0,   152,
-   153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-   163,   164,   165,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   166,   167,
-   168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-   178,     0,   179,   180,   181,   182,     0,   183,   184,   185,
-   358,   359,     0,     0,   360,     0,     0,     0,     0,     0,
-     0,     0,   367,     0,     0,   361,   362,   363,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   364,   365,
-    57,    58,     0,   101,    60,    61,    62,    63,     0,     1,
-     0,     2,     0,     0,     0,     0,     0,    57,    58,   366,
-   101,   109,   110,   111,    63,   417,     1,     0,     2,     0,
-     0,     0,     0,     0,     0,    64,   152,   153,   154,   155,
-   156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     0,     0,    64,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    57,    58,     0,   101,    60,    61,    62,
-    63,     0,     1,     0,     2,   166,   167,   168,   169,   170,
-   171,   172,   173,   174,   175,   176,   177,   178,   495,   179,
-   180,   181,   182,     0,   183,   184,   185,     0,    64,     0,
-     0,    57,    58,     0,   101,    60,    61,    62,    63,   367,
-     1,     0,     2,     0,    57,    58,     0,   198,    60,    61,
-    62,    63,     0,     1,     0,     2,     0,     0,     0,     0,
-     0,    65,     0,     0,    66,     0,    64,    67,     0,    68,
-     0,     0,     0,     0,     0,     0,     0,     0,    65,    64,
-     0,    66,     0,     0,    67,     0,    68,    57,    58,     0,
-   101,   109,   110,   111,    63,     0,     1,     0,     2,    57,
-    58,     0,   295,    60,    61,    62,    63,     0,     1,     0,
-     2,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    64,     0,    65,     0,     0,    66,     0,     0,
-    67,     0,    68,     0,    64,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    65,     0,     0,    66,     0,     0,    67,     0,
-    68,     0,     0,     0,     0,    65,     0,     0,    66,     0,
-     0,    67,     0,    68,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   204,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    65,     0,
-     0,    66,     0,     0,    67,     0,   282,   205,   206,     0,
-    65,     0,     0,    66,     0,     0,    67,     0,    68,     0,
-   207,   208,   209,   210,   211,   212,   152,   153,   154,   155,
-   156,   157,   158,   159,   160,   161,   162,   163,   213,   214,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   215,   216,   217,     0,     0,   218,   167,   168,   169,   170,
-   171,   172,   173,   174,   175,   176,   177,   178,   219,   220,
-   180,   181,   182,   221,   222,   223,   224
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -413
+static const short int yypact[] =
+{
+     401,  -413,  -413,  -413,  -413,  -413,   110,  -107,    30,    67,
+      77,   527,  -413,   -43,     2,   238,   -16,     8,    47,    84,
+    -413,    -4,   132,   791,  -413,  -413,  -413,  -413,  -413,  -413,
+    -413,  -413,  -413,    91,    91,   149,  -413,  -413,  -413,  -413,
+    -413,    91,  -413,  -413,  -413,  -413,  -413,    91,   147,  -413,
+      20,   210,   208,   280,   226,   273,  -413,  -413,  -413,  -413,
+    -413,   160,  -413,  -413,  -413,  -413,  -413,   295,   299,     3,
+       7,  -413,  -413,   140,  -413,  -413,   149,   149,  -413,  -413,
+     954,   192,   192,  -413,  -413,   184,  -413,  -413,  -413,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,   -65,   549,  -413,
+     167,   171,    22,   160,  -413,   140,   -81,  -413,   549,   954,
+    1045,    95,   311,   312,   284,   313,   602,  -413,   317,  -413,
+    -413,  -413,  -413,  -413,  -413,  1125,  -413,    -7,  1228,  -413,
+     306,  -413,  -413,   140,  -413,   191,   193,  1045,  1045,   186,
+     -64,  1045,  -413,   194,  -413,   140,  -413,  -413,  -413,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,   251,   501,   207,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,
+    -413,   209,  -413,  -413,  -413,   214,   215,   216,    49,  1138,
+     120,   314,   219,   222,   224,   225,  -413,  -413,   230,  -413,
+     160,   140,   184,  -413,  -413,  -413,  -413,  -413,   315,  1185,
+     175,   357,   192,  -413,  -413,   251,   501,  1045,  1045,  1045,
+    1045,  1045,  1045,  1045,  1045,  1045,  1045,  1045,  1045,  1045,
+    1045,  -413,   192,  -413,   195,  -413,  -413,   203,   693,  -413,
+     126,    46,  -413,   228,   140,  -413,   230,   230,  -413,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,   231,  -413,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,
+    -413,  -413,  -413,  -413,  -413,   235,   954,   954,   954,   954,
+     954,  -413,  -413,    29,   500,   -24,  -413,   -27,  -413,   954,
+     954,   954,   954,    39,  -413,   241,  -413,   160,   746,  -413,
+     873,   873,  -413,   873,  1125,  1045,  1045,   123,   159,  -413,
+     746,   146,   233,   245,   248,   249,   250,   252,   746,   746,
+     356,   253,  1125,  1045,  1045,  -413,  -413,  -413,  -413,  -413,
+     -18,  -413,  -413,  -413,   -18,  -413,  -413,   954,   954,  -413,
+     254,   255,   256,   259,   954,  -413,   262,   602,   -12,  -413,
+    -413,   265,   274,   367,   275,   391,   407,  -413,   230,   774,
+    -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,   358,   954,
+    -413,  -413,  -413,  -413,   282,  -413,   285,   873,   746,   746,
+      35,  -413,    43,  -413,  -413,   873,   281,  1045,  1045,  1045,
+    1045,  1045,   289,   292,  1045,  1045,   873,   746,   293,  -413,
+    -413,  -413,   294,   301,   -25,   954,   954,   954,   954,  -413,
+    -413,   271,   954,   954,  1045,   954,  -413,  -413,  -413,  -413,
+     140,   302,   303,  -413,   417,    25,   427,   428,   305,   310,
+     318,   873,   441,   873,   319,   322,   873,   323,   140,  -413,
+     324,   325,   873,   873,   140,  -413,   309,  -413,  1045,   954,
+     954,  1045,  -413,   326,   328,   327,   335,  -413,   332,   333,
+     131,   336,    34,  1028,  -413,   339,  -413,   873,   873,  1045,
+     873,   873,   341,  -413,   341,   873,   342,  1045,  1045,  1045,
+    -413,  -413,  1045,   746,   340,   345,  -413,   954,  -413,   954,
+     954,  -413,  -413,  -413,  -413,  -413,  -413,  -413,   140,    10,
+     431,   343,   346,   746,    63,  -413,  -413,   400,  -413,  -413,
+     338,   873,  -413,  -413,  -413,   144,  -413,  -413,  -413,   351,
+     352,   354,    34,  -413,   403,  -413,   472,    -3,  -413,  1045,
+    -413,  -413,   355,  -413,  -413,  -413,  -413,  -413,   489,  -413,
+     873,  -413,  1000,    15,   203,   746,    66,  -413,   -18,  -413,
+    -413,   361,  -413,  1000,  -413,   485,   486,   368,   203,   873,
+     873,   491,   434,  -413,   873,   492,  -413,   873,  -413
 };
 
-static const short yycheck[] = {     0,
-   209,   114,   187,   188,     9,   306,   418,    22,    15,    10,
-     9,     4,    21,     9,    27,    22,    14,     9,    16,    78,
-   244,   245,   328,   110,   111,   243,   332,     5,     6,    29,
-     8,     9,    10,    11,    12,    48,    14,   210,    16,   134,
-   114,   302,   134,   130,     3,     4,    52,   540,   107,    48,
-   145,   143,    48,    68,    43,    44,    45,   230,   551,   320,
-    19,    20,    40,   134,     9,   217,   134,    12,   220,   221,
-   222,   223,   224,    62,   145,   227,   228,   145,    13,    32,
-    33,    96,    83,   134,   496,   100,    39,   134,   134,   133,
-    27,   106,    45,   108,   145,   141,   143,   282,    33,    34,
-    35,    36,    37,    38,    39,   139,    41,   135,   123,   137,
-   110,   111,   110,   111,   526,   143,   134,   135,   132,   137,
-   135,   136,     5,     6,   139,     8,     9,    10,    11,    12,
-   130,    14,   356,    16,    16,   144,   141,    15,   145,   134,
-   552,     5,     6,   138,     8,     9,    10,    11,    12,   141,
-    14,   144,    16,   134,    33,    34,    35,    40,   136,    38,
-   141,   139,   134,   135,   142,   137,   144,   145,   134,   470,
-   322,   472,   138,   110,   111,   135,    40,   137,    37,   133,
-    39,   141,   367,    55,    56,    57,    58,    59,    60,    61,
-   133,   497,   207,   130,   135,   133,   137,   132,   139,   200,
-   215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-   225,   226,   227,   228,   133,   274,   275,   276,   277,   278,
-   133,   236,   296,    16,   298,   299,     4,   301,   287,   288,
-   289,   290,   345,   385,   308,   387,   388,   389,   544,    16,
-   546,   393,   316,   317,   462,   134,    25,    26,   135,   138,
-   137,   138,    14,   136,    16,   135,   139,   137,    16,   142,
-   137,   144,   145,    46,    47,     3,     4,   282,   106,   107,
-     4,   345,   136,   110,   111,   139,   335,   336,   142,     4,
-   144,   145,   140,   342,    74,    75,   140,   302,   303,   304,
-     7,     7,     7,     4,    16,   134,   138,   449,   143,   134,
-    50,   375,   376,   377,   138,   320,   321,   322,   137,   383,
-   528,   137,   137,   531,   137,   137,   525,    16,   137,   137,
-   394,   395,   137,   475,   476,   477,   137,     9,   137,   143,
-   137,   137,   541,   134,   134,   134,   134,   134,   134,    29,
-   134,   143,   357,   134,   403,   404,   405,   406,   134,   134,
-   134,   410,   411,   134,   413,   429,    29,   431,   134,   134,
-   434,    16,     4,    54,   134,   134,   440,   441,   139,   134,
-   385,   386,   387,   388,   389,   134,   143,   392,   393,   134,
-   134,   134,   134,    16,    12,    12,   134,   138,   447,   448,
-   137,   465,   466,   134,   468,   469,     4,   412,     0,   473,
-   298,   299,   134,   301,   134,   134,   134,   481,   134,    16,
-   308,   134,    14,   137,    16,    17,   134,   138,   316,   317,
-   134,    23,    24,    48,   134,   138,   485,   501,   487,   488,
-   138,   446,   138,   134,   449,   509,   134,   139,   138,   134,
-    42,   138,    48,    12,   138,   141,   461,    49,   141,   138,
-   138,    53,   467,     4,   134,    12,    12,   134,    12,   460,
-   475,   476,   477,    67,   538,   480,    12,     0,     0,   543,
-   126,   213,   126,   126,   126,   214,   497,   375,   376,   377,
-    83,   100,   106,   557,   558,   383,    10,   236,   562,   520,
-    80,   565,   480,    48,   382,    -1,   394,   395,    -1,    -1,
-    -1,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-    -1,    14,   527,    16,    -1,    -1,    -1,    19,    20,   520,
-    -1,    -1,    -1,    -1,     0,    -1,    -1,    -1,    -1,    -1,
-    -1,   429,    -1,   431,    -1,    -1,   434,    40,    14,    -1,
-    16,    17,   440,   441,    -1,    -1,    -1,    23,    24,    -1,
-    -1,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-    14,    -1,    16,    -1,    -1,    -1,    42,   465,   466,    -1,
-   468,   469,    -1,    49,    -1,   473,    30,    53,    -1,    -1,
-    -1,    -1,    -1,   481,    -1,    -1,    40,    89,    90,    91,
-    92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-   102,    -1,    -1,   501,     5,     6,    -1,    -1,    -1,    -1,
-    -1,   509,    -1,    14,    -1,    16,    -1,    18,    83,    84,
-    85,    86,    87,    88,    89,    90,    91,    92,    -1,    -1,
-    31,    32,    -1,   136,    -1,    -1,   139,    -1,    -1,   142,
-   538,   144,   145,    -1,    -1,   543,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   557,
-   558,    -1,    -1,    -1,   562,    -1,    -1,   565,    69,    70,
-    71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-    81,    82,   136,    -1,    -1,   139,    -1,    -1,   142,    -1,
-   144,    -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,
-    10,    11,    12,    -1,    14,    -1,    16,   108,   109,   110,
-   111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-    -1,   122,   123,   124,   125,    -1,   127,   128,   129,    -1,
-    40,    -1,    -1,    -1,   135,    -1,   137,    -1,   139,    -1,
-    -1,   142,    -1,   144,    -1,   146,     3,     4,     5,     6,
-     7,    -1,    -1,    -1,    -1,    -1,    -1,    14,    -1,    16,
-    -1,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    31,    32,     5,     6,    -1,     8,
-     9,    10,    11,    12,    -1,    14,    -1,    16,    -1,    -1,
-    -1,    -1,    -1,     5,     6,    52,     8,     9,    10,    11,
-    12,    30,    14,    -1,    16,    -1,    -1,    -1,    -1,    -1,
-    -1,    40,    69,    70,    71,    72,    73,    74,    75,    76,
-    77,    78,    79,    80,    81,    82,   136,    -1,    40,   139,
-    -1,   141,   142,    -1,   144,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-   117,   118,   119,   120,    -1,   122,   123,   124,   125,    -1,
-   127,   128,   129,     3,     4,     5,     6,     7,   135,    -1,
-   137,    -1,    -1,    -1,    14,   142,    16,    -1,    18,    19,
-    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    31,    32,    -1,    -1,    -1,    -1,   136,    -1,    -1,
-   139,    -1,    -1,   142,    -1,   144,    -1,    -1,    -1,    -1,
-    -1,    -1,    52,    -1,   136,    -1,    -1,   139,    -1,    -1,
-   142,    -1,   144,    -1,    -1,    -1,    -1,    -1,    -1,    69,
-    70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-    80,    81,    82,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,   109,
-   110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-   120,    -1,   122,   123,   124,   125,    -1,   127,   128,   129,
-     3,     4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,   142,    -1,    -1,    18,    19,    20,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
-     5,     6,    -1,     8,     9,    10,    11,    12,    -1,    14,
-    -1,    16,    -1,    -1,    -1,    -1,    -1,     5,     6,    52,
-     8,     9,    10,    11,    12,    30,    14,    -1,    16,    -1,
-    -1,    -1,    -1,    -1,    -1,    40,    69,    70,    71,    72,
-    73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,    11,
-    12,    -1,    14,    -1,    16,   108,   109,   110,   111,   112,
-   113,   114,   115,   116,   117,   118,   119,   120,    30,   122,
-   123,   124,   125,    -1,   127,   128,   129,    -1,    40,    -1,
-    -1,     5,     6,    -1,     8,     9,    10,    11,    12,   142,
-    14,    -1,    16,    -1,     5,     6,    -1,     8,     9,    10,
-    11,    12,    -1,    14,    -1,    16,    -1,    -1,    -1,    -1,
-    -1,   136,    -1,    -1,   139,    -1,    40,   142,    -1,   144,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,    40,
-    -1,   139,    -1,    -1,   142,    -1,   144,     5,     6,    -1,
-     8,     9,    10,    11,    12,    -1,    14,    -1,    16,     5,
-     6,    -1,     8,     9,    10,    11,    12,    -1,    14,    -1,
-    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    40,    -1,   136,    -1,    -1,   139,    -1,    -1,
-   142,    -1,   144,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,   136,    -1,    -1,   139,    -1,    -1,   142,    -1,
-   144,    -1,    -1,    -1,    -1,   136,    -1,    -1,   139,    -1,
-    -1,   142,    -1,   144,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    28,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,    -1,
-    -1,   139,    -1,    -1,   142,    -1,   144,    50,    51,    -1,
-   136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,    -1,
-    63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   103,   104,   105,    -1,    -1,   108,   109,   110,   111,   112,
-   113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-   123,   124,   125,   126,   127,   128,   129
+/* YYPGOTO[NTERM-NUM].  */
+static const short int yypgoto[] =
+{
+    -413,  -413,   379,   385,   389,   390,   304,   307,  -210,  -413,
+     439,  -413,  -413,   145,  -413,  -413,  -192,  -305,  -412,  -413,
+    -235,  -413,  -303,    26,  -413,  -201,  -413,  -413,   -14,   288,
+    -255,  -413,   420,   429,   -58,  -112,  -187,   239,  -413,  -413,
+     518,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,  -413,
+    -413,     0,    11,  -413,  -413,   448,  -413,  -413,  -413,  -413,
+    -413,  -413,  -403,   -73,   103,  -151,  -413,   482,  -413,  -413,
+    -413,  -413,  -413,    53,   153,  -413,  -413,  -413,  -413
 };
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -170
+static const short int yytable[] =
+{
+      13,   303,   285,   287,   196,   383,   302,   101,   462,    73,
+     334,    13,    59,    60,   203,   103,    62,    63,    64,    65,
+     304,     1,   117,     2,   302,   400,    21,    59,    60,   400,
+     103,    62,    63,    64,    65,    83,     1,   355,     2,    39,
+     322,    40,    86,   197,   431,   335,   336,    66,     1,   377,
+       2,   144,   433,   141,    59,    60,   105,   103,   111,   112,
+     113,    65,    66,     1,   142,     2,   355,   396,   309,   130,
+     141,   313,   314,   315,   316,   317,   131,    36,   320,   321,
+      23,   243,    22,   432,   133,    13,   522,   356,   105,    66,
+      38,   432,   325,   326,   133,   555,   145,   348,   -57,   -57,
+      24,    25,    26,    27,    28,    29,    30,   344,    31,   451,
+     344,   201,   399,   452,   146,   147,   544,    51,   350,   349,
+     325,   326,   344,   240,   241,    59,    60,   244,   103,   111,
+     112,   113,    65,   411,     1,    55,     2,   204,   541,   551,
+     399,    52,   558,    67,   325,   326,    68,   102,    57,    69,
+     557,    70,   104,    16,    17,    18,   552,   418,    67,   344,
+      66,    68,    83,   344,    69,    87,    70,   139,   466,   508,
+     345,   509,    19,   398,    78,    79,   325,   326,    76,    77,
+      53,   107,   425,   108,   300,    67,    81,   301,    68,   332,
+     281,    69,    82,    70,   400,   298,   399,   529,     1,    32,
+       2,   530,   295,   307,   308,   298,   310,   311,   298,   298,
+     298,   298,   298,   318,   319,   298,   298,    54,   339,   340,
+     341,   342,   343,    32,   133,   372,    90,   372,   372,   499,
+     372,   351,   352,   353,   354,   196,   437,   372,   439,   440,
+     441,   400,    95,   400,   445,   372,   372,   118,   119,   120,
+     121,   122,   123,   124,    91,    92,    67,   380,   107,    68,
+     108,   107,    69,   108,    70,   286,   107,   331,   108,   493,
+     347,    43,    44,    45,   197,   107,    46,   108,   529,   402,
+     403,   107,   533,   108,    94,   385,   409,   148,   149,    96,
+     201,   378,   379,   382,   107,   546,   108,    98,   548,    99,
+     486,   323,   324,   100,   372,   372,   372,   137,   201,   397,
+     298,   138,   372,   325,   326,   109,   110,   542,   -58,   -59,
+     150,   199,   236,   372,   372,   238,   512,   513,   514,   242,
+     288,   239,   245,   553,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   276,   420,   277,   453,   454,   455,
+     456,   278,   279,   280,   458,   459,   289,   461,   372,   290,
+     372,   291,   292,   372,   293,   296,   302,   386,   337,   372,
+     372,   333,   338,   298,   438,   298,   298,   298,   359,   387,
+     444,   298,   388,   389,   390,   394,   391,   395,   405,   406,
+     407,   484,   485,   408,   372,   372,   414,   372,   372,   412,
+     460,  -169,   372,   374,   375,   410,   376,   416,   413,   415,
+     372,   417,   423,   384,   457,     1,   426,     2,     3,   427,
+     436,   392,   393,   442,     4,     5,   443,   448,   449,   519,
+     372,   520,   521,   465,   483,   450,   463,   298,   372,   467,
+     468,   464,   469,     6,   470,   473,   482,   525,   432,   498,
+       7,   538,   471,   451,     8,   503,   475,   477,   478,   479,
+     487,   489,   495,   298,   298,   298,   488,   372,   503,   490,
+     491,   492,   372,   500,   494,   507,   511,   526,   517,   531,
+     428,   429,   430,   518,   540,   527,   372,   372,   435,   534,
+     535,   372,   536,   549,   372,   556,   547,   559,   560,   446,
+     447,   565,   561,   564,   567,    59,    60,   227,   103,   111,
+     112,   113,    65,   228,     1,   545,     2,   229,   230,   305,
+     259,   260,   495,   306,   128,   523,   329,  -168,   143,    37,
+     127,   140,    89,   537,   472,   515,   474,   434,     0,   476,
+      66,     1,     0,     2,     3,   480,   481,     0,     0,     0,
+       4,     5,     0,     0,    59,    60,     0,   103,    62,    63,
+      64,    65,     0,     1,     0,     2,     0,     0,     0,     6,
+     501,   502,     0,   505,   506,     0,     7,     0,   510,   132,
+       8,     0,     0,     0,     0,     0,   516,     0,     0,    66,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,     0,     0,   528,    59,    60,     0,
+       0,     0,     0,     0,   532,     0,     1,     0,     2,     0,
+     151,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   152,   153,     0,    67,     0,     0,    68,
+       0,     0,    69,   550,    70,   346,     0,     0,   554,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   562,   563,     0,     0,     0,   566,     0,     0,
+     568,   154,   155,   156,   157,   158,   159,   160,   161,   162,
+     163,   164,   165,   166,   167,    67,     0,     0,    68,     0,
+       0,    69,     0,    70,     0,     0,     0,     0,    59,    60,
+       0,   103,    62,    63,    64,    65,     0,     1,     0,     2,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   328,   181,   182,   183,   184,     0,   185,
+     186,   187,     0,    66,     0,     0,     0,   107,     0,   108,
+       0,   188,     0,     0,   189,     0,   190,     0,   191,   360,
+     361,    59,    60,   362,     0,     0,     0,     0,     0,     0,
+       1,     0,     2,     0,   363,   364,   365,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   366,   367,    59,
+      60,     0,   103,    62,    63,    64,    65,     0,     1,     0,
+       2,     0,     0,     0,     0,     0,    59,    60,   368,    61,
+      62,    63,    64,    65,   419,     1,     0,     2,     0,     0,
+       0,     0,     0,     0,    66,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,   164,   165,   166,   167,    67,
+       0,    66,    68,     0,     0,    69,     0,    70,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,     0,   181,   182,
+     183,   184,     0,   185,   186,   187,   360,   361,    59,    60,
+     362,   107,     0,   108,     0,     0,     0,     1,   369,     2,
+       0,   363,   364,   365,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   366,   367,     0,     0,     0,     0,
+      67,     0,     0,    68,     0,     0,    69,     0,    70,     0,
+       0,     0,     0,     0,     0,   368,     0,    67,     0,     0,
+      68,     0,     0,    69,     0,    70,     0,     0,     0,     0,
+       0,     0,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,     0,     0,     0,    59,
+      60,     0,   103,   111,   112,   113,    65,     0,     1,     0,
+       2,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,    66,   181,   182,   183,   184,     0,
+     185,   186,   187,   360,   361,     0,     0,   362,     0,     0,
+       0,     0,     0,     0,     0,   369,     0,     0,   363,   364,
+     365,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   366,   367,    59,    60,     0,   103,    62,    63,    64,
+      65,     0,     1,     0,     2,     0,     0,     0,     0,     0,
+      59,    60,   368,   103,    62,    63,    64,    65,   497,     1,
+       0,     2,     0,     0,     0,     0,     0,     0,    66,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,     0,     0,    66,     0,     0,     0,     0,
+      67,     0,     0,    68,     0,     0,    69,     0,    70,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,     0,   181,   182,   183,   184,     0,   185,   186,   187,
+      59,    60,     0,   200,    62,    63,    64,    65,     0,     1,
+       0,     2,   369,    59,    60,     0,   103,   111,   112,   113,
+      65,     0,     1,     0,     2,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    67,    66,     0,    68,     0,     0,
+      69,     0,    70,     0,     0,     0,     0,     0,    66,     0,
+       0,    67,     0,     0,    68,     0,     0,    69,     0,    70,
+      59,    60,     0,   297,    62,    63,    64,    65,     0,     1,
+       0,     2,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    66,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   206,     0,     0,     0,
+       0,    67,     0,     0,    68,     0,     0,    69,     0,    70,
+       0,     0,     0,     0,    67,     0,     0,    68,   207,   208,
+      69,     0,   284,     0,     0,     0,     0,     0,     0,     0,
+       0,   209,   210,   211,   212,   213,   214,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   215,
+     216,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    67,     0,     0,    68,     0,     0,    69,     0,    70,
+       0,   217,   218,   219,     0,     0,   220,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   221,
+     222,   182,   183,   184,   223,   224,   225,   226
+};
 
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+static const short int yycheck[] =
+{
+       0,   211,   189,   190,   116,   308,     9,     4,   420,    23,
+     245,    11,     5,     6,    21,     8,     9,    10,    11,    12,
+     212,    14,    80,    16,     9,   330,   133,     5,     6,   334,
+       8,     9,    10,    11,    12,    15,    14,    27,    16,    37,
+     232,    39,    22,   116,     9,   246,   247,    40,    14,   304,
+      16,   109,     9,   134,     5,     6,    70,     8,     9,    10,
+      11,    12,    40,    14,   145,    16,    27,   322,   219,   134,
+     134,   222,   223,   224,   225,   226,   141,     0,   229,   230,
+      13,   145,    52,    48,    98,    85,   498,    48,   102,    40,
+     133,    48,   110,   111,   108,    29,   110,   284,     3,     4,
+      33,    34,    35,    36,    37,    38,    39,   134,    41,   134,
+     134,   125,   130,   138,    19,    20,   528,   133,   145,   143,
+     110,   111,   134,   137,   138,     5,     6,   141,     8,     9,
+      10,    11,    12,   145,    14,   139,    16,   144,   141,   542,
+     130,   133,   554,   136,   110,   111,   139,   144,    16,   142,
+     553,   144,   145,    43,    44,    45,   141,   358,   136,   134,
+      40,   139,    15,   134,   142,   145,   144,   145,   143,   472,
+     141,   474,    62,   324,    25,    26,   110,   111,    33,    34,
+     133,   135,   369,   137,     9,   136,    41,    12,   139,   143,
+     141,   142,    47,   144,   499,   209,   130,   134,    14,   132,
+      16,   138,   202,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   133,   276,   277,
+     278,   279,   280,   132,   238,   298,    16,   300,   301,   464,
+     303,   289,   290,   291,   292,   347,   387,   310,   389,   390,
+     391,   546,    16,   548,   395,   318,   319,    55,    56,    57,
+      58,    59,    60,    61,    46,    47,   136,   134,   135,   139,
+     137,   135,   142,   137,   144,   145,   135,   141,   137,   138,
+     284,    33,    34,    35,   347,   135,    38,   137,   134,   337,
+     338,   135,   138,   137,     4,   139,   344,     3,     4,    16,
+     304,   305,   306,   134,   135,   530,   137,   137,   533,     4,
+     451,   106,   107,     4,   377,   378,   379,   140,   322,   323,
+     324,   140,   385,   110,   111,    76,    77,   527,     7,     7,
+       7,     4,    16,   396,   397,   134,   477,   478,   479,   143,
+      16,   138,   138,   543,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,   137,   359,   137,   405,   406,   407,
+     408,   137,   137,   137,   412,   413,   137,   415,   431,   137,
+     433,   137,   137,   436,   134,    50,     9,   134,   137,   442,
+     443,   143,   137,   387,   388,   389,   390,   391,   137,   134,
+     394,   395,   134,   134,   134,    29,   134,   134,   134,   134,
+     134,   449,   450,   134,   467,   468,    29,   470,   471,   134,
+     414,     0,   475,   300,   301,   143,   303,    16,   134,   134,
+     483,     4,    54,   310,   143,    14,   134,    16,    17,   134,
+     139,   318,   319,   134,    23,    24,   134,   134,   134,   487,
+     503,   489,   490,    16,   448,   134,   134,   451,   511,    12,
+      12,   138,   137,    42,   134,     4,   137,    16,    48,   463,
+      49,    48,   134,   134,    53,   469,   134,   134,   134,   134,
+     134,   134,   462,   477,   478,   479,   138,   540,   482,   134,
+     138,   138,   545,   134,   138,   134,   134,   134,   138,   141,
+     377,   378,   379,   138,    12,   139,   559,   560,   385,   138,
+     138,   564,   138,     4,   567,   134,   141,    12,    12,   396,
+     397,    67,   134,    12,    12,     5,     6,   128,     8,     9,
+      10,    11,    12,   128,    14,   529,    16,   128,   128,   215,
+      19,    20,   522,   216,    85,   499,   238,     0,   108,    11,
+      82,   102,    50,   522,   431,   482,   433,   384,    -1,   436,
+      40,    14,    -1,    16,    17,   442,   443,    -1,    -1,    -1,
+      23,    24,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    14,    -1,    16,    -1,    -1,    -1,    42,
+     467,   468,    -1,   470,   471,    -1,    49,    -1,   475,    30,
+      53,    -1,    -1,    -1,    -1,    -1,   483,    -1,    -1,    40,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,   101,   102,    -1,    -1,   503,     5,     6,    -1,
+      -1,    -1,    -1,    -1,   511,    -1,    14,    -1,    16,    -1,
+      18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    31,    32,    -1,   136,    -1,    -1,   139,
+      -1,    -1,   142,   540,   144,   145,    -1,    -1,   545,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   559,   560,    -1,    -1,    -1,   564,    -1,    -1,
+     567,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,   136,    -1,    -1,   139,    -1,
+      -1,   142,    -1,   144,    -1,    -1,    -1,    -1,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    14,    -1,    16,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,    30,   122,   123,   124,   125,    -1,   127,
+     128,   129,    -1,    40,    -1,    -1,    -1,   135,    -1,   137,
+      -1,   139,    -1,    -1,   142,    -1,   144,    -1,   146,     3,
+       4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,
+      14,    -1,    16,    -1,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    14,    -1,
+      16,    -1,    -1,    -1,    -1,    -1,     5,     6,    52,     8,
+       9,    10,    11,    12,    30,    14,    -1,    16,    -1,    -1,
+      -1,    -1,    -1,    -1,    40,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,   136,
+      -1,    40,   139,    -1,    -1,   142,    -1,   144,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,   125,    -1,   127,   128,   129,     3,     4,     5,     6,
+       7,   135,    -1,   137,    -1,    -1,    -1,    14,   142,    16,
+      -1,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
+     136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,    -1,
+      -1,    -1,    -1,    -1,    -1,    52,    -1,   136,    -1,    -1,
+     139,    -1,    -1,   142,    -1,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    -1,    -1,    -1,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    14,    -1,
+      16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,    40,   122,   123,   124,   125,    -1,
+     127,   128,   129,     3,     4,    -1,    -1,     7,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,    18,    19,
+      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    31,    32,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    14,    -1,    16,    -1,    -1,    -1,    -1,    -1,
+       5,     6,    52,     8,     9,    10,    11,    12,    30,    14,
+      -1,    16,    -1,    -1,    -1,    -1,    -1,    -1,    40,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    -1,    -1,    40,    -1,    -1,    -1,    -1,
+     136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,    -1,   122,   123,   124,   125,    -1,   127,   128,   129,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    14,
+      -1,    16,   142,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    14,    -1,    16,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   136,    40,    -1,   139,    -1,    -1,
+     142,    -1,   144,    -1,    -1,    -1,    -1,    -1,    40,    -1,
+      -1,   136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    14,
+      -1,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    -1,    -1,
+      -1,   136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,
+      -1,    -1,    -1,    -1,   136,    -1,    -1,   139,    50,    51,
+     142,    -1,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,    -1,    -1,   139,    -1,    -1,   142,    -1,   144,
+      -1,   103,   104,   105,    -1,    -1,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129
+};
 
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,    14,    16,    17,    23,    24,    42,    49,    53,   157,
+     185,   186,   187,   198,   189,   188,    43,    44,    45,    62,
+     195,   133,    52,    13,    33,    34,    35,    36,    37,    38,
+      39,    41,   132,   158,   159,   160,     0,   187,   133,    37,
+      39,   161,   207,    33,    34,    35,    38,   162,   204,   206,
+     213,   133,   133,   133,   133,   139,   196,    16,   193,     5,
+       6,     8,     9,    10,    11,    12,    40,   136,   139,   142,
+     144,   148,   174,   175,   198,   210,   160,   160,    25,    26,
+     184,   160,   160,    15,   214,   215,    22,   145,   205,   214,
+      16,    46,    47,   194,     4,    16,    16,   197,   137,     4,
+       4,     4,   144,     8,   145,   175,   180,   135,   137,   184,
+     184,     9,    10,    11,   155,   156,   175,   181,    55,    56,
+      57,    58,    59,    60,    61,   163,   202,   202,   157,   218,
+     134,   141,    30,   175,   176,   178,   179,   140,   140,   145,
+     180,   134,   145,   179,   181,   175,    19,    20,     3,     4,
+       7,    18,    31,    32,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   122,   123,   124,   125,   127,   128,   129,   139,   142,
+     144,   146,   149,   150,   151,   152,   182,   210,   190,     4,
+       8,   175,   177,    21,   144,   203,    28,    50,    51,    63,
+      64,    65,    66,    67,    68,    81,    82,   103,   104,   105,
+     108,   121,   122,   126,   127,   128,   129,   149,   150,   151,
+     152,   216,   222,   223,   224,   225,    16,   165,   134,   138,
+     175,   175,   143,   145,   175,   138,   191,   192,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,   153,    19,
+      20,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   154,   137,   137,   137,   137,
+     137,   141,   181,   183,   144,   183,   145,   183,    16,   137,
+     137,   137,   137,   134,   172,   198,    50,     8,   175,   212,
+       9,    12,     9,   155,   163,   153,   154,   175,   175,   212,
+     175,   175,   219,   212,   212,   212,   212,   212,   175,   175,
+     212,   212,   163,   106,   107,   110,   111,   164,    30,   176,
+     167,   141,   143,   143,   167,   172,   172,   137,   137,   181,
+     181,   181,   181,   181,   134,   141,   145,   175,   183,   143,
+     145,   181,   181,   181,   181,    27,    48,   170,   173,   137,
+       3,     4,     7,    18,    19,    20,    31,    32,    52,   142,
+     182,   209,   210,   211,   211,   211,   211,   177,   175,   175,
+     134,   169,   134,   169,   211,   139,   134,   134,   134,   134,
+     134,   134,   211,   211,    29,   134,   177,   175,   212,   130,
+     164,   166,   181,   181,   221,   134,   134,   134,   134,   181,
+     143,   145,   134,   134,    29,   134,    16,     4,   172,    30,
+     175,   200,   201,    54,   208,   183,   134,   134,   211,   211,
+     211,     9,    48,     9,   221,   211,   139,   212,   175,   212,
+     212,   212,   134,   134,   175,   212,   211,   211,   134,   134,
+     134,   134,   138,   181,   181,   181,   181,   143,   181,   181,
+     175,   181,   165,   134,   138,    16,   143,    12,    12,   137,
+     134,   134,   211,     4,   211,   134,   211,   134,   134,   134,
+     211,   211,   137,   175,   181,   181,   212,   134,   138,   134,
+     134,   138,   138,   138,   138,   198,   199,    30,   175,   167,
+     134,   211,   211,   175,   220,   211,   211,   134,   169,   169,
+     211,   134,   212,   212,   212,   220,   211,   138,   138,   181,
+     181,   181,   165,   170,   171,    16,   134,   139,   211,   134,
+     138,   141,   211,   138,   138,   138,   138,   199,    48,   168,
+      12,   141,   155,   217,   165,   175,   167,   141,   167,     4,
+     211,   209,   141,   155,   211,    29,   134,   209,   165,    12,
+      12,   134,   211,   211,    12,    67,   211,    12,   211
+};
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (N)								\
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (0)
 #endif
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+              (Loc).first_line, (Loc).first_column,	\
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
-#else /* not YYLSP_NEEDED */
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
+# define YYLEX yylex ()
 #endif
 
-/* If nonreentrant, generate the variables here */
+/* Enable debugging if requested.  */
+#if YYDEBUG
 
-#ifndef YYPURE
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr,					\
+                  Type, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short int *bottom, short int *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short int *bottom;
+    short int *top;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (0)
 
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
 #endif
+{
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
+}
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (Rule);		\
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
 
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
 
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
+
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  return yys - yystr - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
 
-  while (i-- > 0)
-    *t++ = *f++;
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
 }
+# endif
+
+#endif /* YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
 
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
 
-#line 217 "/usr/share/bison.simple"
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
 
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-int yyparse (void *);
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
 #else
-int yyparse (void);
+int
+yyparse ()
+
 #endif
 #endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
 #define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -2118,631 +2779,659 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short int *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
 
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+	short int *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
 
-      if (yyssp >= yyss + yystacksize - 1)
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 3:
+#line 1032 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
     {
-      int i;
+  if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
+    GEN_ERROR("Value too large for type!");
+  (yyval.SIntVal) = (int32_t)(yyvsp[0].UIntVal);
+  CHECK_FOR_ERROR
+;}
+    break;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+  case 31:
+#line 1048 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
+    break;
 
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
+  case 32:
+#line 1048 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
+    break;
 
+  case 33:
+#line 1049 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
+    break;
 
-  switch (yyn) {
+  case 34:
+#line 1049 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
+    break;
 
-case 2:
-#line 1032 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX)     // Outside of my range!
-    GEN_ERROR("Value too large for type!");
-  yyval.SIntVal = (int32_t)yyvsp[0].UIntVal;
-  CHECK_FOR_ERROR
-;
-    break;}
-case 30:
-#line 1048 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_EQ; ;
-    break;}
-case 31:
-#line 1048 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_NE; ;
-    break;}
-case 32:
-#line 1049 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SLT; ;
-    break;}
-case 33:
-#line 1049 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SGT; ;
-    break;}
-case 34:
-#line 1050 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SLE; ;
-    break;}
-case 35:
-#line 1050 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SGE; ;
-    break;}
-case 36:
-#line 1051 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_ULT; ;
-    break;}
-case 37:
-#line 1051 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_UGT; ;
-    break;}
-case 38:
-#line 1052 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_ULE; ;
-    break;}
-case 39:
-#line 1052 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_UGE; ;
-    break;}
-case 40:
-#line 1056 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OEQ; ;
-    break;}
-case 41:
-#line 1056 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ONE; ;
-    break;}
-case 42:
-#line 1057 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OLT; ;
-    break;}
-case 43:
-#line 1057 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OGT; ;
-    break;}
-case 44:
-#line 1058 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OLE; ;
-    break;}
-case 45:
-#line 1058 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OGE; ;
-    break;}
-case 46:
-#line 1059 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ORD; ;
-    break;}
-case 47:
-#line 1059 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UNO; ;
-    break;}
-case 48:
-#line 1060 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UEQ; ;
-    break;}
-case 49:
-#line 1060 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UNE; ;
-    break;}
-case 50:
-#line 1061 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ULT; ;
-    break;}
-case 51:
-#line 1061 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UGT; ;
-    break;}
-case 52:
-#line 1062 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ULE; ;
-    break;}
-case 53:
-#line 1062 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UGE; ;
-    break;}
-case 54:
-#line 1063 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_TRUE; ;
-    break;}
-case 55:
-#line 1064 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_FALSE; ;
-    break;}
-case 59:
-#line 1073 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = yyvsp[-1].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 60:
-#line 1077 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = 0;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 61:
-#line 1083 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 62:
-#line 1084 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 63:
-#line 1085 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
-    break;}
-case 64:
-#line 1086 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::AppendingLinkage; ;
-    break;}
-case 65:
-#line 1087 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
-    break;}
-case 66:
-#line 1091 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 67:
-#line 1092 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 68:
-#line 1093 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 69:
-#line 1097 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::DefaultVisibility; ;
-    break;}
-case 70:
-#line 1098 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::HiddenVisibility;  ;
-    break;}
-case 71:
-#line 1102 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 72:
-#line 1103 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 73:
-#line 1104 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 74:
-#line 1108 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 75:
-#line 1109 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 76:
-#line 1110 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
-    break;}
-case 77:
-#line 1111 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 78:
-#line 1112 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
-    break;}
-case 79:
-#line 1115 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::C; ;
-    break;}
-case 80:
-#line 1116 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::C; ;
-    break;}
-case 81:
-#line 1117 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::CSRet; ;
-    break;}
-case 82:
-#line 1118 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Fast; ;
-    break;}
-case 83:
-#line 1119 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Cold; ;
-    break;}
-case 84:
-#line 1120 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::X86_StdCall; ;
-    break;}
-case 85:
-#line 1121 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::X86_FastCall; ;
-    break;}
-case 86:
-#line 1122 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                   if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
-                     GEN_ERROR("Calling conv too large!");
-                   yyval.UIntVal = yyvsp[0].UInt64Val;
+  case 35:
+#line 1050 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
+    break;
+
+  case 36:
+#line 1050 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
+    break;
+
+  case 37:
+#line 1051 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
+    break;
+
+  case 38:
+#line 1051 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
+    break;
+
+  case 39:
+#line 1052 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
+    break;
+
+  case 40:
+#line 1052 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
+    break;
+
+  case 41:
+#line 1056 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
+    break;
+
+  case 42:
+#line 1056 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
+    break;
+
+  case 43:
+#line 1057 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
+    break;
+
+  case 44:
+#line 1057 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
+    break;
+
+  case 45:
+#line 1058 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
+    break;
+
+  case 46:
+#line 1058 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
+    break;
+
+  case 47:
+#line 1059 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
+    break;
+
+  case 48:
+#line 1059 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
+    break;
+
+  case 49:
+#line 1060 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
+    break;
+
+  case 50:
+#line 1060 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
+    break;
+
+  case 51:
+#line 1061 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
+    break;
+
+  case 52:
+#line 1061 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
+    break;
+
+  case 53:
+#line 1062 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
+    break;
+
+  case 54:
+#line 1062 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
+    break;
+
+  case 55:
+#line 1063 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
+    break;
+
+  case 56:
+#line 1064 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
+    break;
+
+  case 60:
+#line 1073 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[-1].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 61:
+#line 1077 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = 0;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 62:
+#line 1083 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 63:
+#line 1084 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 64:
+#line 1085 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 65:
+#line 1086 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+    break;
+
+  case 66:
+#line 1087 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 67:
+#line 1091 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 68:
+#line 1092 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 69:
+#line 1093 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 70:
+#line 1097 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;}
+    break;
+
+  case 71:
+#line 1098 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::HiddenVisibility;  ;}
+    break;
+
+  case 72:
+#line 1102 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 73:
+#line 1103 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 74:
+#line 1104 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 75:
+#line 1108 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 76:
+#line 1109 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 77:
+#line 1110 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 78:
+#line 1111 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 79:
+#line 1112 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 80:
+#line 1115 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 81:
+#line 1116 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 82:
+#line 1117 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::CSRet; ;}
+    break;
+
+  case 83:
+#line 1118 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Fast; ;}
+    break;
+
+  case 84:
+#line 1119 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Cold; ;}
+    break;
+
+  case 85:
+#line 1120 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
+    break;
+
+  case 86:
+#line 1121 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
+    break;
+
+  case 87:
+#line 1122 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+                   if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+                     GEN_ERROR("Calling conv too large!");
+                   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
                   CHECK_FOR_ERROR
-                 ;
-    break;}
-case 87:
-#line 1129 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = FunctionType::ZExtAttribute; ;
-    break;}
-case 88:
-#line 1130 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = FunctionType::SExtAttribute; ;
-    break;}
-case 89:
-#line 1133 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = FunctionType::NoAttributeSet; ;
-    break;}
-case 90:
-#line 1134 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                yyval.ParamAttrs = FunctionType::ParameterAttributes(yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs);
-              ;
-    break;}
-case 91:
-#line 1139 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = FunctionType::NoReturnAttribute; ;
-    break;}
-case 93:
-#line 1143 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = FunctionType::NoAttributeSet; ;
-    break;}
-case 94:
-#line 1144 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                yyval.ParamAttrs = FunctionType::ParameterAttributes(yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs);
-              ;
-    break;}
-case 95:
-#line 1151 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 96:
-#line 1152 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+                 ;}
+    break;
+
+  case 88:
+#line 1129 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::ZExtAttribute; ;}
+    break;
+
+  case 89:
+#line 1130 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::SExtAttribute; ;}
+    break;
+
+  case 90:
+#line 1133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+    break;
+
+  case 91:
+#line 1134 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
+              ;}
+    break;
+
+  case 92:
+#line 1139 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;}
+    break;
+
+  case 94:
+#line 1143 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+    break;
+
+  case 95:
+#line 1144 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
+              ;}
+    break;
+
+  case 96:
+#line 1151 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 97:
+#line 1152 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two!");
   CHECK_FOR_ERROR
-;
-    break;}
-case 97:
-#line 1158 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 98:
-#line 1159 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+;}
+    break;
+
+  case 98:
+#line 1158 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 99:
+#line 1159 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two!");
   CHECK_FOR_ERROR
-;
-    break;}
-case 99:
-#line 1167 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i)
-    if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\')
+;}
+    break;
+
+  case 100:
+#line 1167 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
+    if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
       GEN_ERROR("Invalid character in section name!");
-  yyval.StrVal = yyvsp[0].StrVal;
+  (yyval.StrVal) = (yyvsp[0].StrVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 100:
-#line 1175 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 101:
-#line 1176 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = yyvsp[0].StrVal; ;
-    break;}
-case 102:
-#line 1181 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{;
-    break;}
-case 103:
-#line 1182 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{;
-    break;}
-case 104:
-#line 1183 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurGV->setSection(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
+;}
+    break;
+
+  case 101:
+#line 1175 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 102:
+#line 1176 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
+    break;
+
+  case 103:
+#line 1181 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 104:
+#line 1182 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 105:
+#line 1183 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurGV->setSection((yyvsp[0].StrVal));
+    free((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 105:
-#line 1188 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
+  ;}
+    break;
+
+  case 106:
+#line 1188 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
-    CurGV->setAlignment(yyvsp[0].UInt64Val);
+    CurGV->setAlignment((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 110:
-#line 1204 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
+  ;}
+    break;
+
+  case 111:
+#line 1204 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 111:
-#line 1208 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
+  ;}
+    break;
+
+  case 112:
+#line 1208 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 112:
-#line 1212 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                             // Pointer type?
-    if (*yyvsp[-1].TypeVal == Type::LabelTy)
+  ;}
+    break;
+
+  case 113:
+#line 1212 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                             // Pointer type?
+    if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-1].TypeVal)));
-    delete yyvsp[-1].TypeVal;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[-1].TypeVal))));
+    delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 113:
-#line 1219 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{            // Named types are also simple types...
-    const Type* tmp = getTypeVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TypeVal = new PATypeHolder(tmp);
-  ;
-    break;}
-case 114:
-#line 1224 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Type UpReference
-    if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range!");
+  ;}
+    break;
+
+  case 114:
+#line 1219 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {            // Named types are also simple types...
+    const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.TypeVal) = new PATypeHolder(tmp);
+  ;}
+    break;
+
+  case 115:
+#line 1224 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                   // Type UpReference
+    if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
-    UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT));  // Add to vector...
-    yyval.TypeVal = new PATypeHolder(OT);
+    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT));  // Add to vector...
+    (yyval.TypeVal) = new PATypeHolder(OT);
     UR_OUT("New Upreference!\n");
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 115:
-#line 1232 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 116:
+#line 1232 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
-    Attrs.push_back(yyvsp[0].ParamAttrs);
-    for (TypeWithAttrsList::iterator I=yyvsp[-2].TypeWithAttrsList->begin(), E=yyvsp[-2].TypeWithAttrsList->end(); I != E; ++I) {
+    Attrs.push_back((yyvsp[0].ParamAttrs));
+    for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
       Params.push_back(I->Ty->get());
       if (I->Ty->get() != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -2750,20 +3439,21 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    FunctionType *FT = FunctionType::get(*yyvsp[-4].TypeVal, Params, isVarArg, Attrs);
-    delete yyvsp[-2].TypeWithAttrsList;   // Delete the argument list
-    delete yyvsp[-4].TypeVal;   // Delete the return type handle
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 116:
-#line 1250 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    FunctionType *FT = FunctionType::get(*(yyvsp[-4].TypeVal), Params, isVarArg, Attrs);
+    delete (yyvsp[-2].TypeWithAttrsList);   // Delete the argument list
+    delete (yyvsp[-4].TypeVal);   // Delete the return type handle
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 117:
+#line 1250 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
-    Attrs.push_back(yyvsp[0].ParamAttrs);
-    for (TypeWithAttrsList::iterator I=yyvsp[-2].TypeWithAttrsList->begin(), E=yyvsp[-2].TypeWithAttrsList->end(); I != E; ++I) {
+    Attrs.push_back((yyvsp[0].ParamAttrs));
+    for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
       Params.push_back(I->Ty->get());
       if (I->Ty->get() != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -2771,282 +3461,303 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    FunctionType *FT = FunctionType::get(yyvsp[-4].PrimType, Params, isVarArg, Attrs);
-    delete yyvsp[-2].TypeWithAttrsList;      // Delete the argument list
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 117:
-#line 1268 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{          // Sized array type?
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(ArrayType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 118:
-#line 1273 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{          // Packed array type?
-     const llvm::Type* ElemTy = yyvsp[-1].TypeVal->get();
-     if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
+    FunctionType *FT = FunctionType::get((yyvsp[-4].PrimType), Params, isVarArg, Attrs);
+    delete (yyvsp[-2].TypeWithAttrsList);      // Delete the argument list
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 118:
+#line 1268 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {          // Sized array type?
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
+    delete (yyvsp[-1].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 119:
+#line 1273 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {          // Packed array type?
+     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
+     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
         GEN_ERROR("Unsigned result not equal to signed result");
      if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
         GEN_ERROR("Element type of a PackedType must be primitive");
-     if (!isPowerOf2_32(yyvsp[-3].UInt64Val))
+     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
        GEN_ERROR("Vector length should be a power of 2!");
-     yyval.TypeVal = new PATypeHolder(HandleUpRefs(PackedType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-     delete yyvsp[-1].TypeVal;
+     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PackedType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
+     delete (yyvsp[-1].TypeVal);
      CHECK_FOR_ERROR
-  ;
-    break;}
-case 119:
-#line 1285 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                        // Structure type?
+  ;}
+    break;
+
+  case 120:
+#line 1285 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
-           E = yyvsp[-1].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
+           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete yyvsp[-1].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete (yyvsp[-1].TypeList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 120:
-#line 1295 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                                  // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 121:
-#line 1299 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 121:
+#line 1295 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                                  // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 122:
+#line 1299 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-2].TypeList->begin(),
-           E = yyvsp[-2].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
+           E = (yyvsp[-2].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    delete yyvsp[-2].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+    delete (yyvsp[-2].TypeList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 122:
-#line 1309 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                         // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 123:
-#line 1316 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ 
-    yyval.TypeWithAttrs.Ty = yyvsp[-1].TypeVal; 
-    yyval.TypeWithAttrs.Attrs = yyvsp[0].ParamAttrs; 
-  ;
-    break;}
-case 124:
-#line 1323 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 123:
+#line 1309 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                         // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 124:
+#line 1316 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { 
+    (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
+    (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
+  ;}
+    break;
+
+  case 125:
+#line 1323 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    if (!(*yyvsp[0].TypeVal)->isFirstClassType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+    if (!(*(yyvsp[0].TypeVal))->isFirstClassType())
       GEN_ERROR("LLVM functions cannot return aggregate types!");
-    yyval.TypeVal = yyvsp[0].TypeVal;
-  ;
-    break;}
-case 125:
-#line 1330 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(Type::VoidTy);
-  ;
-    break;}
-case 126:
-#line 1335 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
-    yyval.TypeWithAttrsList->push_back(yyvsp[0].TypeWithAttrs);
+    (yyval.TypeVal) = (yyvsp[0].TypeVal);
+  ;}
+    break;
+
+  case 126:
+#line 1330 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
+  ;}
+    break;
+
+  case 127:
+#line 1335 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
+    (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 127:
-#line 1340 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList)->push_back(yyvsp[0].TypeWithAttrs);
+  ;}
+    break;
+
+  case 128:
+#line 1340 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 129:
-#line 1348 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList;
+  ;}
+    break;
+
+  case 130:
+#line 1348 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 130:
-#line 1355 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList;
+  ;}
+    break;
+
+  case 131:
+#line 1355 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 131:
-#line 1362 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
+  ;}
+    break;
+
+  case 132:
+#line 1362 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 132:
-#line 1370 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeList = new std::list<PATypeHolder>();
-    yyval.TypeList->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
+  ;}
+    break;
+
+  case 133:
+#line 1370 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeList) = new std::list<PATypeHolder>();
+    (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 133:
-#line 1375 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
+  ;}
+    break;
+
+  case 134:
+#line 1375 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 134:
-#line 1386 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized arr
+  ;}
+    break;
+
+  case 135:
+#line 1386 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-3].TypeVal))->getDescription() + "'!");
     const Type *ETy = ATy->getElementType();
     int NumElements = ATy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "!");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                        ETy->getDescription() +"' as required!\nIt is of type '"+
-                       (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                       (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantArray::get(ATy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[-1].ConstVector));
+    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 135:
-#line 1414 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 136:
+#line 1414 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-2].TypeVal))->getDescription() + "'!");
 
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + itostr(NumElements) +"!");
-    yyval.ConstVal = ConstantArray::get(ATy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
+    delete (yyvsp[-2].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 136:
-#line 1430 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 137:
+#line 1430 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-2].TypeVal))->getDescription() + "'!");
 
     int NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
-    char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
-    if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal))
+    char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
+    if (NumElements != -1 && NumElements != (EndStr-(yyvsp[0].StrVal)))
       GEN_ERROR("Can't build string constant of size " + 
-                     itostr((int)(EndStr-yyvsp[0].StrVal)) +
+                     itostr((int)(EndStr-(yyvsp[0].StrVal))) +
                      " when array has size " + itostr(NumElements) + "!");
     std::vector<Constant*> Vals;
     if (ETy == Type::Int8Ty) {
-      for (unsigned char *C = (unsigned char *)yyvsp[0].StrVal; 
+      for (unsigned char *C = (unsigned char *)(yyvsp[0].StrVal); 
         C != (unsigned char*)EndStr; ++C)
       Vals.push_back(ConstantInt::get(ETy, *C));
     } else {
-      free(yyvsp[0].StrVal);
+      free((yyvsp[0].StrVal));
       GEN_ERROR("Cannot build string arrays of non byte sized elements!");
     }
-    free(yyvsp[0].StrVal);
-    yyval.ConstVal = ConstantArray::get(ATy, Vals);
-    delete yyvsp[-2].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 137:
-#line 1459 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized arr
+    free((yyvsp[0].StrVal));
+    (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
+    delete (yyvsp[-2].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 138:
+#line 1459 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const PackedType *PTy = dyn_cast<PackedType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make packed constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-3].TypeVal))->getDescription() + "'!");
     const Type *ETy = PTy->getElementType();
     int NumElements = PTy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "!");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
            ETy->getDescription() +"' as required!\nIt is of type '"+
-           (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+           (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantPacked::get(PTy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantPacked::get(PTy, *(yyvsp[-1].ConstVector));
+    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 138:
-#line 1487 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
+  ;}
+    break;
+
+  case 139:
+#line 1487 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-3].TypeVal))->getDescription() + "'!");
 
-    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type!");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-1].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[-1].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[-1].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3056,20 +3767,21 @@
     if (STy->isPacked())
       GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector));
+    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 139:
-#line 1512 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 140:
+#line 1512 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-2].TypeVal))->getDescription() + "'!");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type!");
@@ -3078,25 +3790,26 @@
     if (STy->isPacked())
       GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[-2].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 140:
-#line 1531 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal->get());
+  ;}
+    break;
+
+  case 141:
+#line 1531 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-5].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-5].TypeVal))->getDescription() + "'!");
 
-    if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[-2].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type!");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-2].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[-2].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[-2].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3106,20 +3819,21 @@
     if (!STy->isPacked())
       GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-2].ConstVector);
-    delete yyvsp[-5].TypeVal; delete yyvsp[-2].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-2].ConstVector));
+    delete (yyvsp[-5].TypeVal); delete (yyvsp[-2].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 141:
-#line 1556 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 142:
+#line 1556 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-4].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-4].TypeVal))->getDescription() + "'!");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type!");
@@ -3128,42 +3842,45 @@
     if (!STy->isPacked())
       GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-4].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[-4].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 142:
-#line 1575 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 143:
+#line 1575 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make null pointer constant with type: '" + 
-                     (*yyvsp[-1].TypeVal)->getDescription() + "'!");
+                     (*(yyvsp[-1].TypeVal))->getDescription() + "'!");
 
-    yyval.ConstVal = ConstantPointerNull::get(PTy);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = ConstantPointerNull::get(PTy);
+    delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 143:
-#line 1587 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 144:
+#line 1587 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 144:
-#line 1594 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
+    delete (yyvsp[-1].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 145:
+#line 1594 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (Ty == 0)
       GEN_ERROR("Global const reference must be a pointer type!");
 
@@ -3177,7 +3894,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, yyvsp[0].ValIDVal);
+    Value *V = getValNonImprovising(Ty, (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3192,14 +3909,14 @@
 
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
-        CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal));
+        CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[0].ValIDVal)));
     
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
-        yyvsp[0].ValIDVal.destroy();
+        (yyvsp[0].ValIDVal).destroy();
       } else {
         std::string Name;
-        if (yyvsp[0].ValIDVal.Type == ValID::NameVal) Name = yyvsp[0].ValIDVal.Name;
+        if ((yyvsp[0].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[0].ValIDVal).Name;
 
         // Create the forward referenced global.
         GlobalValue *GV;
@@ -3214,284 +3931,312 @@
         }
 
         // Keep track of the fact that we have a forward ref to recycle it
-        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV));
+        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[0].ValIDVal)), GV));
         V = GV;
       }
     }
 
-    yyval.ConstVal = cast<GlobalValue>(V);
-    delete yyvsp[-1].TypeVal;            // Free the type handle
+    (yyval.ConstVal) = cast<GlobalValue>(V);
+    delete (yyvsp[-1].TypeVal);            // Free the type handle
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 145:
-#line 1657 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 146:
+#line 1657 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression: " + 
-        (*yyvsp[-1].TypeVal)->getDescription() + " and " + yyvsp[0].ConstVal->getType()->getDescription());
-    yyval.ConstVal = yyvsp[0].ConstVal;
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 146:
-#line 1667 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        (*(yyvsp[-1].TypeVal))->getDescription() + " and " + (yyvsp[0].ConstVal)->getType()->getDescription());
+    (yyval.ConstVal) = (yyvsp[0].ConstVal);
+    delete (yyvsp[-1].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 147:
+#line 1667 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const Type *Ty = yyvsp[-1].TypeVal->get();
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    const Type *Ty = (yyvsp[-1].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       GEN_ERROR("Cannot create a null initialized value of this type!");
-    yyval.ConstVal = Constant::getNullValue(Ty);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = Constant::getNullValue(Ty);
+    delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 147:
-#line 1677 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
+  ;}
+    break;
+
+  case 148:
+#line 1677 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {      // integral constants
+    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 148:
-#line 1683 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
+  ;}
+    break;
+
+  case 149:
+#line 1683 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {      // integral constants
+    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 150:
+#line 1689 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                      // Boolean constants
+    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getTrue();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 149:
-#line 1689 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                      // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getTrue();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 150:
-#line 1694 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                     // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getFalse();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 151:
-#line 1699 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Float & Double constants
-    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
+  ;}
+    break;
+
+  case 151:
+#line 1694 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                     // Boolean constants
+    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getFalse();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 152:
+#line 1699 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                   // Float & Double constants
+    if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
-    yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, yyvsp[0].FPVal);
+    (yyval.ConstVal) = ConstantFP::get((yyvsp[-1].PrimType), (yyvsp[0].FPVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 152:
-#line 1707 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 153:
+#line 1707 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    Constant *Val = yyvsp[-3].ConstVal;
-    const Type *Ty = yyvsp[-1].TypeVal->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast constant expression from a non-primitive type: '" +
-                     Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast constant expression to a non-primitive type: '" +
-                Ty->getDescription() + "'!");
-    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, yyvsp[-1].TypeVal->get());
-    delete yyvsp[-1].TypeVal;
-  ;
-    break;}
-case 153:
-#line 1721 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    Constant *Val = (yyvsp[-3].ConstVal);
+    const Type *DestTy = (yyvsp[-1].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy);
+    delete (yyvsp[-1].TypeVal);
+  ;}
+    break;
+
+  case 154:
+#line 1719 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType(yyvsp[-2].ConstVal->getType(), *yyvsp[-1].ValueList, true);
+      GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), *(yyvsp[-1].ValueList), true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr!");
 
     std::vector<Constant*> IdxVec;
-    for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i != e; ++i)
-      if (Constant *C = dyn_cast<Constant>((*yyvsp[-1].ValueList)[i]))
+    for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e; ++i)
+      if (Constant *C = dyn_cast<Constant>((*(yyvsp[-1].ValueList))[i]))
         IdxVec.push_back(C);
       else
         GEN_ERROR("Indices to constant getelementptr must be constants!");
 
-    delete yyvsp[-1].ValueList;
+    delete (yyvsp[-1].ValueList);
 
-    yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, IdxVec);
+    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal), IdxVec);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 154:
-#line 1742 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-5].ConstVal->getType() != Type::Int1Ty)
+  ;}
+    break;
+
+  case 155:
+#line 1740 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type!");
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Select operand types must match!");
-    yyval.ConstVal = ConstantExpr::getSelect(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 155:
-#line 1750 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 156:
+#line 1748 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
     CHECK_FOR_ERROR;
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 156:
-#line 1756 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+  ;}
+    break;
+
+  case 157:
+#line 1754 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
-    if (!yyvsp[-3].ConstVal->getType()->isInteger()) {
-      if (!isa<PackedType>(yyvsp[-3].ConstVal->getType()) || 
-          !cast<PackedType>(yyvsp[-3].ConstVal->getType())->getElementType()->isInteger())
+    if (!(yyvsp[-3].ConstVal)->getType()->isInteger()) {
+      if (!isa<PackedType>((yyvsp[-3].ConstVal)->getType()) || 
+          !cast<PackedType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands!");
     }
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 157:
-#line 1767 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 158:
+#line 1765 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match!");
-    yyval.ConstVal = ConstantExpr::getICmp(yyvsp[-5].IPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 158:
-#line 1772 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[-5].IPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+  ;}
+    break;
+
+  case 159:
+#line 1770 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match!");
-    yyval.ConstVal = ConstantExpr::getFCmp(yyvsp[-5].FPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 159:
-#line 1777 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-1].ConstVal->getType() != Type::Int8Ty)
+    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[-5].FPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+  ;}
+    break;
+
+  case 160:
+#line 1775 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-1].ConstVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift count for shift constant must be i8 type!");
-    if (!yyvsp[-3].ConstVal->getType()->isInteger())
+    if (!(yyvsp[-3].ConstVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
     CHECK_FOR_ERROR;
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].OtherOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 160:
-#line 1786 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 161:
+#line 1784 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
-    yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 161:
-#line 1792 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 162:
+#line 1790 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
-    yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 162:
-#line 1798 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 163:
+#line 1796 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
-    yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 163:
-#line 1807 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 164:
+#line 1805 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 164:
-#line 1811 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ConstVector = new std::vector<Constant*>();
-    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 165:
+#line 1809 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ConstVector) = new std::vector<Constant*>();
+    (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 165:
-#line 1819 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 166:
-#line 1819 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 167:
-#line 1830 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+  ;}
+    break;
+
+  case 166:
+#line 1817 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 167:
+#line 1817 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 168:
+#line 1828 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    break;}
-case 168:
-#line 1835 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+  ;}
+    break;
+
+  case 169:
+#line 1833 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    break;}
-case 171:
-#line 1848 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.isDeclare = false ;
-    break;}
-case 172:
-#line 1848 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 172:
+#line 1846 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = false ;}
+    break;
+
+  case 173:
+#line 1846 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 173:
-#line 1852 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.isDeclare = true; ;
-    break;}
-case 174:
-#line 1852 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 174:
+#line 1850 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = true; ;}
+    break;
+
+  case 175:
+#line 1850 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 175:
-#line 1855 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 176:
+#line 1853 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 176:
-#line 1858 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 177:
+#line 1856 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
       const ValID &DID = CurModule.LateResolveTypes.begin()->first;
@@ -3502,13 +4247,14 @@
       }
     }
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 177:
-#line 1870 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 178:
+#line 1868 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -3518,256 +4264,283 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    ResolveTypeTo(yyvsp[-2].StrVal, *yyvsp[0].TypeVal);
+    ResolveTypeTo((yyvsp[-2].StrVal), *(yyvsp[0].TypeVal));
 
-    if (!setTypeName(*yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName(*(yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(*yyvsp[0].TypeVal);
+      CurModule.Types.push_back(*(yyvsp[0].TypeVal));
     }
 
-    delete yyvsp[0].TypeVal;
+    delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 178:
-#line 1894 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].PrimType);
+  ;}
+    break;
+
+  case 179:
+#line 1892 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
-    if (!setTypeName(yyvsp[0].PrimType, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName((yyvsp[0].PrimType), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(yyvsp[0].PrimType);
+      CurModule.Types.push_back((yyvsp[0].PrimType));
     }
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 179:
-#line 1905 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ /* "Externally Visible" Linkage */
-    if (yyvsp[0].ConstVal == 0) 
+  ;}
+    break;
+
+  case 180:
+#line 1903 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { /* "Externally Visible" Linkage */
+    if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage,
-                                yyvsp[-2].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal);
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage,
+                                (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 180:
-#line 1911 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 181:
+#line 1909 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 181:
-#line 1914 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].ConstVal == 0) 
+  ;}
+    break;
+
+  case 182:
+#line 1912 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable(yyvsp[-4].StrVal, yyvsp[-3].Linkage, yyvsp[-2].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal);
+    CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 182:
-#line 1919 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 183:
+#line 1917 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 183:
-#line 1922 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 184:
+#line 1920 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    CurGV = ParseGlobalVariable(yyvsp[-4].StrVal, yyvsp[-3].Linkage, yyvsp[-2].Visibility, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+    CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
-    delete yyvsp[0].TypeVal;
-  ;
-    break;}
-case 184:
-#line 1928 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[0].TypeVal);
+  ;}
+    break;
+
+  case 185:
+#line 1926 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 185:
-#line 1932 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 186:
-#line 1935 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 186:
+#line 1930 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { 
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 187:
-#line 1941 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 187:
+#line 1933 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 188:
+#line 1939 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
-  char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
-  std::string NewAsm(yyvsp[0].StrVal, EndStr);
-  free(yyvsp[0].StrVal);
+  char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
+  std::string NewAsm((yyvsp[0].StrVal), EndStr);
+  free((yyvsp[0].StrVal));
 
   if (AsmSoFar.empty())
     CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
   else
     CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
   CHECK_FOR_ERROR
-;
-    break;}
-case 188:
-#line 1954 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Endianness = Module::BigEndian; ;
-    break;}
-case 189:
-#line 1955 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Endianness = Module::LittleEndian; ;
-    break;}
-case 190:
-#line 1957 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurModule.CurrentModule->setEndianness(yyvsp[0].Endianness);
+;}
+    break;
+
+  case 189:
+#line 1952 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Endianness) = Module::BigEndian; ;}
+    break;
+
+  case 190:
+#line 1953 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Endianness) = Module::LittleEndian; ;}
+    break;
+
+  case 191:
+#line 1955 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 191:
-#line 1961 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].UInt64Val == 32)
+  ;}
+    break;
+
+  case 192:
+#line 1959 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
-    else if (yyvsp[0].UInt64Val == 64)
+    else if ((yyvsp[0].UInt64Val) == 64)
       CurModule.CurrentModule->setPointerSize(Module::Pointer64);
     else
-      GEN_ERROR("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'!");
+      GEN_ERROR("Invalid pointer size: '" + utostr((yyvsp[0].UInt64Val)) + "'!");
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 192:
-#line 1970 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 193:
-#line 1974 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 195:
-#line 1981 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-          free(yyvsp[0].StrVal);
+  ;}
+    break;
+
+  case 193:
+#line 1968 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
+    free((yyvsp[0].StrVal));
+  ;}
+    break;
+
+  case 194:
+#line 1972 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
+    free((yyvsp[0].StrVal));
+  ;}
+    break;
+
+  case 196:
+#line 1979 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+          free((yyvsp[0].StrVal));
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 196:
-#line 1986 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-          free(yyvsp[0].StrVal);
+        ;}
+    break;
+
+  case 197:
+#line 1984 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+          free((yyvsp[0].StrVal));
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 197:
-#line 1991 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 198:
+#line 1989 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 201:
-#line 2001 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 202:
-#line 2003 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 202:
+#line 1999 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 203:
+#line 2001 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid!");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = yyvsp[-4].ArgList;
-    yyvsp[-4].ArgList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 203:
-#line 2013 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
+    (yyval.ArgList) = (yyvsp[-4].ArgList);
+    (yyvsp[-4].ArgList)->push_back(E);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 204:
+#line 2011 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid!");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = new ArgListType;
-    yyval.ArgList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 204:
-#line 2024 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = yyvsp[0].ArgList;
+    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
+    (yyval.ArgList) = new ArgListType;
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 205:
-#line 2028 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = yyvsp[-2].ArgList;
+  ;}
+    break;
+
+  case 205:
+#line 2022 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[0].ArgList);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 206:
+#line 2026 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = FunctionType::NoAttributeSet;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 206:
-#line 2037 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = new ArgListType;
+  ;}
+    break;
+
+  case 207:
+#line 2035 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = FunctionType::NoAttributeSet;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 207:
-#line 2046 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = 0;
+  ;}
+    break;
+
+  case 208:
+#line 2044 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 208:
-#line 2052 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  UnEscapeLexed(yyvsp[-6].StrVal);
-  std::string FunctionName(yyvsp[-6].StrVal);
-  free(yyvsp[-6].StrVal);  // Free strdup'd memory!
+  ;}
+    break;
+
+  case 209:
+#line 2050 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  UnEscapeLexed((yyvsp[-6].StrVal));
+  std::string FunctionName((yyvsp[-6].StrVal));
+  free((yyvsp[-6].StrVal));  // Free strdup'd memory!
   
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
-  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(yyvsp[-7].TypeVal))
-    GEN_ERROR("Reference to abstract result: "+ yyvsp[-7].TypeVal->get()->getDescription());
+  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[-7].TypeVal)))
+    GEN_ERROR("Reference to abstract result: "+ (yyvsp[-7].TypeVal)->get()->getDescription());
 
   std::vector<const Type*> ParamTypeList;
   std::vector<FunctionType::ParameterAttributes> ParamAttrs;
-  ParamAttrs.push_back(yyvsp[-2].ParamAttrs);
-  if (yyvsp[-4].ArgList) {   // If there are arguments...
-    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); I != yyvsp[-4].ArgList->end(); ++I) {
+  ParamAttrs.push_back((yyvsp[-2].ParamAttrs));
+  if ((yyvsp[-4].ArgList)) {   // If there are arguments...
+    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -3780,10 +4553,10 @@
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  FunctionType *FT = FunctionType::get(*yyvsp[-7].TypeVal, ParamTypeList, isVarArg,
+  FunctionType *FT = FunctionType::get(*(yyvsp[-7].TypeVal), ParamTypeList, isVarArg,
                                        ParamAttrs);
   const PointerType *PFT = PointerType::get(FT);
-  delete yyvsp[-7].TypeVal;
+  delete (yyvsp[-7].TypeVal);
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -3828,24 +4601,24 @@
     Fn->setLinkage(CurFun.Linkage);
     Fn->setVisibility(CurFun.Visibility);
   }
-  Fn->setCallingConv(yyvsp[-8].UIntVal);
-  Fn->setAlignment(yyvsp[0].UIntVal);
-  if (yyvsp[-1].StrVal) {
-    Fn->setSection(yyvsp[-1].StrVal);
-    free(yyvsp[-1].StrVal);
+  Fn->setCallingConv((yyvsp[-8].UIntVal));
+  Fn->setAlignment((yyvsp[0].UIntVal));
+  if ((yyvsp[-1].StrVal)) {
+    Fn->setSection((yyvsp[-1].StrVal));
+    free((yyvsp[-1].StrVal));
   }
 
   // Add all of the arguments we parsed to the function...
-  if (yyvsp[-4].ArgList) {                     // Is null if empty...
+  if ((yyvsp[-4].ArgList)) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert(yyvsp[-4].ArgList->back().Ty->get() == Type::VoidTy && yyvsp[-4].ArgList->back().Name == 0&&
+      assert((yyvsp[-4].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[-4].ArgList)->back().Name == 0&&
              "Not a varargs marker!");
-      delete yyvsp[-4].ArgList->back().Ty;
-      yyvsp[-4].ArgList->pop_back();  // Delete the last entry
+      delete (yyvsp[-4].ArgList)->back().Ty;
+      (yyvsp[-4].ArgList)->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); I != yyvsp[-4].ArgList->end(); ++I, ++ArgIt) {
+    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);           // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -3853,114 +4626,128 @@
       Idx++;
     }
 
-    delete yyvsp[-4].ArgList;                     // We're now done with the argument list
+    delete (yyvsp[-4].ArgList);                     // We're now done with the argument list
   }
   CHECK_FOR_ERROR
-;
-    break;}
-case 211:
-#line 2159 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = CurFun.CurrentFunction;
+;}
+    break;
+
+  case 212:
+#line 2157 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.FunctionVal) = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage);
-  yyval.FunctionVal->setVisibility(yyvsp[-2].Visibility);
-;
-    break;}
-case 214:
-#line 2170 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = yyvsp[-1].FunctionVal;
+  (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility));
+;}
+    break;
+
+  case 215:
+#line 2168 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 215:
-#line 2175 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurFun.CurrentFunction->setLinkage(yyvsp[-2].Linkage);
-    CurFun.CurrentFunction->setVisibility(yyvsp[-1].Visibility);
-    yyval.FunctionVal = CurFun.CurrentFunction;
+;}
+    break;
+
+  case 216:
+#line 2173 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
+    CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
+    (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 216:
-#line 2187 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 217:
+#line 2185 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 217:
-#line 2191 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 218:
+#line 2189 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 218:
-#line 2196 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{    // A reference to a direct constant
-    yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 219:
-#line 2200 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
+  ;}
+    break;
+
+  case 219:
+#line 2194 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {    // A reference to a direct constant
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 220:
-#line 2204 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                     // Perhaps it's an FP constant?
-    yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 221:
-#line 2208 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(ConstantInt::getTrue());
+  ;}
+    break;
+
+  case 220:
+#line 2198 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 222:
-#line 2212 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(ConstantInt::getFalse());
+  ;}
+    break;
+
+  case 221:
+#line 2202 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                     // Perhaps it's an FP constant?
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 223:
-#line 2216 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createNull();
+  ;}
+    break;
+
+  case 222:
+#line 2206 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 224:
-#line 2220 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createUndef();
+  ;}
+    break;
+
+  case 223:
+#line 2210 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 224:
+#line 2214 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createNull();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 225:
+#line 2218 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createUndef();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 226:
+#line 2222 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {     // A vector zero constant.
+    (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 225:
-#line 2224 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{     // A vector zero constant.
-    yyval.ValIDVal = ValID::createZeroInit();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 226:
-#line 2228 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized packed vector
-    const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
-    int NumElements = yyvsp[-1].ConstVector->size(); 
+  ;}
+    break;
+
+  case 227:
+#line 2226 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized packed vector
+    const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
+    int NumElements = (yyvsp[-1].ConstVector)->size(); 
     
     PackedType* pt = PackedType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -3972,105 +4759,115 @@
                                          );
     
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                      ETy->getDescription() +"' as required!\nIt is of type '" +
-                     (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                     (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ValIDVal = ValID::create(ConstantPacked::get(pt, *yyvsp[-1].ConstVector));
-    delete PTy; delete yyvsp[-1].ConstVector;
+    (yyval.ValIDVal) = ValID::create(ConstantPacked::get(pt, *(yyvsp[-1].ConstVector)));
+    delete PTy; delete (yyvsp[-1].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 227:
-#line 2253 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 228:
+#line 2251 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 228:
-#line 2257 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
-    std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
-    End = UnEscapeLexed(yyvsp[0].StrVal, true);
-    std::string Constraints = std::string(yyvsp[0].StrVal, End);
-    yyval.ValIDVal = ValID::createInlineAsm(AsmStr, Constraints, yyvsp[-3].BoolVal);
-    free(yyvsp[-2].StrVal);
-    free(yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 229:
-#line 2271 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{  // Is it an integer reference...?
-    yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 230:
-#line 2275 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Is it a named reference...?
-    yyval.ValIDVal = ValID::create(yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 233:
-#line 2287 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 229:
+#line 2255 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
+    std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
+    End = UnEscapeLexed((yyvsp[0].StrVal), true);
+    std::string Constraints = std::string((yyvsp[0].StrVal), End);
+    (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[-3].BoolVal));
+    free((yyvsp[-2].StrVal));
+    free((yyvsp[0].StrVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 230:
+#line 2269 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {  // Is it an integer reference...?
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 231:
+#line 2273 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                   // Is it a named reference...?
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 234:
+#line 2285 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); 
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 234:
-#line 2296 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); 
+    delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 235:
-#line 2300 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Do not allow functions with 0 basic blocks   
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 236:
-#line 2309 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
+  ;}
+    break;
+
+  case 235:
+#line 2294 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 236:
+#line 2298 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { // Do not allow functions with 0 basic blocks   
+    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 237:
+#line 2307 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+    CHECK_FOR_ERROR
+    InsertValue((yyvsp[0].TermInstVal));
+
+    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
+    InsertValue((yyvsp[-2].BasicBlockVal));
+    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
     CHECK_FOR_ERROR
-    InsertValue(yyvsp[0].TermInstVal);
+  ;}
+    break;
 
-    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal);
-    InsertValue(yyvsp[-2].BasicBlockVal);
-    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 237:
-#line 2320 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (CastInst *CI1 = dyn_cast<CastInst>(yyvsp[0].InstVal))
+  case 238:
+#line 2318 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
         if (CI2->getParent() == 0)
-          yyvsp[-1].BasicBlockVal->getInstList().push_back(CI2);
-    yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
-    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 238:
-#line 2329 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BasicBlockVal = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+          (yyvsp[-1].BasicBlockVal)->getInstList().push_back(CI2);
+    (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal));
+    (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 239:
+#line 2327 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BasicBlockVal) = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
 
     // Make sure to move the basic block to the correct location in the
@@ -4078,14 +4875,15 @@
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
+    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 239:
-#line 2341 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BasicBlockVal = getBBVal(ValID::create(yyvsp[0].StrVal), true);
+  ;}
+    break;
+
+  case 240:
+#line 2339 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BasicBlockVal) = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
 
     // Make sure to move the basic block to the correct location in the
@@ -4093,93 +4891,100 @@
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
+    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 240:
-#line 2354 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{              // Return with a result...
-    yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 241:
-#line 2358 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                                       // Return with no result...
-    yyval.TermInstVal = new ReturnInst();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 242:
-#line 2362 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                         // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TermInstVal = new BranchInst(tmpBB);
-  ;
-    break;}
-case 243:
-#line 2367 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{  
-    assert(cast<IntegerType>(yyvsp[-7].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TermInstVal = new BranchInst(tmpBBA, tmpBBB, tmpVal);
-  ;
-    break;}
-case 244:
-#line 2377 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
+  ;}
+    break;
+
+  case 241:
+#line 2352 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {              // Return with a result...
+    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 242:
+#line 2356 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                                       // Return with no result...
+    (yyval.TermInstVal) = new ReturnInst();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 243:
+#line 2360 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {                         // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.TermInstVal) = new BranchInst(tmpBB);
+  ;}
+    break;
+
+  case 244:
+#line 2365 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {  
+    assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
-    yyval.TermInstVal = S;
+    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+  ;}
+    break;
+
+  case 245:
+#line 2375 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
+    CHECK_FOR_ERROR
+    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
+    (yyval.TermInstVal) = S;
 
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
-      E = yyvsp[-1].JumpTable->end();
+    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[-1].JumpTable)->begin(),
+      E = (yyvsp[-1].JumpTable)->end();
     for (; I != E; ++I) {
       if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
           S->addCase(CI, I->second);
       else
         GEN_ERROR("Switch case is constant, but not a simple integer!");
     }
-    delete yyvsp[-1].JumpTable;
+    delete (yyvsp[-1].JumpTable);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 245:
-#line 2396 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
+  ;}
+    break;
+
+  case 246:
+#line 2394 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
     CHECK_FOR_ERROR
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    yyval.TermInstVal = S;
+    (yyval.TermInstVal) = S;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 246:
-#line 2406 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 247:
+#line 2404 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-11].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-11].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       FunctionType::ParamAttrsList ParamAttrs;
-      ParamAttrs.push_back(yyvsp[-6].ParamAttrs);
-      for (ValueRefList::iterator I = yyvsp[-8].ValueRefList->begin(), E = yyvsp[-8].ValueRefList->end(); I != E; ++I) {
+      ParamAttrs.push_back((yyvsp[-6].ParamAttrs));
+      for (ValueRefList::iterator I = (yyvsp[-8].ValueRefList)->begin(), E = (yyvsp[-8].ValueRefList)->end(); I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
@@ -4187,20 +4992,20 @@
         ParamAttrs.push_back(I->Attrs);
       }
 
-      Ty = FunctionType::get(yyvsp[-11].TypeVal->get(), ParamTypes, false, ParamAttrs);
+      Ty = FunctionType::get((yyvsp[-11].TypeVal)->get(), ParamTypes, false, ParamAttrs);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, yyvsp[-10].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[-10].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
-    BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
 
     // Check the arguments
     ValueList Args;
-    if (yyvsp[-8].ValueRefList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[-8].ValueRefList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -4210,7 +5015,7 @@
       // correctly!
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = yyvsp[-8].ValueRefList->begin(), ArgE = yyvsp[-8].ValueRefList->end();
+      ValueRefList::iterator ArgI = (yyvsp[-8].ValueRefList)->begin(), ArgE = (yyvsp[-8].ValueRefList)->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -4229,327 +5034,353 @@
 
     // Create the InvokeInst
     InvokeInst *II = new InvokeInst(V, Normal, Except, Args);
-    II->setCallingConv(yyvsp[-12].UIntVal);
-    yyval.TermInstVal = II;
-    delete yyvsp[-8].ValueRefList;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 247:
-#line 2472 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TermInstVal = new UnwindInst();
+    II->setCallingConv((yyvsp[-12].UIntVal));
+    (yyval.TermInstVal) = II;
+    delete (yyvsp[-8].ValueRefList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 248:
-#line 2476 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TermInstVal = new UnreachableInst();
+  ;}
+    break;
+
+  case 248:
+#line 2470 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 249:
-#line 2483 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.JumpTable = yyvsp[-5].JumpTable;
-    Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+  ;}
+    break;
+
+  case 249:
+#line 2474 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnreachableInst();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 250:
+#line 2481 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.JumpTable) = (yyvsp[-5].JumpTable);
+    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value!");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
-  ;
-    break;}
-case 250:
-#line 2494 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+  ;}
+    break;
+
+  case 251:
+#line 2492 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value!");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
-  ;
-    break;}
-case 251:
-#line 2507 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+  ;}
+    break;
+
+  case 252:
+#line 2505 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
   // Is this definition named?? if so, assign the name...
-  setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
+  setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
   CHECK_FOR_ERROR
-  InsertValue(yyvsp[0].InstVal);
-  yyval.InstVal = yyvsp[0].InstVal;
+  InsertValue((yyvsp[0].InstVal));
+  (yyval.InstVal) = (yyvsp[0].InstVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 252:
-#line 2516 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{    // Used for PHI nodes
+;}
+    break;
+
+  case 253:
+#line 2514 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {    // Used for PHI nodes
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-5].TypeVal)->getDescription());
-    yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
-    Value* tmpVal = getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal);
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-    delete yyvsp[-5].TypeVal;
-  ;
-    break;}
-case 253:
-#line 2527 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.PHIList = yyvsp[-6].PHIList;
-    Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
+    (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
+    Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+    delete (yyvsp[-5].TypeVal);
+  ;}
+    break;
+
+  case 254:
+#line 2525 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.PHIList) = (yyvsp[-6].PHIList);
+    Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
-    yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-  ;
-    break;}
-case 254:
-#line 2537 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{    
+    (yyvsp[-6].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+  ;}
+    break;
+
+  case 255:
+#line 2535 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {    
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
     // Used for call and invoke instructions
-    yyval.ValueRefList = new ValueRefList();
-    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ValueRefList->push_back(E);
-  ;
-    break;}
-case 255:
-#line 2545 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.ValueRefList) = new ValueRefList();
+    ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal));
+    (yyval.ValueRefList)->push_back(E);
+  ;}
+    break;
+
+  case 256:
+#line 2543 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    yyval.ValueRefList = yyvsp[-4].ValueRefList;
-    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ValueRefList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 256:
-#line 2553 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ValueRefList = new ValueRefList(); ;
-    break;}
-case 257:
-#line 2556 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ValueList = new std::vector<Value*>(); ;
-    break;}
-case 258:
-#line 2557 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValueList = yyvsp[-2].ValueList;
-    yyval.ValueList->push_back(yyvsp[0].ValueVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    (yyval.ValueRefList) = (yyvsp[-4].ValueRefList);
+    ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal));
+    (yyval.ValueRefList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 259:
-#line 2564 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 257:
+#line 2551 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueRefList) = new ValueRefList(); ;}
+    break;
+
+  case 258:
+#line 2554 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueList) = new std::vector<Value*>(); ;}
+    break;
+
+  case 259:
+#line 2555 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValueList) = (yyvsp[-2].ValueList);
+    (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 260:
-#line 2568 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 260:
+#line 2562 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 261:
-#line 2573 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 261:
+#line 2566 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 262:
+#line 2571 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
-        !isa<PackedType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
+        !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*yyvsp[-3].TypeVal).get()) && 
-        (yyvsp[-4].BinaryOpVal == Instruction::URem || 
-         yyvsp[-4].BinaryOpVal == Instruction::SRem ||
-         yyvsp[-4].BinaryOpVal == Instruction::FRem))
+    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && 
+        ((yyvsp[-4].BinaryOpVal) == Instruction::URem || 
+         (yyvsp[-4].BinaryOpVal) == Instruction::SRem ||
+         (yyvsp[-4].BinaryOpVal) == Instruction::FRem))
       GEN_ERROR("U/S/FRem not supported on packed types!");
-    Value* val1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal); 
+    Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); 
     CHECK_FOR_ERROR
-    Value* val2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, val1, val2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null!");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 262:
-#line 2594 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 263:
+#line 2592 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger()) {
-      if (!isa<PackedType>(yyvsp[-3].TypeVal->get()) ||
-          !cast<PackedType>(yyvsp[-3].TypeVal->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    if (!(*(yyvsp[-3].TypeVal))->isInteger()) {
+      if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
+          !cast<PackedType>((yyvsp[-3].TypeVal)->get())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands!");
     }
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null!");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 263:
-#line 2611 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 264:
+#line 2609 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<PackedType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by icmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].IPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].IPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("icmp operator returned null!");
-  ;
-    break;}
-case 264:
-#line 2624 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 265:
+#line 2622 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<PackedType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
+    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by fcmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].FPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].FPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("fcmp operator returned null!");
-  ;
-    break;}
-case 265:
-#line 2637 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].ValueVal->getType() != Type::Int8Ty)
+  ;}
+    break;
+
+  case 266:
+#line 2635 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[0].ValueVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift amount must be i8 type!");
-    if (!yyvsp[-2].ValueVal->getType()->isInteger())
+    if (!(yyvsp[-2].ValueVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
     CHECK_FOR_ERROR;
-    yyval.InstVal = new ShiftInst(yyvsp[-3].OtherOpVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 266:
-#line 2646 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 267:
+#line 2644 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    Value* Val = yyvsp[-2].ValueVal;
-    const Type* Ty = yyvsp[0].TypeVal->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast from a non-primitive type: '" +
-                Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!");
-    yyval.InstVal = CastInst::create(yyvsp[-3].CastOpVal, Val, yyvsp[0].TypeVal->get());
-    delete yyvsp[0].TypeVal;
-  ;
-    break;}
-case 267:
-#line 2659 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-4].ValueVal->getType() != Type::Int1Ty)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+    Value* Val = (yyvsp[-2].ValueVal);
+    const Type* DestTy = (yyvsp[0].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[-3].CastOpVal), Val, DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal), Val, DestTy);
+    delete (yyvsp[0].TypeVal);
+  ;}
+    break;
+
+  case 268:
+#line 2656 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean!");
-    if (yyvsp[-2].ValueVal->getType() != yyvsp[0].ValueVal->getType())
+    if ((yyvsp[-2].ValueVal)->getType() != (yyvsp[0].ValueVal)->getType())
       GEN_ERROR("select value types should match!");
-    yyval.InstVal = new SelectInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new SelectInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 268:
-#line 2667 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 269:
+#line 2664 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
-    delete yyvsp[0].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 269:
-#line 2674 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+    (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
+    delete (yyvsp[0].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 270:
+#line 2671 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
-    yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 270:
-#line 2680 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 271:
+#line 2677 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
-    yyval.InstVal = new InsertElementInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 271:
-#line 2686 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 272:
+#line 2683 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
-    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 272:
-#line 2692 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
+  ;}
+    break;
+
+  case 273:
+#line 2689 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
       GEN_ERROR("PHI node operands must be of first class type!");
-    yyval.InstVal = new PHINode(Ty);
-    ((PHINode*)yyval.InstVal)->reserveOperandSpace(yyvsp[0].PHIList->size());
-    while (yyvsp[0].PHIList->begin() != yyvsp[0].PHIList->end()) {
-      if (yyvsp[0].PHIList->front().first->getType() != Ty) 
+    (yyval.InstVal) = new PHINode(Ty);
+    ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[0].PHIList)->size());
+    while ((yyvsp[0].PHIList)->begin() != (yyvsp[0].PHIList)->end()) {
+      if ((yyvsp[0].PHIList)->front().first->getType() != Ty) 
         GEN_ERROR("All elements of a PHI node must be of the same type!");
-      cast<PHINode>(yyval.InstVal)->addIncoming(yyvsp[0].PHIList->front().first, yyvsp[0].PHIList->front().second);
-      yyvsp[0].PHIList->pop_front();
+      cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[0].PHIList)->front().first, (yyvsp[0].PHIList)->front().second);
+      (yyvsp[0].PHIList)->pop_front();
     }
-    delete yyvsp[0].PHIList;  // Free the list...
+    delete (yyvsp[0].PHIList);  // Free the list...
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 273:
-#line 2708 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 274:
+#line 2705 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-5].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-5].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       FunctionType::ParamAttrsList ParamAttrs;
-      ParamAttrs.push_back(yyvsp[0].ParamAttrs);
-      for (ValueRefList::iterator I = yyvsp[-2].ValueRefList->begin(), E = yyvsp[-2].ValueRefList->end(); I != E; ++I) {
+      ParamAttrs.push_back((yyvsp[0].ParamAttrs));
+      for (ValueRefList::iterator I = (yyvsp[-2].ValueRefList)->begin(), E = (yyvsp[-2].ValueRefList)->end(); I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
@@ -4557,16 +5388,16 @@
         ParamAttrs.push_back(I->Attrs);
       }
 
-      Ty = FunctionType::get(yyvsp[-5].TypeVal->get(), ParamTypes, false, ParamAttrs);
+      Ty = FunctionType::get((yyvsp[-5].TypeVal)->get(), ParamTypes, false, ParamAttrs);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, yyvsp[-4].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[-4].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
 
     // Check the arguments 
     ValueList Args;
-    if (yyvsp[-2].ValueRefList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[-2].ValueRefList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -4577,7 +5408,7 @@
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = yyvsp[-2].ValueRefList->begin(), ArgE = yyvsp[-2].ValueRefList->end();
+      ValueRefList::iterator ArgI = (yyvsp[-2].ValueRefList)->begin(), ArgE = (yyvsp[-2].ValueRefList)->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -4594,364 +5425,427 @@
     }
     // Create the call node
     CallInst *CI = new CallInst(V, Args);
-    CI->setTailCall(yyvsp[-7].BoolVal);
-    CI->setCallingConv(yyvsp[-6].UIntVal);
-    yyval.InstVal = CI;
-    delete yyvsp[-2].ValueRefList;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 274:
-#line 2770 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.InstVal = yyvsp[0].InstVal;
+    CI->setTailCall((yyvsp[-7].BoolVal));
+    CI->setCallingConv((yyvsp[-6].UIntVal));
+    (yyval.InstVal) = CI;
+    delete (yyvsp[-2].ValueRefList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 275:
-#line 2775 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 275:
+#line 2767 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 276:
-#line 2779 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 276:
+#line 2772 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 277:
-#line 2786 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 277:
+#line 2776 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 278:
+#line 2783 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 278:
-#line 2793 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
+    delete (yyvsp[-1].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 279:
+#line 2790 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  ;
-    break;}
-case 279:
-#line 2801 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
+    delete (yyvsp[-4].TypeVal);
+  ;}
+    break;
+
+  case 280:
+#line 2798 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 280:
-#line 2808 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
+    delete (yyvsp[-1].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 281:
+#line 2805 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new AllocaInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  ;
-    break;}
-case 281:
-#line 2816 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
+    delete (yyvsp[-4].TypeVal);
+  ;}
+    break;
+
+  case 282:
+#line 2813 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
-                     yyvsp[0].ValueVal->getType()->getDescription() + "!");
-    yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
+                     (yyvsp[0].ValueVal)->getType()->getDescription() + "!");
+    (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 282:
-#line 2824 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 283:
+#line 2821 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-1].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*yyvsp[-1].TypeVal)->getDescription());
-    if (!cast<PointerType>(yyvsp[-1].TypeVal->get())->getElementType()->isFirstClassType())
+                     (*(yyvsp[-1].TypeVal))->getDescription());
+    if (!cast<PointerType>((yyvsp[-1].TypeVal)->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*yyvsp[-1].TypeVal)->getDescription());
-    Value* tmpVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal);
+                     (*(yyvsp[-1].TypeVal))->getDescription());
+    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new LoadInst(tmpVal, "", yyvsp[-3].BoolVal);
-    delete yyvsp[-1].TypeVal;
-  ;
-    break;}
-case 283:
-#line 2838 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal));
+    delete (yyvsp[-1].TypeVal);
+  ;}
+    break;
+
+  case 284:
+#line 2835 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *PT = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
+    const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*yyvsp[-1].TypeVal)->getDescription());
+                     (*(yyvsp[-1].TypeVal))->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != yyvsp[-3].ValueVal->getType())
-      GEN_ERROR("Can't store '" + yyvsp[-3].ValueVal->getType()->getDescription() +
+    if (ElTy != (yyvsp[-3].ValueVal)->getType())
+      GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal)->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'!");
 
-    Value* tmpVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new StoreInst(yyvsp[-3].ValueVal, tmpVal, yyvsp[-5].BoolVal);
-    delete yyvsp[-1].TypeVal;
-  ;
-    break;}
-case 284:
-#line 2855 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal), tmpVal, (yyvsp[-5].BoolVal));
+    delete (yyvsp[-1].TypeVal);
+  ;}
+    break;
+
+  case 285:
+#line 2852 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
 
-    if (!GetElementPtrInst::getIndexedType(*yyvsp[-2].TypeVal, *yyvsp[0].ValueList, true))
+    if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), *(yyvsp[0].ValueList), true))
       GEN_ERROR("Invalid getelementptr indices for type '" +
-                     (*yyvsp[-2].TypeVal)->getDescription()+ "'!");
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+                     (*(yyvsp[-2].TypeVal))->getDescription()+ "'!");
+    Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new GetElementPtrInst(tmpVal, *yyvsp[0].ValueList);
-    delete yyvsp[-2].TypeVal; 
-    delete yyvsp[0].ValueList;
-  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+    (yyval.InstVal) = new GetElementPtrInst(tmpVal, *(yyvsp[0].ValueList));
+    delete (yyvsp[-2].TypeVal); 
+    delete (yyvsp[0].ValueList);
+  ;}
+    break;
+
+
+      default: break;
+    }
+
+/* Line 1126 of yacc.c.  */
+#line 5581 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
+
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
+	  int yytype = YYTRANSLATE (yychar);
+	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+	  YYSIZE_T yysize = yysize0;
+	  YYSIZE_T yysize1;
+	  int yysize_overflow = 0;
+	  char *yymsg = 0;
+#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+	  int yyx;
 
-	      if (count < 5)
+#if 0
+	  /* This is so xgettext sees the translatable formats that are
+	     constructed on the fly.  */
+	  YY_("syntax error, unexpected %s");
+	  YY_("syntax error, unexpected %s, expecting %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+	  char *yyfmt;
+	  char const *yyf;
+	  static char const yyunexpected[] = "syntax error, unexpected %s";
+	  static char const yyexpecting[] = ", expecting %s";
+	  static char const yyor[] = " or %s";
+	  char yyformat[sizeof yyunexpected
+			+ sizeof yyexpecting - 1
+			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+			   * (sizeof yyor - 1))];
+	  char const *yyprefix = yyexpecting;
+
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 1;
+
+	  yyarg[0] = yytname[yytype];
+	  yyfmt = yystpcpy (yyformat, yyunexpected);
+
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      {
+		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+		  {
+		    yycount = 1;
+		    yysize = yysize0;
+		    yyformat[sizeof yyunexpected - 1] = '\0';
+		    break;
+		  }
+		yyarg[yycount++] = yytname[yyx];
+		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+		yysize_overflow |= yysize1 < yysize;
+		yysize = yysize1;
+		yyfmt = yystpcpy (yyfmt, yyprefix);
+		yyprefix = yyor;
+	      }
+
+	  yyf = YY_(yyformat);
+	  yysize1 = yysize + yystrlen (yyf);
+	  yysize_overflow |= yysize1 < yysize;
+	  yysize = yysize1;
+
+	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+	    yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg)
+	    {
+	      /* Avoid sprintf, as that infringes on the user's name space.
+		 Don't have undefined behavior even if the translation
+		 produced a string with the wrong number of "%s"s.  */
+	      char *yyp = yymsg;
+	      int yyi = 0;
+	      while ((*yyp = *yyf))
 		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+	yyerror (YY_("syntax error"));
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
+
 
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+        {
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+        }
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-  goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (0)
+     goto yyerrorlab;
 
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  for (;;)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
+
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK;
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 2872 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+
+
+#line 2869 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
@@ -5001,3 +5895,4 @@
   GenerateError(errMsg);
   return 0;
 }
+


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.43 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.44
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.43	Sun Jan 14 20:12:07 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Tue Jan 16 20:48:45 2007
@@ -1,4 +1,304 @@
-typedef union {
+/* A Bison parser, made by GNU Bison 2.1.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ESINT64VAL = 258,
+     EUINT64VAL = 259,
+     SINTVAL = 260,
+     UINTVAL = 261,
+     FPVAL = 262,
+     VOID = 263,
+     INTTYPE = 264,
+     FLOAT = 265,
+     DOUBLE = 266,
+     LABEL = 267,
+     TYPE = 268,
+     VAR_ID = 269,
+     LABELSTR = 270,
+     STRINGCONSTANT = 271,
+     IMPLEMENTATION = 272,
+     ZEROINITIALIZER = 273,
+     TRUETOK = 274,
+     FALSETOK = 275,
+     BEGINTOK = 276,
+     ENDTOK = 277,
+     DECLARE = 278,
+     DEFINE = 279,
+     GLOBAL = 280,
+     CONSTANT = 281,
+     SECTION = 282,
+     VOLATILE = 283,
+     TO = 284,
+     DOTDOTDOT = 285,
+     NULL_TOK = 286,
+     UNDEF = 287,
+     INTERNAL = 288,
+     LINKONCE = 289,
+     WEAK = 290,
+     APPENDING = 291,
+     DLLIMPORT = 292,
+     DLLEXPORT = 293,
+     EXTERN_WEAK = 294,
+     OPAQUE = 295,
+     EXTERNAL = 296,
+     TARGET = 297,
+     TRIPLE = 298,
+     ENDIAN = 299,
+     POINTERSIZE = 300,
+     LITTLE = 301,
+     BIG = 302,
+     ALIGN = 303,
+     DEPLIBS = 304,
+     CALL = 305,
+     TAIL = 306,
+     ASM_TOK = 307,
+     MODULE = 308,
+     SIDEEFFECT = 309,
+     CC_TOK = 310,
+     CCC_TOK = 311,
+     CSRETCC_TOK = 312,
+     FASTCC_TOK = 313,
+     COLDCC_TOK = 314,
+     X86_STDCALLCC_TOK = 315,
+     X86_FASTCALLCC_TOK = 316,
+     DATALAYOUT = 317,
+     RET = 318,
+     BR = 319,
+     SWITCH = 320,
+     INVOKE = 321,
+     UNWIND = 322,
+     UNREACHABLE = 323,
+     ADD = 324,
+     SUB = 325,
+     MUL = 326,
+     UDIV = 327,
+     SDIV = 328,
+     FDIV = 329,
+     UREM = 330,
+     SREM = 331,
+     FREM = 332,
+     AND = 333,
+     OR = 334,
+     XOR = 335,
+     ICMP = 336,
+     FCMP = 337,
+     EQ = 338,
+     NE = 339,
+     SLT = 340,
+     SGT = 341,
+     SLE = 342,
+     SGE = 343,
+     ULT = 344,
+     UGT = 345,
+     ULE = 346,
+     UGE = 347,
+     OEQ = 348,
+     ONE = 349,
+     OLT = 350,
+     OGT = 351,
+     OLE = 352,
+     OGE = 353,
+     ORD = 354,
+     UNO = 355,
+     UEQ = 356,
+     UNE = 357,
+     MALLOC = 358,
+     ALLOCA = 359,
+     FREE = 360,
+     LOAD = 361,
+     STORE = 362,
+     GETELEMENTPTR = 363,
+     TRUNC = 364,
+     ZEXT = 365,
+     SEXT = 366,
+     FPTRUNC = 367,
+     FPEXT = 368,
+     BITCAST = 369,
+     UITOFP = 370,
+     SITOFP = 371,
+     FPTOUI = 372,
+     FPTOSI = 373,
+     INTTOPTR = 374,
+     PTRTOINT = 375,
+     PHI_TOK = 376,
+     SELECT = 377,
+     SHL = 378,
+     LSHR = 379,
+     ASHR = 380,
+     VAARG = 381,
+     EXTRACTELEMENT = 382,
+     INSERTELEMENT = 383,
+     SHUFFLEVECTOR = 384,
+     NORETURN = 385,
+     DEFAULT = 386,
+     HIDDEN = 387
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define SINTVAL 260
+#define UINTVAL 261
+#define FPVAL 262
+#define VOID 263
+#define INTTYPE 264
+#define FLOAT 265
+#define DOUBLE 266
+#define LABEL 267
+#define TYPE 268
+#define VAR_ID 269
+#define LABELSTR 270
+#define STRINGCONSTANT 271
+#define IMPLEMENTATION 272
+#define ZEROINITIALIZER 273
+#define TRUETOK 274
+#define FALSETOK 275
+#define BEGINTOK 276
+#define ENDTOK 277
+#define DECLARE 278
+#define DEFINE 279
+#define GLOBAL 280
+#define CONSTANT 281
+#define SECTION 282
+#define VOLATILE 283
+#define TO 284
+#define DOTDOTDOT 285
+#define NULL_TOK 286
+#define UNDEF 287
+#define INTERNAL 288
+#define LINKONCE 289
+#define WEAK 290
+#define APPENDING 291
+#define DLLIMPORT 292
+#define DLLEXPORT 293
+#define EXTERN_WEAK 294
+#define OPAQUE 295
+#define EXTERNAL 296
+#define TARGET 297
+#define TRIPLE 298
+#define ENDIAN 299
+#define POINTERSIZE 300
+#define LITTLE 301
+#define BIG 302
+#define ALIGN 303
+#define DEPLIBS 304
+#define CALL 305
+#define TAIL 306
+#define ASM_TOK 307
+#define MODULE 308
+#define SIDEEFFECT 309
+#define CC_TOK 310
+#define CCC_TOK 311
+#define CSRETCC_TOK 312
+#define FASTCC_TOK 313
+#define COLDCC_TOK 314
+#define X86_STDCALLCC_TOK 315
+#define X86_FASTCALLCC_TOK 316
+#define DATALAYOUT 317
+#define RET 318
+#define BR 319
+#define SWITCH 320
+#define INVOKE 321
+#define UNWIND 322
+#define UNREACHABLE 323
+#define ADD 324
+#define SUB 325
+#define MUL 326
+#define UDIV 327
+#define SDIV 328
+#define FDIV 329
+#define UREM 330
+#define SREM 331
+#define FREM 332
+#define AND 333
+#define OR 334
+#define XOR 335
+#define ICMP 336
+#define FCMP 337
+#define EQ 338
+#define NE 339
+#define SLT 340
+#define SGT 341
+#define SLE 342
+#define SGE 343
+#define ULT 344
+#define UGT 345
+#define ULE 346
+#define UGE 347
+#define OEQ 348
+#define ONE 349
+#define OLT 350
+#define OGT 351
+#define OLE 352
+#define OGE 353
+#define ORD 354
+#define UNO 355
+#define UEQ 356
+#define UNE 357
+#define MALLOC 358
+#define ALLOCA 359
+#define FREE 360
+#define LOAD 361
+#define STORE 362
+#define GETELEMENTPTR 363
+#define TRUNC 364
+#define ZEXT 365
+#define SEXT 366
+#define FPTRUNC 367
+#define FPEXT 368
+#define BITCAST 369
+#define UITOFP 370
+#define SITOFP 371
+#define FPTOUI 372
+#define FPTOSI 373
+#define INTTOPTR 374
+#define PTRTOINT 375
+#define PHI_TOK 376
+#define SELECT 377
+#define SHL 378
+#define LSHR 379
+#define ASHR 380
+#define VAARG 381
+#define EXTRACTELEMENT 382
+#define INSERTELEMENT 383
+#define SHUFFLEVECTOR 384
+#define NORETURN 385
+#define DEFAULT 386
+#define HIDDEN 387
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 883 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -44,136 +344,14 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	SINTVAL	259
-#define	UINTVAL	260
-#define	FPVAL	261
-#define	VOID	262
-#define	INTTYPE	263
-#define	FLOAT	264
-#define	DOUBLE	265
-#define	LABEL	266
-#define	TYPE	267
-#define	VAR_ID	268
-#define	LABELSTR	269
-#define	STRINGCONSTANT	270
-#define	IMPLEMENTATION	271
-#define	ZEROINITIALIZER	272
-#define	TRUETOK	273
-#define	FALSETOK	274
-#define	BEGINTOK	275
-#define	ENDTOK	276
-#define	DECLARE	277
-#define	DEFINE	278
-#define	GLOBAL	279
-#define	CONSTANT	280
-#define	SECTION	281
-#define	VOLATILE	282
-#define	TO	283
-#define	DOTDOTDOT	284
-#define	NULL_TOK	285
-#define	UNDEF	286
-#define	INTERNAL	287
-#define	LINKONCE	288
-#define	WEAK	289
-#define	APPENDING	290
-#define	DLLIMPORT	291
-#define	DLLEXPORT	292
-#define	EXTERN_WEAK	293
-#define	OPAQUE	294
-#define	EXTERNAL	295
-#define	TARGET	296
-#define	TRIPLE	297
-#define	ENDIAN	298
-#define	POINTERSIZE	299
-#define	LITTLE	300
-#define	BIG	301
-#define	ALIGN	302
-#define	DEPLIBS	303
-#define	CALL	304
-#define	TAIL	305
-#define	ASM_TOK	306
-#define	MODULE	307
-#define	SIDEEFFECT	308
-#define	CC_TOK	309
-#define	CCC_TOK	310
-#define	CSRETCC_TOK	311
-#define	FASTCC_TOK	312
-#define	COLDCC_TOK	313
-#define	X86_STDCALLCC_TOK	314
-#define	X86_FASTCALLCC_TOK	315
-#define	DATALAYOUT	316
-#define	RET	317
-#define	BR	318
-#define	SWITCH	319
-#define	INVOKE	320
-#define	UNWIND	321
-#define	UNREACHABLE	322
-#define	ADD	323
-#define	SUB	324
-#define	MUL	325
-#define	UDIV	326
-#define	SDIV	327
-#define	FDIV	328
-#define	UREM	329
-#define	SREM	330
-#define	FREM	331
-#define	AND	332
-#define	OR	333
-#define	XOR	334
-#define	ICMP	335
-#define	FCMP	336
-#define	EQ	337
-#define	NE	338
-#define	SLT	339
-#define	SGT	340
-#define	SLE	341
-#define	SGE	342
-#define	ULT	343
-#define	UGT	344
-#define	ULE	345
-#define	UGE	346
-#define	OEQ	347
-#define	ONE	348
-#define	OLT	349
-#define	OGT	350
-#define	OLE	351
-#define	OGE	352
-#define	ORD	353
-#define	UNO	354
-#define	UEQ	355
-#define	UNE	356
-#define	MALLOC	357
-#define	ALLOCA	358
-#define	FREE	359
-#define	LOAD	360
-#define	STORE	361
-#define	GETELEMENTPTR	362
-#define	TRUNC	363
-#define	ZEXT	364
-#define	SEXT	365
-#define	FPTRUNC	366
-#define	FPEXT	367
-#define	BITCAST	368
-#define	UITOFP	369
-#define	SITOFP	370
-#define	FPTOUI	371
-#define	FPTOSI	372
-#define	INTTOPTR	373
-#define	PTRTOINT	374
-#define	PHI_TOK	375
-#define	SELECT	376
-#define	SHL	377
-#define	LSHR	378
-#define	ASHR	379
-#define	VAARG	380
-#define	EXTRACTELEMENT	381
-#define	INSERTELEMENT	382
-#define	SHUFFLEVECTOR	383
-#define	NORETURN	384
-#define	DEFAULT	385
-#define	HIDDEN	386
-
+/* Line 1447 of yacc.c.  */
+#line 349 "llvmAsmParser.tab.h"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 extern YYSTYPE llvmAsmlval;
+
+
+


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.56 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.57
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.56	Sun Jan 14 20:27:26 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Tue Jan 16 20:48:45 2007
@@ -1708,14 +1708,12 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
     Constant *Val = $3;
-    const Type *Ty = $5->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast constant expression from a non-primitive type: '" +
-                     Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast constant expression to a non-primitive type: '" +
-                Ty->getDescription() + "'!");
-    $$ = ConstantExpr::getCast($1, $3, $5->get());
+    const Type *DestTy = $5->get();
+    if (!CastInst::castIsValid($1, $3, DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    $$ = ConstantExpr::getCast($1, $3, DestTy);
     delete $5;
   }
   | GETELEMENTPTR '(' ConstVal IndexList ')' {
@@ -2647,13 +2645,12 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$4)->getDescription());
     Value* Val = $2;
-    const Type* Ty = $4->get();
-    if (!Val->getType()->isFirstClassType())
-      GEN_ERROR("cast from a non-primitive type: '" +
-                Val->getType()->getDescription() + "'!");
-    if (!Ty->isFirstClassType())
-      GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!");
-    $$ = CastInst::create($1, Val, $4->get());
+    const Type* DestTy = $4->get();
+    if (!CastInst::castIsValid($1, Val, DestTy))
+      GEN_ERROR("invalid cast opcode for cast from '" +
+                Val->getType()->getDescription() + "' to '" +
+                DestTy->getDescription() + "'!"); 
+    $$ = CastInst::create($1, Val, DestTy);
     delete $4;
   }
   | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {





From gordonhenriksen at mac.com  Tue Jan 16 21:31:38 2007
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Tue, 16 Jan 2007 22:31:38 -0500
Subject: [llvm-commits] [PATCH] mkpatch vs. OS X sed
Message-ID: <1D1C3849-1674-4079-958B-A597E9618AD4@mac.com>

Mac OS X sed is (POSIXly?) picky and recognizes 'sed [COMMAND ...]  
[FILE ...]' strictly. utils/mkpatch puts the file before the  
commands. This patch reverses the ordering.

? Gordon


-------------- next part --------------
A non-text attachment was scrubbed...
Name: nicey-nice-with-finicky-sed.patch
Type: application/octet-stream
Size: 971 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/2b46b0e0/attachment.obj 

From reid at x10sys.com  Tue Jan 16 21:38:38 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 21:38:38 -0600
Subject: [llvm-commits] CVS: llvm/utils/mkpatch
Message-ID: <200701170338.l0H3cclC008527@zion.cs.uiuc.edu>



Changes in directory llvm/utils:

mkpatch updated: 1.4 -> 1.5
---
Log message:

Fix this tool for use on Darwin which requires the file to come after the
commands. Linux is more forgiving.

Patch by Gordon Henriksen. Thanks, Gordon!


---
Diffs of the changes:  (+1 -1)

 mkpatch |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/utils/mkpatch
diff -u llvm/utils/mkpatch:1.4 llvm/utils/mkpatch:1.5
--- llvm/utils/mkpatch:1.4	Tue Jan 16 16:41:12 2007
+++ llvm/utils/mkpatch	Tue Jan 16 21:38:22 2007
@@ -27,7 +27,7 @@
   tools test runtime projects examples win32 Xcode
 
 echo "mkpatch: Removing cruft from the patch file"
-sed "$NAME".patch.raw -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' | awk '\
+sed -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' "$NAME".patch.raw | awk '\
 BEGIN { deleting = 0; } \
 /^Index: .*[.]cvs$/ { deleting = 1; fname=substr($0,7); \
   print "Skipping: ", fname > "/dev/stderr"; } \





From rspencer at reidspencer.com  Tue Jan 16 21:38:56 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Tue, 16 Jan 2007 19:38:56 -0800
Subject: [llvm-commits] [PATCH] mkpatch vs. OS X sed
In-Reply-To: <1D1C3849-1674-4079-958B-A597E9618AD4@mac.com>
References: <1D1C3849-1674-4079-958B-A597E9618AD4@mac.com>
Message-ID: <1169005136.12773.92.camel@bashful.x10sys.com>

On Tue, 2007-01-16 at 22:31 -0500, Gordon Henriksen wrote:
> Mac OS X sed is (POSIXly?) picky and recognizes 'sed [COMMAND ...]  
> [FILE ...]' strictly. utils/mkpatch puts the file before the  
> commands. This patch reverses the ordering.

Aha! That's the problem! Chris found this a few days ago but I couldn't
figure out how to make it work on Darwin and the error message wasn't
particularly helpful in figuring it out.

Thanks a bunch, Gordon. Patch applied!

> 
> ? Gordon
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From isanbard at gmail.com  Tue Jan 16 21:46:48 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:46:48 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCTargetObjInfo.cpp
	PPCTargetObjInfo.h
Message-ID: <200701170346.l0H3kmAn008890@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCTargetObjInfo.cpp added (r1.1)
PPCTargetObjInfo.h added (r1.1)
---
Log message:

New "TargetObjInfo" class. This holds information that the object writers will
use to write things to the file. It's abstract so each target should implement
its own version for each writer type.


---
Diffs of the changes:  (+167 -0)

 PPCTargetObjInfo.cpp |   22 +++++++
 PPCTargetObjInfo.h   |  145 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)


Index: llvm/lib/Target/PowerPC/PPCTargetObjInfo.cpp
diff -c /dev/null llvm/lib/Target/PowerPC/PPCTargetObjInfo.cpp:1.1
*** /dev/null	Tue Jan 16 21:46:40 2007
--- llvm/lib/Target/PowerPC/PPCTargetObjInfo.cpp	Tue Jan 16 21:46:30 2007
***************
*** 0 ****
--- 1,22 ----
+ //===-- PPCTargetObjInfo.cpp - Object File Info ----------------------------==//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines target object file properties for PowerPC.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "PPCTargetObjInfo.h"
+ #include "llvm/Target/TargetData.h"
+ #include "llvm/Target/TargetMachine.h"
+ using namespace llvm;
+ 
+ MachOTargetObjInfo::MachOTargetObjInfo(const TargetMachine &tm)
+   : TM(tm),
+     is64Bit(TM.getTargetData()->getPointerSizeInBits() == 64),
+     isLittleEndian(TM.getTargetData()->isLittleEndian()) {}


Index: llvm/lib/Target/PowerPC/PPCTargetObjInfo.h
diff -c /dev/null llvm/lib/Target/PowerPC/PPCTargetObjInfo.h:1.1
*** /dev/null	Tue Jan 16 21:46:47 2007
--- llvm/lib/Target/PowerPC/PPCTargetObjInfo.h	Tue Jan 16 21:46:30 2007
***************
*** 0 ****
--- 1,145 ----
+ //===-- PPCTargetObjInfo.h - Object File Info --------------------*- C++ -*-==//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines target object file properties for PowerPC.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef PPCTARGETOBJINFO_H
+ #define PPCTARGETOBJINFO_H
+ 
+ #include "llvm/Target/TargetObjInfo.h"
+ 
+ namespace llvm {
+ 
+   class TargetMachine;
+ 
+   struct MachOTargetObjInfo : public TargetObjInfo {
+     MachOTargetObjInfo(const TargetMachine &PPC_TM);
+ 
+     // align - Emit padding into the file until the current output position is
+     // aligned to the specified power of two boundary.
+     virtual void align(DataBuffer &Output, unsigned Boundary) const {
+       assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
+              "Must align to 2^k boundary");
+       size_t Size = Output.size();
+ 
+       if (Size & (Boundary-1)) {
+         // Add padding to get alignment to the correct place.
+         size_t Pad = Boundary - (Size & (Boundary - 1));
+         Output.resize(Size + Pad);
+       }
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Out Functions - Output the specified value to the data buffer.
+ 
+     virtual void outbyte(DataBuffer &Output, unsigned char X) const {
+       Output.push_back(X);
+     }
+     virtual void outhalf(DataBuffer &Output, unsigned short X) const {
+       if (isLittleEndian) {
+         Output.push_back(X & 255);
+         Output.push_back(X >> 8);
+       } else {
+         Output.push_back(X >> 8);
+         Output.push_back(X & 255);
+       }
+     }
+     virtual void outword(DataBuffer &Output, unsigned X) const {
+       if (isLittleEndian) {
+         Output.push_back((X >>  0) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >> 24) & 255);
+       } else {
+         Output.push_back((X >> 24) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >>  0) & 255);
+       }
+     }
+     virtual void outxword(DataBuffer &Output, uint64_t X) const {
+       if (isLittleEndian) {
+         Output.push_back(unsigned(X >>  0) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 56) & 255);
+       } else {
+         Output.push_back(unsigned(X >> 56) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >>  0) & 255);
+       }
+     }
+     virtual void outaddr32(DataBuffer &Output, unsigned X) const {
+       outword(Output, X);
+     }
+     virtual void outaddr64(DataBuffer &Output, uint64_t X) const {
+       outxword(Output, X);
+     }
+     virtual void outaddr(DataBuffer &Output, uint64_t X) const {
+       if (!is64Bit)
+         outword(Output, (unsigned)X);
+       else
+         outxword(Output, X);
+     }
+     virtual void outstring(DataBuffer &Output, std::string &S,
+                            unsigned Length) const {
+       unsigned len_to_copy = S.length() < Length ? S.length() : Length;
+       unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0;
+ 
+       for (unsigned i = 0; i < len_to_copy; ++i)
+         outbyte(Output, S[i]);
+ 
+       for (unsigned i = 0; i < len_to_fill; ++i)
+         outbyte(Output, 0);
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Fix Functions - Replace an existing entry at an offset.
+ 
+     virtual void fixhalf(DataBuffer &Output, unsigned short X,
+                          unsigned Offset) const {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
+     }
+     virtual void fixword(DataBuffer &Output, unsigned X,
+                          unsigned Offset) const {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
+       P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
+       P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
+     }
+     virtual void fixaddr(DataBuffer &Output, uint64_t X,
+                          unsigned Offset) const {
+       // Not implemented
+     }
+   private:
+     /// Target machine description.
+     const TargetMachine &TM;
+ 
+     /// is64Bit/isLittleEndian - This information is inferred from the target
+     /// machine directly, indicating what header values and flags to set.
+     bool is64Bit, isLittleEndian;
+   };
+ 
+ } // end llvm namespace
+ 
+ #endif // PPCTARGETOBJINFO_H





From isanbard at gmail.com  Tue Jan 16 21:46:48 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:46:48 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetObjInfo.h
Message-ID: <200701170346.l0H3kmUT008895@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetObjInfo.h added (r1.1)
---
Log message:

New "TargetObjInfo" class. This holds information that the object writers will
use to write things to the file. It's abstract so each target should implement
its own version for each writer type.


---
Diffs of the changes:  (+57 -0)

 TargetObjInfo.h |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+)


Index: llvm/include/llvm/Target/TargetObjInfo.h
diff -c /dev/null llvm/include/llvm/Target/TargetObjInfo.h:1.1
*** /dev/null	Tue Jan 16 21:46:40 2007
--- llvm/include/llvm/Target/TargetObjInfo.h	Tue Jan 16 21:46:30 2007
***************
*** 0 ****
--- 1,57 ----
+ //===-- llvm/Target/TargetObjInfo.h - Object File Info ----------*- C++ -*-===//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file contains a class to be used as the basis for target specific object
+ // writers.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef LLVM_TARGET_OBJ_INFO_H
+ #define LLVM_TARGET_OBJ_INFO_H
+ 
+ #include <string>
+ #include <vector>
+ 
+ namespace llvm {
+ 
+   struct TargetObjInfo {
+     TargetObjInfo() {}
+     virtual ~TargetObjInfo() {}
+ 
+     typedef std::vector<unsigned char> DataBuffer;
+ 
+     virtual void align(DataBuffer &Output, unsigned Boundary) const = 0;
+ 
+     //===------------------------------------------------------------------===//
+     // Out Functions - Output the specified value to the data buffer.
+ 
+     virtual void outbyte(DataBuffer &Output, unsigned char X) const = 0;
+     virtual void outhalf(DataBuffer &Output, unsigned short X) const = 0;
+     virtual void outword(DataBuffer &Output, unsigned X) const = 0;
+     virtual void outxword(DataBuffer &Output, uint64_t X) const = 0;
+     virtual void outaddr32(DataBuffer &Output, unsigned X) const = 0;
+     virtual void outaddr64(DataBuffer &Output, uint64_t X) const = 0;
+     virtual void outaddr(DataBuffer &Output, uint64_t X) const = 0;
+     virtual void outstring(DataBuffer &Output, std::string &S,
+                            unsigned Length) const = 0;
+ 
+     //===------------------------------------------------------------------===//
+     // Fix Functions - Replace an existing entry at an offset.
+ 
+     virtual void fixhalf(DataBuffer &Output, unsigned short X,
+                          unsigned Offset) const = 0;
+     virtual void fixword(DataBuffer &Output, unsigned X,
+                          unsigned Offset) const = 0;
+     virtual void fixaddr(DataBuffer &Output, uint64_t X,
+                          unsigned Offset) const = 0;
+   };
+ 
+ } // end llvm namespace
+ 
+ #endif // LLVM_TARGET_OBJ_INFO_H





From isanbard at gmail.com  Tue Jan 16 21:46:49 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:46:49 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetObjInfo.cpp
	X86TargetObjInfo.h
Message-ID: <200701170346.l0H3knBf008902@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetObjInfo.cpp added (r1.1)
X86TargetObjInfo.h added (r1.1)
---
Log message:

New "TargetObjInfo" class. This holds information that the object writers will
use to write things to the file. It's abstract so each target should implement
its own version for each writer type.


---
Diffs of the changes:  (+163 -0)

 X86TargetObjInfo.cpp |   22 +++++++
 X86TargetObjInfo.h   |  141 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)


Index: llvm/lib/Target/X86/X86TargetObjInfo.cpp
diff -c /dev/null llvm/lib/Target/X86/X86TargetObjInfo.cpp:1.1
*** /dev/null	Tue Jan 16 21:46:40 2007
--- llvm/lib/Target/X86/X86TargetObjInfo.cpp	Tue Jan 16 21:46:30 2007
***************
*** 0 ****
--- 1,22 ----
+ //===-- X86TargetObjInfo.cpp - Object File Info ----------------------------==//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines target object file properties for X86
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "X86TargetObjInfo.h"
+ #include "llvm/Target/TargetData.h"
+ #include "llvm/Target/TargetMachine.h"
+ using namespace llvm;
+ 
+ ELFTargetObjInfo::ELFTargetObjInfo(const TargetMachine &tm)
+   : TM(tm),
+     is64Bit(TM.getTargetData()->getPointerSizeInBits() == 64),
+     isLittleEndian(TM.getTargetData()->isLittleEndian()) {}


Index: llvm/lib/Target/X86/X86TargetObjInfo.h
diff -c /dev/null llvm/lib/Target/X86/X86TargetObjInfo.h:1.1
*** /dev/null	Tue Jan 16 21:46:49 2007
--- llvm/lib/Target/X86/X86TargetObjInfo.h	Tue Jan 16 21:46:30 2007
***************
*** 0 ****
--- 1,141 ----
+ //===-- X86TargetObjInfo.h - Object File Info --------------------*- C++ -*-==//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines target object file properties for X86
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef X86TARGETOBJINFO_H
+ #define X86TARGETOBJINFO_H
+ 
+ #include "llvm/Target/TargetObjInfo.h"
+ 
+ namespace llvm {
+ 
+   class TargetMachine;
+ 
+   struct ELFTargetObjInfo : public TargetObjInfo {
+     ELFTargetObjInfo(const TargetMachine &tm);
+ 
+     // align - Emit padding into the file until the current output position is
+     // aligned to the specified power of two boundary.
+     virtual void align(DataBuffer &Output, unsigned Boundary) const {
+       assert(Boundary && (Boundary & (Boundary - 1)) == 0 &&
+              "Must align to 2^k boundary");
+       size_t Size = Output.size();
+ 
+       if (Size & (Boundary - 1)) {
+         // Add padding to get alignment to the correct place.
+         size_t Pad = Boundary - (Size & (Boundary - 1));
+         Output.resize(Size + Pad);
+       }
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Out Functions - Output the specified value to the data buffer.
+ 
+     virtual void outbyte(DataBuffer &Output, unsigned char X) const {
+       Output.push_back(X);
+     }
+     virtual void outhalf(DataBuffer &Output, unsigned short X) const {
+       if (isLittleEndian) {
+         Output.push_back(X & 255);
+         Output.push_back(X >> 8);
+       } else {
+         Output.push_back(X >> 8);
+         Output.push_back(X & 255);
+       }
+     }
+     virtual void outword(DataBuffer &Output, unsigned X) const {
+       if (isLittleEndian) {
+         Output.push_back((X >>  0) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >> 24) & 255);
+       } else {
+         Output.push_back((X >> 24) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >>  0) & 255);
+       }
+     }
+     virtual void outxword(DataBuffer &Output, uint64_t X) const {
+       if (isLittleEndian) {
+         Output.push_back(unsigned(X >>  0) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 56) & 255);
+       } else {
+         Output.push_back(unsigned(X >> 56) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >>  0) & 255);
+       }
+     }
+     virtual void outaddr32(DataBuffer &Output, unsigned X) const {
+       outword(Output, X);
+     }
+     virtual void outaddr64(DataBuffer &Output, uint64_t X) const {
+       outxword(Output, X);
+     }
+     virtual void outaddr(DataBuffer &Output, uint64_t X) const {
+       if (!is64Bit)
+         outword(Output, (unsigned)X);
+       else
+         outxword(Output, X);
+     }
+     virtual void outstring(DataBuffer &Output, std::string &S,
+                            unsigned Length) const {
+       // Not implemented
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Fix Functions - Replace an existing entry at an offset.
+ 
+     virtual void fixhalf(DataBuffer &Output, unsigned short X,
+                          unsigned Offset) const {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
+     }
+     virtual void fixword(DataBuffer &Output, unsigned X,
+                          unsigned Offset) const {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
+       P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
+       P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
+     }
+     virtual void fixaddr(DataBuffer &Output, uint64_t X,
+                          unsigned Offset) const {
+       if (!is64Bit)
+         fixword(Output, (unsigned)X, Offset);
+       else
+         assert(0 && "Emission of 64-bit data not implemented yet!");
+     }
+   private:
+     /// Target machine description.
+     const TargetMachine &TM;
+ 
+     /// is64Bit/isLittleEndian - This information is inferred from the target
+     /// machine directly, indicating what header values and flags to set.
+     bool is64Bit, isLittleEndian;
+   };
+ 
+ } // end llvm namespace
+ 
+ #endif // X86TARGETOBJINFO_H





From isanbard at gmail.com  Tue Jan 16 21:48:10 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:48:10 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/ELFWriter.h
	MachOWriter.h
Message-ID: <200701170348.l0H3mASH008943@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

ELFWriter.h updated: 1.12 -> 1.13
MachOWriter.h updated: 1.11 -> 1.12
---
Log message:

Removed methods which are now in the respective TargetObjInfo implementations.


---
Diffs of the changes:  (+10 -191)

 ELFWriter.h   |  101 ++--------------------------------------------------------
 MachOWriter.h |  100 ++-------------------------------------------------------
 2 files changed, 10 insertions(+), 191 deletions(-)


Index: llvm/include/llvm/CodeGen/ELFWriter.h
diff -u llvm/include/llvm/CodeGen/ELFWriter.h:1.12 llvm/include/llvm/CodeGen/ELFWriter.h:1.13
--- llvm/include/llvm/CodeGen/ELFWriter.h:1.12	Wed Feb 22 10:23:43 2006
+++ llvm/include/llvm/CodeGen/ELFWriter.h	Tue Jan 16 21:47:54 2007
@@ -22,6 +22,7 @@
   class Mangler;
   class MachineCodeEmitter;
   class ELFCodeEmitter;
+  class TargetObjInfo;
 
   /// ELFWriter - This class implements the common target-independent code for
   /// writing ELF files.  Targets should derive a class from this to
@@ -49,6 +50,10 @@
     ///
     TargetMachine &TM;
 
+    /// Target object writer info.
+    ///
+    const TargetObjInfo *TOI;
+
     /// Mang - The object used to perform name mangling for this module.
     ///
     Mangler *Mang;
@@ -214,102 +219,6 @@
     unsigned ELFHeader_e_shoff_Offset;     // e_shoff    in ELF header.
     unsigned ELFHeader_e_shstrndx_Offset;  // e_shstrndx in ELF header.
     unsigned ELFHeader_e_shnum_Offset;     // e_shnum    in ELF header.
-
-
-    // align - Emit padding into the file until the current output position is
-    // aligned to the specified power of two boundary.
-    static void align(DataBuffer &Output, unsigned Boundary) {
-      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
-             "Must align to 2^k boundary");
-      size_t Size = Output.size();
-      if (Size & (Boundary-1)) {
-        // Add padding to get alignment to the correct place.
-        size_t Pad = Boundary-(Size & (Boundary-1));
-        Output.resize(Size+Pad);
-      }
-    }
-
-    static void outbyte(DataBuffer &Output, unsigned char X) {
-      Output.push_back(X);
-    }
-    void outhalf(DataBuffer &Output, unsigned short X) {
-      if (isLittleEndian) {
-        Output.push_back(X&255);
-        Output.push_back(X >> 8);
-      } else {
-        Output.push_back(X >> 8);
-        Output.push_back(X&255);
-      }
-    }
-    void outword(DataBuffer &Output, unsigned X) {
-      if (isLittleEndian) {
-        Output.push_back((X >>  0) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >> 24) & 255);
-      } else {
-        Output.push_back((X >> 24) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >>  0) & 255);
-      }
-    }
-    void outxword(DataBuffer &Output, uint64_t X) {
-      if (isLittleEndian) {
-        Output.push_back(unsigned(X >>  0) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 56) & 255);
-      } else {
-        Output.push_back(unsigned(X >> 56) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >>  0) & 255);
-      }
-    }
-    void outaddr32(DataBuffer &Output, unsigned X) {
-      outword(Output, X);
-    }
-    void outaddr64(DataBuffer &Output, uint64_t X) {
-      outxword(Output, X);
-    }
-    void outaddr(DataBuffer &Output, uint64_t X) {
-      if (!is64Bit)
-        outword(Output, (unsigned)X);
-      else
-        outxword(Output, X);
-    }
-
-    // fix functions - Replace an existing entry at an offset.
-    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
-    }
-
-    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
-      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
-      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
-    }
-
-    void fixaddr(DataBuffer &Output, uint64_t X, unsigned Offset) {
-      if (!is64Bit)
-        fixword(Output, (unsigned)X, Offset);
-      else
-        assert(0 && "Emission of 64-bit data not implemented yet!");
-    }
-
   private:
     void EmitGlobal(GlobalVariable *GV);
 


Index: llvm/include/llvm/CodeGen/MachOWriter.h
diff -u llvm/include/llvm/CodeGen/MachOWriter.h:1.11 llvm/include/llvm/CodeGen/MachOWriter.h:1.12
--- llvm/include/llvm/CodeGen/MachOWriter.h:1.11	Sun Jan 14 20:27:26 2007
+++ llvm/include/llvm/CodeGen/MachOWriter.h	Tue Jan 16 21:47:54 2007
@@ -25,6 +25,7 @@
   class Mangler;
   class MachineCodeEmitter;
   class MachOCodeEmitter;
+  class TargetObjInfo;
 
   /// MachOSym - This struct contains information about each symbol that is
   /// added to logical symbol table for the module.  This is eventually
@@ -100,6 +101,10 @@
     ///
     TargetMachine &TM;
 
+    /// Target object writer info.
+    ///
+    const TargetObjInfo *TOI;
+
     /// Mang - The object used to perform name mangling for this module.
     ///
     Mangler *Mang;
@@ -659,101 +664,6 @@
     /// SymbolTable to aid in emitting the DYSYMTAB load command.
     std::vector<unsigned> DynamicSymbolTable;
     
-    // align - Emit padding into the file until the current output position is
-    // aligned to the specified power of two boundary.
-    static void align(DataBuffer &Output, unsigned Boundary) {
-      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
-             "Must align to 2^k boundary");
-      size_t Size = Output.size();
-      if (Size & (Boundary-1)) {
-        // Add padding to get alignment to the correct place.
-        size_t Pad = Boundary-(Size & (Boundary-1));
-        Output.resize(Size+Pad);
-      }
-    }
-
-    void outbyte(DataBuffer &Output, unsigned char X) {
-      Output.push_back(X);
-    }
-    void outhalf(DataBuffer &Output, unsigned short X) {
-      if (isLittleEndian) {
-        Output.push_back(X&255);
-        Output.push_back(X >> 8);
-      } else {
-        Output.push_back(X >> 8);
-        Output.push_back(X&255);
-      }
-    }
-    void outword(DataBuffer &Output, unsigned X) {
-      if (isLittleEndian) {
-        Output.push_back((X >>  0) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >> 24) & 255);
-      } else {
-        Output.push_back((X >> 24) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >>  0) & 255);
-      }
-    }
-    void outxword(DataBuffer &Output, uint64_t X) {
-      if (isLittleEndian) {
-        Output.push_back(unsigned(X >>  0) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 56) & 255);
-      } else {
-        Output.push_back(unsigned(X >> 56) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >>  0) & 255);
-      }
-    }
-    void outaddr32(DataBuffer &Output, unsigned X) {
-      outword(Output, X);
-    }
-    void outaddr64(DataBuffer &Output, uint64_t X) {
-      outxword(Output, X);
-    }
-    void outaddr(DataBuffer &Output, uint64_t X) {
-      if (!is64Bit)
-        outword(Output, (unsigned)X);
-      else
-        outxword(Output, X);
-    }
-    void outstring(DataBuffer &Output, std::string &S, unsigned Length) {
-      unsigned len_to_copy = S.length() < Length ? S.length() : Length;
-      unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0;
-      
-      for (unsigned i = 0; i < len_to_copy; ++i)
-        outbyte(Output, S[i]);
-
-      for (unsigned i = 0; i < len_to_fill; ++i)
-        outbyte(Output, 0);
-      
-    }
-    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
-    }
-    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
-      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
-      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
-    }
-    
     static void InitMem(const Constant *C, void *Addr, intptr_t Offset,
                         const TargetData *TD, 
                         std::vector<MachineRelocation> &MRs);





From isanbard at gmail.com  Tue Jan 16 21:48:45 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:48:45 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200701170348.l0H3mjou008969@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.71 -> 1.72
---
Log message:

The TargetObjInfo object goes here.


---
Diffs of the changes:  (+18 -3)

 TargetMachine.h |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)


Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.71 llvm/include/llvm/Target/TargetMachine.h:1.72
--- llvm/include/llvm/Target/TargetMachine.h:1.71	Thu Sep  7 18:39:26 2006
+++ llvm/include/llvm/Target/TargetMachine.h	Tue Jan 16 21:48:29 2007
@@ -21,6 +21,7 @@
 namespace llvm {
 
 class TargetAsmInfo;
+class TargetObjInfo;
 class TargetData;
 class TargetSubtarget;
 class TargetInstrInfo;
@@ -66,7 +67,7 @@
   TargetMachine(const TargetMachine &);   // DO NOT IMPLEMENT
   void operator=(const TargetMachine &);  // DO NOT IMPLEMENT
 protected: // Can only create subclasses.
-  TargetMachine() : AsmInfo(NULL) { }
+  TargetMachine() : AsmInfo(NULL), ObjInfo(NULL) { }
 
   /// getSubtargetImpl - virtual method implemented by subclasses that returns
   /// a reference to that target's TargetSubtarget-derived member variable.
@@ -75,11 +76,19 @@
   /// AsmInfo - Contains target specific asm information.
   ///
   mutable const TargetAsmInfo *AsmInfo;
-  
+
   /// createTargetAsmInfo - Create a new instance of target specific asm
   /// information.
   virtual const TargetAsmInfo *createTargetAsmInfo() const { return NULL; }
 
+  /// ObjInfo - Contains target specific object file information.
+  /// 
+  mutable const TargetObjInfo *ObjInfo;
+  
+  /// createTargetObjInfo - Create a new instance of target specific object
+  /// information.
+  virtual const TargetObjInfo *createTargetObjInfo() const { return NULL; }
+
 public:
   virtual ~TargetMachine();
 
@@ -107,7 +116,6 @@
   virtual       TargetLowering    *getTargetLowering() const { return 0; }
   virtual const TargetData            *getTargetData() const { return 0; }
   
-  
   /// getTargetAsmInfo - Return target specific asm information.
   ///
   const TargetAsmInfo *getTargetAsmInfo() const {
@@ -115,6 +123,13 @@
     return AsmInfo;
   }
   
+  /// getTargetObjInfo - Return target specific object information.
+  ///
+  const TargetObjInfo *getTargetObjInfo() const {
+    if (!ObjInfo) ObjInfo = createTargetObjInfo();
+    return ObjInfo;
+  }
+  
   /// getSubtarget - This method returns a pointer to the specified type of
   /// TargetSubtarget.  In debug builds, it verifies that the object being
   /// returned is of the correct type.





From isanbard at gmail.com  Tue Jan 16 21:49:37 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:49:37 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/ELFWriter.cpp MachOWriter.cpp
Message-ID: <200701170349.l0H3nbLx008996@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

ELFWriter.cpp updated: 1.30 -> 1.31
MachOWriter.cpp updated: 1.12 -> 1.13
---
Log message:

Use the methods in the TargetObjInfo object instead of internal methods.


---
Diffs of the changes:  (+156 -126)

 ELFWriter.cpp   |  116 ++++++++++++++++++++++-----------------
 MachOWriter.cpp |  166 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 156 insertions(+), 126 deletions(-)


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.30 llvm/lib/CodeGen/ELFWriter.cpp:1.31
--- llvm/lib/CodeGen/ELFWriter.cpp:1.30	Wed Dec  6 19:30:31 2006
+++ llvm/lib/CodeGen/ELFWriter.cpp	Tue Jan 16 21:49:21 2007
@@ -37,6 +37,7 @@
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/Streams.h"
 using namespace llvm;
@@ -53,8 +54,20 @@
     ELFWriter::ELFSection *ES;  // Section to write to.
     std::vector<unsigned char> *OutBuffer;
     size_t FnStart;
+
+    /// Target machine description.
+    ///
+    TargetMachine &TM;
+
+    /// Target object writer info.
+    ///
+    const TargetObjInfo *TOI;
   public:
-    ELFCodeEmitter(ELFWriter &ew) : EW(ew), OutBuffer(0) {}
+    ELFCodeEmitter(ELFWriter &ew, TargetMachine &tm)
+      : EW(ew), OutBuffer(0), TM(tm) {
+      // Create the target object info object for this target.
+      TOI = TM.getTargetObjInfo();
+    }
 
     void startFunction(MachineFunction &F);
     bool finishFunction(MachineFunction &F);
@@ -113,7 +126,7 @@
 
   // Add padding zeros to the end of the buffer to make sure that the
   // function will start on the correct byte alignment within the section.
-  ELFWriter::align(*OutBuffer, Align);
+  TOI->align(*OutBuffer, Align);
 
   FnStart = OutBuffer->size();
 }
@@ -165,8 +178,11 @@
   isLittleEndian = TM.getTargetData()->isLittleEndian();
 
   // Create the machine code emitter object for this target.
-  MCE = new ELFCodeEmitter(*this);
+  MCE = new ELFCodeEmitter(*this, TM);
   NumSections = 0;
+
+  // Create the target object info object for this target.
+  TOI = TM.getTargetObjInfo();
 }
 
 ELFWriter::~ELFWriter() {
@@ -181,36 +197,36 @@
   // Local alias to shortenify coming code.
   std::vector<unsigned char> &FH = FileHeader;
 
-  outbyte(FH, 0x7F);                     // EI_MAG0
-  outbyte(FH, 'E');                      // EI_MAG1
-  outbyte(FH, 'L');                      // EI_MAG2
-  outbyte(FH, 'F');                      // EI_MAG3
-  outbyte(FH, is64Bit ? 2 : 1);          // EI_CLASS
-  outbyte(FH, isLittleEndian ? 1 : 2);   // EI_DATA
-  outbyte(FH, 1);                        // EI_VERSION
-  FH.resize(16);                         // EI_PAD up to 16 bytes.
+  TOI->outbyte(FH, 0x7F);                     // EI_MAG0
+  TOI->outbyte(FH, 'E');                      // EI_MAG1
+  TOI->outbyte(FH, 'L');                      // EI_MAG2
+  TOI->outbyte(FH, 'F');                      // EI_MAG3
+  TOI->outbyte(FH, is64Bit ? 2 : 1);          // EI_CLASS
+  TOI->outbyte(FH, isLittleEndian ? 1 : 2);   // EI_DATA
+  TOI->outbyte(FH, 1);                        // EI_VERSION
+  FH.resize(16);                              // EI_PAD up to 16 bytes.
 
   // This should change for shared objects.
-  outhalf(FH, 1);                 // e_type = ET_REL
-  outhalf(FH, e_machine);         // e_machine = whatever the target wants
-  outword(FH, 1);                 // e_version = 1
-  outaddr(FH, 0);                 // e_entry = 0 -> no entry point in .o file
-  outaddr(FH, 0);                 // e_phoff = 0 -> no program header for .o
+  TOI->outhalf(FH, 1);               // e_type = ET_REL
+  TOI->outhalf(FH, e_machine);       // e_machine = whatever the target wants
+  TOI->outword(FH, 1);               // e_version = 1
+  TOI->outaddr(FH, 0);               // e_entry = 0 -> no entry point in .o file
+  TOI->outaddr(FH, 0);               // e_phoff = 0 -> no program header for .o
 
   ELFHeader_e_shoff_Offset = FH.size();
-  outaddr(FH, 0);                 // e_shoff
-  outword(FH, e_flags);           // e_flags = whatever the target wants
+  TOI->outaddr(FH, 0);                 // e_shoff
+  TOI->outword(FH, e_flags);           // e_flags = whatever the target wants
 
-  outhalf(FH, is64Bit ? 64 : 52); // e_ehsize = ELF header size
-  outhalf(FH, 0);                 // e_phentsize = prog header entry size
-  outhalf(FH, 0);                 // e_phnum     = # prog header entries = 0
-  outhalf(FH, is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
+  TOI->outhalf(FH, is64Bit ? 64 : 52); // e_ehsize = ELF header size
+  TOI->outhalf(FH, 0);                 // e_phentsize = prog header entry size
+  TOI->outhalf(FH, 0);                 // e_phnum     = # prog header entries=0
+  TOI->outhalf(FH, is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
 
 
   ELFHeader_e_shnum_Offset = FH.size();
-  outhalf(FH, 0);                 // e_shnum     = # of section header ents
+  TOI->outhalf(FH, 0);                 // e_shnum     = # of section header ents
   ELFHeader_e_shstrndx_Offset = FH.size();
-  outhalf(FH, 0);                 // e_shstrndx  = Section # of '.shstrtab'
+  TOI->outhalf(FH, 0);                 // e_shstrndx  = Section # of '.shstrtab'
 
   // Add the null section, which is required to be first in the file.
   getSection("", 0, 0);
@@ -352,7 +368,7 @@
   DataBuffer &StrTabBuf = StrTab.SectionData;
 
   // Set the zero'th symbol to a null byte, as required.
-  outbyte(StrTabBuf, 0);
+  TOI->outbyte(StrTabBuf, 0);
   SymbolTable[0].NameIdx = 0;
   unsigned Index = 1;
   for (unsigned i = 1, e = SymbolTable.size(); i != e; ++i) {
@@ -389,22 +405,22 @@
   if (!is64Bit) {   // 32-bit and 64-bit formats are shuffled a bit.
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      outword(SymTabBuf, Sym.NameIdx);
-      outaddr32(SymTabBuf, Sym.Value);
-      outword(SymTabBuf, Sym.Size);
-      outbyte(SymTabBuf, Sym.Info);
-      outbyte(SymTabBuf, Sym.Other);
-      outhalf(SymTabBuf, Sym.SectionIdx);
+      TOI->outword(SymTabBuf, Sym.NameIdx);
+      TOI->outaddr32(SymTabBuf, Sym.Value);
+      TOI->outword(SymTabBuf, Sym.Size);
+      TOI->outbyte(SymTabBuf, Sym.Info);
+      TOI->outbyte(SymTabBuf, Sym.Other);
+      TOI->outhalf(SymTabBuf, Sym.SectionIdx);
     }
   } else {
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      outword(SymTabBuf, Sym.NameIdx);
-      outbyte(SymTabBuf, Sym.Info);
-      outbyte(SymTabBuf, Sym.Other);
-      outhalf(SymTabBuf, Sym.SectionIdx);
-      outaddr64(SymTabBuf, Sym.Value);
-      outxword(SymTabBuf, Sym.Size);
+      TOI->outword(SymTabBuf, Sym.NameIdx);
+      TOI->outbyte(SymTabBuf, Sym.Info);
+      TOI->outbyte(SymTabBuf, Sym.Other);
+      TOI->outhalf(SymTabBuf, Sym.SectionIdx);
+      TOI->outaddr64(SymTabBuf, Sym.Value);
+      TOI->outxword(SymTabBuf, Sym.Size);
     }
   }
 
@@ -420,7 +436,7 @@
 
   // Now that we know which section number is the .shstrtab section, update the
   // e_shstrndx entry in the ELF header.
-  fixhalf(FileHeader, SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
+  TOI->fixhalf(FileHeader, SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
 
   // Set the NameIdx of each section in the string table and emit the bytes for
   // the string table.
@@ -471,11 +487,11 @@
 
   // Now that we know where all of the sections will be emitted, set the e_shnum
   // entry in the ELF header.
-  fixhalf(FileHeader, NumSections, ELFHeader_e_shnum_Offset);
+  TOI->fixhalf(FileHeader, NumSections, ELFHeader_e_shnum_Offset);
 
   // Now that we know the offset in the file of the section table, update the
   // e_shoff address in the ELF header.
-  fixaddr(FileHeader, FileOff, ELFHeader_e_shoff_Offset);
+  TOI->fixaddr(FileHeader, FileOff, ELFHeader_e_shoff_Offset);
 
   // Now that we know all of the data in the file header, emit it and all of the
   // sections!
@@ -497,16 +513,16 @@
     O.write((char*)&S.SectionData[0], S.SectionData.size());
     FileOff += S.SectionData.size();
 
-    outword(Table, S.NameIdx);  // sh_name - Symbol table name idx
-    outword(Table, S.Type);     // sh_type - Section contents & semantics
-    outword(Table, S.Flags);    // sh_flags - Section flags.
-    outaddr(Table, S.Addr);     // sh_addr - The mem addr this section is in.
-    outaddr(Table, S.Offset);   // sh_offset - Offset from the file start.
-    outword(Table, S.Size);     // sh_size - The section size.
-    outword(Table, S.Link);     // sh_link - Section header table index link.
-    outword(Table, S.Info);     // sh_info - Auxillary information.
-    outword(Table, S.Align);    // sh_addralign - Alignment of section.
-    outword(Table, S.EntSize);  // sh_entsize - Size of entries in the section.
+    TOI->outword(Table, S.NameIdx); // sh_name - Symbol table name idx
+    TOI->outword(Table, S.Type);    // sh_type - Section contents & semantics
+    TOI->outword(Table, S.Flags);   // sh_flags - Section flags
+    TOI->outaddr(Table, S.Addr);    // sh_addr - The mem addr this section is in
+    TOI->outaddr(Table, S.Offset);  // sh_offset - Offset from the file start
+    TOI->outword(Table, S.Size);    // sh_size - The section size
+    TOI->outword(Table, S.Link);    // sh_link - Section header table index link
+    TOI->outword(Table, S.Info);    // sh_info - Auxillary information
+    TOI->outword(Table, S.Align);   // sh_addralign - Alignment of section
+    TOI->outword(Table, S.EntSize); // sh_entsize - Size of entries in the sect
 
     SectionList.pop_front();
   }


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.12 llvm/lib/CodeGen/MachOWriter.cpp:1.13
--- llvm/lib/CodeGen/MachOWriter.cpp:1.12	Fri Jan 12 01:05:13 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Tue Jan 16 21:49:21 2007
@@ -32,11 +32,11 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetJITInfo.h"
+#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Streams.h"
 #include <algorithm>
-
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -49,6 +49,14 @@
   class MachOCodeEmitter : public MachineCodeEmitter {
     MachOWriter &MOW;
 
+    /// Target machine description.
+    ///
+    TargetMachine &TM;
+
+    /// Target object writer info.
+    ///
+    const TargetObjInfo *TOI;
+
     /// Relocations - These are the relocations that the function needs, as
     /// emitted.
     std::vector<MachineRelocation> Relocations;
@@ -71,7 +79,10 @@
     std::vector<intptr_t> MBBLocations;
     
   public:
-    MachOCodeEmitter(MachOWriter &mow) : MOW(mow) {}
+    MachOCodeEmitter(MachOWriter &mow, TargetMachine &tm) : MOW(mow), TM(tm) {
+      // Create the target object info object for this target.
+      TOI = TM.getTargetObjInfo();
+    }
 
     virtual void startFunction(MachineFunction &F);
     virtual bool finishFunction(MachineFunction &F);
@@ -163,7 +174,7 @@
   
   // Get a symbol for the function to add to the symbol table
   const GlobalValue *FuncV = F.getFunction();
-  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, MOW.TM);
+  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, TM);
 
   // Emit constant pool to appropriate section(s)
   emitConstantPool(F.getConstantPool());
@@ -211,7 +222,7 @@
   if (CP.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   // Although there is no strict necessity that I am aware of, we will do what
@@ -223,7 +234,7 @@
   // "giant object for PIC" optimization.
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     const Type *Ty = CP[i].getType();
-    unsigned Size = MOW.TM.getTargetData()->getTypeSize(Ty);
+    unsigned Size = TM.getTargetData()->getTypeSize(Ty);
 
     MachOWriter::MachOSection *Sec = MOW.getConstSection(Ty);
     CPLocations.push_back(Sec->SectionData.size());
@@ -236,10 +247,10 @@
     // FIXME: need alignment?
     // FIXME: share between here and AddSymbolToSection?
     for (unsigned j = 0; j < Size; ++j)
-      MOW.outbyte(Sec->SectionData, 0);
+      TOI->outbyte(Sec->SectionData, 0);
 
     MOW.InitMem(CP[i].Val.ConstVal, &Sec->SectionData[0], CPLocations[i],
-                MOW.TM.getTargetData(), Sec->Relocations);
+                TM.getTargetData(), Sec->Relocations);
   }
 }
 
@@ -250,7 +261,7 @@
   if (JT.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   MachOWriter::MachOSection *Sec = MOW.getJumpTableSection();
@@ -267,7 +278,7 @@
       MR.setResultPointer((void *)JTLocations[i]);
       MR.setConstantVal(TextSecIndex);
       Sec->Relocations.push_back(MR);
-      MOW.outaddr(Sec->SectionData, 0);
+      TOI->outaddr(Sec->SectionData, 0);
     }
   }
   // FIXME: remove when we have unified size + output buffer
@@ -283,7 +294,10 @@
   isLittleEndian = TM.getTargetData()->isLittleEndian();
 
   // Create the machine code emitter object for this target.
-  MCE = new MachOCodeEmitter(*this);
+  MCE = new MachOCodeEmitter(*this, tm);
+
+  // Create the target object info object for this target.
+  TOI = TM.getTargetObjInfo();
 }
 
 MachOWriter::~MachOWriter() {
@@ -312,7 +326,7 @@
     // FIXME: remove when we have unified size + output buffer
     unsigned AlignedSize = Sec->size - OrigSize;
     for (unsigned i = 0; i < AlignedSize; ++i)
-      outbyte(Sec->SectionData, 0);
+      TOI->outbyte(Sec->SectionData, 0);
   }
   // Record the offset of the symbol, and then allocate space for it.
   // FIXME: remove when we have unified size + output buffer
@@ -329,7 +343,7 @@
   
   // Allocate space in the section for the global.
   for (unsigned i = 0; i < Size; ++i)
-    outbyte(Sec->SectionData, 0);
+    TOI->outbyte(Sec->SectionData, 0);
 }
 
 void MachOWriter::EmitGlobal(GlobalVariable *GV) {
@@ -442,15 +456,15 @@
   // Step #3: write the header to the file
   // Local alias to shortenify coming code.
   DataBuffer &FH = Header.HeaderData;
-  outword(FH, Header.magic);
-  outword(FH, Header.cputype);
-  outword(FH, Header.cpusubtype);
-  outword(FH, Header.filetype);
-  outword(FH, Header.ncmds);
-  outword(FH, Header.sizeofcmds);
-  outword(FH, Header.flags);
+  TOI->outword(FH, Header.magic);
+  TOI->outword(FH, Header.cputype);
+  TOI->outword(FH, Header.cpusubtype);
+  TOI->outword(FH, Header.filetype);
+  TOI->outword(FH, Header.ncmds);
+  TOI->outword(FH, Header.sizeofcmds);
+  TOI->outword(FH, Header.flags);
   if (is64Bit)
-    outword(FH, Header.reserved);
+    TOI->outword(FH, Header.reserved);
   
   // Step #4: Finish filling in the segment load command and write it out
   for (std::vector<MachOSection*>::iterator I = SectionList.begin(),
@@ -460,17 +474,17 @@
   SEG.vmsize = SEG.filesize;
   SEG.fileoff = Header.cmdSize(is64Bit) + Header.sizeofcmds;
   
-  outword(FH, SEG.cmd);
-  outword(FH, SEG.cmdsize);
-  outstring(FH, SEG.segname, 16);
-  outaddr(FH, SEG.vmaddr);
-  outaddr(FH, SEG.vmsize);
-  outaddr(FH, SEG.fileoff);
-  outaddr(FH, SEG.filesize);
-  outword(FH, SEG.maxprot);
-  outword(FH, SEG.initprot);
-  outword(FH, SEG.nsects);
-  outword(FH, SEG.flags);
+  TOI->outword(FH, SEG.cmd);
+  TOI->outword(FH, SEG.cmdsize);
+  TOI->outstring(FH, SEG.segname, 16);
+  TOI->outaddr(FH, SEG.vmaddr);
+  TOI->outaddr(FH, SEG.vmsize);
+  TOI->outaddr(FH, SEG.fileoff);
+  TOI->outaddr(FH, SEG.filesize);
+  TOI->outword(FH, SEG.maxprot);
+  TOI->outword(FH, SEG.initprot);
+  TOI->outword(FH, SEG.nsects);
+  TOI->outword(FH, SEG.flags);
   
   // Step #5: Finish filling in the fields of the MachOSections 
   uint64_t currentAddr = 0;
@@ -497,19 +511,19 @@
     currentAddr += MOS->nreloc * 8;
     
     // write the finalized section command to the output buffer
-    outstring(FH, MOS->sectname, 16);
-    outstring(FH, MOS->segname, 16);
-    outaddr(FH, MOS->addr);
-    outaddr(FH, MOS->size);
-    outword(FH, MOS->offset);
-    outword(FH, MOS->align);
-    outword(FH, MOS->reloff);
-    outword(FH, MOS->nreloc);
-    outword(FH, MOS->flags);
-    outword(FH, MOS->reserved1);
-    outword(FH, MOS->reserved2);
+    TOI->outstring(FH, MOS->sectname, 16);
+    TOI->outstring(FH, MOS->segname, 16);
+    TOI->outaddr(FH, MOS->addr);
+    TOI->outaddr(FH, MOS->size);
+    TOI->outword(FH, MOS->offset);
+    TOI->outword(FH, MOS->align);
+    TOI->outword(FH, MOS->reloff);
+    TOI->outword(FH, MOS->nreloc);
+    TOI->outword(FH, MOS->flags);
+    TOI->outword(FH, MOS->reserved1);
+    TOI->outword(FH, MOS->reserved2);
     if (is64Bit)
-      outword(FH, MOS->reserved3);
+      TOI->outword(FH, MOS->reserved3);
   }
   
   // Step #7: Emit the symbol table to temporary buffers, so that we know the
@@ -521,36 +535,36 @@
   SymTab.nsyms   = SymbolTable.size();
   SymTab.stroff  = SymTab.symoff + SymT.size();
   SymTab.strsize = StrT.size();
-  outword(FH, SymTab.cmd);
-  outword(FH, SymTab.cmdsize);
-  outword(FH, SymTab.symoff);
-  outword(FH, SymTab.nsyms);
-  outword(FH, SymTab.stroff);
-  outword(FH, SymTab.strsize);
+  TOI->outword(FH, SymTab.cmd);
+  TOI->outword(FH, SymTab.cmdsize);
+  TOI->outword(FH, SymTab.symoff);
+  TOI->outword(FH, SymTab.nsyms);
+  TOI->outword(FH, SymTab.stroff);
+  TOI->outword(FH, SymTab.strsize);
 
   // FIXME: set DySymTab fields appropriately
   // We should probably just update these in BufferSymbolAndStringTable since
   // thats where we're partitioning up the different kinds of symbols.
-  outword(FH, DySymTab.cmd);
-  outword(FH, DySymTab.cmdsize);
-  outword(FH, DySymTab.ilocalsym);
-  outword(FH, DySymTab.nlocalsym);
-  outword(FH, DySymTab.iextdefsym);
-  outword(FH, DySymTab.nextdefsym);
-  outword(FH, DySymTab.iundefsym);
-  outword(FH, DySymTab.nundefsym);
-  outword(FH, DySymTab.tocoff);
-  outword(FH, DySymTab.ntoc);
-  outword(FH, DySymTab.modtaboff);
-  outword(FH, DySymTab.nmodtab);
-  outword(FH, DySymTab.extrefsymoff);
-  outword(FH, DySymTab.nextrefsyms);
-  outword(FH, DySymTab.indirectsymoff);
-  outword(FH, DySymTab.nindirectsyms);
-  outword(FH, DySymTab.extreloff);
-  outword(FH, DySymTab.nextrel);
-  outword(FH, DySymTab.locreloff);
-  outword(FH, DySymTab.nlocrel);
+  TOI->outword(FH, DySymTab.cmd);
+  TOI->outword(FH, DySymTab.cmdsize);
+  TOI->outword(FH, DySymTab.ilocalsym);
+  TOI->outword(FH, DySymTab.nlocalsym);
+  TOI->outword(FH, DySymTab.iextdefsym);
+  TOI->outword(FH, DySymTab.nextdefsym);
+  TOI->outword(FH, DySymTab.iundefsym);
+  TOI->outword(FH, DySymTab.nundefsym);
+  TOI->outword(FH, DySymTab.tocoff);
+  TOI->outword(FH, DySymTab.ntoc);
+  TOI->outword(FH, DySymTab.modtaboff);
+  TOI->outword(FH, DySymTab.nmodtab);
+  TOI->outword(FH, DySymTab.extrefsymoff);
+  TOI->outword(FH, DySymTab.nextrefsyms);
+  TOI->outword(FH, DySymTab.indirectsymoff);
+  TOI->outword(FH, DySymTab.nindirectsyms);
+  TOI->outword(FH, DySymTab.extreloff);
+  TOI->outword(FH, DySymTab.nextrel);
+  TOI->outword(FH, DySymTab.locreloff);
+  TOI->outword(FH, DySymTab.nlocrel);
   
   O.write((char*)&FH[0], FH.size());
 }
@@ -627,7 +641,7 @@
   
   // Write out a leading zero byte when emitting string table, for n_strx == 0
   // which means an empty string.
-  outbyte(StrT, 0);
+  TOI->outbyte(StrT, 0);
 
   // The order of the string table is:
   // 1. strings for external symbols
@@ -640,7 +654,7 @@
       I->n_strx = 0;
     } else {
       I->n_strx = StrT.size();
-      outstring(StrT, I->GVName, I->GVName.length()+1);
+      TOI->outstring(StrT, I->GVName, I->GVName.length()+1);
     }
   }
 
@@ -654,11 +668,11 @@
       I->n_value += GVSection[GV]->addr;
          
     // Emit nlist to buffer
-    outword(SymT, I->n_strx);
-    outbyte(SymT, I->n_type);
-    outbyte(SymT, I->n_sect);
-    outhalf(SymT, I->n_desc);
-    outaddr(SymT, I->n_value);
+    TOI->outword(SymT, I->n_strx);
+    TOI->outbyte(SymT, I->n_type);
+    TOI->outbyte(SymT, I->n_sect);
+    TOI->outhalf(SymT, I->n_desc);
+    TOI->outaddr(SymT, I->n_value);
   }
 }
 





From isanbard at gmail.com  Tue Jan 16 21:50:56 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:50:56 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetMachine.cpp
Message-ID: <200701170350.l0H3ounm009038@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetMachine.cpp updated: 1.56 -> 1.57
---
Log message:

Create/store/and delete the TargetObjInfo object.


---
Diffs of the changes:  (+2 -0)

 TargetMachine.cpp |    2 ++
 1 files changed, 2 insertions(+)


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.56 llvm/lib/Target/TargetMachine.cpp:1.57
--- llvm/lib/Target/TargetMachine.cpp:1.56	Fri Dec  8 20:41:30 2006
+++ llvm/lib/Target/TargetMachine.cpp	Tue Jan 16 21:50:41 2007
@@ -13,6 +13,7 @@
 
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
@@ -104,6 +105,7 @@
 
 TargetMachine::~TargetMachine() {
   delete AsmInfo;
+  delete ObjInfo;
 }
 
 /// getRelocationModel - Returns the code generation relocation model. The





From isanbard at gmail.com  Tue Jan 16 21:51:56 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:51:56 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetMachine.cpp
	X86TargetMachine.h
Message-ID: <200701170351.l0H3puwS009070@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.135 -> 1.136
X86TargetMachine.h updated: 1.41 -> 1.42
---
Log message:

Create the specified TargetObjInfo and use it.


---
Diffs of the changes:  (+6 -0)

 X86TargetMachine.cpp |    5 +++++
 X86TargetMachine.h   |    1 +
 2 files changed, 6 insertions(+)


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.135 llvm/lib/Target/X86/X86TargetMachine.cpp:1.136
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.135	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Tue Jan 16 21:51:37 2007
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86TargetAsmInfo.h"
+#include "X86TargetObjInfo.h"
 #include "X86TargetMachine.h"
 #include "X86.h"
 #include "llvm/Module.h"
@@ -42,6 +43,10 @@
   return new X86TargetAsmInfo(*this);
 }
 
+const TargetObjInfo *X86TargetMachine::createTargetObjInfo() const {
+  return new ELFTargetObjInfo(*this);
+}
+
 unsigned X86_32TargetMachine::getJITMatchQuality() {
 #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
   return 10;


Index: llvm/lib/Target/X86/X86TargetMachine.h
diff -u llvm/lib/Target/X86/X86TargetMachine.h:1.41 llvm/lib/Target/X86/X86TargetMachine.h:1.42
--- llvm/lib/Target/X86/X86TargetMachine.h:1.41	Fri Sep  8 01:48:29 2006
+++ llvm/lib/Target/X86/X86TargetMachine.h	Tue Jan 16 21:51:37 2007
@@ -35,6 +35,7 @@
 
 protected:
   virtual const TargetAsmInfo *createTargetAsmInfo() const;
+  virtual const TargetObjInfo *createTargetObjInfo() const;
   
 public:
   X86TargetMachine(const Module &M, const std::string &FS, bool is64Bit);





From isanbard at gmail.com  Tue Jan 16 21:51:56 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Jan 2007 21:51:56 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
	PPCTargetMachine.cpp PPCTargetMachine.h
Message-ID: <200701170351.l0H3put5009077@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCMachOWriter.cpp updated: 1.9 -> 1.10
PPCTargetMachine.cpp updated: 1.112 -> 1.113
PPCTargetMachine.h updated: 1.25 -> 1.26
---
Log message:

Create the specified TargetObjInfo and use it.


---
Diffs of the changes:  (+24 -18)

 PPCMachOWriter.cpp   |   36 ++++++++++++++++++------------------
 PPCTargetMachine.cpp |    5 +++++
 PPCTargetMachine.h   |    1 +
 3 files changed, 24 insertions(+), 18 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
diff -u llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.9 llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.10
--- llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.9	Sat Dec 16 14:23:42 2006
+++ llvm/lib/Target/PowerPC/PPCMachOWriter.cpp	Tue Jan 16 21:51:37 2007
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Nate Begeman and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file was developed by Nate Begeman and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -17,6 +17,7 @@
 #include "llvm/PassManager.h"
 #include "llvm/CodeGen/MachOWriter.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Target/TargetObjInfo.h"
 using namespace llvm;
 
 namespace {
@@ -91,10 +92,10 @@
       MachORelocation VANILLA(MR.getMachineCodeOffset(), To.Index, false, 2, 
                               isExtern, PPC_RELOC_VANILLA);
       ++From.nreloc;
-      outword(From.RelocBuffer, VANILLA.r_address);
-      outword(From.RelocBuffer, VANILLA.getPackedFields());
+      TOI->outword(From.RelocBuffer, VANILLA.r_address);
+      TOI->outword(From.RelocBuffer, VANILLA.getPackedFields());
     }
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bx:
     Addr -= MR.getMachineCodeOffset();
@@ -102,12 +103,12 @@
     Addr &= 0xFFFFFF;
     Addr <<= 2;
     Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bcx:
     Addr -= MR.getMachineCodeOffset();
     Addr &= 0xFFFC;
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_high:
     {
@@ -117,14 +118,14 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, HA16.r_address);
-      outword(From.RelocBuffer, HA16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
+      TOI->outword(From.RelocBuffer, HA16.r_address);
+      TOI->outword(From.RelocBuffer, HA16.getPackedFields());
+      TOI->outword(From.RelocBuffer, PAIR.r_address);
+      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("ha16: %x\n", (unsigned)Addr);
     Addr += 0x8000;
-    fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_low:
     {
@@ -134,13 +135,13 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, LO16.r_address);
-      outword(From.RelocBuffer, LO16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
+      TOI->outword(From.RelocBuffer, LO16.r_address);
+      TOI->outword(From.RelocBuffer, LO16.getPackedFields());
+      TOI->outword(From.RelocBuffer, PAIR.r_address);
+      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("lo16: %x\n", (unsigned)Addr);
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   }
 }
@@ -150,4 +151,3 @@
   // FIXME: do something about PIC
   return MachineRelocation::getBB(Offset, PPC::reloc_vanilla, MBB);
 }
-


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.112 llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.113
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.112	Sat Jan  6 16:27:58 2007
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp	Tue Jan 16 21:51:37 2007
@@ -13,6 +13,7 @@
 
 #include "PPC.h"
 #include "PPCTargetAsmInfo.h"
+#include "PPCTargetObjInfo.h"
 #include "PPCTargetMachine.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
@@ -34,6 +35,10 @@
     return new LinuxTargetAsmInfo(*this);
 }
 
+const TargetObjInfo *PPCTargetMachine::createTargetObjInfo() const {
+  return new MachOTargetObjInfo(*this);
+}
+
 unsigned PPC32TargetMachine::getJITMatchQuality() {
 #if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER)
   if (sizeof(void*) == 4)


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.25 llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.26
--- llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.25	Thu Sep  7 18:39:26 2006
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.h	Tue Jan 16 21:51:37 2007
@@ -39,6 +39,7 @@
   
 protected:
   virtual const TargetAsmInfo *createTargetAsmInfo() const;
+  virtual const TargetObjInfo *createTargetObjInfo() const;
   
 public:
   PPCTargetMachine(const Module &M, const std::string &FS, bool is64Bit);





From gordonhenriksen at mac.com  Tue Jan 16 22:49:04 2007
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Tue, 16 Jan 2007 23:49:04 -0500
Subject: [llvm-commits] CAST patch committed
In-Reply-To: <AC41CDB6-CC22-44FF-8319-3D13F165B61A@apple.com>
References: <1164589934.2817.124.camel@bashful.x10sys.com>
	<D94FCA31-460F-4936-9B8A-F808E0A92988@apple.com>
	<1164668010.2837.63.camel@bashful.x10sys.com>
	<AC41CDB6-CC22-44FF-8319-3D13F165B61A@apple.com>
Message-ID: <9564D1D6-AAD6-4FF9-ACA1-C1E8768A51D9@mac.com>

On 2006-11-29, at 02:27, Chris Lattner wrote:

> On 2006-11-27, at 17:53, Reid Spencer wrote:
>
>> On Mon, 2006-11-27 at 14:28 -0800, Chris Lattner wrote:
>>
>>> the CBE doesn't implement the stacksave/restore builtins right.   
>>> If someone was interested in doing this, it should be possible to  
>>> use GCC extensions to implement this.
>>
>> Is there a PR open for this?
>
> No.  It should be really easy to implement them in terms of GCC's  
> __builtin_stack_save/__builtin_stack_restore builtins.  I don't  
> know what version of GCC these are available on though, we'd want  
> to conditionalize the CBE output correctly.  Filing a PR for this  
> would make sense.

The PR is <http://llvm.org/bugs/show_bug.cgi?id=1028>. A patch and  
test are attached.

A more ambitious fix would be to use preprocessor directives to noop  
out the calls on unsupported compilers. That should prove  
functionally identical except for the stack overflows. :) But since  
these intrinsics are not documented even on current compilers, it is  
unclear what condition to use. The stack builtins are available at  
least back to gcc 3.3 (c. 2003).

I don't have llvm-test properly set up, so I have not yet tried  
176.gcc with this change.

llvm-gcc seems to be unaffected, but it might be worth reviewing  
TreeToLLVM::EmitBuiltinCall (gcc/llvm-convert.cpp:3127) to check me.  
Stack save/restore seems to fall into the second case, which is  
unaffected by the changes to Intrinsics.td.

? Gordon

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR1028.tar.gz
Type: application/x-gzip
Size: 723 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070116/9e02d6a4/attachment.gz 
-------------- next part --------------


From sabre at nondot.org  Tue Jan 16 23:27:13 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Jan 2007 23:27:13 -0600
Subject: [llvm-commits] CVS: llvm/projects/Makefile
Message-ID: <200701170527.l0H5RDi5017771@zion.cs.uiuc.edu>



Changes in directory llvm/projects:

Makefile updated: 1.16 -> 1.17
---
Log message:

remove obsolete comment


---
Diffs of the changes:  (+1 -1)

 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/projects/Makefile
diff -u llvm/projects/Makefile:1.16 llvm/projects/Makefile:1.17
--- llvm/projects/Makefile:1.16	Tue Jan 16 20:18:43 2007
+++ llvm/projects/Makefile	Tue Jan 16 23:26:57 2007
@@ -12,7 +12,7 @@
 
 DIRS:= $(filter-out llvm-test,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile)))
 
-# Sparc cannot link shared libraries (libtool problem?) which Stacker uses
+# Sparc cannot link shared libraries (libtool problem?)
 ifeq ($(ARCH), Sparc)
 DIRS := $(filter-out sample, $(DIRS))
 endif





From reid at x10sys.com  Tue Jan 16 23:37:58 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 16 Jan 2007 23:37:58 -0600
Subject: [llvm-commits] CVS: llvm/docs/Stacker.html
Message-ID: <200701170537.l0H5bwKu018076@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

Stacker.html updated: 1.23 -> 1.24
---
Log message:

Update for changes in location of Stacker.


---
Diffs of the changes:  (+17 -12)

 Stacker.html |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)


Index: llvm/docs/Stacker.html
diff -u llvm/docs/Stacker.html:1.23 llvm/docs/Stacker.html:1.24
--- llvm/docs/Stacker.html:1.23	Sat Dec 30 21:44:08 2006
+++ llvm/docs/Stacker.html	Tue Jan 16 23:37:42 2007
@@ -1298,11 +1298,16 @@
 <div class="doc_subsection"> <a name="directory">Directory Structure</a></div>
 <div class="doc_text">
 <p>The source code, test programs, and sample programs can all be found
-under the LLVM "projects" directory. You will need to obtain the LLVM sources
-to find it (either via anonymous CVS or a tarball. See the 
-<a href="GettingStarted.html">Getting Started</a> document).</p>
-<p>Under the "projects" directory there is a directory named "Stacker". That
-directory contains everything, as follows:</p>
+in the LLVM repository named <tt>llvm-stacker</tt> This should be checked out to
+the <tt>projects</tt> directory so that it will auto-configure. To do that, make
+sure you have the llvm sources in <tt><i>llvm</i></tt> 
+(see <a href="GettingStarted.html">Getting Started</a>) and then use these 
+commands:<pre>
+    cd <i>llvm</i>/projects
+    cvs co llvm-stacker</pre>
+</p>
+<p>Under the <tt>projects/llvm-stacker</tt> directory you will find the
+implementation of the Stacker compiler, as follows:</p>
 <ul>
     <li><em>lib</em> - contains most of the source code
     <ul>
@@ -1320,32 +1325,32 @@
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="lexer"></a>The Lexer</div>
 <div class="doc_text">
-<p>See projects/Stacker/lib/compiler/Lexer.l</p>
+<p>See projects/llvm-stacker/lib/compiler/Lexer.l</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="parser"></a>The Parser</div>
 <div class="doc_text">
-<p>See projects/Stacker/lib/compiler/StackerParser.y</p>
+<p>See projects/llvm-stacker/lib/compiler/StackerParser.y</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="compiler"></a>The Compiler</div>
 <div class="doc_text">
-<p>See projects/Stacker/lib/compiler/StackerCompiler.cpp</p>
+<p>See projects/llvm-stacker/lib/compiler/StackerCompiler.cpp</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="runtime"></a>The Runtime</div>
 <div class="doc_text">
-<p>See projects/Stacker/lib/runtime/stacker_rt.c</p>
+<p>See projects/llvm-stacker/lib/runtime/stacker_rt.c</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="driver"></a>Compiler Driver</div>
 <div class="doc_text">
-<p>See projects/Stacker/tools/stkrc/stkrc.cpp</p>
+<p>See projects/llvm-stacker/tools/stkrc/stkrc.cpp</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="tests"></a>Test Programs</div>
 <div class="doc_text">
-<p>See projects/Stacker/test/*.st</p>
+<p>See projects/llvm-stacker/test/*.st</p>
 </div>
 <!-- ======================================================================= -->
 <div class="doc_subsection"> <a name="exercise">Exercise</a></div>
@@ -1405,7 +1410,7 @@
 
   <a href="mailto:rspencer at x10sys.com">Reid Spencer</a><br>
   <a href="http://llvm.org">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2006/12/31 03:44:08 $
+  Last modified: $Date: 2007/01/17 05:37:42 $
 </address>
 
 </body>





From sabre at nondot.org  Wed Jan 17 01:29:03 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 01:29:03 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
Message-ID: <200701170729.l0H7T3Fa020228@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.42 -> 1.43
---
Log message:

make doxygen comment much better.  Patch by B. Scott Michel!


---
Diffs of the changes:  (+31 -1)

 TargetData.h |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.42 llvm/include/llvm/Target/TargetData.h:1.43
--- llvm/include/llvm/Target/TargetData.h:1.42	Tue Oct 24 15:48:29 2006
+++ llvm/include/llvm/Target/TargetData.h	Wed Jan 17 01:28:48 2007
@@ -81,8 +81,38 @@
 
   ~TargetData();  // Not virtual, do not subclass this class
 
-  /// init - Specify configuration if not available at ctor time.
+  /// Parse a target data layout string and initialize TargetData members.
   ///
+  /// Parse a target data layout string, initializing the various TargetData
+  /// members along the way. A TargetData specification string looks like
+  /// "E-p:64:64-d:64-f:32-l:64-i:32-s:16-b:8-B:8" and specifies the
+  /// target's endianess, the alignments of various data types and
+  /// the size of pointers. The "-" is used as a separator and ":"
+  /// separates a token from its argument. Alignment is indicated in bits
+  /// and internally converted to the appropriate number of bytes.
+  ///
+  /// Valid tokens:
+  /// <br>
+  /// <em>E</em> specifies big endian architecture (1234) [default]<br>
+  /// <em>e</em> specifies little endian architecture (4321) <br>
+  /// <em>p:[ptr size]:[ptr align]</em> specifies pointer size and alignment
+  /// [default = 64:64] <br>
+  /// <em>d:[align]</em> specifies double floating point alignment
+  /// [default = 64] <br>
+  /// <em>f:[align]</em> specifies single floating point alignment
+  /// [default = 32] <br>
+  /// <em>l:[align]</em> specifies long integer alignment
+  /// [default = 64] <br>
+  /// <em>i:[align]</em> specifies integer alignment
+  /// [default = 32] <br>
+  /// <em>s:[align]</em> specifies short integer alignment
+  /// [default = 16] <br>
+  /// <em>b:[align]</em> specifies byte data type alignment
+  /// [default = 8] <br>
+  /// <em>B:[align]</em> specifies boolean data type alignment
+  /// [default = 8] <br>
+  ///
+  /// All other token types are silently ignored.
   void init(const std::string &TargetDescription);
   
   





From sabre at nondot.org  Wed Jan 17 01:45:28 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 01:45:28 -0600
Subject: [llvm-commits] CVS: llvm/utils/TableGen/DAGISelEmitter.cpp
Message-ID: <200701170745.l0H7jSth020624@zion.cs.uiuc.edu>



Changes in directory llvm/utils/TableGen:

DAGISelEmitter.cpp updated: 1.289 -> 1.290
---
Log message:

Make tblgen error more useful.  Patch by B. Scott Michel


---
Diffs of the changes:  (+4 -1)

 DAGISelEmitter.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/utils/TableGen/DAGISelEmitter.cpp
diff -u llvm/utils/TableGen/DAGISelEmitter.cpp:1.289 llvm/utils/TableGen/DAGISelEmitter.cpp:1.290
--- llvm/utils/TableGen/DAGISelEmitter.cpp:1.289	Thu Dec  7 16:21:48 2006
+++ llvm/utils/TableGen/DAGISelEmitter.cpp	Wed Jan 17 01:45:12 2007
@@ -2621,7 +2621,10 @@
         assert(N->getExtTypes().size() == 1 && "Multiple types not handled!");
         std::string CastType;
         switch (N->getTypeNum(0)) {
-        default: assert(0 && "Unknown type for constant node!");
+        default:
+          cerr << "Cannot handle " << getEnumName(N->getTypeNum(0))
+               << " type as an immediate constant. Aborting\n";
+          abort();
         case MVT::i1:  CastType = "bool"; break;
         case MVT::i8:  CastType = "unsigned char"; break;
         case MVT::i16: CastType = "unsigned short"; break;





From reid at x10sys.com  Wed Jan 17 01:59:30 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 01:59:30 -0600
Subject: [llvm-commits] CVS: llvm/test/Makefile
Message-ID: <200701170759.l0H7xUnJ020979@zion.cs.uiuc.edu>



Changes in directory llvm/test:

Makefile updated: 1.91 -> 1.92
---
Log message:

Regression is gone, don't try to find it on clean target.


---
Diffs of the changes:  (+1 -2)

 Makefile |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)


Index: llvm/test/Makefile
diff -u llvm/test/Makefile:1.91 llvm/test/Makefile:1.92
--- llvm/test/Makefile:1.91	Fri Nov 10 19:02:45 2006
+++ llvm/test/Makefile	Wed Jan 17 01:59:14 2007
@@ -42,8 +42,7 @@
 endif
 
 clean::
-	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
-	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Feature -name Output -type d -print`
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
 site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@echo 'Making a new site.exp file...'





From reid at x10sys.com  Wed Jan 17 02:01:28 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 02:01:28 -0600
Subject: [llvm-commits] CVS: llvm/test/CFrontend/2006-01-13-Includes.c
Message-ID: <200701170801.l0H81SgB021040@zion.cs.uiuc.edu>



Changes in directory llvm/test/CFrontend:

2006-01-13-Includes.c updated: 1.5 -> 1.6
---
Log message:

The Regression directory is now gone.


---
Diffs of the changes:  (+1 -1)

 2006-01-13-Includes.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/CFrontend/2006-01-13-Includes.c
diff -u llvm/test/CFrontend/2006-01-13-Includes.c:1.5 llvm/test/CFrontend/2006-01-13-Includes.c:1.6
--- llvm/test/CFrontend/2006-01-13-Includes.c:1.5	Fri Jun 16 11:57:43 2006
+++ llvm/test/CFrontend/2006-01-13-Includes.c	Wed Jan 17 02:01:13 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -g -S -o - | gccas | llvm-dis | grep "test/Regression/CFrontend"
+// RUN: %llvmgcc %s -g -S -o - | gccas | llvm-dis | grep "test/CFrontend"
 // PR676
 
 #include <stdio.h>





From isanbard at gmail.com  Wed Jan 17 03:06:38 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:38 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetMachine.cpp
	X86TargetMachine.h X86TargetObjInfo.cpp X86TargetObjInfo.h
Message-ID: <200701170906.l0H96csr031210@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.136 -> 1.137
X86TargetMachine.h updated: 1.42 -> 1.43
X86TargetObjInfo.cpp (r1.1) removed
X86TargetObjInfo.h (r1.1) removed
---
Log message:

Revert patch.


---
Diffs of the changes:  (+0 -6)

 X86TargetMachine.cpp |    5 -----
 X86TargetMachine.h   |    1 -
 2 files changed, 6 deletions(-)


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.136 llvm/lib/Target/X86/X86TargetMachine.cpp:1.137
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.136	Tue Jan 16 21:51:37 2007
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Wed Jan 17 03:06:13 2007
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86TargetAsmInfo.h"
-#include "X86TargetObjInfo.h"
 #include "X86TargetMachine.h"
 #include "X86.h"
 #include "llvm/Module.h"
@@ -43,10 +42,6 @@
   return new X86TargetAsmInfo(*this);
 }
 
-const TargetObjInfo *X86TargetMachine::createTargetObjInfo() const {
-  return new ELFTargetObjInfo(*this);
-}
-
 unsigned X86_32TargetMachine::getJITMatchQuality() {
 #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
   return 10;


Index: llvm/lib/Target/X86/X86TargetMachine.h
diff -u llvm/lib/Target/X86/X86TargetMachine.h:1.42 llvm/lib/Target/X86/X86TargetMachine.h:1.43
--- llvm/lib/Target/X86/X86TargetMachine.h:1.42	Tue Jan 16 21:51:37 2007
+++ llvm/lib/Target/X86/X86TargetMachine.h	Wed Jan 17 03:06:13 2007
@@ -35,7 +35,6 @@
 
 protected:
   virtual const TargetAsmInfo *createTargetAsmInfo() const;
-  virtual const TargetObjInfo *createTargetObjInfo() const;
   
 public:
   X86TargetMachine(const Module &M, const std::string &FS, bool is64Bit);





From isanbard at gmail.com  Wed Jan 17 03:06:41 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:41 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetMachine.cpp
Message-ID: <200701170906.l0H96fml031229@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetMachine.cpp updated: 1.57 -> 1.58
---
Log message:

Revert patch.


---
Diffs of the changes:  (+0 -2)

 TargetMachine.cpp |    2 --
 1 files changed, 2 deletions(-)


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.57 llvm/lib/Target/TargetMachine.cpp:1.58
--- llvm/lib/Target/TargetMachine.cpp:1.57	Tue Jan 16 21:50:41 2007
+++ llvm/lib/Target/TargetMachine.cpp	Wed Jan 17 03:06:13 2007
@@ -13,7 +13,6 @@
 
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
@@ -105,7 +104,6 @@
 
 TargetMachine::~TargetMachine() {
   delete AsmInfo;
-  delete ObjInfo;
 }
 
 /// getRelocationModel - Returns the code generation relocation model. The





From isanbard at gmail.com  Wed Jan 17 03:06:42 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:42 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/ELFWriter.h
	MachOWriter.h
Message-ID: <200701170906.l0H96gZC031243@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

ELFWriter.h updated: 1.13 -> 1.14
MachOWriter.h updated: 1.12 -> 1.13
---
Log message:

Revert patch.


---
Diffs of the changes:  (+191 -10)

 ELFWriter.h   |  101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 MachOWriter.h |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 191 insertions(+), 10 deletions(-)


Index: llvm/include/llvm/CodeGen/ELFWriter.h
diff -u llvm/include/llvm/CodeGen/ELFWriter.h:1.13 llvm/include/llvm/CodeGen/ELFWriter.h:1.14
--- llvm/include/llvm/CodeGen/ELFWriter.h:1.13	Tue Jan 16 21:47:54 2007
+++ llvm/include/llvm/CodeGen/ELFWriter.h	Wed Jan 17 03:06:13 2007
@@ -22,7 +22,6 @@
   class Mangler;
   class MachineCodeEmitter;
   class ELFCodeEmitter;
-  class TargetObjInfo;
 
   /// ELFWriter - This class implements the common target-independent code for
   /// writing ELF files.  Targets should derive a class from this to
@@ -50,10 +49,6 @@
     ///
     TargetMachine &TM;
 
-    /// Target object writer info.
-    ///
-    const TargetObjInfo *TOI;
-
     /// Mang - The object used to perform name mangling for this module.
     ///
     Mangler *Mang;
@@ -219,6 +214,102 @@
     unsigned ELFHeader_e_shoff_Offset;     // e_shoff    in ELF header.
     unsigned ELFHeader_e_shstrndx_Offset;  // e_shstrndx in ELF header.
     unsigned ELFHeader_e_shnum_Offset;     // e_shnum    in ELF header.
+
+
+    // align - Emit padding into the file until the current output position is
+    // aligned to the specified power of two boundary.
+    static void align(DataBuffer &Output, unsigned Boundary) {
+      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
+             "Must align to 2^k boundary");
+      size_t Size = Output.size();
+      if (Size & (Boundary-1)) {
+        // Add padding to get alignment to the correct place.
+        size_t Pad = Boundary-(Size & (Boundary-1));
+        Output.resize(Size+Pad);
+      }
+    }
+
+    static void outbyte(DataBuffer &Output, unsigned char X) {
+      Output.push_back(X);
+    }
+    void outhalf(DataBuffer &Output, unsigned short X) {
+      if (isLittleEndian) {
+        Output.push_back(X&255);
+        Output.push_back(X >> 8);
+      } else {
+        Output.push_back(X >> 8);
+        Output.push_back(X&255);
+      }
+    }
+    void outword(DataBuffer &Output, unsigned X) {
+      if (isLittleEndian) {
+        Output.push_back((X >>  0) & 255);
+        Output.push_back((X >>  8) & 255);
+        Output.push_back((X >> 16) & 255);
+        Output.push_back((X >> 24) & 255);
+      } else {
+        Output.push_back((X >> 24) & 255);
+        Output.push_back((X >> 16) & 255);
+        Output.push_back((X >>  8) & 255);
+        Output.push_back((X >>  0) & 255);
+      }
+    }
+    void outxword(DataBuffer &Output, uint64_t X) {
+      if (isLittleEndian) {
+        Output.push_back(unsigned(X >>  0) & 255);
+        Output.push_back(unsigned(X >>  8) & 255);
+        Output.push_back(unsigned(X >> 16) & 255);
+        Output.push_back(unsigned(X >> 24) & 255);
+        Output.push_back(unsigned(X >> 32) & 255);
+        Output.push_back(unsigned(X >> 40) & 255);
+        Output.push_back(unsigned(X >> 48) & 255);
+        Output.push_back(unsigned(X >> 56) & 255);
+      } else {
+        Output.push_back(unsigned(X >> 56) & 255);
+        Output.push_back(unsigned(X >> 48) & 255);
+        Output.push_back(unsigned(X >> 40) & 255);
+        Output.push_back(unsigned(X >> 32) & 255);
+        Output.push_back(unsigned(X >> 24) & 255);
+        Output.push_back(unsigned(X >> 16) & 255);
+        Output.push_back(unsigned(X >>  8) & 255);
+        Output.push_back(unsigned(X >>  0) & 255);
+      }
+    }
+    void outaddr32(DataBuffer &Output, unsigned X) {
+      outword(Output, X);
+    }
+    void outaddr64(DataBuffer &Output, uint64_t X) {
+      outxword(Output, X);
+    }
+    void outaddr(DataBuffer &Output, uint64_t X) {
+      if (!is64Bit)
+        outword(Output, (unsigned)X);
+      else
+        outxword(Output, X);
+    }
+
+    // fix functions - Replace an existing entry at an offset.
+    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
+      unsigned char *P = &Output[Offset];
+      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
+      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
+    }
+
+    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
+      unsigned char *P = &Output[Offset];
+      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
+      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
+      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
+      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
+    }
+
+    void fixaddr(DataBuffer &Output, uint64_t X, unsigned Offset) {
+      if (!is64Bit)
+        fixword(Output, (unsigned)X, Offset);
+      else
+        assert(0 && "Emission of 64-bit data not implemented yet!");
+    }
+
   private:
     void EmitGlobal(GlobalVariable *GV);
 


Index: llvm/include/llvm/CodeGen/MachOWriter.h
diff -u llvm/include/llvm/CodeGen/MachOWriter.h:1.12 llvm/include/llvm/CodeGen/MachOWriter.h:1.13
--- llvm/include/llvm/CodeGen/MachOWriter.h:1.12	Tue Jan 16 21:47:54 2007
+++ llvm/include/llvm/CodeGen/MachOWriter.h	Wed Jan 17 03:06:13 2007
@@ -25,7 +25,6 @@
   class Mangler;
   class MachineCodeEmitter;
   class MachOCodeEmitter;
-  class TargetObjInfo;
 
   /// MachOSym - This struct contains information about each symbol that is
   /// added to logical symbol table for the module.  This is eventually
@@ -101,10 +100,6 @@
     ///
     TargetMachine &TM;
 
-    /// Target object writer info.
-    ///
-    const TargetObjInfo *TOI;
-
     /// Mang - The object used to perform name mangling for this module.
     ///
     Mangler *Mang;
@@ -664,6 +659,101 @@
     /// SymbolTable to aid in emitting the DYSYMTAB load command.
     std::vector<unsigned> DynamicSymbolTable;
     
+    // align - Emit padding into the file until the current output position is
+    // aligned to the specified power of two boundary.
+    static void align(DataBuffer &Output, unsigned Boundary) {
+      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
+             "Must align to 2^k boundary");
+      size_t Size = Output.size();
+      if (Size & (Boundary-1)) {
+        // Add padding to get alignment to the correct place.
+        size_t Pad = Boundary-(Size & (Boundary-1));
+        Output.resize(Size+Pad);
+      }
+    }
+
+    void outbyte(DataBuffer &Output, unsigned char X) {
+      Output.push_back(X);
+    }
+    void outhalf(DataBuffer &Output, unsigned short X) {
+      if (isLittleEndian) {
+        Output.push_back(X&255);
+        Output.push_back(X >> 8);
+      } else {
+        Output.push_back(X >> 8);
+        Output.push_back(X&255);
+      }
+    }
+    void outword(DataBuffer &Output, unsigned X) {
+      if (isLittleEndian) {
+        Output.push_back((X >>  0) & 255);
+        Output.push_back((X >>  8) & 255);
+        Output.push_back((X >> 16) & 255);
+        Output.push_back((X >> 24) & 255);
+      } else {
+        Output.push_back((X >> 24) & 255);
+        Output.push_back((X >> 16) & 255);
+        Output.push_back((X >>  8) & 255);
+        Output.push_back((X >>  0) & 255);
+      }
+    }
+    void outxword(DataBuffer &Output, uint64_t X) {
+      if (isLittleEndian) {
+        Output.push_back(unsigned(X >>  0) & 255);
+        Output.push_back(unsigned(X >>  8) & 255);
+        Output.push_back(unsigned(X >> 16) & 255);
+        Output.push_back(unsigned(X >> 24) & 255);
+        Output.push_back(unsigned(X >> 32) & 255);
+        Output.push_back(unsigned(X >> 40) & 255);
+        Output.push_back(unsigned(X >> 48) & 255);
+        Output.push_back(unsigned(X >> 56) & 255);
+      } else {
+        Output.push_back(unsigned(X >> 56) & 255);
+        Output.push_back(unsigned(X >> 48) & 255);
+        Output.push_back(unsigned(X >> 40) & 255);
+        Output.push_back(unsigned(X >> 32) & 255);
+        Output.push_back(unsigned(X >> 24) & 255);
+        Output.push_back(unsigned(X >> 16) & 255);
+        Output.push_back(unsigned(X >>  8) & 255);
+        Output.push_back(unsigned(X >>  0) & 255);
+      }
+    }
+    void outaddr32(DataBuffer &Output, unsigned X) {
+      outword(Output, X);
+    }
+    void outaddr64(DataBuffer &Output, uint64_t X) {
+      outxword(Output, X);
+    }
+    void outaddr(DataBuffer &Output, uint64_t X) {
+      if (!is64Bit)
+        outword(Output, (unsigned)X);
+      else
+        outxword(Output, X);
+    }
+    void outstring(DataBuffer &Output, std::string &S, unsigned Length) {
+      unsigned len_to_copy = S.length() < Length ? S.length() : Length;
+      unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0;
+      
+      for (unsigned i = 0; i < len_to_copy; ++i)
+        outbyte(Output, S[i]);
+
+      for (unsigned i = 0; i < len_to_fill; ++i)
+        outbyte(Output, 0);
+      
+    }
+    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
+      unsigned char *P = &Output[Offset];
+      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
+      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
+    }
+    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
+      unsigned char *P = &Output[Offset];
+      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
+      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
+      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
+      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
+    }
+    
     static void InitMem(const Constant *C, void *Addr, intptr_t Offset,
                         const TargetData *TD, 
                         std::vector<MachineRelocation> &MRs);





From isanbard at gmail.com  Wed Jan 17 03:06:40 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:40 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
	TargetObjInfo.h
Message-ID: <200701170906.l0H96ejS031222@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.72 -> 1.73
TargetObjInfo.h (r1.1) removed
---
Log message:

Revert patch.


---
Diffs of the changes:  (+3 -18)

 TargetMachine.h |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)


Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.72 llvm/include/llvm/Target/TargetMachine.h:1.73
--- llvm/include/llvm/Target/TargetMachine.h:1.72	Tue Jan 16 21:48:29 2007
+++ llvm/include/llvm/Target/TargetMachine.h	Wed Jan 17 03:06:13 2007
@@ -21,7 +21,6 @@
 namespace llvm {
 
 class TargetAsmInfo;
-class TargetObjInfo;
 class TargetData;
 class TargetSubtarget;
 class TargetInstrInfo;
@@ -67,7 +66,7 @@
   TargetMachine(const TargetMachine &);   // DO NOT IMPLEMENT
   void operator=(const TargetMachine &);  // DO NOT IMPLEMENT
 protected: // Can only create subclasses.
-  TargetMachine() : AsmInfo(NULL), ObjInfo(NULL) { }
+  TargetMachine() : AsmInfo(NULL) { }
 
   /// getSubtargetImpl - virtual method implemented by subclasses that returns
   /// a reference to that target's TargetSubtarget-derived member variable.
@@ -76,19 +75,11 @@
   /// AsmInfo - Contains target specific asm information.
   ///
   mutable const TargetAsmInfo *AsmInfo;
-
+  
   /// createTargetAsmInfo - Create a new instance of target specific asm
   /// information.
   virtual const TargetAsmInfo *createTargetAsmInfo() const { return NULL; }
 
-  /// ObjInfo - Contains target specific object file information.
-  /// 
-  mutable const TargetObjInfo *ObjInfo;
-  
-  /// createTargetObjInfo - Create a new instance of target specific object
-  /// information.
-  virtual const TargetObjInfo *createTargetObjInfo() const { return NULL; }
-
 public:
   virtual ~TargetMachine();
 
@@ -116,6 +107,7 @@
   virtual       TargetLowering    *getTargetLowering() const { return 0; }
   virtual const TargetData            *getTargetData() const { return 0; }
   
+  
   /// getTargetAsmInfo - Return target specific asm information.
   ///
   const TargetAsmInfo *getTargetAsmInfo() const {
@@ -123,13 +115,6 @@
     return AsmInfo;
   }
   
-  /// getTargetObjInfo - Return target specific object information.
-  ///
-  const TargetObjInfo *getTargetObjInfo() const {
-    if (!ObjInfo) ObjInfo = createTargetObjInfo();
-    return ObjInfo;
-  }
-  
   /// getSubtarget - This method returns a pointer to the specified type of
   /// TargetSubtarget.  In debug builds, it verifies that the object being
   /// returned is of the correct type.





From isanbard at gmail.com  Wed Jan 17 03:06:40 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:40 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
	PPCTargetMachine.cpp PPCTargetMachine.h PPCTargetObjInfo.cpp
	PPCTargetObjInfo.h
Message-ID: <200701170906.l0H96ec7031219@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCMachOWriter.cpp updated: 1.10 -> 1.11
PPCTargetMachine.cpp updated: 1.113 -> 1.114
PPCTargetMachine.h updated: 1.26 -> 1.27
PPCTargetObjInfo.cpp (r1.1) removed
PPCTargetObjInfo.h (r1.1) removed
---
Log message:

Revert patch.


---
Diffs of the changes:  (+18 -24)

 PPCMachOWriter.cpp   |   36 ++++++++++++++++++------------------
 PPCTargetMachine.cpp |    5 -----
 PPCTargetMachine.h   |    1 -
 3 files changed, 18 insertions(+), 24 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
diff -u llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.10 llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.11
--- llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.10	Tue Jan 16 21:51:37 2007
+++ llvm/lib/Target/PowerPC/PPCMachOWriter.cpp	Wed Jan 17 03:06:13 2007
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Nate Begeman and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file was developed by Nate Begeman and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -17,7 +17,6 @@
 #include "llvm/PassManager.h"
 #include "llvm/CodeGen/MachOWriter.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Target/TargetObjInfo.h"
 using namespace llvm;
 
 namespace {
@@ -92,10 +91,10 @@
       MachORelocation VANILLA(MR.getMachineCodeOffset(), To.Index, false, 2, 
                               isExtern, PPC_RELOC_VANILLA);
       ++From.nreloc;
-      TOI->outword(From.RelocBuffer, VANILLA.r_address);
-      TOI->outword(From.RelocBuffer, VANILLA.getPackedFields());
+      outword(From.RelocBuffer, VANILLA.r_address);
+      outword(From.RelocBuffer, VANILLA.getPackedFields());
     }
-    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bx:
     Addr -= MR.getMachineCodeOffset();
@@ -103,12 +102,12 @@
     Addr &= 0xFFFFFF;
     Addr <<= 2;
     Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
-    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bcx:
     Addr -= MR.getMachineCodeOffset();
     Addr &= 0xFFFC;
-    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_high:
     {
@@ -118,14 +117,14 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      TOI->outword(From.RelocBuffer, HA16.r_address);
-      TOI->outword(From.RelocBuffer, HA16.getPackedFields());
-      TOI->outword(From.RelocBuffer, PAIR.r_address);
-      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
+      outword(From.RelocBuffer, HA16.r_address);
+      outword(From.RelocBuffer, HA16.getPackedFields());
+      outword(From.RelocBuffer, PAIR.r_address);
+      outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("ha16: %x\n", (unsigned)Addr);
     Addr += 0x8000;
-    TOI->fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
+    fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_low:
     {
@@ -135,13 +134,13 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      TOI->outword(From.RelocBuffer, LO16.r_address);
-      TOI->outword(From.RelocBuffer, LO16.getPackedFields());
-      TOI->outword(From.RelocBuffer, PAIR.r_address);
-      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
+      outword(From.RelocBuffer, LO16.r_address);
+      outword(From.RelocBuffer, LO16.getPackedFields());
+      outword(From.RelocBuffer, PAIR.r_address);
+      outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("lo16: %x\n", (unsigned)Addr);
-    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   }
 }
@@ -151,3 +150,4 @@
   // FIXME: do something about PIC
   return MachineRelocation::getBB(Offset, PPC::reloc_vanilla, MBB);
 }
+


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.113 llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.114
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.113	Tue Jan 16 21:51:37 2007
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp	Wed Jan 17 03:06:13 2007
@@ -13,7 +13,6 @@
 
 #include "PPC.h"
 #include "PPCTargetAsmInfo.h"
-#include "PPCTargetObjInfo.h"
 #include "PPCTargetMachine.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
@@ -35,10 +34,6 @@
     return new LinuxTargetAsmInfo(*this);
 }
 
-const TargetObjInfo *PPCTargetMachine::createTargetObjInfo() const {
-  return new MachOTargetObjInfo(*this);
-}
-
 unsigned PPC32TargetMachine::getJITMatchQuality() {
 #if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER)
   if (sizeof(void*) == 4)


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.26 llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.27
--- llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.26	Tue Jan 16 21:51:37 2007
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.h	Wed Jan 17 03:06:13 2007
@@ -39,7 +39,6 @@
   
 protected:
   virtual const TargetAsmInfo *createTargetAsmInfo() const;
-  virtual const TargetObjInfo *createTargetObjInfo() const;
   
 public:
   PPCTargetMachine(const Module &M, const std::string &FS, bool is64Bit);





From isanbard at gmail.com  Wed Jan 17 03:06:41 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 03:06:41 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/ELFWriter.cpp MachOWriter.cpp
Message-ID: <200701170906.l0H96fvI031234@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

ELFWriter.cpp updated: 1.31 -> 1.32
MachOWriter.cpp updated: 1.13 -> 1.14
---
Log message:

Revert patch.


---
Diffs of the changes:  (+126 -156)

 ELFWriter.cpp   |  116 ++++++++++++++++-----------------------
 MachOWriter.cpp |  166 +++++++++++++++++++++++++-------------------------------
 2 files changed, 126 insertions(+), 156 deletions(-)


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.31 llvm/lib/CodeGen/ELFWriter.cpp:1.32
--- llvm/lib/CodeGen/ELFWriter.cpp:1.31	Tue Jan 16 21:49:21 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Wed Jan 17 03:06:13 2007
@@ -37,7 +37,6 @@
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/Streams.h"
 using namespace llvm;
@@ -54,20 +53,8 @@
     ELFWriter::ELFSection *ES;  // Section to write to.
     std::vector<unsigned char> *OutBuffer;
     size_t FnStart;
-
-    /// Target machine description.
-    ///
-    TargetMachine &TM;
-
-    /// Target object writer info.
-    ///
-    const TargetObjInfo *TOI;
   public:
-    ELFCodeEmitter(ELFWriter &ew, TargetMachine &tm)
-      : EW(ew), OutBuffer(0), TM(tm) {
-      // Create the target object info object for this target.
-      TOI = TM.getTargetObjInfo();
-    }
+    ELFCodeEmitter(ELFWriter &ew) : EW(ew), OutBuffer(0) {}
 
     void startFunction(MachineFunction &F);
     bool finishFunction(MachineFunction &F);
@@ -126,7 +113,7 @@
 
   // Add padding zeros to the end of the buffer to make sure that the
   // function will start on the correct byte alignment within the section.
-  TOI->align(*OutBuffer, Align);
+  ELFWriter::align(*OutBuffer, Align);
 
   FnStart = OutBuffer->size();
 }
@@ -178,11 +165,8 @@
   isLittleEndian = TM.getTargetData()->isLittleEndian();
 
   // Create the machine code emitter object for this target.
-  MCE = new ELFCodeEmitter(*this, TM);
+  MCE = new ELFCodeEmitter(*this);
   NumSections = 0;
-
-  // Create the target object info object for this target.
-  TOI = TM.getTargetObjInfo();
 }
 
 ELFWriter::~ELFWriter() {
@@ -197,36 +181,36 @@
   // Local alias to shortenify coming code.
   std::vector<unsigned char> &FH = FileHeader;
 
-  TOI->outbyte(FH, 0x7F);                     // EI_MAG0
-  TOI->outbyte(FH, 'E');                      // EI_MAG1
-  TOI->outbyte(FH, 'L');                      // EI_MAG2
-  TOI->outbyte(FH, 'F');                      // EI_MAG3
-  TOI->outbyte(FH, is64Bit ? 2 : 1);          // EI_CLASS
-  TOI->outbyte(FH, isLittleEndian ? 1 : 2);   // EI_DATA
-  TOI->outbyte(FH, 1);                        // EI_VERSION
-  FH.resize(16);                              // EI_PAD up to 16 bytes.
+  outbyte(FH, 0x7F);                     // EI_MAG0
+  outbyte(FH, 'E');                      // EI_MAG1
+  outbyte(FH, 'L');                      // EI_MAG2
+  outbyte(FH, 'F');                      // EI_MAG3
+  outbyte(FH, is64Bit ? 2 : 1);          // EI_CLASS
+  outbyte(FH, isLittleEndian ? 1 : 2);   // EI_DATA
+  outbyte(FH, 1);                        // EI_VERSION
+  FH.resize(16);                         // EI_PAD up to 16 bytes.
 
   // This should change for shared objects.
-  TOI->outhalf(FH, 1);               // e_type = ET_REL
-  TOI->outhalf(FH, e_machine);       // e_machine = whatever the target wants
-  TOI->outword(FH, 1);               // e_version = 1
-  TOI->outaddr(FH, 0);               // e_entry = 0 -> no entry point in .o file
-  TOI->outaddr(FH, 0);               // e_phoff = 0 -> no program header for .o
+  outhalf(FH, 1);                 // e_type = ET_REL
+  outhalf(FH, e_machine);         // e_machine = whatever the target wants
+  outword(FH, 1);                 // e_version = 1
+  outaddr(FH, 0);                 // e_entry = 0 -> no entry point in .o file
+  outaddr(FH, 0);                 // e_phoff = 0 -> no program header for .o
 
   ELFHeader_e_shoff_Offset = FH.size();
-  TOI->outaddr(FH, 0);                 // e_shoff
-  TOI->outword(FH, e_flags);           // e_flags = whatever the target wants
+  outaddr(FH, 0);                 // e_shoff
+  outword(FH, e_flags);           // e_flags = whatever the target wants
 
-  TOI->outhalf(FH, is64Bit ? 64 : 52); // e_ehsize = ELF header size
-  TOI->outhalf(FH, 0);                 // e_phentsize = prog header entry size
-  TOI->outhalf(FH, 0);                 // e_phnum     = # prog header entries=0
-  TOI->outhalf(FH, is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
+  outhalf(FH, is64Bit ? 64 : 52); // e_ehsize = ELF header size
+  outhalf(FH, 0);                 // e_phentsize = prog header entry size
+  outhalf(FH, 0);                 // e_phnum     = # prog header entries = 0
+  outhalf(FH, is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
 
 
   ELFHeader_e_shnum_Offset = FH.size();
-  TOI->outhalf(FH, 0);                 // e_shnum     = # of section header ents
+  outhalf(FH, 0);                 // e_shnum     = # of section header ents
   ELFHeader_e_shstrndx_Offset = FH.size();
-  TOI->outhalf(FH, 0);                 // e_shstrndx  = Section # of '.shstrtab'
+  outhalf(FH, 0);                 // e_shstrndx  = Section # of '.shstrtab'
 
   // Add the null section, which is required to be first in the file.
   getSection("", 0, 0);
@@ -368,7 +352,7 @@
   DataBuffer &StrTabBuf = StrTab.SectionData;
 
   // Set the zero'th symbol to a null byte, as required.
-  TOI->outbyte(StrTabBuf, 0);
+  outbyte(StrTabBuf, 0);
   SymbolTable[0].NameIdx = 0;
   unsigned Index = 1;
   for (unsigned i = 1, e = SymbolTable.size(); i != e; ++i) {
@@ -405,22 +389,22 @@
   if (!is64Bit) {   // 32-bit and 64-bit formats are shuffled a bit.
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      TOI->outword(SymTabBuf, Sym.NameIdx);
-      TOI->outaddr32(SymTabBuf, Sym.Value);
-      TOI->outword(SymTabBuf, Sym.Size);
-      TOI->outbyte(SymTabBuf, Sym.Info);
-      TOI->outbyte(SymTabBuf, Sym.Other);
-      TOI->outhalf(SymTabBuf, Sym.SectionIdx);
+      outword(SymTabBuf, Sym.NameIdx);
+      outaddr32(SymTabBuf, Sym.Value);
+      outword(SymTabBuf, Sym.Size);
+      outbyte(SymTabBuf, Sym.Info);
+      outbyte(SymTabBuf, Sym.Other);
+      outhalf(SymTabBuf, Sym.SectionIdx);
     }
   } else {
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      TOI->outword(SymTabBuf, Sym.NameIdx);
-      TOI->outbyte(SymTabBuf, Sym.Info);
-      TOI->outbyte(SymTabBuf, Sym.Other);
-      TOI->outhalf(SymTabBuf, Sym.SectionIdx);
-      TOI->outaddr64(SymTabBuf, Sym.Value);
-      TOI->outxword(SymTabBuf, Sym.Size);
+      outword(SymTabBuf, Sym.NameIdx);
+      outbyte(SymTabBuf, Sym.Info);
+      outbyte(SymTabBuf, Sym.Other);
+      outhalf(SymTabBuf, Sym.SectionIdx);
+      outaddr64(SymTabBuf, Sym.Value);
+      outxword(SymTabBuf, Sym.Size);
     }
   }
 
@@ -436,7 +420,7 @@
 
   // Now that we know which section number is the .shstrtab section, update the
   // e_shstrndx entry in the ELF header.
-  TOI->fixhalf(FileHeader, SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
+  fixhalf(FileHeader, SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
 
   // Set the NameIdx of each section in the string table and emit the bytes for
   // the string table.
@@ -487,11 +471,11 @@
 
   // Now that we know where all of the sections will be emitted, set the e_shnum
   // entry in the ELF header.
-  TOI->fixhalf(FileHeader, NumSections, ELFHeader_e_shnum_Offset);
+  fixhalf(FileHeader, NumSections, ELFHeader_e_shnum_Offset);
 
   // Now that we know the offset in the file of the section table, update the
   // e_shoff address in the ELF header.
-  TOI->fixaddr(FileHeader, FileOff, ELFHeader_e_shoff_Offset);
+  fixaddr(FileHeader, FileOff, ELFHeader_e_shoff_Offset);
 
   // Now that we know all of the data in the file header, emit it and all of the
   // sections!
@@ -513,16 +497,16 @@
     O.write((char*)&S.SectionData[0], S.SectionData.size());
     FileOff += S.SectionData.size();
 
-    TOI->outword(Table, S.NameIdx); // sh_name - Symbol table name idx
-    TOI->outword(Table, S.Type);    // sh_type - Section contents & semantics
-    TOI->outword(Table, S.Flags);   // sh_flags - Section flags
-    TOI->outaddr(Table, S.Addr);    // sh_addr - The mem addr this section is in
-    TOI->outaddr(Table, S.Offset);  // sh_offset - Offset from the file start
-    TOI->outword(Table, S.Size);    // sh_size - The section size
-    TOI->outword(Table, S.Link);    // sh_link - Section header table index link
-    TOI->outword(Table, S.Info);    // sh_info - Auxillary information
-    TOI->outword(Table, S.Align);   // sh_addralign - Alignment of section
-    TOI->outword(Table, S.EntSize); // sh_entsize - Size of entries in the sect
+    outword(Table, S.NameIdx);  // sh_name - Symbol table name idx
+    outword(Table, S.Type);     // sh_type - Section contents & semantics
+    outword(Table, S.Flags);    // sh_flags - Section flags.
+    outaddr(Table, S.Addr);     // sh_addr - The mem addr this section is in.
+    outaddr(Table, S.Offset);   // sh_offset - Offset from the file start.
+    outword(Table, S.Size);     // sh_size - The section size.
+    outword(Table, S.Link);     // sh_link - Section header table index link.
+    outword(Table, S.Info);     // sh_info - Auxillary information.
+    outword(Table, S.Align);    // sh_addralign - Alignment of section.
+    outword(Table, S.EntSize);  // sh_entsize - Size of entries in the section.
 
     SectionList.pop_front();
   }


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.13 llvm/lib/CodeGen/MachOWriter.cpp:1.14
--- llvm/lib/CodeGen/MachOWriter.cpp:1.13	Tue Jan 16 21:49:21 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Wed Jan 17 03:06:13 2007
@@ -32,11 +32,11 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetJITInfo.h"
-#include "llvm/Target/TargetObjInfo.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Streams.h"
 #include <algorithm>
+
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -49,14 +49,6 @@
   class MachOCodeEmitter : public MachineCodeEmitter {
     MachOWriter &MOW;
 
-    /// Target machine description.
-    ///
-    TargetMachine &TM;
-
-    /// Target object writer info.
-    ///
-    const TargetObjInfo *TOI;
-
     /// Relocations - These are the relocations that the function needs, as
     /// emitted.
     std::vector<MachineRelocation> Relocations;
@@ -79,10 +71,7 @@
     std::vector<intptr_t> MBBLocations;
     
   public:
-    MachOCodeEmitter(MachOWriter &mow, TargetMachine &tm) : MOW(mow), TM(tm) {
-      // Create the target object info object for this target.
-      TOI = TM.getTargetObjInfo();
-    }
+    MachOCodeEmitter(MachOWriter &mow) : MOW(mow) {}
 
     virtual void startFunction(MachineFunction &F);
     virtual bool finishFunction(MachineFunction &F);
@@ -174,7 +163,7 @@
   
   // Get a symbol for the function to add to the symbol table
   const GlobalValue *FuncV = F.getFunction();
-  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, TM);
+  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, MOW.TM);
 
   // Emit constant pool to appropriate section(s)
   emitConstantPool(F.getConstantPool());
@@ -222,7 +211,7 @@
   if (CP.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   // Although there is no strict necessity that I am aware of, we will do what
@@ -234,7 +223,7 @@
   // "giant object for PIC" optimization.
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     const Type *Ty = CP[i].getType();
-    unsigned Size = TM.getTargetData()->getTypeSize(Ty);
+    unsigned Size = MOW.TM.getTargetData()->getTypeSize(Ty);
 
     MachOWriter::MachOSection *Sec = MOW.getConstSection(Ty);
     CPLocations.push_back(Sec->SectionData.size());
@@ -247,10 +236,10 @@
     // FIXME: need alignment?
     // FIXME: share between here and AddSymbolToSection?
     for (unsigned j = 0; j < Size; ++j)
-      TOI->outbyte(Sec->SectionData, 0);
+      MOW.outbyte(Sec->SectionData, 0);
 
     MOW.InitMem(CP[i].Val.ConstVal, &Sec->SectionData[0], CPLocations[i],
-                TM.getTargetData(), Sec->Relocations);
+                MOW.TM.getTargetData(), Sec->Relocations);
   }
 }
 
@@ -261,7 +250,7 @@
   if (JT.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   MachOWriter::MachOSection *Sec = MOW.getJumpTableSection();
@@ -278,7 +267,7 @@
       MR.setResultPointer((void *)JTLocations[i]);
       MR.setConstantVal(TextSecIndex);
       Sec->Relocations.push_back(MR);
-      TOI->outaddr(Sec->SectionData, 0);
+      MOW.outaddr(Sec->SectionData, 0);
     }
   }
   // FIXME: remove when we have unified size + output buffer
@@ -294,10 +283,7 @@
   isLittleEndian = TM.getTargetData()->isLittleEndian();
 
   // Create the machine code emitter object for this target.
-  MCE = new MachOCodeEmitter(*this, tm);
-
-  // Create the target object info object for this target.
-  TOI = TM.getTargetObjInfo();
+  MCE = new MachOCodeEmitter(*this);
 }
 
 MachOWriter::~MachOWriter() {
@@ -326,7 +312,7 @@
     // FIXME: remove when we have unified size + output buffer
     unsigned AlignedSize = Sec->size - OrigSize;
     for (unsigned i = 0; i < AlignedSize; ++i)
-      TOI->outbyte(Sec->SectionData, 0);
+      outbyte(Sec->SectionData, 0);
   }
   // Record the offset of the symbol, and then allocate space for it.
   // FIXME: remove when we have unified size + output buffer
@@ -343,7 +329,7 @@
   
   // Allocate space in the section for the global.
   for (unsigned i = 0; i < Size; ++i)
-    TOI->outbyte(Sec->SectionData, 0);
+    outbyte(Sec->SectionData, 0);
 }
 
 void MachOWriter::EmitGlobal(GlobalVariable *GV) {
@@ -456,15 +442,15 @@
   // Step #3: write the header to the file
   // Local alias to shortenify coming code.
   DataBuffer &FH = Header.HeaderData;
-  TOI->outword(FH, Header.magic);
-  TOI->outword(FH, Header.cputype);
-  TOI->outword(FH, Header.cpusubtype);
-  TOI->outword(FH, Header.filetype);
-  TOI->outword(FH, Header.ncmds);
-  TOI->outword(FH, Header.sizeofcmds);
-  TOI->outword(FH, Header.flags);
+  outword(FH, Header.magic);
+  outword(FH, Header.cputype);
+  outword(FH, Header.cpusubtype);
+  outword(FH, Header.filetype);
+  outword(FH, Header.ncmds);
+  outword(FH, Header.sizeofcmds);
+  outword(FH, Header.flags);
   if (is64Bit)
-    TOI->outword(FH, Header.reserved);
+    outword(FH, Header.reserved);
   
   // Step #4: Finish filling in the segment load command and write it out
   for (std::vector<MachOSection*>::iterator I = SectionList.begin(),
@@ -474,17 +460,17 @@
   SEG.vmsize = SEG.filesize;
   SEG.fileoff = Header.cmdSize(is64Bit) + Header.sizeofcmds;
   
-  TOI->outword(FH, SEG.cmd);
-  TOI->outword(FH, SEG.cmdsize);
-  TOI->outstring(FH, SEG.segname, 16);
-  TOI->outaddr(FH, SEG.vmaddr);
-  TOI->outaddr(FH, SEG.vmsize);
-  TOI->outaddr(FH, SEG.fileoff);
-  TOI->outaddr(FH, SEG.filesize);
-  TOI->outword(FH, SEG.maxprot);
-  TOI->outword(FH, SEG.initprot);
-  TOI->outword(FH, SEG.nsects);
-  TOI->outword(FH, SEG.flags);
+  outword(FH, SEG.cmd);
+  outword(FH, SEG.cmdsize);
+  outstring(FH, SEG.segname, 16);
+  outaddr(FH, SEG.vmaddr);
+  outaddr(FH, SEG.vmsize);
+  outaddr(FH, SEG.fileoff);
+  outaddr(FH, SEG.filesize);
+  outword(FH, SEG.maxprot);
+  outword(FH, SEG.initprot);
+  outword(FH, SEG.nsects);
+  outword(FH, SEG.flags);
   
   // Step #5: Finish filling in the fields of the MachOSections 
   uint64_t currentAddr = 0;
@@ -511,19 +497,19 @@
     currentAddr += MOS->nreloc * 8;
     
     // write the finalized section command to the output buffer
-    TOI->outstring(FH, MOS->sectname, 16);
-    TOI->outstring(FH, MOS->segname, 16);
-    TOI->outaddr(FH, MOS->addr);
-    TOI->outaddr(FH, MOS->size);
-    TOI->outword(FH, MOS->offset);
-    TOI->outword(FH, MOS->align);
-    TOI->outword(FH, MOS->reloff);
-    TOI->outword(FH, MOS->nreloc);
-    TOI->outword(FH, MOS->flags);
-    TOI->outword(FH, MOS->reserved1);
-    TOI->outword(FH, MOS->reserved2);
+    outstring(FH, MOS->sectname, 16);
+    outstring(FH, MOS->segname, 16);
+    outaddr(FH, MOS->addr);
+    outaddr(FH, MOS->size);
+    outword(FH, MOS->offset);
+    outword(FH, MOS->align);
+    outword(FH, MOS->reloff);
+    outword(FH, MOS->nreloc);
+    outword(FH, MOS->flags);
+    outword(FH, MOS->reserved1);
+    outword(FH, MOS->reserved2);
     if (is64Bit)
-      TOI->outword(FH, MOS->reserved3);
+      outword(FH, MOS->reserved3);
   }
   
   // Step #7: Emit the symbol table to temporary buffers, so that we know the
@@ -535,36 +521,36 @@
   SymTab.nsyms   = SymbolTable.size();
   SymTab.stroff  = SymTab.symoff + SymT.size();
   SymTab.strsize = StrT.size();
-  TOI->outword(FH, SymTab.cmd);
-  TOI->outword(FH, SymTab.cmdsize);
-  TOI->outword(FH, SymTab.symoff);
-  TOI->outword(FH, SymTab.nsyms);
-  TOI->outword(FH, SymTab.stroff);
-  TOI->outword(FH, SymTab.strsize);
+  outword(FH, SymTab.cmd);
+  outword(FH, SymTab.cmdsize);
+  outword(FH, SymTab.symoff);
+  outword(FH, SymTab.nsyms);
+  outword(FH, SymTab.stroff);
+  outword(FH, SymTab.strsize);
 
   // FIXME: set DySymTab fields appropriately
   // We should probably just update these in BufferSymbolAndStringTable since
   // thats where we're partitioning up the different kinds of symbols.
-  TOI->outword(FH, DySymTab.cmd);
-  TOI->outword(FH, DySymTab.cmdsize);
-  TOI->outword(FH, DySymTab.ilocalsym);
-  TOI->outword(FH, DySymTab.nlocalsym);
-  TOI->outword(FH, DySymTab.iextdefsym);
-  TOI->outword(FH, DySymTab.nextdefsym);
-  TOI->outword(FH, DySymTab.iundefsym);
-  TOI->outword(FH, DySymTab.nundefsym);
-  TOI->outword(FH, DySymTab.tocoff);
-  TOI->outword(FH, DySymTab.ntoc);
-  TOI->outword(FH, DySymTab.modtaboff);
-  TOI->outword(FH, DySymTab.nmodtab);
-  TOI->outword(FH, DySymTab.extrefsymoff);
-  TOI->outword(FH, DySymTab.nextrefsyms);
-  TOI->outword(FH, DySymTab.indirectsymoff);
-  TOI->outword(FH, DySymTab.nindirectsyms);
-  TOI->outword(FH, DySymTab.extreloff);
-  TOI->outword(FH, DySymTab.nextrel);
-  TOI->outword(FH, DySymTab.locreloff);
-  TOI->outword(FH, DySymTab.nlocrel);
+  outword(FH, DySymTab.cmd);
+  outword(FH, DySymTab.cmdsize);
+  outword(FH, DySymTab.ilocalsym);
+  outword(FH, DySymTab.nlocalsym);
+  outword(FH, DySymTab.iextdefsym);
+  outword(FH, DySymTab.nextdefsym);
+  outword(FH, DySymTab.iundefsym);
+  outword(FH, DySymTab.nundefsym);
+  outword(FH, DySymTab.tocoff);
+  outword(FH, DySymTab.ntoc);
+  outword(FH, DySymTab.modtaboff);
+  outword(FH, DySymTab.nmodtab);
+  outword(FH, DySymTab.extrefsymoff);
+  outword(FH, DySymTab.nextrefsyms);
+  outword(FH, DySymTab.indirectsymoff);
+  outword(FH, DySymTab.nindirectsyms);
+  outword(FH, DySymTab.extreloff);
+  outword(FH, DySymTab.nextrel);
+  outword(FH, DySymTab.locreloff);
+  outword(FH, DySymTab.nlocrel);
   
   O.write((char*)&FH[0], FH.size());
 }
@@ -641,7 +627,7 @@
   
   // Write out a leading zero byte when emitting string table, for n_strx == 0
   // which means an empty string.
-  TOI->outbyte(StrT, 0);
+  outbyte(StrT, 0);
 
   // The order of the string table is:
   // 1. strings for external symbols
@@ -654,7 +640,7 @@
       I->n_strx = 0;
     } else {
       I->n_strx = StrT.size();
-      TOI->outstring(StrT, I->GVName, I->GVName.length()+1);
+      outstring(StrT, I->GVName, I->GVName.length()+1);
     }
   }
 
@@ -668,11 +654,11 @@
       I->n_value += GVSection[GV]->addr;
          
     // Emit nlist to buffer
-    TOI->outword(SymT, I->n_strx);
-    TOI->outbyte(SymT, I->n_type);
-    TOI->outbyte(SymT, I->n_sect);
-    TOI->outhalf(SymT, I->n_desc);
-    TOI->outaddr(SymT, I->n_value);
+    outword(SymT, I->n_strx);
+    outbyte(SymT, I->n_type);
+    outbyte(SymT, I->n_sect);
+    outhalf(SymT, I->n_desc);
+    outaddr(SymT, I->n_value);
   }
 }
 





From asl at math.spbu.ru  Wed Jan 17 04:33:27 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 04:33:27 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetAsmInfo.cpp
	TargetMachine.cpp
Message-ID: <200701171033.l0HAXRXl000972@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetAsmInfo.cpp updated: 1.13 -> 1.14
TargetMachine.cpp updated: 1.58 -> 1.59
---
Log message:

* Fix one more bug in PIC codegen: extra load is needed for *all* 
non-statics.
* Introduce new option to output zero-initialized data to .bss section. 
This can reduce size of binaries. Enable it by default for ELF & 
Cygwin/Mingw targets. Probably, Darwin should be also added.


---
Diffs of the changes:  (+7 -0)

 TargetAsmInfo.cpp |    1 +
 TargetMachine.cpp |    6 ++++++
 2 files changed, 7 insertions(+)


Index: llvm/lib/Target/TargetAsmInfo.cpp
diff -u llvm/lib/Target/TargetAsmInfo.cpp:1.13 llvm/lib/Target/TargetAsmInfo.cpp:1.14
--- llvm/lib/Target/TargetAsmInfo.cpp:1.13	Mon Jan 15 21:42:04 2007
+++ llvm/lib/Target/TargetAsmInfo.cpp	Wed Jan 17 04:33:08 2007
@@ -19,6 +19,7 @@
 TargetAsmInfo::TargetAsmInfo() :
   TextSection(".text"),
   DataSection(".data"),
+  BSSSection(".bss"),
   AddressSize(4),
   NeedsSet(false),
   MaxInstLength(4),


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.58 llvm/lib/Target/TargetMachine.cpp:1.59
--- llvm/lib/Target/TargetMachine.cpp:1.58	Wed Jan 17 03:06:13 2007
+++ llvm/lib/Target/TargetMachine.cpp	Wed Jan 17 04:33:08 2007
@@ -28,6 +28,7 @@
   bool UnsafeFPMath;
   bool FiniteOnlyFPMathOption;
   bool UseSoftFloat;
+  bool NoZerosInBSS;
   Reloc::Model RelocationModel;
   CodeModel::Model CMModel;
 }
@@ -61,6 +62,11 @@
                cl::desc("Generate software floating point library calls"),
                cl::location(UseSoftFloat),
                cl::init(false));
+  cl::opt<bool, true>
+  DontPlaceZerosInBSS("nozero-initialized-in-bss",
+               cl::desc("Don't place zero-initialized symbols into bss section"),
+               cl::location(NoZerosInBSS),
+               cl::init(false));
 
   cl::opt<llvm::Reloc::Model, true>
   DefRelocationModel(





From asl at math.spbu.ru  Wed Jan 17 04:33:27 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 04:33:27 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetAsmInfo.h
	TargetOptions.h
Message-ID: <200701171033.l0HAXRqa000977@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetAsmInfo.h updated: 1.20 -> 1.21
TargetOptions.h updated: 1.11 -> 1.12
---
Log message:

* Fix one more bug in PIC codegen: extra load is needed for *all* 
non-statics.
* Introduce new option to output zero-initialized data to .bss section. 
This can reduce size of binaries. Enable it by default for ELF & 
Cygwin/Mingw targets. Probably, Darwin should be also added.


---
Diffs of the changes:  (+9 -0)

 TargetAsmInfo.h |    7 +++++++
 TargetOptions.h |    2 ++
 2 files changed, 9 insertions(+)


Index: llvm/include/llvm/Target/TargetAsmInfo.h
diff -u llvm/include/llvm/Target/TargetAsmInfo.h:1.20 llvm/include/llvm/Target/TargetAsmInfo.h:1.21
--- llvm/include/llvm/Target/TargetAsmInfo.h:1.20	Mon Jan 15 21:42:04 2007
+++ llvm/include/llvm/Target/TargetAsmInfo.h	Wed Jan 17 04:33:08 2007
@@ -38,6 +38,10 @@
     /// DataSection - Section directive for standard data.
     ///
     const char *DataSection;              // Defaults to ".data".
+
+    /// BSSSection - Section directive for uninitialized data.
+    ///
+    const char *BSSSection;               // Default to ".bss".
     
     /// AddressSize - Size of addresses used in file.
     ///
@@ -313,6 +317,9 @@
     const char *getDataSection() const {
       return DataSection;
     }
+    const char *getBSSSection() const {
+      return BSSSection;
+    }
     unsigned getAddressSize() const {
       return AddressSize;
     }


Index: llvm/include/llvm/Target/TargetOptions.h
diff -u llvm/include/llvm/Target/TargetOptions.h:1.11 llvm/include/llvm/Target/TargetOptions.h:1.12
--- llvm/include/llvm/Target/TargetOptions.h:1.11	Fri Dec  8 20:41:05 2006
+++ llvm/include/llvm/Target/TargetOptions.h	Wed Jan 17 04:33:08 2007
@@ -54,6 +54,8 @@
   /// generate libcalls to the software floating point library instead of
   /// target FP instructions.
   extern bool UseSoftFloat;
+
+  extern bool NoZerosInBSS;
 } // End llvm namespace
 
 #endif





From asl at math.spbu.ru  Wed Jan 17 04:33:27 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 04:33:27 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
	X86AsmPrinter.cpp X86Subtarget.cpp
Message-ID: <200701171033.l0HAXR0W000965@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.90 -> 1.91
X86AsmPrinter.cpp updated: 1.228 -> 1.229
X86Subtarget.cpp updated: 1.48 -> 1.49
---
Log message:

* Fix one more bug in PIC codegen: extra load is needed for *all* 
non-statics.
* Introduce new option to output zero-initialized data to .bss section. 
This can reduce size of binaries. Enable it by default for ELF & 
Cygwin/Mingw targets. Probably, Darwin should be also added.


---
Diffs of the changes:  (+24 -16)

 X86ATTAsmPrinter.cpp |   23 ++++++++++-------------
 X86AsmPrinter.cpp    |   11 +++++++++--
 X86Subtarget.cpp     |    6 +++++-
 3 files changed, 24 insertions(+), 16 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.90 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.91
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.90	Tue Jan 16 10:41:57 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Wed Jan 17 04:33:08 2007
@@ -323,22 +323,19 @@
       O << Offset;
 
     if (isMemOp) {
-      if (isExt) {
-        if (Subtarget->isPICStyleGOT()) {
+      if (Subtarget->isPICStyleGOT()) {
+        if (Subtarget->GVRequiresExtraLoad(GV, TM, false))
           O << "@GOT";
-        } else if (Subtarget->isPICStyleRIPRel()) {
+        else
+          O << "@GOTOFF";
+      } else     
+        if (isExt && Subtarget->isPICStyleRIPRel())
           O << "@GOTPCREL(%rip)";
-        } else if (Subtarget->is64Bit() && !NotRIPRel)
-            // Use rip when possible to reduce code size, except when
-            // index or base register are also part of the address. e.g.
-            // foo(%rip)(%rcx,%rax,4) is not legal
-            O << "(%rip)";
-      } else {
-        if (Subtarget->is64Bit() && !NotRIPRel)
+        else if (Subtarget->is64Bit() && !NotRIPRel)
+          // Use rip when possible to reduce code size, except when
+          // index or base register are also part of the address. e.g.
+          // foo(%rip)(%rcx,%rax,4) is not legal
           O << "(%rip)";
-        else if (Subtarget->isPICStyleGOT())
-          O << "@GOTOFF";
-      }
     }
 
     return;


Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.228 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.229
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.228	Tue Jan 16 10:41:57 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Wed Jan 17 04:33:08 2007
@@ -28,6 +28,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/TargetOptions.h"
 using namespace llvm;
 
 static X86FunctionInfo calculateFunctionInfo(const Function *F,
@@ -149,7 +150,10 @@
           O << "\t.zerofill __DATA__, __common, " << name << ", "
             << Size << ", " << Align;
       } else {
-        SwitchToDataSection(TAI->getDataSection(), I);
+        if (!NoZerosInBSS && TAI->getBSSSection())
+          SwitchToDataSection(TAI->getBSSSection(), I);
+        else
+          SwitchToDataSection(TAI->getDataSection(), I);
         if (TAI->getLCOMMDirective() != NULL) {
           if (I->hasInternalLinkage()) {
             O << TAI->getLCOMMDirective() << name << "," << Size;
@@ -224,7 +228,10 @@
 
           SwitchToDataSection(SectionName.c_str());
         } else {
-          SwitchToDataSection(TAI->getDataSection(), I);
+          if (C->isNullValue() && !NoZerosInBSS && TAI->getBSSSection())
+            SwitchToDataSection(TAI->getBSSSection(), I);
+          else
+            SwitchToDataSection(TAI->getDataSection(), I);
         }
         
         break;


Index: llvm/lib/Target/X86/X86Subtarget.cpp
diff -u llvm/lib/Target/X86/X86Subtarget.cpp:1.48 llvm/lib/Target/X86/X86Subtarget.cpp:1.49
--- llvm/lib/Target/X86/X86Subtarget.cpp:1.48	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/X86Subtarget.cpp	Wed Jan 17 04:33:08 2007
@@ -36,10 +36,14 @@
                                        bool isDirectCall) const
 {
   if (TM.getRelocationModel() != Reloc::Static)
-    if (isTargetDarwin() || isPICStyleGOT()) {
+    if (isTargetDarwin()) {
       return (!isDirectCall &&
               (GV->hasWeakLinkage() || GV->hasLinkOnceLinkage() ||
                (GV->isExternal() && !GV->hasNotBeenReadFromBytecode())));
+    } else if (isPICStyleGOT()) {
+      // Extra load is needed for all non-statics.
+      return (!isDirectCall &&
+              (GV->isExternal() || !GV->hasInternalLinkage()));
     } else if (isTargetCygMing() || isTargetWindows()) {
       return (GV->hasDLLImportLinkage());
     }





From asl at math.spbu.ru  Wed Jan 17 04:33:30 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 04:33:30 -0600
Subject: [llvm-commits] CVS: llvm/test/CodeGen/X86/test-pic-6.ll
Message-ID: <200701171033.l0HAXUVM000985@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/X86:

test-pic-6.ll added (r1.1)
---
Log message:

* Fix one more bug in PIC codegen: extra load is needed for *all* 
non-statics.
* Introduce new option to output zero-initialized data to .bss section. 
This can reduce size of binaries. Enable it by default for ELF & 
Cygwin/Mingw targets. Probably, Darwin should be also added.


---
Diffs of the changes:  (+17 -0)

 test-pic-6.ll |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)


Index: llvm/test/CodeGen/X86/test-pic-6.ll
diff -c /dev/null llvm/test/CodeGen/X86/test-pic-6.ll:1.1
*** /dev/null	Wed Jan 17 04:33:18 2007
--- llvm/test/CodeGen/X86/test-pic-6.ll	Wed Jan 17 04:33:08 2007
***************
*** 0 ****
--- 1,17 ----
+ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
+ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
+ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
+ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOT | wc -l | grep 3
+ 
+ %ptr = global i32* null
+ %dst = global i32 0
+ %src = global i32 0
+ 
+ define void %foo() {
+ entry:
+     store i32* %dst, i32** %ptr
+     %tmp.s = load i32* %src
+     store i32 %tmp.s, i32* %dst
+     ret void
+ }
+ 





From asl at math.spbu.ru  Wed Jan 17 04:41:10 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 04:41:10 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetOptions.h
Message-ID: <200701171041.l0HAfA6q001104@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetOptions.h updated: 1.12 -> 1.13
---
Log message:

Document flag


---
Diffs of the changes:  (+3 -0)

 TargetOptions.h |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/include/llvm/Target/TargetOptions.h
diff -u llvm/include/llvm/Target/TargetOptions.h:1.12 llvm/include/llvm/Target/TargetOptions.h:1.13
--- llvm/include/llvm/Target/TargetOptions.h:1.12	Wed Jan 17 04:33:08 2007
+++ llvm/include/llvm/Target/TargetOptions.h	Wed Jan 17 04:40:54 2007
@@ -55,6 +55,9 @@
   /// target FP instructions.
   extern bool UseSoftFloat;
 
+  /// NoZerosInBSS - By default some codegens place zero-initialized data to
+  /// .bss section. This flag disables such behaviour (necessary, e.g. for
+  /// crt*.o compiling).
   extern bool NoZerosInBSS;
 } // End llvm namespace
 





From asl at math.spbu.ru  Wed Jan 17 04:49:07 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 17 Jan 2007 13:49:07 +0300
Subject: [llvm-commits] "Zeros in bss" patch for llvm-gcc
Message-ID: <1169030948.14117.16.camel@asl.dorms.spbu.ru>

Hello, Everyone.

Now some codegens by default emit zero-initialized data to .bss section.
However, sometimes it's really necessary not to do so. This patch will
add handling of "-fno-zero-initialized-in-bss" llvm-gcc' option. It's
necessary to compile crt*.o properly.

PS: Also some fix some small typo. :)
-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm-gcc-bss.diff
Type: text/x-patch
Size: 954 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070117/4e986cd8/attachment.bin 

From clattner at apple.com  Wed Jan 17 11:18:49 2007
From: clattner at apple.com (Chris Lattner)
Date: Wed, 17 Jan 2007 09:18:49 -0800
Subject: [llvm-commits] "Zeros in bss" patch for llvm-gcc
In-Reply-To: <1169030948.14117.16.camel@asl.dorms.spbu.ru>
References: <1169030948.14117.16.camel@asl.dorms.spbu.ru>
Message-ID: <920E96B9-D1F4-480E-94FD-0DA0B8AA448D@apple.com>


On Jan 17, 2007, at 2:49 AM, Anton Korobeynikov wrote:

> Hello, Everyone.
>
> Now some codegens by default emit zero-initialized data to .bss  
> section.
> However, sometimes it's really necessary not to do so. This patch will
> add handling of "-fno-zero-initialized-in-bss" llvm-gcc' option. It's
> necessary to compile crt*.o properly.

Yuck, the -fno-zero-initialized-in-bss option in GCC is a horrible  
hack.  However, your implementation of it looks great.  I'll apply it.

Thanks Anton!

-Chris


From sabre at nondot.org  Wed Jan 17 11:42:58 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 11:42:58 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetAsmInfo.h
Message-ID: <200701171742.l0HHgwDJ029622@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetAsmInfo.h updated: 1.21 -> 1.22
---
Log message:

document that BSSSection can be null.
Add new ZeroFillDirective directive.


---
Diffs of the changes:  (+9 -1)

 TargetAsmInfo.h |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetAsmInfo.h
diff -u llvm/include/llvm/Target/TargetAsmInfo.h:1.21 llvm/include/llvm/Target/TargetAsmInfo.h:1.22
--- llvm/include/llvm/Target/TargetAsmInfo.h:1.21	Wed Jan 17 04:33:08 2007
+++ llvm/include/llvm/Target/TargetAsmInfo.h	Wed Jan 17 11:42:30 2007
@@ -39,10 +39,15 @@
     ///
     const char *DataSection;              // Defaults to ".data".
 
-    /// BSSSection - Section directive for uninitialized data.
+    /// BSSSection - Section directive for uninitialized data.  Null if this
+    /// target doesn't support a BSS section.
     ///
     const char *BSSSection;               // Default to ".bss".
     
+    /// ZeroFillDirective - Directive for emitting a global to the ZeroFill
+    /// section on this target.  Null if this target doesn't support zerofill.
+    const char *ZeroFillDirective;        // Default is null.
+    
     /// AddressSize - Size of addresses used in file.
     ///
     unsigned AddressSize;                 // Defaults to 4.
@@ -320,6 +325,9 @@
     const char *getBSSSection() const {
       return BSSSection;
     }
+    const char *getZeroFillDirective() const {
+      return ZeroFillDirective;
+    }
     unsigned getAddressSize() const {
       return AddressSize;
     }





From sabre at nondot.org  Wed Jan 17 11:43:05 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 11:43:05 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetAsmInfo.cpp
Message-ID: <200701171743.l0HHh5A0029754@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetAsmInfo.cpp updated: 1.14 -> 1.15
---
Log message:

add new directive


---
Diffs of the changes:  (+1 -0)

 TargetAsmInfo.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/Target/TargetAsmInfo.cpp
diff -u llvm/lib/Target/TargetAsmInfo.cpp:1.14 llvm/lib/Target/TargetAsmInfo.cpp:1.15
--- llvm/lib/Target/TargetAsmInfo.cpp:1.14	Wed Jan 17 04:33:08 2007
+++ llvm/lib/Target/TargetAsmInfo.cpp	Wed Jan 17 11:42:42 2007
@@ -20,6 +20,7 @@
   TextSection(".text"),
   DataSection(".data"),
   BSSSection(".bss"),
+  ZeroFillDirective(0),
   AddressSize(4),
   NeedsSet(false),
   MaxInstLength(4),





From sabre at nondot.org  Wed Jan 17 11:43:55 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 11:43:55 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200701171743.l0HHhtq6030069@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetAsmInfo.cpp updated: 1.28 -> 1.29
---
Log message:

darwin doesn't support .bss, but it does have .zerofill


---
Diffs of the changes:  (+2 -0)

 X86TargetAsmInfo.cpp |    2 ++
 1 files changed, 2 insertions(+)


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.28 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.29
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.28	Tue Jan 16 03:29:17 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Wed Jan 17 11:43:33 2007
@@ -47,6 +47,8 @@
       Data64bitsDirective = 0;       // we can't emit a 64-bit unit
     ZeroDirective = "\t.space\t";  // ".space N" emits N zeros.
     PrivateGlobalPrefix = "L";     // Marker for constant pool idxs
+    BSSSection = 0;                       // no BSS section.
+    ZeroFillDirective = "\t.zerofill\t";  // Uses .zerofill
     ConstantPoolSection = "\t.const\n";
     JumpTableDataSection = "\t.const\n";
     CStringSection = "\t.cstring";





From sabre at nondot.org  Wed Jan 17 11:44:43 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 11:44:43 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86AsmPrinter.cpp
Message-ID: <200701171744.l0HHihab030547@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86AsmPrinter.cpp updated: 1.229 -> 1.230
---
Log message:

restructure code a bit to make use of continue (simplifying things).  Generalize
the .zerofill directive emission to not be darwin-specific


---
Diffs of the changes:  (+95 -92)

 X86AsmPrinter.cpp |  187 +++++++++++++++++++++++++++---------------------------
 1 files changed, 95 insertions(+), 92 deletions(-)


Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.229 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.230
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.229	Wed Jan 17 04:33:08 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Wed Jan 17 11:44:25 2007
@@ -138,18 +138,26 @@
     unsigned Size = TD->getTypeSize(C->getType());
     unsigned Align = TD->getPreferredAlignmentLog(I);
 
-    if (C->isNullValue() && /* FIXME: Verify correct */
-        !I->hasSection() &&
-        (I->hasInternalLinkage() || I->hasWeakLinkage() ||
-         I->hasLinkOnceLinkage() ||
-         (Subtarget->isTargetDarwin() && 
-          I->hasExternalLinkage()))) {
-      if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
+    if (I->hasHiddenVisibility())
+      if (const char *Directive = TAI->getHiddenDirective())
+        O << Directive << name << "\n";
+    if (Subtarget->isTargetELF())
+      O << "\t.type " << name << ", at object\n";
+    
+    if (C->isNullValue()) {
       if (I->hasExternalLinkage()) {
+        if (const char *Directive = TAI->getZeroFillDirective()) {
           O << "\t.globl\t" << name << "\n";
-          O << "\t.zerofill __DATA__, __common, " << name << ", "
+          O << Directive << "__DATA__, __common, " << name << ", "
             << Size << ", " << Align;
-      } else {
+          continue;
+        }
+      }
+      
+      if (!I->hasSection() &&
+          (I->hasInternalLinkage() || I->hasWeakLinkage() ||
+           I->hasLinkOnceLinkage())) {
+        if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
         if (!NoZerosInBSS && TAI->getBSSSection())
           SwitchToDataSection(TAI->getBSSSection(), I);
         else
@@ -170,96 +178,91 @@
           if (TAI->getCOMMDirectiveTakesAlignment())
             O << "," << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
         }
+        O << "\t\t" << TAI->getCommentString() << " " << I->getName() << "\n";
+        continue;
       }
-      O << "\t\t" << TAI->getCommentString() << " " << I->getName() << "\n";
-    } else {
-      switch (I->getLinkage()) {
-      case GlobalValue::LinkOnceLinkage:
-      case GlobalValue::WeakLinkage:
-        if (Subtarget->isTargetDarwin()) {
-          O << "\t.globl " << name << "\n"
-            << "\t.weak_definition " << name << "\n";
-          SwitchToDataSection(".section __DATA,__const_coal,coalesced", I);
-        } else if (Subtarget->isTargetCygMing()) {
-          std::string SectionName(".section\t.data$linkonce." +
-                                  name +
-                                  ",\"aw\"");
-          SwitchToDataSection(SectionName.c_str(), I);
-          O << "\t.globl " << name << "\n"
-            << "\t.linkonce same_size\n";
-        } else {
-          std::string SectionName("\t.section\t.llvm.linkonce.d." +
-                                  name +
-                                  ",\"aw\", at progbits");
-          SwitchToDataSection(SectionName.c_str(), I);
-          O << "\t.weak " << name << "\n";
-        }
-        break;
-      case GlobalValue::AppendingLinkage:
-        // FIXME: appending linkage variables should go into a section of
-        // their name or something.  For now, just emit them as external.
-      case GlobalValue::DLLExportLinkage:
-        DLLExportedGVs.insert(Mang->makeNameProper(I->getName(),""));
-        // FALL THROUGH
-      case GlobalValue::ExternalLinkage:
-        // If external or appending, declare as a global symbol
-        O << "\t.globl " << name << "\n";
-        // FALL THROUGH
-      case GlobalValue::InternalLinkage: {
-        if (I->isConstant()) {
-          const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
-          if (TAI->getCStringSection() && CVA && CVA->isCString()) {
-            SwitchToDataSection(TAI->getCStringSection(), I);
-            break;
-          }
-        }
-        // FIXME: special handling for ".ctors" & ".dtors" sections
-        if (I->hasSection() &&
-            (I->getSection() == ".ctors" ||
-             I->getSection() == ".dtors")) {
-          std::string SectionName = ".section " + I->getSection();
-          
-          if (Subtarget->isTargetCygMing()) {
-            SectionName += ",\"aw\"";
-          } else {
-            assert(!Subtarget->isTargetDarwin());
-            SectionName += ",\"aw\", at progbits";
-          }
+    }
 
-          SwitchToDataSection(SectionName.c_str());
-        } else {
-          if (C->isNullValue() && !NoZerosInBSS && TAI->getBSSSection())
-            SwitchToDataSection(TAI->getBSSSection(), I);
-          else
-            SwitchToDataSection(TAI->getDataSection(), I);
+    switch (I->getLinkage()) {
+    case GlobalValue::LinkOnceLinkage:
+    case GlobalValue::WeakLinkage:
+      if (Subtarget->isTargetDarwin()) {
+        O << "\t.globl " << name << "\n"
+          << "\t.weak_definition " << name << "\n";
+        SwitchToDataSection(".section __DATA,__const_coal,coalesced", I);
+      } else if (Subtarget->isTargetCygMing()) {
+        std::string SectionName(".section\t.data$linkonce." +
+                                name +
+                                ",\"aw\"");
+        SwitchToDataSection(SectionName.c_str(), I);
+        O << "\t.globl " << name << "\n"
+          << "\t.linkonce same_size\n";
+      } else {
+        std::string SectionName("\t.section\t.llvm.linkonce.d." +
+                                name +
+                                ",\"aw\", at progbits");
+        SwitchToDataSection(SectionName.c_str(), I);
+        O << "\t.weak " << name << "\n";
+      }
+      break;
+    case GlobalValue::AppendingLinkage:
+      // FIXME: appending linkage variables should go into a section of
+      // their name or something.  For now, just emit them as external.
+    case GlobalValue::DLLExportLinkage:
+      DLLExportedGVs.insert(Mang->makeNameProper(I->getName(),""));
+      // FALL THROUGH
+    case GlobalValue::ExternalLinkage:
+      // If external or appending, declare as a global symbol
+      O << "\t.globl " << name << "\n";
+      // FALL THROUGH
+    case GlobalValue::InternalLinkage: {
+      if (I->isConstant()) {
+        const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
+        if (TAI->getCStringSection() && CVA && CVA->isCString()) {
+          SwitchToDataSection(TAI->getCStringSection(), I);
+          break;
         }
-        
-        break;
       }
-      default:
-        assert(0 && "Unknown linkage type!");
+      // FIXME: special handling for ".ctors" & ".dtors" sections
+      if (I->hasSection() &&
+          (I->getSection() == ".ctors" ||
+           I->getSection() == ".dtors")) {
+        std::string SectionName = ".section " + I->getSection();
+        
+        if (Subtarget->isTargetCygMing()) {
+          SectionName += ",\"aw\"";
+        } else {
+          assert(!Subtarget->isTargetDarwin());
+          SectionName += ",\"aw\", at progbits";
+        }
+
+        SwitchToDataSection(SectionName.c_str());
+      } else {
+        if (C->isNullValue() && !NoZerosInBSS && TAI->getBSSSection())
+          SwitchToDataSection(TAI->getBSSSection(), I);
+        else
+          SwitchToDataSection(TAI->getDataSection(), I);
       }
+      
+      break;
+    }
+    default:
+      assert(0 && "Unknown linkage type!");
+    }
 
-      EmitAlignment(Align, I);
-      O << name << ":\t\t\t\t" << TAI->getCommentString() << " " << I->getName()
-        << "\n";
-      if (TAI->hasDotTypeDotSizeDirective())
-        O << "\t.size " << name << ", " << Size << "\n";
-      // If the initializer is a extern weak symbol, remember to emit the weak
-      // reference!
-      if (const GlobalValue *GV = dyn_cast<GlobalValue>(C))
-        if (GV->hasExternalWeakLinkage())
-          ExtWeakSymbols.insert(GV);
+    EmitAlignment(Align, I);
+    O << name << ":\t\t\t\t" << TAI->getCommentString() << " " << I->getName()
+      << "\n";
+    if (TAI->hasDotTypeDotSizeDirective())
+      O << "\t.size " << name << ", " << Size << "\n";
+    // If the initializer is a extern weak symbol, remember to emit the weak
+    // reference!
+    if (const GlobalValue *GV = dyn_cast<GlobalValue>(C))
+      if (GV->hasExternalWeakLinkage())
+        ExtWeakSymbols.insert(GV);
 
-      EmitGlobalConstant(C);
-      O << '\n';
-    }
-    if (I->hasHiddenVisibility())
-      if (const char *Directive = TAI->getHiddenDirective())
-        O << Directive << name << "\n";
-    
-    if (Subtarget->isTargetELF())
-      O << "\t.type " << name << ", at object\n";
+    EmitGlobalConstant(C);
+    O << '\n';
   }
   
   // Output linker support code for dllexported globals





From reid at x10sys.com  Wed Jan 17 14:25:01 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 14:25:01 -0600
Subject: [llvm-commits] CVS: llvm/Makefile.config.in
Message-ID: <200701172025.l0HKP0XG013271@zion.cs.uiuc.edu>



Changes in directory llvm:

Makefile.config.in updated: 1.73 -> 1.74
---
Log message:

For PR739: http://llvm.org/PR739 :
Support overriding the prefix and DESTDIR variables from the make command
line. This makes the makefile system a little more GNU compliant and the
feature makes it easier for distribution builders to re-target the install
location of LLVM.


---
Diffs of the changes:  (+13 -19)

 Makefile.config.in |   32 +++++++++++++-------------------
 1 files changed, 13 insertions(+), 19 deletions(-)


Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.73 llvm/Makefile.config.in:1.74
--- llvm/Makefile.config.in:1.73	Thu Dec 21 16:55:41 2006
+++ llvm/Makefile.config.in	Wed Jan 17 14:24:45 2007
@@ -47,16 +47,8 @@
 LLVM_OBJ_ROOT   := $(shell cd @abs_top_builddir@; $(PWD))
 PROJ_SRC_ROOT   := $(shell cd $(LLVM_SRC_ROOT); $(PWD))
 PROJ_SRC_DIR    := $(shell cd $(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-DESTDIR         := @prefix@
-PROJ_prefix     := $(DESTDIR)
-PROJ_bindir     := $(DESTDIR)/bin
-PROJ_libdir     := $(DESTDIR)/lib
-PROJ_datadir    := $(DESTDIR)/share
-PROJ_docsdir    := $(DESTDIR)/docs/llvm
-PROJ_etcdir     := $(DESTDIR)/etc/llvm
-PROJ_includedir := $(DESTDIR)/include
-PROJ_infodir    := $(DESTDIR)/info
-PROJ_mandir     := $(DESTDIR)/man
+prefix          := @prefix@
+PROJ_prefix     := $(prefix)
 PROJ_VERSION    := $(LLVMVersion)
 else
 ifndef PROJ_SRC_ROOT
@@ -75,20 +67,22 @@
 $(error Projects must define LLVM_OBJ_ROOT)
 endif
 PROJ_SRC_DIR := $(shell cd $(PROJ_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-PROJ_prefix     := $(PROJ_INSTALL_ROOT)
-PROJ_bindir     := $(PROJ_INSTALL_ROOT)/bin
-PROJ_libdir     := $(PROJ_INSTALL_ROOT)/lib
-PROJ_datadir    := $(PROJ_INSTALL_ROOT)/share
-PROJ_docsdir    := $(PROJ_INSTALL_ROOT)/docs/llvm
-PROJ_etcdir     := $(PROJ_INSTALL_ROOT)/etc/llvm
-PROJ_includedir := $(PROJ_INSTALL_ROOT)/include
-PROJ_infodir    := $(PROJ_INSTALL_ROOT)/info
-PROJ_mandir     := $(PROJ_INSTALL_ROOT)/man
+prefix          := $(PROJ_INSTALL_ROOT)
+PROJ_prefix     := $(prefix)
 ifndef PROJ_VERSION
 PROJ_VERSION := 1.0
 endif
 endif
 
+PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
+PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
+PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
+PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
+PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
+PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/man
+
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
 LLVM_ON_WIN32:=@LLVM_ON_WIN32@





From dpatel at apple.com  Wed Jan 17 14:30:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Jan 2007 14:30:36 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Pass.h
Message-ID: <200701172030.l0HKUa33013436@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Pass.h updated: 1.75 -> 1.76
---
Log message:

Update assignPassManager() signature to allow selection of preferred 
pass manager type. This allows new FPPassManager to select Call Graph
Pass Manager (if available) as its parent.


---
Diffs of the changes:  (+22 -16)

 Pass.h |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.75 llvm/include/llvm/Pass.h:1.76
--- llvm/include/llvm/Pass.h:1.75	Tue Jan 16 15:43:18 2007
+++ llvm/include/llvm/Pass.h	Wed Jan 17 14:30:17 2007
@@ -57,6 +57,20 @@
 // AnalysisID - Use the PassInfo to identify a pass...
 typedef const PassInfo* AnalysisID;
 
+/// Different types of internal pass managers. External pass managers
+/// (PassManager and FunctionPassManager) are not represented here.
+/// Ordering of pass manager types is important here.
+enum PassManagerType {
+  PMT_Unknown = 0,
+  PMT_ModulePassManager = 1, /// MPPassManager 
+  PMT_CallGraphPassManager,  /// CGPassManager
+  PMT_FunctionPassManager,   /// FPPassManager
+  PMT_LoopPassManager,       /// LPPassManager
+  PMT_BasicBlockPassManager  /// BBPassManager
+};
+
+typedef enum PassManagerType PassManagerType;
+
 //===----------------------------------------------------------------------===//
 /// Pass interface - Implemented by all 'passes'.  Subclass this if you are an
 /// interprocedural optimization or you do not fit into any of the more
@@ -107,7 +121,8 @@
   void print(std::ostream *O, const Module *M) const { if (O) print(*O, M); }
   void dump() const; // dump - call print(std::cerr, 0);
 
-  virtual void assignPassManager(PMStack &PMS) {}
+  virtual void assignPassManager(PMStack &PMS, 
+				 PassManagerType T = PMT_Unknown) {}
   // Access AnalysisResolver
   inline void setResolver(AnalysisResolver *AR) { Resolver = AR; }
   inline AnalysisResolver *getResolver() { return Resolver; }
@@ -200,7 +215,8 @@
   virtual bool runPass(Module &M) { return runOnModule(M); }
   virtual bool runPass(BasicBlock&) { return false; }
 
-  virtual void assignPassManager(PMStack &PMS);
+  virtual void assignPassManager(PMStack &PMS, 
+				 PassManagerType T = PMT_ModulePassManager);
   // Force out-of-line virtual method.
   virtual ~ModulePass();
 };
@@ -266,7 +282,8 @@
   ///
   bool run(Function &F);
 
-  virtual void assignPassManager(PMStack &PMS);
+  virtual void assignPassManager(PMStack &PMS, 
+				 PassManagerType T = PMT_FunctionPassManager);
 };
 
 
@@ -320,19 +337,8 @@
   virtual bool runPass(Module &M) { return false; }
   virtual bool runPass(BasicBlock &BB);
 
-  virtual void assignPassManager(PMStack &PMS);
-};
-
-/// Different types of internal pass managers. External pass managers
-/// (PassManager and FunctionPassManager) are not represented here.
-/// Ordering of pass manager types is important here.
-enum PassManagerType {
-  PMT_Unknown = 0,
-  PMT_ModulePassManager = 1, /// MPPassManager 
-  PMT_CallGraphPassManager,  /// CGPassManager
-  PMT_FunctionPassManager,   /// FPPassManager
-  PMT_LoopPassManager,       /// LPPassManager
-  PMT_BasicBlockPassManager  /// BBPassManager
+  virtual void assignPassManager(PMStack &PMS, 
+				 PassManagerType T = PMT_BasicBlockPassManager);
 };
 
 /// PMStack





From dpatel at apple.com  Wed Jan 17 14:30:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Jan 2007 14:30:36 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701172030.l0HKUa3v013441@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.126 -> 1.127
---
Log message:

Update assignPassManager() signature to allow selection of preferred 
pass manager type. This allows new FPPassManager to select Call Graph
Pass Manager (if available) as its parent.


---
Diffs of the changes:  (+13 -4)

 PassManager.cpp |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.126 llvm/lib/VMCore/PassManager.cpp:1.127
--- llvm/lib/VMCore/PassManager.cpp:1.126	Tue Jan 16 16:38:10 2007
+++ llvm/lib/VMCore/PassManager.cpp	Wed Jan 17 14:30:17 2007
@@ -1202,7 +1202,8 @@
 
 /// Find appropriate Module Pass Manager in the PM Stack and
 /// add self into that manager. 
-void ModulePass::assignPassManager(PMStack &PMS) {
+void ModulePass::assignPassManager(PMStack &PMS, 
+				   PassManagerType PreferredType) {
 
   // Find Module Pass Manager
   while(!PMS.empty()) {
@@ -1219,7 +1220,8 @@
 
 /// Find appropriate Function Pass Manager or Call Graph Pass Manager
 /// in the PM Stack and add self into that manager. 
-void FunctionPass::assignPassManager(PMStack &PMS) {
+void FunctionPass::assignPassManager(PMStack &PMS,
+				     PassManagerType PreferredType) {
 
   // Find Module Pass Manager (TODO : Or Call Graph Pass Manager)
   while(!PMS.empty()) {
@@ -1245,7 +1247,13 @@
     // [3] Assign manager to manage this new manager. This may create
     // and push new managers into PMS
     Pass *P = dynamic_cast<Pass *>(FPP);
-    P->assignPassManager(PMS);
+
+    // If Call Graph Pass Manager is active then use it to manage
+    // this new Function Pass manager.
+    if (PMD->getPassManagerType() == PMT_CallGraphPassManager)
+      P->assignPassManager(PMS, PMT_CallGraphPassManager);
+    else
+      P->assignPassManager(PMS);
 
     // [4] Push new manager into PMS
     PMS.push(FPP);
@@ -1257,7 +1265,8 @@
 
 /// Find appropriate Basic Pass Manager or Call Graph Pass Manager
 /// in the PM Stack and add self into that manager. 
-void BasicBlockPass::assignPassManager(PMStack &PMS) {
+void BasicBlockPass::assignPassManager(PMStack &PMS,
+				       PassManagerType PreferredType) {
 
   BBPassManager *BBP = NULL;
 





From dpatel at apple.com  Wed Jan 17 14:33:52 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Jan 2007 14:33:52 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701172033.l0HKXq4s013529@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.127 -> 1.128
---
Log message:

s/PassDebugging_New/PassDebugging/g


---
Diffs of the changes:  (+5 -5)

 PassManager.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.127 llvm/lib/VMCore/PassManager.cpp:1.128
--- llvm/lib/VMCore/PassManager.cpp:1.127	Wed Jan 17 14:30:17 2007
+++ llvm/lib/VMCore/PassManager.cpp	Wed Jan 17 14:33:36 2007
@@ -39,7 +39,7 @@
 };
 
 static cl::opt<enum PassDebugLevel>
-PassDebugging_New("debug-pass", cl::Hidden,
+PassDebugging("debug-pass", cl::Hidden,
                   cl::desc("Print PassManager debugging information"),
                   cl::values(
   clEnumVal(None      , "disable debug output"),
@@ -426,7 +426,7 @@
 // Print passes managed by this top level manager.
 void PMTopLevelManager::dumpPasses() const {
 
-  if (PassDebugging_New < Structure)
+  if (PassDebugging < Structure)
     return;
 
   // Print out the immutable passes
@@ -441,7 +441,7 @@
 
 void PMTopLevelManager::dumpArguments() const {
 
-  if (PassDebugging_New < Arguments)
+  if (PassDebugging < Arguments)
     return;
 
   cerr << "Pass Arguments: ";
@@ -704,7 +704,7 @@
 
 void PMDataManager:: dumpPassInfo(Pass *P,  std::string &Msg1, 
                                   std::string &Msg2) const {
-  if (PassDebugging_New < Executions)
+  if (PassDebugging < Executions)
     return;
   cerr << (void*)this << std::string(getDepth()*2+1, ' ');
   cerr << Msg1;
@@ -715,7 +715,7 @@
 void PMDataManager::dumpAnalysisSetInfo(const char *Msg, Pass *P,
                                         const std::vector<AnalysisID> &Set) 
   const {
-  if (PassDebugging_New >= Details && !Set.empty()) {
+  if (PassDebugging >= Details && !Set.empty()) {
     cerr << (void*)P << std::string(getDepth()*2+3, ' ') << Msg << " Analyses:";
       for (unsigned i = 0; i != Set.size(); ++i) {
         if (i) cerr << ",";





From baldrick at free.fr  Wed Jan 17 14:55:32 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Jan 2007 21:55:32 +0100
Subject: [llvm-commits] llvm-gcc4: use langhooks rather than front-end calls
	in i386.c
Message-ID: <200701172155.32302.baldrick@free.fr>

The section of code marked "APPLE LOCAL CW asm blocks" contains calls
to routines that only exist in the C-like front-ends (C, C++, ObjC).
Some of them are equivalent to langhook calls - so use langhooks for
those.  This reduces the number of stubs needed to get non C-like
languages compiling.

Index: gcc.llvm.master/gcc/config/i386/i386.c
===================================================================
--- gcc.llvm.master.orig/gcc/config/i386/i386.c	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/config/i386/i386.c	2007-01-17 21:45:14.000000000 +0100
@@ -19594,7 +19594,7 @@
 	mode = SFmode;
 
       if (mode != VOIDmode)
-	type = c_common_type_for_mode (mode, 1);
+	type = lang_hooks.types.type_for_mode (mode, 1);
     }
 
   return type;
@@ -19626,7 +19626,7 @@
 	      C_DECL_REGISTER (decl) = 1;
 	      DECL_HARD_REGISTER (decl) = 1;
 	      change_decl_assembler_name (decl, arg);
-	      decl = pushdecl (decl);
+	      decl = lang_hooks.decls.pushdecl (decl);
 	    }
 	}
 


From baldrick at free.fr  Wed Jan 17 15:06:52 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Jan 2007 22:06:52 +0100
Subject: [llvm-commits] llvm-gcc4: stubs for non C-like languages
Message-ID: <200701172206.52346.baldrick@free.fr>

Apple's gcc modifications require the existence of routines like
iasm_addr and build_modify_expr (see the patch for an exhaustive
list) that are only defined by the C-like front-ends (C, C++, ObjC).
Trying to build other language front-ends fails at link-time because
of the lack of these routines.  Rather than adding stubs to each and
every front-end (I see someone made a partial start on this), this
patch introduces a new file stub-c.c that contains all the missing
stubs.  Front-ends can then just link with it.  Later patches rip
out any stubs already defined in the various non C-like front-ends,
and cause them to link with stub-c.o instead.  The only complication
comes from java.  Java defines some of the missing routines (serious
definitions - not stubs) but not all of them.  Because of this I
made all the stubs into weak symbols, so the java routines will
override the corresponding stubs.  Hopefully this patch will not
cause problems for non x86 platforms, but I'm not promising anything
since I only tested it on x86.

Index: gcc.llvm.master/gcc/Makefile.in
===================================================================
--- gcc.llvm.master.orig/gcc/Makefile.in	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/Makefile.in	2007-01-17 21:46:11.000000000 +0100
@@ -1622,6 +1622,8 @@
     c-objc-common.h c-pragma.h
 stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
     $(GGC_H) $(C_COMMON_H)
+stub-c.o : stub-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
+    $(GGC_H) $(C_COMMON_H)
 c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
     $(RTL_H) debug.h $(C_TREE_H) $(C_COMMON_H) real.h c-incpath.h cppdefault.h \
     $(C_PRAGMA_H) input.h intl.h $(FLAGS_H) toplev.h output.h \
Index: gcc.llvm.master/gcc/stub-c.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gcc.llvm.master/gcc/stub-c.c	2007-01-17 21:46:11.000000000 +0100
@@ -0,0 +1,158 @@
+/* Stub functions for C language routines that are referenced
+   from the back-end.
+   Copyright (C) 1991, 1995, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tree.h"
+#include "c-common.h"
+
+#define ATTRIBUTE_WEAK	__attribute__ ((__weak__))
+
+enum iasm_states iasm_state ATTRIBUTE_WEAK;
+int iasm_in_operands ATTRIBUTE_WEAK;
+int flag_iasm_blocks ATTRIBUTE_WEAK;
+
+
+tree iasm_addr (tree) ATTRIBUTE_WEAK;
+
+tree iasm_addr (tree e ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree iasm_build_bracket (tree, tree) ATTRIBUTE_WEAK;
+
+tree iasm_build_bracket (tree v1 ATTRIBUTE_UNUSED,
+			 tree v2 ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+void iasm_force_constraint (const char *, iasm_md_extra_info *) ATTRIBUTE_WEAK;
+
+void iasm_force_constraint (const char *c ATTRIBUTE_UNUSED,
+			    iasm_md_extra_info *e ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+void iasm_get_register_var (tree, const char *, char *, unsigned, bool,
+			    iasm_md_extra_info *) ATTRIBUTE_WEAK;
+
+void iasm_get_register_var (tree var ATTRIBUTE_UNUSED,
+			    const char *modifier ATTRIBUTE_UNUSED,
+			    char *buf ATTRIBUTE_UNUSED,
+			    unsigned argnum ATTRIBUTE_UNUSED,
+			    bool must_be_reg ATTRIBUTE_UNUSED,
+			    iasm_md_extra_info *e ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+bool iasm_is_pseudo (const char *) ATTRIBUTE_WEAK;
+
+bool iasm_is_pseudo (const char *opcode ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+void iasm_print_operand (char *, tree, unsigned, tree *, bool, bool,
+			 iasm_md_extra_info *) ATTRIBUTE_WEAK;
+
+void iasm_print_operand (char *buf ATTRIBUTE_UNUSED,
+			 tree arg ATTRIBUTE_UNUSED,
+			 unsigned argnum ATTRIBUTE_UNUSED,
+			 tree *uses ATTRIBUTE_UNUSED,
+			 bool must_be_reg ATTRIBUTE_UNUSED,
+			 bool must_not_be_reg ATTRIBUTE_UNUSED,
+			 iasm_md_extra_info *e ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree build_modify_expr (tree, enum tree_code, tree) ATTRIBUTE_WEAK;
+
+tree build_modify_expr (tree lhs ATTRIBUTE_UNUSED,
+			enum tree_code modifycode ATTRIBUTE_UNUSED,
+			tree rhs ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree decl_constant_value (tree) ATTRIBUTE_WEAK;
+
+tree decl_constant_value (tree decl ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree build_function_call (tree, tree) ATTRIBUTE_WEAK;
+
+tree build_function_call (tree function ATTRIBUTE_UNUSED,
+			  tree params ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree build_stmt (enum tree_code, ...) ATTRIBUTE_WEAK;
+
+tree build_stmt (enum tree_code code ATTRIBUTE_UNUSED, ...)
+{
+  gcc_assert(0);
+}
+
+
+tree lookup_name_two (tree, int) ATTRIBUTE_WEAK;
+
+tree lookup_name_two (tree name ATTRIBUTE_UNUSED,
+		      int prefer_type ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+tree pointer_int_sum (enum tree_code, tree, tree) ATTRIBUTE_WEAK;
+
+tree pointer_int_sum (enum tree_code resultcode ATTRIBUTE_UNUSED,
+		      tree ptrop ATTRIBUTE_UNUSED,
+		      tree intop ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}
+
+
+void store_init_value (tree, tree) ATTRIBUTE_WEAK;
+
+void store_init_value (tree decl ATTRIBUTE_UNUSED, tree init ATTRIBUTE_UNUSED)
+{
+  gcc_assert(0);
+}


From baldrick at free.fr  Wed Jan 17 15:10:38 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Jan 2007 22:10:38 +0100
Subject: [llvm-commits] llvm-gcc4: resurrect fortran
Message-ID: <200701172210.38362.baldrick@free.fr>

Link with the common stub routines, and remove the partial set of
stubs that were defined in the front-end.  With this, the fortran
compiler builds, but dies when compiling libgfortran:

llvm-convert.cpp:4243: static llvm::Constant* TreeConstantToLLVM::Convert(tree_node*):
        Assertion `((__extension__ ({ const tree __t = (exp); char const __c = tree_code_type[(int)
        (((enum tree_code) (__t)->common.code))]; if (!((__c) != tcc_type)) tree_class_check_failed
        (__t, tcc_type, "../../gcc.llvm.master/gcc/llvm-convert.cpp", 4243, __FUNCTION__); __t; })
        ->common.constant_flag) || ((enum tree_code) (exp)->common.code) == STRING_CST) &&
        "Isn't a constant!"' failed.

libgfortran/intrinsics/selected_int_kind.f90: In function 'selected_int_kind':
libgfortran/intrinsics/selected_int_kind.f90:22: internal compiler error: Aborted


Index: gcc.llvm.master/gcc/fortran/Make-lang.in
===================================================================
--- gcc.llvm.master.orig/gcc/fortran/Make-lang.in	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/fortran/Make-lang.in	2007-01-17 21:47:04.000000000 +0100
@@ -103,12 +103,15 @@
 	-rm -f gfortran-cross$(exeext)
 	cp gfortran$(exeext) gfortran-cross$(exeext)
 
+# Language-independent object files.
+F95_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o
+
 # The compiler itself is called f951.
 f951$(exeext): $(F95_OBJS) \
-		$(BACKEND) $(LIBDEPS)
+		$(F95_BACKEND) $(LIBDEPS)
 	# APPLE LOCAL LLVM
 	$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
-		$(F95_OBJS) $(BACKEND) $(F95_LIBS)
+		$(F95_OBJS) $(F95_BACKEND) $(F95_LIBS) $(C_STUBS)
 
 gt-fortran-f95-lang.h gtype-fortran.h	      : s-gtype; @true
 gt-fortran-trans-decl.h gt-fortran-trans.h    : s-gtype; @true
Index: gcc.llvm.master/gcc/fortran/f95-lang.c
===================================================================
--- gcc.llvm.master.orig/gcc/fortran/f95-lang.c	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/fortran/f95-lang.c	2007-01-17 21:47:04.000000000 +0100
@@ -154,21 +154,6 @@
 /* APPLE LOCAL disable_typechecking_for_spec_flag */
 int disable_typechecking_for_spec_flag = 0;
 
-/* APPLE LOCAL begin CW asm blocks */
-/* Dummies needed because we use them from cpplib, yuck.  */
-int flag_iasm_blocks;
-int iasm_state;
-int iasm_in_operands;
-/* APPLE LOCAL end CW asm blocks */
-
-/* APPLE LOCAL begin 4174833 */
-tree
-objc_is_class_name (tree ARG_UNUSED (arg))
-{
-  return 0;
-}
-
-/* APPLE LOCAL end 4174833 */
 /* A list (chain of TREE_LIST nodes) of all LABEL_DECLs in the function
    that have names.  Here so we can clear out their names' definitions
    at the end of the function.  */
Index: gcc.llvm.master/gcc/fortran/trans-types.c
===================================================================
--- gcc.llvm.master.orig/gcc/fortran/trans-types.c	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/fortran/trans-types.c	2007-01-17 21:47:04.000000000 +0100
@@ -1752,18 +1752,4 @@
 /* APPLE LOCAL constant cfstrings */
 struct cpp_reader* parse_in;
 
-/* APPLE LOCAL begin AltiVec */
-tree
-build_stmt (enum tree_code code ATTRIBUTE_UNUSED, ...)
-{
-  gcc_assert(0);
-}
-
-void
-store_init_value (tree decl ATTRIBUTE_UNUSED, tree init ATTRIBUTE_UNUSED)
-{
-  gcc_assert(0);
-}
-/* APPLE LOCAL end AltiVec */
-
 #include "gt-fortran-trans-types.h"


From baldrick at free.fr  Wed Jan 17 15:14:19 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Jan 2007 22:14:19 +0100
Subject: [llvm-commits] llvm-gcc4: resurrect java
Message-ID: <200701172214.19383.baldrick@free.fr>

Link with the common stub routines, and remove the partial set of
stubs that were defined in the front-end.  With this, a java build
gets quite far, but dies at

libffi/src/x86/ffi.c: In function 'ffi_prep_cif_machdep':
libffi/src/x86/ffi.c:130: error: duplicate case value
libffi/src/x86/ffi.c:129: error: previously used here

Index: gcc.llvm.master/gcc/java/Make-lang.in
===================================================================
--- gcc.llvm.master.orig/gcc/java/Make-lang.in	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/java/Make-lang.in	2007-01-17 21:47:14.000000000 +0100
@@ -134,10 +134,13 @@
 java/parse-scan.o-warn = -Wno-error
 java/parse.o-warn = -Wno-error
 
-jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS)
+# Language-independent object files.
+JAVA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o
+
+jc1$(exeext): $(JAVA_OBJS) $(JAVA_BACKEND) $(LIBDEPS)
 	rm -f $@
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
-		$(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBICONV) $(LIBS)
+	$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
+		$(JAVA_OBJS) $(JAVA_BACKEND) $(ZLIB) $(LIBICONV) $(LIBS)
 
 gcjh$(exeext): $(GCJH_OBJS) $(LIBDEPS)
 	rm -f $@
Index: gcc.llvm.master/gcc/java/lang.c
===================================================================
--- gcc.llvm.master.orig/gcc/java/lang.c	2007-01-17 21:41:50.000000000 +0100
+++ gcc.llvm.master/gcc/java/lang.c	2007-01-17 21:47:14.000000000 +0100
@@ -800,21 +800,6 @@
 /* APPLE LOCAL disable_typechecking_for_spec_flag */
 int disable_typechecking_for_spec_flag = 0;
 
-/* APPLE LOCAL begin CW asm blocks */
-/* Dummies needed because we use them from cpplib, yuck.  */
-int flag_iasm_blocks;
-int iasm_state;
-int iasm_in_operands;
-/* APPLE LOCAL end CW asm blocks */
-
-/* APPLE LOCAL begin 4174833 */
-tree
-objc_is_class_name (tree ARG_UNUSED (arg))
-{
-  return 0;
-}
-/* APPLE LOCAL end 4174833 */
-
 /* Every call to a static constructor has an associated boolean
    variable which is in the outermost scope of the calling method.
    This variable is used to avoid multiple calls to the static


From baldrick at free.fr  Wed Jan 17 15:16:06 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Jan 2007 22:16:06 +0100
Subject: [llvm-commits] llvm-gcc4: gimplifier fixes
Message-ID: <200701172216.06669.baldrick@free.fr>

Backported from gcc-4.3.  These should only effect the Ada front-end.

Index: gcc.llvm.master/gcc/tree.c
===================================================================
--- gcc.llvm.master.orig/gcc/tree.c	2007-01-17 21:40:30.000000000 +0100
+++ gcc.llvm.master/gcc/tree.c	2007-01-17 21:47:45.000000000 +0100
@@ -2601,7 +2601,7 @@
       break;
 
     default:
-      if (TREE_CODE_CLASS (code) == tcc_unary
+      if ((TREE_CODE_CLASS (code) == tcc_unary || code == VIEW_CONVERT_EXPR)
 	  && node && !TYPE_P (node)
 	  && TREE_CONSTANT (node))
 	TREE_CONSTANT (t) = 1;
Index: gcc.llvm.master/gcc/varasm.c
===================================================================
--- gcc.llvm.master.orig/gcc/varasm.c	2007-01-17 21:40:31.000000000 +0100
+++ gcc.llvm.master/gcc/varasm.c	2007-01-17 21:47:45.000000000 +0100
@@ -3707,6 +3707,10 @@
 	  && ((decl_function_context (value) && !DECL_NO_STATIC_CHAIN (value))
 	      || DECL_NON_ADDR_CONST_P (value)))
 	return NULL_TREE;
+      /* "&{...}" requires a temporary to hold the constructed
+         object.  */
+      if (value && TREE_CODE (value) == CONSTRUCTOR)
+        return NULL_TREE;
       return value;
 
     case VIEW_CONVERT_EXPR:


From dpatel at apple.com  Wed Jan 17 15:19:39 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Jan 2007 15:19:39 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManager.cpp
Message-ID: <200701172119.l0HLJdWK014328@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

PassManager.cpp updated: 1.128 -> 1.129
---
Log message:

Update ModulePass::assignPassManager() to take into account Preferred 
Pass Manager Type.


---
Diffs of the changes:  (+5 -4)

 PassManager.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.128 llvm/lib/VMCore/PassManager.cpp:1.129
--- llvm/lib/VMCore/PassManager.cpp:1.128	Wed Jan 17 14:33:36 2007
+++ llvm/lib/VMCore/PassManager.cpp	Wed Jan 17 15:19:23 2007
@@ -1207,15 +1207,16 @@
 
   // Find Module Pass Manager
   while(!PMS.empty()) {
-    if (PMS.top()->getPassManagerType() > PMT_ModulePassManager)
+    PassManagerType TopPMType = PMS.top()->getPassManagerType();
+    if (TopPMType == PreferredType)
+      break; // We found desired pass manager
+    else if (TopPMType > PMT_ModulePassManager)
       PMS.pop();    // Pop children pass managers
     else
       break;
   }
-  MPPassManager *MPP = dynamic_cast<MPPassManager *>(PMS.top());
 
-  assert(MPP && "Unable to find Module Pass Manager");
-  MPP->add(this);
+  PMS.top()->add(this);
 }
 
 /// Find appropriate Function Pass Manager or Call Graph Pass Manager





From scottm at rushg.aero.org  Wed Jan 17 14:47:25 2007
From: scottm at rushg.aero.org (Scott Michel)
Date: Wed, 17 Jan 2007 12:47:25 -0800
Subject: [llvm-commits] Stack and global alignment enhancement patch
Message-ID: <20070117204724.GA18716@rush.aero.org>

Per Chris' suggestion to submit enhancement patches to llvm-commits,...

- Adds stack and global alignment options to TargetData specification
  strings.

- Adds minimum stack and global alignment for aggregates.


-scooter
-- 
Scott Michel                                      scottm at aero.org
Member of Technical Staff, CSRD                   310/336-5034
The Aerospace Corporation
-------------- next part --------------
--- old-llvm/include/llvm/Target/TargetData.h	2007-01-17 12:23:39.000000000 -0800
+++ new-llvm/include/llvm/Target/TargetData.h	2007-01-17 12:23:39.000000000 -0800
@@ -35,15 +35,39 @@
 
 class TargetData : public ImmutablePass {
   bool          LittleEndian;          // Defaults to false
-  unsigned char BoolAlignment;         // Defaults to 1 byte
-  unsigned char ByteAlignment;         // Defaults to 1 byte
-  unsigned char ShortAlignment;        // Defaults to 2 bytes
-  unsigned char IntAlignment;          // Defaults to 4 bytes
-  unsigned char LongAlignment;         // Defaults to 8 bytes
-  unsigned char FloatAlignment;        // Defaults to 4 bytes
-  unsigned char DoubleAlignment;       // Defaults to 8 bytes
-  unsigned char PointerSize;           // Defaults to 8 bytes
-  unsigned char PointerAlignment;      // Defaults to 8 bytes
+
+  // "SAAlignment": Struct/Array alignments
+  unsigned char BoolSAAlignment;       // Defaults to 1 byte
+  unsigned char ByteSAAlignment;       // Defaults to 1 byte
+  unsigned char ShortSAAlignment;      // Defaults to 2 bytes
+  unsigned char IntSAAlignment;        // Defaults to 4 bytes
+  unsigned char LongSAAlignment;       // Defaults to 8 bytes
+  unsigned char FloatSAAlignment;      // Defaults to 4 bytes
+  unsigned char DoubleSAAlignment;     // Defaults to 8 bytes
+  unsigned char PointerMemSize;        // Defaults to 8 bytes
+  unsigned char PointerSAAlignment;    // Defaults to 8 bytes
+
+  // Stack type alignments.
+  unsigned char BoolStackAlignment;    // Defaults to BoolAlignment
+  unsigned char ByteStackAlignment;    // Defaults to ByteAlignment
+  unsigned char ShortStackAlignment;   // Defaults to ShortAlignment
+  unsigned char IntStackAlignment;     // Defaults to IntAlignment
+  unsigned char LongStackAlignment;    // Defaults to LongAlignment
+  unsigned char FloatStackAlignment;   // Defaults to FloatAlignment
+  unsigned char DoubleStackAlignment;  // Defaults to DoubleAlignment
+  unsigned char PointerStackAlignment; // Defaults to PointerAlignment
+  unsigned char AggMinStackAlignment;  // Defaults to 4 bytes
+
+  // Global alignments
+  unsigned char BoolGlobalAlignment;   // Defaults to BoolAlignment
+  unsigned char ByteGlobalAlignment;   // Defaults to ByteAlignment
+  unsigned char ShortGlobalAlignment;  // Defaults to ShortAlignment
+  unsigned char IntGlobalAlignment;    // Defaults to IntAlignment
+  unsigned char LongGlobalAlignment;   // Defaults to LongAlignment
+  unsigned char FloatGlobalAlignment;  // Defaults to FloatAlignment
+  unsigned char DoubleGlobalAlignment; // Defaults to DoubleAlignment
+  unsigned char PointerGlobalAlignment;// Defaults to PointerAlignment
+  unsigned char AggMinGlobalAlignment; // Defaults to 4 bytes
 
 public:
   /// Default ctor - This has to exist, because this is a pass, but it should
@@ -68,15 +92,33 @@
   TargetData(const TargetData &TD) : 
     ImmutablePass(),
     LittleEndian(TD.isLittleEndian()),
-    BoolAlignment(TD.getBoolAlignment()),
-    ByteAlignment(TD.getByteAlignment()),
-    ShortAlignment(TD.getShortAlignment()),
-    IntAlignment(TD.getIntAlignment()),
-    LongAlignment(TD.getLongAlignment()),
-    FloatAlignment(TD.getFloatAlignment()),
-    DoubleAlignment(TD.getDoubleAlignment()),
-    PointerSize(TD.getPointerSize()),
-    PointerAlignment(TD.getPointerAlignment()) {
+    BoolSAAlignment(TD.getBoolSAAlignment()),
+    ByteSAAlignment(TD.getByteSAAlignment()),
+    ShortSAAlignment(TD.getShortSAAlignment()),
+    IntSAAlignment(TD.getIntSAAlignment()),
+    LongSAAlignment(TD.getLongSAAlignment()),
+    FloatSAAlignment(TD.getFloatSAAlignment()),
+    DoubleSAAlignment(TD.getDoubleSAAlignment()),
+    PointerMemSize(TD.getPointerSize()),
+    PointerSAAlignment(TD.getPointerSAAlignment()),
+    BoolStackAlignment(TD.getBoolStackAlignment()),
+    ByteStackAlignment(TD.getByteStackAlignment()),
+    ShortStackAlignment(TD.getShortStackAlignment()),
+    IntStackAlignment(TD.getIntStackAlignment()),
+    LongStackAlignment(TD.getLongStackAlignment()),
+    FloatStackAlignment(TD.getFloatStackAlignment()),
+    DoubleStackAlignment(TD.getDoubleStackAlignment()),
+    PointerStackAlignment(TD.getPointerStackAlignment()),
+    AggMinStackAlignment(TD.getAggMinStackAlignment()),
+    BoolGlobalAlignment(TD.getBoolGlobalAlignment()),
+    ByteGlobalAlignment(TD.getByteGlobalAlignment()),
+    ShortGlobalAlignment(TD.getShortGlobalAlignment()),
+    IntGlobalAlignment(TD.getIntGlobalAlignment()),
+    LongGlobalAlignment(TD.getLongGlobalAlignment()),
+    FloatGlobalAlignment(TD.getFloatGlobalAlignment()),
+    DoubleGlobalAlignment(TD.getDoubleGlobalAlignment()),
+    PointerGlobalAlignment(TD.getPointerGlobalAlignment()),
+    AggMinGlobalAlignment(TD.getAggMinGlobalAlignment()) {
   }
 
   ~TargetData();  // Not virtual, do not subclass this class
@@ -86,10 +128,19 @@
   /// Parse a target data layout string, initializing the various TargetData
   /// members along the way. A TargetData specification string looks like
   /// "E-p:64:64-d:64-f:32-l:64-i:32-s:16-b:8-B:8" and specifies the
-  /// target's endianess, the alignments of various data types and
-  /// the size of pointers. The "-" is used as a separator and ":"
-  /// separates a token from its argument. Alignment is indicated in bits
-  /// and internally converted to the appropriate number of bytes.
+  /// target's endianess, the struct/array alignments of various data types and
+  /// the size of pointers.
+  ///
+  /// "-" is used as a separator and ":" separates a token from its argument.
+  ///
+  /// Alignment is indicated in bits and internally converted to the
+  /// appropriate number of bytes.
+  ///
+  /// The stack alignment specifications (":[stackalign]") are optional and
+  /// default to the memory alignment.
+  ///
+  /// The global alignment specifications (":[globalign]") are also optional
+  /// and default to structure/array alignment.
   ///
   /// Valid tokens:
   /// <br>
@@ -97,20 +148,25 @@
   /// <em>e</em> specifies little endian architecture (4321) <br>
   /// <em>p:[ptr size]:[ptr align]</em> specifies pointer size and alignment
   /// [default = 64:64] <br>
-  /// <em>d:[align]</em> specifies double floating point alignment
-  /// [default = 64] <br>
-  /// <em>f:[align]</em> specifies single floating point alignment
-  /// [default = 32] <br>
-  /// <em>l:[align]</em> specifies long integer alignment
-  /// [default = 64] <br>
-  /// <em>i:[align]</em> specifies integer alignment
+  /// <em>d:[align]:[stackalign]:[globalign]</em> specifies double floating
+  /// point alignment [default = 64] <br>
+  /// <em>f:[align]:[stackalign]:[globalign]</em> specifies single floating
+  /// point alignment [default = 32] <br>
+  /// <em>l:[align]:[stackalign]:[globalign[</em> specifies long integer
+  /// alignment [default = 64] <br>
+  /// <em>i:[align]:[stackalign]:[globalign]</em> specifies integer alignment
   /// [default = 32] <br>
-  /// <em>s:[align]</em> specifies short integer alignment
-  /// [default = 16] <br>
-  /// <em>b:[align]</em> specifies byte data type alignment
-  /// [default = 8] <br>
-  /// <em>B:[align]</em> specifies boolean data type alignment
-  /// [default = 8] <br>
+  /// <em>s:[align]:[stackalign]:[globalign]</em> specifies short integer
+  /// alignment [default = 16] <br>
+  /// <em>b:[align]:[stackalign]:[globalign]</em> specifies byte data type
+  /// alignment [default = 8] <br>
+  /// <em>B:[align]:[stackalign]:[globalign]</em> specifies boolean data type
+  /// alignment [default = 8] <br>
+  /// <em>A:[minstackalign]:[minglobalign]</em> specifies an aggregates'
+  /// minimum alignment on the stack and when emitted as a global. The
+  /// default minimum aggregate alignment defaults to 0, which causes
+  /// the aggregate's "natural" internal alignment calculated by llvm
+  /// to be preferred.
   ///
   /// All other token types are silently ignored.
   void init(const std::string &TargetDescription);
@@ -120,17 +176,100 @@
   bool          isLittleEndian()       const { return     LittleEndian; }
   bool          isBigEndian()          const { return    !LittleEndian; }
 
-  /// Target alignment constraints
-  unsigned char getBoolAlignment()     const { return    BoolAlignment; }
-  unsigned char getByteAlignment()     const { return    ByteAlignment; }
-  unsigned char getShortAlignment()    const { return   ShortAlignment; }
-  unsigned char getIntAlignment()      const { return     IntAlignment; }
-  unsigned char getLongAlignment()     const { return    LongAlignment; }
-  unsigned char getFloatAlignment()    const { return   FloatAlignment; }
-  unsigned char getDoubleAlignment()   const { return  DoubleAlignment; }
-  unsigned char getPointerAlignment()  const { return PointerAlignment; }
-  unsigned char getPointerSize()       const { return      PointerSize; }
-  unsigned char getPointerSizeInBits() const { return    8*PointerSize; }
+  /// Target boolean alignment
+  unsigned char getBoolSAAlignment()    const { return    BoolSAAlignment; }
+  /// Target byte alignment
+  unsigned char getByteSAAlignment()    const { return    ByteSAAlignment; }
+  /// Target short alignment
+  unsigned char getShortSAAlignment()   const { return   ShortSAAlignment; }
+  /// Target integer alignment
+  unsigned char getIntSAAlignment()     const { return     IntSAAlignment; }
+  /// Target long alignment
+  unsigned char getLongSAAlignment()    const { return    LongSAAlignment; }
+  /// Target single precision float alignment
+  unsigned char getFloatSAAlignment()   const { return   FloatSAAlignment; }
+  /// Target double precision float alignment
+  unsigned char getDoubleSAAlignment()  const { return  DoubleSAAlignment; }
+  /// Target pointer alignment
+  unsigned char getPointerSAAlignment() const { return PointerSAAlignment; }
+  /// Target pointer size
+  unsigned char getPointerSize()        const { return     PointerMemSize; }
+  /// Target pointer size, in bits
+  unsigned char getPointerSizeInBits()  const { return   8*PointerMemSize; }
+
+  /// Return target's alignment for booleans on stack
+  unsigned char getBoolStackAlignment() const {
+    return BoolStackAlignment;
+  }
+  /// Return target's alignment for integers on stack
+  unsigned char getByteStackAlignment() const {
+    return ByteStackAlignment;
+  }
+  /// Return target's alignment for shorts on stack
+  unsigned char getShortStackAlignment() const {
+    return ShortStackAlignment;
+  }
+  /// Return target's alignment for integers on stack
+  unsigned char getIntStackAlignment()     const {
+    return IntStackAlignment;
+  }
+  /// Return target's alignment for longs on stack
+  unsigned char getLongStackAlignment() const {
+    return LongStackAlignment;
+  }
+  /// Return target's alignment for single precision floats on stack
+  unsigned char getFloatStackAlignment() const {
+    return FloatStackAlignment;
+  }
+  /// Return target's alignment for double preceision floats on stack
+  unsigned char getDoubleStackAlignment()  const {
+    return DoubleStackAlignment;
+  }
+  /// Return target's alignment for stack-based pointers
+  unsigned char getPointerStackAlignment() const {
+    return PointerStackAlignment;
+  }
+  /// Return target's alignment for stack-based structures
+  unsigned char getAggMinStackAlignment() const {
+    return AggMinStackAlignment;
+  }
+
+  /// Return target's alignment for global booleans
+  unsigned char getBoolGlobalAlignment() const {
+    return BoolGlobalAlignment;
+  }
+  /// Return target's alignment for global integers
+  unsigned char getByteGlobalAlignment() const {
+    return ByteGlobalAlignment;
+  }
+  /// Return target's alignment for global shorts
+  unsigned char getShortGlobalAlignment() const {
+    return ShortGlobalAlignment;
+  }
+  /// Return target's alignment for global integers
+  unsigned char getIntGlobalAlignment()     const {
+    return IntGlobalAlignment;
+  }
+  /// Return target's alignment for global longs
+  unsigned char getLongGlobalAlignment() const {
+    return LongGlobalAlignment;
+  }
+  /// Return target's alignment for global single precision floats
+  unsigned char getFloatGlobalAlignment() const {
+    return FloatGlobalAlignment;
+  }
+  /// Return target's alignment for global double precision floats
+  unsigned char getDoubleGlobalAlignment()  const {
+    return DoubleGlobalAlignment;
+  }
+  /// Return target's alignment for global pointers
+  unsigned char getPointerGlobalAlignment() const {
+    return PointerGlobalAlignment;
+  }
+  /// Return target's alignment for global structures
+  unsigned char getAggMinGlobalAlignment() const {
+    return AggMinGlobalAlignment;
+  }
 
   /// getStringRepresentation - Return the string representation of the
   /// TargetData.  This representation is in the same format accepted by the
@@ -142,10 +281,18 @@
   ///
   uint64_t getTypeSize(const Type *Ty) const;
 
-  /// getTypeAlignment - Return the minimum required alignment for the specified
+  /// getTypeAlignmentStructArray - Return the minimum required alignment for the specified
   /// type.
   ///
-  unsigned char getTypeAlignment(const Type *Ty) const;
+  unsigned char getTypeAlignmentStructArray(const Type *Ty) const;
+
+  /// getTypeAlignmentStack- Return the stack-based alignment for the specified
+  /// type.
+  unsigned char getTypeAlignmentStack(const Type *Ty) const;
+
+  /// getTypeAlignmentGlobal- Return the stack-based alignment for the specified
+  /// type.
+  unsigned char getTypeAlignmentGlobal(const Type *Ty) const;
 
   /// getTypeAlignmentShift - Return the minimum required alignment for the
   /// specified type, returned as log2 of the value (a shift amount).

--- old-llvm/lib/CodeGen/ELFWriter.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/CodeGen/ELFWriter.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -236,7 +236,7 @@
   }
 
   const Type *GVType = (const Type*)GV->getType();
-  unsigned Align = TM.getTargetData()->getTypeAlignment(GVType);
+  unsigned Align = TM.getTargetData()->getTypeAlignmentGlobal(GVType);
   unsigned Size  = TM.getTargetData()->getTypeSize(GVType);
 
   // If this global has a zero initializer, it is part of the .bss or common

--- old-llvm/lib/CodeGen/MachOWriter.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/CodeGen/MachOWriter.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -295,7 +295,7 @@
   unsigned Size = TM.getTargetData()->getTypeSize(Ty);
   unsigned Align = GV->getAlignment();
   if (Align == 0)
-    Align = TM.getTargetData()->getTypeAlignment(Ty);
+    Align = TM.getTargetData()->getTypeAlignmentGlobal(Ty);
   
   MachOSym Sym(GV, Mang->getValueName(GV), Sec->Index, TM);
   

--- old-llvm/lib/CodeGen/MachineFunction.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/CodeGen/MachineFunction.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -123,7 +123,8 @@
   const TargetData &TD = *TM.getTargetData();
   bool IsPic = TM.getRelocationModel() == Reloc::PIC_;
   unsigned EntrySize = IsPic ? 4 : TD.getPointerSize();
-  unsigned Alignment = IsPic ? TD.getIntAlignment() : TD.getPointerAlignment();
+  unsigned Alignment = IsPic ? TD.getIntSAAlignment()
+                             : TD.getPointerSAAlignment();
   JumpTableInfo = new MachineJumpTableInfo(EntrySize, Alignment);
   
   BasicBlocks.Parent = this;

--- old-llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -3028,7 +3028,7 @@
         // new ones, as reuse may inhibit scheduling.
         const Type *Ty = MVT::getTypeForValueType(ExtraVT);
         unsigned TySize = (unsigned)TLI.getTargetData()->getTypeSize(Ty);
-        unsigned Align  = TLI.getTargetData()->getTypeAlignment(Ty);
+        unsigned Align  = TLI.getTargetData()->getTypeAlignmentStack(Ty);
         MachineFunction &MF = DAG.getMachineFunction();
         int SSFI =
           MF.getFrameInfo()->CreateStackObject((unsigned)TySize, Align);
@@ -3936,7 +3936,9 @@
 SDOperand SelectionDAGLegalize::CreateStackTemporary(MVT::ValueType VT) {
   MachineFrameInfo *FrameInfo = DAG.getMachineFunction().getFrameInfo();
   unsigned ByteSize = MVT::getSizeInBits(VT)/8;
-  int FrameIdx = FrameInfo->CreateStackObject(ByteSize, ByteSize);
+  const Type *Ty = MVT::getTypeForValueType(VT);
+  unsigned StackAlign = (unsigned)TLI.getTargetData()->getTypeAlignmentStack(Ty);
+  int FrameIdx = FrameInfo->CreateStackObject(ByteSize, StackAlign);
   return DAG.getFrameIndex(FrameIdx, TLI.getPointerTy());
 }
 
@@ -4241,9 +4243,12 @@
   if (Op0.getValueType() == MVT::i32) {
     // simple 32-bit [signed|unsigned] integer to float/double expansion
     
-    // get the stack frame index of a 8 byte buffer
+    // get the stack frame index of a 8 byte buffer, pessimistically aligned
     MachineFunction &MF = DAG.getMachineFunction();
-    int SSFI = MF.getFrameInfo()->CreateStackObject(8, 8);
+    const Type *F64Type = MVT::getTypeForValueType(MVT::f64);
+    unsigned StackAlign =
+      (unsigned)TLI.getTargetData()->getTypeAlignmentStack(F64Type);
+    int SSFI = MF.getFrameInfo()->CreateStackObject(8, StackAlign);
     // get address of 8 byte buffer
     SDOperand StackSlot = DAG.getFrameIndex(SSFI, TLI.getPointerTy());
     // word offset constant for Hi/Lo address computation

--- old-llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -244,17 +244,9 @@
         const Type *Ty = AI->getAllocatedType();
         uint64_t TySize = TLI.getTargetData()->getTypeSize(Ty);
         unsigned Align = 
-          std::max((unsigned)TLI.getTargetData()->getTypeAlignment(Ty),
+          std::max((unsigned)TLI.getTargetData()->getTypeAlignmentStack(Ty),
                    AI->getAlignment());
 
-        // If the alignment of the value is smaller than the size of the 
-        // value, and if the size of the value is particularly small 
-        // (<= 8 bytes), round up to the size of the value for potentially 
-        // better performance.
-        //
-        // FIXME: This could be made better with a preferred alignment hook in
-        // TargetData.  It serves primarily to 8-byte align doubles for X86.
-        if (Align < TySize && TySize <= 8) Align = TySize;
         TySize *= CUI->getZExtValue();   // Get total allocated size.
         if (TySize == 0) TySize = 1; // Don't create zero-sized stack objects.
         StaticAllocaMap[AI] =
@@ -1729,8 +1721,9 @@
 
   const Type *Ty = I.getAllocatedType();
   uint64_t TySize = TLI.getTargetData()->getTypeSize(Ty);
-  unsigned Align = std::max((unsigned)TLI.getTargetData()->getTypeAlignment(Ty),
-                            I.getAlignment());
+  unsigned Align =
+    std::max((unsigned)TLI.getTargetData()->getTypeAlignmentStack(Ty),
+             I.getAlignment());
 
   SDOperand AllocSize = getValue(I.getArraySize());
   MVT::ValueType IntPtr = TLI.getPointerTy();

--- old-llvm/lib/ExecutionEngine/JIT/JIT.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/ExecutionEngine/JIT/JIT.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -338,7 +338,7 @@
     // compilation.
     const Type *GlobalType = GV->getType()->getElementType();
     size_t S = getTargetData()->getTypeSize(GlobalType);
-    size_t A = getTargetData()->getTypeAlignment(GlobalType);
+    size_t A = getTargetData()->getTypeAlignmentGlobal(GlobalType);
     if (A <= 8) {
       Ptr = malloc(S);
     } else {

--- old-llvm/lib/Target/ARM/ARMAsmPrinter.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/Target/ARM/ARMAsmPrinter.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -306,7 +306,7 @@
     std::string name = Mang->getValueName(I);
     Constant *C = I->getInitializer();
     unsigned Size = TD->getTypeSize(C->getType());
-    unsigned Align = Log2_32(TD->getTypeAlignment(C->getType()));
+    unsigned Align = Log2_32(TD->getTypeAlignmentGlobal(C->getType()));
 
     if (C->isNullValue() &&
         !I->hasSection() &&

--- old-llvm/lib/Target/Sparc/SparcAsmPrinter.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/Target/Sparc/SparcAsmPrinter.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -229,7 +229,7 @@
       std::string name = Mang->getValueName(I);
       Constant *C = I->getInitializer();
       unsigned Size = TD->getTypeSize(C->getType());
-      unsigned Align = TD->getTypeAlignment(C->getType());
+      unsigned Align = TD->getTypeAlignmentGlobal(C->getType());
 
       if (C->isNullValue() &&
           (I->hasLinkOnceLinkage() || I->hasInternalLinkage() ||
@@ -239,7 +239,7 @@
           O << "\t.local " << name << "\n";
 
         O << "\t.comm " << name << "," << TD->getTypeSize(C->getType())
-          << "," << (unsigned)TD->getTypeAlignment(C->getType());
+          << "," << Align;
         O << "\n";
       } else {
         switch (I->getLinkage()) {

--- old-llvm/lib/Target/TargetData.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/Target/TargetData.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -34,8 +34,15 @@
   RegisterPass<TargetData> X("targetdata", "Target Data Layout");
 }
 
-static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
-                               uint64_t &Size, unsigned char &Alignment);
+static inline void getTypeInfoStructArray(const Type *Ty, const TargetData *TD,
+                                          uint64_t &Size,
+                                          unsigned char &Alignment);
+
+static inline void getTypeInfoStack(const Type *Ty, const TargetData *TD,
+                                    uint64_t &Size, unsigned char &Alignment);
+
+static inline void getTypeInfoGlobal(const Type *Ty, const TargetData *TD,
+                                     uint64_t &Size, unsigned char &Alignment);
 
 //===----------------------------------------------------------------------===//
 // Support for StructLayout
@@ -52,7 +59,7 @@
     unsigned char A;
     unsigned TyAlign;
     uint64_t TySize;
-    getTypeInfo(Ty, &TD, TySize, A);
+    getTypeInfoStructArray(Ty, &TD, TySize, A);
     TyAlign = ST->isPacked() ? 1 : A;
 
     // Add padding if necessary to make the data element aligned properly...
@@ -80,8 +87,7 @@
 /// return the structure index that contains it.
 unsigned StructLayout::getElementContainingOffset(uint64_t Offset) const {
   std::vector<uint64_t>::const_iterator SI =
-    std::upper_bound(MemberOffsets.begin(), MemberOffsets.end(),
-                     Offset);
+    std::upper_bound(MemberOffsets.begin(), MemberOffsets.end(), Offset);
   assert(SI != MemberOffsets.begin() && "Offset not in structure type!");
   --SI;
   assert(*SI <= Offset && "upper_bound didn't work");
@@ -99,15 +105,33 @@
   std::string temp = TargetDescription;
   
   LittleEndian = false;
-  PointerSize = 8;
-  PointerAlignment   = 8;
-  DoubleAlignment = 8;
-  FloatAlignment = 4;
-  LongAlignment   = 8;
-  IntAlignment   = 4;
-  ShortAlignment  = 2;
-  ByteAlignment  = 1;
-  BoolAlignment   = 1;
+  PointerMemSize = 8;
+  PointerSAAlignment   = 8;
+  DoubleSAAlignment = 8;
+  FloatSAAlignment = 4;
+  LongSAAlignment   = 8;
+  IntSAAlignment   = 4;
+  ShortSAAlignment  = 2;
+  ByteSAAlignment  = 1;
+  BoolSAAlignment   = 1;
+  BoolStackAlignment = BoolSAAlignment;
+  ByteStackAlignment = ByteSAAlignment;
+  ShortStackAlignment = ShortSAAlignment;
+  IntStackAlignment = IntSAAlignment;
+  LongStackAlignment = LongSAAlignment;
+  FloatStackAlignment = FloatSAAlignment;
+  DoubleStackAlignment = DoubleSAAlignment;
+  PointerStackAlignment = PointerSAAlignment;
+  AggMinStackAlignment = 0;
+  BoolGlobalAlignment = BoolSAAlignment;
+  ByteGlobalAlignment = ByteSAAlignment;
+  ShortGlobalAlignment = ShortSAAlignment;
+  IntGlobalAlignment = IntSAAlignment;
+  LongGlobalAlignment = LongSAAlignment;
+  FloatGlobalAlignment = FloatSAAlignment;
+  DoubleGlobalAlignment = DoubleSAAlignment;
+  PointerGlobalAlignment = PointerSAAlignment;
+  AggMinGlobalAlignment = 0;
   
   while (!temp.empty()) {
     std::string token = getToken(temp, "-");
@@ -122,29 +146,85 @@
       LittleEndian = true;
       break;
     case 'p':
-      PointerSize = atoi(getToken(token,":").c_str()) / 8;
-      PointerAlignment = atoi(getToken(token,":").c_str()) / 8;
+      PointerMemSize = atoi(getToken(token,":").c_str()) / 8;
+      PointerSAAlignment = atoi(getToken(token,":").c_str()) / 8;
+      PointerStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (PointerStackAlignment == 0)
+        PointerStackAlignment = PointerSAAlignment;
+      PointerGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (PointerGlobalAlignment == 0)
+        PointerGlobalAlignment = PointerSAAlignment;
       break;
     case 'd':
-      DoubleAlignment = atoi(getToken(token,":").c_str()) / 8;
+      DoubleSAAlignment = atoi(getToken(token,":").c_str()) / 8;
+      DoubleStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (DoubleStackAlignment == 0)
+        DoubleStackAlignment = DoubleSAAlignment;
+      DoubleGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (DoubleGlobalAlignment == 0)
+        DoubleGlobalAlignment = DoubleSAAlignment;
       break;
     case 'f':
-      FloatAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      FloatSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      FloatStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (FloatStackAlignment == 0)
+        FloatStackAlignment = FloatSAAlignment;
+      FloatGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (FloatGlobalAlignment == 0)
+        FloatGlobalAlignment = FloatSAAlignment;
       break;
     case 'l':
-      LongAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      LongSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      LongStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (LongStackAlignment == 0)
+        LongStackAlignment = LongSAAlignment;
+      LongGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (LongGlobalAlignment == 0)
+        LongGlobalAlignment = LongSAAlignment;
       break;
     case 'i':
-      IntAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      IntSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      IntStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (IntStackAlignment == 0)
+        IntStackAlignment = IntSAAlignment;
+      IntGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (IntGlobalAlignment == 0)
+        IntGlobalAlignment = IntSAAlignment;
       break;
     case 's':
-      ShortAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ShortSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ShortStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (ShortStackAlignment == 0)
+        ShortStackAlignment = ShortSAAlignment;
+      ShortGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (ShortGlobalAlignment == 0)
+        ShortGlobalAlignment = ShortSAAlignment;
       break;
     case 'b':
-      ByteAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ByteSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ByteStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (ByteStackAlignment == 0)
+        ByteStackAlignment = ByteSAAlignment;
+      ByteGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (ByteGlobalAlignment == 0)
+        ByteGlobalAlignment = ByteSAAlignment;
       break;
     case 'B':
-      BoolAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      BoolSAAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      BoolStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (BoolStackAlignment == 0)
+        BoolStackAlignment = BoolSAAlignment;
+      BoolGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (BoolGlobalAlignment == 0)
+        BoolGlobalAlignment = BoolSAAlignment;
+      break;
+    case 'A':
+      AggMinStackAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (AggMinStackAlignment == 0)
+        AggMinStackAlignment = 0;
+      AggMinGlobalAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (AggMinGlobalAlignment == 0)
+        AggMinGlobalAlignment = 0;
       break;
     default:
       break;
@@ -153,16 +233,34 @@
 }
 
 TargetData::TargetData(const Module *M) {
-  LittleEndian     = M->getEndianness() != Module::BigEndian;
-  PointerSize      = M->getPointerSize() != Module::Pointer64 ? 4 : 8;
-  PointerAlignment = PointerSize;
-  DoubleAlignment  = PointerSize;
-  FloatAlignment   = 4;
-  LongAlignment    = PointerSize;
-  IntAlignment     = 4;
-  ShortAlignment   = 2;
-  ByteAlignment    = 1;
-  BoolAlignment    = 1;
+  LittleEndian       = M->getEndianness() != Module::BigEndian;
+  PointerMemSize     = M->getPointerSize() != Module::Pointer64 ? 4 : 8;
+  PointerSAAlignment = PointerMemSize;
+  DoubleSAAlignment  = PointerMemSize;
+  FloatSAAlignment   = 4;
+  LongSAAlignment    = PointerMemSize;
+  IntSAAlignment     = 4;
+  ShortSAAlignment   = 2;
+  ByteSAAlignment    = 1;
+  BoolSAAlignment    = 1;
+  BoolStackAlignment = BoolSAAlignment;
+  ByteStackAlignment = ByteSAAlignment;
+  ShortStackAlignment = ShortSAAlignment;
+  IntStackAlignment = IntSAAlignment;
+  LongStackAlignment = LongSAAlignment;
+  FloatStackAlignment = FloatSAAlignment;
+  DoubleStackAlignment = DoubleSAAlignment;
+  PointerStackAlignment = PointerSAAlignment;
+  AggMinStackAlignment = 0;
+  BoolGlobalAlignment = BoolSAAlignment;
+  ByteGlobalAlignment = ByteSAAlignment;
+  ShortGlobalAlignment = ShortSAAlignment;
+  IntGlobalAlignment = IntSAAlignment;
+  LongGlobalAlignment = LongSAAlignment;
+  FloatGlobalAlignment = FloatSAAlignment;
+  DoubleGlobalAlignment = DoubleSAAlignment;
+  PointerGlobalAlignment = PointerSAAlignment;
+  AggMinGlobalAlignment = 0;
 }
 
 /// Layouts - The lazy cache of structure layout information maintained by
@@ -195,14 +293,23 @@
   else
     repr << "E";
   
-  repr << "-p:" << (PointerSize * 8) << ":" << (PointerAlignment * 8);
-  repr << "-d:64:" << (DoubleAlignment * 8);
-  repr << "-f:32:" << (FloatAlignment * 8);
-  repr << "-l:64:" << (LongAlignment * 8);
-  repr << "-i:32:" << (IntAlignment * 8);
-  repr << "-s:16:" << (ShortAlignment * 8);
-  repr << "-b:8:" << (ByteAlignment * 8);
-  repr << "-B:8:" << (BoolAlignment * 8);
+  repr << "-p:" << (PointerMemSize * 8) << ":" << (PointerSAAlignment * 8);
+  repr << "-d:" << (DoubleSAAlignment * 8) << ":"
+       << (DoubleStackAlignment * 8) << ":" << (DoubleGlobalAlignment * 8);
+  repr << "-f:" << (FloatSAAlignment * 8) << ":"
+       << (FloatStackAlignment * 8) << ":" << (FloatGlobalAlignment * 8);
+  repr << "-l:" << (LongSAAlignment * 8) << ":"
+       << (LongStackAlignment * 8) << ":" << (LongGlobalAlignment * 8);
+  repr << "-i:" << (IntSAAlignment * 8) << ":"
+       << (IntStackAlignment * 8) << ":" << (IntGlobalAlignment * 8);
+  repr << "-s:" << (ShortSAAlignment * 8) << ":"
+       << (ShortStackAlignment * 8) << ":" << (ShortGlobalAlignment * 8);
+  repr << "-b:" << (ByteSAAlignment * 8) << ":"
+       << (ByteStackAlignment * 8) << ":" << (ByteGlobalAlignment * 8);
+  repr << "-B:" << (BoolSAAlignment * 8) << ":"
+       << (BoolStackAlignment * 8) << ":" << (BoolGlobalAlignment * 8);
+  repr << "-A:" << (AggMinStackAlignment * 8) << ":"
+       << (AggMinGlobalAlignment * 8);
   
   return repr.str();
 }
@@ -237,41 +344,42 @@
 
 
 
-static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
-                               uint64_t &Size, unsigned char &Alignment) {
+static inline void getTypeInfoStructArray(const Type *Ty, const TargetData *TD,
+                                          uint64_t &Size,
+                                          unsigned char &Alignment) {
   assert(Ty->isSized() && "Cannot getTypeInfo() on a type that is unsized!");
   switch (Ty->getTypeID()) {
   case Type::IntegerTyID: {
     unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
     if (BitWidth <= 8) {
-      Size = 1; Alignment = TD->getByteAlignment();
+      Size = 1; Alignment = TD->getByteSAAlignment();
     } else if (BitWidth <= 16) {
-      Size = 2; Alignment = TD->getShortAlignment();
+      Size = 2; Alignment = TD->getShortSAAlignment();
     } else if (BitWidth <= 32) {
-      Size = 4; Alignment = TD->getIntAlignment();
+      Size = 4; Alignment = TD->getIntSAAlignment();
     } else if (BitWidth <= 64) {
-      Size = 8; Alignment = TD->getLongAlignment();
+      Size = 8; Alignment = TD->getLongSAAlignment();
     } else
       assert(0 && "Integer types > 64 bits not supported.");
     return;
   }
-  case Type::VoidTyID:   Size = 1; Alignment = TD->getByteAlignment(); return;
-  case Type::FloatTyID:  Size = 4; Alignment = TD->getFloatAlignment(); return;
-  case Type::DoubleTyID: Size = 8; Alignment = TD->getDoubleAlignment(); return;
+  case Type::VoidTyID:   Size = 1; Alignment = TD->getByteSAAlignment(); return;
+  case Type::FloatTyID:  Size = 4; Alignment = TD->getFloatSAAlignment(); return;
+  case Type::DoubleTyID: Size = 8; Alignment = TD->getDoubleSAAlignment(); return;
   case Type::LabelTyID:
   case Type::PointerTyID:
-    Size = TD->getPointerSize(); Alignment = TD->getPointerAlignment();
+    Size = TD->getPointerSize(); Alignment = TD->getPointerSAAlignment();
     return;
   case Type::ArrayTyID: {
     const ArrayType *ATy = cast<ArrayType>(Ty);
-    getTypeInfo(ATy->getElementType(), TD, Size, Alignment);
+    getTypeInfoStructArray(ATy->getElementType(), TD, Size, Alignment);
     unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
     Size = AlignedSize*ATy->getNumElements();
     return;
   }
   case Type::PackedTyID: {
     const PackedType *PTy = cast<PackedType>(Ty);
-    getTypeInfo(PTy->getElementType(), TD, Size, Alignment);
+    getTypeInfoStructArray(PTy->getElementType(), TD, Size, Alignment);
     unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
     Size = AlignedSize*PTy->getNumElements();
     // FIXME: The alignments of specific packed types are target dependent.
@@ -292,22 +400,166 @@
   }
 }
 
+static inline void getTypeInfoStack(const Type *Ty, const TargetData *TD,
+                                    uint64_t &Size, unsigned char &Alignment) {
+  assert(Ty->isSized() && "Cannot getTypeInfoStack() on a type that is unsized!");
+  switch (Ty->getTypeID()) {
+  case Type::IntegerTyID: {
+    unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+    if (BitWidth <= 8) {
+      Size = 1; Alignment = TD->getByteStackAlignment();
+    } else if (BitWidth <= 16) {
+      Size = 2; Alignment = TD->getShortStackAlignment();
+    } else if (BitWidth <= 32) {
+      Size = 4; Alignment = TD->getIntStackAlignment();
+    } else if (BitWidth <= 64) {
+      Size = 8; Alignment = TD->getLongStackAlignment();
+    } else
+      assert(0 && "Integer types > 64 bits not supported.");
+    return;
+  }
+  case Type::VoidTyID:
+    Size = 1; Alignment = TD->getByteStackAlignment();
+    return;
+  case Type::FloatTyID:
+    Size = 4; Alignment = TD->getFloatStackAlignment();
+    return;
+  case Type::DoubleTyID:
+    Size = 8; Alignment = TD->getDoubleStackAlignment();
+    return;
+  case Type::LabelTyID:
+  case Type::PointerTyID:
+    Size = TD->getPointerSize(); Alignment = TD->getPointerStackAlignment();
+    return;
+  case Type::ArrayTyID: {
+    const ArrayType *ATy = cast<ArrayType>(Ty);
+    getTypeInfoStack(ATy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*ATy->getNumElements();
+    return;
+  }
+  case Type::PackedTyID: {
+    const PackedType *PTy = cast<PackedType>(Ty);
+    getTypeInfoStack(PTy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*PTy->getNumElements();
+    // FIXME: The alignments of specific packed types are target dependent.
+    // For now, just set it to be equal to Size.
+    Alignment = Size;
+    return;
+  }
+  case Type::StructTyID: {
+    // Get the layout annotation... which is lazily created on demand;
+    // enforce minimum aggregate alignment.
+    const StructLayout *Layout = TD->getStructLayout(cast<StructType>(Ty));
+    Size = Layout->StructSize;
+    Alignment = std::max(Layout->StructAlignment,
+                         (const unsigned int) TD->getAggMinStackAlignment());
+    return;
+  }
+
+  default:
+    assert(0 && "Bad type for getTypeInfoStack!!!");
+    return;
+  }
+}
+
+static inline void getTypeInfoGlobal(const Type *Ty, const TargetData *TD,
+                                     uint64_t &Size, unsigned char &Alignment) {
+  assert(Ty->isSized() && "Cannot getTypeInfoGlobal() on a type that is unsized!");
+  switch (Ty->getTypeID()) {
+  case Type::IntegerTyID: {
+    unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+    if (BitWidth <= 8) {
+      Size = 1; Alignment = TD->getByteGlobalAlignment();
+    } else if (BitWidth <= 16) {
+      Size = 2; Alignment = TD->getShortGlobalAlignment();
+    } else if (BitWidth <= 32) {
+      Size = 4; Alignment = TD->getIntGlobalAlignment();
+    } else if (BitWidth <= 64) {
+      Size = 8; Alignment = TD->getLongGlobalAlignment();
+    } else
+      assert(0 && "Integer types > 64 bits not supported.");
+    return;
+  }
+  case Type::VoidTyID:
+    Size = 1; Alignment = TD->getByteGlobalAlignment();
+    return;
+  case Type::FloatTyID:
+    Size = 4; Alignment = TD->getFloatGlobalAlignment();
+    return;
+  case Type::DoubleTyID:
+    Size = 8; Alignment = TD->getDoubleGlobalAlignment();
+    return;
+  case Type::LabelTyID:
+  case Type::PointerTyID:
+    Size = TD->getPointerSize(); Alignment = TD->getPointerGlobalAlignment();
+    return;
+  case Type::ArrayTyID: {
+    const ArrayType *ATy = cast<ArrayType>(Ty);
+    getTypeInfoGlobal(ATy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*ATy->getNumElements();
+    return;
+  }
+  case Type::PackedTyID: {
+    const PackedType *PTy = cast<PackedType>(Ty);
+    getTypeInfoGlobal(PTy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*PTy->getNumElements();
+    // FIXME: The alignments of specific packed types are target dependent.
+    // For now, just set it to be equal to Size.
+    Alignment = Size;
+    return;
+  }
+  case Type::StructTyID: {
+    // Get the layout annotation... which is lazily created on demand;
+    // enforce minimum global aggregate alignment:
+    const StructLayout *Layout = TD->getStructLayout(cast<StructType>(Ty));
+    Size = Layout->StructSize;
+    Alignment = std::max(Layout->StructAlignment,
+                         (const unsigned int) TD->getAggMinGlobalAlignment());
+    return;
+  }
+
+  default:
+    assert(0 && "Bad type for getTypeInfoGlobal!!!");
+    return;
+  }
+}
+
+
+
 uint64_t TargetData::getTypeSize(const Type *Ty) const {
   uint64_t Size;
   unsigned char Align;
-  getTypeInfo(Ty, this, Size, Align);
+  getTypeInfoStructArray(Ty, this, Size, Align);
   return Size;
 }
 
-unsigned char TargetData::getTypeAlignment(const Type *Ty) const {
+unsigned char TargetData::getTypeAlignmentStructArray(const Type *Ty) const {
+  uint64_t Size;
+  unsigned char Align;
+  getTypeInfoStructArray(Ty, this, Size, Align);
+  return Align;
+}
+
+unsigned char TargetData::getTypeAlignmentStack(const Type *Ty) const {
+  uint64_t Size;
+  unsigned char Align;
+  getTypeInfoStack(Ty, this, Size, Align);
+  return Align;
+}
+
+unsigned char TargetData::getTypeAlignmentGlobal(const Type *Ty) const {
   uint64_t Size;
   unsigned char Align;
-  getTypeInfo(Ty, this, Size, Align);
+  getTypeInfoGlobal(Ty, this, Size, Align);
   return Align;
 }
 
 unsigned char TargetData::getTypeAlignmentShift(const Type *Ty) const {
-  unsigned Align = getTypeAlignment(Ty);
+  unsigned Align = getTypeAlignmentStructArray(Ty);
   assert(!(Align & (Align-1)) && "Alignment is not a power of two!");
   return Log2_32(Align);
 }

--- old-llvm/lib/Target/X86/X86TargetMachine.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/Target/X86/X86TargetMachine.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -109,8 +109,8 @@
 X86TargetMachine::X86TargetMachine(const Module &M, const std::string &FS, bool is64Bit)
   : Subtarget(M, FS, is64Bit),
     DataLayout(Subtarget.is64Bit() ?
-               std::string("e-p:64:64-d:32-l:32") :
-               std::string("e-p:32:32-d:32-l:32")),
+               std::string("e-p:64:64-d:32:64:64-l:32") :
+               std::string("e-p:32:32-d:32:64:64-l:32")),
     FrameInfo(TargetFrameInfo::StackGrowsDown,
               Subtarget.getStackAlignment(), Subtarget.is64Bit() ? -8 : -4),
     InstrInfo(*this), JITInfo(*this), TLInfo(*this) {

--- old-llvm/lib/Transforms/Scalar/InstructionCombining.cpp	2007-01-17 12:22:57.000000000 -0800
+++ new-llvm/lib/Transforms/Scalar/InstructionCombining.cpp	2007-01-17 12:22:58.000000000 -0800
@@ -5773,8 +5773,8 @@
   const Type *CastElTy = PTy->getElementType();
   if (!AllocElTy->isSized() || !CastElTy->isSized()) return 0;
 
-  unsigned AllocElTyAlign = TD->getTypeAlignment(AllocElTy);
-  unsigned CastElTyAlign = TD->getTypeAlignment(CastElTy);
+  unsigned AllocElTyAlign = TD->getTypeAlignmentStructArray(AllocElTy);
+  unsigned CastElTyAlign = TD->getTypeAlignmentStructArray(CastElTy);
   if (CastElTyAlign < AllocElTyAlign) return 0;
 
   // If the allocation has multiple uses, only promote it if we are strictly
@@ -6872,18 +6872,22 @@
   if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V)) {
     unsigned Align = GV->getAlignment();
     if (Align == 0 && TD) 
-      Align = TD->getTypeAlignment(GV->getType()->getElementType());
+      Align = TD->getTypeAlignmentGlobal(GV->getType()->getElementType());
     return Align;
   } else if (AllocationInst *AI = dyn_cast<AllocationInst>(V)) {
     unsigned Align = AI->getAlignment();
     if (Align == 0 && TD) {
       if (isa<AllocaInst>(AI))
-        Align = TD->getTypeAlignment(AI->getType()->getElementType());
+        Align = TD->getTypeAlignmentStack(AI->getType()->getElementType());
       else if (isa<MallocInst>(AI)) {
         // Malloc returns maximally aligned memory.
-        Align = TD->getTypeAlignment(AI->getType()->getElementType());
-        Align = std::max(Align, (unsigned)TD->getTypeAlignment(Type::DoubleTy));
-        Align = std::max(Align, (unsigned)TD->getTypeAlignment(Type::Int64Ty));
+        Align = TD->getTypeAlignmentStructArray(AI->getType()->getElementType());
+        Align =
+          std::max(Align,
+                   (unsigned)TD->getTypeAlignmentStructArray(Type::DoubleTy));
+        Align =
+          std::max(Align,
+                   (unsigned)TD->getTypeAlignmentStructArray(Type::Int64Ty));
       }
     }
     return Align;
@@ -6918,10 +6922,12 @@
     if (!TD) return 0;
 
     const Type *BasePtrTy = GEPI->getOperand(0)->getType();
-    if (TD->getTypeAlignment(cast<PointerType>(BasePtrTy)->getElementType())
+    const PointerType *PtrTy = cast<PointerType>(BasePtrTy);
+    if (TD->getTypeAlignmentStructArray(PtrTy->getElementType())
         <= BaseAlignment) {
       const Type *GEPTy = GEPI->getType();
-      return TD->getTypeAlignment(cast<PointerType>(GEPTy)->getElementType());
+      const PointerType *GEPPtrTy = cast<PointerType>(GEPTy);
+      return TD->getTypeAlignmentStructArray(GEPPtrTy->getElementType());
     }
     return 0;
   }


From dpatel at apple.com  Wed Jan 17 15:45:17 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Jan 2007 15:45:17 -0600
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
Message-ID: <200701172145.l0HLjH3i014793@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

CallGraphSCCPass.cpp updated: 1.10 -> 1.11
---
Log message:

Add CGPassManager.


---
Diffs of the changes:  (+124 -0)

 CallGraphSCCPass.cpp |  124 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 124 insertions(+)


Index: llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
diff -u llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.10 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.11
--- llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.10	Thu Apr 21 16:08:44 2005
+++ llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp	Wed Jan 17 15:45:01 2007
@@ -18,8 +18,132 @@
 #include "llvm/CallGraphSCCPass.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/ADT/SCCIterator.h"
+#include "llvm/PassManagers.h"
 using namespace llvm;
 
+//===----------------------------------------------------------------------===//
+// CGPassManager
+//
+/// CGPassManager manages FPPassManagers and CalLGraphSCCPasses.
+
+class CGPassManager : public ModulePass, public PMDataManager {
+
+public:
+  CGPassManager(int Depth) : PMDataManager(Depth) { }
+
+  /// run - Execute all of the passes scheduled for execution.  Keep track of
+  /// whether any of the passes modifies the module, and if so, return true.
+  bool runOnModule(Module &M);
+
+  bool doInitialization(CallGraph &CG);
+  bool doFinalization(CallGraph &CG);
+
+  /// Pass Manager itself does not invalidate any analysis info.
+  void getAnalysisUsage(AnalysisUsage &Info) const {
+    // CGPassManager walks SCC and it needs CallGraph.
+    Info.addRequired<CallGraph>();
+    Info.setPreservesAll();
+  }
+
+  // Print passes managed by this manager
+  void dumpPassStructure(unsigned Offset) {
+    llvm::cerr << std::string(Offset*2, ' ') << "Call Graph SCC Pass Manager\n";
+    for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
+      Pass *P = getContainedPass(Index);
+      P->dumpPassStructure(Offset + 1);
+      dumpLastUses(P, Offset+1);
+    }
+  }
+
+  Pass *getContainedPass(unsigned N) {
+    assert ( N < PassVector.size() && "Pass number out of range!");
+    Pass *FP = static_cast<Pass *>(PassVector[N]);
+    return FP;
+  }
+
+  virtual PassManagerType getPassManagerType() { 
+    return PMT_CallGraphPassManager; 
+  }
+};
+
+/// run - Execute all of the passes scheduled for execution.  Keep track of
+/// whether any of the passes modifies the module, and if so, return true.
+bool CGPassManager::runOnModule(Module &M) {
+  CallGraph &CG = getAnalysis<CallGraph>();
+  bool Changed = doInitialization(CG);
+
+  std::string Msg1 = "Executing Pass '";
+  std::string Msg3 = "' Made Modification '";
+
+  // Walk SCC
+  for (scc_iterator<CallGraph*> I = scc_begin(&CG), E = scc_end(&CG);
+       I != E; ++I) {
+
+    // Run all passes on current SCC
+    for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {  
+
+      Pass *P = getContainedPass(Index);
+      AnalysisUsage AnUsage;
+      P->getAnalysisUsage(AnUsage);
+
+      std::string Msg2 = "' on Call Graph ...\n'";
+      dumpPassInfo(P, Msg1, Msg2);
+      dumpAnalysisSetInfo("Required", P, AnUsage.getRequiredSet());
+
+      initializeAnalysisImpl(P);
+
+      //        if (TheTimeInfo) TheTimeInfo->passStarted(P);
+      if (CallGraphSCCPass *CGSP = dynamic_cast<CallGraphSCCPass *>(P))
+	Changed |= CGSP->runOnSCC(*I);   // TODO : What if CG is changed ?
+      else {
+	FPPassManager *FPP = dynamic_cast<FPPassManager *>(P);
+	assert (FPP && "Invalid CGPassManager member");
+
+	// Run pass P on all functions current SCC
+	std::vector<CallGraphNode*> &SCC = *I;
+	for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
+	  Function *F = SCC[i]->getFunction();
+	  if (F) 
+	    Changed |= FPP->runOnFunction(*F);
+	}
+      }
+      //        if (TheTimeInfo) TheTimeInfo->passEnded(MP);
+
+      if (Changed)
+	dumpPassInfo(P, Msg3, Msg2);
+      dumpAnalysisSetInfo("Preserved", P, AnUsage.getPreservedSet());
+      
+      removeNotPreservedAnalysis(P);
+      recordAvailableAnalysis(P);
+      removeDeadPasses(P, Msg2);
+    }
+  }
+  Changed |= doFinalization(CG);
+  return Changed;
+}
+
+/// Initialize CG
+bool CGPassManager::doInitialization(CallGraph &CG) {
+  bool Changed = false;
+  for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {  
+    Pass *P = getContainedPass(Index);
+    if (CallGraphSCCPass *CGSP = dynamic_cast<CallGraphSCCPass *>(P)) 
+      Changed |= CGSP->doInitialization(CG);
+  }
+  return Changed;
+}
+
+/// Finalize CG
+bool CGPassManager::doFinalization(CallGraph &CG) {
+  bool Changed = false;
+  for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {  
+    Pass *P = getContainedPass(Index);
+    if (CallGraphSCCPass *CGSP = dynamic_cast<CallGraphSCCPass *>(P)) 
+      Changed |= CGSP->doFinalization(CG);
+  }
+  return Changed;
+}
+
 /// getAnalysisUsage - For this class, we declare that we require and preserve
 /// the call graph.  If the derived class implements this method, it should
 /// always explicitly call the implementation here.





From isanbard at gmail.com  Wed Jan 17 16:17:39 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 16:17:39 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/OutputBuffer.h
Message-ID: <200701172217.l0HMHdGq015473@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

OutputBuffer.h added (r1.1)
---
Log message:

Refactored output buffer methods from MachO and ELF writers.


---
Diffs of the changes:  (+146 -0)

 OutputBuffer.h |  146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 146 insertions(+)


Index: llvm/include/llvm/Support/OutputBuffer.h
diff -c /dev/null llvm/include/llvm/Support/OutputBuffer.h:1.1
*** /dev/null	Wed Jan 17 16:17:34 2007
--- llvm/include/llvm/Support/OutputBuffer.h	Wed Jan 17 16:17:24 2007
***************
*** 0 ****
--- 1,146 ----
+ //=== OutputBuffer.h - Output Buffer ----------------------------*- C++ -*-===//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Bill Wendling and is distributed under the
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // Methods to output values to a data buffer.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef LLVM_SUPPORT_OUTPUTBUFFER_H
+ #define LLVM_SUPPORT_OUTPUTBUFFER_H
+ 
+ #include <vector>
+ 
+ namespace llvm {
+   
+   class OutputBuffer {
+     /// Output buffer.
+     std::vector<unsigned char> &Output;
+ 
+     /// is64Bit/isLittleEndian - This information is inferred from the target
+     /// machine directly, indicating what header values and flags to set.
+     bool is64Bit, isLittleEndian;
+   public:
+     OutputBuffer(const TargetMachine& TM,
+                  std::vector<unsigned char> &Out) : Output(Out) {
+       is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
+       isLittleEndian = TM.getTargetData()->isLittleEndian();
+     }
+ 
+     // align - Emit padding into the file until the current output position is
+     // aligned to the specified power of two boundary.
+     void align(unsigned Boundary) {
+       assert(Boundary && (Boundary & (Boundary - 1)) == 0 &&
+              "Must alitypedef std::vector<unsigned char> DataBuffer;gn to 2^k boundary");
+       size_t Size = Output.size();
+       
+       if (Size & (Boundary - 1)) {
+         // Add padding to get alignment to the correct place.
+         size_t Pad = Boundary - (Size & (Boundary - 1));
+         Output.resize(Size + Pad);
+       }
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Out Functions - Output the specified value to the data buffer.
+ 
+     void outbyte(unsigned char X) {
+       Output.push_back(X);
+     }
+     void outhalf(unsigned short X) {
+       if (isLittleEndian) {
+         Output.push_back(X & 255);
+         Output.push_back(X >> 8);
+       } else {
+         Output.push_back(X >> 8);
+         Output.push_back(X & 255);
+       }
+     }
+     void outword(unsigned X) {
+       if (isLittleEndian) {
+         Output.push_back((X >>  0) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >> 24) & 255);
+       } else {
+         Output.push_back((X >> 24) & 255);
+         Output.push_back((X >> 16) & 255);
+         Output.push_back((X >>  8) & 255);
+         Output.push_back((X >>  0) & 255);
+       }
+     }
+     void outxword(uint64_t X) {
+       if (isLittleEndian) {
+         Output.push_back(unsigned(X >>  0) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 56) & 255);
+       } else {
+         Output.push_back(unsigned(X >> 56) & 255);
+         Output.push_back(unsigned(X >> 48) & 255);
+         Output.push_back(unsigned(X >> 40) & 255);
+         Output.push_back(unsigned(X >> 32) & 255);
+         Output.push_back(unsigned(X >> 24) & 255);
+         Output.push_back(unsigned(X >> 16) & 255);
+         Output.push_back(unsigned(X >>  8) & 255);
+         Output.push_back(unsigned(X >>  0) & 255);
+       }
+     }
+     void outaddr32(unsigned X) {
+       outword(X);
+     }
+     void outaddr64(uint64_t X) {
+       outxword(X);
+     }
+     void outaddr(uint64_t X) {
+       if (!is64Bit)
+         outword((unsigned)X);
+       else
+         outxword(X);
+     }
+     void outstring(std::string &S, unsigned Length) {
+       unsigned len_to_copy = S.length() < Length ? S.length() : Length;
+       unsigned len_to_fill = S.length() < Length ? Length - S.length() : 0;
+       
+       for (unsigned i = 0; i < len_to_copy; ++i)
+         outbyte(S[i]);
+       
+       for (unsigned i = 0; i < len_to_fill; ++i)
+         outbyte(0);
+     }
+ 
+     //===------------------------------------------------------------------===//
+     // Fix Functions - Replace an existing entry at an offset.
+ 
+     void fixhalf(unsigned short X, unsigned Offset) {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
+     }
+     void fixword(unsigned X, unsigned Offset) {
+       unsigned char *P = &Output[Offset];
+       P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
+       P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
+       P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
+       P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
+     }
+     void fixaddr(uint64_t X, unsigned Offset) {
+       if (!is64Bit)
+         fixword((unsigned)X, Offset);
+       else
+         assert(0 && "Emission of 64-bit data not implemented yet!");
+     }
+   };
+   
+ } // end llvm namespace
+ 
+ #endif // LLVM_SUPPORT_OUTPUTBUFFER_H





From isanbard at gmail.com  Wed Jan 17 16:22:49 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 16:22:49 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/ELFWriter.h
	MachOWriter.h
Message-ID: <200701172222.l0HMMnNY015613@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

ELFWriter.h updated: 1.14 -> 1.15
MachOWriter.h updated: 1.13 -> 1.14
---
Log message:

Changed to use the OutputBuffer instead of the methods in MachO and ELF
writers.


---
Diffs of the changes:  (+0 -191)

 ELFWriter.h   |   96 ----------------------------------------------------------
 MachOWriter.h |   95 ---------------------------------------------------------
 2 files changed, 191 deletions(-)


Index: llvm/include/llvm/CodeGen/ELFWriter.h
diff -u llvm/include/llvm/CodeGen/ELFWriter.h:1.14 llvm/include/llvm/CodeGen/ELFWriter.h:1.15
--- llvm/include/llvm/CodeGen/ELFWriter.h:1.14	Wed Jan 17 03:06:13 2007
+++ llvm/include/llvm/CodeGen/ELFWriter.h	Wed Jan 17 16:22:31 2007
@@ -214,102 +214,6 @@
     unsigned ELFHeader_e_shoff_Offset;     // e_shoff    in ELF header.
     unsigned ELFHeader_e_shstrndx_Offset;  // e_shstrndx in ELF header.
     unsigned ELFHeader_e_shnum_Offset;     // e_shnum    in ELF header.
-
-
-    // align - Emit padding into the file until the current output position is
-    // aligned to the specified power of two boundary.
-    static void align(DataBuffer &Output, unsigned Boundary) {
-      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
-             "Must align to 2^k boundary");
-      size_t Size = Output.size();
-      if (Size & (Boundary-1)) {
-        // Add padding to get alignment to the correct place.
-        size_t Pad = Boundary-(Size & (Boundary-1));
-        Output.resize(Size+Pad);
-      }
-    }
-
-    static void outbyte(DataBuffer &Output, unsigned char X) {
-      Output.push_back(X);
-    }
-    void outhalf(DataBuffer &Output, unsigned short X) {
-      if (isLittleEndian) {
-        Output.push_back(X&255);
-        Output.push_back(X >> 8);
-      } else {
-        Output.push_back(X >> 8);
-        Output.push_back(X&255);
-      }
-    }
-    void outword(DataBuffer &Output, unsigned X) {
-      if (isLittleEndian) {
-        Output.push_back((X >>  0) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >> 24) & 255);
-      } else {
-        Output.push_back((X >> 24) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >>  0) & 255);
-      }
-    }
-    void outxword(DataBuffer &Output, uint64_t X) {
-      if (isLittleEndian) {
-        Output.push_back(unsigned(X >>  0) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 56) & 255);
-      } else {
-        Output.push_back(unsigned(X >> 56) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >>  0) & 255);
-      }
-    }
-    void outaddr32(DataBuffer &Output, unsigned X) {
-      outword(Output, X);
-    }
-    void outaddr64(DataBuffer &Output, uint64_t X) {
-      outxword(Output, X);
-    }
-    void outaddr(DataBuffer &Output, uint64_t X) {
-      if (!is64Bit)
-        outword(Output, (unsigned)X);
-      else
-        outxword(Output, X);
-    }
-
-    // fix functions - Replace an existing entry at an offset.
-    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
-    }
-
-    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
-      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
-      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
-    }
-
-    void fixaddr(DataBuffer &Output, uint64_t X, unsigned Offset) {
-      if (!is64Bit)
-        fixword(Output, (unsigned)X, Offset);
-      else
-        assert(0 && "Emission of 64-bit data not implemented yet!");
-    }
-
   private:
     void EmitGlobal(GlobalVariable *GV);
 


Index: llvm/include/llvm/CodeGen/MachOWriter.h
diff -u llvm/include/llvm/CodeGen/MachOWriter.h:1.13 llvm/include/llvm/CodeGen/MachOWriter.h:1.14
--- llvm/include/llvm/CodeGen/MachOWriter.h:1.13	Wed Jan 17 03:06:13 2007
+++ llvm/include/llvm/CodeGen/MachOWriter.h	Wed Jan 17 16:22:31 2007
@@ -659,101 +659,6 @@
     /// SymbolTable to aid in emitting the DYSYMTAB load command.
     std::vector<unsigned> DynamicSymbolTable;
     
-    // align - Emit padding into the file until the current output position is
-    // aligned to the specified power of two boundary.
-    static void align(DataBuffer &Output, unsigned Boundary) {
-      assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
-             "Must align to 2^k boundary");
-      size_t Size = Output.size();
-      if (Size & (Boundary-1)) {
-        // Add padding to get alignment to the correct place.
-        size_t Pad = Boundary-(Size & (Boundary-1));
-        Output.resize(Size+Pad);
-      }
-    }
-
-    void outbyte(DataBuffer &Output, unsigned char X) {
-      Output.push_back(X);
-    }
-    void outhalf(DataBuffer &Output, unsigned short X) {
-      if (isLittleEndian) {
-        Output.push_back(X&255);
-        Output.push_back(X >> 8);
-      } else {
-        Output.push_back(X >> 8);
-        Output.push_back(X&255);
-      }
-    }
-    void outword(DataBuffer &Output, unsigned X) {
-      if (isLittleEndian) {
-        Output.push_back((X >>  0) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >> 24) & 255);
-      } else {
-        Output.push_back((X >> 24) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >>  0) & 255);
-      }
-    }
-    void outxword(DataBuffer &Output, uint64_t X) {
-      if (isLittleEndian) {
-        Output.push_back(unsigned(X >>  0) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 56) & 255);
-      } else {
-        Output.push_back(unsigned(X >> 56) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >>  0) & 255);
-      }
-    }
-    void outaddr32(DataBuffer &Output, unsigned X) {
-      outword(Output, X);
-    }
-    void outaddr64(DataBuffer &Output, uint64_t X) {
-      outxword(Output, X);
-    }
-    void outaddr(DataBuffer &Output, uint64_t X) {
-      if (!is64Bit)
-        outword(Output, (unsigned)X);
-      else
-        outxword(Output, X);
-    }
-    void outstring(DataBuffer &Output, std::string &S, unsigned Length) {
-      unsigned len_to_copy = S.length() < Length ? S.length() : Length;
-      unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0;
-      
-      for (unsigned i = 0; i < len_to_copy; ++i)
-        outbyte(Output, S[i]);
-
-      for (unsigned i = 0; i < len_to_fill; ++i)
-        outbyte(Output, 0);
-      
-    }
-    void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
-    }
-    void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
-      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
-      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
-    }
-    
     static void InitMem(const Constant *C, void *Addr, intptr_t Offset,
                         const TargetData *TD, 
                         std::vector<MachineRelocation> &MRs);





From isanbard at gmail.com  Wed Jan 17 16:22:50 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 16:22:50 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/ELFWriter.cpp MachOWriter.cpp
Message-ID: <200701172222.l0HMMooT015624@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

ELFWriter.cpp updated: 1.32 -> 1.33
MachOWriter.cpp updated: 1.14 -> 1.15
---
Log message:

Changed to use the OutputBuffer instead of the methods in MachO and ELF
writers.


---
Diffs of the changes:  (+148 -126)

 ELFWriter.cpp   |  112 ++++++++++++++++++++------------------
 MachOWriter.cpp |  162 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 148 insertions(+), 126 deletions(-)


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.32 llvm/lib/CodeGen/ELFWriter.cpp:1.33
--- llvm/lib/CodeGen/ELFWriter.cpp:1.32	Wed Jan 17 03:06:13 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Wed Jan 17 16:22:31 2007
@@ -38,6 +38,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Mangler.h"
+#include "llvm/Support/OutputBuffer.h"
 #include "llvm/Support/Streams.h"
 using namespace llvm;
 
@@ -50,11 +51,12 @@
   /// functions to the ELF file.
   class ELFCodeEmitter : public MachineCodeEmitter {
     ELFWriter &EW;
+    TargetMachine &TM;
     ELFWriter::ELFSection *ES;  // Section to write to.
     std::vector<unsigned char> *OutBuffer;
     size_t FnStart;
   public:
-    ELFCodeEmitter(ELFWriter &ew) : EW(ew), OutBuffer(0) {}
+    ELFCodeEmitter(ELFWriter &ew) : EW(ew), TM(EW.TM), OutBuffer(0) {}
 
     void startFunction(MachineFunction &F);
     bool finishFunction(MachineFunction &F);
@@ -103,8 +105,8 @@
                       ELFWriter::ELFSection::SHF_EXECINSTR |
                       ELFWriter::ELFSection::SHF_ALLOC);
   OutBuffer = &ES->SectionData;
-  cerr << "FIXME: This code needs to be updated for changes in the"
-       << " CodeEmitter interfaces.  In particular, this should set "
+  cerr << "FIXME: This code needs to be updated for changes in the "
+       << "CodeEmitter interfaces.  In particular, this should set "
        << "BufferBegin/BufferEnd/CurBufferPtr, not deal with OutBuffer!";
   abort();
 
@@ -113,8 +115,8 @@
 
   // Add padding zeros to the end of the buffer to make sure that the
   // function will start on the correct byte alignment within the section.
-  ELFWriter::align(*OutBuffer, Align);
-
+  OutputBuffer OB(TM, *OutBuffer);
+  OB.align(Align);
   FnStart = OutBuffer->size();
 }
 
@@ -145,7 +147,7 @@
 
   FnSym.SetType(ELFWriter::ELFSym::STT_FUNC);
   FnSym.SectionIdx = ES->SectionIdx;
-    FnSym.Value = FnStart;   // Value = Offset from start of Section.
+  FnSym.Value = FnStart;   // Value = Offset from start of Section.
   FnSym.Size = OutBuffer->size()-FnStart;
 
   // Finally, add it to the symtab.
@@ -180,37 +182,38 @@
 
   // Local alias to shortenify coming code.
   std::vector<unsigned char> &FH = FileHeader;
+  OutputBuffer FHOut(TM, FH);
 
-  outbyte(FH, 0x7F);                     // EI_MAG0
-  outbyte(FH, 'E');                      // EI_MAG1
-  outbyte(FH, 'L');                      // EI_MAG2
-  outbyte(FH, 'F');                      // EI_MAG3
-  outbyte(FH, is64Bit ? 2 : 1);          // EI_CLASS
-  outbyte(FH, isLittleEndian ? 1 : 2);   // EI_DATA
-  outbyte(FH, 1);                        // EI_VERSION
+  FHOut.outbyte(0x7F);                     // EI_MAG0
+  FHOut.outbyte('E');                      // EI_MAG1
+  FHOut.outbyte('L');                      // EI_MAG2
+  FHOut.outbyte('F');                      // EI_MAG3
+  FHOut.outbyte(is64Bit ? 2 : 1);          // EI_CLASS
+  FHOut.outbyte(isLittleEndian ? 1 : 2);   // EI_DATA
+  FHOut.outbyte(1);                        // EI_VERSION
   FH.resize(16);                         // EI_PAD up to 16 bytes.
 
   // This should change for shared objects.
-  outhalf(FH, 1);                 // e_type = ET_REL
-  outhalf(FH, e_machine);         // e_machine = whatever the target wants
-  outword(FH, 1);                 // e_version = 1
-  outaddr(FH, 0);                 // e_entry = 0 -> no entry point in .o file
-  outaddr(FH, 0);                 // e_phoff = 0 -> no program header for .o
+  FHOut.outhalf(1);                 // e_type = ET_REL
+  FHOut.outhalf(e_machine);         // e_machine = whatever the target wants
+  FHOut.outword(1);                 // e_version = 1
+  FHOut.outaddr(0);                 // e_entry = 0 -> no entry point in .o file
+  FHOut.outaddr(0);                 // e_phoff = 0 -> no program header for .o
 
   ELFHeader_e_shoff_Offset = FH.size();
-  outaddr(FH, 0);                 // e_shoff
-  outword(FH, e_flags);           // e_flags = whatever the target wants
+  FHOut.outaddr(0);                 // e_shoff
+  FHOut.outword(e_flags);           // e_flags = whatever the target wants
 
-  outhalf(FH, is64Bit ? 64 : 52); // e_ehsize = ELF header size
-  outhalf(FH, 0);                 // e_phentsize = prog header entry size
-  outhalf(FH, 0);                 // e_phnum     = # prog header entries = 0
-  outhalf(FH, is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
+  FHOut.outhalf(is64Bit ? 64 : 52); // e_ehsize = ELF header size
+  FHOut.outhalf(0);                 // e_phentsize = prog header entry size
+  FHOut.outhalf(0);                 // e_phnum     = # prog header entries = 0
+  FHOut.outhalf(is64Bit ? 64 : 40); // e_shentsize = sect hdr entry size
 
 
   ELFHeader_e_shnum_Offset = FH.size();
-  outhalf(FH, 0);                 // e_shnum     = # of section header ents
+  FHOut.outhalf(0);                 // e_shnum     = # of section header ents
   ELFHeader_e_shstrndx_Offset = FH.size();
-  outhalf(FH, 0);                 // e_shstrndx  = Section # of '.shstrtab'
+  FHOut.outhalf(0);                 // e_shstrndx  = Section # of '.shstrtab'
 
   // Add the null section, which is required to be first in the file.
   getSection("", 0, 0);
@@ -350,9 +353,10 @@
   StrTab.Align = 1;
 
   DataBuffer &StrTabBuf = StrTab.SectionData;
+  OutputBuffer StrTabOut(TM, StrTabBuf);
 
   // Set the zero'th symbol to a null byte, as required.
-  outbyte(StrTabBuf, 0);
+  StrTabOut.outbyte(0);
   SymbolTable[0].NameIdx = 0;
   unsigned Index = 1;
   for (unsigned i = 1, e = SymbolTable.size(); i != e; ++i) {
@@ -385,26 +389,27 @@
   SymTab.Info = FirstNonLocalSymbol;   // First non-STB_LOCAL symbol.
   SymTab.EntSize = 16; // Size of each symtab entry. FIXME: wrong for ELF64
   DataBuffer &SymTabBuf = SymTab.SectionData;
+  OutputBuffer SymTabOut(TM, SymTabBuf);
 
   if (!is64Bit) {   // 32-bit and 64-bit formats are shuffled a bit.
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      outword(SymTabBuf, Sym.NameIdx);
-      outaddr32(SymTabBuf, Sym.Value);
-      outword(SymTabBuf, Sym.Size);
-      outbyte(SymTabBuf, Sym.Info);
-      outbyte(SymTabBuf, Sym.Other);
-      outhalf(SymTabBuf, Sym.SectionIdx);
+      SymTabOut.outword(Sym.NameIdx);
+      SymTabOut.outaddr32(Sym.Value);
+      SymTabOut.outword(Sym.Size);
+      SymTabOut.outbyte(Sym.Info);
+      SymTabOut.outbyte(Sym.Other);
+      SymTabOut.outhalf(Sym.SectionIdx);
     }
   } else {
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
       ELFSym &Sym = SymbolTable[i];
-      outword(SymTabBuf, Sym.NameIdx);
-      outbyte(SymTabBuf, Sym.Info);
-      outbyte(SymTabBuf, Sym.Other);
-      outhalf(SymTabBuf, Sym.SectionIdx);
-      outaddr64(SymTabBuf, Sym.Value);
-      outxword(SymTabBuf, Sym.Size);
+      SymTabOut.outword(Sym.NameIdx);
+      SymTabOut.outbyte(Sym.Info);
+      SymTabOut.outbyte(Sym.Other);
+      SymTabOut.outhalf(Sym.SectionIdx);
+      SymTabOut.outaddr64(Sym.Value);
+      SymTabOut.outxword(Sym.Size);
     }
   }
 
@@ -420,7 +425,8 @@
 
   // Now that we know which section number is the .shstrtab section, update the
   // e_shstrndx entry in the ELF header.
-  fixhalf(FileHeader, SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
+  OutputBuffer FHOut(TM, FileHeader);
+  FHOut.fixhalf(SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
 
   // Set the NameIdx of each section in the string table and emit the bytes for
   // the string table.
@@ -471,11 +477,12 @@
 
   // Now that we know where all of the sections will be emitted, set the e_shnum
   // entry in the ELF header.
-  fixhalf(FileHeader, NumSections, ELFHeader_e_shnum_Offset);
+  OutputBuffer FHOut(TM, FileHeader);
+  FHOut.fixhalf(NumSections, ELFHeader_e_shnum_Offset);
 
   // Now that we know the offset in the file of the section table, update the
   // e_shoff address in the ELF header.
-  fixaddr(FileHeader, FileOff, ELFHeader_e_shoff_Offset);
+  FHOut.fixaddr(FileOff, ELFHeader_e_shoff_Offset);
 
   // Now that we know all of the data in the file header, emit it and all of the
   // sections!
@@ -484,6 +491,7 @@
   DataBuffer().swap(FileHeader);
 
   DataBuffer Table;
+  OutputBuffer TableOut(TM, Table);
 
   // Emit all of the section data and build the section table itself.
   while (!SectionList.empty()) {
@@ -497,16 +505,16 @@
     O.write((char*)&S.SectionData[0], S.SectionData.size());
     FileOff += S.SectionData.size();
 
-    outword(Table, S.NameIdx);  // sh_name - Symbol table name idx
-    outword(Table, S.Type);     // sh_type - Section contents & semantics
-    outword(Table, S.Flags);    // sh_flags - Section flags.
-    outaddr(Table, S.Addr);     // sh_addr - The mem addr this section is in.
-    outaddr(Table, S.Offset);   // sh_offset - Offset from the file start.
-    outword(Table, S.Size);     // sh_size - The section size.
-    outword(Table, S.Link);     // sh_link - Section header table index link.
-    outword(Table, S.Info);     // sh_info - Auxillary information.
-    outword(Table, S.Align);    // sh_addralign - Alignment of section.
-    outword(Table, S.EntSize);  // sh_entsize - Size of entries in the section.
+    TableOut.outword(S.NameIdx);  // sh_name - Symbol table name idx
+    TableOut.outword(S.Type);     // sh_type - Section contents & semantics
+    TableOut.outword(S.Flags);    // sh_flags - Section flags.
+    TableOut.outaddr(S.Addr);     // sh_addr - The mem addr this section is in.
+    TableOut.outaddr(S.Offset);   // sh_offset - Offset from the file start.
+    TableOut.outword(S.Size);     // sh_size - The section size.
+    TableOut.outword(S.Link);     // sh_link - Section header table index link.
+    TableOut.outword(S.Info);     // sh_info - Auxillary information.
+    TableOut.outword(S.Align);    // sh_addralign - Alignment of section.
+    TableOut.outword(S.EntSize);  // sh_entsize - Size of entries in the section
 
     SectionList.pop_front();
   }


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.14 llvm/lib/CodeGen/MachOWriter.cpp:1.15
--- llvm/lib/CodeGen/MachOWriter.cpp:1.14	Wed Jan 17 03:06:13 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Wed Jan 17 16:22:31 2007
@@ -34,6 +34,7 @@
 #include "llvm/Target/TargetJITInfo.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
+#include "llvm/Support/OutputBuffer.h"
 #include "llvm/Support/Streams.h"
 #include <algorithm>
 
@@ -49,6 +50,9 @@
   class MachOCodeEmitter : public MachineCodeEmitter {
     MachOWriter &MOW;
 
+    /// Target machine description.
+    TargetMachine &TM;
+
     /// Relocations - These are the relocations that the function needs, as
     /// emitted.
     std::vector<MachineRelocation> Relocations;
@@ -71,7 +75,7 @@
     std::vector<intptr_t> MBBLocations;
     
   public:
-    MachOCodeEmitter(MachOWriter &mow) : MOW(mow) {}
+    MachOCodeEmitter(MachOWriter &mow) : MOW(mow), TM(MOW.TM) {}
 
     virtual void startFunction(MachineFunction &F);
     virtual bool finishFunction(MachineFunction &F);
@@ -163,7 +167,7 @@
   
   // Get a symbol for the function to add to the symbol table
   const GlobalValue *FuncV = F.getFunction();
-  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, MOW.TM);
+  MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, TM);
 
   // Emit constant pool to appropriate section(s)
   emitConstantPool(F.getConstantPool());
@@ -211,7 +215,7 @@
   if (CP.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   // Although there is no strict necessity that I am aware of, we will do what
@@ -223,9 +227,11 @@
   // "giant object for PIC" optimization.
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     const Type *Ty = CP[i].getType();
-    unsigned Size = MOW.TM.getTargetData()->getTypeSize(Ty);
+    unsigned Size = TM.getTargetData()->getTypeSize(Ty);
 
     MachOWriter::MachOSection *Sec = MOW.getConstSection(Ty);
+    OutputBuffer SecDataOut(TM, Sec->SectionData);
+
     CPLocations.push_back(Sec->SectionData.size());
     CPSections.push_back(Sec->Index);
     
@@ -236,10 +242,10 @@
     // FIXME: need alignment?
     // FIXME: share between here and AddSymbolToSection?
     for (unsigned j = 0; j < Size; ++j)
-      MOW.outbyte(Sec->SectionData, 0);
+      SecDataOut.outbyte(0);
 
     MOW.InitMem(CP[i].Val.ConstVal, &Sec->SectionData[0], CPLocations[i],
-                MOW.TM.getTargetData(), Sec->Relocations);
+                TM.getTargetData(), Sec->Relocations);
   }
 }
 
@@ -250,11 +256,12 @@
   if (JT.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = MOW.TM.getRelocationModel() == Reloc::PIC_;
+  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
   assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
 
   MachOWriter::MachOSection *Sec = MOW.getJumpTableSection();
   unsigned TextSecIndex = MOW.getTextSection()->Index;
+  OutputBuffer SecDataOut(TM, Sec->SectionData);
 
   for (unsigned i = 0, e = JT.size(); i != e; ++i) {
     // For each jump table, record its offset from the start of the section,
@@ -267,7 +274,7 @@
       MR.setResultPointer((void *)JTLocations[i]);
       MR.setConstantVal(TextSecIndex);
       Sec->Relocations.push_back(MR);
-      MOW.outaddr(Sec->SectionData, 0);
+      SecDataOut.outaddr(0);
     }
   }
   // FIXME: remove when we have unified size + output buffer
@@ -302,6 +309,8 @@
   // Reserve space in the .bss section for this symbol while maintaining the
   // desired section alignment, which must be at least as much as required by
   // this symbol.
+  OutputBuffer SecDataOut(TM, Sec->SectionData);
+
   if (Align) {
     uint64_t OrigSize = Sec->size;
     Align = Log2_32(Align);
@@ -312,7 +321,7 @@
     // FIXME: remove when we have unified size + output buffer
     unsigned AlignedSize = Sec->size - OrigSize;
     for (unsigned i = 0; i < AlignedSize; ++i)
-      outbyte(Sec->SectionData, 0);
+      SecDataOut.outbyte(0);
   }
   // Record the offset of the symbol, and then allocate space for it.
   // FIXME: remove when we have unified size + output buffer
@@ -329,7 +338,7 @@
   
   // Allocate space in the section for the global.
   for (unsigned i = 0; i < Size; ++i)
-    outbyte(Sec->SectionData, 0);
+    SecDataOut.outbyte(0);
 }
 
 void MachOWriter::EmitGlobal(GlobalVariable *GV) {
@@ -442,15 +451,17 @@
   // Step #3: write the header to the file
   // Local alias to shortenify coming code.
   DataBuffer &FH = Header.HeaderData;
-  outword(FH, Header.magic);
-  outword(FH, Header.cputype);
-  outword(FH, Header.cpusubtype);
-  outword(FH, Header.filetype);
-  outword(FH, Header.ncmds);
-  outword(FH, Header.sizeofcmds);
-  outword(FH, Header.flags);
+  OutputBuffer FHOut(TM, FH);
+
+  FHOut.outword(Header.magic);
+  FHOut.outword(Header.cputype);
+  FHOut.outword(Header.cpusubtype);
+  FHOut.outword(Header.filetype);
+  FHOut.outword(Header.ncmds);
+  FHOut.outword(Header.sizeofcmds);
+  FHOut.outword(Header.flags);
   if (is64Bit)
-    outword(FH, Header.reserved);
+    FHOut.outword(Header.reserved);
   
   // Step #4: Finish filling in the segment load command and write it out
   for (std::vector<MachOSection*>::iterator I = SectionList.begin(),
@@ -460,17 +471,17 @@
   SEG.vmsize = SEG.filesize;
   SEG.fileoff = Header.cmdSize(is64Bit) + Header.sizeofcmds;
   
-  outword(FH, SEG.cmd);
-  outword(FH, SEG.cmdsize);
-  outstring(FH, SEG.segname, 16);
-  outaddr(FH, SEG.vmaddr);
-  outaddr(FH, SEG.vmsize);
-  outaddr(FH, SEG.fileoff);
-  outaddr(FH, SEG.filesize);
-  outword(FH, SEG.maxprot);
-  outword(FH, SEG.initprot);
-  outword(FH, SEG.nsects);
-  outword(FH, SEG.flags);
+  FHOut.outword(SEG.cmd);
+  FHOut.outword(SEG.cmdsize);
+  FHOut.outstring(SEG.segname, 16);
+  FHOut.outaddr(SEG.vmaddr);
+  FHOut.outaddr(SEG.vmsize);
+  FHOut.outaddr(SEG.fileoff);
+  FHOut.outaddr(SEG.filesize);
+  FHOut.outword(SEG.maxprot);
+  FHOut.outword(SEG.initprot);
+  FHOut.outword(SEG.nsects);
+  FHOut.outword(SEG.flags);
   
   // Step #5: Finish filling in the fields of the MachOSections 
   uint64_t currentAddr = 0;
@@ -497,19 +508,19 @@
     currentAddr += MOS->nreloc * 8;
     
     // write the finalized section command to the output buffer
-    outstring(FH, MOS->sectname, 16);
-    outstring(FH, MOS->segname, 16);
-    outaddr(FH, MOS->addr);
-    outaddr(FH, MOS->size);
-    outword(FH, MOS->offset);
-    outword(FH, MOS->align);
-    outword(FH, MOS->reloff);
-    outword(FH, MOS->nreloc);
-    outword(FH, MOS->flags);
-    outword(FH, MOS->reserved1);
-    outword(FH, MOS->reserved2);
+    FHOut.outstring(MOS->sectname, 16);
+    FHOut.outstring(MOS->segname, 16);
+    FHOut.outaddr(MOS->addr);
+    FHOut.outaddr(MOS->size);
+    FHOut.outword(MOS->offset);
+    FHOut.outword(MOS->align);
+    FHOut.outword(MOS->reloff);
+    FHOut.outword(MOS->nreloc);
+    FHOut.outword(MOS->flags);
+    FHOut.outword(MOS->reserved1);
+    FHOut.outword(MOS->reserved2);
     if (is64Bit)
-      outword(FH, MOS->reserved3);
+      FHOut.outword(MOS->reserved3);
   }
   
   // Step #7: Emit the symbol table to temporary buffers, so that we know the
@@ -521,36 +532,36 @@
   SymTab.nsyms   = SymbolTable.size();
   SymTab.stroff  = SymTab.symoff + SymT.size();
   SymTab.strsize = StrT.size();
-  outword(FH, SymTab.cmd);
-  outword(FH, SymTab.cmdsize);
-  outword(FH, SymTab.symoff);
-  outword(FH, SymTab.nsyms);
-  outword(FH, SymTab.stroff);
-  outword(FH, SymTab.strsize);
+  FHOut.outword(SymTab.cmd);
+  FHOut.outword(SymTab.cmdsize);
+  FHOut.outword(SymTab.symoff);
+  FHOut.outword(SymTab.nsyms);
+  FHOut.outword(SymTab.stroff);
+  FHOut.outword(SymTab.strsize);
 
   // FIXME: set DySymTab fields appropriately
   // We should probably just update these in BufferSymbolAndStringTable since
   // thats where we're partitioning up the different kinds of symbols.
-  outword(FH, DySymTab.cmd);
-  outword(FH, DySymTab.cmdsize);
-  outword(FH, DySymTab.ilocalsym);
-  outword(FH, DySymTab.nlocalsym);
-  outword(FH, DySymTab.iextdefsym);
-  outword(FH, DySymTab.nextdefsym);
-  outword(FH, DySymTab.iundefsym);
-  outword(FH, DySymTab.nundefsym);
-  outword(FH, DySymTab.tocoff);
-  outword(FH, DySymTab.ntoc);
-  outword(FH, DySymTab.modtaboff);
-  outword(FH, DySymTab.nmodtab);
-  outword(FH, DySymTab.extrefsymoff);
-  outword(FH, DySymTab.nextrefsyms);
-  outword(FH, DySymTab.indirectsymoff);
-  outword(FH, DySymTab.nindirectsyms);
-  outword(FH, DySymTab.extreloff);
-  outword(FH, DySymTab.nextrel);
-  outword(FH, DySymTab.locreloff);
-  outword(FH, DySymTab.nlocrel);
+  FHOut.outword(DySymTab.cmd);
+  FHOut.outword(DySymTab.cmdsize);
+  FHOut.outword(DySymTab.ilocalsym);
+  FHOut.outword(DySymTab.nlocalsym);
+  FHOut.outword(DySymTab.iextdefsym);
+  FHOut.outword(DySymTab.nextdefsym);
+  FHOut.outword(DySymTab.iundefsym);
+  FHOut.outword(DySymTab.nundefsym);
+  FHOut.outword(DySymTab.tocoff);
+  FHOut.outword(DySymTab.ntoc);
+  FHOut.outword(DySymTab.modtaboff);
+  FHOut.outword(DySymTab.nmodtab);
+  FHOut.outword(DySymTab.extrefsymoff);
+  FHOut.outword(DySymTab.nextrefsyms);
+  FHOut.outword(DySymTab.indirectsymoff);
+  FHOut.outword(DySymTab.nindirectsyms);
+  FHOut.outword(DySymTab.extreloff);
+  FHOut.outword(DySymTab.nextrel);
+  FHOut.outword(DySymTab.locreloff);
+  FHOut.outword(DySymTab.nlocrel);
   
   O.write((char*)&FH[0], FH.size());
 }
@@ -627,7 +638,8 @@
   
   // Write out a leading zero byte when emitting string table, for n_strx == 0
   // which means an empty string.
-  outbyte(StrT, 0);
+  OutputBuffer StrTOut(TM, StrT);
+  StrTOut.outbyte(0);
 
   // The order of the string table is:
   // 1. strings for external symbols
@@ -640,10 +652,12 @@
       I->n_strx = 0;
     } else {
       I->n_strx = StrT.size();
-      outstring(StrT, I->GVName, I->GVName.length()+1);
+      StrTOut.outstring(I->GVName, I->GVName.length()+1);
     }
   }
 
+  OutputBuffer SymTOut(TM, SymT);
+
   for (std::vector<MachOSym>::iterator I = SymbolTable.begin(),
          E = SymbolTable.end(); I != E; ++I) {
     // Add the section base address to the section offset in the n_value field
@@ -654,11 +668,11 @@
       I->n_value += GVSection[GV]->addr;
          
     // Emit nlist to buffer
-    outword(SymT, I->n_strx);
-    outbyte(SymT, I->n_type);
-    outbyte(SymT, I->n_sect);
-    outhalf(SymT, I->n_desc);
-    outaddr(SymT, I->n_value);
+    SymTOut.outword(I->n_strx);
+    SymTOut.outbyte(I->n_type);
+    SymTOut.outbyte(I->n_sect);
+    SymTOut.outhalf(I->n_desc);
+    SymTOut.outaddr(I->n_value);
   }
 }
 





From isanbard at gmail.com  Wed Jan 17 16:22:50 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 16:22:50 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
Message-ID: <200701172222.l0HMMoIP015629@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCMachOWriter.cpp updated: 1.11 -> 1.12
---
Log message:

Changed to use the OutputBuffer instead of the methods in MachO and ELF
writers.


---
Diffs of the changes:  (+52 -31)

 PPCMachOWriter.cpp |   83 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 31 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
diff -u llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.11 llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.12
--- llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.11	Wed Jan 17 03:06:13 2007
+++ llvm/lib/Target/PowerPC/PPCMachOWriter.cpp	Wed Jan 17 16:22:31 2007
@@ -17,6 +17,7 @@
 #include "llvm/PassManager.h"
 #include "llvm/CodeGen/MachOWriter.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/OutputBuffer.h"
 using namespace llvm;
 
 namespace {
@@ -91,24 +92,36 @@
       MachORelocation VANILLA(MR.getMachineCodeOffset(), To.Index, false, 2, 
                               isExtern, PPC_RELOC_VANILLA);
       ++From.nreloc;
-      outword(From.RelocBuffer, VANILLA.r_address);
-      outword(From.RelocBuffer, VANILLA.getPackedFields());
+
+      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      RelocOut.outword(VANILLA.r_address);
+      RelocOut.outword(VANILLA.getPackedFields());
+
+      OutputBuffer SecOut(TM, From.SectionData);
+      SecOut.fixword(Addr, MR.getMachineCodeOffset());
+      break;
     }
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
-    break;
   case PPC::reloc_pcrel_bx:
-    Addr -= MR.getMachineCodeOffset();
-    Addr >>= 2;
-    Addr &= 0xFFFFFF;
-    Addr <<= 2;
-    Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
-    break;
+    {
+      Addr -= MR.getMachineCodeOffset();
+      Addr >>= 2;
+      Addr &= 0xFFFFFF;
+      Addr <<= 2;
+      Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
+
+      OutputBuffer SecOut(TM, From.SectionData);
+      SecOut.fixword(Addr, MR.getMachineCodeOffset());
+      break;
+    }
   case PPC::reloc_pcrel_bcx:
-    Addr -= MR.getMachineCodeOffset();
-    Addr &= 0xFFFC;
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
-    break;
+    {
+      Addr -= MR.getMachineCodeOffset();
+      Addr &= 0xFFFC;
+
+      OutputBuffer SecOut(TM, From.SectionData);
+      SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
+      break;
+    }
   case PPC::reloc_absolute_high:
     {
       MachORelocation HA16(MR.getMachineCodeOffset(), To.Index, false, 2,
@@ -117,15 +130,19 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, HA16.r_address);
-      outword(From.RelocBuffer, HA16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
-    }
-    printf("ha16: %x\n", (unsigned)Addr);
-    Addr += 0x8000;
-    fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
-    break;
+
+      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      RelocOut.outword(HA16.r_address);
+      RelocOut.outword(HA16.getPackedFields());
+      RelocOut.outword(PAIR.r_address);
+      RelocOut.outword(PAIR.getPackedFields());
+      printf("ha16: %x\n", (unsigned)Addr);
+      Addr += 0x8000;
+
+      OutputBuffer SecOut(TM, From.SectionData);
+      SecOut.fixhalf(Addr >> 16, MR.getMachineCodeOffset() + 2);
+      break;
+    }
   case PPC::reloc_absolute_low:
     {
       MachORelocation LO16(MR.getMachineCodeOffset(), To.Index, false, 2,
@@ -134,14 +151,18 @@
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, LO16.r_address);
-      outword(From.RelocBuffer, LO16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
+
+      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      RelocOut.outword(LO16.r_address);
+      RelocOut.outword(LO16.getPackedFields());
+      RelocOut.outword(PAIR.r_address);
+      RelocOut.outword(PAIR.getPackedFields());
+      printf("lo16: %x\n", (unsigned)Addr);
+
+      OutputBuffer SecOut(TM, From.SectionData);
+      SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
+      break;
     }
-    printf("lo16: %x\n", (unsigned)Addr);
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
-    break;
   }
 }
 





From reid at x10sys.com  Wed Jan 17 17:20:58 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 17:20:58 -0600
Subject: [llvm-commits] CVS:
	llvm/test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll
Message-ID: <200701172320.l0HNKwf0016760@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/CBackend:

2007-01-17-StackSaveNRestore.ll added (r1.1)
---
Log message:

For PR1028: http://llvm.org/PR1028 :
Ensure the CBE generates calls to GCC builtins for stack_save and 
stack_restore when it encounters the corresponding intrinsics.

Patch by Gordon Henriksen.


---
Diffs of the changes:  (+12 -0)

 2007-01-17-StackSaveNRestore.ll |   12 ++++++++++++
 1 files changed, 12 insertions(+)


Index: llvm/test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll
diff -c /dev/null llvm/test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll:1.1
*** /dev/null	Wed Jan 17 17:20:53 2007
--- llvm/test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll	Wed Jan 17 17:20:43 2007
***************
*** 0 ****
--- 1,12 ----
+ ; RUN: llvm-as < %s | llc -march=c | grep __builtin_stack_save
+ ; RUN: llvm-as < %s | llc -march=c | grep __builtin_stack_restore
+ ; PR1028
+ 
+ declare i8* %llvm.stacksave()
+ declare void %llvm.stackrestore(i8*)
+ 
+ define i8* %test() {
+     %s = call i8* %llvm.stacksave()
+     call void %llvm.stackrestore(i8* %s)
+     ret i8* %s
+ }





From reid at x10sys.com  Wed Jan 17 17:33:36 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 17:33:36 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Intrinsics.td
Message-ID: <200701172333.l0HNXapK016997@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Intrinsics.td updated: 1.40 -> 1.41
---
Log message:

For PR1028: http://llvm.org/PR1028 :
Add the llvm.stacksave and llvm.stackrestore intrinsics that correspond
to the GCC builtins __builtin_stack_save and __builtin_stack_restore. This
allows the CBE to execute these builtins, and fixes:

   test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll
   External/SPEC/CINT2000/176.gcc (CBE)

Patch by Gordon Henriksen.


---
Diffs of the changes:  (+4 -2)

 Intrinsics.td |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Intrinsics.td
diff -u llvm/include/llvm/Intrinsics.td:1.40 llvm/include/llvm/Intrinsics.td:1.41
--- llvm/include/llvm/Intrinsics.td:1.40	Fri Jan 12 01:05:13 2007
+++ llvm/include/llvm/Intrinsics.td	Wed Jan 17 17:33:20 2007
@@ -138,8 +138,10 @@
 //  
 def int_returnaddress : Intrinsic<[llvm_ptr_ty, llvm_i32_ty], [IntrNoMem]>;
 def int_frameaddress  : Intrinsic<[llvm_ptr_ty, llvm_i32_ty], [IntrNoMem]>;
-def int_stacksave     : Intrinsic<[llvm_ptr_ty], [IntrReadMem]>;
-def int_stackrestore  : Intrinsic<[llvm_void_ty, llvm_ptr_ty]>;
+def int_stacksave     : Intrinsic<[llvm_ptr_ty], [IntrReadMem]>,
+                        GCCBuiltin<"__builtin_stack_save">;
+def int_stackrestore  : Intrinsic<[llvm_void_ty, llvm_ptr_ty]>,
+                        GCCBuiltin<"__builtin_stack_restore">;
 def int_prefetch      : Intrinsic<[llvm_void_ty, llvm_ptr_ty, 
                                    llvm_i32_ty, llvm_i32_ty]>;
 def int_pcmarker      : Intrinsic<[llvm_void_ty, llvm_i32_ty]>;





From sabre at nondot.org  Wed Jan 17 19:13:14 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 19:13:14 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp
Message-ID: <200701180113.l0I1DEcS019156@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.136 -> 1.137
---
Log message:

add new JumpTableSpecialLabelPrefix hook to asmprinter for jumptable emission.


---
Diffs of the changes:  (+9 -1)

 AsmPrinter.cpp |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.136 llvm/lib/CodeGen/AsmPrinter.cpp:1.137
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.136	Mon Jan 15 21:42:04 2007
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Wed Jan 17 19:12:56 2007
@@ -244,6 +244,13 @@
         if (EmittedSets.insert(JTBBs[ii]).second)
           printSetLabel(i, JTBBs[ii]);
     
+    // On some targets (e.g. darwin) we want to emit two consequtive labels
+    // before each jump table.  The first label is never referenced, but tells
+    // the assembler and linker the extents of the jump table object.  The
+    // second label is actually referenced by the code.
+    if (const char *JTLabelPrefix = TAI->getJumpTableSpecialLabelPrefix())
+      O << JTLabelPrefix << "JTI" << getFunctionNumber() << '_' << i << ":\n";
+    
     O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() 
       << '_' << i << ":\n";
     
@@ -259,7 +266,8 @@
           << '_' << i << "_set_" << JTBBs[ii]->getNumber();
       } else if (IsPic) {
         printBasicBlockLabel(JTBBs[ii], false, false);
-        //If the arch uses custom Jump Table directives, don't calc relative to JT
+        // If the arch uses custom Jump Table directives, don't calc relative to
+        // JT
         if (!HadJTEntryDirective) 
           O << '-' << TAI->getPrivateGlobalPrefix() << "JTI"
             << getFunctionNumber() << '_' << i;





From sabre at nondot.org  Wed Jan 17 19:13:16 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 19:13:16 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetAsmInfo.h
Message-ID: <200701180113.l0I1DGlA019161@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetAsmInfo.h updated: 1.22 -> 1.23
---
Log message:

add new JumpTableSpecialLabelPrefix hook to asmprinter for jumptable emission.


---
Diffs of the changes:  (+7 -0)

 TargetAsmInfo.h |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/include/llvm/Target/TargetAsmInfo.h
diff -u llvm/include/llvm/Target/TargetAsmInfo.h:1.22 llvm/include/llvm/Target/TargetAsmInfo.h:1.23
--- llvm/include/llvm/Target/TargetAsmInfo.h:1.22	Wed Jan 17 11:42:30 2007
+++ llvm/include/llvm/Target/TargetAsmInfo.h	Wed Jan 17 19:12:56 2007
@@ -78,6 +78,10 @@
     /// have names in the .o file.  This is often "." or "L".
     const char *PrivateGlobalPrefix;      // Defaults to "."
     
+    /// JumpTableSpecialLabelPrefix - If not null, a extra (dead) label is
+    /// emitted before jump tables with the specified prefix.
+    const char *JumpTableSpecialLabelPrefix;  // Default to null.
+    
     /// GlobalVarAddrPrefix/Suffix - If these are nonempty, these strings
     /// will enclose any GlobalVariable (that isn't a function)
     ///
@@ -343,6 +347,9 @@
     const char *getPrivateGlobalPrefix() const {
       return PrivateGlobalPrefix;
     }
+    const char *getJumpTableSpecialLabelPrefix() const {
+      return JumpTableSpecialLabelPrefix;
+    }
     const char *getGlobalVarAddrPrefix() const {
       return GlobalVarAddrPrefix;
     }





From sabre at nondot.org  Wed Jan 17 19:13:16 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 19:13:16 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetAsmInfo.cpp
Message-ID: <200701180113.l0I1DGPB019164@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetAsmInfo.cpp updated: 1.15 -> 1.16
---
Log message:

add new JumpTableSpecialLabelPrefix hook to asmprinter for jumptable emission.


---
Diffs of the changes:  (+1 -0)

 TargetAsmInfo.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/Target/TargetAsmInfo.cpp
diff -u llvm/lib/Target/TargetAsmInfo.cpp:1.15 llvm/lib/Target/TargetAsmInfo.cpp:1.16
--- llvm/lib/Target/TargetAsmInfo.cpp:1.15	Wed Jan 17 11:42:42 2007
+++ llvm/lib/Target/TargetAsmInfo.cpp	Wed Jan 17 19:12:56 2007
@@ -28,6 +28,7 @@
   CommentString("#"),
   GlobalPrefix(""),
   PrivateGlobalPrefix("."),
+  JumpTableSpecialLabelPrefix(0),
   GlobalVarAddrPrefix(""),
   GlobalVarAddrSuffix(""),
   FunctionAddrPrefix(""),





From sabre at nondot.org  Wed Jan 17 19:16:17 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 19:16:17 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200701180116.l0I1GHTp019273@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetAsmInfo.cpp updated: 1.29 -> 1.30
---
Log message:

Modify emission of jump tables on darwin to emit an extra "l" label that
delimits the boundaries of jump tables.  This lets the linker's dead code
stripping optimization do a better job.


---
Diffs of the changes:  (+7 -0)

 X86TargetAsmInfo.cpp |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.29 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.30
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.29	Wed Jan 17 11:43:33 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Wed Jan 17 19:15:58 2007
@@ -68,6 +68,13 @@
     WeakRefDirective = "\t.weak_reference\t";
     HiddenDirective = "\t.private_extern\t";
     
+    // In non-PIC modes, emit a special label before jump tables so that the
+    // linker can perform more accurate dead code stripping.
+    if (TM.getRelocationModel() != Reloc::PIC_) {
+      // Emit a local label that is preserved until the linker runs.
+      JumpTableSpecialLabelPrefix = "l";
+    }
+    
     NeedsSet = true;
     DwarfAbbrevSection = ".section __DWARF,__debug_abbrev,regular,debug";
     DwarfInfoSection = ".section __DWARF,__debug_info,regular,debug";





From sabre at nondot.org  Wed Jan 17 19:16:17 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Jan 2007 19:16:17 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
Message-ID: <200701180116.l0I1GHCp019278@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCTargetAsmInfo.cpp updated: 1.13 -> 1.14
---
Log message:

Modify emission of jump tables on darwin to emit an extra "l" label that
delimits the boundaries of jump tables.  This lets the linker's dead code
stripping optimization do a better job.


---
Diffs of the changes:  (+7 -0)

 PPCTargetAsmInfo.cpp |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.13 llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.14
--- llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp:1.13	Tue Jan 16 03:29:16 2007
+++ llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp	Wed Jan 17 19:15:58 2007
@@ -57,6 +57,13 @@
   UsedDirective = "\t.no_dead_strip\t";
   WeakRefDirective = "\t.weak_reference\t";
   HiddenDirective = "\t.private_extern\t";
+  
+  // In non-PIC modes, emit a special label before jump tables so that the
+  // linker can perform more accurate dead code stripping.
+  if (TM.getRelocationModel() != Reloc::PIC_) {
+    // Emit a local label that is preserved until the linker runs.
+    JumpTableSpecialLabelPrefix = "l";
+  }
 }
 
 LinuxTargetAsmInfo::LinuxTargetAsmInfo(const PPCTargetMachine &TM)





From isanbard at gmail.com  Wed Jan 17 19:23:30 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 19:23:30 -0600
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/ELFWriter.cpp MachOWriter.cpp
Message-ID: <200701180123.l0I1NUqr019519@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

ELFWriter.cpp updated: 1.33 -> 1.34
MachOWriter.cpp updated: 1.15 -> 1.16
---
Log message:

Have the OutputBuffer take the is64Bit and isLittleEndian booleans.


---
Diffs of the changes:  (+23 -14)

 ELFWriter.cpp   |   16 +++++++++-------
 MachOWriter.cpp |   21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.33 llvm/lib/CodeGen/ELFWriter.cpp:1.34
--- llvm/lib/CodeGen/ELFWriter.cpp:1.33	Wed Jan 17 16:22:31 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Wed Jan 17 19:23:11 2007
@@ -115,7 +115,9 @@
 
   // Add padding zeros to the end of the buffer to make sure that the
   // function will start on the correct byte alignment within the section.
-  OutputBuffer OB(TM, *OutBuffer);
+  OutputBuffer OB(*OutBuffer,
+                  TM.getTargetData()->getPointerSizeInBits() == 64,
+                  TM.getTargetData()->isLittleEndian());
   OB.align(Align);
   FnStart = OutBuffer->size();
 }
@@ -182,7 +184,7 @@
 
   // Local alias to shortenify coming code.
   std::vector<unsigned char> &FH = FileHeader;
-  OutputBuffer FHOut(TM, FH);
+  OutputBuffer FHOut(FH, is64Bit, isLittleEndian);
 
   FHOut.outbyte(0x7F);                     // EI_MAG0
   FHOut.outbyte('E');                      // EI_MAG1
@@ -353,7 +355,7 @@
   StrTab.Align = 1;
 
   DataBuffer &StrTabBuf = StrTab.SectionData;
-  OutputBuffer StrTabOut(TM, StrTabBuf);
+  OutputBuffer StrTabOut(StrTabBuf, is64Bit, isLittleEndian);
 
   // Set the zero'th symbol to a null byte, as required.
   StrTabOut.outbyte(0);
@@ -389,7 +391,7 @@
   SymTab.Info = FirstNonLocalSymbol;   // First non-STB_LOCAL symbol.
   SymTab.EntSize = 16; // Size of each symtab entry. FIXME: wrong for ELF64
   DataBuffer &SymTabBuf = SymTab.SectionData;
-  OutputBuffer SymTabOut(TM, SymTabBuf);
+  OutputBuffer SymTabOut(SymTabBuf, is64Bit, isLittleEndian);
 
   if (!is64Bit) {   // 32-bit and 64-bit formats are shuffled a bit.
     for (unsigned i = 0, e = SymbolTable.size(); i != e; ++i) {
@@ -425,7 +427,7 @@
 
   // Now that we know which section number is the .shstrtab section, update the
   // e_shstrndx entry in the ELF header.
-  OutputBuffer FHOut(TM, FileHeader);
+  OutputBuffer FHOut(FileHeader, is64Bit, isLittleEndian);
   FHOut.fixhalf(SHStrTab.SectionIdx, ELFHeader_e_shstrndx_Offset);
 
   // Set the NameIdx of each section in the string table and emit the bytes for
@@ -477,7 +479,7 @@
 
   // Now that we know where all of the sections will be emitted, set the e_shnum
   // entry in the ELF header.
-  OutputBuffer FHOut(TM, FileHeader);
+  OutputBuffer FHOut(FileHeader, is64Bit, isLittleEndian);
   FHOut.fixhalf(NumSections, ELFHeader_e_shnum_Offset);
 
   // Now that we know the offset in the file of the section table, update the
@@ -491,7 +493,7 @@
   DataBuffer().swap(FileHeader);
 
   DataBuffer Table;
-  OutputBuffer TableOut(TM, Table);
+  OutputBuffer TableOut(Table, is64Bit, isLittleEndian);
 
   // Emit all of the section data and build the section table itself.
   while (!SectionList.empty()) {


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.15 llvm/lib/CodeGen/MachOWriter.cpp:1.16
--- llvm/lib/CodeGen/MachOWriter.cpp:1.15	Wed Jan 17 16:22:31 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Wed Jan 17 19:23:11 2007
@@ -53,6 +53,10 @@
     /// Target machine description.
     TargetMachine &TM;
 
+    /// is64Bit/isLittleEndian - This information is inferred from the target
+    /// machine directly, indicating what header values and flags to set.
+    bool is64Bit, isLittleEndian;
+
     /// Relocations - These are the relocations that the function needs, as
     /// emitted.
     std::vector<MachineRelocation> Relocations;
@@ -75,7 +79,10 @@
     std::vector<intptr_t> MBBLocations;
     
   public:
-    MachOCodeEmitter(MachOWriter &mow) : MOW(mow), TM(MOW.TM) {}
+    MachOCodeEmitter(MachOWriter &mow) : MOW(mow), TM(MOW.TM) {
+      is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
+      isLittleEndian = TM.getTargetData()->isLittleEndian();
+    }
 
     virtual void startFunction(MachineFunction &F);
     virtual bool finishFunction(MachineFunction &F);
@@ -230,7 +237,7 @@
     unsigned Size = TM.getTargetData()->getTypeSize(Ty);
 
     MachOWriter::MachOSection *Sec = MOW.getConstSection(Ty);
-    OutputBuffer SecDataOut(TM, Sec->SectionData);
+    OutputBuffer SecDataOut(Sec->SectionData, is64Bit, isLittleEndian);
 
     CPLocations.push_back(Sec->SectionData.size());
     CPSections.push_back(Sec->Index);
@@ -261,7 +268,7 @@
 
   MachOWriter::MachOSection *Sec = MOW.getJumpTableSection();
   unsigned TextSecIndex = MOW.getTextSection()->Index;
-  OutputBuffer SecDataOut(TM, Sec->SectionData);
+  OutputBuffer SecDataOut(Sec->SectionData, is64Bit, isLittleEndian);
 
   for (unsigned i = 0, e = JT.size(); i != e; ++i) {
     // For each jump table, record its offset from the start of the section,
@@ -309,7 +316,7 @@
   // Reserve space in the .bss section for this symbol while maintaining the
   // desired section alignment, which must be at least as much as required by
   // this symbol.
-  OutputBuffer SecDataOut(TM, Sec->SectionData);
+  OutputBuffer SecDataOut(Sec->SectionData, is64Bit, isLittleEndian);
 
   if (Align) {
     uint64_t OrigSize = Sec->size;
@@ -451,7 +458,7 @@
   // Step #3: write the header to the file
   // Local alias to shortenify coming code.
   DataBuffer &FH = Header.HeaderData;
-  OutputBuffer FHOut(TM, FH);
+  OutputBuffer FHOut(FH, is64Bit, isLittleEndian);
 
   FHOut.outword(Header.magic);
   FHOut.outword(Header.cputype);
@@ -638,7 +645,7 @@
   
   // Write out a leading zero byte when emitting string table, for n_strx == 0
   // which means an empty string.
-  OutputBuffer StrTOut(TM, StrT);
+  OutputBuffer StrTOut(StrT, is64Bit, isLittleEndian);
   StrTOut.outbyte(0);
 
   // The order of the string table is:
@@ -656,7 +663,7 @@
     }
   }
 
-  OutputBuffer SymTOut(TM, SymT);
+  OutputBuffer SymTOut(SymT, is64Bit, isLittleEndian);
 
   for (std::vector<MachOSym>::iterator I = SymbolTable.begin(),
          E = SymbolTable.end(); I != E; ++I) {





From isanbard at gmail.com  Wed Jan 17 19:23:31 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 19:23:31 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/OutputBuffer.h
Message-ID: <200701180123.l0I1NVwP019524@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

OutputBuffer.h updated: 1.1 -> 1.2
---
Log message:

Have the OutputBuffer take the is64Bit and isLittleEndian booleans.


---
Diffs of the changes:  (+5 -6)

 OutputBuffer.h |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


Index: llvm/include/llvm/Support/OutputBuffer.h
diff -u llvm/include/llvm/Support/OutputBuffer.h:1.1 llvm/include/llvm/Support/OutputBuffer.h:1.2
--- llvm/include/llvm/Support/OutputBuffer.h:1.1	Wed Jan 17 16:17:24 2007
+++ llvm/include/llvm/Support/OutputBuffer.h	Wed Jan 17 19:23:11 2007
@@ -14,6 +14,7 @@
 #ifndef LLVM_SUPPORT_OUTPUTBUFFER_H
 #define LLVM_SUPPORT_OUTPUTBUFFER_H
 
+#include <string>
 #include <vector>
 
 namespace llvm {
@@ -26,11 +27,9 @@
     /// machine directly, indicating what header values and flags to set.
     bool is64Bit, isLittleEndian;
   public:
-    OutputBuffer(const TargetMachine& TM,
-                 std::vector<unsigned char> &Out) : Output(Out) {
-      is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
-      isLittleEndian = TM.getTargetData()->isLittleEndian();
-    }
+    OutputBuffer(std::vector<unsigned char> &Out,
+                 bool is64bit, bool le)
+      : Output(Out), is64Bit(is64bit), isLittleEndian(le) {}
 
     // align - Emit padding into the file until the current output position is
     // aligned to the specified power of two boundary.
@@ -107,7 +106,7 @@
       else
         outxword(X);
     }
-    void outstring(std::string &S, unsigned Length) {
+    void outstring(const std::string &S, unsigned Length) {
       unsigned len_to_copy = S.length() < Length ? S.length() : Length;
       unsigned len_to_fill = S.length() < Length ? Length - S.length() : 0;
       





From isanbard at gmail.com  Wed Jan 17 19:23:31 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 19:23:31 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
Message-ID: <200701180123.l0I1NVet019529@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCMachOWriter.cpp updated: 1.12 -> 1.13
---
Log message:

Have the OutputBuffer take the is64Bit and isLittleEndian booleans.


---
Diffs of the changes:  (+8 -8)

 PPCMachOWriter.cpp |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
diff -u llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.12 llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.13
--- llvm/lib/Target/PowerPC/PPCMachOWriter.cpp:1.12	Wed Jan 17 16:22:31 2007
+++ llvm/lib/Target/PowerPC/PPCMachOWriter.cpp	Wed Jan 17 19:23:11 2007
@@ -93,11 +93,11 @@
                               isExtern, PPC_RELOC_VANILLA);
       ++From.nreloc;
 
-      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
       RelocOut.outword(VANILLA.r_address);
       RelocOut.outword(VANILLA.getPackedFields());
 
-      OutputBuffer SecOut(TM, From.SectionData);
+      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
       SecOut.fixword(Addr, MR.getMachineCodeOffset());
       break;
     }
@@ -109,7 +109,7 @@
       Addr <<= 2;
       Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
 
-      OutputBuffer SecOut(TM, From.SectionData);
+      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
       SecOut.fixword(Addr, MR.getMachineCodeOffset());
       break;
     }
@@ -118,7 +118,7 @@
       Addr -= MR.getMachineCodeOffset();
       Addr &= 0xFFFC;
 
-      OutputBuffer SecOut(TM, From.SectionData);
+      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
       SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
       break;
     }
@@ -131,7 +131,7 @@
       ++From.nreloc;
       ++From.nreloc;
 
-      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
       RelocOut.outword(HA16.r_address);
       RelocOut.outword(HA16.getPackedFields());
       RelocOut.outword(PAIR.r_address);
@@ -139,7 +139,7 @@
       printf("ha16: %x\n", (unsigned)Addr);
       Addr += 0x8000;
 
-      OutputBuffer SecOut(TM, From.SectionData);
+      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
       SecOut.fixhalf(Addr >> 16, MR.getMachineCodeOffset() + 2);
       break;
     }
@@ -152,14 +152,14 @@
       ++From.nreloc;
       ++From.nreloc;
 
-      OutputBuffer RelocOut(TM, From.RelocBuffer);
+      OutputBuffer RelocOut(From.RelocBuffer, is64Bit, isLittleEndian);
       RelocOut.outword(LO16.r_address);
       RelocOut.outword(LO16.getPackedFields());
       RelocOut.outword(PAIR.r_address);
       RelocOut.outword(PAIR.getPackedFields());
       printf("lo16: %x\n", (unsigned)Addr);
 
-      OutputBuffer SecOut(TM, From.SectionData);
+      OutputBuffer SecOut(From.SectionData, is64Bit, isLittleEndian);
       SecOut.fixhalf(Addr, MR.getMachineCodeOffset() + 2);
       break;
     }





From reid at x10sys.com  Wed Jan 17 19:24:18 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:24:18 -0600
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
Message-ID: <200701180124.l0I1OIfQ019557@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.98 -> 1.99
---
Log message:

Make sure we truncate stored values to their bit width.


---
Diffs of the changes:  (+40 -30)

 ExecutionEngine.cpp |   70 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 40 insertions(+), 30 deletions(-)


Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.98 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.99
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.98	Fri Jan 12 01:05:13 2007
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Wed Jan 17 19:24:02 2007
@@ -456,25 +456,30 @@
     switch (Ty->getTypeID()) {
     case Type::IntegerTyID: {
       unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+      uint64_t BitMask = (1ull << BitWidth) - 1;
+      GenericValue TmpVal = Val;
       if (BitWidth <= 8)
-        Ptr->Untyped[0] = Val.Int8Val;
+        Ptr->Untyped[0] = Val.Int8Val & BitMask;
       else if (BitWidth <= 16) {
-        Ptr->Untyped[0] = Val.Int16Val        & 255;
-        Ptr->Untyped[1] = (Val.Int16Val >> 8) & 255;
+        TmpVal.Int16Val &= BitMask;
+        Ptr->Untyped[0] = TmpVal.Int16Val        & 255;
+        Ptr->Untyped[1] = (TmpVal.Int16Val >> 8) & 255;
       } else if (BitWidth <= 32) {
-        Ptr->Untyped[0] =  Val.Int32Val        & 255;
-        Ptr->Untyped[1] = (Val.Int32Val >>  8) & 255;
-        Ptr->Untyped[2] = (Val.Int32Val >> 16) & 255;
-        Ptr->Untyped[3] = (Val.Int32Val >> 24) & 255;
+        TmpVal.Int32Val &= BitMask;
+        Ptr->Untyped[0] =  TmpVal.Int32Val        & 255;
+        Ptr->Untyped[1] = (TmpVal.Int32Val >>  8) & 255;
+        Ptr->Untyped[2] = (TmpVal.Int32Val >> 16) & 255;
+        Ptr->Untyped[3] = (TmpVal.Int32Val >> 24) & 255;
       } else if (BitWidth <= 64) {
-        Ptr->Untyped[0] = (unsigned char)(Val.Int64Val      );
-        Ptr->Untyped[1] = (unsigned char)(Val.Int64Val >>  8);
-        Ptr->Untyped[2] = (unsigned char)(Val.Int64Val >> 16);
-        Ptr->Untyped[3] = (unsigned char)(Val.Int64Val >> 24);
-        Ptr->Untyped[4] = (unsigned char)(Val.Int64Val >> 32);
-        Ptr->Untyped[5] = (unsigned char)(Val.Int64Val >> 40);
-        Ptr->Untyped[6] = (unsigned char)(Val.Int64Val >> 48);
-        Ptr->Untyped[7] = (unsigned char)(Val.Int64Val >> 56);
+        TmpVal.Int64Val &= BitMask;
+        Ptr->Untyped[0] = (unsigned char)(TmpVal.Int64Val      );
+        Ptr->Untyped[1] = (unsigned char)(TmpVal.Int64Val >>  8);
+        Ptr->Untyped[2] = (unsigned char)(TmpVal.Int64Val >> 16);
+        Ptr->Untyped[3] = (unsigned char)(TmpVal.Int64Val >> 24);
+        Ptr->Untyped[4] = (unsigned char)(TmpVal.Int64Val >> 32);
+        Ptr->Untyped[5] = (unsigned char)(TmpVal.Int64Val >> 40);
+        Ptr->Untyped[6] = (unsigned char)(TmpVal.Int64Val >> 48);
+        Ptr->Untyped[7] = (unsigned char)(TmpVal.Int64Val >> 56);
       } else
         assert(0 && "Integer types > 64 bits not supported");
       break;
@@ -507,25 +512,30 @@
     switch (Ty->getTypeID()) {
     case Type::IntegerTyID: {
       unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+      uint64_t BitMask = (1ull << BitWidth) - 1;
+      GenericValue TmpVal = Val;
       if (BitWidth <= 8)
-        Ptr->Untyped[0] = Val.Int8Val;
+        Ptr->Untyped[0] = Val.Int8Val & BitMask;
       else if (BitWidth <= 16) {
-        Ptr->Untyped[1] =  Val.Int16Val       & 255;
-        Ptr->Untyped[0] = (Val.Int16Val >> 8) & 255;
+        TmpVal.Int16Val &= BitMask;
+        Ptr->Untyped[1] =  TmpVal.Int16Val       & 255;
+        Ptr->Untyped[0] = (TmpVal.Int16Val >> 8) & 255;
       } else if (BitWidth <= 32) {
-        Ptr->Untyped[3] =  Val.Int32Val        & 255;
-        Ptr->Untyped[2] = (Val.Int32Val >>  8) & 255;
-        Ptr->Untyped[1] = (Val.Int32Val >> 16) & 255;
-        Ptr->Untyped[0] = (Val.Int32Val >> 24) & 255;
+        TmpVal.Int32Val &= BitMask;
+        Ptr->Untyped[3] =  TmpVal.Int32Val        & 255;
+        Ptr->Untyped[2] = (TmpVal.Int32Val >>  8) & 255;
+        Ptr->Untyped[1] = (TmpVal.Int32Val >> 16) & 255;
+        Ptr->Untyped[0] = (TmpVal.Int32Val >> 24) & 255;
       } else if (BitWidth <= 64) {
-        Ptr->Untyped[7] = (unsigned char)(Val.Int64Val      );
-        Ptr->Untyped[6] = (unsigned char)(Val.Int64Val >>  8);
-        Ptr->Untyped[5] = (unsigned char)(Val.Int64Val >> 16);
-        Ptr->Untyped[4] = (unsigned char)(Val.Int64Val >> 24);
-        Ptr->Untyped[3] = (unsigned char)(Val.Int64Val >> 32);
-        Ptr->Untyped[2] = (unsigned char)(Val.Int64Val >> 40);
-        Ptr->Untyped[1] = (unsigned char)(Val.Int64Val >> 48);
-        Ptr->Untyped[0] = (unsigned char)(Val.Int64Val >> 56);
+        TmpVal.Int64Val &= BitMask;
+        Ptr->Untyped[7] = (unsigned char)(TmpVal.Int64Val      );
+        Ptr->Untyped[6] = (unsigned char)(TmpVal.Int64Val >>  8);
+        Ptr->Untyped[5] = (unsigned char)(TmpVal.Int64Val >> 16);
+        Ptr->Untyped[4] = (unsigned char)(TmpVal.Int64Val >> 24);
+        Ptr->Untyped[3] = (unsigned char)(TmpVal.Int64Val >> 32);
+        Ptr->Untyped[2] = (unsigned char)(TmpVal.Int64Val >> 40);
+        Ptr->Untyped[1] = (unsigned char)(TmpVal.Int64Val >> 48);
+        Ptr->Untyped[0] = (unsigned char)(TmpVal.Int64Val >> 56);
       } else
         assert(0 && "Integer types > 64 bits not supported");
       break;





From reid at x10sys.com  Wed Jan 17 19:25:57 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:25:57 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
Message-ID: <200701180125.l0I1PvfL019623@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.159 -> 1.160
---
Log message:

Two changes:
1. Fix logic for executeGEP. Only 32-bit and 64-bit integer types are 
   acceptable as indices.
2. Ensure that all integer cast operations truncate their result to the
   integer size of the operand.


---
Diffs of the changes:  (+17 -18)

 Execution.cpp |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)


Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.159 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.160
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.159	Sun Jan 14 20:27:26 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Wed Jan 17 19:25:42 2007
@@ -1073,16 +1073,12 @@
       int64_t Idx;
       unsigned BitWidth = 
         cast<IntegerType>(I.getOperand()->getType())->getBitWidth();
-      if (BitWidth <= 8)
-        Idx = (int64_t)(int8_t)IdxGV.Int8Val;
-      else if (BitWidth <= 16)
-        Idx = (int64_t)(int16_t)IdxGV.Int16Val;
-      else if (BitWidth <= 32)
+      if (BitWidth == 32)
         Idx = (int64_t)(int32_t)IdxGV.Int32Val;
-      else if (BitWidth <= 64)
+      else if (BitWidth == 64)
         Idx = (int64_t)IdxGV.Int64Val;
       else 
-        assert(0 && "Integer types >64 bits not supported");
+        assert(0 && "Invalid index type for getelementptr");
       Total += PointerTy(TD.getTypeSize(ST->getElementType())*Idx);
     }
   }
@@ -1288,17 +1284,20 @@
   SetValue(&I, Dest, SF);
 }
 
-#define INTEGER_ASSIGN(DEST, BITWIDTH, VAL)   \
-  if (BITWIDTH == 1) {                        \
-    Dest.Int1Val = (bool) VAL;                \
-  } else if (BITWIDTH <= 8) {                 \
-    Dest.Int8Val = (uint8_t) VAL;             \
-  } else if (BITWIDTH <= 16) {                \
-    Dest.Int16Val = (uint16_t) VAL;           \
-  } else if (BITWIDTH <= 32) {                \
-    Dest.Int32Val = (uint32_t) VAL;           \
-  } else                                      \
-    Dest.Int64Val = (uint64_t) VAL;          
+#define INTEGER_ASSIGN(DEST, BITWIDTH, VAL)     \
+  {                                             \
+    uint64_t Mask = (1ull << BITWIDTH) - 1;     \
+    if (BITWIDTH == 1) {                        \
+      Dest.Int1Val = (bool) (VAL & Mask);       \
+    } else if (BITWIDTH <= 8) {                 \
+      Dest.Int8Val = (uint8_t) (VAL & Mask);    \
+    } else if (BITWIDTH <= 16) {                \
+      Dest.Int16Val = (uint16_t) (VAL & Mask);  \
+    } else if (BITWIDTH <= 32) {                \
+      Dest.Int32Val = (uint32_t) (VAL & Mask);  \
+    } else                                      \
+      Dest.Int64Val = (uint64_t) (VAL & Mask);  \
+  }
 
 GenericValue Interpreter::executeTruncInst(Value *SrcVal, const Type *DstTy,
                                            ExecutionContext &SF) {





From reid at x10sys.com  Wed Jan 17 19:31:12 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:31:12 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/.cvsignore
Message-ID: <200701180131.l0I1VCZw019724@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

.cvsignore added (r1.1)
---
Log message:

Ignore the output directory


---
Diffs of the changes:  (+1 -0)

 .cvsignore |    1 +
 1 files changed, 1 insertion(+)


Index: llvm-test/SingleSource/UnitTests/Integer/.cvsignore
diff -c /dev/null llvm-test/SingleSource/UnitTests/Integer/.cvsignore:1.1
*** /dev/null	Wed Jan 17 19:31:07 2007
--- llvm-test/SingleSource/UnitTests/Integer/.cvsignore	Wed Jan 17 19:30:57 2007
***************
*** 0 ****
--- 1 ----
+ Output





From reid at x10sys.com  Wed Jan 17 19:31:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:31:43 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/general-test.c
	general-test.reference_output
Message-ID: <200701180131.l0I1VhxI019746@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

general-test.c updated: 1.1 -> 1.2
general-test.reference_output updated: 1.1 -> 1.2
---
Log message:

Provide a simple test case and its reference output.


---
Diffs of the changes:  (+63 -22)

 general-test.c                |   66 ++++++++++++++++++++++++++++++------------
 general-test.reference_output |   19 +++++++++---
 2 files changed, 63 insertions(+), 22 deletions(-)


Index: llvm-test/SingleSource/UnitTests/Integer/general-test.c
diff -u llvm-test/SingleSource/UnitTests/Integer/general-test.c:1.1 llvm-test/SingleSource/UnitTests/Integer/general-test.c:1.2
--- llvm-test/SingleSource/UnitTests/Integer/general-test.c:1.1	Tue Jan 16 14:30:27 2007
+++ llvm-test/SingleSource/UnitTests/Integer/general-test.c	Wed Jan 17 19:31:25 2007
@@ -7,41 +7,71 @@
 
 #define ATTR_BITS(N) __attribute__((bitwidth(N))) 
 
-typedef int ATTR_BITS( 4) My04BitInt;
-typedef int ATTR_BITS(16) My16BitInt;
-typedef int ATTR_BITS(17) My17BitInt;
-typedef int ATTR_BITS(37) My37BitInt;
-typedef int ATTR_BITS(65) My65BitInt;
+typedef unsigned char ATTR_BITS( 4) My04BitInt;
+typedef unsigned short ATTR_BITS(16) My16BitInt;
+typedef unsigned int ATTR_BITS(17) My17BitInt;
+typedef unsigned long long ATTR_BITS(37) My37BitInt;
+typedef unsigned ATTR_BITS(65) My65BitInt;
 
 struct MyStruct {
+  struct MyStruct* next;
   My04BitInt i4Field;
-  short ATTR_BITS(12) i12Field;
-  long ATTR_BITS(17) i17Field;
+  unsigned short ATTR_BITS(12) i12Field;
+  unsigned ATTR_BITS(17) i17Field;
   My37BitInt i37Field;
 };
 
-My37BitInt getSizes( short ATTR_BITS(23) num) {
+struct MyStruct Data1;
+struct MyStruct Data2;
+
+struct MyStruct* getSizes( short ATTR_BITS(23) num, My37BitInt * result) {
   My17BitInt i;
-  struct MyStruct strct;
-  int __attribute__((bitwidth(9))) j;
-  int result;
+  short __attribute__((bitwidth(9))) j;
   printf("sizeof(MyStruct) == %d\n", sizeof(struct MyStruct));
   printf("sizeof(My17BitInt) == %d\n", sizeof(My17BitInt));
   printf("sizeof(j) == %d\n", sizeof(j));
   result = sizeof(My17BitInt) + sizeof(j) + sizeof(struct MyStruct);
-  strct.i17Field = result;
-  j = 257;
+  Data1.i4Field = num;
+  Data1.i12Field = num + 1;
+  Data1.i17Field = num + 2;
+  Data1.i37Field = num + 3;
+  Data1.next = 0;
+  Data2 = Data1;
+  Data2.i4Field  *= 7;
+  Data2.i12Field *= 7;
+  Data2.i17Field *= 7;
+  Data2.i37Field *= 7;
+  Data2.next = &Data1;
+  j = num * 2;
   printf("j = %d\n", j);
   printf("size sum is %d\n", result);
-  return result;
+  return &Data2;
 }
 
 int
 main ( int argc, char** argv)
 {
   srand(0);
-  int r = rand() + argc + 31415926;
-  char ATTR_BITS(23) X = r;
-  printf("X is %d\n", X);
-  return ((int ATTR_BITS(32)) getSizes(X)) & 1;
+  struct MyStruct* strct = malloc(sizeof(struct MyStruct));
+  int r = rand();
+  int num = 0;
+  int ATTR_BITS(23) val = 0;
+  My37BitInt* sizes = 0;
+  printf("rand = %d\n", r);
+  printf("argc = %d\n", argc);
+  if (argc > 1)
+    num = atoi(argv[1]);
+  printf("num  = %d\n", num);
+  val = r + argc + num;
+  printf("val  = %d\n", val);
+  struct MyStruct* that = ((int ATTR_BITS(32)) getSizes(val, &sizes));
+  printf("that.i4Field  = %d\n", (int)that->i4Field);
+  printf("that.i12Field = %d\n", (int)that->i12Field);
+  printf("that.i17Field = %d\n", (int)that->i17Field);
+  printf("that.i37Field = %d\n", (int)that->i37Field);
+  printf("next.i4Field  = %d\n", (int)that->next->i4Field);
+  printf("next.i12Field = %d\n", (int)that->next->i12Field);
+  printf("next.i17Field = %d\n", (int)that->next->i17Field);
+  printf("next.i37Field = %d\n", (int)that->next->i37Field);
+  return ((int)sizes) & 1;
 }


Index: llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output
diff -u llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output:1.1 llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output:1.2
--- llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output:1.1	Tue Jan 16 14:30:27 2007
+++ llvm-test/SingleSource/UnitTests/Integer/general-test.reference_output	Wed Jan 17 19:31:25 2007
@@ -1,7 +1,18 @@
-X is 1802150879
-sizeof(MyStruct) == 12
+rand = 1804289383
+argc = 2
+num  = 31415926
+val  = 6988767
+sizeof(MyStruct) == 20
 sizeof(My17BitInt) == 4
 sizeof(j) == 2
-j = 257
-size sum is 18
+j = 446
+size sum is 26
+that.i4Field  = 9
+that.i12Field = 2848
+that.i17Field = 31527
+that.i37Field = 48921390
+next.i4Field  = 15
+next.i12Field = 992
+next.i17Field = 41953
+next.i37Field = 6988770
 exit 0





From reid at x10sys.com  Wed Jan 17 19:33:02 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:33:02 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
Message-ID: <200701180133.l0I1X22X019784@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.160 -> 1.161
---
Log message:

Make shl instruction mask its result to the correct bitsize. This is 
sufficient to get llvm-test/SingleSource/UnitTests/Integer/general-test.ll
working with lli in interpreter mode.


---
Diffs of the changes:  (+10 -5)

 Execution.cpp |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.160 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.161
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.160	Wed Jan 17 19:25:42 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Wed Jan 17 19:32:46 2007
@@ -1187,15 +1187,20 @@
   GenericValue Dest;
   if (const IntegerType *ITy = cast<IntegerType>(Ty)) {
     unsigned BitWidth = ITy->getBitWidth();
-    if (BitWidth <= 8)
+    uint32_t BitMask = (1ull << BitWidth) - 1;
+    if (BitWidth <= 8) {
       Dest.Int8Val  = ((uint8_t)Src1.Int8Val)   << ((uint32_t)Src2.Int8Val);
-    else if (BitWidth <= 16)
+      Dest.Int8Val &= BitMask;
+    } else if (BitWidth <= 16) {
       Dest.Int16Val = ((uint16_t)Src1.Int16Val) << ((uint32_t)Src2.Int8Val);
-    else if (BitWidth <= 32)
+      Dest.Int16Val &= BitMask;
+    } else if (BitWidth <= 32) {
       Dest.Int32Val = ((uint32_t)Src1.Int32Val) << ((uint32_t)Src2.Int8Val);
-    else if (BitWidth <= 64)
+      Dest.Int32Val &= BitMask;
+    } else if (BitWidth <= 64) {
       Dest.Int64Val = ((uint64_t)Src1.Int64Val) << ((uint32_t)Src2.Int8Val);
-    else {
+      Dest.Int64Val &= BitMask;
+    } else {
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n";
       abort();
     }





From reid at x10sys.com  Wed Jan 17 19:33:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 19:33:43 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/Integer/Makefile
Message-ID: <200701180133.l0I1XhFp019806@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

Makefile updated: 1.3 -> 1.4
---
Log message:

Turn on ENABLE_LLI so that it is run, along with CBE, by default.


---
Diffs of the changes:  (+1 -0)

 Makefile |    1 +
 1 files changed, 1 insertion(+)


Index: llvm-test/SingleSource/UnitTests/Integer/Makefile
diff -u llvm-test/SingleSource/UnitTests/Integer/Makefile:1.3 llvm-test/SingleSource/UnitTests/Integer/Makefile:1.4
--- llvm-test/SingleSource/UnitTests/Integer/Makefile:1.3	Tue Jan 16 15:41:11 2007
+++ llvm-test/SingleSource/UnitTests/Integer/Makefile	Wed Jan 17 19:33:27 2007
@@ -18,6 +18,7 @@
 #
 DISABLE_LLC := 1
 DISABLE_JIT := 1
+ENABLE_LLI  := 1
 
 # Define USE_REFERENCE_OUTPUT which is a signal to Makefile.programs
 # that the native compiler should not be run but that its output





From evan.cheng at apple.com  Wed Jan 17 19:50:13 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 17 Jan 2007 19:50:13 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
	X86AsmPrinter.cpp
Message-ID: <200701180150.l0I1oDeD020124@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.91 -> 1.92
X86AsmPrinter.cpp updated: 1.230 -> 1.231
---
Log message:

Minor code clean up.

---
Diffs of the changes:  (+21 -18)

 X86ATTAsmPrinter.cpp |   37 ++++++++++++++++++++-----------------
 X86AsmPrinter.cpp    |    2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.91 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.92
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.91	Wed Jan 17 04:33:08 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Wed Jan 17 19:49:58 2007
@@ -31,16 +31,15 @@
 
 STATISTIC(EmittedInsts, "Number of machine instrs printed");
 
-static std::string computePICLabel(unsigned fnNumber,
-                                   const X86Subtarget* Subtarget) 
-{
+static std::string computePICLabel(unsigned FnNum,
+                                   const TargetAsmInfo *TAI,
+                                   const X86Subtarget* Subtarget)  {
   std::string label;
-
-  if (Subtarget->isTargetDarwin()) {
-    label =  "\"L" + utostr_32(fnNumber) + "$pb\"";
-  } else if (Subtarget->isTargetELF()) {
-    label = ".Lllvm$" + utostr_32(fnNumber) + "$piclabel";
-  } else
+  if (Subtarget->isTargetDarwin())
+    label =  "\"L" + utostr_32(FnNum) + "$pb\"";
+  else if (Subtarget->isTargetELF())
+    label = ".Lllvm$" + utostr_32(FnNum) + "$piclabel";
+  else
     assert(0 && "Don't know how to print PIC label!\n");
 
   return label;
@@ -227,7 +226,8 @@
 
     if (TM.getRelocationModel() == Reloc::PIC_) {
       if (Subtarget->isPICStyleStub())
-        O << "-\"L" << getFunctionNumber() << "$pb\"";
+        O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+          << "$pb\"";
       else if (Subtarget->isPICStyleGOT())
         O << "@GOTOFF";
     }
@@ -244,7 +244,8 @@
 
     if (TM.getRelocationModel() == Reloc::PIC_) {
       if (Subtarget->isPICStyleStub())
-        O << "-\"L" << getFunctionNumber() << "$pb\"";
+        O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+          << "$pb\"";
       if (Subtarget->isPICStyleGOT())
         O << "@GOTOFF";
     }
@@ -280,10 +281,10 @@
         // Dynamically-resolved functions need a stub for the function.
         if (isCallOp && isa<Function>(GV)) {
           FnStubs.insert(Name);
-          O << "L" << Name << "$stub";
+          O << TAI->getPrivateGlobalPrefix() << Name << "$stub";
         } else {
           GVStubs.insert(Name);
-          O << "L" << Name << "$non_lazy_ptr";
+          O << TAI->getPrivateGlobalPrefix() << Name << "$non_lazy_ptr";
         }
       } else {
         if (GV->hasDLLImportLinkage()) {
@@ -293,7 +294,8 @@
       }
       
       if (!isCallOp && TM.getRelocationModel() == Reloc::PIC_)
-        O << "-\"L" << getFunctionNumber() << "$pb\"";
+        O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+          << "$pb\"";
     } else {
       if (GV->hasDLLImportLinkage()) {
         O << "__imp_";          
@@ -346,7 +348,7 @@
     Name += MO.getSymbolName();
     if (isCallOp && Subtarget->isPICStyleStub()) {
       FnStubs.insert(Name);
-      O << "L" << Name << "$stub";
+      O << TAI->getPrivateGlobalPrefix() << Name << "$stub";
       return;
     }
     if (!isCallOp) O << '$';
@@ -363,7 +365,8 @@
         // piclabel:
         //   popl %some_register
         //   addl $_GLOBAL_ADDRESS_TABLE_ + [.-piclabel], %some_register
-        O << " + [.-" << computePICLabel(getFunctionNumber(), Subtarget) << "]";
+        O << " + [.-"
+          << computePICLabel(getFunctionNumber(), TAI, Subtarget) << "]";
     }
 
     if (isCallOp && Subtarget->isPICStyleGOT())
@@ -440,7 +443,7 @@
 }
 
 void X86ATTAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) {
-  std::string label = computePICLabel(getFunctionNumber(), Subtarget);
+  std::string label = computePICLabel(getFunctionNumber(), TAI, Subtarget);
   O << label << "\n" << label << ":";
 }
 


Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.230 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.231
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.230	Wed Jan 17 11:44:25 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Wed Jan 17 19:49:58 2007
@@ -166,7 +166,7 @@
           if (I->hasInternalLinkage()) {
             O << TAI->getLCOMMDirective() << name << "," << Size;
             if (Subtarget->isTargetDarwin())
-              O << "," << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
+              O << "," << Align;
           } else
             O << TAI->getCOMMDirective()  << name << "," << Size;
         } else {





From reid at x10sys.com  Wed Jan 17 20:10:19 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 20:10:19 -0600
Subject: [llvm-commits] CVS:
	llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c
Message-ID: <200701180210.l0I2AJ3p020473@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/SignlessTypes:

ccc.c updated: 1.1 -> 1.2
---
Log message:

Don't reference stderr, lli can't find it on Linux because it is both a
global variable and a macro!


---
Diffs of the changes:  (+1 -1)

 ccc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c
diff -u llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c:1.1 llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c:1.2
--- llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c:1.1	Wed Jan 10 11:54:02 2007
+++ llvm-test/SingleSource/UnitTests/SignlessTypes/ccc.c	Wed Jan 17 20:10:04 2007
@@ -35,7 +35,7 @@
   unsigned short ush;
 
   if (argc < 2) {
-    fprintf(stderr, "Program requires integer parameter");
+    printf("Program requires integer parameter");
     exit (1);
   }
 





From clattner at apple.com  Wed Jan 17 20:10:15 2007
From: clattner at apple.com (Chris Lattner)
Date: Wed, 17 Jan 2007 18:10:15 -0800
Subject: [llvm-commits] Stack and global alignment enhancement patch
In-Reply-To: <20070117204724.GA18716@rush.aero.org>
References: <20070117204724.GA18716@rush.aero.org>
Message-ID: <DD039CFF-F289-4725-8990-920EBF4FA184@apple.com>


On Jan 17, 2007, at 12:47 PM, Scott Michel wrote:

> Per Chris' suggestion to submit enhancement patches to llvm- 
> commits,...
>
> - Adds stack and global alignment options to TargetData specification
>   strings.
>
> - Adds minimum stack and global alignment for aggregates.

Hi Scott,

I think I miscommunicated a little bit :(

You have:

+  // Stack type alignments.
+  unsigned char BoolStackAlignment;    // Defaults to BoolAlignment
+  unsigned char ByteStackAlignment;    // Defaults to ByteAlignment
+  unsigned char ShortStackAlignment;   // Defaults to ShortAlignment
+  unsigned char IntStackAlignment;     // Defaults to IntAlignment
+  unsigned char LongStackAlignment;    // Defaults to LongAlignment
+  unsigned char FloatStackAlignment;   // Defaults to FloatAlignment
+  unsigned char DoubleStackAlignment;  // Defaults to DoubleAlignment
+  unsigned char PointerStackAlignment; // Defaults to PointerAlignment
+  unsigned char AggMinStackAlignment;  // Defaults to 4 bytes
+
+  // Global alignments
+  unsigned char BoolGlobalAlignment;   // Defaults to BoolAlignment
+  unsigned char ByteGlobalAlignment;   // Defaults to ByteAlignment
+  unsigned char ShortGlobalAlignment;  // Defaults to ShortAlignment
+  unsigned char IntGlobalAlignment;    // Defaults to IntAlignment
+  unsigned char LongGlobalAlignment;   // Defaults to LongAlignment
+  unsigned char FloatGlobalAlignment;  // Defaults to FloatAlignment
+  unsigned char DoubleGlobalAlignment; // Defaults to DoubleAlignment
+  unsigned char PointerGlobalAlignment;// Defaults to PointerAlignment
+  unsigned char AggMinGlobalAlignment; // Defaults to 4 bytes

I don't think there is any need for this generality.  It seems that a  
target has two sorts of alignments: that imposed by the ABI, and that  
which is really wants things to be aligned at.  The target itself  
doesn't care *where* something is, but if it has the choice, it  
sometimes wants to use a bigger alignment than necessary.

As such, I don't think there is any reason to have separate variables  
for stack and global alignment.  These are both just the, "we can use  
any alignment, so lets use whatever is preferred for the target".   
Why not have one set of XXXPrefAlignment instance variables which can  
be used for both globals and stack objects?

If you'd like to rename the existing IntAlignment values to  
something, I'd suggest IntABIAlignment instead of IntSAAlignment.

Aside from that, your patch looks good.  Updating the X86 backend and  
hack removal is great!

-Chris


From reid at x10sys.com  Wed Jan 17 20:12:25 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 20:12:25 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
Message-ID: <200701180212.l0I2CPI4020523@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Interpreter.h updated: 1.80 -> 1.81
---
Log message:

Add an inline helper function that masks a GenericValue to a specified
bit width.


---
Diffs of the changes:  (+12 -0)

 Interpreter.h |   12 ++++++++++++
 1 files changed, 12 insertions(+)


Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.80 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.81
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.80	Fri Jan 12 01:05:13 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Wed Jan 17 20:12:10 2007
@@ -231,8 +231,20 @@
   GenericValue executeCastOperation(Instruction::CastOps opcode, Value *SrcVal, 
                                     const Type *Ty, ExecutionContext &SF);
   void popStackAndReturnValueToCaller(const Type *RetTy, GenericValue Result);
+
 };
 
+inline void maskToBitWidth(GenericValue& GV, unsigned BitWidth) {
+  uint64_t BitMask = (1ull << BitWidth) - 1;
+  if (BitWidth <= 8)
+    GV.Int8Val &= BitMask;
+  else if (BitWidth <= 16)
+    GV.Int16Val &= BitMask;
+  else if (BitWidth <= 32)
+    GV.Int32Val &= BitMask;
+  else 
+    GV.Int64Val &= BitMask;
+}
 } // End llvm namespace
 
 #endif





From reid at x10sys.com  Wed Jan 17 20:13:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 20:13:08 -0600
Subject: [llvm-commits] CVS:
	llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
Message-ID: <200701180213.l0I2D8gN020545@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.161 -> 1.162
---
Log message:

Use the new maskToBitWidth function to ensure that the results of 
computations do not overflow the intended bit width.


---
Diffs of the changes:  (+15 -10)

 Execution.cpp |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)


Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.161 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.162
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.161	Wed Jan 17 19:32:46 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Wed Jan 17 20:12:51 2007
@@ -216,6 +216,7 @@
        Dest.Int64Val = Src1.Int64Val OP Src2.Int64Val; \
      else \
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
+     maskToBitWidth(Dest, BitWidth); \
      break; \
    }
 
@@ -234,6 +235,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
        abort(); \
      } \
+     maskToBitWidth(Dest, BitWidth); \
    } else { \
     cerr << "Unhandled type for " #OP " operator: " << *Ty << "\n"; \
     abort(); \
@@ -254,6 +256,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
        abort(); \
      } \
+     maskToBitWidth(Dest, BitWidth); \
    } else { \
     cerr << "Unhandled type for " #OP " operator: " << *Ty << "\n"; \
     abort(); \
@@ -397,6 +400,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
        abort(); \
      } \
+     maskToBitWidth(Dest, BitWidth); \
      break; \
    }
 
@@ -417,6 +421,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
        abort(); \
      } \
+     maskToBitWidth(Dest, BitWidth); \
      break; \
    }
 
@@ -1187,23 +1192,19 @@
   GenericValue Dest;
   if (const IntegerType *ITy = cast<IntegerType>(Ty)) {
     unsigned BitWidth = ITy->getBitWidth();
-    uint32_t BitMask = (1ull << BitWidth) - 1;
-    if (BitWidth <= 8) {
+    if (BitWidth <= 8)
       Dest.Int8Val  = ((uint8_t)Src1.Int8Val)   << ((uint32_t)Src2.Int8Val);
-      Dest.Int8Val &= BitMask;
-    } else if (BitWidth <= 16) {
+    else if (BitWidth <= 16)
       Dest.Int16Val = ((uint16_t)Src1.Int16Val) << ((uint32_t)Src2.Int8Val);
-      Dest.Int16Val &= BitMask;
-    } else if (BitWidth <= 32) {
+    else if (BitWidth <= 32)
       Dest.Int32Val = ((uint32_t)Src1.Int32Val) << ((uint32_t)Src2.Int8Val);
-      Dest.Int32Val &= BitMask;
-    } else if (BitWidth <= 64) {
+    else if (BitWidth <= 64)
       Dest.Int64Val = ((uint64_t)Src1.Int64Val) << ((uint32_t)Src2.Int8Val);
-      Dest.Int64Val &= BitMask;
-    } else {
+    else {
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n";
       abort();
     }
+    maskToBitWidth(Dest, BitWidth);
   } else {
     cerr << "Unhandled type for Shl instruction: " << *Ty << "\n";
     abort();
@@ -1228,6 +1229,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n";
       abort();
     }
+    maskToBitWidth(Dest, BitWidth);
   } else {
     cerr << "Unhandled type for LShr instruction: " << *Ty << "\n";
     abort();
@@ -1252,6 +1254,7 @@
       cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
       abort();
     } 
+    maskToBitWidth(Dest, BitWidth);
   } else { 
     cerr << "Unhandled type for AShr instruction: " << *Ty << "\n";
     abort();
@@ -1567,6 +1570,7 @@
         Dest.Int32Val = Src.Int32Val;
       else 
         Dest.Int64Val = Src.Int64Val;
+      maskToBitWidth(Dest, DBitWidth);
     } else 
       assert(0 && "Invalid BitCast");
   } else if (DstTy == Type::FloatTy) {
@@ -1673,6 +1677,7 @@
         Dest.Int64Val = Src.Int64Val;
       else
         assert("Integer types > 64 bits not supported");
+      maskToBitWidth(Dest, BitWidth);
     }
     IMPLEMENT_VAARG(Pointer);
     IMPLEMENT_VAARG(Float);





From isanbard at gmail.com  Wed Jan 17 20:30:34 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 20:30:34 -0600
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86AsmPrinter.cpp
Message-ID: <200701180230.l0I2UY5n020871@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86AsmPrinter.cpp updated: 1.231 -> 1.232
---
Log message:

The zerofill directive needs a newline after it.


---
Diffs of the changes:  (+1 -1)

 X86AsmPrinter.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.231 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.232
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.231	Wed Jan 17 19:49:58 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Wed Jan 17 20:30:19 2007
@@ -149,7 +149,7 @@
         if (const char *Directive = TAI->getZeroFillDirective()) {
           O << "\t.globl\t" << name << "\n";
           O << Directive << "__DATA__, __common, " << name << ", "
-            << Size << ", " << Align;
+            << Size << ", " << Align << "\n";
           continue;
         }
       }





From reid at x10sys.com  Wed Jan 17 21:00:13 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 21:00:13 -0600
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200701180300.l0I30DN4021400@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.161 -> 1.162
---
Log message:

Provide an isPowerOf2ByteWidth method for the IntegerType class. This will
mostly be used by back ends that wish to distinguish between integer types
that fit evenly within a natural integer type and those that don't.


---
Diffs of the changes:  (+5 -0)

 Type.cpp |    5 +++++
 1 files changed, 5 insertions(+)


Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.161 llvm/lib/VMCore/Type.cpp:1.162
--- llvm/lib/VMCore/Type.cpp:1.161	Sun Jan 14 20:27:26 2007
+++ llvm/lib/VMCore/Type.cpp	Wed Jan 17 20:59:54 2007
@@ -975,6 +975,11 @@
   return ITy;
 }
 
+bool IntegerType::isPowerOf2ByteWidth() const {
+  unsigned BitWidth = getBitWidth();
+  return (BitWidth > 7 && Log2_32(BitWidth) == Log2_32_Ceil(BitWidth));
+}
+
 // FunctionValType - Define a class to hold the key that goes into the TypeMap
 //
 namespace llvm {





From reid at x10sys.com  Wed Jan 17 21:00:14 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 17 Jan 2007 21:00:14 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200701180300.l0I30EQW021405@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.79 -> 1.80
---
Log message:

Provide an isPowerOf2ByteWidth method for the IntegerType class. This will
mostly be used by back ends that wish to distinguish between integer types
that fit evenly within a natural integer type and those that don't.


---
Diffs of the changes:  (+6 -0)

 DerivedTypes.h |    6 ++++++
 1 files changed, 6 insertions(+)


Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.79 llvm/include/llvm/DerivedTypes.h:1.80
--- llvm/include/llvm/DerivedTypes.h:1.79	Fri Jan 12 16:11:53 2007
+++ llvm/include/llvm/DerivedTypes.h	Wed Jan 17 20:59:54 2007
@@ -101,6 +101,12 @@
   /// @brief Get the number of bits in this IntegerType
   unsigned getBitWidth() const { return getSubclassData(); }
 
+  /// This method determines if the width of this IntegerType is a power-of-2
+  /// in terms of 8 bit bytes. 
+  /// @returns true if this is a power-of-2 byte width.
+  /// @brief Is this a power-of-2 byte-width IntegerType ?
+  bool isPowerOf2ByteWidth() const;
+
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const IntegerType *T) { return true; }
   static inline bool classof(const Type *T) {





From scottm at rushg.aero.org  Wed Jan 17 21:11:32 2007
From: scottm at rushg.aero.org (Scott Michel)
Date: Wed, 17 Jan 2007 19:11:32 -0800
Subject: [llvm-commits] Round 2: ABI and preferred alignment enhancement
Message-ID: <20070118031131.GA13186@rush.aero.org>

Previously known as struct/array vs. stack vs. global alignments...


-scooter
-- 
Scott Michel                                      scottm at aero.org
Member of Technical Staff, CSRD                   310/336-5034
The Aerospace Corporation
-------------- next part --------------
--- old-llvm/include/llvm/Target/TargetData.h	2007-01-17 19:06:51.000000000 -0800
+++ new-llvm/include/llvm/Target/TargetData.h	2007-01-17 19:06:51.000000000 -0800
@@ -35,15 +35,28 @@
 
 class TargetData : public ImmutablePass {
   bool          LittleEndian;          // Defaults to false
-  unsigned char BoolAlignment;         // Defaults to 1 byte
-  unsigned char ByteAlignment;         // Defaults to 1 byte
-  unsigned char ShortAlignment;        // Defaults to 2 bytes
-  unsigned char IntAlignment;          // Defaults to 4 bytes
-  unsigned char LongAlignment;         // Defaults to 8 bytes
-  unsigned char FloatAlignment;        // Defaults to 4 bytes
-  unsigned char DoubleAlignment;       // Defaults to 8 bytes
-  unsigned char PointerSize;           // Defaults to 8 bytes
-  unsigned char PointerAlignment;      // Defaults to 8 bytes
+
+  // ABI alignments
+  unsigned char BoolABIAlignment;       // Defaults to 1 byte
+  unsigned char ByteABIAlignment;       // Defaults to 1 byte
+  unsigned char ShortABIAlignment;      // Defaults to 2 bytes
+  unsigned char IntABIAlignment;        // Defaults to 4 bytes
+  unsigned char LongABIAlignment;       // Defaults to 8 bytes
+  unsigned char FloatABIAlignment;      // Defaults to 4 bytes
+  unsigned char DoubleABIAlignment;     // Defaults to 8 bytes
+  unsigned char PointerMemSize;        // Defaults to 8 bytes
+  unsigned char PointerABIAlignment;    // Defaults to 8 bytes
+
+  // Preferred stack/global type alignments
+  unsigned char BoolPrefAlignment;    // Defaults to BoolABIAlignment
+  unsigned char BytePrefAlignment;    // Defaults to ByteABIAlignment
+  unsigned char ShortPrefAlignment;   // Defaults to ShortABIAlignment
+  unsigned char IntPrefAlignment;     // Defaults to IntABIAlignment
+  unsigned char LongPrefAlignment;    // Defaults to LongABIAlignment
+  unsigned char FloatPrefAlignment;   // Defaults to FloatABIAlignment
+  unsigned char DoublePrefAlignment;  // Defaults to DoubleABIAlignment
+  unsigned char PointerPrefAlignment; // Defaults to PointerABIAlignment
+  unsigned char AggMinPrefAlignment;  // Defaults to 0 bytes
 
 public:
   /// Default ctor - This has to exist, because this is a pass, but it should
@@ -68,15 +81,24 @@
   TargetData(const TargetData &TD) : 
     ImmutablePass(),
     LittleEndian(TD.isLittleEndian()),
-    BoolAlignment(TD.getBoolAlignment()),
-    ByteAlignment(TD.getByteAlignment()),
-    ShortAlignment(TD.getShortAlignment()),
-    IntAlignment(TD.getIntAlignment()),
-    LongAlignment(TD.getLongAlignment()),
-    FloatAlignment(TD.getFloatAlignment()),
-    DoubleAlignment(TD.getDoubleAlignment()),
-    PointerSize(TD.getPointerSize()),
-    PointerAlignment(TD.getPointerAlignment()) {
+    BoolABIAlignment(TD.getBoolABIAlignment()),
+    ByteABIAlignment(TD.getByteABIAlignment()),
+    ShortABIAlignment(TD.getShortABIAlignment()),
+    IntABIAlignment(TD.getIntABIAlignment()),
+    LongABIAlignment(TD.getLongABIAlignment()),
+    FloatABIAlignment(TD.getFloatABIAlignment()),
+    DoubleABIAlignment(TD.getDoubleABIAlignment()),
+    PointerMemSize(TD.getPointerSize()),
+    PointerABIAlignment(TD.getPointerABIAlignment()),
+    BoolPrefAlignment(TD.getBoolPrefAlignment()),
+    BytePrefAlignment(TD.getBytePrefAlignment()),
+    ShortPrefAlignment(TD.getShortPrefAlignment()),
+    IntPrefAlignment(TD.getIntPrefAlignment()),
+    LongPrefAlignment(TD.getLongPrefAlignment()),
+    FloatPrefAlignment(TD.getFloatPrefAlignment()),
+    DoublePrefAlignment(TD.getDoublePrefAlignment()),
+    PointerPrefAlignment(TD.getPointerPrefAlignment()),
+    AggMinPrefAlignment(TD.getAggMinPrefAlignment()) {
   }
 
   ~TargetData();  // Not virtual, do not subclass this class
@@ -86,10 +108,16 @@
   /// Parse a target data layout string, initializing the various TargetData
   /// members along the way. A TargetData specification string looks like
   /// "E-p:64:64-d:64-f:32-l:64-i:32-s:16-b:8-B:8" and specifies the
-  /// target's endianess, the alignments of various data types and
-  /// the size of pointers. The "-" is used as a separator and ":"
-  /// separates a token from its argument. Alignment is indicated in bits
-  /// and internally converted to the appropriate number of bytes.
+  /// target's endianess, the ABI alignments of various data types and
+  /// the size of pointers.
+  ///
+  /// "-" is used as a separator and ":" separates a token from its argument.
+  ///
+  /// Alignment is indicated in bits and internally converted to the
+  /// appropriate number of bytes.
+  ///
+  /// The preferred stack/global alignment specifications (":[prefalign]") are
+  /// optional and default to the ABI alignment.
   ///
   /// Valid tokens:
   /// <br>
@@ -97,20 +125,24 @@
   /// <em>e</em> specifies little endian architecture (4321) <br>
   /// <em>p:[ptr size]:[ptr align]</em> specifies pointer size and alignment
   /// [default = 64:64] <br>
-  /// <em>d:[align]</em> specifies double floating point alignment
-  /// [default = 64] <br>
-  /// <em>f:[align]</em> specifies single floating point alignment
+  /// <em>d:[align]:[prefalign]</em> specifies double floating
+  /// point alignment [default = 64] <br>
+  /// <em>f:[align]:[prefalign]</em> specifies single floating
+  /// point alignment [default = 32] <br>
+  /// <em>l:[align]:[prefalign]:[globalign[</em> specifies long integer
+  /// alignment [default = 64] <br>
+  /// <em>i:[align]:[prefalign]</em> specifies integer alignment
   /// [default = 32] <br>
-  /// <em>l:[align]</em> specifies long integer alignment
-  /// [default = 64] <br>
-  /// <em>i:[align]</em> specifies integer alignment
-  /// [default = 32] <br>
-  /// <em>s:[align]</em> specifies short integer alignment
-  /// [default = 16] <br>
-  /// <em>b:[align]</em> specifies byte data type alignment
-  /// [default = 8] <br>
-  /// <em>B:[align]</em> specifies boolean data type alignment
-  /// [default = 8] <br>
+  /// <em>s:[align]:[prefalign]</em> specifies short integer
+  /// alignment [default = 16] <br>
+  /// <em>b:[align]:[prefalign]</em> specifies byte data type
+  /// alignment [default = 8] <br>
+  /// <em>B:[align]:[prefalign]</em> specifies boolean data type
+  /// alignment [default = 8] <br>
+  /// <em>A:[prefalign]</em> specifies an aggregates' minimum alignment
+  /// on the stack and when emitted as a global. The default minimum aggregate
+  /// alignment defaults to 0, which causes the aggregate's "natural" internal
+  /// alignment calculated by llvm to be preferred.
   ///
   /// All other token types are silently ignored.
   void init(const std::string &TargetDescription);
@@ -120,17 +152,63 @@
   bool          isLittleEndian()       const { return     LittleEndian; }
   bool          isBigEndian()          const { return    !LittleEndian; }
 
-  /// Target alignment constraints
-  unsigned char getBoolAlignment()     const { return    BoolAlignment; }
-  unsigned char getByteAlignment()     const { return    ByteAlignment; }
-  unsigned char getShortAlignment()    const { return   ShortAlignment; }
-  unsigned char getIntAlignment()      const { return     IntAlignment; }
-  unsigned char getLongAlignment()     const { return    LongAlignment; }
-  unsigned char getFloatAlignment()    const { return   FloatAlignment; }
-  unsigned char getDoubleAlignment()   const { return  DoubleAlignment; }
-  unsigned char getPointerAlignment()  const { return PointerAlignment; }
-  unsigned char getPointerSize()       const { return      PointerSize; }
-  unsigned char getPointerSizeInBits() const { return    8*PointerSize; }
+  /// Target boolean alignment
+  unsigned char getBoolABIAlignment()    const { return    BoolABIAlignment; }
+  /// Target byte alignment
+  unsigned char getByteABIAlignment()    const { return    ByteABIAlignment; }
+  /// Target short alignment
+  unsigned char getShortABIAlignment()   const { return   ShortABIAlignment; }
+  /// Target integer alignment
+  unsigned char getIntABIAlignment()     const { return     IntABIAlignment; }
+  /// Target long alignment
+  unsigned char getLongABIAlignment()    const { return    LongABIAlignment; }
+  /// Target single precision float alignment
+  unsigned char getFloatABIAlignment()   const { return   FloatABIAlignment; }
+  /// Target double precision float alignment
+  unsigned char getDoubleABIAlignment()  const { return  DoubleABIAlignment; }
+  /// Target pointer alignment
+  unsigned char getPointerABIAlignment() const { return PointerABIAlignment; }
+  /// Target pointer size
+  unsigned char getPointerSize()         const { return      PointerMemSize; }
+  /// Target pointer size, in bits
+  unsigned char getPointerSizeInBits()   const { return    8*PointerMemSize; }
+
+  /// Return target's alignment for booleans on stack
+  unsigned char getBoolPrefAlignment() const {
+    return BoolPrefAlignment;
+  }
+  /// Return target's alignment for integers on stack
+  unsigned char getBytePrefAlignment() const {
+    return BytePrefAlignment;
+  }
+  /// Return target's alignment for shorts on stack
+  unsigned char getShortPrefAlignment() const {
+    return ShortPrefAlignment;
+  }
+  /// Return target's alignment for integers on stack
+  unsigned char getIntPrefAlignment()     const {
+    return IntPrefAlignment;
+  }
+  /// Return target's alignment for longs on stack
+  unsigned char getLongPrefAlignment() const {
+    return LongPrefAlignment;
+  }
+  /// Return target's alignment for single precision floats on stack
+  unsigned char getFloatPrefAlignment() const {
+    return FloatPrefAlignment;
+  }
+  /// Return target's alignment for double preceision floats on stack
+  unsigned char getDoublePrefAlignment()  const {
+    return DoublePrefAlignment;
+  }
+  /// Return target's alignment for stack-based pointers
+  unsigned char getPointerPrefAlignment() const {
+    return PointerPrefAlignment;
+  }
+  /// Return target's alignment for stack-based structures
+  unsigned char getAggMinPrefAlignment() const {
+    return AggMinPrefAlignment;
+  }
 
   /// getStringRepresentation - Return the string representation of the
   /// TargetData.  This representation is in the same format accepted by the
@@ -142,10 +220,13 @@
   ///
   uint64_t getTypeSize(const Type *Ty) const;
 
-  /// getTypeAlignment - Return the minimum required alignment for the specified
-  /// type.
-  ///
-  unsigned char getTypeAlignment(const Type *Ty) const;
+  /// getTypeAlignmentABI - Return the minimum ABI-required alignment for the
+  /// specified type.
+  unsigned char getTypeAlignmentABI(const Type *Ty) const;
+
+  /// getTypeAlignmentPref - Return the preferred stack/global alignment for
+  /// the specified type.
+  unsigned char getTypeAlignmentPref(const Type *Ty) const;
 
   /// getTypeAlignmentShift - Return the minimum required alignment for the
   /// specified type, returned as log2 of the value (a shift amount).

--- old-llvm/lib/CodeGen/ELFWriter.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/CodeGen/ELFWriter.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -236,7 +236,7 @@
   }
 
   const Type *GVType = (const Type*)GV->getType();
-  unsigned Align = TM.getTargetData()->getTypeAlignment(GVType);
+  unsigned Align = TM.getTargetData()->getTypeAlignmentPref(GVType);
   unsigned Size  = TM.getTargetData()->getTypeSize(GVType);
 
   // If this global has a zero initializer, it is part of the .bss or common

--- old-llvm/lib/CodeGen/MachOWriter.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/CodeGen/MachOWriter.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -295,7 +295,7 @@
   unsigned Size = TM.getTargetData()->getTypeSize(Ty);
   unsigned Align = GV->getAlignment();
   if (Align == 0)
-    Align = TM.getTargetData()->getTypeAlignment(Ty);
+    Align = TM.getTargetData()->getTypeAlignmentPref(Ty);
   
   MachOSym Sym(GV, Mang->getValueName(GV), Sec->Index, TM);
   

--- old-llvm/lib/CodeGen/MachineFunction.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/CodeGen/MachineFunction.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -123,7 +123,8 @@
   const TargetData &TD = *TM.getTargetData();
   bool IsPic = TM.getRelocationModel() == Reloc::PIC_;
   unsigned EntrySize = IsPic ? 4 : TD.getPointerSize();
-  unsigned Alignment = IsPic ? TD.getIntAlignment() : TD.getPointerAlignment();
+  unsigned Alignment = IsPic ? TD.getIntABIAlignment()
+                             : TD.getPointerABIAlignment();
   JumpTableInfo = new MachineJumpTableInfo(EntrySize, Alignment);
   
   BasicBlocks.Parent = this;

--- old-llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -3028,7 +3028,7 @@
         // new ones, as reuse may inhibit scheduling.
         const Type *Ty = MVT::getTypeForValueType(ExtraVT);
         unsigned TySize = (unsigned)TLI.getTargetData()->getTypeSize(Ty);
-        unsigned Align  = TLI.getTargetData()->getTypeAlignment(Ty);
+        unsigned Align  = TLI.getTargetData()->getTypeAlignmentPref(Ty);
         MachineFunction &MF = DAG.getMachineFunction();
         int SSFI =
           MF.getFrameInfo()->CreateStackObject((unsigned)TySize, Align);
@@ -3936,7 +3936,9 @@
 SDOperand SelectionDAGLegalize::CreateStackTemporary(MVT::ValueType VT) {
   MachineFrameInfo *FrameInfo = DAG.getMachineFunction().getFrameInfo();
   unsigned ByteSize = MVT::getSizeInBits(VT)/8;
-  int FrameIdx = FrameInfo->CreateStackObject(ByteSize, ByteSize);
+  const Type *Ty = MVT::getTypeForValueType(VT);
+  unsigned StackAlign = (unsigned)TLI.getTargetData()->getTypeAlignmentPref(Ty);
+  int FrameIdx = FrameInfo->CreateStackObject(ByteSize, StackAlign);
   return DAG.getFrameIndex(FrameIdx, TLI.getPointerTy());
 }
 
@@ -4241,9 +4243,12 @@
   if (Op0.getValueType() == MVT::i32) {
     // simple 32-bit [signed|unsigned] integer to float/double expansion
     
-    // get the stack frame index of a 8 byte buffer
+    // get the stack frame index of a 8 byte buffer, pessimistically aligned
     MachineFunction &MF = DAG.getMachineFunction();
-    int SSFI = MF.getFrameInfo()->CreateStackObject(8, 8);
+    const Type *F64Type = MVT::getTypeForValueType(MVT::f64);
+    unsigned StackAlign =
+      (unsigned)TLI.getTargetData()->getTypeAlignmentPref(F64Type);
+    int SSFI = MF.getFrameInfo()->CreateStackObject(8, StackAlign);
     // get address of 8 byte buffer
     SDOperand StackSlot = DAG.getFrameIndex(SSFI, TLI.getPointerTy());
     // word offset constant for Hi/Lo address computation

--- old-llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -244,17 +244,9 @@
         const Type *Ty = AI->getAllocatedType();
         uint64_t TySize = TLI.getTargetData()->getTypeSize(Ty);
         unsigned Align = 
-          std::max((unsigned)TLI.getTargetData()->getTypeAlignment(Ty),
+          std::max((unsigned)TLI.getTargetData()->getTypeAlignmentPref(Ty),
                    AI->getAlignment());
 
-        // If the alignment of the value is smaller than the size of the 
-        // value, and if the size of the value is particularly small 
-        // (<= 8 bytes), round up to the size of the value for potentially 
-        // better performance.
-        //
-        // FIXME: This could be made better with a preferred alignment hook in
-        // TargetData.  It serves primarily to 8-byte align doubles for X86.
-        if (Align < TySize && TySize <= 8) Align = TySize;
         TySize *= CUI->getZExtValue();   // Get total allocated size.
         if (TySize == 0) TySize = 1; // Don't create zero-sized stack objects.
         StaticAllocaMap[AI] =
@@ -1729,8 +1721,9 @@
 
   const Type *Ty = I.getAllocatedType();
   uint64_t TySize = TLI.getTargetData()->getTypeSize(Ty);
-  unsigned Align = std::max((unsigned)TLI.getTargetData()->getTypeAlignment(Ty),
-                            I.getAlignment());
+  unsigned Align =
+    std::max((unsigned)TLI.getTargetData()->getTypeAlignmentPref(Ty),
+             I.getAlignment());
 
   SDOperand AllocSize = getValue(I.getArraySize());
   MVT::ValueType IntPtr = TLI.getPointerTy();

--- old-llvm/lib/ExecutionEngine/JIT/JIT.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/ExecutionEngine/JIT/JIT.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -338,7 +338,7 @@
     // compilation.
     const Type *GlobalType = GV->getType()->getElementType();
     size_t S = getTargetData()->getTypeSize(GlobalType);
-    size_t A = getTargetData()->getTypeAlignment(GlobalType);
+    size_t A = getTargetData()->getTypeAlignmentPref(GlobalType);
     if (A <= 8) {
       Ptr = malloc(S);
     } else {

--- old-llvm/lib/Target/ARM/ARMAsmPrinter.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/Target/ARM/ARMAsmPrinter.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -306,7 +306,7 @@
     std::string name = Mang->getValueName(I);
     Constant *C = I->getInitializer();
     unsigned Size = TD->getTypeSize(C->getType());
-    unsigned Align = Log2_32(TD->getTypeAlignment(C->getType()));
+    unsigned Align = Log2_32(TD->getTypeAlignmentPref(C->getType()));
 
     if (C->isNullValue() &&
         !I->hasSection() &&

--- old-llvm/lib/Target/Sparc/SparcAsmPrinter.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/Target/Sparc/SparcAsmPrinter.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -229,7 +229,7 @@
       std::string name = Mang->getValueName(I);
       Constant *C = I->getInitializer();
       unsigned Size = TD->getTypeSize(C->getType());
-      unsigned Align = TD->getTypeAlignment(C->getType());
+      unsigned Align = TD->getTypeAlignmentPref(C->getType());
 
       if (C->isNullValue() &&
           (I->hasLinkOnceLinkage() || I->hasInternalLinkage() ||
@@ -239,7 +239,7 @@
           O << "\t.local " << name << "\n";
 
         O << "\t.comm " << name << "," << TD->getTypeSize(C->getType())
-          << "," << (unsigned)TD->getTypeAlignment(C->getType());
+          << "," << Align;
         O << "\n";
       } else {
         switch (I->getLinkage()) {

--- old-llvm/lib/Target/TargetData.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/Target/TargetData.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -34,8 +34,11 @@
   RegisterPass<TargetData> X("targetdata", "Target Data Layout");
 }
 
-static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
-                               uint64_t &Size, unsigned char &Alignment);
+static inline void getTypeInfoABI(const Type *Ty, const TargetData *TD,
+                                  uint64_t &Size, unsigned char &Alignment);
+
+static inline void getTypeInfoPref(const Type *Ty, const TargetData *TD,
+                                   uint64_t &Size, unsigned char &Alignment);
 
 //===----------------------------------------------------------------------===//
 // Support for StructLayout
@@ -52,7 +55,7 @@
     unsigned char A;
     unsigned TyAlign;
     uint64_t TySize;
-    getTypeInfo(Ty, &TD, TySize, A);
+    getTypeInfoABI(Ty, &TD, TySize, A);
     TyAlign = ST->isPacked() ? 1 : A;
 
     // Add padding if necessary to make the data element aligned properly...
@@ -80,8 +83,7 @@
 /// return the structure index that contains it.
 unsigned StructLayout::getElementContainingOffset(uint64_t Offset) const {
   std::vector<uint64_t>::const_iterator SI =
-    std::upper_bound(MemberOffsets.begin(), MemberOffsets.end(),
-                     Offset);
+    std::upper_bound(MemberOffsets.begin(), MemberOffsets.end(), Offset);
   assert(SI != MemberOffsets.begin() && "Offset not in structure type!");
   --SI;
   assert(*SI <= Offset && "upper_bound didn't work");
@@ -99,15 +101,24 @@
   std::string temp = TargetDescription;
   
   LittleEndian = false;
-  PointerSize = 8;
-  PointerAlignment   = 8;
-  DoubleAlignment = 8;
-  FloatAlignment = 4;
-  LongAlignment   = 8;
-  IntAlignment   = 4;
-  ShortAlignment  = 2;
-  ByteAlignment  = 1;
-  BoolAlignment   = 1;
+  PointerMemSize = 8;
+  PointerABIAlignment   = 8;
+  DoubleABIAlignment = 8;
+  FloatABIAlignment = 4;
+  LongABIAlignment   = 8;
+  IntABIAlignment   = 4;
+  ShortABIAlignment  = 2;
+  ByteABIAlignment  = 1;
+  BoolABIAlignment   = 1;
+  BoolPrefAlignment = BoolABIAlignment;
+  BytePrefAlignment = ByteABIAlignment;
+  ShortPrefAlignment = ShortABIAlignment;
+  IntPrefAlignment = IntABIAlignment;
+  LongPrefAlignment = LongABIAlignment;
+  FloatPrefAlignment = FloatABIAlignment;
+  DoublePrefAlignment = DoubleABIAlignment;
+  PointerPrefAlignment = PointerABIAlignment;
+  AggMinPrefAlignment = 0;
   
   while (!temp.empty()) {
     std::string token = getToken(temp, "-");
@@ -122,29 +133,58 @@
       LittleEndian = true;
       break;
     case 'p':
-      PointerSize = atoi(getToken(token,":").c_str()) / 8;
-      PointerAlignment = atoi(getToken(token,":").c_str()) / 8;
+      PointerMemSize = atoi(getToken(token,":").c_str()) / 8;
+      PointerABIAlignment = atoi(getToken(token,":").c_str()) / 8;
+      PointerPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (PointerPrefAlignment == 0)
+        PointerPrefAlignment = PointerABIAlignment;
       break;
     case 'd':
-      DoubleAlignment = atoi(getToken(token,":").c_str()) / 8;
+      DoubleABIAlignment = atoi(getToken(token,":").c_str()) / 8;
+      DoublePrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (DoublePrefAlignment == 0)
+        DoublePrefAlignment = DoubleABIAlignment;
       break;
     case 'f':
-      FloatAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      FloatABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      FloatPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (FloatPrefAlignment == 0)
+        FloatPrefAlignment = FloatABIAlignment;
       break;
     case 'l':
-      LongAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      LongABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      LongPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (LongPrefAlignment == 0)
+        LongPrefAlignment = LongABIAlignment;
       break;
     case 'i':
-      IntAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      IntABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      IntPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (IntPrefAlignment == 0)
+        IntPrefAlignment = IntABIAlignment;
       break;
     case 's':
-      ShortAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ShortABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ShortPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (ShortPrefAlignment == 0)
+        ShortPrefAlignment = ShortABIAlignment;
       break;
     case 'b':
-      ByteAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      ByteABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      BytePrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (BytePrefAlignment == 0)
+        BytePrefAlignment = ByteABIAlignment;
       break;
     case 'B':
-      BoolAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      BoolABIAlignment = atoi(getToken(token, ":").c_str()) / 8;
+      BoolPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (BoolPrefAlignment == 0)
+        BoolPrefAlignment = BoolABIAlignment;
+      break;
+    case 'A':
+      AggMinPrefAlignment = atoi(getToken(token,":").c_str()) / 8;
+      if (AggMinPrefAlignment == 0)
+        AggMinPrefAlignment = 0;
       break;
     default:
       break;
@@ -153,16 +193,25 @@
 }
 
 TargetData::TargetData(const Module *M) {
-  LittleEndian     = M->getEndianness() != Module::BigEndian;
-  PointerSize      = M->getPointerSize() != Module::Pointer64 ? 4 : 8;
-  PointerAlignment = PointerSize;
-  DoubleAlignment  = PointerSize;
-  FloatAlignment   = 4;
-  LongAlignment    = PointerSize;
-  IntAlignment     = 4;
-  ShortAlignment   = 2;
-  ByteAlignment    = 1;
-  BoolAlignment    = 1;
+  LittleEndian       = M->getEndianness() != Module::BigEndian;
+  PointerMemSize     = M->getPointerSize() != Module::Pointer64 ? 4 : 8;
+  PointerABIAlignment = PointerMemSize;
+  DoubleABIAlignment  = PointerMemSize;
+  FloatABIAlignment   = 4;
+  LongABIAlignment    = PointerMemSize;
+  IntABIAlignment     = 4;
+  ShortABIAlignment   = 2;
+  ByteABIAlignment    = 1;
+  BoolABIAlignment    = 1;
+  BoolPrefAlignment = BoolABIAlignment;
+  BytePrefAlignment = ByteABIAlignment;
+  ShortPrefAlignment = ShortABIAlignment;
+  IntPrefAlignment = IntABIAlignment;
+  LongPrefAlignment = LongABIAlignment;
+  FloatPrefAlignment = FloatABIAlignment;
+  DoublePrefAlignment = DoubleABIAlignment;
+  PointerPrefAlignment = PointerABIAlignment;
+  AggMinPrefAlignment = 0;
 }
 
 /// Layouts - The lazy cache of structure layout information maintained by
@@ -195,14 +244,22 @@
   else
     repr << "E";
   
-  repr << "-p:" << (PointerSize * 8) << ":" << (PointerAlignment * 8);
-  repr << "-d:64:" << (DoubleAlignment * 8);
-  repr << "-f:32:" << (FloatAlignment * 8);
-  repr << "-l:64:" << (LongAlignment * 8);
-  repr << "-i:32:" << (IntAlignment * 8);
-  repr << "-s:16:" << (ShortAlignment * 8);
-  repr << "-b:8:" << (ByteAlignment * 8);
-  repr << "-B:8:" << (BoolAlignment * 8);
+  repr << "-p:" << (PointerMemSize * 8) << ":" << (PointerABIAlignment * 8);
+  repr << "-d:" << (DoubleABIAlignment * 8) << ":"
+       << (DoublePrefAlignment * 8);
+  repr << "-f:" << (FloatABIAlignment * 8) << ":"
+       << (FloatPrefAlignment * 8);
+  repr << "-l:" << (LongABIAlignment * 8) << ":"
+       << (LongPrefAlignment * 8);
+  repr << "-i:" << (IntABIAlignment * 8) << ":"
+       << (IntPrefAlignment * 8);
+  repr << "-s:" << (ShortABIAlignment * 8) << ":"
+       << (ShortPrefAlignment * 8);
+  repr << "-b:" << (ByteABIAlignment * 8) << ":"
+       << (BytePrefAlignment * 8);
+  repr << "-B:" << (BoolABIAlignment * 8) << ":"
+       << (BoolPrefAlignment * 8);
+  repr << "-A:" << (AggMinPrefAlignment * 8);
   
   return repr.str();
 }
@@ -237,41 +294,41 @@
 
 
 
-static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
-                               uint64_t &Size, unsigned char &Alignment) {
+static inline void getTypeInfoABI(const Type *Ty, const TargetData *TD,
+                                  uint64_t &Size, unsigned char &Alignment) {
   assert(Ty->isSized() && "Cannot getTypeInfo() on a type that is unsized!");
   switch (Ty->getTypeID()) {
   case Type::IntegerTyID: {
     unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
     if (BitWidth <= 8) {
-      Size = 1; Alignment = TD->getByteAlignment();
+      Size = 1; Alignment = TD->getByteABIAlignment();
     } else if (BitWidth <= 16) {
-      Size = 2; Alignment = TD->getShortAlignment();
+      Size = 2; Alignment = TD->getShortABIAlignment();
     } else if (BitWidth <= 32) {
-      Size = 4; Alignment = TD->getIntAlignment();
+      Size = 4; Alignment = TD->getIntABIAlignment();
     } else if (BitWidth <= 64) {
-      Size = 8; Alignment = TD->getLongAlignment();
+      Size = 8; Alignment = TD->getLongABIAlignment();
     } else
       assert(0 && "Integer types > 64 bits not supported.");
     return;
   }
-  case Type::VoidTyID:   Size = 1; Alignment = TD->getByteAlignment(); return;
-  case Type::FloatTyID:  Size = 4; Alignment = TD->getFloatAlignment(); return;
-  case Type::DoubleTyID: Size = 8; Alignment = TD->getDoubleAlignment(); return;
+  case Type::VoidTyID:   Size = 1; Alignment = TD->getByteABIAlignment(); return;
+  case Type::FloatTyID:  Size = 4; Alignment = TD->getFloatABIAlignment(); return;
+  case Type::DoubleTyID: Size = 8; Alignment = TD->getDoubleABIAlignment(); return;
   case Type::LabelTyID:
   case Type::PointerTyID:
-    Size = TD->getPointerSize(); Alignment = TD->getPointerAlignment();
+    Size = TD->getPointerSize(); Alignment = TD->getPointerABIAlignment();
     return;
   case Type::ArrayTyID: {
     const ArrayType *ATy = cast<ArrayType>(Ty);
-    getTypeInfo(ATy->getElementType(), TD, Size, Alignment);
+    getTypeInfoABI(ATy->getElementType(), TD, Size, Alignment);
     unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
     Size = AlignedSize*ATy->getNumElements();
     return;
   }
   case Type::PackedTyID: {
     const PackedType *PTy = cast<PackedType>(Ty);
-    getTypeInfo(PTy->getElementType(), TD, Size, Alignment);
+    getTypeInfoABI(PTy->getElementType(), TD, Size, Alignment);
     unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
     Size = AlignedSize*PTy->getNumElements();
     // FIXME: The alignments of specific packed types are target dependent.
@@ -292,22 +349,94 @@
   }
 }
 
+static inline void getTypeInfoPref(const Type *Ty, const TargetData *TD,
+                                   uint64_t &Size, unsigned char &Alignment) {
+  assert(Ty->isSized() && "Cannot getTypeInfoPref() on a type that is unsized!");
+  switch (Ty->getTypeID()) {
+  case Type::IntegerTyID: {
+    unsigned BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+    if (BitWidth <= 8) {
+      Size = 1; Alignment = TD->getBytePrefAlignment();
+    } else if (BitWidth <= 16) {
+      Size = 2; Alignment = TD->getShortPrefAlignment();
+    } else if (BitWidth <= 32) {
+      Size = 4; Alignment = TD->getIntPrefAlignment();
+    } else if (BitWidth <= 64) {
+      Size = 8; Alignment = TD->getLongPrefAlignment();
+    } else
+      assert(0 && "Integer types > 64 bits not supported.");
+    return;
+  }
+  case Type::VoidTyID:
+    Size = 1; Alignment = TD->getBytePrefAlignment();
+    return;
+  case Type::FloatTyID:
+    Size = 4; Alignment = TD->getFloatPrefAlignment();
+    return;
+  case Type::DoubleTyID:
+    Size = 8; Alignment = TD->getDoublePrefAlignment();
+    return;
+  case Type::LabelTyID:
+  case Type::PointerTyID:
+    Size = TD->getPointerSize(); Alignment = TD->getPointerPrefAlignment();
+    return;
+  case Type::ArrayTyID: {
+    const ArrayType *ATy = cast<ArrayType>(Ty);
+    getTypeInfoPref(ATy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*ATy->getNumElements();
+    return;
+  }
+  case Type::PackedTyID: {
+    const PackedType *PTy = cast<PackedType>(Ty);
+    getTypeInfoPref(PTy->getElementType(), TD, Size, Alignment);
+    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    Size = AlignedSize*PTy->getNumElements();
+    // FIXME: The alignments of specific packed types are target dependent.
+    // For now, just set it to be equal to Size.
+    Alignment = Size;
+    return;
+  }
+  case Type::StructTyID: {
+    // Get the layout annotation... which is lazily created on demand;
+    // enforce minimum aggregate alignment.
+    const StructLayout *Layout = TD->getStructLayout(cast<StructType>(Ty));
+    Size = Layout->StructSize;
+    Alignment = std::max(Layout->StructAlignment,
+                         (const unsigned int) TD->getAggMinPrefAlignment());
+    return;
+  }
+
+  default:
+    assert(0 && "Bad type for getTypeInfoPref!!!");
+    return;
+  }
+}
+
+
 uint64_t TargetData::getTypeSize(const Type *Ty) const {
   uint64_t Size;
   unsigned char Align;
-  getTypeInfo(Ty, this, Size, Align);
+  getTypeInfoABI(Ty, this, Size, Align);
   return Size;
 }
 
-unsigned char TargetData::getTypeAlignment(const Type *Ty) const {
+unsigned char TargetData::getTypeAlignmentABI(const Type *Ty) const {
+  uint64_t Size;
+  unsigned char Align;
+  getTypeInfoABI(Ty, this, Size, Align);
+  return Align;
+}
+
+unsigned char TargetData::getTypeAlignmentPref(const Type *Ty) const {
   uint64_t Size;
   unsigned char Align;
-  getTypeInfo(Ty, this, Size, Align);
+  getTypeInfoPref(Ty, this, Size, Align);
   return Align;
 }
 
 unsigned char TargetData::getTypeAlignmentShift(const Type *Ty) const {
-  unsigned Align = getTypeAlignment(Ty);
+  unsigned Align = getTypeAlignmentABI(Ty);
   assert(!(Align & (Align-1)) && "Alignment is not a power of two!");
   return Log2_32(Align);
 }

--- old-llvm/lib/Target/X86/X86TargetMachine.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/Target/X86/X86TargetMachine.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -109,8 +109,8 @@
 X86TargetMachine::X86TargetMachine(const Module &M, const std::string &FS, bool is64Bit)
   : Subtarget(M, FS, is64Bit),
     DataLayout(Subtarget.is64Bit() ?
-               std::string("e-p:64:64-d:32-l:32") :
-               std::string("e-p:32:32-d:32-l:32")),
+               std::string("e-p:64:64-d:32:64-l:32") :
+               std::string("e-p:32:32-d:32:64-l:32")),
     FrameInfo(TargetFrameInfo::StackGrowsDown,
               Subtarget.getStackAlignment(), Subtarget.is64Bit() ? -8 : -4),
     InstrInfo(*this), JITInfo(*this), TLInfo(*this) {

--- old-llvm/lib/Transforms/Scalar/InstructionCombining.cpp	2007-01-17 19:05:51.000000000 -0800
+++ new-llvm/lib/Transforms/Scalar/InstructionCombining.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -5773,8 +5773,8 @@
   const Type *CastElTy = PTy->getElementType();
   if (!AllocElTy->isSized() || !CastElTy->isSized()) return 0;
 
-  unsigned AllocElTyAlign = TD->getTypeAlignment(AllocElTy);
-  unsigned CastElTyAlign = TD->getTypeAlignment(CastElTy);
+  unsigned AllocElTyAlign = TD->getTypeAlignmentABI(AllocElTy);
+  unsigned CastElTyAlign = TD->getTypeAlignmentABI(CastElTy);
   if (CastElTyAlign < AllocElTyAlign) return 0;
 
   // If the allocation has multiple uses, only promote it if we are strictly
@@ -6872,18 +6872,22 @@
   if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V)) {
     unsigned Align = GV->getAlignment();
     if (Align == 0 && TD) 
-      Align = TD->getTypeAlignment(GV->getType()->getElementType());
+      Align = TD->getTypeAlignmentPref(GV->getType()->getElementType());
     return Align;
   } else if (AllocationInst *AI = dyn_cast<AllocationInst>(V)) {
     unsigned Align = AI->getAlignment();
     if (Align == 0 && TD) {
       if (isa<AllocaInst>(AI))
-        Align = TD->getTypeAlignment(AI->getType()->getElementType());
+        Align = TD->getTypeAlignmentPref(AI->getType()->getElementType());
       else if (isa<MallocInst>(AI)) {
         // Malloc returns maximally aligned memory.
-        Align = TD->getTypeAlignment(AI->getType()->getElementType());
-        Align = std::max(Align, (unsigned)TD->getTypeAlignment(Type::DoubleTy));
-        Align = std::max(Align, (unsigned)TD->getTypeAlignment(Type::Int64Ty));
+        Align = TD->getTypeAlignmentABI(AI->getType()->getElementType());
+        Align =
+          std::max(Align,
+                   (unsigned)TD->getTypeAlignmentABI(Type::DoubleTy));
+        Align =
+          std::max(Align,
+                   (unsigned)TD->getTypeAlignmentABI(Type::Int64Ty));
       }
     }
     return Align;
@@ -6918,10 +6922,12 @@
     if (!TD) return 0;
 
     const Type *BasePtrTy = GEPI->getOperand(0)->getType();
-    if (TD->getTypeAlignment(cast<PointerType>(BasePtrTy)->getElementType())
+    const PointerType *PtrTy = cast<PointerType>(BasePtrTy);
+    if (TD->getTypeAlignmentABI(PtrTy->getElementType())
         <= BaseAlignment) {
       const Type *GEPTy = GEPI->getType();
-      return TD->getTypeAlignment(cast<PointerType>(GEPTy)->getElementType());
+      const PointerType *GEPPtrTy = cast<PointerType>(GEPTy);
+      return TD->getTypeAlignmentABI(GEPPtrTy->getElementType());
     }
     return 0;
   }

--- old-llvm/lib/VMCore/ValueTypes.cpp	2007-01-17 19:05:52.000000000 -0800
+++ new-llvm/lib/VMCore/ValueTypes.cpp	2007-01-17 19:05:52.000000000 -0800
@@ -13,6 +13,7 @@
 
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Type.h"
+#include "llvm/DerivedTypes.h"
 using namespace llvm;
 
 /// MVT::getValueTypeString - This function returns value type as a string,
@@ -94,5 +95,14 @@
   case MVT::i64:   return Type::Int64Ty;
   case MVT::f32:   return Type::FloatTy;
   case MVT::f64:   return Type::DoubleTy;
+  case MVT::v8i8:  return PackedType::get(Type::Int8Ty, 8);
+  case MVT::v4i16: return PackedType::get(Type::Int16Ty, 4);
+  case MVT::v2i32: return PackedType::get(Type::Int32Ty, 2);
+  case MVT::v16i8: return PackedType::get(Type::Int8Ty, 16);
+  case MVT::v8i16: return PackedType::get(Type::Int16Ty, 8);
+  case MVT::v4i32: return PackedType::get(Type::Int32Ty, 4);
+  case MVT::v2i64: return PackedType::get(Type::Int64Ty, 2);
+  case MVT::v4f32: return PackedType::get(Type::FloatTy, 4);
+  case MVT::v2f64: return PackedType::get(Type::DoubleTy, 2);
   }
 }


From isanbard at gmail.com  Wed Jan 17 21:39:25 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Jan 2007 19:39:25 -0800
Subject: [llvm-commits] "Zeros in bss" patch for llvm-gcc
In-Reply-To: <1169030948.14117.16.camel@asl.dorms.spbu.ru>
References: <1169030948.14117.16.camel@asl.dorms.spbu.ru>
Message-ID: <6B7C23B0-56CD-4D37-AF01-899CBECED253@gmail.com>

Hi Anton,

The small typo was maybe intentional. Because it's a macro, it's used  
like this:

	LLVM_SET_TARGET_OPTIONS(foo);

With this patch, there will be an extra ';' at the end.

-bw

On Jan 17, 2007, at 2:49 AM, Anton Korobeynikov wrote:

> Hello, Everyone.
>
> Now some codegens by default emit zero-initialized data to .bss  
> section.
> However, sometimes it's really necessary not to do so. This patch will
> add handling of "-fno-zero-initialized-in-bss" llvm-gcc' option. It's
> necessary to compile crt*.o properly.
>
> PS: Also some fix some small typo. :)
> -- 
> With best regards, Anton Korobeynikov.
>
> Faculty of Mathematics & Mechanics, Saint Petersburg State University.
>
> <llvm-gcc-bss.diff>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Thu Jan 18 00:19:45 2007
From: clattner at apple.com (Chris Lattner)
Date: Wed, 17 Jan 2007 22:19:45 -0800
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
In-Reply-To: <200701180300.l0I30DN4021400@zion.cs.uiuc.edu>
References: <200701180300.l0I30DN4021400@zion.cs.uiuc.edu>
Message-ID: <BDE1F83E-4D99-4F13-BE46-7CDCD958A30D@apple.com>

> +bool IntegerType::isPowerOf2ByteWidth() const {
> +  unsigned BitWidth = getBitWidth();
> +  return (BitWidth > 7 && Log2_32(BitWidth) == Log2_32_Ceil 
> (BitWidth));
> +}
> +

Please use the isPowerOf2_32 function or use ((BitWidth-1) &  
BitWidth) == 0 instead of two Log2_32 calls.

Thanks,

-Chris


From lattner at cs.uiuc.edu  Thu Jan 18 00:23:00 2007
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu, 18 Jan 2007 00:23:00 -0600
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/tramp3d-v4/
Message-ID: <200701180623.l0I6N0tw024730@zion.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/tramp3d-v4:

---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/tramp3d-v4 added to the repository


---
Diffs of the changes:  (+0 -0)

 0 files changed





From sabre at nondot.org  Thu Jan 18 00:29:02 2007
From: sabre at nondot.org (Chris Lattner)
Date: Thu, 18 Jan 2007 00:29:02 -0600
Subject: [llvm-commits] CVS:
	llvm-test/MultiSource/Benchmarks/tramp3d-v4/Makefile
	README.txt tramp3d-v4.cpp
Message-ID: <200701180629.l0I6T2SZ024949@zion.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/tramp3d-v4:

Makefile added (r1.1)
README.txt added (r1.1)
tramp3d-v4.cpp added (r1.1)
---
Log message:

Add the tramp3d-v4 benchmark.


---
Diffs of the changes:  (+56097 -0)

 Makefile       |    9 
 README.txt     |    8 
 tramp3d-v4.cpp |56080 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56097 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/tramp3d-v4/Makefile
diff -c /dev/null llvm-test/MultiSource/Benchmarks/tramp3d-v4/Makefile:1.1
*** /dev/null	Thu Jan 18 00:28:57 2007
--- llvm-test/MultiSource/Benchmarks/tramp3d-v4/Makefile	Thu Jan 18 00:28:47 2007
***************
*** 0 ****
--- 1,9 ----
+ LEVEL = ../../..
+ 
+ PROG     = tramp3d-v4
+ CPPFLAGS = 
+ LDFLAGS  = -lstdc++
+ RUN_OPTIONS =  --cartvis 1.0 0.0 --rhomin 1e-8 -n 25
+ FP_TOLERANCE :=  0.00001
+ 
+ include	../../Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/tramp3d-v4/README.txt
diff -c /dev/null llvm-test/MultiSource/Benchmarks/tramp3d-v4/README.txt:1.1
*** /dev/null	Thu Jan 18 00:29:02 2007
--- llvm-test/MultiSource/Benchmarks/tramp3d-v4/README.txt	Thu Jan 18 00:28:47 2007
***************
*** 0 ****
--- 1,8 ----
+ 
+ This is a template-intensive numerical program based on FreePOOMA, written by
+ Richard Guenther.  The FreePOOMA parts are 3-clause BSD licensed, the rest is
+ put in the public domain by Richard.
+ 
+ For more info, see:
+ http://www.suse.de/~rguenther/tramp3d/
+ 


Index: llvm-test/MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4.cpp
diff -c /dev/null llvm-test/MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4.cpp:1.1
*** /dev/null	Thu Jan 18 00:29:02 2007
--- llvm-test/MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4.cpp	Thu Jan 18 00:28:47 2007
***************
*** 0 ****
--- 1,56080 ----
+ #include <sys/time.h>
+ #include <time.h>
+ #include <fenv.h>
+ #include <cstdarg>
+ #include <complex>
+ #include <algorithm>
+ #include <limits>
+ #include <math.h>
+ 
+ namespace Smarts {
+ template<class T>
+ class IterateScheduler;
+ template<class T>
+ class Iterate;
+ template<class T>
+ class DataObject;
+ }
+ namespace Smarts {
+ class Runnable
+ {
+ public:
+   Runnable()
+   {
+     priority_m = 0;
+   }
+   Runnable(int)
+   {
+     priority_m = 0;
+   }
+   virtual ~Runnable() {}
+   inline int
+   priority() { return priority_m; }
+   inline void
+   priority(int _priority) { priority_m = _priority; }
+   virtual void execute()
+   {
+     run();
+   }
+ protected:
+   virtual void run() {}
+ private:
+   int priority_m;
+ };
+ typedef Runnable *RunnablePtr_t;
+ inline void add(RunnablePtr_t);
+ }
+ namespace Smarts {
+ class Stub
+ {
+ public:
+   enum Action { Read, Write };
+ };
+ template<> class Iterate<Stub>;
+ template<> class IterateScheduler<Stub>;
+ template<> class DataObject<Stub>;
+ template<>
+ class Iterate<Stub> : public Runnable
+ {
+ public:
+   inline Iterate(IterateScheduler<Stub> & scheduler, int affinity=-1);
+   virtual ~Iterate() {}
+   virtual void run() = 0;
+   int affinity() { return 0; }
+   int hintAffinity() { return 0; }
+   void affinity(int) {}
+   void hintAffinity(int) {}
+   void generation(int gen) { generation_m=gen; }
+   int generation() { return generation_m; }
+ protected:
+   IterateScheduler<Stub> &scheduler_m;
+ private:
+   int generation_m;
+ };
+ template<>
+ class IterateScheduler<Stub>
+ {
+ public:
+   inline
+   void beginGeneration() { generation_m++; }
+   inline
+   void endGeneration() {}
+   inline
+   void blockingEvaluate() {}
+   inline
+   void releaseIterates() { }
+   inline
+   IterateScheduler()
+     : generation_m(0)
+   { }
+   inline
+   ~IterateScheduler() {}
+   inline int generation() const { return generation_m; }
+   inline
+   void handOff(Iterate<Stub>* it)
+   {
+     it->run();
+     delete it;
+   }
+ protected:
+ private:
+   int generation_m;
+ };
+ inline Iterate<Stub>::Iterate(IterateScheduler<Stub> & scheduler, int)
+   : scheduler_m(scheduler)
+ {
+   generation(scheduler.generation());
+ }
+ template<>
+ class DataObject<Stub>
+ {
+ public:
+     inline DataObject(int=-1) {}
+     inline int affinity() const { return 0; };
+     inline void affinity(int) {}
+     inline void request(Iterate<Stub>&, Stub::Action) {}
+     inline void release(Stub::Action) {}
+ protected:
+ private:
+ };
+ inline void concurrency(int)
+ {
+ }
+ inline int concurrency()
+ {
+   return 1;
+ }
+ inline void wait()
+ {
+ }
+ inline void add(Runnable *runnable)
+ {
+   runnable->execute();
+   delete runnable;
+ }
+ }
+ namespace Pooma {
+   typedef Smarts::Stub SmartsTag_t;
+ }
+ namespace Pooma {
+ static const char schedulerVersion[] = "stub scheduler";
+ typedef Smarts::IterateScheduler<SmartsTag_t> Scheduler_t;
+ typedef Smarts::DataObject<SmartsTag_t> DataObject_t;
+ typedef Smarts::Iterate<SmartsTag_t> Iterate_t;
+ typedef Smarts::Runnable Runnable_t;
+ inline void addRunnable(Runnable_t *runnable)
+ {
+   Smarts::add(runnable);
+ }
+ }
+ namespace Pooma {
+ class Assertion
+ {
+   char *msg_m;
+   char *file_m;
+   int line_m;
+ public:
+   Assertion(const char *msg, const char *file, int line);
+   Assertion(const Assertion &a);
+   ~Assertion() { delete[] msg_m; delete [] file_m; }
+   Assertion &operator=(const Assertion &a);
+   const char *what() const { return msg_m; }
+   const char *file() const { return file_m; }
+   int line() const { return line_m; }
+   template<class OS>
+   void print(OS &os) const
+   {
+     os << "### POOMA Assertion Failure ###\n";
+     os << "### " << what() << "\n";
+     os << "### File " << file() << "; Line " << line();
+   }
+ };
+ void toss_cookies(const char *msg, const char *file, int line ...) __attribute__((noreturn));
+ }
+ template<bool B> struct PoomaCTAssert {};
+ template<> struct PoomaCTAssert<true> { static inline void test() {} };
+ template<class T1, class T2>
+ struct SameType
+ {
+   enum { same = false };
+ };
+ template<class T1>
+ struct SameType<T1, T1>
+ {
+   enum { same = true };
+ };
+ namespace Pooma {
+   class DummyMutex
+   {
+   public:
+     inline DummyMutex() { }
+     inline DummyMutex(const DummyMutex &) { }
+     inline DummyMutex &operator=(const DummyMutex &) { return *this; }
+     inline void lock() { }
+     inline void unlock() { }
+   };
+   typedef DummyMutex Mutex_t;
+ }
+ #include <iostream>
+ #include <map>
+ class InformStream;
+ class Inform
+ {
+ public:
+   typedef int ID_t;
+   typedef int Level_t;
+   typedef int Context_t;
+   enum { out, app };
+   enum { allContexts = (-1) };
+   enum { off = (-1), on = 0 };
+   Inform(const char *prefix = 0, Context_t outputContext = 0);
+   Inform(const char *prefix, const char *fname, int writemode,
+   Context_t outputContext = 0);
+   Inform(const char *prefix, std::ostream &outstream,
+   Context_t outputContext = 0);
+   ~Inform();
+   const std::string &prefix() const { return prefix_m; }
+   void setPrefix(const char *prefix = 0);
+   ID_t open(Context_t context = 0);
+   ID_t open(const char *fname, int writemode, Context_t context = 0);
+   ID_t open(std::ostream &outstream, Context_t context = 0);
+   void close(ID_t);
+   void close();
+   Level_t messageLevel() const { return level_m; }
+   Inform &setMessageLevel(Level_t newval) { level_m = newval; return *this; }
+   Level_t outputLevel(ID_t id = 0) const;
+   void setOutputLevel(Level_t newval, ID_t id);
+   void setOutputLevel(Level_t newval);
+   Context_t outputContext(ID_t id = 0) const;
+   void setOutputContext(Context_t outputContext, ID_t id);
+   void setOutputContext(Context_t outputContext);
+   inline static Context_t context() { return context_s; }
+   inline static Context_t numContexts() { return nContexts_s; }
+   static inline void setContext(Context_t c) { context_s = c; }
+   static inline void setNumContexts(Context_t n) { nContexts_s = n; }
+   void flush();
+   void print() { flush(); }
+   void output() { flush(); }
+   typedef std::ios_base::fmtflags FmtFlags_t;
+   std::ostream& stream() { return *message_m; }
+   FmtFlags_t
+     setf(FmtFlags_t setbits,FmtFlags_t field)
+     { return message_m->setf(setbits,field);}
+   FmtFlags_t
+     setf(FmtFlags_t f) { return message_m->setf(f); }
+   void unsetf(FmtFlags_t f) { message_m->unsetf(f); }
+   long flags() const { return message_m->flags(); }
+   long flags(FmtFlags_t f) { return message_m->flags(f); }
+   int width() const { return message_m->width(); }
+   int width(int w) { return message_m->width(w); }
+   char fill() const { return message_m->fill(); }
+   char fill(char c) { return message_m->fill(c); }
+   int precision() const { return message_m->precision(); }
+   int precision(int p) { return message_m->precision(p); }
+   void lock() const { mutex_m.lock(); }
+   void unlock() const { mutex_m.unlock(); }
+ private:
+   typedef std::map<ID_t, InformStream *> StreamList_t;
+   typedef StreamList_t::size_type Size_t;
+   typedef StreamList_t::value_type Value_t;
+   typedef StreamList_t::iterator iterator;
+   typedef StreamList_t::const_iterator const_iterator;
+   std::string prefix_m;
+   Context_t outputContext_m;
+   Level_t level_m;
+   StreamList_t streams_m;
+   std::ostringstream *message_m;
+   char *buffer_m;
+   static const unsigned int bufSize;
+   ID_t nextID_m;
+   mutable Pooma::Mutex_t mutex_m;
+   static Pooma::Mutex_t outputMutex_s;
+   static Context_t context_s;
+   static Context_t nContexts_s;
+   InformStream *findStream(ID_t) const;
+   void setup(const char *prefix);
+ };
+ namespace std {
+   extern Inform &endl(Inform &);
+   extern Inform &flush(Inform &);
+   extern Inform &lock(Inform &);
+   extern Inform &unlock(Inform &);
+ }
+ inline Inform &operator<<(Inform &o, Inform &(*d)(Inform &))
+ {
+   return d(o);
+ }
+ inline Inform &operator<<(Inform &o, std::ios_base &(*d)(std::ios_base &))
+ {
+   d(o.stream());
+   return o;
+ }
+ template<class T>
+ inline Inform &operator<<(Inform &o, const T &val)
+ {
+   o.stream() << val;
+   return o;
+ }
+ inline Inform &operator<<(Inform &o, const void *val)
+ {
+   Inform::FmtFlags_t oldformat =
+     o.setf(std::ios::hex, std::ios::basefield);
+   o.stream() << "0x" << reinterpret_cast<long>(val);
+   o.setf(oldformat, std::ios::basefield);
+   return o;
+ }
+ inline Inform &operator<<(Inform &o, const char *s)
+ {
+   o.stream() << s;
+   return o;
+ }
+ inline Inform &operator<<(Inform &o, const std::string &s)
+ {
+   o.stream() << s.c_str();
+   return o;
+ }
+ #include <iterator>
+ template <class T>
+ class InformIterator
+ {
+ public:
+   typedef std::output_iterator_tag iterator_category;
+   typedef void value_type;
+   typedef void difference_type;
+   typedef void pointer;
+   typedef void reference;
+   InformIterator(Inform &s) : out_m(&s), delim_m(0) { }
+   InformIterator(Inform &s, const char *d) : out_m(&s), delim_m(d) { }
+   InformIterator &operator=(const T &value)
+   {
+     *out_m << value;
+     if (delim_m != 0)
+       *out_m << delim_m;
+     return *this;
+   }
+   InformIterator &operator*() { return *this; }
+   InformIterator &operator++() { return *this; }
+   InformIterator &operator++(int) { return *this; }
+ private:
+   Inform *out_m;
+   const char *delim_m;
+ };
+ namespace Pooma {
+ class Options
+ {
+ public:
+   Options();
+   Options(int &argc, char ** argv);
+   Options(const Options &opts);
+   Options &operator=(const Options &opts);
+   ~Options();
+   int concurrency() const { return concurrency_m; }
+   void concurrency(int c)
+     {
+       ;
+       concurrency_m = c;
+     }
+   bool printInfo() const { return info_m; }
+   void printInfo(bool p) { info_m = p; }
+   bool printWarnings() const { return warn_m; }
+   void printWarnings(bool p) { warn_m = p; }
+   bool printErrors() const { return err_m; }
+   void printErrors(bool p) { err_m = p; }
+   const std::string &logfile() const { return logfile_m; }
+   void logfile(const std::string &s) { logfile_m = s; }
+   bool printStats() const { return stats_m; }
+   void printStats(bool p) { stats_m = p; }
+   int debug() const { return debug_m; }
+   void debug(int p) { debug_m = p; }
+   bool neverCompress() const { return neverCompress_m; }
+   void neverCompress(bool p) { neverCompress_m = p; }
+   bool deferredGuardFills() const { return deferredFills_m; }
+   void deferredGuardFills(bool p) { deferredFills_m = p; }
+   bool hardInit() const { return hardinit_m; }
+   void hardInit(bool p) { hardinit_m = p; }
+   bool hardRun() const { return hardrun_m; }
+   void hardRun(bool p) { hardrun_m = p; }
+   bool lockThreads() const { return lockthreads_m; }
+   void lockThreads(bool p) { lockthreads_m = p; }
+   bool blockingExpressions() const { return blockingExpressions_m; }
+   void blockingExpressions(bool p) { blockingExpressions_m = p; }
+   void usage();
+   void reset();
+   void parse(int &argc, char ** &argv);
+ private:
+   int concurrency_m;
+   bool info_m;
+   bool warn_m;
+   bool err_m;
+   std::string logfile_m;
+   bool stats_m;
+   int debug_m;
+   bool neverCompress_m;
+   bool deferredFills_m;
+   bool hardinit_m;
+   bool hardrun_m;
+   bool lockthreads_m;
+   bool blockingExpressions_m;
+ };
+ bool intArgument(int argc, char **argv, int pos, int &val);
+ bool stringArgument(int argc, char **argv, int pos, std::string &val);
+ bool doubleArgument(int argc, char **argv, int pos, double &val);
+ }
+ namespace Pooma {
+   typedef void (*AbortHandler_t)();
+   typedef int Context_t;
+   typedef int PatchID_t;
+   namespace Arch {
+     inline void dawdle() { }
+     inline void getCommandLineArguments(int &, char** &) { }
+     inline void initialize() { }
+     inline void finalize() { }
+   }
+   void incrementNumExpressions(long val = 1);
+   void incrementNumMultiPatchExpressions(long val = 1);
+   void incrementNumZBExpressions(long val = 1);
+   void incrementNumCompressedAssigns(long val = 1);
+   void incrementNumAssignsRequiringUnCompression(long val = 1);
+   void incrementNumInlineEvaluations(long val = 1);
+   void incrementNumLocalPatchesEvaluated(long val = 1);
+   void incrementNumReductions(long val = 1);
+   void incrementNumUnCompresses(long val = 1);
+   void incrementNumUnsuccessfulTryCompresses(long val = 1);
+   void incrementNumSuccessfulTryCompresses(long val = 1);
+   void incrementNumPolls(long val = 1);
+   extern Inform pinfo;
+   extern Inform pwarn;
+   extern Inform perr;
+   extern Inform pdebug;
+   bool initialize(int &argc, char ** &argv,
+     bool initRTS = true, bool getCLArgsArch = true, bool initArch = true);
+   bool initialize(Pooma::Options &opts, bool initRTS = true,
+     bool initArch = true);
+   bool finalize();
+   bool finalize(bool quitRTS, bool quitArch);
+   void pAbort(int errorcode = 0) __attribute__((noreturn));
+   void pAbort(const char *msg, int errorcode = 0) __attribute__((noreturn));
+   void stopHere();
+   AbortHandler_t abortHandler();
+   AbortHandler_t abortHandler(AbortHandler_t);
+   AbortHandler_t resetAbortHandler();
+   const char *version();
+   int majorVersion();
+   int minorVersion();
+   const char *buildDate();
+   bool printStats();
+   void printStats(bool on);
+   bool infoMessages();
+   void infoMessages(bool on);
+   bool warnMessages();
+   void warnMessages(bool on);
+   bool errorMessages();
+   void errorMessages(bool on);
+   void logMessages(const char *filename);
+   int debugLevel();
+   void debugLevel(int val);
+   bool neverCompress();
+   void neverCompress(bool p);
+   bool deferredGuardFills();
+   void deferredGuardFills(bool p);
+   extern Context_t myContext_g;
+   extern int numContexts_g;
+   extern int expression_g;
+   inline Context_t context() { return myContext_g; }
+   inline int contexts() { return numContexts_g; }
+   Scheduler_t &scheduler();
+   void blockAndEvaluate();
+   bool hardInit();
+   void hardInit(bool on);
+   bool hardRun();
+   void hardRun(bool on);
+   bool lockThreads();
+   void lockThreads(bool on);
+   bool blockingExpressions();
+   void blockingExpressions(bool on);
+   inline void beginExpression()
+   {
+     scheduler().beginGeneration();
+   }
+   inline void endExpression()
+   {
+     scheduler().endGeneration();
+     expression_g++;
+     if (blockingExpressions())
+       blockAndEvaluate();
+   }
+   inline int expression()
+   {
+     return expression_g;
+   }
+ inline void poll()
+ {
+     ;
+ }
+ }
+ template<int Dim, class T, class EngineTag> class Array;
+ template<int Dim, class T, class EngineTag> class Engine;
+ template<class Subject, class Sub1, bool SV>
+ struct View1Implementation;
+ template <class LayoutTag, class PatchTag>
+ struct MultiPatch;
+ template <class LayoutTag, class PatchTag, int Dim2>
+ struct MultiPatchView;
+ template<class Expr>
+ struct ExpressionTag;
+ template <int Dim, class T, class EngineTag>
+ class Engine;
+ template <class Engine, class SubDomain>
+ struct NewEngine
+ {
+ };
+ template <class Engine, class SubDomain>
+ struct NewEngineEngine
+ {
+   typedef Engine Type_t;
+   static inline
+   const Engine &apply(const Engine &e, const SubDomain &)
+   {
+     return e;
+   }
+ } ;
+ template <class Engine, class SubDomain>
+ struct NewEngineDomain
+ {
+   typedef SubDomain Type_t;
+   typedef const SubDomain &Return_t;
+   static inline
+   Return_t apply(const Engine &, const SubDomain &i)
+   {
+     return i;
+   }
+ } ;
+ template<class Eng, class Dom>
+ inline typename NewEngineEngine<Eng, Dom>::Type_t
+ newEngineEngine(const Eng &e, const Dom &dom)
+ {
+   return NewEngineEngine<Eng, Dom>::apply(e, dom);
+ }
+ template<class Eng, class Dom>
+ inline typename NewEngineDomain<Eng, Dom>::Type_t
+ newEngineDomain(const Eng &e, const Dom &dom)
+ {
+   return NewEngineDomain<Eng, Dom>::apply(e, dom);
+ }
+ struct EngineConstructTag
+ {
+   EngineConstructTag() { };
+   ~EngineConstructTag() { };
+   EngineConstructTag(const EngineConstructTag &) { };
+   EngineConstructTag &operator=(const EngineConstructTag &) { return *this; }
+ };
+ template<class T>
+ class Scalar
+ {
+ public:
+   inline
+   Scalar() { }
+   inline
+   Scalar(const T &t) : scalar_m(t) { }
+   template<class T1>
+   inline
+   explicit Scalar(const T1 &t) : scalar_m(t) { }
+   template<class Arg>
+   inline
+   Scalar(const Scalar<T> &s, const Arg &)
+     : scalar_m(s.scalar_m) { }
+   template<class Arg1, class Arg2>
+   inline
+   Scalar(const Scalar<T> &s, const Arg1 &, const Arg2 &)
+     : scalar_m(s.scalar_m) { }
+   inline
+   Scalar(const Scalar<T> &s) : scalar_m(s.scalar_m) { }
+   inline
+   const T &value() const { return scalar_m; }
+   inline
+   Scalar<T> &operator=(const Scalar<T> &rhs)
+   {
+     scalar_m = rhs.scalar_m;
+     return *this;
+   }
+   inline
+   Scalar<T> &operator=(const T &rhs)
+   {
+     scalar_m = rhs;
+     return *this;
+   }
+ private:
+   T scalar_m;
+ };
+ template<class T, class Op>
+ struct UnaryReturn {
+   typedef T Type_t;
+ };
+ template<class T1, class T2>
+ struct Promote { typedef T1 Type_t; };
+ template<>
+ struct Promote<bool, bool> {
+   typedef bool Type_t;
+ };
+ template<>
+ struct Promote<bool, char> {
+   typedef char Type_t;
+ };
+ template<>
+ struct Promote<bool, short> {
+   typedef short Type_t;
+ };
+ template<>
+ struct Promote<bool, int> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<bool, long> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<bool, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<bool, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<char, bool> {
+   typedef char Type_t;
+ };
+ template<>
+ struct Promote<char, char> {
+   typedef char Type_t;
+ };
+ template<>
+ struct Promote<char, short> {
+   typedef short Type_t;
+ };
+ template<>
+ struct Promote<char, int> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<char, long> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<char, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<char, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<short, bool> {
+   typedef short Type_t;
+ };
+ template<>
+ struct Promote<short, char> {
+   typedef short Type_t;
+ };
+ template<>
+ struct Promote<short, short> {
+   typedef short Type_t;
+ };
+ template<>
+ struct Promote<short, int> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<short, long> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<short, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<short, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<int, bool> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<int, char> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<int, short> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<int, int> {
+   typedef int Type_t;
+ };
+ template<>
+ struct Promote<int, long> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<int, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<int, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<long, bool> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<long, char> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<long, short> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<long, int> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<long, long> {
+   typedef long Type_t;
+ };
+ template<>
+ struct Promote<long, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<long, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<float, bool> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, char> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, short> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, int> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, long> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, float> {
+   typedef float Type_t;
+ };
+ template<>
+ struct Promote<float, double> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, bool> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, char> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, short> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, int> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, long> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, float> {
+   typedef double Type_t;
+ };
+ template<>
+ struct Promote<double, double> {
+   typedef double Type_t;
+ };
+ template<class T1, class T2, class Op>
+ struct BinaryReturn {
+   typedef typename Promote<T1, T2>::Type_t Type_t;
+ };
+ template<class T1, class T2, class T3, class Op>
+ struct TrinaryReturn {
+   typedef typename BinaryReturn<T2, T3, Op>::Type_t Type_t;
+ };
+ template<class T>
+ struct Reference
+ {
+   typedef T Type_t;
+   inline
+   Reference(const T &reference)
+     : reference_m(reference)
+   { }
+   inline
+   Reference(const Reference<T> &model)
+     : reference_m(model.reference())
+   { }
+   inline
+   const T &reference() const
+   {
+     return reference_m;
+   }
+   operator const T& () const { return reference_m; }
+   operator T& () const { return const_cast<T&>(reference_m); }
+   const T &reference_m;
+ };
+ template<class T>
+ struct DeReference
+ {
+   typedef const T &Return_t;
+   typedef T Type_t;
+   static inline Return_t apply(const T &a) { return a; }
+ };
+ template<class T>
+ struct DeReference<Reference<T> >
+ {
+   typedef const T &Return_t;
+   typedef T Type_t;
+   static inline Return_t apply(const Reference<T> &a) { return a.reference(); }
+ };
+ template<class Op, class Child>
+ class UnaryNode
+ {
+ public:
+   inline
+   typename DeReference<Child>::Return_t
+   child() const { return DeReference<Child>::apply(child_m); }
+   inline
+   UnaryNode(const Child &c)
+     : child_m(c) { }
+   inline
+   UnaryNode(const UnaryNode<Op, Child> &t)
+     : child_m(t.child()) { }
+   template<class OtherChild>
+   inline
+   UnaryNode(const UnaryNode<Op, OtherChild> &t)
+     : child_m(t.child()) { }
+   template<class OtherChild, class Arg>
+   inline
+   UnaryNode(const UnaryNode<Op, OtherChild> &t, const Arg &a)
+     : child_m(t.child(), a) { }
+   template<class OtherChild, class Arg1, class Arg2>
+   inline
+   UnaryNode(const UnaryNode<Op, OtherChild> &t,
+      const Arg1 &a1, const Arg2 &a2)
+     : child_m(t.child(), a1, a2)
+     { }
+ private:
+   Child child_m;
+ };
+ template<class Op, class Left, class Right>
+ class BinaryNode
+ {
+ public:
+   inline
+   typename DeReference<Left>::Return_t
+   left() const { return DeReference<Left>::apply(left_m); }
+   inline
+   typename DeReference<Right>::Return_t
+   right() const { return DeReference<Right>::apply(right_m); }
+   inline
+   BinaryNode(const Left &l, const Right &r)
+     : left_m(l), right_m(r)
+   { }
+   inline
+   BinaryNode(const BinaryNode<Op, Left, Right> &t)
+     : left_m(t.left()), right_m(t.right())
+   { }
+   template<class OtherLeft, class OtherRight>
+   inline
+   BinaryNode(const BinaryNode<Op, OtherLeft, OtherRight> &t)
+     : left_m(t.left()), right_m(t.right())
+   { }
+   template<class OtherLeft, class OtherRight, class Arg>
+   inline
+   BinaryNode(const BinaryNode<Op, OtherLeft, OtherRight> &t,
+       const Arg &a)
+     : left_m(t.left(), a), right_m(t.right(), a)
+   { }
+   template<class OtherLeft, class OtherRight, class Arg1, class Arg2>
+   inline
+   BinaryNode(const BinaryNode<Op, OtherLeft, OtherRight> &t,
+       const Arg1 &a1, const Arg2 &a2)
+     : left_m(t.left(), a1, a2), right_m(t.right(), a1, a2)
+   { }
+ private:
+   Left left_m;
+   Right right_m;
+ };
+ template< class Op, class Left, class Middle, class Right>
+ class TrinaryNode
+ {
+ public:
+   inline
+   typename DeReference<Left>::Return_t
+   left() const { return DeReference<Left>::apply(left_m); }
+   inline
+   typename DeReference<Right>::Return_t
+   right() const { return DeReference<Right>::apply(right_m); }
+   inline
+   typename DeReference<Middle>::Return_t
+   middle() const { return DeReference<Middle>::apply(middle_m); }
+   inline
+   TrinaryNode(const Left &l, const Middle &m, const Right &r)
+     : left_m(l), middle_m(m), right_m(r)
+   { }
+   inline
+   TrinaryNode(const TrinaryNode<Op, Left, Middle, Right> &t)
+     : left_m(t.left()), middle_m(t.middle()), right_m(t.right())
+   { }
+   template<class OtherLeft, class OtherMiddle, class OtherRight>
+   inline
+   TrinaryNode(const TrinaryNode<Op, OtherLeft, OtherMiddle, OtherRight> & t)
+     : left_m(t.left()), middle_m(t.middle()), right_m(t.right())
+   { }
+   template<class OtherLeft, class OtherMiddle, class OtherRight, class Arg>
+   inline
+   TrinaryNode(const TrinaryNode<Op, OtherLeft, OtherMiddle, OtherRight> &t,
+        const Arg &a)
+     : left_m(t.left(), a), middle_m(t.middle(), a), right_m(t.right(), a)
+   { }
+   template<class OtherLeft, class OtherMiddle, class OtherRight,
+     class Arg1, class Arg2>
+   inline
+   TrinaryNode(const TrinaryNode<Op, OtherLeft, OtherMiddle, OtherRight> &t,
+        const Arg1 &a1, const Arg2 &a2)
+     : left_m(t.left(), a1, a2),
+       middle_m(t.middle(), a1, a2) , right_m(t.right(), a1, a2)
+   { }
+ private:
+   Left left_m;
+   Middle middle_m;
+   Right right_m;
+ };
+ struct FnArcCos
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnArcCos >::Type_t
+   operator()(const T &a) const
+   {
+     return (acos(a));
+   }
+ };
+ struct FnArcSin
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnArcSin >::Type_t
+   operator()(const T &a) const
+   {
+     return (asin(a));
+   }
+ };
+ struct FnArcTan
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnArcTan >::Type_t
+   operator()(const T &a) const
+   {
+     return (atan(a));
+   }
+ };
+ struct FnCeil
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnCeil >::Type_t
+   operator()(const T &a) const
+   {
+     return (ceil(a));
+   }
+ };
+ struct FnCos
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnCos >::Type_t
+   operator()(const T &a) const
+   {
+     return (cos(a));
+   }
+ };
+ struct FnHypCos
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnHypCos >::Type_t
+   operator()(const T &a) const
+   {
+     return (cosh(a));
+   }
+ };
+ struct FnExp
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnExp >::Type_t
+   operator()(const T &a) const
+   {
+     return (exp(a));
+   }
+ };
+ struct FnFabs
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnFabs >::Type_t
+   operator()(const T &a) const
+   {
+     return (fabs(a));
+   }
+ };
+ struct FnFloor
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnFloor >::Type_t
+   operator()(const T &a) const
+   {
+     return (floor(a));
+   }
+ };
+ struct FnLog
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnLog >::Type_t
+   operator()(const T &a) const
+   {
+     return (log(a));
+   }
+ };
+ struct FnLog10
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnLog10 >::Type_t
+   operator()(const T &a) const
+   {
+     return (log10(a));
+   }
+ };
+ struct FnSin
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnSin >::Type_t
+   operator()(const T &a) const
+   {
+     return (sin(a));
+   }
+ };
+ struct FnHypSin
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnHypSin >::Type_t
+   operator()(const T &a) const
+   {
+     return (sinh(a));
+   }
+ };
+ struct FnSqrt
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnSqrt >::Type_t
+   operator()(const T &a) const
+   {
+     return (sqrt(a));
+   }
+ };
+ struct FnTan
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnTan >::Type_t
+   operator()(const T &a) const
+   {
+     return (tan(a));
+   }
+ };
+ struct FnHypTan
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, FnHypTan >::Type_t
+   operator()(const T &a) const
+   {
+     return (tanh(a));
+   }
+ };
+ struct OpUnaryMinus
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, OpUnaryMinus >::Type_t
+   operator()(const T &a) const
+   {
+     return (-a);
+   }
+ };
+ struct OpUnaryPlus
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, OpUnaryPlus >::Type_t
+   operator()(const T &a) const
+   {
+     return (+a);
+   }
+ };
+ struct OpBitwiseNot
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, OpBitwiseNot >::Type_t
+   operator()(const T &a) const
+   {
+     return (~a);
+   }
+ };
+ struct OpIdentity
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, OpIdentity >::Type_t
+   operator()(const T &a) const
+   {
+     return (a);
+   }
+ };
+ struct OpNot
+ {
+  
+   template<class T>
+   inline typename UnaryReturn<T, OpNot >::Type_t
+   operator()(const T &a) const
+   {
+     return (!a);
+   }
+ };
+ template<class T >
+ struct UnaryReturn<T, OpNot > {
+   typedef bool Type_t;
+ };
+ template <class T1>
+ struct OpCast
+ {
+  
+   template<class T2>
+   inline UnaryReturn<T2, OpCast<T1> >
+   operator()(const T2 &a) const
+   {
+     return T1(a);
+   }
+ };
+ template<class T1, class T2>
+ struct UnaryReturn<T2, OpCast<T1> > {
+   typedef T1 Type_t;
+ };
+ struct OpAdd
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpAdd >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a + b);
+   }
+ };
+ struct OpSubtract
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpSubtract >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a - b);
+   }
+ };
+ struct OpMultiply
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpMultiply >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a * b);
+   }
+ };
+ struct OpDivide
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpDivide >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a / b);
+   }
+ };
+ struct OpMod
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpMod >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a % b);
+   }
+ };
+ struct OpBitwiseAnd
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseAnd >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a & b);
+   }
+ };
+ struct OpBitwiseOr
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseOr >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a | b);
+   }
+ };
+ struct OpBitwiseXor
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseXor >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a ^ b);
+   }
+ };
+ struct FnLdexp
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, FnLdexp >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (ldexp(a,b));
+   }
+ };
+ struct FnPow
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, FnPow >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (pow(a,b));
+   }
+ };
+ struct FnFmod
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, FnFmod >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (fmod(a,b));
+   }
+ };
+ struct FnArcTan2
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, FnArcTan2 >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (atan2(a,b));
+   }
+ };
+ struct OpLT
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpLT >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a < b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpLT > {
+   typedef bool Type_t;
+ };
+ struct OpLE
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpLE >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a <= b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpLE > {
+   typedef bool Type_t;
+ };
+ struct OpGT
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpGT >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a > b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpGT > {
+   typedef bool Type_t;
+ };
+ struct OpGE
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpGE >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a >= b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpGE > {
+   typedef bool Type_t;
+ };
+ struct OpEQ
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpEQ >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a == b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpEQ > {
+   typedef bool Type_t;
+ };
+ struct OpNE
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpNE >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a != b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpNE > {
+   typedef bool Type_t;
+ };
+ struct OpAnd
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpAnd >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a && b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpAnd > {
+   typedef bool Type_t;
+ };
+ struct OpOr
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpOr >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a || b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpOr > {
+   typedef bool Type_t;
+ };
+ struct OpLeftShift
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpLeftShift >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a << b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpLeftShift > {
+   typedef T1 Type_t;
+ };
+ struct OpRightShift
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpRightShift >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (a >> b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpRightShift > {
+   typedef T1 Type_t;
+ };
+ struct OpAddAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpAddAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) += b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpAddAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpSubtractAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpSubtractAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) -= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpSubtractAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpMultiplyAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpMultiplyAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) *= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpMultiplyAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpDivideAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpDivideAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) /= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpDivideAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpModAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpModAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) %= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpModAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpBitwiseOrAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseOrAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) |= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpBitwiseOrAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpBitwiseAndAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseAndAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) &= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpBitwiseAndAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpBitwiseXorAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpBitwiseXorAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) ^= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpBitwiseXorAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpLeftShiftAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpLeftShiftAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) <<= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpLeftShiftAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpRightShiftAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpRightShiftAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     (const_cast<T1 &>(a) >>= b); return const_cast<T1 &>(a);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpRightShiftAssign > {
+   typedef T1 &Type_t;
+ };
+ struct OpAssign
+ {
+  
+   template<class T1, class T2>
+   inline typename BinaryReturn<T1, T2, OpAssign >::Type_t
+   operator()(const T1 &a, const T2 &b) const
+   {
+     return (const_cast<T1 &>(a) = b);
+   }
+ };
+ template<class T1, class T2 >
+ struct BinaryReturn<T1, T2, OpAssign > {
+   typedef T1 &Type_t;
+ };
+ struct FnWhere
+ {
+  
+   template<class T1, class T2, class T3>
+   inline typename TrinaryReturn<T1, T2, T3, FnWhere >
+   ::Type_t
+   operator()(T1 &a, const T2 &b, const T3 &c) const
+   {
+     if (a) return b; else return c;
+   }
+ };
+ template<class LeafType, class LeafTag>
+ struct LeafFunctor
+ { };
+ template<class LeafType, class LeafTag>
+ inline
+ typename LeafFunctor<LeafType, LeafTag>::Type_t
+ leafFunctor(const LeafType &leaf, const LeafTag &tag)
+ {
+   return LeafFunctor<LeafType, LeafTag>::apply(leaf, tag);
+ }
+ struct EvalLeaf1
+ {
+   int i1_m;
+   inline EvalLeaf1(int i1) : i1_m(i1) { }
+   inline int val1() const { return i1_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf1>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf1 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf2
+ {
+   int i1_m, i2_m;
+   inline EvalLeaf2(int i1, int i2) : i1_m(i1), i2_m(i2) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf2>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf2 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf3
+ {
+   int i1_m, i2_m, i3_m;
+   inline EvalLeaf3(int i1, int i2, int i3)
+     : i1_m(i1), i2_m(i2), i3_m(i3) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+   inline int val3() const { return i3_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf3>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf3 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf4
+ {
+   int i1_m, i2_m, i3_m, i4_m;
+   inline EvalLeaf4(int i1, int i2, int i3, int i4)
+     : i1_m(i1), i2_m(i2), i3_m(i3), i4_m(i4) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+   inline int val3() const { return i3_m; }
+   inline int val4() const { return i4_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf4>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf4 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf5
+ {
+   int i1_m, i2_m, i3_m, i4_m, i5_m;
+   inline EvalLeaf5(int i1, int i2, int i3, int i4, int i5)
+     : i1_m(i1), i2_m(i2), i3_m(i3), i4_m(i4), i5_m(i5) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+   inline int val3() const { return i3_m; }
+   inline int val4() const { return i4_m; }
+   inline int val5() const { return i5_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf5>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf5 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf6
+ {
+   int i1_m, i2_m, i3_m, i4_m, i5_m, i6_m;
+   inline EvalLeaf6(int i1, int i2, int i3, int i4, int i5, int i6)
+     : i1_m(i1), i2_m(i2), i3_m(i3), i4_m(i4), i5_m(i5), i6_m(i6) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+   inline int val3() const { return i3_m; }
+   inline int val4() const { return i4_m; }
+   inline int val5() const { return i5_m; }
+   inline int val6() const { return i6_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf6>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf6 &)
+   {
+     return s.value();
+   }
+ };
+ struct EvalLeaf7
+ {
+   int i1_m, i2_m, i3_m, i4_m, i5_m, i6_m, i7_m;
+   inline EvalLeaf7(int i1, int i2, int i3, int i4, int i5, int i6,
+     int i7)
+     : i1_m(i1), i2_m(i2), i3_m(i3), i4_m(i4), i5_m(i5), i6_m(i6), i7_m(i7) { }
+   inline int val1() const { return i1_m; }
+   inline int val2() const { return i2_m; }
+   inline int val3() const { return i3_m; }
+   inline int val4() const { return i4_m; }
+   inline int val5() const { return i5_m; }
+   inline int val6() const { return i6_m; }
+   inline int val7() const { return i7_m; }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, EvalLeaf7>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const EvalLeaf7 &)
+   {
+     return s.value();
+   }
+ };
+ struct IncrementLeaf
+ { };
+ template<class T>
+ struct LeafFunctor<T, IncrementLeaf>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t apply(const T &cl, const IncrementLeaf &)
+   {
+     T &l = const_cast<T &>(cl);
+     ++l;
+     return 0;
+   }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, IncrementLeaf>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t apply(const Scalar<T> &, const IncrementLeaf &)
+   {
+     return 0;
+   }
+ };
+ struct DecrementLeaf
+ { };
+ template<class T>
+ struct LeafFunctor<T, DecrementLeaf>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t apply(const T &cl, const DecrementLeaf &)
+   {
+     T &l = const_cast<T &>(cl);
+     --l;
+     return 0;
+   }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, DecrementLeaf>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t apply(const Scalar<T> &, const DecrementLeaf &)
+   {
+     return 0;
+   }
+ };
+ struct DereferenceLeaf
+ { };
+ template<class ForwardIterator>
+ struct LeafFunctor<ForwardIterator, DereferenceLeaf>
+ {
+   typedef typename std::iterator_traits<ForwardIterator>::value_type Type_t;
+   inline static
+   Type_t apply(const ForwardIterator &i, const DereferenceLeaf &)
+   {
+     return *i;
+   }
+ };
+ template<class T>
+ struct LeafFunctor<Scalar<T>, DereferenceLeaf>
+ {
+   typedef T Type_t;
+   inline static
+   const Type_t &apply(const Scalar<T> &s, const DereferenceLeaf &)
+   {
+     return s.value();
+   }
+ };
+ template<class A, class Op, class Tag>
+ struct Combine1
+ {
+   typedef A Type_t;
+   inline static
+   Type_t combine(const A &a, const Tag &) { return a; }
+ };
+ template<class A, class B, class Op, class Tag>
+ struct Combine2
+ {
+ };
+ template<class A,class B,class C,class Op,class Tag>
+ struct Combine3
+ {
+   typedef typename Combine2<A, B, Op, Tag>::Type_t Type1_t;
+   typedef typename Combine2<Type1_t, C, Op, Tag>::Type_t Type_t;
+   inline static
+   Type_t combine(const A& a, const B& b, const C& c, const Tag& t)
+   {
+     return
+       Combine2<Type1_t, C,
+       Op, Tag>::combine(Combine2<A, B, Op, Tag>::combine(a,b,t),c,t);
+   }
+ };
+ template<class A, class Op, class Tag>
+ inline typename Combine1<A, Op, Tag>::Type_t
+ peteCombine(const A &a, const Op &, const Tag &t)
+ {
+   return Combine1<A, Op, Tag>::combine(a, t);
+ }
+ template<class A, class B, class Op, class Tag>
+ inline typename Combine2<A, B, Op, Tag>::Type_t
+ peteCombine(const A &a, const B &b, const Op &, const Tag &t)
+ {
+   return Combine2<A, B, Op, Tag>::combine(a, b, t);
+ }
+ template<class A, class B, class C, class Op, class Tag>
+ inline typename Combine3<A, B, C, Op, Tag>::Type_t
+ peteCombine(const A &a, const B &b, const C &c, const Op &, const Tag &t)
+ {
+   return Combine3<A, B, C, Op, Tag>::combine(a, b, c, t);
+ }
+ struct TreeCombine
+ {
+  
+ };
+ template<class A, class Op>
+ struct Combine1<A, Op, TreeCombine >
+ {
+   typedef UnaryNode<Op, A> Type_t;
+   inline static
+   Type_t combine(const A &a, const TreeCombine &t)
+   {
+     return Type_t(a);
+   }
+ };
+ template<class A, class B, class Op>
+ struct Combine2<A, B, Op, TreeCombine >
+ {
+   typedef BinaryNode<Op, A, B> Type_t;
+   inline static
+   Type_t combine(const A &a, const B &b, const TreeCombine &t)
+   {
+     return Type_t(a, b);
+   }
+ };
+ template<class A, class B, class C, class Op>
+ struct Combine3<A, B, C, Op, TreeCombine >
+ {
+   typedef TrinaryNode<Op, A, B, C> Type_t;
+   inline static
+   Type_t combine(const A &a, const B &b, const C &c, const TreeCombine &t)
+   {
+     return Type_t(a, b, c);
+   }
+ };
+ struct OpCombine
+ {
+  
+ };
+ template<class A,class Op>
+ struct Combine1<A, Op, OpCombine>
+ {
+   typedef typename UnaryReturn<A, Op>::Type_t Type_t;
+   inline static
+   Type_t combine(A a, OpCombine) { return Op()(a); }
+ };
+ template<class A,class B,class Op>
+ struct Combine2<A, B, Op, OpCombine>
+ {
+   typedef typename BinaryReturn<A, B, Op>::Type_t Type_t;
+   inline static
+   Type_t combine(A a, B b, OpCombine)
+   {
+     return Op()(a, b);
+   }
+ };
+ template<class A,class B,class C,class Op>
+ struct Combine3<A, B, C, Op, OpCombine>
+ {
+   typedef typename TrinaryReturn<A, B, C, Op>::Type_t Type_t;
+   inline static
+   Type_t combine(A a, B b, C c, OpCombine)
+   {
+     return Op()(a, b, c);
+   }
+ };
+ struct AndCombine
+ {
+  
+ };
+ template<class Op>
+ struct Combine2<bool, bool, Op, AndCombine>
+ {
+   typedef bool Type_t;
+   inline static
+   Type_t combine(bool a, bool b, AndCombine)
+   {
+     return (a && b);
+   }
+ };
+ struct OrCombine
+ {
+  
+ };
+ template<class Op>
+ struct Combine2<bool, bool, Op, OrCombine>
+ {
+   typedef bool Type_t;
+   inline static
+   Type_t combine(bool a, bool b, OrCombine)
+   {
+     return (a || b);
+   }
+ };
+ struct NullCombine
+ {
+  
+ };
+ template<class Op>
+ struct Combine2<int, int, Op, NullCombine>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t combine(int, int, NullCombine)
+   {
+     return 0;
+   }
+ };
+ struct SumCombine
+ {
+  
+ };
+ template<class Op>
+ struct Combine2<int, int, Op, SumCombine>
+ {
+   typedef int Type_t;
+   inline static
+   Type_t combine(int a, int b, SumCombine)
+   {
+     return a + b;
+   }
+ };
+ template<class Expr, class FTag, class CTag>
+ struct ForEach
+ {
+   typedef typename LeafFunctor<Expr, FTag>::Type_t Type_t;
+   inline static
+   Type_t apply(const Expr &expr, const FTag &f, const CTag &)
+   {
+     return LeafFunctor<Expr, FTag>::apply(expr, f);
+   }
+ };
+ template<class Expr, class FTag, class CTag>
+ inline typename ForEach<Expr,FTag,CTag>::Type_t
+ forEach(const Expr &e, const FTag &f, const CTag &c)
+ {
+   return ForEach<Expr, FTag, CTag>::apply(e, f, c);
+ }
+ template<class Op, class A, class FTag, class CTag>
+ struct ForEach<UnaryNode<Op, A>, FTag, CTag>
+ {
+   typedef typename ForEach<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename Combine1<TypeA_t, Op, CTag>::Type_t Type_t;
+   inline static
+   Type_t apply(const UnaryNode<Op, A> &expr, const FTag &f,
+     const CTag &c)
+   {
+     return Combine1<TypeA_t, Op, CTag>::
+       combine(ForEach<A, FTag, CTag>::apply(expr.child(), f, c), c);
+   }
+ };
+ template<class Op, class A, class B, class FTag, class CTag>
+ struct ForEach<BinaryNode<Op, A, B>, FTag, CTag >
+ {
+   typedef typename ForEach<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename ForEach<B, FTag, CTag>::Type_t TypeB_t;
+   typedef typename Combine2<TypeA_t, TypeB_t, Op, CTag>::Type_t Type_t;
+   inline static
+   Type_t apply(const BinaryNode<Op, A, B> &expr, const FTag &f,
+         const CTag &c)
+   {
+     return Combine2<TypeA_t, TypeB_t, Op, CTag>::
+       combine(ForEach<A, FTag, CTag>::apply(expr.left(), f, c),
+               ForEach<B, FTag, CTag>::apply(expr.right(), f, c),
+        c);
+   }
+ };
+ template<class Op, class A, class B, class C, class FTag, class CTag>
+ struct ForEach<TrinaryNode<Op, A, B, C>, FTag, CTag >
+ {
+   typedef typename ForEach<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename ForEach<B, FTag, CTag>::Type_t TypeB_t;
+   typedef typename ForEach<C, FTag, CTag>::Type_t TypeC_t;
+   typedef typename Combine3<TypeA_t, TypeB_t, TypeC_t, Op, CTag>::Type_t
+     Type_t;
+   inline static
+   Type_t apply(const TrinaryNode<Op, A, B, C> &expr, const FTag &f,
+         const CTag &c)
+   {
+     return Combine3<TypeA_t, TypeB_t, TypeC_t, Op, CTag>::
+       combine(ForEach<A, FTag, CTag>::apply(expr.left(), f, c),
+        ForEach<B, FTag, CTag>::apply(expr.middle(), f, c),
+        ForEach<C, FTag, CTag>::apply(expr.right(), f, c),
+        c);
+   }
+ };
+ template<class T> class Expression;
+ template<class T, class FTag, class CTag>
+ struct ForEach<Expression<T>, FTag, CTag>
+ {
+   typedef typename ForEach<T, FTag, CTag>::Type_t Type_t;
+   inline static
+   Type_t apply(const Expression<T> &expr, const FTag &f,
+         const CTag &c)
+   {
+     return ForEach<T, FTag, CTag>::apply(expr.expression(), f, c);
+   }
+ };
+ template<class T> struct Reference;
+ template<class T, class FTag, class CTag>
+ struct ForEach<Reference<T>, FTag, CTag>
+ {
+   typedef typename ForEach<T, FTag, CTag>::Type_t Type_t;
+   inline static
+   Type_t apply(const Reference<T> &ref, const FTag &f,
+         const CTag &c)
+   {
+     return ForEach<T, FTag, CTag>::apply(ref.reference(), f, c);
+   }
+ };
+ template<class T>
+ class Expression
+ {
+ public:
+   typedef T Expression_t;
+   Expression(const T& expr) : expr_m(expr)
+   { }
+   const Expression_t& expression() const
+   {
+     return expr_m;
+   }
+ private:
+   T expr_m;
+ };
+ template<class T>
+ struct CreateLeaf
+ {
+   typedef Scalar<T> Leaf_t;
+   inline static
+   Leaf_t make(const T &a)
+   {
+     return Scalar<T>(a);
+   }
+ };
+ template<class T>
+ struct CreateLeaf<Expression<T> >
+ {
+   typedef typename Expression<T>::Expression_t Leaf_t;
+   inline static
+   const Leaf_t &make(const Expression<T> &a)
+   {
+     return a.expression();
+   }
+ };
+ template<class T>
+ struct MakeReturn
+ {
+   typedef Expression<T> Expression_t;
+   inline static
+   Expression_t make(const T &a) { return Expression_t(a); }
+ };
+ struct ErrorType
+ {
+ };
+ template<class Expr, class FTag, class CTag>
+ struct ForEachRef
+ {
+   typedef typename LeafFunctor<Expr, FTag>::Type_t Type_t;
+   inline static
+   const Type_t &apply(const Expr &expr, const FTag &f, const CTag &)
+     {
+       return LeafFunctor<Expr, FTag>::apply(expr, f);
+     }
+ };
+ template<class Expr, class FTag, class CTag>
+ inline const typename ForEachRef<Expr,FTag,CTag>::Type_t &
+ forEachRef(const Expr &e, const FTag &f, const CTag &c)
+ {
+   return ForEachRef<Expr, FTag, CTag>::apply(e, f, c);
+ }
+ template<class Op, class A, class FTag, class CTag>
+ struct ForEachRef<UnaryNode<Op, A>, FTag, CTag>
+ {
+   typedef typename ForEachRef<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename Combine1<TypeA_t, Op, CTag>::Type_t Type_t;
+   inline static
+   const Type_t &apply(const UnaryNode<Op, A> &expr, const FTag &f,
+     const CTag &c)
+     {
+       return Combine1<TypeA_t, Op, CTag>::
+         combine(ForEachRef<A, FTag, CTag>::apply(expr.child(), f, c),
+                 c);
+     }
+ };
+ template<class Op, class A, class B, class FTag, class CTag>
+ struct ForEachRef<BinaryNode<Op, A, B>, FTag, CTag >
+ {
+   typedef typename ForEachRef<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename ForEachRef<B, FTag, CTag>::Type_t TypeB_t;
+   typedef typename Combine2<TypeA_t, TypeB_t, Op, CTag>::Type_t Type_t;
+   inline static
+   const Type_t &apply(const BinaryNode<Op, A, B> &expr, const FTag &f,
+                    const CTag &c)
+     {
+       return Combine2<TypeA_t, TypeB_t, Op, CTag>::
+         combine(ForEachRef<A, FTag, CTag>::apply(expr.left(), f, c),
+                 ForEachRef<B, FTag, CTag>::apply(expr.right(), f, c),
+          c);
+     }
+ };
+ template<class Op, class A, class B, class C, class FTag, class CTag>
+ struct ForEachRef<TrinaryNode<Op, A, B, C>, FTag, CTag >
+ {
+   typedef typename ForEachRef<A, FTag, CTag>::Type_t TypeA_t;
+   typedef typename ForEachRef<B, FTag, CTag>::Type_t TypeB_t;
+   typedef typename ForEachRef<C, FTag, CTag>::Type_t TypeC_t;
+   typedef typename Combine3<TypeA_t, TypeB_t, TypeC_t, Op, CTag>::Type_t
+     Type_t;
+   inline static
+   const Type_t &apply(const TrinaryNode<Op, A, B, C> &expr, const FTag &f,
+                    const CTag &c)
+     {
+       return Combine3<TypeA_t, TypeB_t, TypeC_t, Op, CTag>::
+         combine(ForEachRef<A, FTag, CTag>::apply(expr.left(), f, c),
+          ForEachRef<B, FTag, CTag>::apply(expr.middle(), f, c),
+          ForEachRef<C, FTag, CTag>::apply(expr.right(), f, c),
+          c);
+     }
+ };
+ template<class T, class FTag, class CTag>
+ struct ForEachRef<Expression<T>, FTag, CTag>
+ {
+   typedef typename ForEachRef<T, FTag, CTag>::Type_t Type_t;
+   inline static
+   const Type_t &apply(const Expression<T> &expr, const FTag &f,
+                    const CTag &c)
+     {
+       return ForEachRef<T, FTag, CTag>::apply(expr.expression(), f, c);
+     }
+ };
+ template<class T, class FTag, class CTag>
+ struct ForEachRef<Reference<T>, FTag, CTag>
+ {
+   typedef typename ForEachRef<T, FTag, CTag>::Type_t Type_t;
+   inline static
+   const Type_t &apply(const Reference<T> &ref, const FTag &f,
+                    const CTag &c)
+     {
+       return ForEachRef<T, FTag, CTag>::apply(ref.reference(), f, c);
+     }
+ };
+ template<int Integer> class WrappedInt
+ {
+ public:
+   enum { val = Integer };
+  
+ };
+ template<int Dim, class T, class EngineTag> class Engine;
+ template<class Eng, class Tag>
+ struct EngineFunctorDefault
+ { };
+ template<class Eng, class Tag>
+ struct EngineFunctor
+ {
+   typedef typename EngineFunctorDefault<Eng,Tag>::Type_t Type_t;
+   inline static
+   Type_t apply(const Eng &e, const Tag &t)
+   {
+     return EngineFunctorDefault<Eng,Tag>::apply(e,t);
+   }
+ };
+ template<class Eng, class Tag>
+ inline typename EngineFunctor<Eng,Tag>::Type_t
+ engineFunctor(const Eng &e, const Tag &tag)
+ {
+   return EngineFunctor<Eng,Tag>::apply(e,tag);
+ }
+ template<class T, class Tag>
+ struct EngineFunctorScalar
+ { };
+ template<class Tag>
+ struct EngineView;
+ template<class Node, class Tag>
+ struct LeafFunctor<Node, EngineView<Tag> >
+ {
+ };
+ template<class T, class Tag>
+ struct LeafFunctor<Scalar<T>, EngineView<Tag> >
+ {
+   typedef Scalar<T> Type_t;
+   static inline
+   Type_t apply(const Scalar<T> &s, const EngineView<Tag> &)
+   {
+     return s;
+   }
+ };
+ template<class Engine, class Tag>
+ struct DefaultEngineView;
+ template<int Dim, class T, class E, class Tag>
+ struct LeafFunctor<Engine<Dim, T, E>, EngineView<Tag> >
+ {
+   typedef Engine<Dim, T, E> Subject_t;
+   typedef DefaultEngineView<Subject_t, Tag> EngineView_t;
+   typedef typename EngineView_t::Type_t Type_t;
+   static inline
+   Type_t apply(const Subject_t &engine,
+         const EngineView<Tag> &tag)
+   {
+     return EngineView_t::apply(engine, tag);
+   }
+ };
+ template<class Tag>
+ struct ExpressionApply
+ {
+   inline
+   ExpressionApply(const Tag &tag)
+     : tag_m(tag)
+   {
+   }
+   template<class A>
+   void operator()(const A &a) const
+   {
+     forEach(a, *this, NullCombine());
+   }
+   const Tag &tag() const { return tag_m; }
+   const Tag &tag_m;
+ };
+ template<class A, class Tag>
+ inline void
+ expressionApply(const A &a, const Tag &tag)
+ {
+   forEach(a, ExpressionApply<Tag>(tag), NullCombine());
+ }
+ template<class Node, class Tag>
+ struct LeafFunctor<Node, ExpressionApply<Tag> >
+ {
+ };
+ template<class T, class Tag>
+ struct LeafFunctor<Scalar<T>, ExpressionApply<Tag> >
+ {
+   typedef int Type_t;
+   static inline
+   Type_t apply(const Scalar<T> &, const ExpressionApply<Tag> &)
+   {
+     return 0;
+   }
+ };
+ template<class Engine, class Tag>
+ struct DefaultExpressionApply;
+ template<int Dim, class T, class E, class Tag>
+ struct LeafFunctor<Engine<Dim, T, E>, ExpressionApply<Tag> >
+ {
+   typedef Engine<Dim, T, E> Subject_t;
+   typedef DefaultExpressionApply<Subject_t, Tag> ExpressionApply_t;
+   typedef int Type_t;
+   static inline
+   Type_t apply(const Subject_t &engine,
+         const ExpressionApply<Tag> &tag)
+   {
+     return ExpressionApply_t::apply(engine, tag);
+   }
+ };
+ namespace Pooma {
+ class NoInit
+ {
+ public:
+  
+ };
+ }
+ template <class T> class DomainTraits;
+ template <class T>
+ struct SizeTypePromotion
+ {
+   typedef T Type_t;
+ };
+ template <>
+ struct SizeTypePromotion<int>
+ {
+   typedef long Type_t;
+ };
+ template <>
+ struct SizeTypePromotion<float>
+ {
+   typedef double Type_t;
+ };
+ template <int I>
+ struct Dom1Initialize {
+   template <class DT>
+   static inline void apply(typename DT::Storage_t& s)
+   {
+     Dom1Initialize<I-1>::template apply<DT>(s);
+     DomainTraits<typename DT::OneDomain_t>::initializeStorage(s[I].storage());
+   }
+ };
+ template <>
+ struct Dom1Initialize<0> {
+   template <class DT>
+   static inline void apply(typename DT::Storage_t& s)
+   {
+     DomainTraits<typename DT::OneDomain_t>::initializeStorage(s[0].storage());
+   }
+ };
+ template <class Domain>
+ struct WrapNoInit : public Domain
+ {
+   WrapNoInit() : Domain(Pooma::NoInit()) {}
+ };
+ template<class DomT, class T, int Dim>
+ struct DomainTraitsDomain
+ {
+   typedef typename SizeTypePromotion<T>::Type_t Size_t;
+   typedef T Element_t;
+   typedef DomT Domain_t;
+   typedef DomT NewDomain1_t;
+   enum { domain = true };
+   enum { dimensions = Dim };
+   static bool getIgnorable(const Domain_t &, int) { return false; }
+ };
+ template<class DomT, class T>
+ struct DomainTraitsDomain<DomT, T, 1>
+ {
+   typedef typename SizeTypePromotion<T>::Type_t Size_t;
+   typedef T Element_t;
+   typedef DomT Domain_t;
+   typedef DomT NewDomain1_t;
+   enum { domain = true };
+   enum { dimensions = 1 };
+   inline
+   static Element_t getFirst(const Domain_t &d) { return d.first(); }
+   inline
+   static Element_t getLast(const Domain_t &d) { return d.last(); }
+   inline
+   static Element_t getStride(const Domain_t &d) { return d.stride(); }
+   inline
+   static Size_t getLength(const Domain_t &d) { return d.length(); }
+   inline
+   static Size_t getSize(const Domain_t &d) { return d.size(); }
+   inline
+   static Element_t getMin(const Domain_t &d) { return d.min(); }
+   inline
+   static Element_t getMax(const Domain_t &d) { return d.max(); }
+   inline
+   static bool getEmpty(const Domain_t &d) { return d.empty(); }
+   inline
+   static int getLoop(const Domain_t &d) { return d.loop(); }
+   inline
+   static Element_t getElem(const Domain_t &d, int n) { return d.elem(n); }
+   inline
+   static bool getIgnorable(const Domain_t &, int) { return false; }
+ };
+ template<class DomT, class T, class NewDom1T>
+ struct DomainTraitsScalar
+ {
+   typedef DomT Domain_t;
+   typedef DomT OneDomain_t;
+   typedef NewDom1T NewDomain1_t;
+   typedef T PointDomain_t;
+   typedef T Element_t;
+   typedef int Size_t;
+   enum { domain = false };
+   enum { dimensions = 1,
+   sliceDimensions = 0 };
+   enum { loopAware = false };
+   enum { singleValued = true };
+   enum { unitStride = true };
+   enum { wildcard = false };
+   inline
+   static OneDomain_t getDomain(T d, int) { return OneDomain_t(d); }
+   inline
+   static PointDomain_t getPointDomain(T d, int) { return d; }
+   inline
+   static Element_t getFirst(const Element_t &d) { return d; }
+   inline
+   static Element_t getLast(const Element_t &d) { return d; }
+   inline
+   static int getStride(const Element_t &) { return 1; }
+   inline
+   static Size_t getLength(const Element_t &) { return 1; }
+   inline
+   static Size_t getSize(const Element_t &d) { return 1; }
+   inline
+   static Element_t getMin(const Element_t &d) { return d; }
+   inline
+   static Element_t getMax(const Element_t &d) { return d; }
+   inline
+   static bool getEmpty(const Element_t &) { return false; }
+   inline
+   static int getLoop(const Element_t &) { return 0; }
+   inline
+   static Element_t getElem(const Element_t &d, int) { return d; }
+ };
+ template<class T>
+ struct DomainTraits : public DomainTraitsScalar<T, T, T>
+ {
+   typedef DomainTraitsScalar<T, T, T> Base_t;
+   typedef typename Base_t::Domain_t Domain_t;
+   typedef typename Base_t::OneDomain_t OneDomain_t;
+   typedef typename Base_t::NewDomain1_t NewDomain1_t;
+   typedef typename Base_t::PointDomain_t PointDomain_t;
+   typedef typename Base_t::Element_t Element_t;
+   typedef typename Base_t::Size_t Size_t;
+   enum { domain = Base_t::domain };
+   enum { dimensions = Base_t::dimensions,
+   sliceDimensions = Base_t::sliceDimensions };
+   enum { loopAware = Base_t::loopAware };
+   enum { singleValued = Base_t::singleValued };
+   enum { unitStride = Base_t::unitStride };
+   enum { wildcard = Base_t::wildcard };
+ };
+ template<class T, int Dim>
+ struct DomainChangeDim {
+   typedef T OldType_t;
+   typedef T NewType_t;
+   enum { oldDim = Dim,
+   newDim = Dim };
+ };
+ template <class Dom, class Storage, class T1, class T2>
+ inline void
+ setDomain(const Dom&, Storage& data, const T1& beg, const T2& end) {
+   DomainTraits<Dom>::setDomain(data, beg, end);
+ }
+ template <int Dim> class Interval;
+ template <> class Interval<1>;
+ template <int Dim> class Loc;
+ template <> class Loc<1>;
+ template<>
+ struct DomainTraits<char>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<unsigned char>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<short>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<unsigned short>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<int>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<unsigned int>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<long>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<>
+ struct DomainTraits<unsigned long>
+   : public DomainTraitsScalar<Interval<1>, int, Loc<1> > { };
+ template<class T1, class T2, bool strided>
+ struct ContainsDomainSingle {
+   static bool contains(const T1 &a, const T2 &b) {
+     return (a.min() <= b.min() && a.max() >= b.max());
+   }
+ };
+ template<class T1, class T2>
+ struct ContainsDomainSingle<T1,T2,true> {
+   static bool contains(const T1 &a, const T2 &b) {
+     typedef typename DomainTraits<T1>::Element_t E1_t;
+     typedef typename DomainTraits<T2>::Element_t E2_t;
+     E1_t a0 = a.min();
+     E1_t a1 = a.max();
+     E1_t s = a.stride();
+     E2_t b0 = b.min();
+     E2_t b1 = b.max();
+     E2_t t = b.stride();
+     if (s < 0)
+       s = -s;
+     if (t < 0)
+       t = -t;
+     bool quicktest = (a0 <= b0 && a1 >= b1);
+     if (!quicktest || s == 1)
+       return quicktest;
+     return (t % s == 0) && ((b0-a0) % s == 0) && ((a1-b1) % s == 0);
+   }
+ };
+ template<class T1, class T2, int Dim>
+ struct ContainsDomain {
+   enum { strided = !DomainTraits<T1>::unitStride };
+   enum { n = Dim - 1 };
+   static bool contains(const T1 &a, const T2 &b) {
+     typedef typename DomainTraits<T1>::OneDomain_t Dom1_t;
+     typedef typename DomainTraits<T2>::OneDomain_t Dom2_t;
+     return ContainsDomainSingle<Dom1_t,Dom2_t,strided>::contains(
+       DomainTraits<T1>::getDomain(a,n), DomainTraits<T2>::getDomain(b,n)) &&
+       ContainsDomain<T1,T2,n>::contains(a,b);
+   }
+ };
+ template<class T1, class T2>
+ struct ContainsDomain<T1,T2,1> {
+   enum { strided = !DomainTraits<T1>::unitStride };
+   static bool contains(const T1 &a, const T2 &b) {
+     typedef typename DomainTraits<T1>::OneDomain_t Dom1_t;
+     typedef typename DomainTraits<T2>::OneDomain_t Dom2_t;
+     return ContainsDomainSingle<Dom1_t,Dom2_t,strided>::contains(
+       DomainTraits<T1>::getDomain(a,0), DomainTraits<T2>::getDomain(b,0));
+   }
+ };
+ template<class T1, class T2>
+ inline bool contains(const T1 &a, const T2 &b)
+ {
+   PoomaCTAssert<((int)DomainTraits<T1>::dimensions == DomainTraits<T2>::dimensions)>::test();
+   return ContainsDomain<T1,T2,DomainTraits<T1>::dimensions>::contains(a, b);
+ }
+ template<int Dim>
+ class Loc;
+ template<int Dim>
+ class Interval;
+ template<int Dim>
+ class Range;
+ template<class T>
+ class IndirectionList;
+ template<int Dim>
+ class Grid;
+ template<class T1,class T2 >
+ struct DomainArithOpsTraits
+ {
+ };
+ template <>
+ struct DomainArithOpsTraits< Loc<1> , Loc<1> >
+ {
+   typedef Loc<1> AddResult_t;
+   typedef Loc<1> SubResult_t;
+   typedef Loc<1> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Loc<1> , Loc<Dim> >
+ {
+   typedef Loc<Dim> AddResult_t;
+   typedef Loc<Dim> SubResult_t;
+   typedef Loc<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Loc<Dim> , Loc<1> >
+ {
+   typedef Loc<Dim> AddResult_t;
+   typedef Loc<Dim> SubResult_t;
+   typedef Loc<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Loc<Dim> , Loc<Dim2> >
+ {
+   typedef Loc<Dim> AddResult_t;
+   typedef Loc<Dim> SubResult_t;
+   typedef Loc<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Loc<1> , Interval<Dim> >
+ {
+   typedef Interval<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Interval<Dim>, Loc<1> >
+ {
+   typedef Interval<Dim> AddResult_t;
+   typedef Interval<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Loc<Dim> , Interval<Dim2> >
+ {
+   typedef Interval<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Interval<Dim>, Loc<Dim2> >
+ {
+   typedef Interval<Dim> AddResult_t;
+   typedef Interval<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Loc<1> , Range<Dim> >
+ {
+   typedef Range<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Range<Dim>, Loc<1> >
+ {
+   typedef Range<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Loc<Dim> , Range<Dim2> >
+ {
+   typedef Range<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Range<Dim>, Loc<Dim2> >
+ {
+   typedef Range<Dim> AddResult_t;
+   typedef Range<Dim> SubResult_t;
+   typedef Range<Dim> MultResult_t;
+ };
+ template< >
+ struct DomainArithOpsTraits<Loc<1> , IndirectionList<int> >
+ {
+   typedef IndirectionList<int> AddResult_t;
+   typedef IndirectionList<int> SubResult_t;
+   typedef IndirectionList<int> MultResult_t;
+ };
+ template< >
+ struct DomainArithOpsTraits<IndirectionList<int>, Loc<1> >
+ {
+   typedef IndirectionList<int> AddResult_t;
+   typedef IndirectionList<int> SubResult_t;
+   typedef IndirectionList<int> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Loc<1> , Grid<Dim> >
+ {
+   typedef Grid<Dim> AddResult_t;
+   typedef Grid<Dim> SubResult_t;
+   typedef Grid<Dim> MultResult_t;
+ };
+ template<int Dim>
+ struct DomainArithOpsTraits<Grid<Dim>, Loc<1> >
+ {
+   typedef Grid<Dim> AddResult_t;
+   typedef Grid<Dim> SubResult_t;
+   typedef Grid<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Loc<Dim> , Grid<Dim2> >
+ {
+   typedef Grid<Dim> AddResult_t;
+   typedef Grid<Dim> SubResult_t;
+   typedef Grid<Dim> MultResult_t;
+ };
+ template<int Dim,int Dim2>
+ struct DomainArithOpsTraits<Grid<Dim>, Loc<Dim2> >
+ {
+   typedef Grid<Dim> AddResult_t;
+   typedef Grid<Dim> SubResult_t;
+   typedef Grid<Dim> MultResult_t;
+ };
+ template <class