From gaeke at cs.uiuc.edu  Mon May 31 00:53:04 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon May 31 00:53:04 2004
Subject: [llvm-commits] CVS: reopt/include/reopt/UnpackTraceFunction.h
Message-ID: <200405310551.AAA27334@kain.cs.uiuc.edu>


Changes in directory reopt/include/reopt:

UnpackTraceFunction.h updated: 1.5 -> 1.6

---
Log message:

Update some comments.


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

Index: reopt/include/reopt/UnpackTraceFunction.h
diff -u reopt/include/reopt/UnpackTraceFunction.h:1.5 reopt/include/reopt/UnpackTraceFunction.h:1.6
--- reopt/include/reopt/UnpackTraceFunction.h:1.5	Sun May 30 14:39:49 2004
+++ reopt/include/reopt/UnpackTraceFunction.h	Mon May 31 00:51:42 2004
@@ -29,17 +29,17 @@
   TargetMachine *TM;
   TraceFunction *TF;
 
-  /// Static stack size of the MachineFunction. Filled in by rewriteProlog ()
-  /// by calling getStaticStackSize (), and then used again by rewriteEpilog ().
+  /// Static stack size of the MachineFunction. Filled in
+  /// by getStaticStackSize (), and then used by rewriteProlog & rewriteEpilog.
   ///
   unsigned StaticStackSize;
 
-  /// Total stack size of the MachineFunction, including space for regs
-  /// modified in TraceFn to be saved.
+  /// Total stack size of the MachineFunction, including space to save regs
+  /// modified in TraceFn.
   ///
   int TotalStackSize;
 
-  /// Registers clobbered in the trace. Filled in by findRegsUsedInFunction ().
+  /// Registers clobbered in the trace. Filled in by findRegsToSave.
   ///
   std::set<unsigned> RegsToSave;
 




From gaeke at cs.uiuc.edu  Mon May 31 00:54:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon May 31 00:54:02 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/ValueAllocState.cpp
Message-ID: <200405310551.AAA27442@kain.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

ValueAllocState.cpp updated: 1.1 -> 1.2

---
Log message:

Refactor the calculation of InstructionKey & OperandKey into
getValueAllocStateKeys().  Make it understand that the first PHI node
in a trace should have a special key.


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

Index: reopt/lib/LightWtProfiling/ValueAllocState.cpp
diff -u reopt/lib/LightWtProfiling/ValueAllocState.cpp:1.1 reopt/lib/LightWtProfiling/ValueAllocState.cpp:1.2
--- reopt/lib/LightWtProfiling/ValueAllocState.cpp:1.1	Sun May 30 04:01:28 2004
+++ reopt/lib/LightWtProfiling/ValueAllocState.cpp	Mon May 31 00:51:44 2004
@@ -17,6 +17,7 @@
 #include "reopt/MappingInfo.h"
 #include "llvm/Module.h"
 #include "llvm/Argument.h"
+#include "llvm/iPHINode.h"
 #include "llvm/Support/InstIterator.h"
 #include "Support/Debug.h"
 #include "../../../../lib/Target/SparcV9/RegAlloc/AllocInfo.h"
@@ -85,26 +86,42 @@
   abort ();
 }
 
+static BasicBlock *TraceEntryBB = 0;
+
+/// getValueAllocStateKeys - Fill in InstructionKey and OperandKey with the
+/// indices used to look up saved register allocation state for V in F.
+///
+static void getValueAllocStateKeys (Function *F, Value *V, int &InstructionKey,
+                                    int &OperandKey, bool preferLiveIn) {
+  if (Argument *Arg = dyn_cast<Argument> (V)) {
+    InstructionKey = -1;
+    OperandKey = getNumberOfFunctionArg (F, Arg);
+  } else if (Instruction *Inst = dyn_cast<Instruction> (V)) {
+    InstructionKey = getSavedStateIndexOfInstruction (F, Inst);
+    if (isa<PHINode> (Inst) && preferLiveIn
+        && Inst->getParent() == TraceEntryBB)
+      OperandKey = -2; // look for PhiCpRes
+    else
+      OperandKey = -1;
+  } else {
+    std::cerr << "getValueAllocStateKeys: can't look up state for " << *V;
+    abort();
+  }
+}
+
 /// Returns the register number or stack position where V can be found in the
 /// machine code for the function F, which it finds by searching the global
 /// variable _llvm_regAllocState written out by PhyRegAlloc.cpp during a
 /// previous invocation of llc.
 ///
-static AllocInfo getValueAllocStateFromModule (Function *F, Value *V) {
+static AllocInfo getValueAllocStateFromModule (Function *F, Value *V,
+                                               bool preferLiveIn) {
   unsigned FI = getLLVMFunctionPositionInfo (F);
   FunctionAllocState *FAllocState = _llvm_regAllocState.functions[FI];
   assert (FAllocState->numTuples > 0
           && "Reg. alloc state for function is empty");
   int InstructionKey = -1, OperandKey = -1;
-  if (Argument *A = dyn_cast<Argument> (V)) {
-    // Find the alloc state of an argument.
-    OperandKey = getNumberOfFunctionArg (F, A);
-  } else {
-    // Figure out the indices (FI, VI, VO) that can be used to look up V, which
-    // is an operand of some instruction in F, in _llvm_regAllocState:
-    Instruction *Instr = cast<Instruction> (V);
-    InstructionKey = getSavedStateIndexOfInstruction (F, Instr);
-  }
+  getValueAllocStateKeys (F, V, InstructionKey, OperandKey, preferLiveIn);
   // Reconstruct the AllocInfo for V by searching
   // _llvm_regAllocState.functions[FI] for a tuple that starts with
   // (InstructionKey, OperandKey, ...):
@@ -121,7 +138,7 @@
   }
   // By this time we had better have found it, otherwise we are about to do bad
   // things.
-  std::cerr << "ERROR: UnpackTraceFunction: No saved AllocInfo found for "
+  std::cerr << "ERROR: No saved AllocInfo found for "
             << F->getName () << "()'s value " << *V
             << " in getValueAllocStateFromModule()\n";
   abort ();
@@ -131,26 +148,13 @@
 /// machine code for the function F, which it finds by searching the global
 /// variable ExportedFnAllocState exported by PhyRegAlloc.cpp.
 ///
-static AllocInfo getValueAllocStateFromGlobal (Function *F, Value *V) {
+static AllocInfo getValueAllocStateFromGlobal (Function *F, Value *V,
+                                               bool preferLiveIn) {
   // Get the saved PhyRegAlloc state for F out of ExportedFnAllocState:
   std::vector<AllocInfo> &FState = ExportedFnAllocState[F];
   assert (FState.size () > 0 && "Reg. alloc state for function is empty");
   int InstructionKey = -1, OperandKey = -1;
-  if (Argument *A = dyn_cast<Argument> (V)) {
-    // Find the alloc state of an argument.
-    OperandKey = getNumberOfFunctionArg (F, A);
-  } else {
-    if (! isa<Instruction> (V)) {
-      std::cerr
-        << "ERROR: Don't know how to look up alloc state for this Value:\n\t"
-        << *V << "\n";
-      abort ();
-    }
-    // Figure out the indices (VI, VO) that can be used to look up V,
-    // which is some instruction producing a value in F, in FState:
-    Instruction *Instr = cast<Instruction> (V);
-    InstructionKey = getSavedStateIndexOfInstruction (F, Instr);
-  }
+  getValueAllocStateKeys (F, V, InstructionKey, OperandKey, preferLiveIn);
   // Reconstruct the AllocInfo for V by searching
   // FState for a tuple that starts with (InstructionKey, OperandKey, ...):
   for (unsigned i = 0, s = FState.size (); i < s; ++i) {
@@ -164,7 +168,7 @@
   }
   // By this time we had better have found it, otherwise we are about to do bad
   // things.
-  std::cerr << "ERROR: UnpackTraceFunction: No saved AllocInfo found for "
+  std::cerr << "ERROR: No saved AllocInfo found for "
             << F->getName () << "()'s value " << *V
             << " in getValueAllocStateFromGlobal()\n";
   abort ();
@@ -175,9 +179,12 @@
 ///
 std::pair<AllocInfo, AllocInfo>
 GetValueAllocState (TraceFunction *TF, Value *V, bool preferLiveIn) {
-  return std::make_pair (getValueAllocStateFromModule (TF->MatrixFn, V),
+  TraceEntryBB = TF->T.getEntryBasicBlock();
+  return std::make_pair
+   (getValueAllocStateFromModule (TF->MatrixFn, V, preferLiveIn),
     getValueAllocStateFromGlobal (TF->TraceFn,
-                                  TF->getCorrespondingValue (V, preferLiveIn)));
+                                  TF->getCorrespondingValue (V, preferLiveIn),
+                                  preferLiveIn));
 }
 
 } // end namespace llvm




From gaeke at cs.uiuc.edu  Mon May 31 00:54:10 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon May 31 00:54:10 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceToFunction/TraceToFunction.cpp
Message-ID: <200405310551.AAA27455@kain.cs.uiuc.edu>


Changes in directory reopt/lib/TraceToFunction:

TraceToFunction.cpp updated: 1.58 -> 1.59

---
Log message:

Add a timer.


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

Index: reopt/lib/TraceToFunction/TraceToFunction.cpp
diff -u reopt/lib/TraceToFunction/TraceToFunction.cpp:1.58 reopt/lib/TraceToFunction/TraceToFunction.cpp:1.59
--- reopt/lib/TraceToFunction/TraceToFunction.cpp:1.58	Mon May 24 15:36:10 2004
+++ reopt/lib/TraceToFunction/TraceToFunction.cpp	Mon May 31 00:51:45 2004
@@ -38,6 +38,7 @@
 #include "Support/StringExtras.h"  // for utostr()
 #define DEBUG_TYPE "tracetofunction"
 #include "Support/Debug.h"         // for DEBUG()
+#include "Support/Timer.h"
 #include <cassert>
 
 namespace llvm {
@@ -750,6 +751,7 @@
 /// data structures.
 ///
 TraceFunction *TraceFunction::get (Trace &T) {
+  NamedRegionTimer X ("TraceToFunction");
   TraceFunctionBuilder TTF;
   return TTF.buildTraceFunction (T);
 }




From llvm at cs.uiuc.edu  Mon May 31 16:04:02 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Mon May 31 16:04:02 2004
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200405312100.QAA18891@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.47 -> 1.48

---
Log message:

Clean up the Feature and Regression test output to (a) use section headers,
(b) avoid <pre> tag so page width doesn't become excessive, (c) omit the
execution time stats, (d) format each reported test in a list with bold
headings for readability, (e) omit long lines of dashes.


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

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.47 llvm/utils/NightlyTest.pl:1.48
--- llvm/utils/NightlyTest.pl:1.47	Sat May 29 19:17:47 2004
+++ llvm/utils/NightlyTest.pl	Mon May 31 15:59:55 2004
@@ -272,27 +272,52 @@
   if (open SRCHFILE, $filename) {
     # Skip stuff before ---TEST RESULTS
     while ( <SRCHFILE> ) {
-      if ( m/^--- TEST RESULTS/ ) { 
-	  push(@lines, $_); last; 
-      }
+      if ( m/^--- TEST RESULTS/ ) { last; }
     }
     # Process test results
+    push(@lines,"<h3>TEST RESULTS</h3><ol><li>\n");
+    my $first_list = 1;
+    my $should_break = 1;
     while ( <SRCHFILE> ) {
       if ( length($_) > 1 ) { 
-	  if ( ! m/: PASS[ ]*$/ &&
-	       ! m/^    qmtest.target:/ && 
-	       ! m/^      local/ &&
-	       ! m/^gmake:/ ) {
-	  push(@lines,$_); 
+	chomp($_);
+	if ( ! m/: PASS[ ]*$/ &&
+	     ! m/^    qmtest.target:/ && 
+	     ! m/^      local/ &&
+	     ! m/^gmake:/ ) {
+	  if ( m/: XFAIL/ || m/: XPASS/ || m/: FAIL/ ) {
+	    if ( $first_list ) {
+	      $first_list = 0;
+	      $should_break = 1;
+	      push(@lines,"<b>$_</b><br/>\n");
+	    } else {
+	      push(@lines,"</li><li><b>$_</b><br/>\n");
+	    }
+	  } elsif ( m/^--- STATISTICS/ ) {
+	    if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
+	    push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
+	    $should_break = 0;
+	  } elsif ( m/^--- TESTS WITH/ ) {
+	    $should_break = 1;
+	    $first_list = 1;
+	    push(@lines,"</pre><h3>TESTS WITH UNEXPECTED RESULTS</h3><ol><li>\n");
+	  } elsif ( m/^real / ) {
+	    last;
+	  } else {
+	    if ( $should_break ) {
+	      push(@lines,"$_<br/>\n");
+	    } else {
+	      push(@lines,"$_\n");
+	    }
+	  }
 	}
       }
     }
     close SRCHFILE;
   }
   my $content = join("", at lines);
-  return "<pre>\n at lines</pre>\n";
+  return "$content</pre>\n";
 }
-
 
 # Get results of feature tests.
 my $FeatureTestResults; # String containing the results of the feature tests




From llvm at cs.uiuc.edu  Mon May 31 16:43:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Mon May 31 16:43:01 2004
Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html
Message-ID: <200405312139.QAA19012@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.24 -> 1.25

---
Log message:

Align the lower portion of the page with the left margin so that the page
width is not made excessive by the large table of results. Improves
readability of the page.


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

Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.24 llvm/utils/NightlyTestTemplate.html:1.25
--- llvm/utils/NightlyTestTemplate.html:1.24	Fri May 28 15:30:23 2004
+++ llvm/utils/NightlyTestTemplate.html	Mon May 31 16:38:56 2004
@@ -108,11 +108,11 @@
 <li>Newly passing tests: $TestsFixed
 <li>Newly failing tests: $TestsBroken
 </ul>
-
+</td></tr></tbody></table>
 <br><br><center>
 <table border="0" cellspacing="0" cellpadding="2"><tr><td bgcolor="#000000"> 
 <table border="0" cellpadding="10" cellspacing="0"><tr><td bgcolor="#DDAA77"
-<font size=+2 face=Verdana><b><a name="Trends">Changes over Time</font></b>
+<font size=+2 face=Verdana><b><a name="Trends">Changes Over Time</font></b>
 </td></tr></table></td></tr></table></center><p>
 
 




From lattner at cs.uiuc.edu  Tue Jun  1 01:52:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 01:52:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406010648.BAA22176@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html added (r1.1)

---
Log message:

It's a small start, but it is certainly needed.  Contributions are certainly
welcomed.  :)


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

Index: llvm/docs/CodeGenerator.html
diff -c /dev/null llvm/docs/CodeGenerator.html:1.1
*** /dev/null	Tue Jun  1 01:48:10 2004
--- llvm/docs/CodeGenerator.html	Tue Jun  1 01:48:00 2004
***************
*** 0 ****
--- 1,348 ----
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+                       "http://www.w3.org/TR/html4/strict.dtd">
+ <html>
+ <head>
+   <title>The LLVM Target-Independent Code Generator</title>
+   <link rel="stylesheet" href="llvm.css" type="text/css">
+ </head>
+ <body>
+ 
+ <div class="doc_title">
+   The LLVM Target-Independent Code Generator
+ </div>
+ 
+ <ol>
+   <li><a href="#introduction">Introduction</a>
+     <ul>
+       <li><a href="#required">Required components in the code generator</a></li>
+       <li><a href="#high-level-design">The high-level design of the code generator</a></li>
+       <li><a href="#tablegen">Using TableGen for target description</a></li>
+     </ul>
+   </li>
+   <li><a href="#targetdesc">Target description classes</a>
+     <ul>
+       <li><a href="#targetmachine">The <tt>TargetMachine</tt> class</a></li>
+       <li><a href="#targetdata">The <tt>TargetData</tt> class</a></li>
+       <li><a href="#mregisterinfo">The <tt>MRegisterInfo</tt> class</a></li>
+       <li><a href="#targetinstrinfo">The <tt>TargetInstrInfo</tt> class</a></li>
+       <li><a href="#targetframeinfo">The <tt>TargetFrameInfo</tt> class</a></li>
+       <li><a href="#targetjitinfo">The <tt>TargetJITInfo</tt> class</a></li>
+     </ul>
+   </li>
+   <li><a href="#codegendesc">Machine code description classes</a>
+   </li>
+   <li><a href="#codegenalgs">Target-independent code generation algorithms</a>
+   </li>
+   <li><a href="#targetimpls">Target description implementations</a>
+     <ul>
+       <li><a href="#x86">The X86 backend</a></li>
+     </li>
+   </li>
+ 
+ </ol>
+ 
+ <div class="doc_author">
+   <p>Written by <a href="mailto:sabre at nondot.org">Chris Lattner</a></p>
+ </div>
+ 
+ <!-- *********************************************************************** -->
+ <div class="doc_section">
+   <a name="introduction">Introduction</a>
+ </div>
+ <!-- *********************************************************************** -->
+ 
+ <div class="doc_text">
+ 
+ <p>The LLVM target-independent code generator is a framework that provides a
+ suite of reusable components for translating the LLVM internal representation to
+ the machine code for a specified target -- either in assembly form (suitable for
+ a static compiler) or in binary machine code format (usable for a JIT compiler).
+ The LLVM target-independent code generator consists of four main components:</p>
+ 
+ <ol>
+ <li><a href="#targetdesc">Abstract target description</a> interfaces which
+ capture improtant properties about various aspects of the machine independently
+ of how they will be used.  These interfaces are defined in
+ <tt>include/llvm/Target/</tt>.</li>
+ 
+ <li>Classes used to represent the <a href="#codegendesc">machine code</a> being
+ generator for a target.  These classes are intended to be abstract enough to
+ represent the machine code for <i>any</i> target machine.  These classes are
+ defined in <tt>include/llvm/CodeGen/</tt>.</li>
+ 
+ <li><a href="#codegenalgs">Target-independent algorithms</a> used to implement
+ various phases of native code generation (register allocation, scheduling, stack
+ frame representation, etc).  This code lives in <tt>lib/CodeGen/</tt>.</li>
+ 
+ <li><a href="#targetimpls">Implementations of the abstract target description
+ interfaces</a> for particular targets.  These machine descriptions make use of
+ the components provided by LLVM, and can optionally provide custom
+ target-specific passes, to build complete code generators for a specific target.
+ Target descriptions live in <tt>lib/Target/</tt>.</li>
+ 
+ </ol>
+ 
+ <p>
+ Depending on which part of the code generator you are interested in working on,
+ different pieces of this will be useful to you.  In any case, you should be
+ familiar with the <a href="#targetdesc">target description</a> and <a
+ href="#codegendesc">machine code representation</a> classes.  If you want to add
+ a backend for a new target, you will need <a href="#targetimpls">implement the
+ targe description</a> classes for your new target and understand the <a
+ href="LangRef.html">LLVM code representation</a>.  If you are interested in
+ implementing a new <a href="#codegenalgs">code generation algorithm</a>, it
+ should only depend on the target-description and machine code representation
+ classes, ensuring that it is portable.
+ </p>
+ 
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+  <a name="required">Required components in the code generator</a>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The two pieces of the LLVM code generator are the high-level interface to the
+ code generator and the set of reusable components that can be used to build
+ target-specific backends.  The two most important interfaces (<a
+ href="#targetmachine"><tt>TargetMachine</tt></a> and <a
+ href="#targetdata"><tt>TargetData</tt></a> classes) are the only ones that are
+ required to be defined for a backend to fit into the LLVM system, but the others
+ must be defined if the reusable code generator components are going to be
+ used.</p>
+ 
+ <p>This design has two important implications.  The first is that LLVM can
+ support completely non-traditional code generation targets.  For example, the C
+ backend does not require register allocation, instruction selection, or any of
+ the other standard components provided by the system.  As such, it only
+ implements these two interfaces, and does its own thing.  Another example of a
+ code generator like this is a (purely hypothetical) backend that converts LLVM
+ to the GCC RTL form and uses GCC to emit machine code for a target.</p>
+ 
+ <p>The other implication of this design is that it is possible to design and
+ implement radically different code generators in the LLVM system that do not
+ make use of any of the built-in components.  Doing so is not recommended at all,
+ but could be required for radically different targets that do not fit into the
+ LLVM machine description model: programmable FPGAs for example.</p>
+ </p>
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+  <a name="high-level-design">The high-level design of the code generator</a></li>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The LLVM target-indendent code generator is designed to support efficient and
+ quality code generation for standard register-based microprocessors.  Code
+ generation in this model is divided into the following stages:</p>
+ 
+ <ol>
+ <li><b>Instruction Selection</b> - Determining a efficient implementation of the
+ input LLVM code in the target instruction set.  This stage produces the initial
+ code for the program in the target instruction set the makes use of virtual
+ registers in SSA form and physical registers that represent any required
+ register assignments due to target constraints or calling conventions.</li>
+ 
+ <li><b>SSA-based Machine Code Optimizations</b> - This (optional) stage consists
+ of a series of machine-code optimizations that operate on the SSA-form produced
+ by the instruction selector.  Optimizations like modulo-scheduling, normal
+ scheduling, or peephole optimization work here.</li>
+ 
+ <li><b>Register Allocation</b> - The target code is transformed from an infinite
+ virtual register file in SSA form to the concrete register file used by the
+ target.  This phase introduces spill code and eliminates all virtual register
+ references from the program.</li>
+ 
+ <li><b>Prolog/Epilog Code Insertion</b> - Once the machine code has been
+ generated for the function and the amount of stack space required is known (used
+ for LLVM alloca's and spill slots), the prolog and epilog code for the function
+ can be inserted and "abstract stack location references" can be eliminated.
+ This stage is responsible for implementing optimizations like frame-pointer
+ elimination and stack packing.</li>
+ 
+ <li><b>Late Machine Code Optimizations</b> - Optimizations that operate on
+ "final" machine code can go here, such as spill code scheduling and peephole
+ optimizations.</li>
+ 
+ <li><b>Code Emission</b> - The final stage actually outputs the machine code for
+ the current function, either in the target assembler format or in machine
+ code.</li>
+ 
+ </ol>
+ 
+ <p>
+ The code generator is based on the assumption that the instruction selector will
+ use an optimal pattern matching selector to create high-quality sequences of
+ native code.  Alternative code generator designs based on pattern expansion and
+ aggressive iterative peephole optimization are much slower.  This design is
+ designed to permit efficient compilation (important for JIT environments) and
+ aggressive optimization (used when generate code offline) by allowing components
+ of varying levels of sophisication to be used for any step of compilation.</p>
+ 
+ <p>
+ In addition to these stages, target implementations can insert arbitrary
+ target-specific passes into the flow.  For example, the X86 target uses a
+ special pass to handle the 80x87 floating point stack architecture.  Other
+ targets with unusual requirements can be supported with custom passes as needed.
+ </p>
+ 
+ </div>
+ 
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+  <a name="tablegen">Using TableGen for target description</a></li>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The target description classes require a detailed descriptions of the target
+ architecture.  These target descriptions often have a large amount of common
+ information (e.g., an add instruction is almost identical to a sub instruction).
+ In order to allow the maximum amount of commonality to be factored out, the LLVM
+ code generator uses the <a href="TableGenFundamentals.html">TableGen</a> tool to
+ allow 
+ </p>
+ 
+ </div>
+ 
+ <!-- *********************************************************************** -->
+ <div class="doc_section">
+   <a name="targetdesc">Target description classes</a>
+ </div>
+ <!-- *********************************************************************** -->
+ 
+ <div class="doc_text">
+ 
+ <p>The LLVM target description classes (which are located in the
+ <tt>include/llvm/Target</tt> directory) provide an abstract description of the
+ target machine, independent of any particular client.  These classes are
+ designed to capture the <i>abstract</i> properties of the target (such as what
+ instruction and registers it has), and do not incorporate any particular pieces
+ of code generation algorithms (these interfaces do not take interference graphs
+ as inputs or other algorithm-specific data structures).</p>
+ 
+ <p>All of the target description classes (except the <tt><a
+ href="#targetdata">TargetData</a></tt> class) are designed to be subclassed by
+ the concrete target implementation, and have virtual methods implemented.  To
+ get to these implementations, <tt><a
+ href="#targetmachine">TargetMachine</a></tt> class provides accessors that
+ should be implemented by the target.</p>
+ 
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="targetmachine">The <tt>TargetMachine</tt> class</a>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The <tt>TargetMachine</tt> class provides virtual methods that are used to
+ access the target-specific implementations of the various target description
+ classes (with the <tt>getInstrInfo</tt>, <tt>getRegisterInfo</tt>,
+ <tt>getFrameInfo</tt>, ... methods).  This class is designed to be subclassed by
+ a concrete target implementation (e.g., <tt>X86TargetMachine</tt>) which
+ implements the various virtual methods.  The only required target description
+ class is the <a href="#targetdata"><tt>TargetData</tt></a> class, but if the
+ code generator components are to be used, the other interfaces should be
+ implemented as well.</p>
+ 
+ </div>
+ 
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="targetdata">The <tt>TargetData</tt> class</a>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The <tt>TargetData</tt> class is the only required target description class,
+ and it is the only class that is not extensible (it cannot be derived from).  It
+ specifies information about how the target lays out memory for structures, the
+ alignment requirements for various data types, the size of pointers in the
+ target, and whether the target is little- or big-endian.</p>
+ 
+ </div>
+ 
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="mregisterinfo">The <tt>MRegisterInfo</tt> class</a></li>
+ </div>
+ 
+ <div class="doc_text">
+ 
+ <p>The <tt>MRegisterInfo</tt> class (which will eventually be renamed to
+ <tt>TargetRegisterInfo</tt>) is used to describe the register file of the
+ target and any interactions between the registers.</p>
+ 
+ <p>Registers in the code generator are represented in the code generator by
+ unsigned numbers.  Physical registers (those that actually exist in the target
+ description) are unique small numbers, and virtual registers are generally
+ large.</p>
+ 
+ <p>Each register in the processor description has an associated
+ <tt>MRegisterDesc</tt> entry, which provides a textual name for the register
+ (used for assembly output and debugging dumps), a set of aliases (used to
+ indicate that one register overlaps with another), and some flag bits.
+ </p>
+ 
+ <p>In addition to the per-register description, the <tt>MRegisterInfo</tt> class
+ exposes a set of processor specific register classes (instances of the
+ <tt>TargetRegisterClass</tt> class).  Each register class contains sets of
+ registers that have the same properties (for example, they are all 32-bit
+ integer registers).  Each SSA virtual register created by the instruction
+ selector has an associated register class.  When the register allocator runs, it
+ replaces virtual registers with a physical register in the set.</p>
+ 
+ <p>
+ The target-specific implementations of these classes is auto-generated from a <a
+ href="TableGenFundamentals.html">TableGen</a> description of the register file.
+ </p>
+ 
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="targetinstrinfo">The <tt>TargetInstrInfo</tt> class</a></li>
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="targetframeinfo">The <tt>TargetFrameInfo</tt> class</a></li>
+ </div>
+ 
+ <!-- ======================================================================= -->
+ <div class="doc_subsection">
+   <a name="targetjitinfo">The <tt>TargetJITInfo</tt> class</a></li>
+ </div>
+ 
+ <!-- *********************************************************************** -->
+ <div class="doc_section">
+   <a name="codegendesc">Machine code description classes</a>
+ </div>
+ <!-- *********************************************************************** -->
+ 
+ 
+ 
+ <!-- *********************************************************************** -->
+ <hr>
+ <address>
+   <a href="http://jigsaw.w3.org/css-validator/check/referer"><img
+   src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
+   <a href="http://validator.w3.org/check/referer"><img
+   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
+ 
+   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
+   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
+   Last modified: $Date: 2004/06/01 06:48:00 $
+ </address>
+ 
+ </body>
+ </html>




From criswell at cs.uiuc.edu  Tue Jun  1 09:55:01 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Jun  1 09:55:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200406011454.JAA20407@choi.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.133 -> 1.134

---
Log message:

Modified calcTypeName() so that it does not allocate a std::string for
every recursive call.
This makes it more robust for deeply nested, unnamed types.



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

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.133 llvm/lib/VMCore/AsmWriter.cpp:1.134
--- llvm/lib/VMCore/AsmWriter.cpp:1.133	Thu May 27 17:04:46 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Tue Jun  1 09:54:08 2004
@@ -224,18 +224,26 @@
 
 
 
-static std::string calcTypeName(const Type *Ty, 
-                                std::vector<const Type *> &TypeStack,
-                                std::map<const Type *, std::string> &TypeNames){
-  if (Ty->isPrimitiveType() && !isa<OpaqueType>(Ty))
-    return Ty->getDescription();  // Base case
+static void calcTypeName(const Type *Ty, 
+                         std::vector<const Type *> &TypeStack,
+                         std::map<const Type *, std::string> &TypeNames,
+                         std::string & Result){
+  if (Ty->isPrimitiveType() && !isa<OpaqueType>(Ty)) {
+    Result += Ty->getDescription();  // Base case
+    return;
+  }
 
   // Check to see if the type is named.
   std::map<const Type *, std::string>::iterator I = TypeNames.find(Ty);
-  if (I != TypeNames.end()) return I->second;
+  if (I != TypeNames.end()) {
+    Result += I->second;
+    return;
+  }
 
-  if (isa<OpaqueType>(Ty))
-    return "opaque";
+  if (isa<OpaqueType>(Ty)) {
+    Result += "opaque";
+    return;
+  }
 
   // Check to see if the Type is already on the stack...
   unsigned Slot = 0, CurSize = TypeStack.size();
@@ -244,21 +252,23 @@
   // This is another base case for the recursion.  In this case, we know 
   // that we have looped back to a type that we have previously visited.
   // Generate the appropriate upreference to handle this.
-  if (Slot < CurSize)
-    return "\\" + utostr(CurSize-Slot);       // Here's the upreference
+  if (Slot < CurSize) {
+    Result += "\\" + utostr(CurSize-Slot);     // Here's the upreference
+    return;
+  }
 
   TypeStack.push_back(Ty);    // Recursive case: Add us to the stack..
   
-  std::string Result;
   switch (Ty->getPrimitiveID()) {
   case Type::FunctionTyID: {
     const FunctionType *FTy = cast<FunctionType>(Ty);
-    Result = calcTypeName(FTy->getReturnType(), TypeStack, TypeNames) + " (";
+    calcTypeName(FTy->getReturnType(), TypeStack, TypeNames, Result);
+    Result += " (";
     for (FunctionType::param_iterator I = FTy->param_begin(),
            E = FTy->param_end(); I != E; ++I) {
       if (I != FTy->param_begin())
         Result += ", ";
-      Result += calcTypeName(*I, TypeStack, TypeNames);
+      calcTypeName(*I, TypeStack, TypeNames, Result);
     }
     if (FTy->isVarArg()) {
       if (FTy->getNumParams()) Result += ", ";
@@ -269,35 +279,37 @@
   }
   case Type::StructTyID: {
     const StructType *STy = cast<StructType>(Ty);
-    Result = "{ ";
+    Result += "{ ";
     for (StructType::element_iterator I = STy->element_begin(),
            E = STy->element_end(); I != E; ++I) {
       if (I != STy->element_begin())
         Result += ", ";
-      Result += calcTypeName(*I, TypeStack, TypeNames);
+      calcTypeName(*I, TypeStack, TypeNames, Result);
     }
     Result += " }";
     break;
   }
   case Type::PointerTyID:
-    Result = calcTypeName(cast<PointerType>(Ty)->getElementType(), 
-                          TypeStack, TypeNames) + "*";
+    calcTypeName(cast<PointerType>(Ty)->getElementType(), 
+                          TypeStack, TypeNames, Result);
+    Result += "*";
     break;
   case Type::ArrayTyID: {
     const ArrayType *ATy = cast<ArrayType>(Ty);
-    Result = "[" + utostr(ATy->getNumElements()) + " x ";
-    Result += calcTypeName(ATy->getElementType(), TypeStack, TypeNames) + "]";
+    Result += "[" + utostr(ATy->getNumElements()) + " x ";
+    calcTypeName(ATy->getElementType(), TypeStack, TypeNames, Result);
+    Result += "]";
     break;
   }
   case Type::OpaqueTyID:
-    Result = "opaque";
+    Result += "opaque";
     break;
   default:
-    Result = "<unrecognized-type>";
+    Result += "<unrecognized-type>";
   }
 
   TypeStack.pop_back();       // Remove self from stack...
-  return Result;
+  return;
 }
 
 
@@ -321,9 +333,10 @@
   // names.
   //
   std::vector<const Type *> TypeStack;
-  std::string TypeName = calcTypeName(Ty, TypeStack, TypeNames);
+  std::string TypeName;
+  calcTypeName(Ty, TypeStack, TypeNames, TypeName);
   TypeNames.insert(std::make_pair(Ty, TypeName));//Cache type name for later use
-  return Out << TypeName;
+  return (Out << TypeName);
 }
 
 




From lattner at cs.uiuc.edu  Tue Jun  1 12:22:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 12:22:02 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406011718.MAA02176@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.1 -> 1.2

---
Log message:

Add a warning about incompleteness, fix validation errors


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.1 llvm/docs/CodeGenerator.html:1.2
--- llvm/docs/CodeGenerator.html:1.1	Tue Jun  1 01:48:00 2004
+++ llvm/docs/CodeGenerator.html	Tue Jun  1 12:18:11 2004
@@ -36,7 +36,7 @@
   <li><a href="#targetimpls">Target description implementations</a>
     <ul>
       <li><a href="#x86">The X86 backend</a></li>
-    </li>
+    </ul>
   </li>
 
 </ol>
@@ -45,6 +45,10 @@
   <p>Written by <a href="mailto:sabre at nondot.org">Chris Lattner</a></p>
 </div>
 
+<div class="doc_warning">
+  <p>Warning: This is a work in progress.</p>
+</div>
+
 <!-- *********************************************************************** -->
 <div class="doc_section">
   <a name="introduction">Introduction</a>
@@ -126,12 +130,11 @@
 make use of any of the built-in components.  Doing so is not recommended at all,
 but could be required for radically different targets that do not fit into the
 LLVM machine description model: programmable FPGAs for example.</p>
-</p>
 </div>
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
- <a name="high-level-design">The high-level design of the code generator</a></li>
+ <a name="high-level-design">The high-level design of the code generator</a>
 </div>
 
 <div class="doc_text">
@@ -195,7 +198,7 @@
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
- <a name="tablegen">Using TableGen for target description</a></li>
+ <a name="tablegen">Using TableGen for target description</a>
 </div>
 
 <div class="doc_text">
@@ -273,7 +276,7 @@
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
-  <a name="mregisterinfo">The <tt>MRegisterInfo</tt> class</a></li>
+  <a name="mregisterinfo">The <tt>MRegisterInfo</tt> class</a>
 </div>
 
 <div class="doc_text">
@@ -310,17 +313,17 @@
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
-  <a name="targetinstrinfo">The <tt>TargetInstrInfo</tt> class</a></li>
+  <a name="targetinstrinfo">The <tt>TargetInstrInfo</tt> class</a>
 </div>
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
-  <a name="targetframeinfo">The <tt>TargetFrameInfo</tt> class</a></li>
+  <a name="targetframeinfo">The <tt>TargetFrameInfo</tt> class</a>
 </div>
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
-  <a name="targetjitinfo">The <tt>TargetJITInfo</tt> class</a></li>
+  <a name="targetjitinfo">The <tt>TargetJITInfo</tt> class</a>
 </div>
 
 <!-- *********************************************************************** -->
@@ -341,7 +344,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 06:48:00 $
+  Last modified: $Date: 2004/06/01 17:18:11 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Tue Jun  1 12:34:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 12:34:03 2004
Subject: [llvm-commits] CVS: llvm-gcc/gcc/gensupport.c
Message-ID: <200406011729.MAA02387@zion.cs.uiuc.edu>


Changes in directory llvm-gcc/gcc:

gensupport.c updated: 1.1.1.1 -> 1.2

---
Log message:

Fix the gen* utilities that GCC used when running under cygwin.  They were
reading the .md files and getting confused about the \r characters that
windows has in them.  This forces cygwin to open the files in "text" mode.


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

Index: llvm-gcc/gcc/gensupport.c
diff -u llvm-gcc/gcc/gensupport.c:1.1.1.1 llvm-gcc/gcc/gensupport.c:1.2
--- llvm-gcc/gcc/gensupport.c:1.1.1.1	Thu Jan  8 15:58:40 2004
+++ llvm-gcc/gcc/gensupport.c	Tue Jun  1 12:29:16 2004
@@ -205,7 +205,7 @@
 	  static const char sep[2] = { DIR_SEPARATOR, '\0' };
 
 	  pathname = concat (stackp->fname, sep, filename, NULL);
-	  input_file = fopen (pathname, "r");
+	  input_file = fopen (pathname, "rt");
 	  if (input_file != NULL)
 	    goto success;
 	  free (pathname);
@@ -216,7 +216,7 @@
     pathname = concat (base_dir, filename, NULL);
   else
     pathname = xstrdup (filename);
-  input_file = fopen (pathname, "r");
+  input_file = fopen (pathname, "rt");
   if (input_file == NULL)
     {
       free (pathname);
@@ -917,7 +917,7 @@
     base_dir = save_string (filename, lastsl - filename + 1 );
 
   read_rtx_filename = filename;
-  input_file = fopen (filename, "r");
+  input_file = fopen (filename, "rt");
   if (input_file == 0)
     {
       perror (filename);




From brukman at cs.uiuc.edu  Tue Jun  1 12:39:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 12:39:02 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.footer
Message-ID: <200406011735.MAA10185@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.footer updated: 1.1 -> 1.2

---
Log message:

* It's now the year 2004
* Our main page is index.html, not index.php
* Wrap lines at 80 cols


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

Index: llvm/docs/doxygen.footer
diff -u llvm/docs/doxygen.footer:1.1 llvm/docs/doxygen.footer:1.2
--- llvm/docs/doxygen.footer:1.1	Wed Dec 31 00:47:28 2003
+++ llvm/docs/doxygen.footer	Tue Jun  1 12:35:10 2004
@@ -2,8 +2,11 @@
 <p class="footer">
 Generated on $datetime for $projectname version $projectnumber by
 <a href="http://www.doxygen.org/index.html">doxygen $doxygenversion</a><br/>
-Copyright &copy; 2003, University of Illinois at Urbana-Champaign. All Rights Reserved.<br/>
-<a href="/index.php" onmouseover="window.status='Go To LLVM Home Page';return true;" title="LLVM Home Page">Home Page</a>
-<a href="http://www.doxygen.org/index.html" onmouseover="window.status='Go To Doxygen Home Page';return true;" title="Doxygen Home Page">
+Copyright &copy; 2004, University of Illinois at Urbana-Champaign. All Rights
+Reserved.<br/>
+<a href="/index.html" onmouseover="window.status='Go To LLVM Home Page';return
+true;" title="LLVM Home Page">Home Page</a>
+<a href="http://www.doxygen.org/index.html" onmouseover="window.status='Go To
+Doxygen Home Page';return true;" title="Doxygen Home Page">
 <img src="doxygen.png" alt="Doxygen Logo" style="border:none;"/></a> 
 </p></body></html>




From brukman at cs.uiuc.edu  Tue Jun  1 12:43:03 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 12:43:03 2004
Subject: [llvm-commits] CVS: llvm-www/www-index.html
Message-ID: <200406011739.MAA21823@zion.cs.uiuc.edu>


Changes in directory llvm-www:

www-index.html updated: 1.102 -> 1.103

---
Log message:

* Make the text easier to edit by removing leading tabs.
* Some changes for HTML 4.01 (Strict) compliance (not complete)


---
Diffs of the changes:  (+91 -100)

Index: llvm-www/www-index.html
diff -u llvm-www/www-index.html:1.102 llvm-www/www-index.html:1.103
--- llvm-www/www-index.html:1.102	Fri May 28 02:47:39 2004
+++ llvm-www/www-index.html	Tue Jun  1 12:39:07 2004
@@ -2,82 +2,77 @@
 
 <table border="0" cellpadding="0" cellspacing="0" width="95%"
 cellborder="0">
-<!-- Start of the left bar... -->    <tr>
-        <td valign="top" width="64%">
+<!-- Start of the left bar... -->
+<tr>
+<td valign="top" width="64%">
 
 <div class="www_sectiontitle">LLVM Overview</div>
-  <p>
-  Low Level Virtual Machine (LLVM) is:<ol>
-                    <li><p><a href="pubs/2004-01-30-CGO-LLVM.html">
-		        A compilation strategy</a> - Fundamentally, LLVM is a
-		        compilation strategy designed to enable effective
-		        program optimization across the entire lifetime of a
-		        program.  LLVM supports effective optimization at
-		        compile time, link-time (particularly interprocedural),
-		        run-time and offline (i.e., after software is
-		        installed), while remaining transparent to developers
-			and maintaining compatibility with
-		        existing build scripts.</p></li>
-
-                    <li><p><a href="docs/LangRef.html"><u>A virtual
-                        instruction set</u></a> - LLVM is a low-level object
-                        code representation that uses simple RISC-like
-                        instructions, but provides rich, language-independent,
-			type information and dataflow
-                        (SSA) information about operands. This combination
-                        enables sophisticated transformations on object code,
-                        while remaining light-weight enough to be attached to
-                        the executable. This combination is key to allowing
-                        link-time, run-time, and offline
-                        transformations.</p></li>
-
-                    <li><p><a href="pubs/2002-12-LattnerMSThesis.html">A compiler 
-                        infrastructure</a> - LLVM is also a collection of source
-                        code that implements the language and compilation
-                        strategy. The primary components of the LLVM
-                        infrastructure are a GCC-based <a href="docs/CommandGuide/llvmgcc.html">C &amp; C++ front-end</a>, a link-time
-                        optimization framework with a growing set of global and
-                        interprocedural analyses and transformations, static
-                        back-ends for the SPARC v9 and X86 architectures, a
-                        back-end which emits portable C code, and a Just-In-Time compiler for
-                        X86 and SPARC v9 processors. See &quot;<a
-                        href="CurrentWork.html">Current Projects</a>&quot; for
-                        information about other components under
-                        development.</p></li>
-                </ol></p>
-
-  <p>
-    LLVM is a robust system, particularly well suited for developing new mid-level
-    language-independent analyses and optimizations of all sorts, including 
-    those that require <a href="pubs/2003-05-05-LCTES03-CodeSafety.html">
-    extensive interprocedural analysis</a>.  LLVM is also a great target for 
-    <a href="docs/Stacker.html">front-end development</a> for conventional or 
-    research programming languages, including those which require <a 
-    href="pubs/2004-01-30-CGO-LLVM.html">compile-time, 
-    link-time, or run-time optimization</a> for effective implementation.  We
-    have an incomplete <a href="ProjectsWithLLVM/">list of projects</a>
-    which have used LLVM for various purposes, showing that you can get
-    up-and-running quickly with LLVM, giving time to do interesting things,
-    even if you only have a semester in a University course.
-  </p>
-
-  <p>LLVM is a product of the <a
-     href="http://www-faculty.cs.uiuc.edu/~vadve/lcoproject.html">Lifelong
-     Code Optimization Project</a>, led by <a
-     href="http://www-faculty.cs.uiuc.edu/~vadve/">Vikram Adve</a> in the <a 
-     href="http://www.cs.uiuc.edu/">Department of Computer Science</a> at the 
-     <a href="http://www.uiuc.edu/">University of Illinois,
-     Urbana-Champaign</a>.  Since our public release, LLVM has grown to include
-     contributions from <a 
-     href="/cvsweb/cvsweb.cgi/llvm/CREDITS.TXT?rev=HEAD&content-type=text/x-cvsweb-markup">several
-     other people</a>!  We welcome external contributions, so please send e-mail
-     to <a href="mailto:llvmdev at cs.uiuc.edu">llvmdev at cs.uiuc.edu</a> if you are
-     interested in contributing code to the LLVM infrastructure.
-  </p>
+
+<div class="www_text">
+
+<p>Low Level Virtual Machine (LLVM) is:</p>
+
+<ol>
+
+<li><p><a href="pubs/2004-01-30-CGO-LLVM.html"> A compilation strategy</a>
+designed to enable effective program optimization across the entire lifetime of
+a program.  LLVM supports effective optimization at compile time, link-time
+(particularly interprocedural), run-time and offline (i.e., after software is
+installed), while remaining transparent to developers and maintaining
+compatibility with existing build scripts.</p></li>
+
+<li><p><a href="docs/LangRef.html"><u>A virtual instruction set</u></a> - LLVM
+is a low-level object code representation that uses simple RISC-like
+instructions, but provides rich, language-independent, type information and
+dataflow (SSA) information about operands. This combination enables
+sophisticated transformations on object code, while remaining light-weight
+enough to be attached to the executable. This combination is key to allowing
+link-time, run-time, and offline transformations.</p></li>
+
+<li><p><a href="pubs/2002-12-LattnerMSThesis.html">A compiler infrastructure</a>
+- LLVM is also a collection of source code that implements the language and
+compilation strategy. The primary components of the LLVM infrastructure are a
+GCC-based <a href="docs/CommandGuide/llvmgcc.html">C &amp; C++ front-end</a>, a
+link-time optimization framework with a growing set of global and
+interprocedural analyses and transformations, static back-ends for the SPARC v9
+and X86 architectures, a back-end which emits portable C code, and a
+Just-In-Time compiler for X86 and SPARC v9 processors. See &quot;<a
+href="CurrentWork.html">Current Projects</a>&quot; for information about other
+components under development.</p></li>
+
+</ol>
+
+<p>LLVM is a robust system, particularly well suited for developing new
+mid-level language-independent analyses and optimizations of all sorts,
+including those that require <a href="pubs/2003-05-05-LCTES03-CodeSafety.html">
+extensive interprocedural analysis</a>.  LLVM is also a great target for <a
+href="docs/Stacker.html">front-end development</a> for conventional or research
+programming languages, including those which require <a
+href="pubs/2004-01-30-CGO-LLVM.html">compile-time, link-time, or run-time
+optimization</a> for effective implementation.  We have an incomplete <a
+href="ProjectsWithLLVM/">list of projects</a> which have used LLVM for various
+purposes, showing that you can get up-and-running quickly with LLVM, giving time
+to do interesting things, even if you only have a semester in a University
+course.</p>
+
+<p>LLVM is a product of the <a
+href="http://www-faculty.cs.uiuc.edu/~vadve/lcoproject.html">Lifelong Code
+Optimization Project</a>, led by <a
+href="http://www-faculty.cs.uiuc.edu/~vadve/">Vikram Adve</a> in the <a
+href="http://www.cs.uiuc.edu/">Department of Computer Science</a> at the <a
+href="http://www.uiuc.edu/">University of Illinois, Urbana-Champaign</a>.  Since
+our public release, LLVM has grown to include contributions from <a
+href="/cvsweb/cvsweb.cgi/llvm/CREDITS.TXT?rev=HEAD&amp;content-type=text/x-cvsweb-markup">several
+other people</a>!  We welcome external contributions, so please send e-mail to
+<a href="mailto:llvmdev at cs.uiuc.edu">llvmdev at cs.uiuc.edu</a> if you are
+interested in contributing code to the LLVM infrastructure.</p>
+
+</div>  
 
 <div class="www_sectiontitle">Strengths of the LLVM System</div>
 
-<p> 
+<div class="www_text">
+
 <ol>
   <li>LLVM uses a simple <a href="docs/LangRef.html">low-level language</a> with strictly defined semantics.</li>
 
@@ -117,55 +112,51 @@
   <li>LLVM is freely available under an OSI-approved "three-clause BSD" <a
   href="http://llvm.cs.uiuc.edu/docs/FAQ.html#license">license</a>.</li>
 </ol>
-</p>
 
+</div>
 
+<div class="www_sectiontitle">Want to learn more?</div>
 
-  <div class="www_sectiontitle">Want to learn more?</div>
-  <p>
+<p>If you'd like to learn more about LLVM, please take a look at the extensive
+<a href="Documentation.html">documentation</a> for LLVM.  In particular, all of
+the tools distributed with LLVM are described in the <a
+href="docs/CommandGuide/">LLVM Command Guide</a>.  If you're interested in what
+source-language features and optimizations we support, please check out the <a
+href="demo/">LLVM demo page</a>.  If you'd like to browse through the source
+code, either check out <a href="/doxygen/">doxygen</a> or <a
+href="releases/">download the most recent release</a>.  Finally, if you're
+interested in LLVM, have questions, and can't find any answers, please ask on
+the <a href="http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev">LLVM
+developer's</a> mailing list.</p>
 
-  If you'd like to learn more about LLVM, please take a look at the extensive
-  <a href="Documentation.html">documentation</a> for LLVM.  In particular, all
-  of the tools distributed with LLVM are described in the <a 
-  href="docs/CommandGuide/">LLVM Command Guide</a>.  If you're interested in
-  what source-language features and optimizations we support, please check 
-  out the <a href="demo/">LLVM demo page</a>.  If you'd like to browse through
-  the source code, either check out <a href="/doxygen/">doxygen</a> or <a 
-  href="releases/">download the most recent release</a>.  Finally, if you're 
-  interested in LLVM, have questions, and can't find any answers, please ask 
-  on the <a 
-  href="http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev">LLVM developer's</a> 
-  mailing list.
-  </p>
+</td>
 
-        </td>
 <!-- Dividing space between columns -->
 <TD width="2%"></TD>
 <!-- Start of the right bar... 359 -->
 <td valign="top" width="35%">
 
-
-
-
 <div class="www_sectiontitle">Public LLVM Release!</div>
 
-  <p>
-  <b>Mar 19, 2004</b>: The LLVM 1.2 is now <a href="releases/"><b>available for
-  download</b></a>!  LLVM is publicly available under the OSI-certified <a
+<div class="www_text">
+  <p><b>Mar 19, 2004</b>: The LLVM 1.2 is now <a href="releases/"><b>available
+  for download</b></a>!  LLVM is publicly available under the OSI-certified <a
   href="releases/1.2/LICENSE.TXT">University of Illinois Open-Source
   License</a>.  See <a href="docs/FAQ.html#license">answers</a> to common
   licensing questions.</a></p>
+</div>
 
 <br><br>
 
-
 <div class="www_sectiontitle">Try out LLVM in your browser</div>
 
+<div class="www_text">
    <p>If you'd like to experiment with LLVM, but don't want to download it and
    compile it, we've got just the thing for you.  You can now compile C and C++
-   <a href="/demo">in your browser</a>, to see what the LLVM representation
+   <a href="/demo/">in your browser</a>, to see what the LLVM representation
    looks like, to see what various C/C++ constructs map to in LLVM, and try out
    some of the optimizers.</p>
+</div>
 
 <br><br>
 
@@ -177,13 +168,13 @@
 <!--#exec cgi="random-box.cgi"-->
 </div>
 
-<p>If you have an addition, please <a href="mailto:sabre at nondot.org">send it in</a>.</p>
+<p>If you have an addition, please <a href="mailto:sabre at nondot.org">send it
+in</a>.</p>
 
 <div class="www_sectiontitle">Funding</div>
-<p>
 
-  This work is sponsored by the <a
-  href="http://www.cise.nsf.gov/fndg/pubs/display2.cfm?pgm_pims_id=5160&pgm_supp_id=10070&loc=acir&pub_id=5372&div=acir">NSF
+  <p>This work is sponsored by the <a
+  href="http://www.cise.nsf.gov/fndg/pubs/display2.cfm?pgm_pims_id=5160&amp;pgm_supp_id=10070&amp;loc=acir&amp;pub_id=5372&amp;div=acir">NSF
   <i>Next Generation Software</i></a> program through grants EIA-0093426 (an NSF
   CAREER award) and EIA-0103756.  It is also supported in part by the NSF
   <i>Operating Systems and Compilers</i> program (grant #CCR-9988482), by the




From brukman at cs.uiuc.edu  Tue Jun  1 13:05:05 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:05:05 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.footer
Message-ID: <200406011800.NAA01381@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.footer updated: 1.2 -> 1.3

---
Log message:

* Add the year 2003 back to the copyright line
* Remove doxygen image from page, make LLVM link inline with the text


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

Index: llvm/docs/doxygen.footer
diff -u llvm/docs/doxygen.footer:1.2 llvm/docs/doxygen.footer:1.3
--- llvm/docs/doxygen.footer:1.2	Tue Jun  1 12:35:10 2004
+++ llvm/docs/doxygen.footer	Tue Jun  1 13:00:39 2004
@@ -1,12 +1,10 @@
 <hr>
+
 <p class="footer">
-Generated on $datetime for $projectname version $projectnumber by
-<a href="http://www.doxygen.org/index.html">doxygen $doxygenversion</a><br/>
-Copyright &copy; 2004, University of Illinois at Urbana-Champaign. All Rights
-Reserved.<br/>
-<a href="/index.html" onmouseover="window.status='Go To LLVM Home Page';return
-true;" title="LLVM Home Page">Home Page</a>
-<a href="http://www.doxygen.org/index.html" onmouseover="window.status='Go To
-Doxygen Home Page';return true;" title="Doxygen Home Page">
-<img src="doxygen.png" alt="Doxygen Logo" style="border:none;"/></a> 
-</p></body></html>
+Generated on $datetime for <a href="http://llvm.cs.uiuc.edu">LLVM</a> by
+<a href="http://www.doxygen.org">doxygen $doxygenversion</a><br/>
+Copyright &copy; 2003,2004 University of Illinois at Urbana-Champaign. All
+Rights Reserved.<p>
+
+</body>
+</html>




From brukman at cs.uiuc.edu  Tue Jun  1 13:14:04 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:14:04 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.css
Message-ID: <200406011809.NAA12700@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.css updated: 1.1 -> 1.2

---
Log message:

Make doxygen pages look like our own documentation.


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

Index: llvm/docs/doxygen.css
diff -u llvm/docs/doxygen.css:1.1 llvm/docs/doxygen.css:1.2
--- llvm/docs/doxygen.css:1.1	Wed Dec 31 00:47:28 2003
+++ llvm/docs/doxygen.css	Tue Jun  1 13:09:32 2004
@@ -77,8 +77,19 @@
         vertical-align: middle;
 }
 .title {
-    font-size: 105%
-    font-weight: bold;
-    text-decoration: underline;
-    text-align: center;
+  color: black; background: url("img/lines.gif");
+  font-family: "Georgia,Palatino,Times,Roman"; font-weight: bold;
+  border-width: 1px;
+  border-style: solid none solid none;
+  text-align: center;
+  vertical-align: middle;
+  padding-left: 8pt;
+  padding-top: 1px;
+  padding-bottom: 2px
+/*
+  font-size: 105%
+  font-weight: bold;
+  text-decoration: underline;
+  text-align: center;
+*/
 }




From lattner at cs.uiuc.edu  Tue Jun  1 13:17:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 13:17:02 2004
Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html
Message-ID: <200406011813.NAA17974@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CFEBuildInstrs.html updated: 1.16 -> 1.17

---
Log message:

* Make it HTML4.01
* Add information about cygwin
* Simplify instructions a little and make it more robust (have people just 
  reconfig and build after buildint the CFE)
* Remove some obsolete stuff



---
Diffs of the changes:  (+42 -22)

Index: llvm/docs/CFEBuildInstrs.html
diff -u llvm/docs/CFEBuildInstrs.html:1.16 llvm/docs/CFEBuildInstrs.html:1.17
--- llvm/docs/CFEBuildInstrs.html:1.16	Sun May 23 16:07:26 2004
+++ llvm/docs/CFEBuildInstrs.html	Tue Jun  1 13:13:05 2004
@@ -14,12 +14,17 @@
 
 <ol>
   <li><a href="#cautionarynote">A Cautionary Note</a>
-  <li><a href="#instructions">Instructions</a>
-  <li><a href="#license">License Information</a>
+    <ul>
+      <li><a href="#cygwin">Building under cygwin</a></li>
+    </ul>
+  </li>
+  <li><a href="#instructions">Instructions</a></li>
+  <li><a href="#license">License Information</a></li>
 </ol>
 
 <div class="doc_author">    
-  <p>Written by Brian R. Gaeke</p>
+  <p>Written by Brian R. Gaeke and 
+     <a href="http://nondot.org/sabre">Chris Lattner</a></p>
 </div>
 
 <!-- *********************************************************************** -->
@@ -46,6 +51,23 @@
 <p>We welcome patches to help make this process simpler.</p>
 </div>
 
+<!--=========================================================================-->
+<div class="doc_subsection">
+  <a name="cygwin">Building under cygwin</a>
+</div>
+<!--=========================================================================-->
+
+<div class="doc_text">
+<p>If you are building LLVM and the C front-end under cygwin, please note that
+the LLVM and GCC makefiles do not correctly handle spaces in paths.  To deal
+with this issue, make sure that your LLVM and GCC source and build trees are 
+located in a top-level directory (like <tt>/cygdrive/c/llvm</tt> and 
+<tt>/cygdrive/c/llvm-cfrontend</tt>), not in a directory that contains a space
+(which includes your "home directory", because it lives under the "Documents 
+and Settings" directory).  We welcome patches to fix this issue.
+</p>
+</div>
+
 <!-- *********************************************************************** -->
 <div class="doc_section">
   <a name="instructions">Instructions</a>
@@ -59,12 +81,11 @@
 <pre>
  % cd llvm
  % ./configure [options...]
- % gmake tools-only
+ % gmake 
 </pre>
-    <p>The use of the non-default target "tools-only" means that the
-    LLVM tools and libraries will build, and the binaries will be
-    deposited in llvm/tools/Debug, but the runtime (bytecode)
-    libraries will not build.</p></li>
+    <p>This will build all of the LLVM tools and libraries, but you will see 
+       warnings about missing the C front-end (certain runtime libraries can't
+       be built without it).  Ignore these warnings for now.</p></li>
 
 <li><p>Add the directory containing the tools to your PATH.</p>
 <pre>
@@ -73,9 +94,6 @@
 
 <li><p>Unpack the C/C++ front-end source into cfrontend/src.</p></li>
 
-<li><p>Edit src/configure.  Change the first line (starting w/ #!) to
-       contain the correct full pathname of sh.</p></li>
-
 <li><p>Make "build" and "install" directories as siblings of the "src"
        tree.</p>
 <pre>
@@ -86,12 +104,13 @@
  % set CFEINSTALL = `pwd`/install
 </pre></li>
 
+
 <li><p>Configure, build, and install the C front-end:</p>
 
 <p>
-<b>Linux/x86:</b>
-<br>
-<b>MacOS X/PowerPC:</b>
+<b>Linux/x86:</b> <br>
+<b>MacOS X/PowerPC:</b><br>
+<b>cygwin/x86:</b>
 </p>
 
 <pre>
@@ -170,11 +189,9 @@
  </ul>
 </li>
 
-<li><p>Go back into the LLVM source tree proper. Edit Makefile.config
-to redefine <code>LLVMGCCDIR</code> to the full pathname of the
-<code>$CFEINSTALL</code> directory, which is the directory you just
-installed the C front-end into. (The ./configure script is likely to
-have set this to a directory which does not exist on your system.)</p></li>
+<li><p>Go back into the LLVM source tree proper.  Rerun configure, using
+the <code>--with-llvmgccdir=$CFEINSTALL</code> option to specify the path
+to the newly built C front-end.</p></li>
 
 <li><p>If you edited header files during the C/C++ front-end build as
 described in "Fix 1" above, you must now copy those header files from
@@ -184,9 +201,12 @@
 libgcc.a library, which you can find by running
 <code>$CFEINSTALL/bin/gcc --print-libgcc-file-name</code>.)</p></li>
 
-<li><p>Build and install the runtime (bytecode) libraries by running:</p>
+<li><p>Rebuild your CVS tree.  This shouldn't cause the whole thing to be
+  rebuilt, but it should build the runtime libraries.  After the tree is
+  built, install the runtime libraries into your C front-end build tree.
+  These are the commands you need.</p>
 <pre>
- % gmake -C runtime
+ % gmake
  % mkdir $CFEINSTALL/bytecode-libs
  % gmake -C runtime install-bytecode
  % setenv LLVM_LIB_SEARCH_PATH $CFEINSTALL/bytecode-libs
@@ -274,7 +294,7 @@
 
   Brian Gaeke<br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:26 $
+  Last modified: $Date: 2004/06/01 18:13:05 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Tue Jun  1 13:24:05 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:24:05 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.css
Message-ID: <200406011819.NAA25945@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.css updated: 1.2 -> 1.3

---
Log message:

* Use sans-serif fonts just like in the rest of doxygen
* Reference the lines image correctly
* Set font size to make the title stand out


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

Index: llvm/docs/doxygen.css
diff -u llvm/docs/doxygen.css:1.2 llvm/docs/doxygen.css:1.3
--- llvm/docs/doxygen.css:1.2	Tue Jun  1 13:09:32 2004
+++ llvm/docs/doxygen.css	Tue Jun  1 13:19:28 2004
@@ -77,8 +77,9 @@
         vertical-align: middle;
 }
 .title {
-  color: black; background: url("img/lines.gif");
-  font-family: "Georgia,Palatino,Times,Roman"; font-weight: bold;
+  font-size: 25pt; 
+  color: black; background: url("../img/lines.gif");
+  font-weight: bold;
   border-width: 1px;
   border-style: solid none solid none;
   text-align: center;
@@ -86,10 +87,4 @@
   padding-left: 8pt;
   padding-top: 1px;
   padding-bottom: 2px
-/*
-  font-size: 105%
-  font-weight: bold;
-  text-decoration: underline;
-  text-align: center;
-*/
 }




From lattner at cs.uiuc.edu  Tue Jun  1 13:27:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 13:27:02 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406011822.NAA30414@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.187 -> 1.188

---
Log message:

Fix wandering </a>, add note about cygwin being supported.


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.187 llvm/docs/ReleaseNotes.html:1.188
--- llvm/docs/ReleaseNotes.html:1.187	Mon May 24 00:34:32 2004
+++ llvm/docs/ReleaseNotes.html	Tue Jun  1 13:22:41 2004
@@ -106,7 +106,7 @@
 <li>The induction variable substitution pass performs linear function test
 replacement and exit value replacement optimizations.</li>
 <li>The <a href="BytecodeFormat.html">LLVM Bytecode file format</a> is now 
-    documented.</a></li>
+    documented.</li>
 <li>LLVM now has first-class support for <a href="GarbageCollection.html">Accurate 
 Garbage Collection</a>, enabling the use of aggressive copying and generational 
 collectors.</li>
@@ -114,6 +114,8 @@
 analysis algorithm.</li>
 <li>Bugpoint can <a href="http://llvm.cs.uiuc.edu/PR327">extract individual
 basic blocks</a> to track down reduce miscompilation testcases.</li>
+<li>LLVM and the C front-end now work under Win32 using the cygnus libraries.  
+This includes the JIT compiler.</li>
 </ol>
 
 </div>
@@ -262,11 +264,17 @@
 
 <div class="doc_text">
 
-<p>LLVM has been extensively tested on Intel and AMD machines running Red Hat
-Linux.  It has also been tested under FreeBSD, and on Sun UltraSPARC
-workstations running Solaris 8.  Additionally, LLVM works on Mac OS X 10.3 and
-above, but only with the C backend and interpreter; no native machine-code
-generator for the PowerPC is available yet.</p>
+<p>LLVM is known to work in the following platforms:</p>
+
+<ul>
+<li>Intel and AMD machines running Red Hat Linux and FreeBSD (and probably 
+    other unix-like systems).</li>
+<li>Sun UltraSPARC workstations running Solaris 8.</li>
+<li>PowerPC-based Mac OS X boxes, running 10.3 and above (C backend and 
+    interpreter only, no native codegen is available yet).</li>
+<li>Intel and AMD machines running on Win32 with the Cygwin libraries.</li>
+</ul>
+
 
 <p>The core LLVM infrastructure uses
 <a href="http://www.gnu.org/software/autoconf/">GNU autoconf</a> to adapt itself
@@ -274,6 +282,11 @@
 porting may be required to get LLVM to work on new platforms.  We welcome your
 portability patches and reports of successful builds or error messages.</p>
 
+<p>Note that the LLVM build system does not currently support directories with 
+spaces on them when running on Win32/cygwin.  We strongly recommend running
+LLVM and the C frontend out of a top-level directory without spaces (e.g., 
+<tt>/cygdrive/c/llvm</tt>).</p>
+
 </div>
 
 <!--=========================================================================-->
@@ -677,7 +690,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/24 05:34:32 $
+  Last modified: $Date: 2004/06/01 18:22:41 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Tue Jun  1 13:39:04 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:39:04 2004
Subject: [llvm-commits] CVS: llvm-www/Features.html
Message-ID: <200406011835.NAA04787@zion.cs.uiuc.edu>


Changes in directory llvm-www:

Features.html updated: 1.6 -> 1.7

---
Log message:

* Moved "Strengths" sub-section here from the main page
* Tightened up whitespace in HTML code


---
Diffs of the changes:  (+91 -75)

Index: llvm-www/Features.html
diff -u llvm-www/Features.html:1.6 llvm-www/Features.html:1.7
--- llvm-www/Features.html:1.6	Mon Mar  8 23:44:19 2004
+++ llvm-www/Features.html	Tue Jun  1 13:34:58 2004
@@ -1,91 +1,107 @@
 <!--#include virtual="header.incl" -->
 <div class="www_sectiontitle">LLVM Features</div>
 
-<p>
-The <a href="releases/">public release of LLVM</a> is a fully functional 
-release of our compiler system for C and C++.  As such, it includes the 
-following:
-</p>
+<p>The <a href="releases/">public release of LLVM</a> is a fully functional
+release of our compiler system for C and C++.  As such, it includes the
+following:</p>
 
 <ul>
-  <li>
-  Front-ends for C and C++ based on the GCC 3.4 parser.  They support the full
-  ANSI-standard C and C++ languages, plus many GCC extensions.  LLVM 
-  also includes a front-end for "<a href="docs/Stacker.html">Stacker</a>", a 
-  Forth-like language.
-  </li>
-
-  <li>
-  A wide range of global scalar optimizations.
-  </li>
+  <li>Front-ends for C and C++ based on the GCC 3.4 parser.  They support the
+  full ANSI-standard C and C++ languages, plus many GCC extensions.  LLVM also
+  includes a front-end for "<a href="docs/Stacker.html">Stacker</a>", a
+  Forth-like language.</li>
+
+  <li> A wide range of global scalar optimizations.</li>
 
-  <li>
-  A link-time interprocedural optimization framework with a rich set of
+  <li> A link-time interprocedural optimization framework with a rich set of
   analyses and transformations, including sophisticated whole-program pointer
-  analysis, call graph construction, and support for profile-guided 
-  optimizations.
-  </li>
-
-  <li>
-  Native code generators for x86 and Sparc.
-  </li>
-
-  <li>
-  A Just-In-Time (JIT) code generation system for x86 and Sparc.
-  </li>
-
-  <li>
-  A C back-end useful for testing, for supporting targets other than X86 and 
-  Sparc, and allowing LLVM to use a native code generator.
-  </li>
-
-  <li>
-  A profiling system similar to gprof.
-  </li>
-
-  <li>
-  A test framework with a number of benchmark codes and applications.
-  </li>
-
-  <li>
-  APIs and debugging tools to simplify rapid development of LLVM components.
-  </li>
+  analysis, call graph construction, and support for profile-guided
+  optimizations.</li>
+
+  <li>Native code generators for x86 and Sparc.</li>
+
+  <li>A Just-In-Time (JIT) code generation system for x86 and Sparc.</li>
+
+  <li>A C back-end useful for testing, for supporting targets other than X86
+  and Sparc, and allowing LLVM to use a native code generator.</li>
+
+  <li>A profiling system similar to gprof.</li>
+
+  <li>A test framework with a number of benchmark codes and applications.</li>
+
+  <li>APIs and debugging tools to simplify rapid development of LLVM
+  components.</li>
 </ul>
 
+<div class="www_sectiontitle">Strengths of the LLVM System</div>
+
+<div class="www_text">
+
+<ol>
+  <li>LLVM uses a simple <a href="docs/LangRef.html">low-level language</a> with
+  strictly defined semantics.</li>
+
+  <li>It includes front-ends for <a href="docs/CommandGuide/llvmgcc.html">C</a>,
+  <a href="docs/CommandGuide/llvmgxx.html">C++</a>, and <a
+  href="docs/Stacker.html">Stacker</a> (a forth-like language).  Front-ends for
+  Java, Microsoft CLI, and O-Caml are in early development.</li>
+
+  <li>It includes an aggressive optimizer, including scalar, interprocedural,
+   profile-driven, and some simple loop optimizations.</li>
+  
+  <li>It supports a <a
+  href="http://llvm.cs.uiuc.edu/pubs/2004-01-30-CGO-LLVM.html">life-long
+  compilation model</a>, including link-time, install-time, run-time, and
+  offline optimization.</li>
+
+  <li>LLVM has full support for <a href="docs/GarbageCollection.html">accurate
+  garbage collection</a>.</li>
+
+  <li>It includes native code generators for X86 and Sparc (both of which work
+  as JIT or static compilers).  LLVM can also compile to C code, for
+  portability.  Other native backends are in development.</li>
+
+  <li>LLVM has extensive <a href="Documentation.html">documentation</a> and has
+  hosted many <a href="ProjectsWithLLVM/">projects</a> of various sorts.</li>
+
+  <li>Many third-party users have claimed that LLVM is easy to work with and
+  develop for.  For example, the Stacker front-end was written in <A
+  href="docs/Stacker.html#introduction">4 days</a> by someone who started
+  knowing nothing about LLVM.  Additionally, LLVM has tools to make <a
+  href="docs/CommandGuide/bugpoint.html">development easier</a>.</li>
+
+  <li>LLVM is under active development and is constantly being extended,
+  enhanced and improved.  See the status updates on the left bar to see the rate
+  of development.</li>
+
+  <li>LLVM is freely available under an OSI-approved "three-clause BSD" <a
+  href="http://llvm.cs.uiuc.edu/docs/FAQ.html#license">license</a>.</li>
+</ol>
+
+</div>
+
 <div class="www_sectiontitle">LLVM Audience</div>
 
-<p>
-LLVM can be used in many different kinds of projects.  You might be interested
-in LLVM if you are:
-</p>
+<p>LLVM can be used in many different kinds of projects.  You might be
+interested in LLVM if you are:</p>
 
 <ul>
-  <li>
-  A compiler researcher interested in compile-time, link-time
-  (interprocedural), and runtime transformations for C and C++ programs.
-  </li>
-
-  <li>
-  A virtual machine researcher/developer interested in a portable,
-  language-independent instruction set and compilation framework.
-  </li>
-
-  <li>
-  An architecture researcher interested in compiler/hardware techniques.
-  </li>
-
-  <li>
-  A security researcher interested in static analysis or instrumentation.
-  </li>
-
-  <li>
-  An instructor (or other person) interested in a system for quick
-  prototyping of compiler transformations.
-  </li>
-
-  <li>
-  An end-user who wants to get better performance out of your code.
-  </li>
+  <li>A compiler researcher interested in compile-time, link-time
+  (interprocedural), and runtime transformations for C and C++ programs.</li>
+
+  <li>A virtual machine researcher/developer interested in a portable,
+  language-independent instruction set and compilation framework.</li>
+
+  <li>An architecture researcher interested in compiler/hardware
+  techniques.</li>
+
+  <li>A security researcher interested in static analysis or
+  instrumentation.</li>
+
+  <li>An instructor or developer interested in a system for quick prototyping of
+  compiler transformations.</li>
+
+  <li>An end-user who wants to get better performance out of your code.</li>
 </ul>
 
 <div class="www_sectiontitle">Want to Know More?</div>




From lattner at cs.uiuc.edu  Tue Jun  1 13:40:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 13:40:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406011835.NAA07106@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.2 -> 1.3

---
Log message:

Finish the thought that got interrupted when my train arrived.  :)


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.2 llvm/docs/CodeGenerator.html:1.3
--- llvm/docs/CodeGenerator.html:1.2	Tue Jun  1 12:18:11 2004
+++ llvm/docs/CodeGenerator.html	Tue Jun  1 13:35:00 2004
@@ -203,12 +203,13 @@
 
 <div class="doc_text">
 
-<p>The target description classes require a detailed descriptions of the target
+<p>The target description classes require a detailed description of the target
 architecture.  These target descriptions often have a large amount of common
 information (e.g., an add instruction is almost identical to a sub instruction).
 In order to allow the maximum amount of commonality to be factored out, the LLVM
 code generator uses the <a href="TableGenFundamentals.html">TableGen</a> tool to
-allow 
+describe big chunks of the target machine, which allows the use of domain- and 
+target-specific abstractions to reduce the amount of repetition.
 </p>
 
 </div>
@@ -344,7 +345,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 17:18:11 $
+  Last modified: $Date: 2004/06/01 18:35:00 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Tue Jun  1 13:40:04 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:40:04 2004
Subject: [llvm-commits] CVS: llvm-www/www-index.html
Message-ID: <200406011836.NAA17825@zion.cs.uiuc.edu>


Changes in directory llvm-www:

www-index.html updated: 1.103 -> 1.104

---
Log message:

Moved "Strenghts" section to the Features page.


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

Index: llvm-www/www-index.html
diff -u llvm-www/www-index.html:1.103 llvm-www/www-index.html:1.104
--- llvm-www/www-index.html:1.103	Tue Jun  1 12:39:07 2004
+++ llvm-www/www-index.html	Tue Jun  1 13:36:00 2004
@@ -69,52 +69,6 @@
 
 </div>  
 
-<div class="www_sectiontitle">Strengths of the LLVM System</div>
-
-<div class="www_text">
-
-<ol>
-  <li>LLVM uses a simple <a href="docs/LangRef.html">low-level language</a> with strictly defined semantics.</li>
-
-  <li>It includes front-ends for <a href="docs/CommandGuide/llvmgcc.html">C</a>,
-  <a href="docs/CommandGuide/llvmgxx.html">C++</a>, and <a
-  href="docs/Stacker.html">Stacker</a> (a forth-like language).  Front-ends for
-  Java, Microsoft CLI, and O-Caml are in early development.</li>
-
-  <li>It includes an aggressive optimizer, including scalar, interprocedural,
-   profile-driven, and some simple loop optimizations.</li>
-  
-  <li>It supports a <a
-  href="http://llvm.cs.uiuc.edu/pubs/2004-01-30-CGO-LLVM.html">life-long
-  compilation model</a>, including link-time, install-time, run-time, and
-  offline optimization.</li>
-
-  <li>LLVM has full support for <a href="docs/GarbageCollection.html">accurate
-  garbage collection</a>.</li>
-
-  <li>It includes native code generators for X86 and Sparc (both of which work
-  as JIT or static compilers).  LLVM can also compile to C code, for
-  portability.  Other native backends are in development.</li>
-
-  <li>LLVM has extensive <a href="Documentation.html">documentation</a> and has
-  hosted many <a href="ProjectsWithLLVM/">projects</a> of various sorts.</li>
-
-  <li>Many third-party users have claimed that LLVM is easy to work with and
-  develop for.  For example, the Stacker front-end was written in <A
-  href="docs/Stacker.html#introduction">4 days</a> by someone who started
-  knowing nothing about LLVM.  Additionally, LLVM has tools to make <a
-  href="docs/CommandGuide/bugpoint.html">development easier</a>.</li>
-
-  <li>LLVM is under active development and is constantly being extended,
-  enhanced and improved.  See the status updates on the left bar to see the rate
-  of development.</li>
-
-  <li>LLVM is freely available under an OSI-approved "three-clause BSD" <a
-  href="http://llvm.cs.uiuc.edu/docs/FAQ.html#license">license</a>.</li>
-</ol>
-
-</div>
-
 <div class="www_sectiontitle">Want to learn more?</div>
 
 <p>If you'd like to learn more about LLVM, please take a look at the extensive




From brukman at cs.uiuc.edu  Tue Jun  1 13:44:03 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:44:03 2004
Subject: [llvm-commits] CVS: llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html
Message-ID: <200406011839.NAA29858@zion.cs.uiuc.edu>


Changes in directory llvm-www/pubs:

2003-09-30-LifelongOptimizationTR.html updated: 1.5 -> 1.6

---
Log message:

Fix spelling of `superseded'.


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

Index: llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html
diff -u llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html:1.5 llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html:1.6
--- llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html:1.5	Fri Jan 30 19:42:20 2004
+++ llvm-www/pubs/2003-09-30-LifelongOptimizationTR.html	Tue Jun  1 13:39:21 2004
@@ -50,7 +50,8 @@
 </blockquote>
 
 <p><b>This paper is an early version of the <a 
-      href="2004-01-30-CGO-LLVM.html">paper published in CGO'04</a>, and is superceded by it.</b></p>
+      href="2004-01-30-CGO-LLVM.html">paper published in CGO'04</a>, and is
+      superseded by it.</b></p>
 
 <h2>Download:</h2>
 <ul>




From brukman at cs.uiuc.edu  Tue Jun  1 13:55:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 13:55:02 2004
Subject: [llvm-commits] CVS: llvm/docs/FAQ.html
Message-ID: <200406011851.NAA09034@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

FAQ.html updated: 1.22 -> 1.23

---
Log message:

* Standardize footer
* HTML 4.01 (Strict) compliance


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

Index: llvm/docs/FAQ.html
diff -u llvm/docs/FAQ.html:1.22 llvm/docs/FAQ.html:1.23
--- llvm/docs/FAQ.html:1.22	Sun May 23 16:07:26 2004
+++ llvm/docs/FAQ.html	Tue Jun  1 13:51:03 2004
@@ -3,7 +3,7 @@
 <html>
 <head>
   <title>LLVM: Frequently Asked Questions</title>
-  <style>
+  <style type="text/css">
     @import url("llvm.css");
     .question { font-weight: bold }
     .answer   { margin-left: 2em  }
@@ -236,7 +236,7 @@
   <li><p>Run <tt>configure</tt> with an alternative <tt>PATH</tt> that is
   correct. In a Borne compatible shell, the syntax would be:</p>
 		
-      <p><tt>PATH=<the path without the bad program> ./configure ...</tt></p>
+      <p><tt>PATH=[the path without the bad program] ./configure ...</tt></p>
 
       <p>This is still somewhat inconvenient, but it allows <tt>configure</tt>
       to do its work without having to adjust your <tt>PATH</tt>
@@ -517,14 +517,17 @@
 </div>
 
 <!-- *********************************************************************** -->
-<!-- *********************************************************************** -->
 
 <hr>
-<div class="doc_footer">
-  <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a>
-  <br>
-  Last modified: $Date: 2004/05/23 21:07:26 $
-</div>
+<address>
+  <a href="http://jigsaw.w3.org/css-validator/check/referer"><img
+  src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
+  <a href="http://validator.w3.org/check/referer"><img
+  src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
+
+  <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
+  Last modified: $Date: 2004/06/01 18:51:03 $
+</address>
 
 </body>
 </html>




From criswell at cs.uiuc.edu  Tue Jun  1 14:06:05 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Jun  1 14:06:05 2004
Subject: [llvm-commits] CVS: llvm/Makefile.config.in
Message-ID: <200406011904.OAA24786@choi.cs.uiuc.edu>


Changes in directory llvm:

Makefile.config.in updated: 1.26 -> 1.27

---
Log message:

Added the EXEEXT variable so that Makefiles can figure out what extension
to put on executable files.



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

Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.26 llvm/Makefile.config.in:1.27
--- llvm/Makefile.config.in:1.26	Fri Apr 23 19:10:56 2004
+++ llvm/Makefile.config.in	Tue Jun  1 14:04:38 2004
@@ -133,6 +133,9 @@
 # Shared library extension for this platform.
 SHLIBEXT = @SHLIBEXT@
 
+# Executable file extension for this platform.
+EXEEXT = @EXEEXT@
+
 ###########################################################################
 # Directory Configuration
 #	This section of the Makefile determines what is where.  To be




From lattner at cs.uiuc.edu  Tue Jun  1 14:10:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 14:10:01 2004
Subject: [llvm-commits] CVS: llvm/Makefile.rules
Message-ID: <200406011906.OAA13434@zion.cs.uiuc.edu>


Changes in directory llvm:

Makefile.rules updated: 1.184 -> 1.185

---
Log message:

Make tool names end with .exe on windows.  This isn't needed to run the
tools, but is required for rules that depend on the executables, e.g.:

a: b $(LLVMAS)



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

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.184 llvm/Makefile.rules:1.185
--- llvm/Makefile.rules:1.184	Fri May 21 18:21:11 2004
+++ llvm/Makefile.rules	Tue Jun  1 14:05:53 2004
@@ -244,10 +244,10 @@
 #--------------------------------------------------------------------------
 # Utilities used while building the LLVM tree, which live in the utils dir
 #
-BURG       := $(LLVMTOOLCURRENT)/burg
+BURG       := $(LLVMTOOLCURRENT)/burg$(EXEEXT)
 RunBurg    := $(BURG) $(BURG_OPTS)
-TBLGEN     := $(LLVMTOOLCURRENT)/tblgen
-LGCCLDPROG := $(LLVMTOOLCURRENT)/gccld
+TBLGEN     := $(LLVMTOOLCURRENT)/tblgen$(EXEEXT)
+LGCCLDPROG := $(LLVMTOOLCURRENT)/gccld$(EXEEXT)
 
 #--------------------------------------------------------------------------
 # The LLVM GCC front-end in C and C++ flavors
@@ -259,7 +259,7 @@
 # Some of the compiled LLVM tools which are used for compilation of runtime
 # libraries.
 #
-LLVMAS  := $(LLVMTOOLCURRENT)/llvm-as
+LLVMAS  := $(LLVMTOOLCURRENT)/llvm-as$(EXEEXT)
 
 
 ###########################################################################




From lattner at cs.uiuc.edu  Tue Jun  1 14:11:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 14:11:08 2004
Subject: [llvm-commits] CVS: llvm/test/Makefile.tests
Message-ID: <200406011906.OAA13464@zion.cs.uiuc.edu>


Changes in directory llvm/test:

Makefile.tests updated: 1.87 -> 1.88

---
Log message:

Make tool names end with .exe on windows.  This isn't needed to run the
tools, but is required for rules that depend on the executables, e.g.:

a: b $(LLVMAS)



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

Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.87 llvm/test/Makefile.tests:1.88
--- llvm/test/Makefile.tests:1.87	Tue Feb 10 13:46:14 2004
+++ llvm/test/Makefile.tests	Tue Jun  1 14:06:43 2004
@@ -38,16 +38,16 @@
 LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
 
 # LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(LLVMTOOLCURRENT)/lli
-LLC      = $(LLVMTOOLCURRENT)/llc
-LGCCAS   = $(LLVMTOOLCURRENT)/gccas
+LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
+LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
+LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
 LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
-LDIS     = $(LLVMTOOLCURRENT)/llvm-dis 
-LOPT     = $(LLVMTOOLCURRENT)/opt
-LLINK    = $(LLVMTOOLCURRENT)/llvm-link
-LPROF    = $(LLVMTOOLCURRENT)/llvm-prof
-LANALYZE = $(LLVMTOOLCURRENT)/analyze
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint
+LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
+LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
+LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
+LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
+LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
+LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall




From lattner at cs.uiuc.edu  Tue Jun  1 14:23:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 14:23:01 2004
Subject: [llvm-commits] CVS: llvm-www/RandomBoxes/007-Bugpoint.html
Message-ID: <200406011919.OAA14155@zion.cs.uiuc.edu>


Changes in directory llvm-www/RandomBoxes:

007-Bugpoint.html updated: 1.2 -> 1.3

---
Log message:

Fix grammar


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

Index: llvm-www/RandomBoxes/007-Bugpoint.html
diff -u llvm-www/RandomBoxes/007-Bugpoint.html:1.2 llvm-www/RandomBoxes/007-Bugpoint.html:1.3
--- llvm-www/RandomBoxes/007-Bugpoint.html:1.2	Fri May 28 12:30:35 2004
+++ llvm-www/RandomBoxes/007-Bugpoint.html	Tue Jun  1 14:19:04 2004
@@ -1,3 +1,3 @@
 <img align="right" src="img/logo-bugpoint.gif" width=176 height=154">
-<a href="docs/CommandGuide/bugpoint.html">Bugpoint</a> is a automated testcase reduction tool that is extremely useful for debugging problems in LLVM optimizers and code generators.  It can usually reduce an optimizer crash down to the few instructions needed to reproduce the problem or a miscompilation down to the specific loop nest or basic block in the program that is causing the problem.
+<a href="docs/CommandGuide/bugpoint.html">Bugpoint</a> is an automated testcase reduction tool that is extremely useful for debugging problems in LLVM optimizers and code generators.  It can usually reduce an optimizer crash down to the few instructions needed to reproduce the problem or a miscompilation down to the specific loop nest or basic block in the program that is being miscompiled.
 




From lattner at cs.uiuc.edu  Tue Jun  1 14:46:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 14:46:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406011941.OAA14835@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.188 -> 1.189

---
Log message:

Add a note about cygwin


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.188 llvm/docs/ReleaseNotes.html:1.189
--- llvm/docs/ReleaseNotes.html:1.188	Tue Jun  1 13:22:41 2004
+++ llvm/docs/ReleaseNotes.html	Tue Jun  1 14:41:30 2004
@@ -285,7 +285,9 @@
 <p>Note that the LLVM build system does not currently support directories with 
 spaces on them when running on Win32/cygwin.  We strongly recommend running
 LLVM and the C frontend out of a top-level directory without spaces (e.g., 
-<tt>/cygdrive/c/llvm</tt>).</p>
+<tt>/cygdrive/c/llvm</tt>).  Also, make sure to install <b>all</b> of the 
+cygwin packages.  By default, many important tools are not installed that 
+are needed by the LLVM build process or test suite (e.g., /bin/time).</p>
 
 </div>
 
@@ -690,7 +692,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 18:22:41 $
+  Last modified: $Date: 2004/06/01 19:41:30 $
 </address>
 
 </body>




From gaeke at cs.uiuc.edu  Tue Jun  1 15:02:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:02:01 2004
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/BranchCombine/
Message-ID: <200406012000.PAA16507@kain.cs.uiuc.edu>


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


---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm/test/Regression/Transforms/BranchCombine added to the repository


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



From gaeke at cs.uiuc.edu  Tue Jun  1 15:02:04 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:02:04 2004
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/BranchCombine/2004-06-01-Simple.ll
Message-ID: <200406012001.PAA16520@kain.cs.uiuc.edu>


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

2004-06-01-Simple.ll added (r1.1)

---
Log message:

Maybe this will keep people from breaking -branch-combine!


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

Index: llvm/test/Regression/Transforms/BranchCombine/2004-06-01-Simple.ll
diff -c /dev/null llvm/test/Regression/Transforms/BranchCombine/2004-06-01-Simple.ll:1.1
*** /dev/null	Tue Jun  1 15:01:16 2004
--- llvm/test/Regression/Transforms/BranchCombine/2004-06-01-Simple.ll	Tue Jun  1 15:01:05 2004
***************
*** 0 ****
--- 1,24 ----
+ ; Basic test of -branch-combine functionality
+ ; RUN: llvm-as < %s | opt -branch-combine | llvm-dis | egrep 'newCommon:.*; preds =.*no_exit.1' | grep loopentry.2
+ 
+ target endian = big
+ target pointersize = 64
+ 
+ implementation   ; Functions:
+ 
+ void %main() {
+ entry:
+ 	br bool false, label %__main.entry, label %endif.0.i
+ 
+ endif.0.i:		; preds = %entry
+ 	ret void
+ 
+ __main.entry:		; preds = %entry
+ 	br label %no_exit.1
+ 
+ no_exit.1:		; preds = %__main.entry, %no_exit.1, %loopentry.2
+ 	br bool false, label %loopentry.2, label %no_exit.1
+ 
+ loopentry.2:		; preds = %no_exit.1
+ 	br label %no_exit.1
+ }




From gaeke at cs.uiuc.edu  Tue Jun  1 15:04:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:04:02 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406012003.PAA16587@kain.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.189 -> 1.190

---
Log message:

Call Cygwin by its proper name, and give it a link. :-)


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.189 llvm/docs/ReleaseNotes.html:1.190
--- llvm/docs/ReleaseNotes.html:1.189	Tue Jun  1 14:41:30 2004
+++ llvm/docs/ReleaseNotes.html	Tue Jun  1 15:02:56 2004
@@ -114,7 +114,8 @@
 analysis algorithm.</li>
 <li>Bugpoint can <a href="http://llvm.cs.uiuc.edu/PR327">extract individual
 basic blocks</a> to track down reduce miscompilation testcases.</li>
-<li>LLVM and the C front-end now work under Win32 using the cygnus libraries.  
+<li>LLVM and the C front-end now work under Win32 using the
+<a href="http://www.cygwin.com">Cygwin</a> runtime libraries.  
 This includes the JIT compiler.</li>
 </ol>
 
@@ -692,7 +693,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 19:41:30 $
+  Last modified: $Date: 2004/06/01 20:02:56 $
 </address>
 
 </body>




From gaeke at cs.uiuc.edu  Tue Jun  1 15:08:05 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:08:05 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
Message-ID: <200406012006.PAA16603@kain.cs.uiuc.edu>


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

CombineBranch.cpp updated: 1.8 -> 1.9

---
Log message:

Use new form of unconditional branch constructor.


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

Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.8 llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.9
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.8	Tue Mar 30 13:53:46 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp	Tue Jun  1 15:06:10 2004
@@ -110,7 +110,7 @@
       sameTarget.push_back(MI->first);
 
       BasicBlock *newBB = new BasicBlock("newCommon", MI->first->getParent());
-      BranchInst *newBranch = new BranchInst(MI->second, 0, 0, newBB);
+      BranchInst *newBranch = new BranchInst(MI->second, newBB);
 
       std::map<PHINode *, std::vector<unsigned int> > phiMap;
 




From gaeke at cs.uiuc.edu  Tue Jun  1 15:40:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:40:02 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/spiff/
Message-ID: <200406012035.PAA15605@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Applications/spiff:


---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff added to the repository


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



From gaeke at cs.uiuc.edu  Tue Jun  1 15:40:06 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:40:06 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/spiff/LICENSE.TXT Makefile README Sample.1 Sample.2 Sample.3 Sample.4 command.c command.h comment.c comment.h compare.c compare.h edit.h exact.c exact.h flagdefs.h float.c float.h floatrep.c floatrep.h line.c line.h miller.c miller.h misc.c misc.h one output.c output.h paper.ms parse.c parse.h spiff.1 spiff.c strings.c strings.h token.c token.h tol.c tol.h two visual.c visual.h
Message-ID: <200406012036.PAA15762@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Applications/spiff:

LICENSE.TXT added (r1.1)
Makefile added (r1.1)
README added (r1.1)
Sample.1 added (r1.1)
Sample.2 added (r1.1)
Sample.3 added (r1.1)
Sample.4 added (r1.1)
command.c added (r1.1)
command.h added (r1.1)
comment.c added (r1.1)
comment.h added (r1.1)
compare.c added (r1.1)
compare.h added (r1.1)
edit.h added (r1.1)
exact.c added (r1.1)
exact.h added (r1.1)
flagdefs.h added (r1.1)
float.c added (r1.1)
float.h added (r1.1)
floatrep.c added (r1.1)
floatrep.h added (r1.1)
line.c added (r1.1)
line.h added (r1.1)
miller.c added (r1.1)
miller.h added (r1.1)
misc.c added (r1.1)
misc.h added (r1.1)
one added (r1.1)
output.c added (r1.1)
output.h added (r1.1)
paper.ms added (r1.1)
parse.c added (r1.1)
parse.h added (r1.1)
spiff.1 added (r1.1)
spiff.c added (r1.1)
strings.c added (r1.1)
strings.h added (r1.1)
token.c added (r1.1)
token.h added (r1.1)
tol.c added (r1.1)
tol.h added (r1.1)
two added (r1.1)
visual.c added (r1.1)
visual.h added (r1.1)

---
Log message:

Importing spiff


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

Index: llvm/test/Programs/MultiSource/Applications/spiff/LICENSE.TXT
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/LICENSE.TXT:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/LICENSE.TXT	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,13 ----
+ COPYRIGHT
+ 
+ Our lawyers advise the following:
+ 
+                    Copyright (c) 1988 Bellcore
+                        All Rights Reserved
+   Permission is granted to copy or use this program, EXCEPT that it
+   may not be sold for profit, the copyright notice must be reproduced
+   on copies, and credit should be given to Bellcore where it is due.
+   BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ 
+ Given that all of the above seems to be very reasonable, there should be no
+ reason for anyone to not play by the rules.


Index: llvm/test/Programs/MultiSource/Applications/spiff/Makefile
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/Makefile:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/Makefile	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,13 ----
+ LEVEL = ../../../../..
+ PROG     = spiff
+ CPPFLAGS = 
+ CFLAGS   = 
+ LDFLAGS  =
+ 
+ RUN_OPTIONS = ./Sample.1 ./Sample.2
+ #RUN_OPTIONS = ./Sample.3 ./Sample.4
+ #RUN_OPTIONS = ./one ./two
+ # you get the idea...
+ 
+ include ../../Makefile.multisrc
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/README
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/README:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/README	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,264 ----
+ INSTALLATION
+ 	1) Change makefile settings to reflect
+ 		ATT vs. BSD software
+ 		termio vs. termcap
+ 		MGR vs. no MGR		(MGR is a BELLCORE produced
+ 					 window manager that is also available
+ 					 free to the public.)
+ 	2) Then, just say "make".
+ 		If you want to "make install", you should first
+ 		change definition of INSDIR in the makefile
+ 
+ 	3) to test the software say
+ 
+ 			spiff Sample.1 Sample.2
+ 
+ 		spiff should find 4 differences and
+ 		you should see the words "added", "deleted", "changed",
+ 		and "altered" as well as four number in stand-out mode.
+ 
+ 			spiff Sample.1 Sample.2 | cat
+ 
+ 		should produce the same output, only the differences
+ 		should be underlined However, on many terminals the underlining
+ 		does not appear. So try the command
+ 
+ 			spiff Sample.1 Sample.2 | cat -v
+ 
+ 		or whatever the equivalent to cat -v is on your system.
+ 
+ 		A more complicated test set is found in Sample.3 and Sample.4
+ 		These files show how to use embedded commands to do things
+ 		like change the commenting convention and tolerances on the
+ 		fly.  Be sure to run the command with the -s option to spiff:
+ 
+ 			spiff -s 'command spiffword' Sample.3 Sample.4
+ 
+ 		These files by no means provide an exhaustive test of
+ 		spiff's features. But they should give you some idea if things
+ 		are working right.
+ 
+ 	This code (or it's closely related cousins) has been run on
+ 	Vaxen running 4.3BSD, a CCI Power 6, some XENIX machines, and some
+ 	other machines running System V derivatives as well as
+ 	(thanks to eugene at ames.arpa) Cray, Amdahl and Convex machines.
+ 
+ 	4) Share and enjoy.
+ 
+ AUTHOR'S ADDRESS
+ 	Please send complaints, comments, praise, bug reports, etc to
+ 		Dan Nachbar
+ 		Bell Communications Research  (also known as BELLCORE)
+ 		445 South St. Room 2B-389
+ 		Morristown, NJ 07960
+ 
+ 			nachbar at bellcore.com
+ 		or
+ 			bellcore!nachbar
+ 		or
+ 			(201) 829-4392  (praise only, please)
+ 
+ OVERVIEW OF OPERATION
+ 
+ Each of two input files is read and stored in core.
+ Then it is parsed into a series of tokens (literal strings and
+ floating point numbers, white space is ignored).
+ The token sequences are stored in core as well.
+ After both files have been parsed, a differencing algorithm is applied to
+ the token sequences.  The differencing algorithm
+ produces an edit script, which is then passed to an output routine.
+ 
+ SIZE LIMITS AND OTHER DEFAULTS
+ 		file implementing limit		name		default value
+ maximum number of lines		lines.h		_L_MAXLINES	10000
+ 	per file
+ maximum number of tokens	token.h		K_MAXTOKENS	50000
+ 	per file
+ maximum line length		misc.h		Z_LINELEN	 1024
+ maximum word length		misc.h		Z_WORDLEN	   20
+  (length of misc buffers for
+  things like literal
+  delimiters.
+  NOT length of tokens which
+  can be virtually any length)
+ default absolute tolerance	tol.h		_T_ADEF		   "1e-10"   
+ default relative tolerance	tol.h		_T_RDEF		   "1e-10"  
+ maximum number of commands	command.h	_C_CMDMAX	  100
+  in effect at one time
+ maximum number of commenting	comment.h	W_COMMAX	   20
+  conventions that can be
+  in effect at one time
+  (not including commenting
+   conventions that are
+   restricted to beginning
+   of line)
+ maximum number of commenting	comment.h	W_BOLMAX	   20
+  conventions that are
+  restricted to beginning of
+  line that are in effect at
+  one time
+ maximum number of literal	comment.h	W_LITMAX	   20
+  string conventions that
+  can be in effect at one time
+ maximum number of tolerances	tol.h		_T_TOLMAX	   10
+  that can be in effect at one
+  time
+ 
+ 
+ DIFFERENCES BETWEEN THE CURRENT VERSION AND THE ENCLOSED PAPER
+ 
+ The files paper.ms and paper.out contain the nroff -ms input and
+ output respectively of a paper on spiff that was given the Summer '88
+ USENIX conference in San Francisco.  Since that time many changes
+ have been made to the code.  Many flags have changed and some have
+ had their meanings reversed, see the enclosed man page for the current
+ usage.  Also, there is no longer control over the
+ granularity of object used when applying the differencing algorithm.
+ The current version of spiff always applies the differencing
+ in terms of individual tokens.  The -t flag controls how the edit script
+ is printed.  This arrangement more closely reflects the original intent
+ of having multiple differencing granularities. 
+ 
+ PERFORMANCE
+ 
+ Spiff is big and slow.  It is big because all the storage is
+ in core.  It is a straightforward but boring task to move the temporary
+ storage into a file.  Someone who cares is invited to take on the job.
+ Spiff is slow because whenever a choice had to be made between
+ speed of operation and ease of coding, speed of operation almost always lost.
+ As the program matures it will almost certainly get smaller and faster.
+ Obvious performance enhancements have been avoided in order to make the
+ program available as soon as possible.
+ 
+ COPYRIGHT
+ 
+ Our lawyers advise the following:
+ 
+                    Copyright (c) 1988 Bellcore
+                        All Rights Reserved
+   Permission is granted to copy or use this program, EXCEPT that it
+   may not be sold for profit, the copyright notice must be reproduced
+   on copies, and credit should be given to Bellcore where it is due.
+   BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ 
+ Given that all of the above seems to be very reasonable, there should be no
+ reason for anyone to not play by the rules.
+ 
+ 
+ NAMING CONVENTIONS USED IN THE CODE
+ 
+ All symbols (functions, data declarations, macros) are named as follows:
+ 
+ 	L_foo	-- for names exported to other modules
+ 			and possibly used inside the module as well.
+ 	_L_foo	-- for names used by more than one routine
+ 			within a module
+ 	foo	-- for names used inside a single routine.
+ 
+ Each module uses a different value for "L" -- 
+ 	module files	   letter used     implements
+ 	spiff.c			Y	top level routines
+ 	misc.[ch]		Z	various routines used throughout
+ 	strings.[ch]		S	routines for handling strings
+ 	edit.h			E	list of changes found and printed
+ 	tol.[ch]		T	tolerances for real numbers
+ 	token.[ch]		K	storage for objects
+ 	float.[ch]		F	manipulation of floats
+ 	floatrep.[ch]		R	representation of floats
+ 	line.[ch]		L	storage for input lines
+ 	parse.[ch]		P	parse for input files
+ 	command.[ch]		C	storage and recognition of commands
+ 	comment.[ch]		W	comment list maintenance
+ 	compare.[ch]		X	comparisons of a single token
+ 	exact.[ch]		Q	exact match differencing algorithm
+ 	miller.[ch]		G	miller/myers differencing algorithm
+ 	output.[ch]		O	print listing of differences
+ 	flagdefs.h		U	define flag bits that are used in
+ 					several of the other modules.
+ 					These #defines could have been
+ 					included in misc.c, but were separated
+ 					out because of their explicit
+ 					communication function.
+ 	visual.[ch]		V	screen oriented display for MGR
+ 					window manager, also contains
+ 					dummy routines for people who don't
+ 					have MGR 
+ 
+ I haven't cleaned up visual.c yet.  It probably doesn't even compile
+ in this version anyway. But since most people don't have mgr, this
+ isn't urgent.
+ 
+ NON-OBVIOUS DATA STRUCTURES
+ 
+ The Floating Point Representation
+ 
+ Floating point numbers are stored in a struct R_flstr
+ The fractional part is often called the mantissa.
+ 
+ The structure consists of
+ 	a flag for the sign of the factional part
+ 	the exponent in binary 
+ 	a character string containing the fractional part
+ 
+ The structure could be converted to a float via
+ 	atof(strcat(".",mantissa)) * (10^exponent)
+ 
+ To be properly formed, the mantissa string must:
+ 	start with a digit between 1 and 9 (i.e. no leading zeros)
+ 		except for the zero, in which case the mantissa is exactly "0"
+ 	for the special case of zero, the exponent is always 0, and the
+ 		sign is always positive. (i.e. no negative 0)
+ 
+ In other words, (except for the value 0)
+ the mantissa is a fractional number ranging
+ between 0.1 (inclusive) and 1.0 (exclusive).
+ The exponent is interpreted as a power of 10.
+ 
+ Lines 
+ there are three sets of lines:
+ implemented in line.c and line.h
+ 	real_lines --
+ 	  the lines as they come from the file
+ 	content_lines --
+ 	  a subset of reallines that excluding embedded commands
+ implemented in token.c and token.h 
+ 	token_lines --
+ 	  a subset of content_lines consisting of those lines that
+ 		have tokens that begin on them (literals can go on for
+ 		more than one line)
+ 		i.e. content_lines excluding comments and blank lines.
+ 
+ 
+ THE STATE OF THE CODE
+ Things that should be added
+ 	visual mode should handle tabs and wrapped lines
+ 	handling huge files in chunks when in using the ordinal match
+ 	algorithm. right now you have to parse and then diff the
+ 	whole thing before you get any output.  often, you run out of memory.
+ 
+ Things that would be nice to add
+ 	output should optionally be expressed in real line numbers
+ 		(i.e. including command lines)
+ 	at present, all storage is in core. there should
+ 		be a compile time decision to allow temporary storage
+ 		in files rather than core. 
+ 		that way the user could decide how to handle the
+ 			speed/space tradeoff
+ 	a front end that looked like diff should be added so that
+ 		one could drop spiff into existing shell scripts
+ 	the parser converts floats into their internal form even when
+ 		it isn't necessary.
+ 	in the miller/myer code, the code should check for matching
+ 		end sequences.  it currently looks matching beginning
+ 		sequences.
+ 
+ Minor programming improvements (programming botches)
+ 	some of the #defines should really be enumerated types
+ 	all the routines in strings.c that alter the data at the end of
+ 		a pointer but return void should just return the correct
+ 		data. the current arrangement is a historical artifact
+ 		of the days when these routines returned a status code.
+ 		but then the code was never examined,
+ 		so i made them void . . .
+ 	comments should be added to the miller/myer code
+ 	in visual mode, ask for font by name rather than number


Index: llvm/test/Programs/MultiSource/Applications/spiff/Sample.1
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/Sample.1:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/Sample.1	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,11 ----
+ test file for spiff.
+ there is a word       here.
+ there is a deleted word in this line.
+ there is a word that is changed here.
+ 
+ no difference on 	this line  due to      white space.
+ default absolute tolerance should be 1e-10   
+ no difference --> 0.0           different --> 0.0
+ default relative tolerance should be 1e-10   
+ no difference --> 10.           different --> 10.00000
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/Sample.2
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/Sample.2:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/Sample.2	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,11 ----
+ test file for spiff.
+ there is a word added here.
+ there is a         word in this line.
+ there is a word that is altered here.
+ no difference on this line due to white space.
+ 
+ default absolute tolerance should be .0000000001   
+ no difference --> 0.0000000001  different --> 0.00000000011
+ default relative tolerance should be 1.0e-10   
+ no difference --> 10.000000001  different --> 10.0000000011
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/Sample.3
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/Sample.3:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/Sample.3	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,36 ----
+ spiffword rem this file should be named Sample.3
+ spiffword rem it is a test input file for spiff
+ spiffword rem it should be compared with a file named Sample.4, to use it
+ spiffword rem execute: spiff -s 'command spiffword' Sample.3 Sample.4
+ spiffword rem the -s argument is  essential, otherwise spiff will
+ spiffword rem will not recognized these comments for what they are.
+ spiffword rem first we'll check the default tolerances.  this is the
+ spiffword rem same test as is found in Sample.1/Sample.2
+ default absolute tolerance should be 1e-10   
+ no difference --> 0.0           different --> 0.0
+ default relative tolerance should be 1e-10   
+ no difference --> 10.           different --> 10.00000
+ spiffword rem Note that spiff said that the differences were on lines 2 and 4
+ spiffword rem of the input files even though they were really on lines 10 and
+ spiffword rem of this file.
+ spiffword rem That's because spiff does not count lines with commands.
+ spiffword rem As part of spiff's design, it is assumed that "embedded commands"
+ spiffword rem such as these are not of direct interest and have been added
+ spiffword rem soley for the purpose of controlling the spiffing process.
+ spiffword rem OK. Now we'll try changing some things. first, we'll add 
+ spiffword rem a commenting convention, everything from # to end of line
+ spiffword rem will be ignored.
+ spiffword comment # $
+ there should be NO differences on this line !!!! # Nah, Nah, can't see me !!
+ spiffword rem Well, that was fun. Now we'll ignore all differences
+ spiffword tol i
+ spiffword rem and there should be no differences the following lines
+ no difference --> 0.0           NO difference --> 0.0
+ no difference --> 10.           NO difference --> 10.00000
+ spiffword rem now we'll set the tolerance for the second number
+ spiffword rem on each line, to be lower than the others.
+ spiffword tol a0.02 ; a0.01 ; a0.02
+ spiffword rem and only the middle number should appear different
+ not different --> 0.0    different --> 0.0    not different --> 0.0
+ spiffword rem You get the idea. Enough fun for now.
+ Bye, Bye.


Index: llvm/test/Programs/MultiSource/Applications/spiff/Sample.4
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/Sample.4:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/Sample.4	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,36 ----
+ spiffword rem this file should be named Sample.4
+ spiffword rem it is a test input file for spiff
+ spiffword rem it should be compared with a file named Sample.3, to use it
+ spiffword rem execute: spiff -s 'command spiffword' Sample.3 Sample.4
+ spiffword rem the -s argument is  essential, otherwise spiff will
+ spiffword rem will not recognized these comments for what they are.
+ spiffword rem first we'll check the default tolerances.  this is the
+ spiffword rem same test as is found in Sample.1/Sample.2
+ default absolute tolerance should be .0000000001   
+ no difference --> 0.0000000001  different --> 0.00000000011
+ default relative tolerance should be 1.0e-10   
+ no difference --> 10.000000001  different --> 10.0000000011
+ spiffword rem Note that spiff said that the differences were on lines 1 and 3
+ spiffword rem of the input files even though they were really on lines 10 and
+ spiffword rem of this file.
+ spiffword rem That's because spiff does not count lines with commands.
+ spiffword rem As part of spiff's design, it is assumed that "embedded commands"
+ spiffword rem such as these are not of direct interest and have been added
+ spiffword rem soley for the purpose of controlling the spiffing process.
+ spiffword rem OK. Now we'll try changing some things. first, we'll add 
+ spiffword rem a commenting convention, everything from # to end of line
+ spiffword rem will be ignored.
+ spiffword comment # $
+ there should be NO differences on this line !!!! # No difference here !!
+ spiffword rem Well, that was fun. Now we'll ignore all differences
+ spiffword tol i
+ spiffword rem and there should be no differences the following lines
+ no difference --> 0.0000000001  NO difference --> 0.00000000011
+ no difference --> 10.000000001  NO difference --> 10.0000000011
+ spiffword rem now we'll set the tolerance for the second number
+ spiffword rem on each line, to be lower than the others.
+ spiffword tol a0.02 ; a0.01 ; a0.02
+ spiffword rem and only the middle number should appear different
+ not different --> 0.011  different --> 0.011  not different --> 0.011  
+ spiffword rem You get the idea. Enough fun for now.
+ All done.


Index: llvm/test/Programs/MultiSource/Applications/spiff/command.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/command.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/command.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,192 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/command.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ 
+ #include "misc.h"
+ #include "tol.h"
+ #include "comment.h"
+ #include "command.h"
+ #include "strings.h"
+ #include "parse.h"
+ 
+ /*
+ **	storage for the string that signals an embedded command
+ */
+ static char _C_cmdword[Z_WORDLEN];
+ 
+ /*
+ **	storage for the command script
+ */
+ static int _C_nextcmd = 0;
+ static char *_C_cmds[_C_CMDMAX];
+ 
+ 
+ /*
+ **	add a string to the command buffer
+ */
+ void
+ C_addcmd(str)
+ char *str;
+ {
+ 	S_savestr(&_C_cmds[_C_nextcmd++],str);
+ 	return;
+ }
+ 
+ /*
+ **	execute a single command
+ */
+ static void
+ _C_do_a_cmd(str)
+ char *str;
+ {
+ 	/*
+ 	**	place holder for the beginning of the string
+ 	*/
+ 	char *beginning = str;
+ 
+ 	S_skipspace(&str);
+ 
+ 	/*
+ 	**	set the command string to allow embedded commands
+ 	*/
+ 	if 	(!S_wordcmp(str,"command"))
+ 	{
+ 		S_nextword(&str);
+ 		if (strlen(str) >= Z_WORDLEN)
+ 		{
+ 			Z_fatal("command word is too long");
+ 		}
+ 		S_wordcpy(_C_cmdword,str);
+ 	}
+ 	/*
+ 	**	set the tolerances
+ 	*/
+ 	else if (!S_wordcmp(str,"tol"))
+ 	{
+ 		S_nextword(&str);
+ 		T_tolline(str);
+ 	}
+ 	/*
+ 	**	add a comment specification
+ 	*/
+ 	else if (!S_wordcmp(str,"comment"))
+ 	{
+ 		S_nextword(&str);
+ 		if (strlen(str) >= Z_WORDLEN)
+ 		{
+ 			Z_fatal("command word is too long");
+ 		}
+ 		W_addcom(str,0);
+ 	}
+ 	else if (!S_wordcmp(str,"nestcom"))
+ 	{
+ 		S_nextword(&str);
+ 		if (strlen(str) >= Z_WORDLEN)
+ 		{
+ 			Z_fatal("command word is too long");
+ 		}
+ 		W_addcom(str,1);
+ 	}
+ 	/*
+ 	**	add a literal string specification
+ 	*/
+ 	else if (!S_wordcmp(str,"literal"))
+ 	{
+ 		S_nextword(&str);
+ 		if (strlen(str) >= Z_WORDLEN)
+ 		{
+ 			Z_fatal("command word is too long");
+ 		}
+ 		W_addlit(str);
+ 	}
+ 	else if (!S_wordcmp(str,"resetcomments"))
+ 	{
+ 		W_clearcoms();
+ 	}
+ 	else if (!S_wordcmp(str,"resetliterals"))
+ 	{
+ 		W_clearlits();
+ 	}
+ 	else if (!S_wordcmp(str,"beginchar"))
+ 	{
+ 		S_nextword(&str);
+ 		W_setbolchar(*str);
+ 	}
+ 	else if (!S_wordcmp(str,"endchar"))
+ 	{
+ 		S_nextword(&str);
+ 		W_seteolchar(*str);
+ 	}
+ 	else if (!S_wordcmp(str,"addalpha"))
+ 	{
+ 		S_nextword(&str);
+ 		P_addalpha(str);
+ 	}
+ 	else if ((0 == strlen(str)) || !S_wordcmp(str,"rem") 
+ 				    || ('#' == *str))
+ 	{
+ 		/* do nothing */
+ 	}
+ 	else
+ 	{
+ 		(void) sprintf(Z_err_buf,
+ 			       "don't understand command %s\n",
+ 			       beginning);
+ 		Z_fatal(Z_err_buf);
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	execute the commands in the command buffer
+ */
+ void
+ C_docmds()
+ {
+ 	int i;
+ 	for (i=0;i<_C_nextcmd;i++)
+ 	{
+ 		_C_do_a_cmd(_C_cmds[i]);
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	disable embedded command key word recognition
+ */
+ void
+ C_clear_cmd()
+ {
+ 	_C_cmdword[0] = '\0';
+ 	return;
+ }
+ 
+ int
+ C_is_cmd(in_line)
+ char *in_line;
+ {
+ 	char *ptr;
+ 	/*
+ 	**	see if this is a command line
+ 	**	and if so, do the command right away
+ 	*/
+ 	if (('\0' != _C_cmdword[0]) && (!S_wordcmp(in_line,_C_cmdword)))
+ 	{
+ 		ptr = in_line;
+ 		S_nextword(&ptr);
+ 		_C_do_a_cmd(ptr);
+ 		return(1);
+ 	}
+ 	return(0);
+ }
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/command.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/command.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/command.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,18 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef C_INCLUDED
+ extern int C_is_cmd();
+ extern void C_clear_cmd();
+ extern void C_addcmd();
+ extern void C_docmds();
+ 
+ #define _C_CMDMAX	100
+ 
+ #define C_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/comment.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/comment.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/comment.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,311 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/comment.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ 
+ #include "misc.h"
+ #include "comment.h"
+ #include "strings.h"
+ 
+ /*
+ **	storage for the comment specifiers that can appear
+ **		anywhere on a line
+ */
+ static int _W_nextcom = 0;
+ _W_comstruct _W_coms[_W_COMMAX];
+ 
+ /*
+ **	storage for comment specifiers that are examined only at the
+ **		beginning of each line
+ */
+ static int _W_nextbol = 0;
+ _W_bolstruct _W_bols[_W_BOLMAX];
+ 
+ /*
+ **	storage for delimiters of literal strings
+ */
+ static int _W_nextlit = 0;
+ _W_litstruct _W_lits[_W_LITMAX];
+ 
+ /*
+ **	storage for characters to specify beginning and end of line
+ **	in the comment and literal commands
+ */
+ char _W_bolchar = '^';
+ char _W_eolchar = '$';
+ 
+ 
+ /*
+ **	build up a list of comment delimiters
+ */
+ void
+ W_addcom(str,nestflag)
+ char *str;
+ int nestflag;
+ {
+ 	/*
+ 	**	check for comments that begin at the beginning of line
+ 	*/
+ 	if (*str ==  _W_bolchar)
+ 	{
+ 		if (_W_nextbol >= _W_BOLMAX)
+ 			Z_fatal("too many beginning of line comment delimiter sets");
+ 
+ 		str++;	/*skip the bol char */
+ 		S_wordcpy(_W_bols[_W_nextbol].begin,str);
+ 
+ 		S_nextword(&str);
+ 
+ 		if (*str == _W_eolchar)
+ 		{
+ 			(void) strcpy(_W_bols[_W_nextbol].end,"\n");
+ 		}
+ 		else
+ 		{
+ 			S_wordcpy(_W_bols[_W_nextbol].end,str);
+ 		}
+ 
+ 		S_nextword(&str);
+ 		S_wordcpy(_W_bols[_W_nextbol].escape,str);
+ 
+ 		/*
+ 		**
+ 		*/
+ 		if (nestflag)
+ 			Z_complain("begining of line comment won't nest");
+ 
+ 		_W_nextbol++;
+ 	}
+ 	else
+ 	{
+ 		if (_W_nextcom >= _W_COMMAX)
+ 			Z_fatal("too many comment delimiter sets");
+ 
+ 		S_wordcpy(_W_coms[_W_nextcom].begin,str);
+ 
+ 		S_nextword(&str);
+ 
+ 		if (*str == _W_eolchar)
+ 		{
+ 			(void) strcpy(_W_coms[_W_nextbol].end,"\n");
+ 		}
+ 		else
+ 		{
+ 			S_wordcpy(_W_coms[_W_nextbol].end,str);
+ 		}
+ 
+ 		S_nextword(&str);
+ 		S_wordcpy(_W_coms[_W_nextcom].escape,str);
+ 
+ 		_W_coms[_W_nextcom].nestbit = nestflag;
+ 
+ 		_W_nextcom++;
+ 	}
+ 	return;
+ }
+ 
+ 
+ /*
+ **	clear the comment delimiter storage
+ */
+ void
+ W_clearcoms()
+ {
+ 	_W_nextcom = 0;
+ 	_W_nextbol = 0;
+ 	return;
+ }
+ 
+ /*
+ **	build up the list of literal delimiters
+ */
+ void
+ W_addlit(str)
+ char *str;
+ {
+ 	if (_W_nextlit >= _W_LITMAX)
+ 		Z_fatal("too many literal delimiter sets");
+ 
+ 	S_wordcpy(_W_lits[_W_nextlit].begin,str);
+ 
+ 	S_nextword(&str);
+ 	S_wordcpy(_W_lits[_W_nextlit].end,str);
+ 
+ 	S_nextword(&str);
+ 	S_wordcpy(_W_lits[_W_nextlit].escape,str);
+ 
+ 	_W_nextlit++;
+ 	return;
+ }
+ 
+ /*
+ **	clear the literal delimiter storage
+ */
+ void
+ W_clearlits()
+ {
+ 	_W_nextlit = 0;
+ 	return;
+ }
+ 
+ 
+ 
+ static _W_bolstruct bol_scratch;
+ 
+ static void
+ _W_copybol(to,from)
+ W_bol to,from;
+ {
+ 	(void) strcpy(to->begin,from->begin);
+ 	(void) strcpy(to->end,from->end);
+ 	(void) strcpy(to->escape,from->escape);
+ }
+ 
+ W_bol
+ W_isbol(str)
+ char *str;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextbol;i++)
+ 	{
+ 		if(!S_wordcmp(str,_W_bols[i].begin))
+ 		{
+ 			_W_copybol(&bol_scratch,&_W_bols[i]);
+ 			return(&bol_scratch);
+ 		}
+ 	}
+ 	return(W_BOLNULL);
+ }
+ 
+ int
+ W_is_bol(ptr)
+ W_bol ptr;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextbol;i++)
+ 	{
+ 		if(!S_wordcmp(ptr->begin,_W_bols[i].begin) &&
+ 			!S_wordcmp(ptr->end,_W_bols[i].end) &&
+ 			!S_wordcmp(ptr->escape,_W_bols[i].escape))
+ 		{
+ 			return(1);
+ 		}
+ 
+ 	}
+ 	return(0);
+ }
+ 
+ 
+ static _W_litstruct lit_scratch;
+ 
+ static void
+ _W_copylit(to,from)
+ W_lit to,from;
+ {
+ 	(void) strcpy(to->begin,from->begin);
+ 	(void) strcpy(to->end,from->end);
+ 	(void) strcpy(to->escape,from->escape);
+ }
+ 
+ W_lit
+ W_islit(str)
+ char *str;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextlit;i++)
+ 	{
+ 		if(!S_wordcmp(str,_W_lits[i].begin))
+ 		{
+ 			_W_copylit(&lit_scratch,&_W_lits[i]);
+ 			return(&lit_scratch);
+ 		}
+ 	}
+ 	return(W_LITNULL);
+ }
+ 
+ int
+ W_is_lit(ptr)
+ W_lit ptr;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextlit;i++)
+ 	{
+ 		if(!S_wordcmp(ptr->begin,_W_lits[i].begin) &&
+ 			!S_wordcmp(ptr->end,_W_lits[i].end) &&
+ 			!S_wordcmp(ptr->escape,_W_lits[i].escape))
+ 		{
+ 			return(1);
+ 		}
+ 
+ 	}
+ 	return(0);
+ }
+ 
+ static _W_comstruct com_scratch;
+ 
+ static void
+ _W_copycom(to,from)
+ W_com to,from;
+ {
+ 	(void) strcpy(to->begin,from->begin);
+ 	(void) strcpy(to->end,from->end);
+ 	(void) strcpy(to->escape,from->escape);
+ 	to->nestbit = from->nestbit;
+ }
+ 
+ W_com
+ W_iscom(str)
+ char *str;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextcom;i++)
+ 	{
+ 		if(!S_wordcmp(str,_W_coms[i].begin))
+ 		{
+ 			_W_copycom(&com_scratch,&_W_coms[i]);
+ 			return(&com_scratch);
+ 		}
+ 	}
+ 	return(W_COMNULL);
+ }
+ 
+ int
+ W_is_com(ptr)
+ W_com ptr;
+ {
+ 	int i;
+ 
+ 	for(i=0;i<_W_nextcom;i++)
+ 	{
+ 		if(!S_wordcmp(ptr->begin,_W_coms[i].begin) &&
+ 			!S_wordcmp(ptr->end,_W_coms[i].end) &&
+ 			!S_wordcmp(ptr->escape,_W_coms[i].escape) &&
+ 			ptr->nestbit == _W_coms[i].nestbit)
+ 		{
+ 			return(1);
+ 		}
+ 
+ 	}
+ 	return(0);
+ }
+ 
+ int
+ W_is_nesting(ptr)
+ W_com ptr;
+ {
+ 	return(ptr->nestbit);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/comment.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/comment.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/comment.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,85 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef W_INCLUDED
+ 
+ #include <stdio.h>
+ 
+ #define _W_COMWORD	16
+ #define _W_COMMAX	20
+ #define _W_BOLMAX	20
+ #define _W_LITMAX	20
+ 
+ /*
+ **	these three data structures used to be much
+ **		different.  eventually, the differences
+ **		have disappeared as the code has evolved.
+ **		obviously, they should now be collapsed.
+ **		someday . . .
+ */
+ typedef struct {
+ 	char begin[_W_COMWORD];
+ 	char end[_W_COMWORD];
+ 	char escape[_W_COMWORD];
+ } _W_bolstruct, *W_bol;
+ 
+ typedef struct {
+ 	char begin[_W_COMWORD];
+ 	char end[_W_COMWORD];
+ 	char escape[_W_COMWORD];
+ 	int nestbit;
+ } _W_comstruct, *W_com;
+ 
+ typedef struct {
+ 	char begin[_W_COMWORD];
+ 	char end[_W_COMWORD];
+ 	char escape[_W_COMWORD];
+ } _W_litstruct, *W_lit;
+ 
+ #define W_bolbegin(ptr)		(ptr->begin)
+ #define W_bolend(ptr)		(ptr->end)
+ #define W_bolescape(ptr)	(ptr->escape)
+ 
+ #define W_litbegin(ptr)		(ptr->begin)
+ #define W_litend(ptr)		(ptr->end)
+ #define W_litescape(ptr)	(ptr->escape)
+ 
+ #define W_combegin(ptr)		(ptr->begin)
+ #define W_comend(ptr)		(ptr->end)
+ #define W_comescape(ptr)	(ptr->escape)
+ 
+ extern char _W_bolchar;
+ extern char _W_eolchar;
+ 
+ #define W_setbolchar(x)		(_W_bolchar = x)
+ #define W_seteolchar(x)		(_W_eolchar = x)
+ 
+ extern W_bol W_isbol();
+ extern W_lit W_islit();
+ extern W_com W_iscom();
+ 
+ extern int W_is_bol();
+ extern int W_is_lit();
+ extern int W_is_com();
+ extern int W_is_nesting(W_com ptr);
+ 
+ extern _W_bolstruct _W_bols[];
+ extern _W_litstruct _W_lits[];
+ extern _W_comstruct _W_coms[];
+ 
+ extern void W_clearcoms();
+ extern void W_clearlits();
+ extern void W_addcom();
+ extern void W_addlit();
+ 
+ #define W_BOLNULL		((W_bol)0)
+ #define W_COMNULL		((W_com)0)
+ #define W_LITNULL		((W_lit)0)
+ 
+ #define W_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/compare.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/compare.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/compare.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,205 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/compare.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "flagdefs.h"
+ #include "tol.h"
+ #include "token.h"
+ #include "line.h"
+ #include "float.h"
+ #include "compare.h"
+ 
+ #include <ctype.h>
+ 
+ static int _X_strcmp(char *s1,char *s2,int flags);
+ static int _X_cmptokens(K_token p1,K_token p2,int flags);
+ static int _X_floatdiff(F_float p1,F_float p2,T_tol the_tol);
+ 
+ int
+ X_com(a,b,flags)
+ int a,b,flags;
+ {
+ 	K_token atmp,btmp;
+ 
+ 	atmp = K_gettoken(0,a);
+ 	btmp = K_gettoken(1,b);
+ 	if(flags & U_BYTE_COMPARE)
+ 	{
+ 		return(_X_strcmp(K_gettext(atmp),K_gettext(btmp),flags));
+ 	}
+ 	else
+ 	{
+ 		return(_X_cmptokens(atmp,btmp,flags));
+ 	}
+ #ifndef lint 
+ 	Z_fatal("this line should never be reached in com");
+ 	return(-1);	/* Z_fatal never returns, but i need a this line
+ 				here to stop lint from complaining */
+ #endif
+ }
+ 
+ /*
+ **	same as strcmp() except that case can be optionally ignored
+ */
+ static int _X_strcmp(char *s1,char *s2,int flags)
+ {
+ 	if (flags & U_NO_CASE)
+ 	{
+ 		
+ 		for (;('\0' != s1) && ('\0' !=  *s2);s1++,s2++)
+ 		{
+ 			if(isalpha(*s1) && isalpha(*s2))
+ 			{
+ 				if(tolower(*s1) != tolower(*s2))
+ 				{
+ 					return(1);
+ 				}
+ 			}
+ 			else
+ 			{
+ 				if(*s1!=*s2)
+ 				{
+ 					return(1);
+ 				}
+ 			}
+ 		}
+ 		return(*s1 != *s2);
+ 	}
+ 	else
+ 	{
+ 		return(strcmp(s1,s2));
+ 	}
+ }
+ 
+ 
+ /*
+ **	routine to compare two tokens
+ */
+ static int _X_cmptokens(K_token p1,K_token p2,int flags)
+ {
+ 	if (K_gettype(p1) !=  K_gettype(p2))
+ 	{
+ 		return(1);
+ 	}
+ 
+ 	switch (K_gettype(p1))
+ 	{
+ 		case K_LIT:
+ 			return(_X_strcmp(K_gettext(p1),K_gettext(p2),flags));
+ 		case K_FLO_NUM:
+ 			return(_X_floatdiff(K_getfloat(p1),
+ 					   K_getfloat(p2),
+ 					   T_picktol(K_gettol(p1),
+ 						     K_gettol(p2))));
+ 		default:
+ 			Z_fatal("fell off switch in _X_cmptokens");
+ 			return(-1);	/* Z_fatal never returns, but i need a this line
+ 						here to stop lint from complaining */
+ 	}
+ 
+ }
+ 
+ /*
+ **	compare two F_floats using a tolerance
+ */
+ static int _X_floatdiff(F_float p1,F_float p2,T_tol the_tol)
+ {
+ 	F_float diff, float_tmp;
+ 	T_tol tol_tmp;
+ 
+ 	/*
+ 	** 	check for null tolerance list
+ 	*/
+ 	if (T_isnull(the_tol))
+ 	{
+ 		Z_fatal("_X_floatdiff called with a null tolerance");
+ 	}
+ 
+ 	/*
+ 	**	look for an easy answer. i.e -- check
+ 	**		to see if any of the tolerances are of type T_IGNORE
+ 	**		or if the numbers are too small to exceed an absolute
+ 	**		tolerance.
+ 	**		if so, return immediately
+ 	*/
+ 	for(tol_tmp=the_tol; !(T_isnull(tol_tmp)) ;tol_tmp=T_getnext(tol_tmp))
+ 	{
+ 		if ((T_IGNORE == T_gettype(tol_tmp)) || 
+ 			/*
+ 			**	take a look at the exponents before you bother
+ 			**	with the mantissas
+ 			*/
+ 			((T_ABSOLUTE == T_gettype(tol_tmp))
+ 				   && !F_zerofloat(T_getfloat(tol_tmp))
+ 				   && (F_getexp(p1) <
+ 					F_getexp(T_getfloat(tol_tmp))-1)
+ 				   && (F_getexp(p2) <
+ 					F_getexp(T_getfloat(tol_tmp))-1)))
+ 		{
+ 				return(0);
+ 		}
+ 	}
+ 
+ 	
+ 	/*
+ 	**	ok, we're going to have to do some arithmetic, so
+ 	**		first find the magnitude of the difference
+ 	*/
+ 	if (F_getsign(p1) != F_getsign(p2))
+ 	{
+ 		diff = F_floatmagadd(p1,p2);
+ 	}
+ 	else
+ 	{
+ 		diff = F_floatsub(p1,p2);
+ 	}
+ 
+ 	/*
+ 	**	now check to see if the difference exceeds any tolerance
+ 	*/
+ 	for(tol_tmp=the_tol; !(T_isnull(tol_tmp)) ;tol_tmp=T_getnext(tol_tmp))
+ 	{
+ 		float_tmp = T_getfloat(tol_tmp);
+ 
+ 		if (T_gettype(tol_tmp) == T_ABSOLUTE)
+ 		{
+ 			/* do nothing */
+ 		}
+ 		else if (T_gettype(tol_tmp) == T_RELATIVE)
+ 		{
+ 			if (F_floatcmp(p1,p2) > 0)
+ 			{
+ 				float_tmp = F_floatmul(p1, float_tmp);
+ 			}
+ 			else
+ 			{
+ 				float_tmp = F_floatmul(p2, float_tmp);
+ 			}
+ 		}
+ 		else
+ 		{
+ 			Z_fatal("bad value for type of tolerance in floatdiff");
+ 		}
+ 		/*
+ 		**	if we pass this tolerance, then we're done
+ 		*/
+ 		if (F_floatcmp(diff,float_tmp) <= 0)
+ 		{
+ 			return(0);
+ 		}
+ 	}
+ 	/*
+ 	**	all of the tolerances were exceeded
+ 	*/
+ 	return(1);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/compare.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/compare.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/compare.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,14 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef X_INCLUDED
+ 
+ extern int X_com();
+ 
+ #define X_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/edit.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/edit.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/edit.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,43 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ /*
+ **	the naming information hiding conventions are incompletely implemented
+ **	 for the edit module. I tried to clean it up once, but kept introducing
+ **	 nasty (ie. core dump) bugs in the miller code.  I give up for now.
+ */
+ #ifndef E_INCLUDED
+ 
+ #define E_INSERT	1
+ #define E_DELETE	2
+ 
+ typedef struct edt {
+ 	struct edt *link;
+ 	int op;
+ 	int line1;
+ 	int line2;
+ } _E_struct, *E_edit;
+ 
+ #define E_setop(x,y)		((x)->op = (y))
+ #define E_setl1(x,y)		((x)->line1 = (y))
+ #define E_setl2(x,y)		((x)->line2 = (y))
+ #define E_setnext(x,y)		((x)->link = (y))
+ 
+ #define E_getop(x)		((x)->op)
+ #define E_getl1(x)		((x)->line1)
+ #define E_getl2(x)		((x)->line2)
+ #define E_getnext(x)		((x)->link)
+ 
+ #define E_NULL 		((E_edit) 0)
+ #define E_edit_alloc()	(Z_ALLOC(1,_E_struct))
+ 
+ #define E_INCLUDED
+ 
+ #endif
+ 
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/exact.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/exact.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/exact.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,93 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/exact.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "edit.h"
+ #include "compare.h"
+ 
+ /*
+ **	routine to compare each object with its ordinal twin
+ */
+ E_edit
+ Q_do_exact(size1,size2,max_d,comflags)
+ int size1;
+ int size2;
+ int max_d;
+ int comflags;
+ {
+ 	int i = 0;
+ 	int diffcnt = 0;
+ 	int last = Z_MIN(size1,size2);
+ 	int next_edit = 0;
+ 	E_edit last_ptr = E_NULL;
+ 	int start,tmp;
+ 	E_edit *script;
+ 
+ 	script = Z_ALLOC(max_d+1,E_edit);
+ 
+ 	if (size1 != size2)
+ 	{
+ 		(void) sprintf(Z_err_buf,"unequal number of tokens, %d and %d respectively\n",size1,size2);
+ 		Z_complain(Z_err_buf);
+ 	}
+ 
+ 	do
+ 	{
+ 		/*
+ 		**	skip identical objects
+ 		*/
+ 		while (i<last && (!X_com(i,i,comflags)))
+ 		{
+ 			i++;
+ 		}
+ 		start = i;
+ 		/*
+ 		**	see how many difference we have in a row
+ 		*/
+ 		while (i<last && X_com(i,i,comflags))
+ 		{
+ 			if ((diffcnt += 2) >= max_d+1)
+ 				Z_exceed(max_d);
+ 			i++;
+ 		}
+ 		/*
+ 		**	build the list of deletions
+ 		*/
+ 		for(tmp=start;tmp<i;tmp++,next_edit++)
+ 		{
+ 			script[next_edit] = E_edit_alloc();
+ 			E_setnext(script[next_edit],last_ptr);
+ 			last_ptr = script[next_edit];
+ 
+ 			E_setop(script[next_edit],E_DELETE);
+ 			E_setl1(script[next_edit],tmp+1);
+ 			/* no need to set line2, it is never used */
+ 			E_setl2(script[next_edit],0);
+ 		}
+ 		/*
+ 		**	build the list of insertions
+ 		*/
+ 		for(tmp=start;tmp<i;tmp++,next_edit++)
+ 		{
+ 			script[next_edit] = E_edit_alloc();
+ 			E_setnext(script[next_edit],last_ptr);
+ 			last_ptr = script[next_edit];
+ 
+ 			E_setop(script[next_edit],E_INSERT);
+ 			E_setl1(script[next_edit],i);
+ 			E_setl2(script[next_edit],tmp+1);
+ 		}
+ 	} while (i<last);
+ 
+ 	return(last_ptr);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/exact.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/exact.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/exact.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,17 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef Q_INCLUDED
+ 
+ #include "edit.h"
+ 
+ extern E_edit Q_do_exact();
+ 
+ #define Q_INCLUDED
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/flagdefs.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/flagdefs.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/flagdefs.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,29 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ /*
+ **	flags used by both parser and comparison routines
+ */
+ #define U_INCLUDE_WS	001
+ 
+ /*
+ **	flags used only by the comparison routines
+ */
+ #define U_BYTE_COMPARE		002
+ #define U_NO_CASE		004
+ 
+ /*
+ **	flag used by the output routine
+ */
+ #define U_TOKENS		010
+ 
+ /*
+ **	flags used only by the parser
+ */
+ #define U_INC_SIGN	020
+ #define U_NEED_DECIMAL	040


Index: llvm/test/Programs/MultiSource/Applications/spiff/float.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/float.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/float.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,813 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/float.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include <ctype.h>
+ #include "misc.h"
+ #include "floatrep.h"
+ #include "float.h"
+ #include "strings.h"
+ 
+ #define _F_GETEND(x)	(x + (strlen(x)-1)) 
+ 
+ /*
+ int floatcnt = 0;
+ */
+ /*
+ **	routines to convert strings to our internal floating point form
+ **		isfloat just looks at the string
+ **		to see if a conversion is reasonable
+ **			it does look-ahead on when it sees an 'e' and such.
+ **		atocf actually does the conversion.
+ **	these two routines could probably be combined
+ */
+ 
+ /*
+ **	test to see if the string can reasonably
+ **		be interpreted as floating point number
+ **	returns 0 if string can't be interpreted as a float
+ **	otherwise returns the number of digits that will be used in F_atof
+ */
+ int
+ F_isfloat(str,need_decimal,allow_sign)
+ char *str;
+ int need_decimal;	/* if non-zero, require that a decimal point be present
+ 				otherwise, accept strings like "123" */
+ int allow_sign;		/* if non-zero, allow + or - to set the sign */
+ {
+ 	int man_length = 0;	/* length of the fractional part (mantissa) */
+ 	int exp_length = 0;	/* length of the exponential part */
+ 	int got_a_digit = 0;	/* flag to set if we ever see a digit */
+ 
+ 	/*
+ 	**	look for an optional leading sign marker
+ 	*/
+ 	if (allow_sign && ('+' == *str  || '-' == *str))
+ 	{
+ 		str++; man_length++;
+ 	}
+ 	/*
+ 	**	count up the digits on the left hand side
+ 	**		 of the decimal point
+ 	*/
+ 	while(isdigit(*str))
+ 	{
+ 		got_a_digit = 1;
+ 		str++; man_length++;
+ 	}
+ 
+ 	/*
+ 	**	check for a decimal point
+ 	*/
+ 	if ('.' == *str)
+ 	{
+ 		str++; man_length++;
+ 	}
+ 	else
+ 	{
+ 		if (need_decimal)
+ 		{
+ 			return(0);
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	collect the digits on the right hand
+ 	**		side of the decimal point
+ 	*/
+ 	while(isdigit(*str))
+ 	{
+ 		got_a_digit = 1;
+ 		str++; man_length++;
+ 	}
+ 
+ 	if (!got_a_digit)
+ 		return(0);
+ 
+ 	/*
+ 	**	now look ahead for an exponent
+ 	*/
+ 	if ('e' == *str ||
+ 	    'E' == *str ||
+ 	    'd' == *str ||
+ 	    'D' == *str)
+ 	{
+ 		str++; exp_length++;
+ 		if ('+' == *str  || '-' == *str)
+ 		{
+ 			str++; exp_length++;
+ 		}
+ 
+ 		if (!isdigit(*str))
+ 		{
+ 			/*
+ 			**	look ahead went too far,
+ 			**	so return just the length of the mantissa
+ 			*/
+ 			return(man_length);
+ 		}
+ 
+ 		while (isdigit(*str))
+ 		{
+ 			str++; exp_length++;
+ 		}
+ 	}
+ 	return(man_length+exp_length);	/* return the total length */
+ }
+ 
+ /*
+ **	routine to convert a string to our internal
+ **	floating point representation
+ **
+ **		similar to atof()
+ */
+ F_float
+ F_atof(str,allflag)
+ char *str;
+ int allflag;	/* require that exactly all the characters are used */
+ {
+ 	char *beg = str; /* place holder for beginning of the string */ 
+ 	char man[R_MANMAX];	/* temporary location to build the mantissa */
+ 	int length = 0;	/* length of the mantissa so far */
+ 	int got_a_digit = 0;	/* flag to set if we get a non-zero digit */ 
+ 	int i;
+ 	int resexp;
+ 
+ 	F_float res;	/* where we build the result */
+ 
+ /*
+ floatcnt++;
+ */
+ 	res = R_makefloat();
+ 
+ 	R_setsign(res,R_POSITIVE);
+ 
+ 	resexp = 0;
+ 	man[0] = '\0';
+ 
+ 	/*
+ 	**	check for leading sign
+ 	*/
+ 	if ('+' == *str)
+ 	{
+ 		/*
+ 		**	sign should already be positive, see above in this
+ 		**		routine, so just skip the plus sign
+ 		*/
+ 		str++;
+ 	}
+ 	else
+ 	{
+ 		if ('-' == *str)
+ 		{
+ 			R_setsign(res,R_NEGATIVE);
+ 			str++;
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	skip any leading zeros
+ 	*/
+ 	while('0' == *str)
+ 	{
+ 		str++;
+ 	}
+ 
+ 	/*
+ 	**	now snarf up the digits on the left hand side
+ 	**		of the decimal point
+ 	*/
+ 	while(isdigit(*str))
+ 	{
+ 		got_a_digit = 1;
+ 		man[length++] = *str++;
+ 		man[length] = '\0';
+ 		resexp++;
+ 	}
+ 
+ 	/*
+ 	**	skip the decimal point if there is one
+ 	*/
+ 	if ('.' == *str)
+ 		str++;
+ 
+ 	/*
+ 	**	trim off any leading zeros (on the right hand side)
+ 	**	if there were no digits in front of the decimal point.
+ 	*/
+ 
+ 	if (!got_a_digit)
+ 	{
+ 		while('0' == *str)
+ 		{
+ 			str++;
+ 			resexp--;
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	now snarf up the digits on the right hand side
+ 	*/
+ 	while(isdigit(*str))
+ 	{
+ 		man[length++] = *str++;
+ 		man[length] = '\0';
+ 	}
+ 
+ 	if ('e' == *str ||
+             'E' == *str ||
+             'd' == *str ||
+             'D' == *str )
+ 	{
+ 		str++;
+ 		resexp += atoi(str);
+ 	}
+ 
+ 	if (allflag)
+ 	{
+ 		if ('+' == *str ||
+ 		    '-' == *str)
+ 		{
+ 			str++;
+ 		}
+ 		while (isdigit(*str))
+ 		{
+ 			str++;
+ 		}
+ 		if ('\0' != *str)
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 					"didn't use up all of %s in atocf",
+ 					beg);
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	check for special case of all zeros in the mantissa
+ 	*/
+ 	for (i=0;i<length;i++)
+ 	{
+ 		if (man[i] != '0')
+ 		{
+ 			/*
+ 			**	the mantissa is non-zero, so return it unchanged
+ 			*/
+ 			S_trimzeros(man);
+ 			/*
+ 			**	save a copy of the mantissa
+ 			*/
+ 			R_setfrac(res,man);
+ 			R_setexp(res,resexp);
+ 			return(res);
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	the answer is 0, so . . .
+ 	*/
+ 	R_setzero(res);
+ 	return(res);
+ }
+ 
+ 
+ /*
+ **	add s2 to s1
+ */
+ static
+ void
+ _F_stradd(s1,s2)
+ char *s1,*s2;
+ {
+ 	char *end1 = s1 + (strlen(s1)-1);
+ 	char *end2 = s2 + (strlen(s2)-1);
+ 
+ 	static char result[R_MANMAX];
+ 	char *resptr = result+(R_MANMAX-1); /*point to the end of the array */
+ 	int carry = 0;
+ 	int tmp,val1,val2;
+ 
+ 	*resptr-- = '\0';
+ 
+ 	while ((end1 >= s1) ||  ( end2 >= s2))
+ 	{
+ 		if (end1 >= s1)
+ 		{
+ 			val1 = *end1 - '0';
+ 			--end1;
+ 		}
+ 		else
+ 		{
+ 			val1 = 0;
+ 		}
+ 
+ 		if (end2 >= s2)
+ 		{
+ 			val2 = *end2 - '0';
+ 			--end2;
+ 		}
+ 		else
+ 		{
+ 			val2 = 0;
+ 		}
+ 
+ 		tmp = val1 + val2 + carry;
+ 		if (tmp > 9)
+ 		{
+ 			carry = 1;
+ 			tmp -= 10;
+ 		}
+ 		else
+ 		{
+ 			carry = 0;
+ 		}
+ 
+ 		*resptr-- = tmp+'0';
+ 	}
+ 	if (carry)
+ 	{
+ 		*resptr =  '1';
+ 	}
+ 	else
+ 	{
+ 		resptr++;
+ 	}
+ 	(void) strcpy(s1,resptr);
+ 	return;
+ }
+ 
+ /*
+ **	add zero(s) onto the end of a string
+ */
+ static void
+ addzeros(ptr,count)
+ char *ptr;
+ int count;
+ {
+ 	for(;count> 0;count--)
+ 	{
+ 		(void) strcat(ptr,"0");
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	subtract two mantissa strings
+ */
+ F_float
+ F_floatsub(p1,p2)
+ F_float  p1,p2;
+ {
+ 	static F_float result;
+ 	static int needinit = 1;
+ 	static char man1[R_MANMAX],man2[R_MANMAX],diff[R_MANMAX];
+ 	int exp1,exp2;
+ 	char *diffptr,*big,*small;
+ 	int man_cmp_val,i,borrow;
+ 
+ 	if (needinit)
+ 	{
+ 		result = R_makefloat();
+ 		needinit = 0;
+ 	}
+ 
+ 	man1[0] = '\0';
+ 	man2[0] = '\0';
+ 
+ 	exp1 = R_getexp(p1);
+ 	exp2 = R_getexp(p2);
+ 
+ 	/*
+ 	**	line up the mantissas
+ 	*/
+ 	while (exp1 < exp2)
+ 	{
+ 		(void) strcat(man1,"0");
+ 		exp1++;
+ 	}
+ 
+ 	while(exp1 > exp2)
+ 	{
+ 		(void) strcat(man2,"0");
+ 		exp2++;
+ 	}
+ 
+ 	if (exp1 != exp2)	/* boiler plate assertion */
+ 	{
+ 		Z_fatal("mantissas didn't get lined up properly in floatsub");
+ 	}
+ 
+ 	(void) strcat(man1,R_getfrac(p1));
+ 	(void) strcat(man2,R_getfrac(p2));
+ 	
+ 	/*
+ 	**	now that the mantissa are aligned,
+ 	**	if the strings are the same, return 0
+ 	*/
+ 	if((man_cmp_val = strcmp(man1,man2)) == 0)
+ 	{
+ 		R_setzero(result);
+ 		return(result);
+ 	}
+ 
+ 	/*
+ 	**	pad the shorter string with 0's
+ 	**		when this loop finishes, both mantissas should
+ 	**		have the same length
+ 	*/
+ 	if (strlen(man1)> strlen(man2))
+ 	{
+ 		addzeros(man2,strlen(man1)-strlen(man2));
+ 	}
+ 	else
+ 	{
+ 		if (strlen(man1)<strlen(man2))
+ 		{
+ 			addzeros(man1,strlen(man2)-strlen(man1));
+ 		}
+ 	}
+ 
+ 	if (strlen(man1) != strlen(man2))	/* pure boilerplate */
+ 	{
+ 		Z_fatal("lengths not equal in F_floatsub");
+ 	}
+ 
+ 	if (man_cmp_val < 0)
+ 	{
+ 		big = man2;
+ 		small = man1;
+ 	}
+ 	else
+ 	{
+ 		big = man1;
+ 		small = man2;
+ 	}
+ 
+ 	/*
+ 	**	find the difference between the mantissas
+ 	*/
+ 	for(i=(strlen(big)-1),borrow=0,diff[strlen(big)] = '\0';i>=0;i--)
+ 	{
+ 		char from;
+ 		if (borrow)
+ 		{
+ 			if (big[i] == '0')
+ 			{
+ 				from = '9';
+ 			}
+ 			else
+ 			{
+ 				from = big[i]-1;
+ 				borrow = 0;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if(big[i]<small[i])
+ 			{
+ 				from = '9'+1;
+ 				borrow = 1;
+ 			}
+ 			else
+ 			{
+ 				from = big[i];
+ 			}
+ 		}
+ 		diff[i] = (from-small[i]) + '0';
+ 	}
+ 
+ 	/*
+ 	** trim the leading zeros on the difference
+ 	*/
+ 	diffptr = diff;
+ 	while('0' == *diffptr)
+ 	{
+ 		diffptr++;
+ 		exp1--;
+ 	}
+ 
+ 	R_setexp(result,exp1); /* exponents are equal at the point */
+ 	R_setfrac(result,diffptr);
+ 	R_setsign(result,R_POSITIVE);
+ 	return(result);
+ }
+ 
+ int F_floatcmp(F_float f1,F_float f2)
+ {
+ 	static char man1[R_MANMAX],man2[R_MANMAX];
+ 
+ 	/*
+ 	**		special case for zero
+ 	*/
+ 	if (R_zerofloat(f1))
+ 	{
+ 		if (R_zerofloat(f2))
+ 		{
+ 			return(0);
+ 		}
+ 		else
+ 		{
+ 			return(-1);
+ 		}
+ 	}
+ 	else
+ 	{
+ 		if (R_zerofloat(f2))
+ 		{
+ 			return(1);
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	to reach this point, both numbers must be non zeros
+ 	*/
+ 	if (R_getexp(f1) < R_getexp(f2))
+ 	{
+ 		return(-1);
+ 	}
+ 
+ 	if (R_getexp(f1) > R_getexp(f2))
+ 	{
+ 		return(1);
+ 	}
+ 
+ 	(void) strcpy(man1,R_getfrac(f1));
+ 	S_trimzeros(man1);
+ 
+ 	(void) strcpy(man2,R_getfrac(f2));
+ 	S_trimzeros(man2);
+ 	return(strcmp(man1,man2));
+ }
+ 
+ F_float
+ F_floatmul(f1,f2)
+ F_float f1,f2;
+ {
+ 	static char prod[R_MANMAX];
+ 	char *end;
+ 	int count1 = 0;
+ 	int count2 = 0;
+ 	int tmp,len;
+ 	char *end1;
+ 	char *end2;
+ 	static char man1[R_MANMAX],man2[R_MANMAX];
+ 	char *bigman,*smallman;
+ 	static F_float result;
+ 	static int needinit = 1;
+ 
+ 	if (needinit)
+ 	{
+ 		result = R_makefloat();
+ 		needinit = 0;
+ 	}
+ 	/*
+ 	**	special case for a zero result
+ 	*/
+ 	if (R_zerofloat(f1) || R_zerofloat(f2))
+ 	{
+ 		R_setzero(result);
+ 		return(result);
+ 	}
+ 
+ 	(void) strcpy(man1,R_getfrac(f1));
+ 	(void) strcpy(man2,R_getfrac(f2));
+ 
+ 	end1 = _F_GETEND(man1);
+ 	end2 = _F_GETEND(man2);
+ 
+ 	/*
+ 	**	decide which number will cause multiplication loop to go
+ 	**	around the least
+ 	*/
+ 	while(end1 >= man1)
+ 	{
+ 		count1 += *end1 - '0';
+ 		end1--;
+ 	}
+ 
+ 	while(end2 >= man2)
+ 	{
+ 		count2 += *end2 - '0';
+ 		end2--;
+ 	}
+ 
+ 
+ 	if (count1 > count2)
+ 	{
+ 		bigman = man1;
+ 		smallman = man2;
+ 	}
+ 	else
+ 	{
+ 		bigman = man2;
+ 		smallman = man1;
+ 	}
+ 	S_trimzeros(bigman);
+ 	S_trimzeros(smallman);
+ 	len = strlen(bigman) +  strlen(smallman);
+ 
+ 	end = _F_GETEND(smallman);
+ 	(void) strcpy(prod,"0");
+ 
+ 	/*
+ 	**	multiplication by repeated addition
+ 	*/
+ 	while(end >= smallman)
+ 	{
+ 		for(tmp = 0;tmp<*end-'0';tmp++)
+ 		{
+ 			_F_stradd(prod,bigman);
+ 		}
+ 		addzeros(bigman,1);
+ 		end--;
+ 	}
+ 
+ 	R_setfrac(result,prod);
+ 	R_setexp(result,(((R_getexp(f1) + R_getexp(f2)) - len)+ strlen(prod)));
+ 
+ 	if (R_getsign(f1) == R_getsign(f2))
+ 	{
+ 		R_setsign(result,R_POSITIVE);
+ 	}
+ 	else
+ 	{
+ 		R_setsign(result,R_NEGATIVE);
+ 	}
+ 	return(result);
+ }
+ 
+ int
+ _F_xor(x,y)
+ {
+ 	return(((x) && !(y)) || (!(x) && (y)));
+ }
+ #define	_F_SAMESIGN(x,y)	_F_xor((x<0),(y<0))
+ #define _F_ABSADD(x,y)		(Z_ABS(x) + Z_ABS(y))
+ 
+ int
+ _F_ABSDIFF(x,y)
+ {
+ 	if (Z_ABS(x) < Z_ABS(y))
+ 	{
+ 		return(Z_ABS(y) - Z_ABS(x));
+ 	}
+ 	else
+ 	{
+ 		return(Z_ABS(x) - Z_ABS(y));
+ 	}
+ }
+ /*
+ **	add two floats without regard to sign
+ */
+ F_float
+ F_floatmagadd(p1,p2)
+ F_float p1,p2;
+ {
+ 	static F_float result;
+ 	static int needinit = 1;
+ 
+ 	static char  man1[R_MANMAX],man2[R_MANMAX];
+ 
+ 	int digits;	/* count of the number of digits needed to represent the
+ 				result */
+ 	int resexp;	/* exponent of the result */
+ 	int len;	/* length of the elements before adding */
+ 	char *diffptr;
+ 
+ 	if (needinit)
+ 	{
+ 		result = R_makefloat();
+ 		needinit = 0;
+ 	}
+ 	(void) strcpy(man1,"");
+ 	(void) strcpy(man2,"");
+ 
+ 	/*
+ 	**	find the difference in the exponents number of digits
+ 	*/
+ 	if( _F_SAMESIGN(R_getexp(p1),R_getexp(p2)))
+ 	{
+ 		digits =  _F_ABSDIFF(R_getexp(p1),R_getexp(p2));
+ 	}
+ 	else
+ 	{
+ 		digits = _F_ABSADD(R_getexp(p1),R_getexp(p2));
+ 	}
+ 
+ 	/*
+ 	**	make sure that there is room to store the result
+ 	*/
+ 	if (digits>0)
+ 	{ 
+ 		if (R_getexp(p1) < R_getexp(p2))
+ 		{
+ 			/*
+ 			**	leave room for terminator
+ 			*/
+ 			if (digits+strlen(R_getfrac(p1)) > (R_MANMAX-1))
+ 			{
+ 				(void) sprintf(Z_err_buf,
+ 				   "numbers differ by too much in magnitude");
+ 				Z_fatal(Z_err_buf);
+ 			}
+ 		}
+ 		else
+ 		{
+ 			/*
+ 			**	leave room for terminator
+ 			*/
+ 			if (digits+strlen(R_getfrac(p2)) > (R_MANMAX-1))
+ 			{
+ 				(void) sprintf(Z_err_buf,
+ 				   "numbers differ by too much in magnitude");
+ 				Z_fatal(Z_err_buf);
+ 			}
+ 		}
+ 	}
+ 	else
+ 	{
+ 		/*
+ 		**	leave room for terminator and possible carry
+ 		*/
+ 		if (Z_MAX(strlen(R_getfrac(p1)),
+ 			strlen(R_getfrac(p2))) > (R_MANMAX-2))
+ 		{						
+ 			(void) sprintf(Z_err_buf,
+ 			   "numbers differ by too much in magnitude");
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 	}
+ 
+ 	/*
+ 	**	pad zeroes on the front of the smaller number
+ 	*/
+ 	if (R_getexp(p1) < R_getexp(p2))
+ 	{
+ 
+ 		addzeros(man1,digits);
+ 		resexp = R_getexp(p2);
+ 	}
+ 	else
+ 	{
+ 		addzeros(man2,digits);
+ 		resexp = R_getexp(p1);
+ 	}
+ 	(void) strcat(man1,R_getfrac(p1));
+ 	(void) strcat(man2,R_getfrac(p2));
+ 
+ 	len = Z_MAX(strlen(man1),strlen(man2));
+ 
+ 	/*
+ 	**	add the two values
+ 	*/
+ 	_F_stradd(man1,man2);
+ 
+ 	/*
+ 	**	adjust the exponent to account for a
+ 	**		possible carry
+ 	*/
+ 	resexp += strlen(man1) - len;
+ 
+ 
+ 	/*
+ 	** trim the leading zeros on the sum
+ 	*/
+ 	diffptr = man1;
+ 	while('0' == *diffptr)
+ 	{
+ 		diffptr++;
+ 		resexp--;
+ 	}
+ 
+ 	R_setfrac(result,diffptr);
+ 	R_setexp(result,resexp);
+ 	R_setsign(result,R_POSITIVE);
+ 
+ 	return(result);
+ }
+ 
+ /*
+ **	useful debugging routine. we don't call it in the release,
+ **	so it is commented out, but we'll leave it for future use
+ */
+ 
+ /*
+ F_printfloat(fl)
+ F_float fl;
+ {
+ 	(void) printf("fraction = :%s: exp = %d sign = %c\n",
+ 			R_getfrac(fl),
+ 			R_getexp(fl),
+ 			((R_getsign(fl) == R_POSITIVE) ? '+': '-'));
+ 
+ }
+ */


Index: llvm/test/Programs/MultiSource/Applications/spiff/float.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/float.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/float.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,37 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #include "floatrep.h"
+ 
+ #ifndef F_INCLUDED
+ 
+ /*
+ **	flags for F_atof
+ */
+ #define NO_USE_ALL	0
+ #define USE_ALL		1
+ 
+ typedef struct R_flstr *F_float;
+ #define F_getexp(x)	R_getexp(x)
+ #define F_getsign(x)	R_getsign(x)
+ #define F_zerofloat(x)	R_zerofloat(x)
+ 
+ extern F_float F_atof();
+ 
+ extern F_float F_floatmul();
+ extern F_float F_floatmagadd();
+ extern F_float F_floatsub();
+ extern int F_floatcmp(F_float f1,F_float f2);
+ extern int F_isfloat(char *str,int need_decimal,int allow_sign);
+ 
+ #define F_null	((F_float) 0)
+ 
+ #define F_INCLUDED
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/floatrep.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/floatrep.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/floatrep.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,33 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/floatrep.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "floatrep.h"
+ 
+ R_float
+ R_makefloat()
+ {
+ 	R_float retval;
+ 
+ 	retval = Z_ALLOC(1,struct R_flstr);
+ 	retval->mantissa = Z_ALLOC(R_MANMAX,char);
+ 	return(retval);
+ }
+ 
+ int
+ R_getexp(ptr)
+ R_float ptr;
+ {
+ 	return(ptr->exponent);
+ }
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/floatrep.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/floatrep.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/floatrep.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,66 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ /*
+ ** header file that defines canonical floating point structure
+ **	and routines
+ */
+ 
+ 
+ #ifndef  R_INCLUDED
+ 
+ /*
+ **	when evaluated to a string, the fractional part will
+ **		not exceed this length
+ */
+ #define R_MANMAX	200
+ 
+ #define R_POSITIVE	0
+ #define R_NEGATIVE	1
+ 
+ struct  R_flstr {
+ 	int exponent;
+ 	int man_sign;
+ 	char *mantissa;
+ };
+ 
+ typedef struct R_flstr *R_float;
+ 
+ #define R_getfrac(x)	(x->mantissa)
+ 
+ extern R_float R_makefloat();
+ 
+ extern int R_getexp();
+ 
+ #define R_getsign(x)	(x->man_sign)
+ 
+ /*
+ **	takes a string
+ */
+ #define R_setfrac(x,y)	((void)strcpy(x->mantissa,y))
+ /*
+ **	takes an int
+ */
+ #define R_setexp(x,y)	(x->exponent = y)
+ /*
+ **	takes a sign
+ */
+ #define R_setsign(x,y)	(x->man_sign = y)
+ 
+ /*
+ #define R_incexp(x)	((x->exponent)++)
+ #define R_decexp(x)	((x->exponent)--)
+ */
+ 
+ #define R_setzero(x)	R_setfrac(x,"0");R_setexp(x,0);R_setsign(x,R_POSITIVE)
+ 
+ #define R_zerofloat(x)	((0 == x->exponent) && (!strcmp(x->mantissa,"0")))
+ 
+ #define R_INCLUDED
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/line.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/line.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/line.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,167 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/line.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include <stdio.h>
+ #include "misc.h"
+ #include "token.h"
+ #include "line.h"
+ 
+ char *_L_al[_L_MAXLINES];  /* storage for lines */
+ char *_L_bl[_L_MAXLINES];
+ 
+ int   _L_ai[_L_MAXLINES];  /* index from token line number to first token */
+ int   _L_bi[_L_MAXLINES];
+ 
+ int   _L_ac[_L_MAXLINES];  /* count of tokens on this token line */
+ int   _L_bc[_L_MAXLINES];
+ 
+ int   _L_arlm;		/* count of real lines in the file */
+ int   _L_brlm;
+ 
+ int   _L_aclm;		/* count of content lines in the file */
+ int   _L_bclm;
+ 
+ int   _L_atlm;		/* count of token lines in the file */
+ int   _L_btlm;
+ 
+ int   _L_aclindex[_L_MAXLINES]; /* mapping from content lines to real lines*/
+ int   _L_bclindex[_L_MAXLINES]; 
+ 
+ int   _L_atlindex[_L_MAXLINES]; /*mapping from token lines to content lines */
+ int   _L_btlindex[_L_MAXLINES];
+ 
+ 
+ static void
+ _L_setrline(file,X,str)
+ int file;
+ int X;
+ char *str;
+ {
+ 	if (file)
+ 	{
+ 		S_savestr(&_L_bl[X],str);
+ 	}
+ 	else
+ 	{
+ 		S_savestr(&_L_al[X],str);
+ 	}
+ 	return;
+ }
+ /*
+ **	returns 1 if we reached the end of file
+ **	returns 0 if there is more to do
+ **
+ **	stores data and sets maximum counts
+ */
+ int L_init_file(int fnumber, char *fname)
+ {
+ 	extern char *fgets();
+ 	FILE *fp;
+ 	static char buf[Z_LINELEN+2];	/* +2 is to leave room for us to add
+ 						a newline if we need to */
+ 	int ret_val = 1;
+ 	int tmplen;
+ 
+ 	if ((fp = fopen(fname,"r")) == (FILE*) NULL)
+ 	{
+ 		(void) sprintf(Z_err_buf, "Cannot open file %s.\n",fname);
+ 		Z_fatal(Z_err_buf);
+ 	}
+ 
+ 	/*
+ 	**	clear the line count
+ 	*/
+ 	_L_setrlmx(fnumber,0);
+ 
+ 	/*
+ 	**	read in the entire file
+ 	*/
+ 	while (fgets(buf,Z_LINELEN+1,fp) != (char *) NULL)
+ 	{
+ 		tmplen = strlen(buf);
+ 		if (tmplen <= 0)
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 			  "fatal error -- got 0 length line %d in file %s\n",
+ 				L_getrlmax(fnumber)+1,
+ 				fname);
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 		else if (tmplen > Z_LINELEN)
+ 		{
+ 			(void) sprintf(Z_err_buf,
+   "got fatally long line %d in file %s length is %d, must be a bug\n",
+ 				L_getrlmax(fnumber)+1,
+ 				fname,tmplen);
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 		/*
+ 		**	look for newline as last character
+ 		*/
+ 		if ('\n' != buf[tmplen-1])
+ 		{
+ 			/*
+ 			**	did we run out room in the buffer?
+ 			*/
+ 			if (tmplen == Z_LINELEN)
+ 			{
+ 			(void) sprintf(Z_err_buf,
+ 	"line %d too long in file %s, newline added after %d characters\n",
+ 				L_getrlmax(fnumber)+1,
+ 				fname,Z_LINELEN);
+ 			Z_complain(Z_err_buf);
+ 			}
+ 			else
+ 			{
+ 			(void) sprintf(Z_err_buf,
+ 	"didn't find a newline at end of line %d in file %s, added one\n",
+ 				L_getrlmax(fnumber)+1,
+ 				fname);
+ 			Z_complain(Z_err_buf);
+ 			}
+ 
+ 			buf[tmplen] = '\n';
+ 			buf[tmplen+1] = '\0';
+ 		}
+ 
+ 		_L_setrline(fnumber,L_getrlmax(fnumber),buf);
+ 
+ 		if (L_getrlmax(fnumber) >= _L_MAXLINES-1)
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 	"warning -- ran out of space reading %s, truncated to %d lines\n",
+ 				fname,_L_MAXLINES);
+ 			Z_complain(Z_err_buf);
+ 			ret_val= 0;
+ 			break;
+ 		}
+ 		else
+ 		{
+ 			/*
+ 			**	increment the line count
+ 			*/
+ 			_L_incrlmx(fnumber);
+ 		}
+ 
+ 	}
+ 
+ 	(void) fclose(fp);
+ 	/*
+ 	**	reset line numbers
+ 	*/
+ 	L_setclmax(fnumber,0);
+ 	L_settlmax(fnumber,0);
+ 
+ 	return(ret_val);
+ }
+ 


Index: llvm/test/Programs/MultiSource/Applications/spiff/line.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/line.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/line.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,115 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef L_INCLUDED
+ 
+ #define _L_MAXLINES	10000
+ 
+ /*
+ **	oh god, is this an ugly implementation.
+ **	I really should have a two dimensional array of structures
+ **		the history of the current arrangement is too long
+ **		and ugly to record here.
+ **		Someday when I have too much time on my hands . . .
+ */
+ 
+ extern char *_L_al[];	/* storage for text in first file */
+ extern char *_L_bl[];	/* storage for text in second file */
+ 
+ extern int _L_ai[];	/* pointer from token line to first token */
+ extern int _L_bi[];
+ 
+ extern int _L_ac[];	/* number of tokens on a given token line */
+ extern int _L_bc[];
+ 
+ extern int _L_aclindex[]; /* mapping from content lines to real lines */
+ extern int _L_bclindex[];
+ 
+ extern int _L_atlindex[]; /* mapping from lines with tokens to content lines */
+ extern int _L_btlindex[];
+ 
+ extern int _L_arlm;	/* count of real lines */
+ extern int _L_brlm;
+ 
+ extern int _L_aclm;	/* count of content lines */
+ extern int _L_bclm;
+ 
+ extern int _L_atlm;	/* count of lines with tokens */
+ extern int _L_btlm;
+ 
+ extern int L_init_file(int fnumber, char *fname);
+ 
+ /*
+ **	routines to set up mappings from token lines to content lines
+ **	  and from content lines to real lines
+ */
+ #define L_setclindex(file,content,real) (file?(_L_bclindex[content]=real):\
+ 					     (_L_aclindex[content]=real))
+ 
+ #define L_settlindex(file,token,content) (file?(_L_btlindex[token]=content):\
+ 					      (_L_atlindex[token]=content))
+ /*
+ **	get line number X from file
+ */
+ #define L_getrline(file, X)	 (file?(_L_bl[X]):(_L_al[X]))
+ #define L_getcline(file, X)	 (file?(_L_bl[_L_bclindex[X]]):\
+ 				       (_L_al[_L_aclindex[X]]))
+ #define L_gettline(file, X)	 (file?(_L_bl[_L_bclindex[_L_btlindex[X]]]):\
+ 				       (_L_al[_L_aclindex[_L_atlindex[X]]]))
+ 
+ #define L_cl2rl(file, X)	 (file?(_L_bclindex[X]):\
+ 				       (_L_aclindex[X]))
+ #define L_tl2cl(file, X)	 (file?(_L_btlindex[X]):\
+ 				       (_L_atlindex[X]))
+ #define L_tl2rl(file, X)	 (file?(_L_bclindex[_L_btlindex[X]]):\
+ 				       (_L_aclindex[_L_atlindex[X]]))
+ 
+ /*
+ **	get number of first token on line X of the file
+ */
+ #define L_getindex(file,X)	(file?(_L_bi[X]):(_L_ai[X]))
+ 
+ /*
+ **	get count of number of tokens on line X of first file
+ */
+ #define L_getcount(file,X)	(file?(_L_bc[X]):(_L_ac[X]))
+ 
+ /*
+ **	save number of first token for line X of file
+ */
+ #define L_setindex(file,index,value)	(file?(_L_bi[index]=value):(_L_ai[index]=value))
+ /*
+ **	save count of tokens on line X of file
+ */
+ #define L_setcount(file,index,value)	(file?(_L_bc[index]=value):(_L_ac[index]=value))
+ #define	L_inccount(file,index)		(file?(_L_bc[index]++):(_L_ac[index]++))
+ 
+ /*
+ **	retrieve line and token counts
+ */
+ #define L_getrlmax(file)	(file?_L_brlm:_L_arlm)
+ #define L_getclmax(file)	(file?_L_bclm:_L_aclm)
+ #define L_gettlmax(file)	(file?_L_btlm:_L_atlm)
+ 
+ /*
+ **	set line and token counts
+ */
+ #define _L_setrlmx(file,value)	(file?(_L_brlm=(value)):(_L_arlm=(value)))
+ #define L_setclmax(file,value)	(file?(_L_bclm=(value)):(_L_aclm=(value)))
+ #define L_settlmax(file,value)	(file?(_L_btlm=(value)):(_L_atlm=(value)))
+ 
+ /*
+ **	increment line and token counts
+ */
+ #define	_L_incrlmx(file)		(file?(_L_brlm++):(_L_arlm++))
+ #define	L_incclmax(file)		(file?(_L_bclm++):(_L_aclm++))
+ #define	L_inctlmax(file)		(file?(_L_btlm++):(_L_atlm++))
+ 
+ #define L_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/miller.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/miller.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/miller.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,128 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/miller.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "token.h"
+ #include "edit.h"
+ #include "compare.h"
+ 
+ #define MAXT	K_MAXTOKENS
+ #define ORIGIN (max_obj/2)
+ 
+ #define MILLER_CHATTER	100
+ 
+ /*
+ **	totally opaque miller/myers code
+ **		hacked from a version provided by the author
+ */
+ 
+ 
+ E_edit
+ G_do_miller(m,n,max_d,comflags)
+ int m;
+ int n;
+ int max_d;
+ int comflags;
+ {
+     int	max_obj = m + n;
+     int
+ 	lower,
+ 	upper,
+ 	d,
+ 	k,
+ 	row,
+ 	col;
+ 	E_edit new;
+ 
+ #ifdef STATIC_MEM
+ 	static E_edit script[MAXT+1];
+ 	static int last_d[MAXT+1];
+ #else
+ 	E_edit *script;
+ 	int *last_d;
+ 	/*
+ 	**	make space for the two big arrays
+ 	**		these could probably be smaller if I
+ 	**		understood this algorithm at all
+ 	**		as is, i just shoe horned it into my program.
+ 	**	be sure to allocate max_obj + 1 objects as was done
+ 	**		in original miller/myers code
+ 	*/
+ 	script = Z_ALLOC(max_obj+1,E_edit);
+ 	last_d = Z_ALLOC(max_obj+1,int);
+ 
+ #endif
+ 	for (row=0;row < m && row < n && X_com(row,row,comflags) == 0; ++row)
+ 		;
+ 	last_d[ORIGIN] = row;
+ 	script[ORIGIN] = E_NULL;
+ 	lower = (row == m) ? ORIGIN+1 : ORIGIN - 1;
+ 	upper = (row == n) ? ORIGIN-1 : ORIGIN + 1;
+ 	if (lower > upper)
+ 	{
+ 		/*
+ 		**	the files are identical
+ 		*/
+ 		return(E_NULL);
+ 	}
+ 	for (d = 1; d <= max_d; ++d) {
+ 		for (k = lower; k<= upper; k+= 2) {
+ 			new = E_edit_alloc();
+ 
+ 			if (k == ORIGIN-d || (k!= ORIGIN+d && last_d[k+1] >= last_d[k-1])) {
+ 				row = last_d[k+1]+1;
+ 				E_setnext(new,script[k+1]);
+ 				E_setop(new,E_DELETE);
+ 			} else {
+ 				row = last_d[k-1];
+ 				E_setnext(new,script[k-1]);
+ 				E_setop(new,E_INSERT);
+ 			}
+ 
+ 			E_setl1(new,row);
+ 			col = row + k - ORIGIN;
+ 			E_setl2(new,col);
+ 			script[k] = new;
+ 
+ 			while (row < m && col < n && X_com(row,col,comflags) == 0) {
+ 				++row;
+ 				++col;
+ 			}
+ 			last_d[k] = row;
+ 			if (row == m && col == n) {
+ 				return(script[k]);
+ 			}
+ 			if (row == m)
+ 				lower = k+2;
+ 			if (col == n)
+ 				upper = k-2;
+ 		}
+ 		--lower;
+ 		++upper;
+ #ifndef NOCHATTER
+ 		if ((d > 0) && (0 == (d % MILLER_CHATTER)))
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 				"found %d differences\n",
+ 				d);
+ 			Z_chatter(Z_err_buf);
+ 		}
+ #endif
+ 	}
+ 	Z_exceed(max_d);
+ 	/*
+ 	**	dummy lines to shut up lint
+ 	*/
+ 	Z_fatal("fell off end of do_miller\n");
+ 	return(E_NULL);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/miller.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/miller.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/miller.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,17 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef G_INCLUDED
+ 
+ #include "edit.h"
+ 
+ extern E_edit G_do_miller();
+ 
+ #define G_INCLUDED
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/misc.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/misc.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/misc.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,119 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/misc.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include <stdio.h>
+ #include "misc.h"
+ #include "visual.h"
+ #include "output.h"
+ 
+ /*
+ **	various routines used throughout the program
+ */
+ 
+ static int _Z_qflag = 0;
+ 
+ void
+ Z_setquiet()
+ {
+ 	_Z_qflag = 1;
+ }
+ 
+ char Z_err_buf[Z_LINELEN];
+ 
+ #ifndef NOCHATTER
+ /*
+ **	I/O coverup to reassure users with HUGE files
+ **	that spiff is doing something
+ */
+ void
+ Z_chatter(str)
+ char *str;
+ {
+ 	if (!_Z_qflag)
+ 	{
+ 		(void) fputs("spiff -- ",stderr);
+ 		(void) fputs(str,stderr);
+ 	}
+ }
+ #endif
+ 
+ /*
+ **	complain unless you've been told to be quiet
+ */
+ void
+ Z_complain(str)
+ char *str;
+ {
+ 	if (!_Z_qflag)
+ 		(void) fputs(str,stderr);
+ }
+ 
+ /*
+ **	quit with an error code
+ */
+ static void
+ _Z_errexit()
+ {
+ 	(void) exit(2);
+ }
+ 
+ /*
+ **	complain and die
+ */
+ void
+ _Z_qfatal(str)
+ char *str;
+ {
+ 	V_cleanup();	/* try reset the device to normal */
+ 	O_cleanup();	/*  "    "    "     "   "    "    */
+ 	Z_complain(str);
+ 	_Z_errexit();
+ }
+ 
+ /*
+ **	scream and die
+ */
+ void
+ Z_fatal(str)
+ char *str;
+ {
+ 	V_cleanup();	/* try reset the device to normal */
+ 	O_cleanup();	/*  "    "    "     "   "    "    */
+ 	(void) fputs(str,stderr);
+ 	_Z_errexit();
+ }
+ 
+ /*
+ **	allocate memory with error checking
+ */
+ int*
+ _Z_myalloc(k)
+ int k;
+ {
+ 	int *tmp;
+ 	if ((tmp = (int*) calloc((unsigned)k,(unsigned)1)) != 0)
+ 	{
+ 		return(tmp);
+ 	}
+ 	Z_fatal("Out of Memory\n");
+ 	return(tmp);	/* boilerplate to shut up lint */
+ }
+ 
+ void
+ Z_exceed(d)
+ int d;
+ {
+ 	(void) sprintf(Z_err_buf,
+ 		"The files differ in more than %d places\n", d);
+ 	_Z_qfatal(Z_err_buf);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/misc.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/misc.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/misc.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,49 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef Z_INCLUDED
+ 
+ /*
+ **	make sure that if we have a XENIX system, that
+ **	we also treat it as an AT and T derivative
+ */
+ #ifdef XENIX
+ #ifndef ATT
+ #define ATT
+ #endif
+ #endif
+ 
+ #define	Z_LINELEN	1024
+ #define	Z_WORDLEN	  20
+ 
+ extern char Z_err_buf[];
+ 
+ /*
+ **	helpful macros
+ */
+ #define Z_ABS(x)	(( (x) < (0) )? (-(x)):(x))
+ #define Z_MIN(x,y)	(( (x) < (y) )? (x):(y))
+ #define Z_MAX(x,y)	(( (x) > (y) )? (x):(y))
+ 
+ #define Z_ALLOC(n,type)	((type*) _Z_myalloc((n) * sizeof (type)))
+ extern int *_Z_myalloc();
+ 
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+ extern void Z_complain();
+ extern void Z_fatal();
+ extern void Z_exceed();
+ extern void Z_setquiet();
+ #ifndef NOCHATTER
+ extern void Z_chatter();
+ #endif
+ 
+ #define Z_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/one
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/one:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/one	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,3 ----
+ Hello there
+ you world
+ leaders.


Index: llvm/test/Programs/MultiSource/Applications/spiff/output.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/output.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/output.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,560 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/output.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include <stdio.h>
+ 
+ #ifdef M_TERMINFO
+ #include <curses.h>
+ #include <term.h>
+ #endif
+ 
+ #ifdef M_TERMCAP
+ #ifdef XENIX
+ #include <tcap.h>
+ #endif
+ #endif
+ 
+ #include <unistd.h>
+ 
+ #include "misc.h"
+ #include "flagdefs.h"
+ #include "edit.h"
+ #include "line.h"
+ #include "token.h"
+ 
+ static int _O_need_init = 1;
+ static int _O_st_ok = 0;
+ static int _O_doing_ul = 0;
+ static	char *_O_st_tmp;
+ #ifdef M_TERMCAP
+ static	char _O_startline[Z_WORDLEN];
+ static	char _O_endline[Z_WORDLEN];
+ #endif
+ 
+ static void
+ _O_st_init()
+ {
+ 	char termn[Z_WORDLEN];
+ #ifdef M_TERMCAP
+ 	static	char entry[1024];
+ #endif
+ 
+ 	/*
+ 	**	see if standard out is a terminal
+ 	*/
+ 	if (!isatty(1))
+ 	{
+ 		_O_need_init = 0;
+ 		_O_st_ok = 0;
+ 		return;
+ 	}
+ 
+ 	if (NULL == (_O_st_tmp = (char*) getenv("TERM")))
+ 	{
+ 		Z_complain("can't find TERM entry in environment\n");
+ 		_O_need_init = 0;
+ 		_O_st_ok = 0;
+ 		return;
+ 	}
+ 	(void) strcpy(termn,_O_st_tmp);
+ 
+ #ifdef M_TERMCAP
+ 	if (1 != tgetent(entry,termn))
+ 	{
+ 		Z_complain("can't get TERMCAP info for terminal\n");
+ 		_O_need_init = 0;
+ 		_O_st_ok = 0;
+ 		return;
+ 	}
+ 
+ 	_O_st_tmp = _O_startline;
+ 	_O_startline[0] = '\0';
+ 	tgetstr("so",&_O_st_tmp);
+ 
+ 	_O_st_tmp = _O_endline;
+ 	_O_endline[0] = '\0';
+ 	tgetstr("se",&_O_st_tmp);
+ 
+ 	_O_st_ok = (strlen(_O_startline) > 0) && (strlen(_O_endline) > 0);
+ #endif
+ 
+ #ifdef M_TERMINFO
+ 	setupterm(termn,1,&_O_st_ok);
+ #endif
+ 	_O_need_init = 0;
+ }
+ 
+ void
+ O_cleanup()
+ {
+ 	/*
+ 	**	this probably isn't necessary, but in the
+ 	**	name of compeleteness.
+ 	*/
+ #ifdef M_TERMINFO
+ 	resetterm();
+ #endif
+ }
+ 
+ static void
+ _O_start_standout()
+ {
+ 	if (_O_need_init)
+ 	{
+ 		_O_st_init();
+ 	}
+ 	if (_O_st_ok)
+ 	{
+ #ifdef M_TERMCAP
+ 		(void) printf("%s",_O_startline);
+ #endif 
+ #ifdef M_TERMINFO
+ 		vidattr(A_STANDOUT);
+ #endif
+ 	}
+ 	else
+ 	{
+ 		_O_doing_ul = 1;
+ 	}
+ }
+ 
+ static void
+ _O_end_standout()
+ {
+ 	if (_O_need_init)
+ 	{
+ 		_O_st_init();
+ 	}
+ 	if (_O_st_ok)
+ 	{
+ #ifdef M_TERMCAP
+ 		(void) printf("%s",_O_endline);
+ #endif 
+ #ifdef M_TERMINFO
+ 		vidattr(0);
+ #endif
+ 	}
+ 	else
+ 	{
+ 		_O_doing_ul = 0;
+ 	}
+ }
+ 
+ static void
+ _O_pchars(line,start,end)
+ char *line;
+ int start,end;
+ {
+ 	int cnt;
+ 
+ 	for(cnt=start;cnt < end; cnt++)
+ 	{
+ 		if (0 && _O_doing_ul)
+ 		{
+ 			(void) putchar('_');
+ 			(void) putchar('\b');
+ 		}
+ 		(void) putchar(line[cnt]);
+ 	}
+ }
+ 
+ 
+ /*
+ **	convert a 0 origin token number to a 1 orgin token
+ **		number or 1 origin line number as appropriate
+ */
+ static int
+ _O_con_line(numb,flags,filenum)
+ int numb, flags,filenum;
+ {
+ 	if (flags & U_TOKENS)
+ 	{
+ 		return(numb+1);
+ 	}
+ 	else
+ 	{
+ 		/*
+ 		**	 check to make sure that this is a real
+ 		**	line number. if not, then return 0
+ 		**	on rare occasions, (i.e. insertion/deletion
+ 		**	of the first token in a file) we'll get
+ 		**	line numbers of -1.  the usual look-up technique
+ 		**	won't work since we have no lines before than 0.
+ 		*/
+ 		if (numb < 0)
+ 			return(0);
+ 		/*
+ 		**	look up the line number the token and then
+ 		**	add 1 to make line number 1 origin
+ 		*/
+ 		return(L_tl2cl(filenum,numb)+1);
+ 	}
+ }
+ 
+ static char *
+ _O_convert(ptr)
+ char *ptr;
+ {
+ 	static char spacetext[Z_WORDLEN];
+ 
+ 	if (1 == strlen(ptr))
+ 	{
+ 		switch (*ptr)
+ 		{
+ 			default:
+ 				break;
+ 			case '\n' :
+ 				(void) strcpy(spacetext,"<NEWLINE>");
+ 				return(spacetext);
+ 			case '\t' :
+ 				(void) strcpy(spacetext,"<TAB>");
+ 				return(spacetext);
+ 			case ' ' :
+ 				(void) strcpy(spacetext,"<SPACE>");
+ 				return(spacetext);
+ 		}
+ 				
+ 	}
+ 	return(ptr);
+ }
+ 
+ static char*
+ _O_get_text(file,index,flags)
+ int file,index,flags;
+ {
+ 	static char buf[Z_LINELEN*2];	/* leave lots of room for both
+ 						the token text and the
+ 						chatter that preceeds it */
+ 	char *text;
+ 	K_token tmp;
+ 
+ 	if (flags & U_TOKENS)
+ 	{
+ 		tmp = K_gettoken(file,index);
+ 		text = _O_convert(K_gettext(tmp));
+ 		(void) sprintf(buf,"%s -- line %d, character %d\n",
+ 				text,
+ 				/*
+ 				**	add 1 to make output start at line 1 
+ 				**	and character numbers start at 1
+ 				*/
+ 				L_tl2cl(file,K_getline(tmp))+1,
+ 				K_getpos(tmp)+1);
+ 		return(buf);
+ 	}
+ 	else
+ 	{
+ 		return(L_gettline(file,index));
+ 	}
+ }
+ #define	_O_APP		1
+ #define _O_DEL		2
+ #define _O_CHA		3
+ #define _O_TYPE_E	4
+ 
+ static void
+ _O_do_lines(start,end,file)
+ int start,end,file;
+ {
+ 	int cnt;
+ 	int lastline = -1;
+ 	int nextline;
+ 	K_token nexttoken;
+ 	for (cnt=start;cnt <= end; cnt++)
+ 	{
+ 		nexttoken = K_get_token(file,cnt);
+ 		nextline = K_getline(nexttoken);
+ 		if (lastline != nextline)
+ 		{
+ 			int lastone,lastchar;
+ 			K_token lasttok;
+ 			char linetext[Z_LINELEN+1];	/* leave room for
+ 							   terminator */
+ 			if (0 == file)
+ 			{
+ 				(void) printf("< ");
+ 			}
+ 			else
+ 			{
+ 				(void) printf("> ");
+ 			}
+ 
+ 			/*
+ 			**	put loop here if you want to print
+ 			**	out any intervening lines that don't
+ 			**	have any tokens on them
+ 			*/
+ 
+ 			/*
+ 			**	following line is necessary because
+ 			**	L_gettline is a macro, and can't be passed
+ 			*/
+ 			(void) strcpy(linetext,L_gettline(file,nextline));
+ 			_O_pchars(linetext,0,K_getpos(nexttoken));
+ 			_O_start_standout();
+ 			/*
+ 			** 	look for last token on this line to be
+ 			**	highlighted
+ 			*/
+ 			for ( lastone=cnt,lasttok = K_get_token(file,lastone);
+ 			      (lastone<=end)&&(nextline == K_getline(lasttok));
+ 				lastone++,lasttok = K_get_token(file,lastone))
+ 			{
+ 			}
+ 			lastone--;
+ 			lasttok = K_get_token(file,lastone);
+ 			lastchar = K_getpos(lasttok)
+ 					+ strlen(K_gettext(lasttok));
+ 			_O_pchars(linetext,K_getpos(nexttoken),lastchar);
+ 			_O_end_standout();
+ 			_O_pchars(linetext,lastchar,strlen(linetext));
+ 			
+ 			lastline = nextline;
+ 		}
+ 	}
+ }
+ 
+ void
+ O_output(start,flags)
+ E_edit start;
+ int flags;
+ {
+ 	int type = _O_TYPE_E;	/* initialize to error state
+ 				** this is to make sure that type is set
+ 				** somewhere
+ 				*/
+ 	int t_beg1, t_beg2, t_end1, t_end2; /* token numbers */
+ 	int first1, last1, first2, last2;
+ 
+ 	E_edit ep, behind, ahead, a, b;
+ 
+ 	/*
+ 	**	reverse the list of edits
+ 	*/
+ 	ahead = start;
+ 	ep = E_NULL;
+ 	while (ahead != E_NULL) {
+ 		/*
+ 		**	set token numbers intentionally out of range
+ 		**		as boilerplate
+ 		*/
+ 		t_beg1 = t_beg2 = t_end1 = t_end2 = -1;
+ 		/*
+ 		**	edit script is 1 origin, all of
+ 		**	 our routines are zero origin
+ 		*/
+ 		E_setl1(ahead,(E_getl1(ahead))-1);
+ 		E_setl2(ahead,(E_getl2(ahead))-1);
+ 
+ 		behind = ep;
+ 		ep = ahead;
+ 		ahead = E_getnext(ahead);
+ 		E_setnext(ep,behind);
+ 	}
+ 
+ 	/*
+ 	**	now run down the list and collect the following information
+ 	**	type of change (_O_APP, _O_DEL or _O_CHA)
+ 	**	start and length for each file
+ 	*/
+ 	while (ep != E_NULL)
+ 	{
+ 		b = ep;
+ 		/*
+ 		**	operation always start here
+ 		*/
+ 		t_beg1 = E_getl1(ep);
+ 		/*
+ 		**	any deletions will appear before any insertions,
+ 		**	so, if the first edit is an E_INSERT, then this
+ 		**	this is an _O_APP
+ 		*/
+ 		if (E_getop(ep) == E_INSERT)
+ 			type = _O_APP;
+ 		else {
+ 			/*
+ 			**	run down the list looking for the edit
+ 			**	that is not part of the current deletion
+ 			*/	
+ 			do {
+ 				a = b;
+ 				b = E_getnext(b);
+ 			} while ((b != E_NULL) &&
+ 				 (E_getop(b) == E_DELETE) &&
+ 				 ((E_getl1(b)) == ((E_getl1(a))+1)));
+ 			/*
+ 			**	if we have an insertion at the same place
+ 			**	as the deletion we just scanned, then
+ 			**	this is a change
+ 			*/
+ 			if ((b != E_NULL) &&
+ 				((E_getop(b)) == E_INSERT) &&
+ 				((E_getl1(b))==(E_getl1(a))))
+ 			{
+ 				type = _O_CHA;
+ 			}
+ 			else
+ 			{
+ 				type = _O_DEL;
+ 			}
+ 			/*
+ 			**	set up start and length information for
+ 			**	first file
+ 			*/
+ 			t_end1 = E_getl1(a);
+ 			/*
+ 			**	move pointer to beginning of insertion
+ 			*/
+ 			ep = b;
+ 			/*
+ 			**	if we are showing only a deletion,
+ 			**	then we're all done, so skip ahead
+ 			*/ 
+ 			if (_O_DEL == type)
+ 			{
+ 				t_beg2 = E_getl2(a);
+ 				t_end2 = -1;	/* dummy number, won't
+ 							ever be printed */
+ 						   
+ 				goto skipit;
+ 			}
+ 		}
+ 		t_beg2 = E_getl2(ep);
+ 		t_end2 = t_beg2-1;
+ 		/*
+ 		**	now run down the list lookingfor the
+ 		**	end of this insertion and keep count
+ 		**	of the number of times we step along
+ 		*/
+ 		do {
+ 			t_end2++;
+ 			ep = E_getnext(ep);
+ 		} while ((ep != E_NULL) && ((E_getop(ep)) == E_INSERT) &&
+ 					((E_getl1(ep)) == (E_getl1(b))));
+ 
+ skipit:;
+ 		if (flags & U_TOKENS)
+ 		{
+ 			/*
+ 			**	if we are dealing with tokens individually,
+ 			**	then just print then set printing so
+ 			*/
+ 				first1 = t_beg1;
+ 				last1 = t_end1;
+ 				first2 = t_beg2;
+ 				last2 = t_end2;
+ 		}
+ 		else
+ 		{
+ 			/*
+ 			**	we are printing differences in terms of lines
+ 			**	so find the beginning and ending lines of the
+ 			**	changes and print header in those terms
+ 			*/
+ 			if ( t_beg1 >= 0)
+ 				first1 = K_getline(K_get_token(0,t_beg1));
+ 			else
+ 				first1 = t_beg1;
+ 
+ 			if ( t_end1 >= 0)
+ 				last1 = K_getline(K_get_token(0,t_end1));
+ 			else
+ 				last1 = t_end1;
+ 
+ 			if ( t_beg2 >= 0)
+ 				first2 = K_getline(K_get_token(1,t_beg2));
+ 			else
+ 				first2 = t_beg2;
+ 
+ 			if ( t_end2 >= 0)
+ 				last2 = K_getline(K_get_token(1,t_end2));
+ 			else
+ 				last2 = t_end2;
+ 
+ 		}
+ 		/*
+ 		**	print the header for this difference
+ 		*/
+ 		(void) printf("%d",_O_con_line(first1,flags,0));
+ 		switch (type)
+ 		{
+ 		case _O_APP :
+ 			(void) printf("a%d",_O_con_line(first2,flags,1));
+ 			if (last2 > first2)
+ 			{
+ 				(void) printf(",%d",_O_con_line(last2,flags,1));
+ 			}
+ 			(void) printf("\n");
+ 			break;
+ 		case _O_DEL :
+ 			if (last1 > first1)
+ 			{
+ 				(void) printf(",%d",_O_con_line(last1,flags,0));
+ 			}
+ 			(void) printf("d%d\n",_O_con_line(first2,flags,1));
+ 			break;
+ 		case _O_CHA :
+ 			if (last1 > first1)
+ 			{
+ 				(void) printf(",%d",_O_con_line(last1,flags,0));
+ 			}
+ 			(void) printf("c%d",_O_con_line(first2,flags,1));
+ 			if (last2 > first2)
+ 			{
+ 				(void) printf(",%d",_O_con_line(last2,flags,1));
+ 			}
+ 			(void) printf("\n");
+ 			break;
+ 		default:
+ 			Z_fatal("type in O_output wasn't set\n");
+ 		}
+ 		if (_O_DEL == type || _O_CHA == type)
+ 		{
+ 			if (flags & U_TOKENS)
+ 			{
+ 				int cnt;
+ 				for(cnt=first1;cnt <= last1; cnt++)
+ 				{
+ 		(void) printf("< %s",
+ 							_O_get_text(0,cnt,flags));
+ 				}
+ 			}
+ 			else
+ 			{	
+ 				_O_do_lines(t_beg1,t_end1,0);
+ 			}
+ 		}
+ 		if (_O_CHA == type)
+ 		{
+ 			(void) printf("---\n");
+ 		}
+ 		if (_O_APP == type || _O_CHA == type)
+ 		{
+ 			if (flags & U_TOKENS)
+ 			{
+ 				int cnt;
+ 				for(cnt=first2;cnt <= last2; cnt++)
+ 				{
+ 					(void) printf("> %s",
+ 						_O_get_text(1,cnt,flags));
+ 				}
+ 			}
+ 			else
+ 			{
+ 				_O_do_lines(t_beg2,t_end2,1);
+ 			}
+ 		}
+ 	}
+ 	O_cleanup();
+ 	return;
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/output.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/output.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/output.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,17 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef O_INCLUDED
+ 
+ extern void O_output();
+ extern void O_cleanup();
+ 
+ #define O_INCLUDED
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/paper.ms
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/paper.ms:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/paper.ms	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,819 ----
+ .ll 6i
+ .nr PO 1.15i
+ .nr HM 0i
+ .nr FM 1.05i
+ .TL
+ SPIFF -- A Program for Making Controlled Approximate Comparisons of Files
+ .AU
+ Daniel Nachbar
+ .AI
+ Software Engineering Research Group
+ Bell Communications Research
+ Morristown, New Jersey
+ .AB
+ The well known program 
+ .B
+ diff
+ .R
+ [1]
+ is inappropriate for some
+ common tasks such as comparing the output of floating
+ point calculations where roundoff errors
+ lead 
+ .B
+ diff
+ .R
+ astray and comparing program source code
+ where some differences in the text (such as white space and comments)
+ have no effect on the operation of the compiled code. A new program,
+ named 
+ .B
+ spiff,
+ .R
+ addresses these and other similar cases
+ by lexical parsing of the input files and then applying
+ a differencing algorithm to the token sequences.  
+ .B
+ Spiff
+ .R
+ ignores differences
+ between floating point numbers that are below a user settable tolerance.
+ Other features include user settable commenting and literal string
+ conventions and a choice of differencing algorithm.
+ There is also an interactive mode wherein the input texts are displayed
+ with differences highlighted.  The user can change numeric tolerances
+ "on the fly" and 
+ .B
+ spiff
+ .R
+ will adjust the highlighting accordingly. 
+ .AE
+ .SH
+ Some Troubles With Diff
+ .PP
+ Over the past several years, it has been fairly easy to tell when 
+ a new type of computer arrived at a nearby computer center.
+ The best clue was the discordant chorus of
+ groaning, sighing, gnashing of teeth, pounding of foreheads on desks,
+ and other sounds of distress.  Tracing these noises to their source, one
+ would find some poor soul in the process of installing
+ a numerical analysis package on the new machine.
+ .PP
+ One might expect that "moving up" to a new machine
+ would be a cause for celebration.
+ After all, new machines are typically bigger, faster,
+ and better than old machines.
+ However, the floating point arithmetic on any new machine is frequently
+ slightly different from any old machine.
+ As a consequence,
+ software package test routines produce output that is slightly different,
+ but still correct, on the new machines.
+ Serious troubles appear when the person installing the software package
+ attempts to compare the test output files from two different machines
+ by using a difference finding program such as
+ .B
+ diff.
+ .R
+ Programs such as 
+ .B
+ diff
+ .R
+ do a character by character comparison.
+ .B
+ Diff
+ .R
+ finds a great many differences,  most of which
+ are due to roundoff errors in the least significant digits of floating point
+ numbers.  Others are the result of differences in the way
+ in which the two test runs
+ had printed a number (3.4e-1 vs. 0.34).
+ In one case, the test suite for the S statistical analysis package[2],
+ over 1700 floating point numbers are produced
+ (per machine). In the eyes of 
+ .B
+ diff,
+ .R
+ roughly 1200 of these numbers are different.
+ However, none of the "differences" are important ones.
+ Nonetheless, software installers wind up inspecting the output by eye.
+ .PP
+ A similar problem arises when one attempts to
+ look for differences between two versions
+ of the same C program.
+ .B
+ Diff
+ .R
+ reports many differences that are not of interest.  In
+ particular, white space (except inside quotation marks) and
+ anything inside a comment have no effect on the operation of the compiled
+ program and are usually not of interest.
+ .B
+ Diff
+ .R
+ does have a mode of operation where white space
+ within a line (spaces and tabs) can be ignored.
+ However, differences in the placement of newlines cannot be ignored.
+ This is particularly annoying since C programming
+ styles differ on whether to place a newline character before or after the '{'
+ characters that start blocks.
+ .SH
+ The Problem in General Terms
+ .PP
+ As already mentioned, programs such as 
+ .B
+ diff
+ .R
+ do
+ a character-by-character comparison of the input files.
+ However, when it comes to interpreting
+ the contents of a file (either by a human or by a program)
+ it is almost never the case that characters
+ are treated individually. Rather, characters make up tokens such
+ as words and numbers, or act as separators between these tokens.
+ When comparing files, one is usually looking for
+ differences between these tokens, not the characters that make them up
+ or the characters that separate them.
+ .PP
+ What is needed is a program that first parses the input files
+ into tokens, and then applies a differencing algorithm to the token
+ sequences. 
+ In addition to finding differences in terms of tokens,
+ it is possible to interpret the tokens and
+ compare different types of tokens in different ways.  Numbers, for example,
+ can differ by a lot or a little.\**
+ .FS
+ Current differencing programs do not have such a notion because
+ the difference between two characters is a binary function.
+ Two characters are the same or they are not.
+ .FE
+ It is possible to use a tolerance when comparing two number tokens and
+ report only those differences that exceed the tolerance.
+ .SH
+ Design Issues
+ .PP
+ A serious design issue for such a program is how
+ complex to make the parse.  The
+ .I
+ deeper
+ .R
+ one goes in the parsing the larger
+ the unit of text that can be manipulated.  For instance, if one is looking
+ for differences in C code, a complete parse tree can be produced and
+ the differencing algorithm could examine insertion and deletion of entire
+ branches of the tree.  However, deep parsing requires much more
+ complex parsing and slower differencing algorithms.
+ .PP
+ Another design issue is deciding how to interpret the tokens.
+ Closer interpretation may lead to greater flexibility in comparing tokens, but
+ also results in a more cumbersome and error-prone implementation.
+ .PP
+ In the program described here, we attempt to keep both the depth
+ of the parse and the semantics of the tokens to a minimum.
+ The parse is a simple
+ lexical parse with the input files broken up into one dimensional
+ sequences of numbers, literal strings and white space.
+ Literal strings and white space are not interpreted. Numbers
+ are treated as representing points on the real number line.
+ .SH
+ Default Operation
+ .PP
+ .B
+ Spiff\**
+ .R
+ .FS
+ We picked the name as a way to pay a small tribute to that famous intergalactic
+ adventurer Spaceman Spiff[3].
+ .B
+ Spiff
+ .R
+ is also a contraction of "spiffy diff".
+ .FE
+ works very much like 
+ .B
+ diff.
+ .R
+ It reads two files, looks
+ for differences, and prints a listing of the
+ differences in the form of
+ an edit script.\**
+ .FS
+ An edit script is a sequence of insertions and deletions
+ that will transform the first file into the second.
+ .FE
+ As already suggested, 
+ .B
+ spiff
+ .R
+ parses the files into
+ literal strings and real numbers.
+ The definition of these tokens can be altered somewhat by the user
+ (more on this later).  For now, suffice it
+ to say that literals are strings like "cow", "sit",
+ "into", etc.  Real numbers look like "1.3", "1.6e-4" and so on.
+ All of the common formats for real numbers are recognized.
+ The only requirements for a string to be
+ treated as a real number is the presence
+ of a period and at least one digit.
+ By default, a string of digits without a decimal point
+ (such as "1988") is not considered to be a real number,
+ but rather a literal string.\**
+ Each non-alphanumeric character (such as #$@^&*)
+ is parsed into a separate literal token.
+ .FS 
+ Integer numbers are often used as indices, labels, and so on.
+ Under these circumstances, it is more appropriate to treat them as literals.
+ Our choice of default was driven by a design goal
+ of having 
+ .B
+ spiff
+ .R
+ be very conservative
+ when choosing to ignore differences.
+ .FE
+ .PP
+ Once 
+ .B
+ spiff
+ .R
+ determines the two sequences of tokens,
+ it compares members of the first sequence with
+ members of the second sequence.
+ If two tokens are of different types,
+ .B
+ spiff
+ .R
+ deems them to be different, regardless of their content.
+ If both tokens are literal tokens, 
+ .B
+ spiff
+ .R
+ will deem them
+ to be different if any of their characters differ.
+ When comparing two real numbers,
+ .B
+ spiff
+ .R
+ will deem them to be different only if
+ the difference in their values exceeds a user settable tolerance.
+ .SH
+ Altering Spiff's Operation 
+ .PP
+ To make 
+ .B
+ spiff
+ .R
+ more generally useful, the user can control:
+ .IP \(bu
+ how text strings are parsed into tokens 
+ .IP \(bu
+ how tokens of the same type are compared
+ .IP \(bu
+ the choice of differencing algorithm used
+ .IP \(bu
+ and the granularity of edit considered by the differencing algorithm.
+ .LP
+ .PP
+ These features are described next.
+ .SH
+ Altering the Parse
+ .PP
+ The operation of the parser can be altered in several ways.
+ The user can specify that delimited sections of text are to be ignored
+ completely.  This is useful for selectively ignoring the contents of
+ comments in programs.  Similarly, the user can specify that
+ delimited sections of text (including white space)
+ be treated as a single literal token.  So, literal strings in program
+ text can be treated appropriately.
+ Multiple sets of
+ delimiters may be specified at once (to handle cases such as the
+ Modula-2 programming language
+ where there are two ways to specify quoted strings). At present,
+ the delimiters must be fixed string (possibly restricted to the
+ beginning of the line) or end of line.
+ As a consequence of the mechanism for specifying literal strings,
+ multicharacter operators (such as the += operator in C)
+ can be parsed into a single token.
+ .PP
+ As yet, no provision is made for allowing delimiter
+ specification in terms of regular expressions.  This omission 
+ was made for the sake of simplifying the parser.
+ Nothing prevents the addition of regular expressions in the
+ future.  However, the simple mechanism
+ already in place handles the literal string and commenting conventions
+ for most well known programming languages.\**
+ .FS
+ See the manual page in the appendix for examples of handling
+ C, Bourne Shell, Fortran, Lisp, Pascal, and Modula-2.  The only
+ cases that are known not to work are comments in BASIC and
+ Hollerith strings in Fortran.
+ .FE
+ .PP
+ In addition to controlling literal string and comments, the user
+ may also specify whether to treat white space characters as any other
+ non-alphanumeric character (in other words, parse each white space
+ character into its own literal token),
+ whether to parse sign markers as part
+ of the number that they precede or as separate tokens, whether
+ to treat numbers without printed decimal markers (e.g. "1988") 
+ as real numbers rather than as literal strings, and whether
+ to parse real numbers into literal tokens.
+ .SH
+ Altering the Comparison of Individual Tokens
+ .PP
+ As mentioned earlier, the user can set a tolerance below which differences
+ between real numbers are ignored.  
+ .B
+ Spiff
+ .R
+ allows two kinds of tolerances:
+ absolute and relative. 
+ Specifying an absolute tolerance will cause 
+ .B
+ spiff
+ .R
+ to ignore differences
+ that are less than the specified value.
+ For instance, specifying an absolute tolerance of 0.01 will
+ cause only those differences greater than or equal to 0.01 to be reported.
+ Specifying a relative tolerance will cause 
+ .B
+ spiff
+ .R
+ to ignore differences that are
+ smaller than some fraction of the number of larger magnitude.
+ Specifically, the value of the tolerance is interpreted
+ as a fraction of the larger (in absolute terms) 
+ of the two floating point numbers being compared.
+ For example,
+ specifying a relative tolerance of 0.1
+ will cause the two floating point numbers 1.0 and 0.91 to be deemed within
+ tolerance. The numbers 1.0 and 0.9 will be outside the tolerance.
+ Absolute and relative tolerances can be OR'ed together.  In fact,
+ the most effective way to ignore differences that are due to roundoff errors
+ in floating point calculations is to use both
+ a relative tolerance (to handle limits in precision) as well as an absolute
+ tolerance (to handle cases when one number is zero and the other number is
+ almost zero).\**
+ .FS
+ All numbers differ from zero by 100% of their magnitude.  Thus, to handle
+ numbers that are near zero, one would have to specify a relative tolerance
+ of 100% which would be unreasonably large when both numbers are non-zero.
+ .FE
+ In addition, the user can specify an infinite tolerance.  This is useful
+ for checking the format of output while ignoring the actual numbers
+ produced.
+ .SH
+ Altering the Differencing Algorithm
+ .PP
+ By default, 
+ .B
+ spiff
+ .R
+ produces a minimal edit sequence (using the Miller/Myers differencing algorithm[4])
+ that will convert the first file into the second.
+ However, a minimal edit sequences is not always desirable. 
+ For example, for the following two tables of numbers:
+ .DS
+ 0.1   0.2   0.3				0.2   0.3   0.4
+ 0.4   0.5   0.6				0.5   0.6   0.7
+ .DE
+ a minimal edit sequence to convert the table on
+ the left into the table on the right be to
+ would delete the first number (0.1) and insert 0.7 at the end.\**
+ .FS
+ The problem of having the elements of tables become misaligned when
+ the differencing algorithm is trying
+ to find a minimal number of edits can be reduced somewhat
+ by retaining newlines and not using tolerances.
+ Unfortunately, it does not go away.
+ .FE
+ Such a result, while logically correct, does not provide a good picture
+ of the differences between the two files.
+ In general, for text with a very definite structure (such as tables),
+ we may not want to consider insertions and deletions at all, but
+ only one-to-one changes.\**
+ .FS
+ A "change" can be expressed as one deletion and one insertion at the same
+ point in the text.
+ .FE
+ So, rather than look for a minimal edit script, we
+ merely want to compare each token in the first file with
+ the corresponding token in the second file.
+ .PP
+ The user can choose which differencing algorithm to use
+ (the default Miller/Myers or
+ the alternative one-to-one comparison)
+ based upon what is known about the input files. In general,
+ files produced mechanically
+ (such the output from test suites) have a very regular structure
+ and the one-to-one comparison works surprisingly well.
+ For files created by humans, the Miller/Myers
+ algorithm is more appropriate.
+ There is nothing in
+ .B
+ spiff's
+ .R
+ internal design that limits
+ the number of differencing algorithms that it can run.
+ Other differencing algorithms,
+ in particular the one used in
+ .B
+ diff,
+ .R
+ will probably be added later.
+ .SH
+ Altering the Granularity of the Edit Sequence
+ .PP
+ By default,
+ .B
+ spiff
+ .R
+ produces an edit sequence
+ in terms of insertions and deletions of individual tokens.
+ At times it may be more useful to
+ treat the contents of the files as tokens when looking for differences
+ but
+ express the edit script in terms of entire lines of the files rather
+ than individual tokens.\**
+ .FS
+ For instance, if one wants to have 
+ .B
+ spiff
+ .R
+ produce output that can be fed into
+ the
+ .B
+ ed
+ .R
+ editor.
+ .FE
+ .B
+ Spiff
+ .R
+ provides a facility for restricting the edits to entire lines.
+ .SH
+ Treating Parts of the Files Differently
+ .PP
+ For complex input files, it is important that different parts of the
+ file be treated in different ways.  In other words, it may be impossible
+ to find one set of parsing/differencing rules that work well for the
+ entire file.
+ .B
+ Spiff
+ .R
+ can differentiate between parts of the input files on two bases:
+ within a line and between lines.
+ Within a line, a different tolerance can be applied to each real number.
+ The tolerances are specified in terms of the ordinal position of the
+ numbers on the line (i.e. one tolerance is applied to the first real number
+ on each line, a different tolerance is applied to the second number on
+ each line, a third tolerance is applied to the third, and so on).  If more
+ numbers appear on a line than there are tolerances specified, the last
+ tolerance is applied to all subsequent numbers on the line (i.e., if the user
+ specifies three tolerances, the third is applied to the third, fourth
+ fifth, . . . number on each line).  This feature is useful for applying
+ different tolerances to the different columns of a table of numbers.
+ .PP
+ Between lines, the user can place "embedded commands" in the input files.
+ These commands
+ are instructions to parser that can change what tolerances are attached
+ to real numbers and the commenting and literal string conventions used by the
+ parser.  Embedded commands are flagged to the parser
+ by starting the line with a user-specified
+ escape string.  By combining within line and between line differentiation,
+ it is possible for the user to specify a different tolerance
+ for every single real number in the input files.
+ .SH
+ Visual Mode
+ .PP
+ So far,
+ .B
+ spiff's
+ .R
+ operation as an intelligent filter has been described.
+ .B
+ Spiff
+ .R
+ also has an interactive mode.
+ When operating in interactive mode,
+ .B
+ spiff
+ .R
+ places corresponding sections of the input files 
+ side by side on user's screen.\**
+ .FS
+ Although the current implementation of
+ .B
+ spiff
+ .R
+ runs in many environments,
+ interactive mode works only under the MGR window manager.[5]
+ Other graphics interfaces will probably be added over time.
+ .FE
+ Tokens are compared using a one-to-one ordinal comparison, and any tokens that
+ are found to be different are highlighted in reverse video.
+ The user can interactively change the tolerances and 
+ .B
+ spiff
+ .R
+ will alter the display
+ to reflect which real numbers exceed the new tolerances.
+ Other commands allow the user to page through the file and exit.
+ .SH
+ Performance
+ .PP
+ Two components of 
+ .B
+ spiff,
+ .R
+ the parser and the differencing algorithm,
+ account for most of the execution time.  Miller and Myers compare their
+ algorithm to the one used in the diff program.  To restate their results,
+ the Miller/Myers algorithm is faster for files
+ that have relatively few differences but much
+ slower (quadratic time) for files with a great many differences.
+ .PP
+ For cases where the files do not differ greatly,
+ parsing the input files takes most of the time (around 80% of the total).\**
+ .FS
+ No effort has yet been made to make the parser run more quickly.
+ A faster parser could no doubt be written by generating a special state machine.
+ .FE
+ The performance of the parser is roughly similar to programs that do a similar
+ level of parsing (i.e. programs that must examine each character in the file).
+ For files where roughly half of the tokens are real numbers, 
+ .B
+ spiff
+ .R
+ takes about twice as long to parse the input files
+ as an
+ .B
+ awk
+ .R
+ program that counts the number of words in a file:\**
+ .FS
+ For
+ .B
+ awk,
+ .R
+ a word is any string separated by white space.
+ .FE
+ .B
+ .DS
+ awk '{total += NF}' firstfile secondfile
+ .DE
+ .R
+ .PP
+ The time that it takes 
+ .B
+ spiff
+ .R
+ to parse a file is substantially
+ increased if scanning is done for comments
+ and delimited literal strings.  The precise effect depends upon the length of
+ the delimiters, whether they are restricted to appear at beginning of line, and
+ the frequency with which literals and comments appear in the input files.
+ As an example, adding the 12 literal conventions\**
+ .FS
+ One literal convention is for C literal strings.  The rest enumerate multicharacter
+ operators.
+ .FE
+ and 1 commenting convention
+ required for C code roughly doubles the time required to parse input files.\**
+ .FS
+ So in total, it takes 
+ .B
+ spiff
+ .R
+ about 4 times longer to parse a C program than it takes
+ .B
+ awk
+ .R
+ to count the number of words in the same file.
+ .FE
+ .PP
+ A more complete approach to evaluating
+ .B
+ spiff's
+ .R
+ performance must measure the total time that it takes for the user to complete a
+ differencing task.  For example, consider one of the
+ test suites for the S statistical
+ analysis package mentioned at the beginning of this paper.
+ The output file for each machine is 427 lines long and contains
+ 1090 floating point numbers.  It takes
+ .B
+ diff 
+ .R
+ approximately 2 seconds on one of our "6 MIPS"\** computers
+ .FS
+ We will not comment on the usefulness of "MIPS" as a measure
+ of computing speed.  The numbers provided are only intended to
+ give the reader some vague idea of how fast these programs run. 
+ .FE
+ to compare the two files and produce
+ an edit script that is 548 lines long containing 1003 "differences"
+ in the floating point numbers.  It takes the average tester
+ 5 minutes to print out the edit script and roughly 2 hours to examine
+ the output by hand to determine that the machines are, in fact,
+ both giving nearly identical answers.  The total time needed is
+ 2 hours 5 minutes and 2 seconds.
+ .PP
+ In contrast, it takes
+ .B
+ spiff
+ .R
+ approximately 6 seconds on one of our "6 MIPS" computers to
+ produce an output file that is 4 lines long.\**
+ .FS
+ The output would be zero length except that the output of the
+ .B
+ time
+ .R
+ command is built into the S tests.
+ The timing information could easily be ignored using
+ .B
+ spiff's
+ .R
+ embedded commands. But, as we shall see, it hardly seems worth the trouble.
+ .FE
+ It takes the average tester 30 seconds to examine
+ .B
+ spiff's
+ .R
+ output.  The total for
+ .B
+ spiff
+ .R
+ is 36 seconds.  Therefore for this case, 
+ .B
+ spiff
+ .R
+ will get the job done roughly 208.88 times faster than
+ .B
+ diff.
+ .R
+ .PP
+ In general, it is misleading to compare
+ .B
+ spiff's
+ .R
+ speed with that of
+ .B
+ diff.
+ .R
+ While both programs are looking for differences between files,
+ they operate on very different types of data (tokens vs. bytes).
+ An analogous comparison could be made between the speed of an assembler
+ and the speed of a C compiler.  They are both language translators.
+ One runs much faster than the other.
+ None the less, most programmers use the slower program
+ whenever possible.
+ .SH
+ Using Spiff For Making Regression Tests Of Software
+ .PP
+ We envision 
+ .B
+ spiff
+ .R
+ to be the first of several tools for aiding in the now
+ arduous task of making regression tests.\**
+ .FS
+ In software engineering parlance, a "regression test" is the process by
+ which a tester checks to make sure that the new version of a piece of
+ software still performs the same way as the older versions 
+ on overlapping tasks.
+ .FE
+ Given 
+ .B
+ spiff's
+ .R
+ current capabilities, the regression test designer can
+ take the output of an older version of software and through
+ the use of literal string and commenting conventions,
+ specify what parts of the output must remain identical and
+ what sections can change completely.  By specifying tolerances, the test
+ designer can take into account how much of a difference in floating
+ point calculations is acceptable.
+ .PP
+ The test designer is also free to
+ edit the output from the older version of the software and add embedded
+ commands that can instruct 
+ .B
+ spiff
+ .R
+ to treat various parts of the output
+ differently.  The newly edited output can then serve as a template for
+ the output of later versions of the software.
+ .PP
+ Obviously, editing output by hand is a very low level mechanism for adding
+ specification information.  It is our intention that 
+ .B
+ spiff
+ .R
+ will become
+ the last element in a pipeline of programs.  Programs (as yet unwritten) located
+ earlier in the pipeline
+ can implement a higher level representation of the specification information.
+ They read in the old and new input files, add the appropriate embedded commands,
+ and then pass the results to 
+ .B
+ spiff
+ .R
+ which will do the actual differencing.
+ .SH
+ Future Work
+ .PP
+ There are many features that could be added to 
+ .B
+ spiff
+ .R
+ (if there are not
+ too many already).  Some of these include: 
+ .IP \(bu
+ Using separate differencing algorithms on separate sections of the file
+ and/or limiting the scope of an edit sequence (fencing) 
+ .IP \(bu
+ Providing a more general mechanism for specifying comments and literals
+ (perhaps allowing specification in terms of regular expressions).
+ As yet, we have not encountered any important cases where regular expressions
+ have been needed.  Until such a case is encountered, we will leave regular
+ expressions out in the name of simplicity.
+ .IP \(bu
+ Allowing for a more general specification of what lines should look like.
+ At present, the user can only specify tolerances for numbers as a function
+ of their ordinal position on a line.  The difficulty in expanding the
+ specification abilities of 
+ .B
+ spiff
+ .R
+ is knowing when to stop.  In the extreme,
+ we might add all of the functionality of a program such as
+ .B
+ awk.\**
+ .R
+ .FS
+ Imagine handling the case such as
+ "apply this tolerance to all numbers that appear
+ on a line starting with the word `foo' but only if the number is between 1.9
+ and 3.6 and the word `bar' does not appear on the line".
+ .FE
+ We hope to keep 
+ .B
+ spiff
+ .R
+ as simple as possible.  Our first efforts in
+ this direction will try to implement higher level specification functions
+ outside of 
+ .B
+ spiff.
+ .R
+ .SH
+ Acknowledgements
+ .PP
+ First and foremost, we thank Stu Feldman for his endless patience, constant encouragement
+ and numerous good ideas. We also extend thanks to Doug McIlroy for bringing the Miller/Myers
+ algorithm to our attention, Nat Howard for a key insight
+ and for his editorial comments
+ and Steve Uhler and Mike Bianchi for their editorial comments.
+ .SH
+ References
+ .IP [1]
+ Hunt,J.W. and M.D. McIlroy.
+ .I
+ An Algorithm For Differential File Comparisons, 
+ .R
+ .B
+ Bell Labs Computer Science Technical Report,
+ .R
+ Number 41, 1975.
+ .IP [2]
+ Becker,R.A. and J.M. Chambers (1984).
+ .B
+ S \- An Interactive Environment For Data Analysis And
+ Graphics.
+ .R
+ Belmont, CA: Wadsworth Inc.
+ .IP [3]
+ Watterson, B. (1987).
+ .B
+ Calvin and Hobbes.
+ .R
+ New York: Andrews, McMeel & Parker.
+ .IP [4]
+ Miller, W. and E.W. Myers.
+ .I
+ A File Comparison Program,
+ .R
+ .B
+ Software \-
+ Practice and Experience
+ .R
+ 15, 11, 1025-1040, 1985.
+ .IP [5]
+ Uhler, S.A.
+ .I
+ MGR -- A Window Manager For UNIX,
+ .R
+ Sun User's Group Meeting. September 1986.
+ .LP


Index: llvm/test/Programs/MultiSource/Applications/spiff/parse.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/parse.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/parse.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,803 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/parse.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "flagdefs.h"
+ #include "float.h"
+ #include "tol.h"
+ #include "token.h"
+ #include "line.h"
+ #include "command.h"
+ #include "comment.h"
+ #include "parse.h"
+ 
+ 
+ #include <ctype.h>
+ 
+ #define _P_PARSE_CHATTER	1000
+ 
+ 
+ static	int _P_realline;	/* loop counter */
+ static  int _P_fnumb;
+ 
+ static  char *_P_nextchr;	/* pointer to the next character to parse */
+ static	char *_P_firstchr;		/* pointer to the beginning of the line being parsed */
+ static	int _P_next_tol;		/* number of floats seen on this line */
+ static	int _P_stringsize;		/* count of number of characters that are being
+ 					read into a comment or literal */
+ static int _P_has_content;	/* flag to indicate if the line being
+ 					parsed has any tokens on it */
+ static int _P_start;		/* first line to parse */
+ static int _P_lcount;		/* number of lines to parse */
+ 
+ static int _P_flags;		/* location for global flags */
+ 
+ /*
+ **	by default, "words" can be made up of numbers and letters
+ **	the following code allows for extending the alphabet that can
+ **	be used in words. this is useful for handling languages such
+ **	as C where the underscore character is an allowable character
+ **	in an identifier.  If a character (such as underscore) is NOT added
+ **	to the alphabet, the identifier will be broken into 2 or more "words"
+ **	by the parser.  as such the two sequences
+ **			one_two
+ **		and
+ **			one _ two
+ **	would look identical to spiff.
+ */
+ #define _P_ALPHALEN 256
+ static char _P_alpha[_P_ALPHALEN];
+ 
+ static void
+ _P_alpha_clear()
+ {
+ 	*_P_alpha = '\0';
+ }
+ 
+ 
+ static int
+ _P_in_alpha(chr)
+ char chr;
+ {
+ #ifndef ATT
+ 	extern char *index(const char *s, int c);
+ #endif
+ 	/*
+ 	**	special case when string terminator
+ 	**	is handed to us
+ 	*/
+ 	if ('\0' == chr)
+ 		return(0);
+ 
+ #ifdef ATT
+ 	return((int) strchr(_P_alpha,chr));
+ #else
+ 	return((int) index(_P_alpha,chr));
+ #endif
+ }
+ 
+ void
+ P_addalpha(ptr)
+ char *ptr;
+ {
+ 	char buf[Z_LINELEN];
+ 
+ 	S_wordcpy(buf,ptr);		/* copy up to (but not including)
+ 						the first whitespace char */
+ 
+ 	if ((strlen(_P_alpha) + strlen(buf)) >= _P_ALPHALEN)
+ 	{
+ 		Z_fatal("too many characters added to extended alphabet");
+ 	}
+ 	(void) strcat(_P_alpha,buf);
+ }
+ 
+ /*
+ **	put parser in a default state
+ */
+ 
+ static char _P_dummyline[2];	/* a place to aim wild pointers */
+ static void
+ _P_initparser()
+ {
+ 	_P_dummyline[0] = '\0';
+ 
+ 	/*
+ 	**	now reset all the state of each module
+ 	*/
+ 	C_clear_cmd();		/* disable embedded command key word */ 
+ 	T_clear_tols();
+ 	W_clearcoms();
+ 	W_clearlits();
+ 	_P_alpha_clear();	/* disable extended alphabet */
+ 
+ 	/*
+ 	**	and set state as defined by execute-time commands.
+ 	*/
+ 	C_docmds();
+ 	return;
+ }
+ 
+ 
+ static int
+ _P_needmore()
+ {
+ 	return(*_P_nextchr == '\0');
+ }
+ 
+ static int
+ _P_nextline()
+ {
+ 	/*
+ 	**	if the line that we just finished had
+ 	**		some content,  increment the count
+ 	*/
+ 	if (_P_has_content)
+ 	{
+ 		L_incclmax(_P_fnumb);
+ 		/*
+ 		**	if the previous line had a token
+ 		**		increment the line
+ 		*/
+ 		if (L_getcount(_P_fnumb,L_gettlmax(_P_fnumb)))
+ 		{
+ 			L_inctlmax(_P_fnumb);
+ 			L_setcount(_P_fnumb,L_gettlmax(_P_fnumb),0);
+ 		}
+ 		_P_has_content = 0;
+ 	}
+ 
+ 	/*
+ 	**	reset the number of floats seen on the line
+ 	*/
+ 	_P_next_tol = 0;
+ 
+ 	/*
+ 	**	get another line if there is one available
+ 	*/
+ 	_P_realline++;
+ 	if (_P_realline >= _P_start+_P_lcount)
+ 	{
+ 		return(1);
+ 	}
+ 
+ 	_P_firstchr = _P_nextchr = L_getrline(_P_fnumb,_P_realline);
+ 	/*
+ 	**	and look for a command
+ 	*/
+ 	if (C_is_cmd(_P_firstchr))
+ 	{
+ 		_P_nextchr = _P_dummyline;
+ 		_P_has_content = 0;
+ 	}
+ 	else
+ 	{
+ 		/*
+ 		**	we have a real line, so set up the index
+ 		*/
+ 		L_setclindex(_P_fnumb,L_getclmax(_P_fnumb),_P_realline);
+ 		_P_has_content = 1;
+ 	}
+ 	return(0);
+ }
+ 
+ /*
+ **	the following three routines (_P_litsnarf, _P_bolsnarf, and _P_comsnarf
+ **	all do roughly the same thing. they scan ahead and collect the
+ **	specified string, move _P_nextchr to the end of the
+ **	comment or literal and return 1 if we run off the end of file,
+ **	0 otherwise.  it would have been nice to have 1 routine handle
+ **	all three task (there is much common code), however there were
+ **	so enough differences, (for instance, only comments check for nesting,
+ **	only literals need to set _P_stringsize, etc)
+ **	that I decided to split them up.
+ */
+ static int
+ _P_litsnarf(litptr)
+ W_lit litptr; 
+ {
+ 	_P_stringsize = 0;
+ 	/*
+ 	**	skip the start of literal string
+ 	*/
+ 	_P_nextchr += strlen(W_litbegin(litptr));
+ 	_P_stringsize += strlen(W_litbegin(litptr));
+ 	/*
+ 	**	is there a separate end string?
+ 	**		if not, then we're done
+ 	*/
+ 	if ('\0' == *(W_litend(litptr)))
+ 	{
+ 		return(0);
+ 	}
+ 	/*
+ 	**	loop once for each character in the literal
+ 	*/
+ 	while(1)
+ 	{
+ 		/*
+ 		**	if we are out of characters, move on to next line
+ 		*/
+ 		if (_P_needmore())
+ 		{
+ 			if (_P_nextline())
+ 			{
+ 				return(1);
+ 			}
+ 			if (!_P_has_content)
+ 			{
+ 				/*
+ 				**	since we've just gotten a command
+ 				**		check to see if this literal
+ 				**		is still legit ...
+ 				**		could have just been reset
+ 				**		by the command
+ 				*/
+ 				if (!W_is_lit(litptr))
+ 				{
+ 					return(0);
+ 				}
+ 			}
+ 		} /* if _P_needmore */
+ 
+ 		/*
+ 		**	see if we have an escaped end of literal string
+ 		*/
+ 		if (('\0' != *(W_litescape(litptr))) && /* escape string exists */
+ 		  !S_wordcmp(_P_nextchr,
+ 			   W_litescape(litptr)) &&     /* and escape matches */
+ 		  !S_wordcmp(_P_nextchr+strlen(W_litescape(litptr)),
+ 			   W_litend(litptr)))	     /* and endstring matches */
+ 		{
+ 			_P_nextchr += strlen(W_litescape(litptr))
+ 					+ strlen(W_litend(litptr));
+ 			_P_stringsize += strlen(W_litescape(litptr))
+ 					+ strlen(W_litend(litptr));
+ 			continue;
+ 		}
+ 
+ 		/*
+ 		**	see if we have an end of literal string
+ 		*/
+ 		if (!S_wordcmp(_P_nextchr,W_litend(litptr))) /* escape matches */
+ 		{
+ 			_P_nextchr += strlen(W_litend(litptr));
+ 			_P_stringsize += strlen(W_litend(litptr));
+ 			return(0);
+ 		}
+ 		/*
+ 		**	this must be yet another character in the literal, so
+ 		**	just snarf it up
+ 		*/
+ 		_P_nextchr++;
+ 		_P_stringsize++;
+ 	}	/* while loop once for each character */
+ 
+ #ifndef lint
+ 	Z_fatal("shouldn't execute this line at the end of _P_litsnarf");
+ #endif
+ } /* _P_litsnarf */
+ 
+ static int
+ _P_bolsnarf(bolptr)
+ W_bol bolptr; 
+ {
+ 	/*
+ 	**	skip the start of comment string
+ 	*/
+ 	_P_nextchr += strlen(W_bolbegin(bolptr));
+ 	/*
+ 	**	is there a separate end string
+ 	**		if not, then we're done
+ 	*/
+ 	if ('\0' == *(W_bolend(bolptr)))
+ 	{
+ 		return(0);
+ 	}
+ 	/*
+ 	**	loop once for each character in the comment
+ 	*/
+ 	while(1)
+ 	{
+ 		/*
+ 		**	if we are out of characters,move on to next line
+ 		*/
+ 		if (_P_needmore())
+ 		{
+ 			if (_P_nextline())
+ 			{
+ 				return(1);
+ 			}
+ 			if (!_P_has_content)
+ 			{
+ 				/*
+ 				**	since we've just gotten a command
+ 				**		check to see if this comment
+ 				**		is still legit ... comments
+ 				**		could have just been reset
+ 				**		by the command
+ 				*/
+ 				if (!W_is_bol(bolptr))
+ 				{
+ 					return(0);
+ 				}
+ 			}
+ 		} /* if at end of line */
+ 
+ 		/*
+ 		**	see if we have an escaped end of comment string
+ 		*/
+ 		if ('\0' != *(W_bolescape(bolptr)) && /* escape string exists */
+ 		  !S_wordcmp(_P_nextchr,
+ 			   W_bolescape(bolptr)) &&     /* and escape matches */
+ 		  !S_wordcmp(_P_nextchr+strlen(W_bolescape(bolptr)),
+ 			   W_bolend(bolptr)))	 /* and end string matches */
+ 		{
+ 			_P_nextchr += strlen(W_bolescape(bolptr))
+ 					+ strlen(W_bolend(bolptr));
+ 			continue;
+ 		}
+ 
+ 		/*
+ 		**	see if we have an end of comment string
+ 		*/
+ 		if (!S_wordcmp(_P_nextchr,W_bolend(bolptr)))
+ 		{
+ 			_P_nextchr += strlen(W_bolend(bolptr));
+ 			return(0);
+ 		}
+ 		/*
+ 		**	this must be yet another character in the comment, so
+ 		**	just snarf it up
+ 		*/
+ 		_P_nextchr++;
+ 	}	/* while loop once for each character */
+ 
+ #ifndef lint
+ 	Z_fatal("shouldn't execute this line in at end of _P_bolsnarf");
+ #endif
+ } /* _P_bolsnarf */
+ 
+ /*
+ **	pass over a comment -- look for nexting
+ */
+ static int
+ _P_comsnarf(comptr)
+ W_com comptr; 
+ {
+ 	int depth = 1; /* nesting depth */
+ 	/*
+ 	**	skip the start of comment string
+ 	*/
+ 	_P_nextchr += strlen(W_combegin(comptr));
+ 
+ 	/*
+ 	**	is there a separate end string
+ 	**		if not, then we're done
+ 	*/
+ 	if ('\0' == *(W_comend(comptr)))
+ 	{
+ 		return(0);
+ 	}
+ 	/*
+ 	**	loop once for each character in the comment
+ 	*/
+ 	while(1)
+ 	{
+ 		/*
+ 		**	if we are out of characters, move on to next line
+ 		*/
+ 		if (_P_needmore())
+ 		{
+ 			if (_P_nextline())
+ 			{
+ 				return(1);
+ 			}
+ 			if (!_P_has_content)
+ 			{
+ 				/*
+ 				**	since we've just gotten a command
+ 				**		check to see if this comment
+ 				**		is still legit ... comments
+ 				**		could have just been reset
+ 				**		by the command
+ 				*/
+ 				if (!W_is_com(comptr))
+ 				{
+ 					return(0);
+ 				}
+ 			}
+ 		} /* if at end of line */
+ 
+ 		/*
+ 		**	see if we have an escaped end of comment string
+ 		*/
+ 		if ('\0' != *(W_comescape(comptr)) &&  /* escape string exists */
+ 		  !S_wordcmp(_P_nextchr,
+ 			   W_comescape(comptr)) &&    /* and escape matches */
+ 		  !S_wordcmp(_P_nextchr+strlen(W_comescape(comptr)),
+ 			   W_comend(comptr)))	/* and end string matches */
+ 		{
+ 			/*
+ 			** skip over the escape sequence and the end sequence
+ 			*/
+ 			_P_nextchr += strlen(W_comescape(comptr))
+ 					+ strlen(W_comend(comptr));
+ 			continue;
+ 		}
+ 
+ 		/*
+ 		**	see if we have an end of comment string
+ 		*/
+ 		if (!S_wordcmp(_P_nextchr,W_comend(comptr))) /* end  matches */
+ 		{
+ 			/*
+ 			**	skip over the end sequence
+ 			*/
+ 			_P_nextchr += strlen(W_comend(comptr));
+ 			if (W_is_nesting(comptr))
+ 			{
+ 				depth--;
+ 				if (0 == depth)
+ 					return(0);
+ 			}
+ 			else
+ 			{
+ 				return(0);
+ 			}
+ 			continue;
+ 		}
+ 		/*
+ 		**	see if we have another beginning of comment string
+ 		*/
+ 		if (W_is_nesting(comptr) &&
+ 			!S_wordcmp(_P_nextchr,W_comend(comptr))) /* end matches */
+ 		{
+ 			_P_nextchr += strlen(W_comend(comptr));
+ 			depth++;
+ 			continue;
+ 		}
+ 		/*
+ 		**	this must be yet another character in the comment, so
+ 		**	just snarf it up
+ 		*/
+ 		_P_nextchr++;
+ 	}	/* while loop once for each character */
+ 
+ #ifndef lint
+ 		Z_fatal("should not execute this line in _P_comsnarf\n");
+ #endif
+ 
+ } /* _P_comsnarf */
+ 
+ 
+ /*
+ **	parse a file
+ */
+ static void
+ _P_do_parse()
+ {
+ 
+ 	char *ptr;		/* scratch space */
+ 	int tmp;
+ 	int ret_code;
+ 
+ 	K_token newtoken;
+ 	W_bol bolptr;
+ 	W_com comptr;
+ 	W_lit litptr;
+ 
+ 	int startline, endline, startpos;
+ 
+ 	/*
+ 	**	main parsing loop
+ 	*/
+ 	while (1)
+ 	{
+ 		/*
+ 		**	get more text if necessary
+ 		*/
+ 		if (_P_needmore())
+ 		{
+ 			if (_P_nextline())
+ 			{
+ 				return;
+ 			}
+ 
+ 			/*
+ 			**	if the line contains nothing of interest,
+ 			**		try again
+ 			*/
+ 			if (!_P_has_content)
+ 			{
+ 				continue;
+ 			}
+ 
+ 			/*
+ 			**	check to see if this line starts a comment
+ 			*/
+ 			if ((bolptr = W_isbol(_P_firstchr)) != W_BOLNULL)
+ 			{
+ 				if (_P_bolsnarf(bolptr))
+ 				{
+ 					return;
+ 				}
+ 				continue;
+ 			}
+ 		} /* if _P_needmore */
+ 
+ 		/*
+ 		**	skip whitespace
+ 		*/
+ 		if (!(U_INCLUDE_WS & _P_flags) && isspace(*_P_nextchr))
+ 		{
+ 			_P_nextchr++;
+ 			continue;
+ 		}
+ 
+ 		/*
+ 		**	check to see if this character starts a comment
+ 		*/
+ 		if ((comptr = W_iscom(_P_nextchr)) != W_COMNULL)
+ 		{
+ 			if (_P_comsnarf(comptr))
+ 			{
+ 				return;
+ 			}
+ 			continue;
+ 		}
+ 
+ 		/*
+ 		**	if there aren't any tokens on this line already
+ 		**	set up the index from the token line to the content line
+ 		*/
+ 		if (!L_getcount(_P_fnumb,L_gettlmax(_P_fnumb)))
+ 		{
+ 			L_settlindex(_P_fnumb,
+ 					L_gettlmax(_P_fnumb),
+ 					L_getclmax(_P_fnumb));
+ 			/*
+ 			**	and the pointer from the token line to the 
+ 			** 	first  token on the line
+ 			*/
+ 			L_setindex(_P_fnumb,
+ 					L_gettlmax(_P_fnumb),
+ 					K_gettmax(_P_fnumb));
+ 		}
+ 
+ 		startline =  L_tl2cl(_P_fnumb,L_gettlmax(_P_fnumb));
+ 		startpos = _P_nextchr-_P_firstchr;
+ 
+ 		newtoken = K_maketoken();
+ 		K_setline(newtoken,L_gettlmax(_P_fnumb));
+ 		K_setpos(newtoken,startpos);
+ 
+ 		ret_code = 0;
+ 		/*
+ 		**	check to see if this character starts a
+ 		**		delimited literal string
+ 		*/
+ 		if ((litptr = W_islit(_P_nextchr)) != W_LITNULL)
+ 		{
+ 			ret_code = _P_litsnarf(litptr);
+ 			K_settype(newtoken,K_LIT);
+ 			S_allocstr(&ptr,_P_stringsize);
+ 			/*
+ 			**	fixed nasty memory bug here by adding else
+ 			**	old code copied entire line even if literal
+ 			**	ended before the end of line
+ 			**		should check into getting strcpy loaded
+ 			**		locally
+ 			*/
+ 			endline = L_getclmax(_P_fnumb);
+ 			if (endline > startline)
+ 			{
+ 				/*
+ 				**	copy in the first line of the literal
+ 				*/
+ 				(void) strcpy(ptr,
+ 					      L_getcline(_P_fnumb,startline)
+ 							+startpos);
+ 				/*
+ 				**	now copy all the lines between
+ 				**		the first and last
+ 				*/
+ 				for (tmp=startline+1;tmp<endline;tmp++)
+ 				{
+ 					(void) strcat(ptr,
+ 						      L_getcline(_P_fnumb,tmp));
+ 				}
+ 				/*
+ 				**	and now copy in the last line
+ 				*/
+ 				(void) strncat(ptr,
+ 					       L_getcline(_P_fnumb,endline),
+ 					       _P_stringsize-strlen(ptr));
+ 			}
+ 			else
+ 			{
+ 				(void) strncpy(ptr,
+ 					       L_getcline(_P_fnumb,startline)
+ 								+startpos,
+ 					      _P_stringsize);
+ 				/*
+ 				**	terminate the string you just copied
+ 				*/
+ 				ptr[_P_stringsize] = '\0';
+ 			}
+ 			K_settext(newtoken,ptr);
+ 		} /* if is_lit */
+ 
+ 		/*
+ 		**	see if this is a floating point number
+ 		*/
+ 		else if ((tmp = F_isfloat(_P_nextchr,
+ 				       _P_flags & U_NEED_DECIMAL,
+ 				       _P_flags & U_INC_SIGN)) != 0)
+ 		{
+ 			K_saventext(newtoken,_P_nextchr,tmp);
+ 			K_settype(newtoken,K_FLO_NUM);
+ 			if (!(_P_flags & U_BYTE_COMPARE))
+ 			{
+ 				K_setfloat(newtoken,
+ 					   F_atof(K_gettext(newtoken),
+ 					   USE_ALL));
+ 
+ 				/*
+ 				**	assign the curent tolerance
+ 				*/
+ 				K_settol(newtoken,T_gettol(_P_next_tol));
+ 			}
+ 
+ 			/*
+ 			**	use next tolerance in the
+ 			**		specification if there is one
+ 			*/
+ 			if (T_moretols(_P_next_tol))
+ 			{
+ 				_P_next_tol++;
+ 			}
+ 			/*
+ 			**	and move pointer past the float
+ 			*/
+ 			_P_nextchr += tmp;
+ 		}
+ 
+ 		/*
+ 		**	is this a fixed point number
+ 		*/
+ 		else if (isdigit(*_P_nextchr))
+ 		{
+ 			for(ptr=_P_nextchr; isdigit(*ptr); ptr++)
+ 			{
+ 			}
+ 			K_saventext(newtoken,_P_nextchr,ptr-_P_nextchr);
+ 			K_settype(newtoken,K_LIT);
+ 			_P_nextchr = ptr;
+ 		}
+ 
+ 		/*
+ 		**	try an alpha-numeric word
+ 		*/
+ 		else if (isalpha(*_P_nextchr) || _P_in_alpha(*_P_nextchr))
+ 		{
+ 			/*
+ 			**	it's a multi character word
+ 			*/
+ 			for(ptr = _P_nextchr;
+ 			    isalpha(*ptr)
+ 				|| isdigit(*ptr)
+ 				|| _P_in_alpha(*ptr);
+ 			    ptr++)
+ 			{
+ 			}
+ 			K_saventext(newtoken,_P_nextchr,ptr-_P_nextchr);
+ 			K_settype(newtoken,K_LIT);
+ 			_P_nextchr = ptr;
+ 		}
+ 		else
+ 		{
+ 			/*
+ 			**	otherwise, treat the char itself as a token
+ 			*/
+ 			K_saventext(newtoken,_P_nextchr,1);
+ 			K_settype(newtoken,K_LIT);
+ 			_P_nextchr++;
+ 		}
+ 
+ 		K_settoken(_P_fnumb,K_gettmax(_P_fnumb),newtoken);
+ 		L_inccount(_P_fnumb,L_gettlmax(_P_fnumb));
+ 		/*
+ 		**	if we are out of space, complain and quit
+ 		*/
+ 		if (K_inctmax(_P_fnumb))
+ 		{
+ 			(void) sprintf(Z_err_buf,
+      "warning -- to many tokens in file only first %d tokens will be used.\n",
+ 				       K_MAXTOKENS);
+ 			Z_complain(Z_err_buf);
+ 			return;
+ 		}
+ #ifndef NOCHATTER
+ 		if (0 == (K_gettmax(_P_fnumb) % _P_PARSE_CHATTER))
+ 		{
+ 			int max = K_gettmax(_P_fnumb);
+ 			(void) sprintf(Z_err_buf,
+ 				"scanned %d words from file #%d\n",
+ 					max,_P_fnumb+1);
+ 			Z_chatter(Z_err_buf);
+ 		}
+ #endif
+ 
+ 		/*
+ 		**	are we done?
+ 		*/
+ 		if(ret_code)
+ 		{
+ 			return;
+ 		}
+ 	}   /* loop once per object on a line */
+ 
+ #ifndef lint 
+ 	Z_fatal("this line should never execute");
+ #endif
+ }
+ 
+ void
+ P_file_parse(num,strt,lcnt,flags)
+ int num;	/* file number */
+ int strt;	/* first line to parse expressed in real line numbers */
+ int lcnt;	/* max number of lines to parse */
+ int flags;	/* flags for controlling the parse mode */
+ {
+ 	/*
+ 	**	set module-wide state variables
+ 	*/
+ 	_P_fnumb = num;		
+ 	_P_start = strt;	
+ 	_P_lcount = lcnt;
+ 	_P_flags = flags;
+ 
+ 	_P_initparser();
+ 
+ 	_P_nextchr = _P_dummyline;
+ 
+ 	_P_has_content = 0;
+ 	_P_next_tol = 0;
+ 	L_setcount(_P_fnumb,L_gettlmax(_P_fnumb),0);
+ 	/*
+ 	**	start everything back one line (it will be incremented
+ 	**		just before the first line is accessed
+ 	*/
+ 	_P_realline = _P_start-1;
+ 
+ 	_P_do_parse();
+ 
+ 	/*
+ 	**	if the last line had content, increment the count
+ 	*/
+ 	if (_P_has_content)
+ 	{
+ /*
+ **	this code will get executed if we stopped parsing in the middle
+ **	of a line.  i haven't looked at this case carefully.
+ **	so, there is a good chance that it is buggy.
+ */
+ (void) sprintf(Z_err_buf,"parser got confused at end of file\n");
+ Z_complain(Z_err_buf);
+ 		L_incclmax(_P_fnumb);
+ 		if (L_getcount(_P_fnumb,L_gettlmax(_P_fnumb)))
+ 			L_inctlmax(_P_fnumb);
+ 	}
+ 	return;
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/parse.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/parse.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/parse.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,10 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ extern void P_file_parse();
+ extern void P_addalpha();


Index: llvm/test/Programs/MultiSource/Applications/spiff/spiff.1
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/spiff.1:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/spiff.1	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,454 ----
+ .ll 6i
+ .pl 10.5i
+ .po 1.25i
+ .\"	@(#)spiff.1	1.0 (Bellcore) 9/20/87
+ .\"
+ .lt 6.0i
+ .TH SPIFF 1 "February 2, 1988"
+ .AT 3
+ .SH NAME
+ spiff \- make controlled approximate comparisons between files 
+ .SH SYNOPSIS
+ .B spiff
+ [
+ .B \-s
+ script ] [
+ .B \-f
+ sfile ] [
+ .B \-bteviqcdwm
+ ] [
+ .B \-a
+ \(br
+ .B \-r
+ value ] \-value file1 file2
+ .SH DESCRIPTION
+ .I Spiff
+ compares the contents of 
+ .B file1
+ and
+ .B file2
+ and prints a description of the important differences between
+ the files.
+ White space is ignored except to separate other objects.
+ .I Spiff
+ maintains tolerances below which differences between two floating point
+ numbers are ignored. 
+ Differences in floating point notation (such as 3.4 3.40 and 3.4e01)
+ are treated as unimportant.
+ User specified delimited strings (i.e. comments) can also be ignored.
+ Inside other user specified delimited strings
+ (i.e. quoted strings) whitespace can be significant.
+ .PP
+ .I Spiff's
+ operation can be altered via command line options, a command script, and with
+ commands that are embedded in the input files.
+ .PP
+ The following options affect
+ .I spiff's
+ overall operation.
+ .TP
+ .B \-q
+ suppresses warning messages.
+ .TP
+ .B \-v
+ use a visually oriented display.  Works only in MGR windows.
+ .PP
+ .I Spiff
+ has several flags to aid differencing of various programming languages.
+ See EXAMPLES for a detailed description of the effects of these flags.
+ .TP
+ .B \-C
+ treat the input files as C program source code.
+ .TP
+ .B \-S
+ treat the input files as Bourne shell program source code.
+ .TP
+ .B \-F
+ treat the input files as Fortran program source code.
+ .TP
+ .B \-M
+ treat the input files as Modula-2 program source code.
+ .TP
+ .B \-L
+ treat the input files as Lisp program source code.
+ .PP
+ By default, the output looks somewhat similar in appearance
+ to the output of diff(1).  Lines with differences are printed with
+ the differences highlighted.  If stdout is a terminal, as determined
+ by isatty(), then highlighting uses standout mode as determined by termcap.
+ If stdout is not a tty, then the underlining (via underscore/backspace/char)
+ is used to highlight differences.
+ The following option can control the format of the ouput.
+ .TP
+ .B \-t
+ produce output in terms of individual tokens.  This option is
+ most useful for debugging as the output produced is verbose to
+ the point of being unreadable.
+ .PP
+ The following option controls the differencing algorithm.
+ .TP
+ .B \-e
+ compare each token 
+ in the files with the object in the same ordinal
+ position in the other file.  If the files have a different number
+ of objects, a warning message is printed
+ and the objects at the end of the longer file are ignored.
+ By default,
+ .I spiff
+ uses a Miller/Myers algorithm to find a minimal edit sequence
+ that will convert the contents of the first file into the second.
+ .TP
+ \-<decimal-value>
+ sets a limit on the total number of insertions and deletions
+ that will be considered.
+ If the files differ by more than the stated amount,
+ the program will give up, print a warning message, and exit.
+ .PP
+ The following options control the command script.  More than one of
+ each may appear at at time. The commands accumulate.
+ .TP
+ .B \-f sfile
+ a command script to be taken from file
+ .IR sfile 
+ .TP
+ .B \-s command-script
+ causes the following argument to be taken as a command script.
+ .PP
+ The following options control how individual objects are compared.
+ .TP
+ .B \-b
+ treat all objects (including floating point numbers) as literals.
+ .TP
+ .B \-c
+ ignore differences between upper and lower case.
+ .PP
+ The following commands will control how the files are parsed.
+ .TP
+ .B \-w
+ treat white space as objects.  Each white space character will
+ be treated as a separate object when the program is comparing the
+ files.
+ .TP
+ .B \-m
+ treat leading sign characters ( + and \- ) as separate even
+ if they are followed by floating point numbers.
+ .TP
+ .B \-d
+ treat integer decimal numbers (such as 1987) as real numbers (subject to
+ tolerances) rather than as literal strings.
+ .PP
+ The following three flags are used to set the default tolerances.
+ The floating-point-numbers may be given in the formats accepted
+ by atof(3).
+ .TP
+ .B \-a floating-point-number
+ specifies an absolute value for the tolerance in floating point numbers.
+ The flag
+ .B \-a1e-2
+ will cause all differences greater than 0.01 to be reported.
+ .TP
+ .B \-r floating-point-number
+ specifies a relative tolerance. The value given is interpreted
+ as a fraction of the larger (in absolute terms) 
+ of the two floating point numbers being compared.
+ Thus, the flag
+ .B \-r0.1
+ will cause the two floating point numbers 1.0 and 0.9 to be deemed within
+ tolerance. The numbers 1.0 and 0.89 will be outside the tolerance.
+ .TP
+ .B \-i
+ causes differences between floating point numbers to be ignored.
+ .PP
+ If more than one
+ .B \-a, \-r,
+ or
+ .B \-i
+ flag appear on the command line,
+ the tolerances will be OR'd together (i.e. any difference that is within
+ any of the tolerances will be ignored). 
+ .PP
+ If no default tolerances is set on the command line,
+ the program will use a default tolerance of
+ .B '\-a 1e-10 \-r 1e-10'.
+ .SH SCRIPT COMMANDS
+ .PP
+ A script consists of commands, one per line.
+ Each command consists of a keyword possibly followed by arguments.
+ Arguments are separated by one or more tabs or spaces.
+ The commands are:
+ .TP
+ literal BEGIN-STRING [END-STRING [ESCAPE-STRING]]
+ Specifies the delimiters surrounding text that is to be treated as a single
+ literal object. If only one argument is present, then only that string itself is treated
+ as a literal. If only two arguments are present, they are taking as the starting
+ and ending delimiters respectively.  If three arguments are present, they are treated
+ as the start delimiter, end delimiter, and a string that may be used to escape
+ an instance of the end delimiter.
+ .TP
+ beginchar BEGINNING-OF-LINE-CHARACTER
+ Set the the beginning of line character for BEGIN-STRING's in comments.
+ The default is '^'.
+ .TP
+ endchar END-OF-LINE-CHARACTER
+ Set the end of line character for END-STRING's in comments.
+ The default is '$'.
+ .TP
+ addalpha NEW-ALPHA-CHARACTER
+ Add NEW-ALPHA-CHARACTER to the set of characters allowed in literal strings.
+ By default, 
+ .I spiff
+ parses sequences of characters that begin with a letter and followed by
+ zero or more letters or numbers as a single literal token.  This definition
+ is overly restrictive when dealing with programming languages.
+ For example, in the C programming language,
+ the underscore character is allowed in identifiers. 
+ .TP
+ comment BEGIN-STRING [END-STRING [ESCAPE-STRING]]
+ Specifies the delimiters surrounding text that is to be be ignored entirely
+ (i.e. viewed as comments).
+ The operation of the comment command is very similar to the literal command.
+ In addition, if the END-STRING consists of only
+ the end of line character, the end of line will delimit the end of the comment.
+ Also, if the BEGIN-STRING starts with the beginning of line character, only
+ lines that begin with the BEGIN-STRING will be ignored.
+ .PP
+ More than one comment specification and more than one literal string specification
+ may be specified at a time.
+ .TP
+ nestcom BEGIN-STRING [END-STRING [ESCAPE-STRING]]
+ Similar to the comment command, but allows comments to be nested.
+ Note, due to the design of the parser nested comments can not
+ have a BEGIN-STRING that starts with the beginning of line character.  
+ .TP
+ resetcomments
+ Clears the list of comment specifications.
+ .TP
+ resetliterals
+ Clears the list of literal specifications.
+ .TP
+ tol [aVALUE\(brrVALUE\(bri\(brd . . . [ ; aVALUE\(brrVALUE\(bri\(brd . . . ] . . . ]
+ set the tolerance for floating point comparisons.  
+ The arguments to the tol command are a set of tolerance specifications
+ separated by semicolons.  If more than one a,r,d, or i appears within
+ a specification, then the tolerances are OR'd together (i.e. any difference
+ that is within any tolerance will be ignored).
+ The semantics of a,r, and i are identical to the
+ .B \-a, \-r,
+ and
+ .B \-i
+ flags. The d means that the default tolerance (as specified by the invocation
+ options) should be used.
+ If more than one specification appears on the line, the first
+ specification is applied to the first floating point number on each line,
+ the second specification to the second floating point number one each line
+ of the input files, and so on.  If there are more floating point numbers
+ on a given line of input than tolerance specifications,
+ the last specification is used repeatedly for all remaining floating point numbers
+ on that line.
+ .TP
+ command STRING
+ lines in the input file that start with STRING will be interpreted as
+ command lines. If no "command" is given as part of a
+ .B \-s
+ or
+ .B \-f
+ then it will be impossible to embed commands in the input files.
+ .TP
+ rem
+ .TP
+ #
+ used to places human readable remarks into a commands script. Note that the
+ use of the '#' character differs from other command languages (for instance
+ the Bourne shell).
+ .I Spiff
+ will only recognize the '#' as beginning a comment when it is the first
+ non-blank character on the command line.  A '#' character appearing elsewhere
+ will be treated as part of the command.  Cautious users should use 'rem'.
+ Those hopelessly addicted to '#' as a comment character can have command
+ scripts with a familiar format.
+ .PP
+ Tolerances specified in the command scripts have precedence over the tolerance
+ specified on the invocation command line. The tolerance specified in
+ .I file1
+ has precedence over the tolerance specified in
+ .I file2.
+ .PP
+ .SH VISUAL MODE
+ If
+ .I spiff
+ is invoked with the \-v option, it will enter an interactive mode rather
+ than produce an edit sequence.  Three windows will be put on the screen.
+ Two windows will contain corresponding segments of the input files.
+ Objects that appear in both segments will be examined for differences and
+ if any difference is found, the objects will be highlighted in reverse video
+ on the screen.  Objects that appear in only one window will have a line drawn
+ through them to indicate that they aren't being compared with anything in the other
+ text window. The third window is a command window.  The command window will
+ accept a single tolerance specification (followed by a newline)
+ in a form suitable to the
+ .B tol
+ command.  The tolerance specified will then be used as the default tolerance
+ and the display will be updated to highlight only those objects that exceed
+ the new default tolerance.  Typing 
+ .B m
+ (followed by a newline) will display the next screenfull of text. Typing
+ .B q
+ (followed by a newline)  will cause the program to exit.
+ .SH LIMITS
+ Each input files can be no longer that 10,000 line long or contain more
+ than 50,000 tokens. Longer files will be truncated.
+ No line can be longer than 1024 characters.  Newlines
+ will be inserted every 1024 character.
+ .SH EXAMPLES
+ .TP
+ spiff \-e \-d foo bar
+ this invocation (using exact match algorithm and treating integer numbers
+ as if they were floats) is very useful for examining large tables of numbers.
+ .TP
+ spiff \-0 foo bar
+ compare the two files, quitting after the first difference is found.
+ This makes the program operate roughly like cmp(1).
+ .TP
+ spiff \-0 -q foo bar
+ same as the above, but no output is produced.
+ The return code is still useful.
+ .TP
+ spiff \-w \-b foo bar
+ will make the program operate much like diff(1).
+ .TP
+ spiff \-a1e-5 \-r0.001 foo bar
+ compare the contents of the files foo and bar and ignore all differences between
+ floating point numbers that are less than or equal to
+ 0.00001 or 0.1% of the number of larger magnitude.
+ .TP
+ tol a.01 r.01
+ will cause all differences between floating point numbers that are less than
+ or equal to
+ 0.01 or 1% of the number of larger magnitude to be ignored.
+ .TP
+ tol a.01 r.01 ; i
+ will cause the tolerance in the previous example to be applied to the first
+ floating point number on each line.  All differences between the second and
+ subsequent floating point numbers on each line will be ignored.
+ .TP
+ tol a.01 r.01 ; i ; a.0001
+ like the above except that only differences between the second floating point
+ number on each line will be ignored. The differences between
+ third and subsequent floating point numbers on each number will be ignored if they
+ are less than or equal to 0.0001.
+ .IP
+ A useful script for examing C code is:
+ .nf
+ literal  "    "    \\ 
+ comment  /*  */
+ literal  &&
+ literal  \(br\(br
+ literal  <=
+ literal  >=
+ literal  !=
+ literal  ==
+ literal  --
+ literal  ++
+ literal  <<
+ literal  >>
+ literal  ->
+ addalpha _
+ tol      a0
+ .fi
+ .IP
+ A useful script for shell programs is:
+ .nf
+ literal  '    '    \\
+ comment  #    $
+ tol      a0
+ .fi
+ .IP
+ A useful script for Fortran programs is:
+ .nf
+ literal ' ' '
+ comment ^C $
+ tol     a0
+ .fi
+ .IP
+ A useful script for Modula 2 programs is:
+ .nf
+ literal ' '
+ literal " "
+ nestcom (* *)
+ literal :=
+ literal <>
+ literal <=
+ literal >=
+ tol     a0
+ .fi
+ .IP
+ A useful script for Lisp programs is:
+ .nf
+ literal " "
+ comment ; $
+ tol     a0
+ .fi
+ .SH DIAGNOSTICS
+ .I Spiff's
+ exit status is 0 if no differences are found, 1 if differences are found, and
+ 2 upon error.
+ .SH BUGS
+ In C code, escaped newlines will appear as differences.
+ .PP
+ Comments are treated as token delimiters.
+ .PP
+ Comments in Basic don't work right.  The line number is not ignored.
+ .PP
+ Continuation lines in Fortran comments don't work.
+ .PP
+ There is no way to represent strings specified using a
+ Hollerith notation in Fortran.
+ .PP
+ In formated English text, hyphenated words,
+ movements in pictures, footnotes, etc.
+ will be reported as differences.
+ .PP
+ STRING's in script commands can not include whitespace.
+ .PP
+ Visual mode does not handle tabs properly.  Files containing
+ tabs should be run through
+ expand(1) before trying to display them with visual mode.
+ .PP
+ In visual mode, the text windows appear in a fixed size and font.
+ Lines longer than the window size will not be handled properly.
+ .PP
+ Objects (literal strings) that contain newlines cause trouble in several places
+ in visual mode.
+ .PP
+ Visual mode should accept more than one tolerance specification.
+ .PP
+ When using visual mode or the exact match comparison algorithm, the program
+ should do the parsing on the fly rather than truncating long files.
+ .SH AUTHOR
+ Daniel Nachbar
+ .SH COPYRIGHT
+ .nf
+                  Copyright (c) 1988 Bellcore
+                      All Rights Reserved
+ Permission is granted to copy or use this program,
+ EXCEPT that it may not be sold for profit, the copyright
+ notice must be reproduced on copies, and credit should
+ be given to Bellcore where it is due.
+          BELLCORE MAKES NO WARRANTY AND ACCEPTS
+             NO LIABILITY FOR THIS PROGRAM.
+ .fi
+ 
+ .br
+ .SH SEE ALSO
+ atof(3)
+ isatty(2)
+ diff(1)
+ cmp(1)
+ expand(1)
+ mgr(1L)
+ .PP
+ "Spiff -- A Program for Making Controlled Approximate Comparisons of Files",
+ by Daniel Nachbar.
+ .PP
+ "A File Comparison Program" by Webb Miller and Eugene W. Myers in Software \-
+ Practice and Experience, Volume 15(11), pp.1025-1040, (November 1985).


Index: llvm/test/Programs/MultiSource/Applications/spiff/spiff.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/spiff.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/spiff.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,342 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/spiff.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ 
+ #include <stdio.h>
+ #include "misc.h"
+ #include "flagdefs.h"
+ #include "parse.h"
+ #include "edit.h"
+ #include "line.h"
+ #include "token.h"
+ #include "tol.h"
+ #include "command.h"
+ #include "compare.h"
+ #include "exact.h"
+ #include "miller.h"
+ #include "visual.h"
+ #include "output.h"
+ 
+ static void _Y_doargs();
+ 
+ static int _Y_eflag = 0;	/* use exact match algorithm */
+ static int _Y_vflag = 0;	/* use visual mode */
+ 
+ /*
+ **	this is the set of flags that gets used throughout the top module
+ **	as well as being used to communicate between modules.
+ */
+ static int _Y_flags;
+ 
+ int
+ main(argc,argv)
+ int argc;
+ char *argv[];
+ {
+ 	E_edit edit_end;
+ 	char *filename[2];
+ 
+ 	int max_d; 	/* max number of differences allowed */
+ 	int i;		/* loop counter */
+ 
+ 	/*
+ 	**	parse the command line
+ 	*/
+ 	_Y_doargs(argc,argv,&(filename[0]),&(filename[1]),&max_d);
+ 
+ 	/*
+ 	**	initialize the default tolerance if it
+ 	**		hasn't been set already.
+ 	*/
+ 	T_initdefault();
+ 
+ 	/*
+ 	**	read and then parse the files
+ 	*/
+ 
+ 	/*
+ 	**	L_initfile return a code that indicates if the
+ 	**	entire file was read or not
+ 	**
+ 	**	P_fileparse also knows how to start at someplace other
+ 	**		than the first line of file
+ 	**
+ 	**	Taken together, this is enough to do step our way
+ 	**		through the file using an exact match algorithm.
+ 	**
+ 	**	Oh well, someday . . .
+ 	*/
+ 	for(i=0;i<=1;i++)
+ 	{
+ 		/*
+ 		**	read the file into core
+ 		*/
+ 		(void) L_init_file(i,filename[i]);
+ 		K_settmax(i,0);		/* start tokens at 0 */
+ 		/*
+ 		**	and parse the files into tokens
+ 		*/
+ 		P_file_parse(i,0,L_getrlmax(i),_Y_flags);
+ 	}
+ 
+ 	if (_Y_vflag)
+ 	{
+ 		return(V_visual(_Y_flags));
+ 	}
+ 
+ 	/*
+ 	**	if max_d was not set on the command line
+ 	**		set it to be as large as is possible
+ 	**		since the most changes possible would
+ 	**		be to delete all the tokens in the
+ 	**		first file and add all the tokens from
+ 	**		the second, the max possible is the
+ 	**		sum of the number of tokens in the
+ 	**		two files.
+ 	*/
+ 	if (-1 == max_d)
+ 		max_d = K_gettmax(0) + K_gettmax(1);
+ 
+ 	if (_Y_eflag)
+ 	{
+ 		edit_end = Q_do_exact(K_gettmax(0),K_gettmax(1),
+ 					max_d,_Y_flags);
+ 	}
+ 	else
+ 	{
+ 		edit_end = G_do_miller(K_gettmax(0), K_gettmax(1),
+ 				     max_d,_Y_flags);
+ 	}
+ 
+ 	if (E_NULL != edit_end)
+ 	{
+ 		O_output(edit_end,_Y_flags);
+ 		return(1);
+ 	}
+ 	return(0);
+ }
+ 
+ /*
+ **	break a string into individual lines and feed
+ **		them to the command module
+ */
+ static void
+ _Y_cmdlines(from)
+ char *from;
+ {
+ 	char buf[Z_LINELEN]; 
+ 	char *to;
+ 	while ('\0' != *from)
+ 	{
+ 		/*
+ 		**	copy line into buf
+ 		*/
+ 		to = buf;
+ 		while (('\0' != *from) && ('\n' != *from))
+ 		{
+ 			*to++ = *from++;
+ 		}
+ 		*to = '\0';	/* terminate the line */
+ 
+ 		/*
+ 		**	hand the line to the command module
+ 		*/
+ 		C_addcmd(buf);
+ 		/*
+ 		**	skip the newline
+ 		*/
+ 		if ('\n' == *from)
+ 		{
+ 			from++;
+ 		}
+ 	}
+ }
+ 
+ /*
+ **	this useful macro handle arguements that are adjacent
+ **	to a flag or in the following word e.g --
+ **
+ **		-a XXX 
+ **	and
+ **		-aXXX 
+ **
+ **	both work when SETPTR is used. 
+ */
+ #define SETPTR	{if(strlen(argv[1]) == 2) {argv++;argc--;ptr=argv[1];}else ptr=(&argv[1][2]);}
+ 
+ static void
+ _Y_doargs(argc,argv,file1,file2,max_d)
+ int argc;
+ char *argv[];
+ char **file1,**file2;
+ int *max_d;
+ {
+ 	char *ptr;
+ 
+ 	/*
+ 	**	mark maximum number of tokens as being unset
+ 	*/
+ 	*max_d = -1;
+ 
+ 	while (argc > 1 && argv[1][0] == '-')
+ 	{
+ 		switch (argv[1][1])
+ 		{
+ 			case 't':
+ 				_Y_flags |= U_TOKENS;
+ 				break;
+ 			case 'w':
+ 				_Y_flags |= U_INCLUDE_WS;
+ 				break;
+ 
+ 			case 'b':
+ 				_Y_flags |= U_BYTE_COMPARE;
+ 				break;
+ 
+ 			case 'c':
+ 				_Y_flags |= U_NO_CASE;
+ 				break;
+ 			case 'd' :
+ 				_Y_flags |= U_NEED_DECIMAL;
+ 				break;
+ 			case 'm' :
+ 				_Y_flags |= U_INC_SIGN;
+ 				break;
+ 			case 'a':
+ 				SETPTR;
+ 				T_defatol(ptr);
+ 				break;
+ 			case 'r':
+ 				SETPTR;
+ 				T_defrtol(ptr);
+ 				break;
+ 			case 'i':
+ 				T_defitol();
+ 				break;
+ 			case 'e' :
+ 				_Y_eflag = 1;
+ 				break;
+ 			case 'v' :
+ 				_Y_vflag = 1;
+ 				break;
+ 			case 'q' :
+ 				Z_setquiet();
+ 				break;
+ 			case 's' :
+ 				SETPTR;
+ 				_Y_cmdlines(ptr);
+ 				break;
+ 			case 'f' :
+ 			{
+ 				extern FILE *fopen();
+ 				char buf[Z_LINELEN];
+ 				FILE *cmdfile;
+ 				SETPTR;
+ 				if ((FILE*) NULL ==
+ 					(cmdfile = fopen(ptr,"r")))
+ 				{
+ 					Z_fatal("can't open command file\n");
+ 				}
+ 				while ((char*) NULL !=
+ 					(char*) fgets(buf,Z_LINELEN,cmdfile))
+ 				{
+ 					C_addcmd(buf);
+ 				}
+ 				(void) fclose(cmdfile);
+ 				break;
+ 			}
+ 			/*
+ 			**	useful commands for
+ 			**	 the C programming language
+ 			*/
+ 			case 'C' :
+ 				C_addcmd("literal  \"   \"    \\ ");
+ 				C_addcmd("comment  /*  */	 ");
+ 				C_addcmd("literal  &&		 ");
+ 				C_addcmd("literal  ||		 ");
+ 				C_addcmd("literal  <=		 ");
+ 				C_addcmd("literal  >=		 ");
+ 				C_addcmd("literal  !=		 ");
+ 				C_addcmd("literal  ==		 ");
+ 				C_addcmd("literal  --		 ");
+ 				C_addcmd("literal  ++		 ");
+ 				C_addcmd("literal  <<		 ");
+ 				C_addcmd("literal  >>		 ");
+ 				C_addcmd("literal  ->		 ");
+ 				C_addcmd("addalpha _		 ");
+ 				C_addcmd("tol      a0 		 ");
+ 				break;
+ 			/*
+ 			**	useful commands for
+ 			**	 the Bourne shell programming language
+ 			*/
+ 			case 'S' :
+ 				C_addcmd("literal  '    '    \\	");
+ 				C_addcmd("comment  #    $	");
+ 				C_addcmd("tol      a0 		");
+ 				break;
+ 			/*
+ 			**	useful commands for
+ 			**	 the Fortran programming language
+ 			*/
+ 			case 'F' :
+ 				C_addcmd("literal  '	'     ' ");
+ 				C_addcmd("comment  ^C   $	");
+ 				C_addcmd("tol      a0 		");
+ 				break;
+ 			/*
+ 			**	useful commands for
+ 			**	 the Lisp programming language
+ 			*/
+ 			case 'L' :
+ 				C_addcmd("literal  \" 	\"	");
+ 				C_addcmd("comment  ; 	$	");
+ 				C_addcmd("tol      a0 		");
+ 				break;
+ 			/*
+ 			**	useful commands for
+ 			**	 the Modula-2 programming language
+ 			*/
+ 			case 'M' :
+ 				C_addcmd("literal ' 	'	");
+ 				C_addcmd("literal \"	\"	");
+ 				C_addcmd("comment (*	*)	");
+ 				C_addcmd("literal :=		");
+ 				C_addcmd("literal <>		");
+ 				C_addcmd("literal <=		");
+ 				C_addcmd("literal >=		");
+ 				C_addcmd("tol      a0 		");
+ 				break;
+ 			case '0':
+ 			case '1':
+ 			case '2':
+ 			case '3':
+ 			case '4':
+ 			case '5':
+ 			case '6':
+ 			case '7':
+ 			case '8':
+ 			case '9':
+ 				*max_d = atoi(&argv[1][1]);
+ 				break;
+ 			default:
+ 				Z_fatal("don't understand arguments\n");
+ 		}
+ 		++argv;
+ 		--argc;
+ 	}
+ 	if (argc != 3)
+ 		Z_fatal ("spiff requires two file names.\n");
+ 	*file1 = argv[1];
+ 	*file2 = argv[2];
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/strings.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/strings.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/strings.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,162 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/strings.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include <ctype.h>
+ #include "misc.h"
+ #include "strings.h"
+ 
+ /*
+ **	routines for handling strings.
+ **		several routines manipulate  "words"
+ **		a "word" is a string not containing whitespace
+ */
+ 
+ /*
+ **	copy a single word. similar to  strcpy
+ */
+ void
+ S_wordcpy(to,from)
+ char *to, *from;
+ {
+ 	while ((*from != '\0') && isprint(*from) && (!isspace(*from)))
+ 	{
+ 		*to++ = *from++;
+ 	}
+ 	*to = '\0';
+ 	return;
+ }
+ 
+ /*
+ **	find the next whitespace character.  The address of the pointer
+ **		is passed and the pointer itself is changed.
+ */
+ void
+ S_skipword(theptr)
+ char **theptr;
+ {
+ 	while((**theptr != '\0') && isprint(**theptr) && (!isspace(**theptr)))
+ 	{
+ 		(*theptr)++;	/* increment the pointer, NOT the pointer
+ 					to the pointer */
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	find the next non-whitespace character.  The address of the pointer
+ **		is passed and the pointer itself is changed.
+ */
+ void
+ S_skipspace(theptr)
+ char **theptr;
+ {
+ 	while((**theptr != '\0') && isspace(**theptr))
+ 	{
+ 		(*theptr)++;	/* increment the pointer, NOT the pointer
+ 					to the pointer */
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	move the pointer to the beginning of the next word
+ */
+ void
+ S_nextword(theptr)
+ char **theptr;
+ {
+ 	S_skipword(theptr);
+ 	S_skipspace(theptr);
+ 	return;
+ }
+ 
+ /*
+ **	see if the first string is a prefix of the second
+ **		returns 0 if yes
+ **		non zero if now
+ **		sigh -- the way strcmp does
+ */
+ int
+ S_wordcmp(s1,s2)
+ char *s1,*s2;
+ {
+ 	return(strncmp(s1,s2,strlen(s2)));
+ }
+ 
+ /*
+ **	chop off any trailing zeros on a string
+ **		but leave one zero if there are only zeros
+ */
+ void
+ S_trimzeros(str)
+ char *str;
+ {
+ 	/*
+ 	**	end starts out pointing at the null terminator
+ 	*/
+ 	char *end = str + strlen(str);
+ 
+ 	/*
+ 	**	if there is more than one character left in the string
+ 	*/
+ 	while(end > (str+1))
+ 	{
+ 		--end;
+ 		if ('0' == *end)
+ 		{
+ 			*end = '\0';
+ 		}
+ 		else
+ 		{
+ 			return;
+ 		}
+ 	}
+ 	return;
+ }
+ 
+ /*
+ **	save a copy of the string
+ */
+ void
+ S_savestr(to,from)
+ char **to,*from;
+ {
+ 	S_allocstr(to,strlen(from));
+ 	(void) strcpy(*to,from);
+ 	return;
+ }
+ 
+ /*
+ **	save cnt characters of the string
+ */
+ void
+ S_savenstr(to,from,cnt)
+ char **to,*from;
+ {
+ 	S_allocstr(to,cnt);
+ 	(void) strncpy(*to,from,cnt);
+ 	*((*to)+cnt) = '\0';
+ 	return;
+ }
+ 
+ /*
+ **	allocate space for a string,  add 1 to size to
+ **		make sure that there is room for the terminating null character
+ */
+ void
+ S_allocstr(to,size)
+ char **to;
+ int size;
+ {
+ 	*to = Z_ALLOC(size+1,char);
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/strings.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/strings.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/strings.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,20 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #ifndef S_INCLUDED
+ extern void S_wordcpy();
+ extern void S_skipword();
+ extern void S_skipspace();
+ extern void S_nextword();
+ extern int  S_wordcmp();
+ extern void S_trimzeros();
+ extern void S_savestr();
+ extern void S_savenstr();
+ extern void S_allocstr();
+ #define S_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/token.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/token.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/token.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,37 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/token.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "token.h"
+ 
+ K_token _K_ato[K_MAXTOKENS]; /* storage for tokens */
+ K_token _K_bto[K_MAXTOKENS];
+ 
+ int _K_atm;
+ int _K_btm;
+ 
+ void
+ K_settoken(file,index,pointer)
+ int file;
+ int index;
+ K_token pointer;
+ {
+ 	if (file)
+ 	{
+ 		_K_bto[index] = pointer;
+ 	}
+ 	else
+ 	{
+ 		_K_ato[index] = pointer;
+ 	}
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/token.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/token.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/token.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,81 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef K_INCLUDED
+ #include "float.h"
+ #include "tol.h"
+ #include "strings.h"
+ 
+ #define		K_MAXTOKENS	50000
+ /*
+ **	values for token type
+ */
+ #define K_LIT		1
+ #define	K_FLO_NUM	2
+ 
+ 
+ typedef struct {
+ 	int linenum;		/* line that the token started on */
+ 	int pos;		/* position on the line where token started */
+ 	int type;		/* token type */
+ 	char *text;	 	/* literal token text */
+ 	/*
+ 	**	canonical floationg point representation
+ 	*/
+ 	F_float flo_num;
+ 	T_tol tolerance;
+ } _K_str, *K_token;
+ 
+ /*
+ **	this should really be a two dimensional array
+ **	but i'm too lazy to recode it
+ */
+ extern K_token _K_ato[];	/* storage for the tokens */
+ extern K_token _K_bto[];
+ /*
+ **	save token X from file
+ */
+ extern void K_settoken(/*file,X,ptr*/);
+ #define K_gettoken(file, X)	(file?(_K_bto[X]):(_K_ato[X]))
+ 
+ extern int _K_atm;	/* count of tokens */
+ extern int _K_btm;
+ 
+ /*
+ **	get token number X from file
+ */
+ #define K_get_token(file, X)	(file?(_K_bto[X]):(_K_ato[X]))
+ 
+ #define K_gettmax(file)		(file?_K_btm:_K_atm)
+ #define K_settmax(file,value)	(file?(_K_btm=(value)):(_K_atm=(value)))
+ /*
+ **	increment and return true on overflow
+ */
+ #define	K_inctmax(file)		((file?(++_K_btm):(++_K_atm))>=K_MAXTOKENS)
+ 
+ #define K_setline(x,y)		(x->linenum = y)
+ #define K_setpos(x,y)		(x->pos = y)
+ #define K_settext(x,y)		(x->text = y)
+ #define K_savetext(x,y,z)	S_savestr(&(x->text),y)
+ #define K_saventext(x,y,z)	S_savenstr(&(x->text),y,z)
+ #define K_setfloat(x,y)		(x->flo_num = y)
+ #define K_settol(x,y)		(x->tolerance = y)
+ #define K_settype(x,y)		(x->type = y)
+ 
+ #define K_getline(x)		(x->linenum)
+ #define K_getpos(x)		(x->pos)
+ #define K_gettext(x)		(x->text)
+ #define K_getfloat(x)		(x->flo_num)
+ #define K_gettol(x)		(x->tolerance)
+ #define K_gettype(x)		(x->type)
+ 
+ #define K_maketoken()		(Z_ALLOC(1,_K_str))
+ 
+ #define K_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/tol.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/tol.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/tol.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,362 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/tol.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #include "misc.h"
+ #include "float.h"
+ #include "tol.h"
+ #include "token.h"
+ 
+ /*
+ **	storage for the default tolerances
+ */
+ T_tol _T_gtol = _T_null;
+ 
+ /*
+ **	tolerances that can be set in the command script and attached to floating
+ **		point numbers at parse time
+ */
+ static T_tol _T_tols[_T_TOLMAX];
+ 
+ /*
+ **	initialize the global tolerance
+ **	should be called only once at the beginning of the program
+ */
+ void
+ T_initdefault()
+ {
+ 	static int called_before = 0;
+ 
+ 	if (called_before)
+ 	{
+ 		Z_fatal("T_initdefault called more than once\n");
+ 	}
+ 
+ 	/*
+ 	**	if the default tolerance was set somewhere else
+ 	**	don't set it here
+ 	*/
+ 	if (T_isnull(_T_gtol))
+ 	{
+ 		T_defatol(_T_ADEF);
+ 		T_defrtol(_T_RDEF);
+ 	}
+ 	called_before = 1;
+ }
+ 
+ static void
+ _T_tolclear(addr)
+ T_tol *addr;
+ {
+ 	*addr = _T_null;
+ }
+ 
+ /*
+ **	clear the parse time tolerances
+ */
+ void
+ T_clear_tols()
+ {
+ 	int i;
+ 	for(i=0;i<_T_TOLMAX;i++)
+ 	{
+ 		_T_tolclear(&_T_tols[i]);
+ 	}
+ }
+ 
+ static void
+ _T_defclear()
+ {
+ 	_T_tolclear(&_T_gtol);
+ }
+ 
+ /*
+ **	take a series of specifiers and add them to the tolerance
+ */
+ static void
+ _T_settol(toladdr,str)
+ T_tol *toladdr;
+ char *str;
+ {
+ 	char typechar;
+ 	while ('\0' != *str)
+ 	{
+ 		/*
+ 		**	find the first non-whitespace character
+ 		*/
+ 		S_skipspace(&str);
+ 		/*
+ 		**	snarf up the type specifier
+ 		*/
+ 		typechar = *str;
+ 		/*
+ 		**	now skip the first char
+ 		*/
+ 		str++;
+ 		/*
+ 		**	skip any possibly intervening whitespace
+ 		*/
+ 		S_skipspace(&str);
+ 		switch (typechar)
+ 		{
+ 			case 'a':
+ 				_T_addtol(toladdr,T_ABSOLUTE,str);
+ 				break;
+ 			case 'r':
+ 				_T_addtol(toladdr,T_RELATIVE,str);
+ 				break;
+ 			case 'i':
+ 				_T_addtol(toladdr,T_IGNORE,(char*)0);
+ 				break;
+ 			case 'd':
+ 				_T_appendtols(toladdr,_T_gtol);
+ 				break;
+ 			default:
+ 				(void) sprintf(Z_err_buf,
+ 				  "don't understand tolerance type '%c'\n",typechar);
+ 				Z_fatal(Z_err_buf);
+ 		}
+ 		/*
+ 		**	and skip to next tolerance
+ 		*/
+ 		S_nextword(&str);
+ 	}
+ }
+ 
+ /*
+ **	set the default tolerance 
+ */
+ void
+ T_setdef(str)
+ char *str;
+ {
+ 	_T_defclear();
+ 	_T_settol(&_T_gtol,str);
+ }
+ 
+ 
+ static char*
+ _T_nextspec(ptr)
+ char *ptr;
+ {
+ 	/*
+ 	**	find the end of the current spec
+ 	*/
+ 	for(;(_T_SEPCHAR != *ptr) && ('\0' != *ptr);ptr++)
+ 	{
+ 	}
+ 
+ 	/*
+ 	**	and step over the seperator if necessary
+ 	*/
+ 	if (_T_SEPCHAR == *ptr)
+ 		ptr++;
+ 
+ 	return(ptr);
+ }
+ 
+ /*
+ **	return just the next set of specs
+ **		ie the string up to end of line or
+ **			the first _T_SEPCHAR
+ **	returned string does not include the _T_SEPCHAR
+ */
+ static char *
+ _T_getspec(from)
+ char *from;
+ {
+ 	static char retval[Z_LINELEN];
+ 	char *ptr = retval;
+ 
+ 	while((_T_SEPCHAR != *from) && ('\0' != *from))
+ 	{
+ 		*ptr++ = *from++;
+ 	}
+ 	*ptr = '\0';	/* terminate the line */
+ 	return(retval);
+ }
+ 
+ /*
+ **	parse a series of _T_SEPCHAR separated tolerance specifications
+ */
+ void
+ T_tolline(str)
+ char *str;
+ {
+ 	int nexttol;
+ 
+ 	T_clear_tols();
+ 
+ 	for(nexttol=0;'\0' != *str;nexttol++,str = _T_nextspec(str))
+ 	{
+ 		/*
+ 		**	make sure we haven't run off the end
+ 		*/
+ 		if (nexttol >= _T_TOLMAX)
+ 		{
+ 			Z_fatal("too many tolerances per line");
+ 		}
+ 
+ 		/*
+ 		**	and set the tolerance
+ 		*/
+ 		_T_settol(&_T_tols[nexttol],_T_getspec(str));
+ 	}
+ }
+ 
+ int
+ T_moretols(int next_tol)
+ {
+ 	return((next_tol >= 0) &&
+ 		(_T_TOLMAX-1 > next_tol) &&
+ 		(!T_isnull( _T_tols[next_tol+1])));
+ }
+ 
+ T_tol
+ T_gettol(index)
+ int index;
+ {
+ 	return(_T_tols[index]);
+ }
+ 
+ /*
+ **	chose which tolerance to use
+ **		 precidence is
+ **			first tolerance
+ **			second tolerance
+ **			default tolerance
+ */
+ T_tol
+ T_picktol(p1,p2)
+ T_tol p1, p2;
+ {
+ 	if (!(T_isnull(p1)))
+ 		return(p1);
+ 
+ 	if (!(T_isnull(p2)))
+ 		return(p2);
+ 
+ 	return(_T_gtol);
+ }
+ 
+ void
+ _T_appendtols(to,from)
+ T_tol *to,from;
+ {
+ 
+ 	T_tol last;
+ 
+ 	/*
+ 	**	are there any elements on the list yet
+ 	*/
+ 	if (T_isnull(*to))
+ 	{
+ 		/*
+ 		**	it's a null list, so allocat space for the
+ 		**		first element and set pointer to it.
+ 		*/
+ 
+ 		*to = from;
+ 	}
+ 	else
+ 	{
+ 		/*
+ 		**	find the last element on the list
+ 		*/
+ 		for(last= *to;!T_isnull(T_getnext(last));last = T_getnext(last))
+ 		{
+ 		}
+ 		/*
+ 		**	add an element on the end
+ 		*/
+ 		T_setnext(last,from);
+ 	}
+ }
+ 
+ /*
+ **	add a tolerance to a list
+ */
+ void
+ _T_addtol(listptr,type,str)
+ T_tol *listptr;
+ int type;
+ char *str;
+ {
+ 	T_tol last;
+ 
+ 	/*
+ 	**	are there any elements on the list yet
+ 	*/
+ 	if (T_isnull(*listptr))
+ 	{
+ 		/*
+ 		**	it's a null list, so allocat space for the
+ 		**		first element and set pointer to it.
+ 		*/
+ 
+ 		last = *listptr = Z_ALLOC(1,_T_struct);
+ 	}
+ 	else
+ 	{
+ 		/*
+ 		**	find the last element on the list
+ 		*/
+ 		for(last= *listptr;!T_isnull(T_getnext(last));last = T_getnext(last))
+ 		{
+ 		}
+ 		/*
+ 		**	add an element on the end
+ 		*/
+ 		T_setnext(last,Z_ALLOC(1,_T_struct));
+ 
+ 		/*
+ 		**	and point to the new element
+ 		*/
+ 		last = T_getnext(last);
+ 	}
+ 
+ 	T_settype(last,type);
+ 	T_setnext(last,_T_null);
+ 
+ 	/*
+ 	**	set the float value only if necessary
+ 	*/
+ 	if (T_IGNORE == type)
+ 	{
+ 		T_setfloat(last,F_null);
+ 	}
+ 	else
+ 	{
+ 		T_setfloat(last,F_atof(str,NO_USE_ALL));
+ 
+ 		/*
+ 		**	test new tolerance for sanity
+ 		*/
+ 		if (F_getsign(T_getfloat(last)))
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 			"%s : negative tolerances don't make any sense\n",str);
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 		/*
+ 		**	check for excessively large relative tolerances
+ 		*/
+ 		if ((T_RELATIVE == type) &&
+ 			 (F_floatcmp(T_getfloat(last),
+ 				     F_atof("2.0",USE_ALL)) > 0))
+ 		{
+ 			(void) sprintf(Z_err_buf,
+ 	"%s : relative tolerances greater than 2 don't make any sense\n",str);
+ 			Z_fatal(Z_err_buf);
+ 		}
+ 	}
+ }


Index: llvm/test/Programs/MultiSource/Applications/spiff/tol.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/tol.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/tol.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,65 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ #include "float.h"
+ 
+ #ifndef T_INCLUDED
+ /*
+ **	values for tol_type
+ */
+ #define T_ABSOLUTE 		0
+ #define T_RELATIVE 		1
+ #define T_IGNORE		2
+ 
+ typedef struct _T_tstr{
+ 	int tol_type;		/* one of the above */
+ 	F_float flo_tol;	/* tolerance is expressed in
+ 				    terms of a floating point value */
+ 	struct _T_tstr *next;
+ } _T_struct, *T_tol;
+ 
+ #define _T_TOLMAX	10	/* number of tolerances that can
+ 					be in effect at one time */
+ 
+ #define _T_ADEF		"1e-10"	/* default absolute tolerance */
+ #define _T_RDEF		"1e-10"	/* default relative tolerance */
+ 
+ extern T_tol T_gettol();
+ extern void T_clear_tols();
+ extern void T_initdefault();
+ extern void T_setdef();
+ extern void T_tolline();
+ extern T_tol T_picktol();
+ extern int T_moretols(int next_tol);
+ 
+ #define T_gettype(x)	(x->tol_type)
+ #define T_getfloat(x)	(x->flo_tol)
+ #define T_getnext(x)	(x->next)
+ 
+ #define T_settype(x,y)	(x->tol_type = y)
+ #define T_setfloat(x,y)	(x->flo_tol = y)
+ #define T_setnext(x,y)	(x->next = y)
+ 
+ #define _T_null		((T_tol) 0)
+ #define T_isnull(x)	((x) == _T_null)
+ 
+ extern T_tol _T_gtol;
+ extern void _T_addtol();
+ extern void _T_appendtols();
+ 
+ /*
+ **	routines for building the global tolerance list
+ */
+ #define T_defatol(x)	_T_addtol(&_T_gtol,T_ABSOLUTE,x)
+ #define T_defrtol(x)	_T_addtol(&_T_gtol,T_RELATIVE,x)
+ #define T_defitol()	_T_addtol(&_T_gtol,T_IGNORE,(char*)NULL)
+ 
+ #define _T_SEPCHAR	';'
+ 
+ #define T_INCLUDED
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/two
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/two:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/two	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,3 ----
+ Hello there
+ you wierd
+ leaders.


Index: llvm/test/Programs/MultiSource/Applications/spiff/visual.c
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/visual.c:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/visual.c	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,413 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef lint
+ static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm/test/Programs/MultiSource/Applications/spiff/visual.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+ #endif
+ 
+ #ifdef MGR
+ 
+ #include "misc.h"
+ #include "line.h"
+ #include "token.h"
+ #include "/usr/public/pkg/mgr/include/term.h"
+ #include "/usr/public/pkg/mgr/include/restart.h"
+ 
+ #define OTHER		0
+ #define ON_DEBUG	1
+ #define OFF_DEBUG	2
+ #define DO_QUIT		3
+ #define DO_PAGE		4
+ #define NEW_PREC	5
+ 
+ 
+ #define NROW	60
+ #define NCOL	80
+ 
+ int isdiff[MAXTOKENS];	/* flag showing if a token pair was shown different*/
+ 
+ int comwin,wina, winb;	/* location to store window numbers */
+ int fontx,fonty;	/* size of the font in pixels */
+ 
+ int debug =0;
+ 
+ 
+ int firsttoken = 0;	/* index of first token pair being displayed */
+ int tokencnt;		/* count of the number of token pairs being displayed */
+ 
+ int
+ V_visual(flags)
+ int flags;
+ {
+ 
+ 	int moretodo = 1;	/* flag to clear when we're finished */
+ 
+ 	messup();
+ 
+ 	m_selectwin(comwin);
+ 	m_setmode(W_ACTIVATE);
+ 
+ 	showpages(comroutine,flags);
+ 
+ 	do
+ 	{
+ 		switch(getinput())
+ 		{
+ 			case ON_DEBUG:
+ 				debug = 0;
+ 				break;
+ 			case OFF_DEBUG:
+ 				debug = 1;
+ 				break;
+ 			case DO_QUIT:
+ 				moretodo = 0;
+ 				break;
+ 			case DO_PAGE:
+ 				if((firsttoken+tokencnt>= K_gettmax(0))||
+ 				   (firsttoken+tokencnt>= K_gettmax(1)))
+ 				{
+ 					m_selectwin(comwin);
+ 					m_printstr("\007this is the last page\n");
+ 					break;
+ 				}
+ 				firsttoken += tokencnt;
+ 				showpages(comroutine,flags);
+ 				break;
+ 			case NEW_PREC:
+ 				updatepages(comroutine,flags);
+ 				break;
+ 			case OTHER:
+ 				break;
+ 			default :
+ 				Z_fatal("bad value in main switch");
+ 				
+ 		}
+ 	} while (moretodo);
+ 
+ 	V_cleanup();
+ 	return(0);
+ }
+ 
+ getinput()
+ {
+ 	char ibuf[Z_LINELEN];	/* input buffer */
+ 	char *ptr;
+ 
+ 	m_selectwin(comwin);
+ 	m_setmode(W_ACTIVATE);
+ 	switch (m_getchar())
+ 	{
+ 		case 't':
+ 			m_gets(ibuf);
+ 			/*
+ 			**	skip the 'tol'
+ 			*/
+ 			ptr = ibuf;
+ 			S_nextword(&ptr);
+ 			T_setdef(ptr);
+ 			return(NEW_PREC);
+ 		case 'q':
+ 			return(DO_QUIT);
+ 		case 'd':
+ 			return(OFF_DEBUG);
+ 		case 'D':
+ 			return(ON_DEBUG);
+ 		case 'm':
+ 			return(DO_PAGE);
+ 		default:
+ 			return(OTHER);
+ 	}
+ 	
+ }
+ 
+ showpages(comroutine,flags)
+ int (*comroutine)();
+ int flags;
+ {
+ 	int i;
+ 		m_selectwin(wina);
+ 		m_clear();
+ 		m_selectwin(winb);
+ 		m_clear();
+ 		showlines();
+ 
+ 		for(i=firsttoken;i<tokencnt+firsttoken; i++)
+ 		{
+ 			isdiff[i] = 0;
+ 		}
+ 		updatepages(comroutine,flags);
+ }
+ 
+ updatepages(comroutine,flags)
+ int (*comroutine)();
+ int flags;
+ {
+ 	int i;
+ 
+ 	for(i=firsttoken;i<tokencnt+firsttoken; i++)
+ 	{
+ 		if (isdiff[i])
+ 		{
+ 
+ 			if (0 == X_com(i,i,flags))
+ 			{
+ 				m_selectwin(wina);
+ 				un_highlight(0,K_gettoken(0,i),K_getline(K_gettoken(0,firsttoken)));
+ 				m_selectwin(winb);
+ 				un_highlight(1,K_gettoken(1,i),K_getline(K_gettoken(1,firsttoken)));
+ 				isdiff[i] = 0;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if (0 != X_com(i,i,flags))
+ 			{
+ 				m_selectwin(wina);
+ 				highlight(0,K_gettoken(0,i),K_getline(K_gettoken(0,firsttoken)));
+ 				m_selectwin(winb);
+ 				highlight(1,K_gettoken(1,i),K_getline(K_gettoken(1,firsttoken)));
+ 				isdiff[i] = 1;
+ 			}
+ 		}
+ 	}
+ }
+ 
+ un_highlight(file,ptr,firstline)
+ int file;
+ K_token ptr;
+ int firstline;
+ {
+ 	highlight(file,ptr,firstline);
+ }
+ 
+ /*
+ **	argument expressed in terms of token lines
+ */
+ highlight(file,ptr,firstline)
+ int file;
+ K_token ptr;
+ int firstline;
+ {
+ 	int startx = K_getpos(ptr)*fontx;
+ 	int starty = (L_tl2cl(file,K_getline(ptr))-L_tl2cl(file,firstline))*fonty;
+ 
+ 	int sizex = fontx*strlen(K_gettext(ptr));
+ 	int sizey = fonty;
+ 	m_bitwrite(startx,starty,sizex,sizey);
+ }
+ 
+ showlines()
+ {
+ 	int Alinecnt = 0;
+ 	int Blinecnt = 0;
+ 
+ 	int Atfirstline = K_getline(K_gettoken(0,firsttoken));
+ 	int Btfirstline = K_getline(K_gettoken(1,firsttoken));
+ 	int Afirstline =  L_tl2cl(0,K_getline(K_gettoken(0,firsttoken)));
+ 	int Bfirstline =  L_tl2cl(1,K_getline(K_gettoken(1,firsttoken)));
+ 	int Anexttoken = L_getindex(0,Atfirstline);
+ 	int Bnexttoken = L_getindex(1,Btfirstline);
+ 	int i;
+ 	/*
+ 	**	first print the lines on the screen
+ 	*/
+ 	for(i=0;i < NROW;i++)
+ 	{
+ 		if(Afirstline+i < L_getclmax(0))
+ 		{
+ 			m_selectwin(wina);
+ 			showline(0,Afirstline+i,i);
+ 			Alinecnt++;
+ 		}
+ 
+ 		if(Bfirstline+i < L_getclmax(1))
+ 		{
+ 			m_selectwin(winb);
+ 			showline(1,Bfirstline+i,i);
+ 			Blinecnt++;
+ 		}
+ 	}
+ 	/*
+ 	**	now figure out how many tokens we actually printed
+ 	*/
+ 	for(i=Atfirstline;Anexttoken<K_gettmax(0) && L_tl2cl(0,i) < Afirstline+Alinecnt;i++)
+ 	{
+ 			Anexttoken += L_getcount(0,i);
+ 	}
+ 
+ 	for(i=Btfirstline;Bnexttoken<K_gettmax(1) && L_tl2cl(1,i) < Bfirstline+Blinecnt;i++)
+ 	{
+ 			Bnexttoken += L_getcount(1,i);
+ 	}
+ 	tokencnt = MIN(Anexttoken,Bnexttoken) - firsttoken;
+ 
+ 	/*
+ 	**	draw a line through any tokens that come before the first
+ 	**		token that is being compared
+ 	*/
+ 	if (L_getindex(0,Atfirstline) != firsttoken)
+ 	{
+ 		m_selectwin(wina);
+ 		for(i=L_getindex(0,Atfirstline);i<firsttoken;i++)
+ 		{
+ 			drawline(K_gettoken(0,i),0);
+ 		}
+ 	}
+ 
+ 	if (L_getindex(1,Btfirstline) != firsttoken)
+ 	{
+ 		m_selectwin(winb);
+ 
+ 		for(i=L_getindex(1,Btfirstline);i<firsttoken;i++)
+ 		{
+ 			drawline(K_gettoken(1,i),0);
+ 		}
+ /*
+ m_line(Bt[Bindex[Bfirstline]]->pos*fontx,fonty/2,(Bt[firsttoken]->pos*fontx)-2,fonty/2);
+ */
+ 	}
+ 
+ 	if (Anexttoken > Bnexttoken)
+ 	{
+ 		m_selectwin(wina);
+ 		for(i=Bnexttoken;i<Anexttoken;i++)
+ 		{
+ 			drawline(K_gettoken(0,i),L_tl2cl(0,K_getline(K_gettoken(0,i)))-Afirstline);
+ 		}
+ 	}
+ 
+ 	if (Anexttoken < Bnexttoken)
+ 	{
+ 		m_selectwin(winb);
+ 		for(i=Anexttoken;i<Bnexttoken;i++)
+ 		{
+ 			drawline(K_gettoken(1,i),L_tl2cl(1,K_getline(K_gettoken(1,i)))-Bfirstline);
+ 		}
+ 	}
+ 
+ }
+ 
+ /*
+ **	line is given in conten line
+ */
+ drawline(ptr,line)
+ K_token ptr;
+ int line;
+ {
+ 		m_line(K_getpos(ptr)*fontx,
+ 			(line*fonty)+fonty/2,
+ 			(K_getpos(ptr)+strlen(K_gettext(ptr)))*fontx,
+ 			(line*fonty)+fonty/2);
+ }
+ 
+ /*
+ **	takes arguments in terms of content lines
+ */
+ showline(file,index,row)
+ int file;
+ int index;
+ int row;
+ {
+ 	static char tmp[Z_LINELEN];
+ 	m_move(0,row);
+ 	stripnl(tmp,L_getcline(file,index));
+ 	m_printstr(tmp);
+ }
+ 
+ stripnl(to,from)
+ char *to,*from;
+ {
+ 	while ((*from != '\n') && (*from != '\0'))
+ 	{
+ 		*to++ = *from++;
+ 	}
+ 	*to = '\0';
+ }
+ 
+ static int didscr = 0;
+ 
+ messup()
+ {
+ 	int col, row;
+ 	int dum1,dum2,dum3,border;
+ 
+ 	m_setup(W_FLUSH|W_DEBUG);
+ 	m_push(P_EVENT|P_FLAGS|P_POSITION);
+ 	get_param(&dum1,&dum2,&dum3,&border);
+ 	didscr = 1;
+ 	comwin =  m_makewindow(192,50,732,116);
+ 	wina = m_makewindow(0,218,570,670);
+ 	m_selectwin(wina);
+ 	m_font(2);
+ 	get_font(&fontx,&fonty);
+ 	m_shapewindow(0,218,NCOL*fontx+(2*border),NROW*fonty+(2*border));
+ 
+ 	get_colrow(&col,&row);
+ 	if ((col != NCOL) || (row != NROW))
+ 	{
+ 		Z_fatal("bad window size");
+ 	}
+ 	m_func(B_INVERT);
+ 	m_setmode(W_ABS);
+ 
+ 	winb = m_makewindow(580,218,570,670);
+ 	m_selectwin(winb);
+ 	m_font(2);
+ 	get_font(&fontx,&fonty);
+ 	m_shapewindow(580,218,NCOL*fontx+(2*border),NROW*fonty+(2*border));
+ 
+ 	get_colrow(&col,&row);
+ 	if ((col != NCOL) || (row != NROW))
+ 	{
+ 		Z_fatal("bad window size");
+ 	}
+ 	m_func(B_INVERT);
+ 	m_setmode(W_ABS);
+ 
+ 	m_selectwin(comwin);
+ 	m_clear();
+ 	m_setmode(W_ABS);
+ 	m_setmode(W_ACTIVATE);
+ }
+ 
+ V_cleanup()
+ {
+ 	if (didscr)
+ 	{
+ 		m_destroywin(wina);
+ 		m_destroywin(winb);
+ 		m_destroywin(comwin);
+ 		m_popall();
+ 		m_setecho();
+ 		(void) fclose(m_termin);
+ 		(void) fclose(m_termout);
+ 	}
+ }
+ 
+ #else
+ 
+ #include "misc.h"
+ /*
+ **	dummy code for systems that don't have
+ **	the mgr window manager installed
+ */
+ int
+ V_visual(d)
+ int d;
+ {
+ 	Z_fatal("visual mode is not available on this machine\n");
+ 	return(-d);	/* boiler plate */
+ }
+ 
+ void
+ V_cleanup()
+ {
+ }
+ 
+ #endif


Index: llvm/test/Programs/MultiSource/Applications/spiff/visual.h
diff -c /dev/null llvm/test/Programs/MultiSource/Applications/spiff/visual.h:1.1
*** /dev/null	Tue Jun  1 15:36:08 2004
--- llvm/test/Programs/MultiSource/Applications/spiff/visual.h	Tue Jun  1 15:35:58 2004
***************
*** 0 ****
--- 1,18 ----
+ /*                        Copyright (c) 1988 Bellcore
+ **                            All Rights Reserved
+ **       Permission is granted to copy or use this program, EXCEPT that it
+ **       may not be sold for profit, the copyright notice must be reproduced
+ **       on copies, and credit should be given to Bellcore where it is due.
+ **       BELLCORE MAKES NO WARRANTY AND ACCEPTS NO LIABILITY FOR THIS PROGRAM.
+ */
+ 
+ 
+ #ifndef V_INCLUDED
+ 
+ 
+ extern void V_cleanup();
+ extern int V_visual (int d);
+ 
+ #define V_INCLUDED
+ 
+ #endif




From gaeke at cs.uiuc.edu  Tue Jun  1 15:41:05 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:41:05 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/Makefile
Message-ID: <200406012036.PAA15835@zion.cs.uiuc.edu>


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

Makefile updated: 1.9 -> 1.10

---
Log message:

Build spiff


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

Index: llvm/test/Programs/MultiSource/Applications/Makefile
diff -u llvm/test/Programs/MultiSource/Applications/Makefile:1.9 llvm/test/Programs/MultiSource/Applications/Makefile:1.10
--- llvm/test/Programs/MultiSource/Applications/Makefile:1.9	Tue May 11 15:04:06 2004
+++ llvm/test/Programs/MultiSource/Applications/Makefile	Tue Jun  1 15:36:39 2004
@@ -4,7 +4,7 @@
 
 include $(LEVEL)/Makefile.config
 
-PARALLEL_DIRS  = Burg aha sgefa siod lambda-0.1.3 d
+PARALLEL_DIRS  = Burg aha sgefa siod lambda-0.1.3 d spiff
 ifeq ($(OS),Linux)
 PARALLEL_DIRS += kimwitu++ treecc hbd obsequi
 endif




From gaeke at cs.uiuc.edu  Tue Jun  1 15:42:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Jun  1 15:42:02 2004
Subject: [llvm-commits] CVS: llvm/LICENSE.TXT
Message-ID: <200406012037.PAA15942@zion.cs.uiuc.edu>


Changes in directory llvm:

LICENSE.TXT updated: 1.17 -> 1.18

---
Log message:

Add spiff


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

Index: llvm/LICENSE.TXT
diff -u llvm/LICENSE.TXT:1.17 llvm/LICENSE.TXT:1.18
--- llvm/LICENSE.TXT:1.17	Tue May 11 14:29:59 2004
+++ llvm/LICENSE.TXT	Tue Jun  1 15:37:41 2004
@@ -69,6 +69,7 @@
 Aha:                llvm/test/Programs/MultiSource/Applications/aha
 SGEFA:              llvm/test/Programs/MultiSource/Applications/sgefa
 SIOD:               llvm/test/Programs/MultiSource/Applications/siod
+Spiff:              llvm/test/Programs/MultiSource/Applications/spiff
 D:                  llvm/test/Programs/MultiSource/Applications/d
 Lambda:             llvm/test/Programs/MultiSource/Applications/lambda-0.1.3
 hbd:                llvm/test/Programs/MultiSource/Applications/hbd




From lattner at cs.uiuc.edu  Tue Jun  1 16:53:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 16:53:01 2004
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Intercept.cpp
Message-ID: <200406012149.QAA16374@zion.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/JIT:

Intercept.cpp updated: 1.15 -> 1.16

---
Log message:

Implement PR315: http://llvm.cs.uiuc.edu/PR315 : abort, don't warn, when missing external functions encountered

This fixes some critical problems building libstdc++ on cygwin.



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

Index: llvm/lib/ExecutionEngine/JIT/Intercept.cpp
diff -u llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.15 llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.16
--- llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.15	Wed Mar 10 11:38:28 2004
+++ llvm/lib/ExecutionEngine/JIT/Intercept.cpp	Tue Jun  1 16:49:00 2004
@@ -60,8 +60,13 @@
 };
 #endif // __linux__
 
-// NoopFn - Used if we have nothing else to call...
-static void NoopFn() {}
+// __mainFunc - If the program does not have a linked in __main function, allow
+// it to run, but print a warning.
+static void __mainFunc() {
+  fprintf(stderr, "WARNING: Program called __main but was not linked to "
+          "libcrtend.a.\nThis probably won't hurt anything unless the "
+          "program is written in C++.\n");
+}
 
 // jit_exit - Used to intercept the "exit" library call.
 static void jit_exit(int Status) {
@@ -86,13 +91,16 @@
   if (Name == "exit") return (void*)&jit_exit;
   if (Name == "atexit") return (void*)&jit_atexit;
 
+  // If the program does not have a linked in __main function, allow it to run,
+  // but print a warning.
+  if (Name == "__main") return (void*)&__mainFunc;
+
   // If it's an external function, look it up in the process image...
   void *Ptr = GetAddressOfSymbol(Name);
-  if (Ptr == 0) {
-    std::cerr << "WARNING: Cannot resolve fn '" << Name
-	      << "' using a dummy noop function instead!\n";
-    Ptr = (void*)NoopFn;
-  }
-  
-  return Ptr;
+  if (Ptr) return Ptr;
+
+  std::cerr << "ERROR: Program used external function '" << Name
+            << "' which could not be resolved!\n";
+  abort();
+  return 0;
 }




From lattner at cs.uiuc.edu  Tue Jun  1 16:57:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 16:57:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406012152.QAA17038@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.190 -> 1.191

---
Log message:

Bug fixed


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.190 llvm/docs/ReleaseNotes.html:1.191
--- llvm/docs/ReleaseNotes.html:1.190	Tue Jun  1 15:02:56 2004
+++ llvm/docs/ReleaseNotes.html	Tue Jun  1 16:52:45 2004
@@ -245,6 +245,7 @@
 <li><a href="http://llvm.cs.uiuc.edu/PR337">[livevar] Live variables missed
 physical register use of aliased definition</a></li>
 <li><a href="http://llvm.cs.uiuc.edu/PR340">Verifier misses malformed switch instruction</a></li>
+<li><a href="http://llvm.cs.uiuc.edu/PR315">[jit] abort, don't warn, when missing external functions encountered</a></li>
 </ol>
 
 <p>Bugs in the C/C++ front-end:</p>
@@ -693,7 +694,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 20:02:56 $
+  Last modified: $Date: 2004/06/01 21:52:45 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Tue Jun  1 18:51:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 18:51:01 2004
Subject: [llvm-commits] CVS: llvm/include/Config/unistd.h
Message-ID: <200406012347.SAA18456@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config:

unistd.h updated: 1.3 -> 1.4

---
Log message:

On win32, process.h provides some of the traditional stuff that unistd 
provides.  This seems like a relatively clean way to get it.


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

Index: llvm/include/Config/unistd.h
diff -u llvm/include/Config/unistd.h:1.3 llvm/include/Config/unistd.h:1.4
--- llvm/include/Config/unistd.h:1.3	Mon Oct 20 15:11:38 2003
+++ llvm/include/Config/unistd.h	Tue Jun  1 18:47:00 2004
@@ -20,4 +20,8 @@
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
+#include <process.h>
+#endif
+
 #endif




From lattner at cs.uiuc.edu  Tue Jun  1 18:52:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 18:52:01 2004
Subject: [llvm-commits] CVS: llvm/tools/llvm-stub/
Message-ID: <200406012348.SAA18826@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llvm-stub:


---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm/tools/llvm-stub added to the repository


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



From lattner at cs.uiuc.edu  Tue Jun  1 18:53:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 18:53:01 2004
Subject: [llvm-commits] CVS: llvm/tools/llvm-stub/Makefile llvm-stub.c
Message-ID: <200406012348.SAA18837@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llvm-stub:

Makefile added (r1.1)
llvm-stub.c added (r1.1)

---
Log message:

Initial checkin of a stub executable that can be used by gccld to forward to
bytecode files on systems that don't support #!/bin/sh natively (ie, win32).


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

Index: llvm/tools/llvm-stub/Makefile
diff -c /dev/null llvm/tools/llvm-stub/Makefile:1.1
*** /dev/null	Tue Jun  1 18:48:55 2004
--- llvm/tools/llvm-stub/Makefile	Tue Jun  1 18:48:45 2004
***************
*** 0 ****
--- 1,13 ----
+ ##===- tools/llvm-stub/Makefile ----------------------------*- Makefile -*-===##
+ # 
+ #                     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.
+ # 
+ ##===----------------------------------------------------------------------===##
+ 
+ LEVEL = ../..
+ TOOLNAME = llvm-stub
+ include $(LEVEL)/Makefile.common
+ 


Index: llvm/tools/llvm-stub/llvm-stub.c
diff -c /dev/null llvm/tools/llvm-stub/llvm-stub.c:1.1
*** /dev/null	Tue Jun  1 18:48:55 2004
--- llvm/tools/llvm-stub/llvm-stub.c	Tue Jun  1 18:48:45 2004
***************
*** 0 ****
--- 1,51 ----
+ /*===- llvm-stub.c - Stub executable to run llvm bytecode files -----------===//
+ // 
+ //                     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 tool is used by the gccld program to enable transparent execution of
+ // bytecode files by the user.  Specifically, gccld outputs two files when asked
+ // to compile a <program> file:
+ //    1. It outputs the LLVM bytecode file to <program>.bc
+ //    2. It outputs a stub executable that runs lli on <program>.bc
+ //
+ // This allows the end user to just say ./<program> and have the JIT executed
+ // automatically.  On unix, the stub executable emitted is actually a bourne
+ // shell script that does the forwarding.  Windows doesn't not like #!/bin/sh
+ // programs in .exe files, so we make it an actual program, defined here.
+ //
+ //===----------------------------------------------------------------------===*/
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "Config/unistd.h"  /* provides definition of execve */
+ 
+ int main(int argc, char** argv) {
+   const char *Interp = getenv("LLVMINTERP");
+   const char **Args;
+   if (Interp == 0) Interp = "lli";
+ 
+   /* Set up the command line options to pass to the JIT. */
+   Args = (const char**)malloc(sizeof(char*) * (argc+2));
+   /* argv[0] is the JIT */
+   Args[0] = Interp;
+   /* argv[1] is argv[0] + ".bc". */
+   Args[1] = strcat(strcpy((char*)malloc(strlen(argv[0])+4), argv[0]), ".bc");
+ 
+   /* The rest of the args are as before. */
+   memcpy(Args+2, argv+1, sizeof(char*)*argc);
+ 
+   /* Run the JIT. */
+   execvp(Interp, (char *const*)Args);
+ 
+   /* if _execv returns, the JIT could not be started. */
+   fprintf(stderr, "Could not execute the LLVM JIT.  Either add 'lli' to your"
+           " path, or set the\ninterpreter you want to use in the LLVMINTERP "
+           "environment variable.\n");
+   return 1;
+ }




From lattner at cs.uiuc.edu  Tue Jun  1 18:54:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 18:54:01 2004
Subject: [llvm-commits] CVS: llvm/tools/Makefile
Message-ID: <200406012350.SAA18852@zion.cs.uiuc.edu>


Changes in directory llvm/tools:

Makefile updated: 1.27 -> 1.28

---
Log message:

Build the llvm-stub directory


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

Index: llvm/tools/Makefile
diff -u llvm/tools/Makefile:1.27 llvm/tools/Makefile:1.28
--- llvm/tools/Makefile:1.27	Sun Jan  4 23:28:15 2004
+++ llvm/tools/Makefile	Tue Jun  1 18:49:55 2004
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld \
+PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
                  analyze extract bugpoint llvm-nm llvm-prof llvm-db llvm-ar
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Tue Jun  1 19:09:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:09:03 2004
Subject: [llvm-commits] CVS: llvm/tools/llvm-stub/llvm-stub.c
Message-ID: <200406020005.TAA18989@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llvm-stub:

llvm-stub.c updated: 1.1 -> 1.2

---
Log message:

No really cygwin, we LIKE .exe'ness.


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

Index: llvm/tools/llvm-stub/llvm-stub.c
diff -u llvm/tools/llvm-stub/llvm-stub.c:1.1 llvm/tools/llvm-stub/llvm-stub.c:1.2
--- llvm/tools/llvm-stub/llvm-stub.c:1.1	Tue Jun  1 18:48:45 2004
+++ llvm/tools/llvm-stub/llvm-stub.c	Tue Jun  1 19:04:54 2004
@@ -34,6 +34,14 @@
   Args = (const char**)malloc(sizeof(char*) * (argc+2));
   /* argv[0] is the JIT */
   Args[0] = Interp;
+
+#ifdef __CYGWIN32__
+  /* Cygwin strips the .exe suffix off of argv[0] to "help" us.  Put it back 
+   * on.
+   */
+  argv[0] = strcat(strcpy((char*)malloc(strlen(argv[0])+5), argv[0]), ".exe");
+#endif
+
   /* argv[1] is argv[0] + ".bc". */
   Args[1] = strcat(strcpy((char*)malloc(strlen(argv[0])+4), argv[0]), ".bc");
 




From brukman at cs.uiuc.edu  Tue Jun  1 19:14:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 19:14:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Support/SystemUtils.cpp
Message-ID: <200406020009.TAA19035@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

SystemUtils.cpp updated: 1.27 -> 1.28

---
Log message:

Fix spelling, trim empty space, tighten up function header comment.


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

Index: llvm/lib/Support/SystemUtils.cpp
diff -u llvm/lib/Support/SystemUtils.cpp:1.27 llvm/lib/Support/SystemUtils.cpp:1.28
--- llvm/lib/Support/SystemUtils.cpp:1.27	Thu May 27 20:20:58 2004
+++ llvm/lib/Support/SystemUtils.cpp	Tue Jun  1 19:09:46 2004
@@ -191,13 +191,8 @@
 }
 
 
-//
-// Function: ExecWait ()
-//
-// Description:
-//  This function executes a program with the specified arguments and
-//  environment.  It then waits for the progarm to termiante and then returns
-//  to the caller.
+// ExecWait - executes a program with the specified arguments and environment.
+// It then waits for the progarm to termiante and then returns to the caller.
 //
 // Inputs:
 //  argv - The arguments to the program as an array of C strings.  The first
@@ -230,10 +225,8 @@
 int llvm::ExecWait(const char * const old_argv[],
                    const char * const old_envp[]) {
 #ifdef HAVE_SYS_WAIT_H
-  //
   // Create local versions of the parameters that can be passed into execve()
   // without creating const problems.
-  //
   char ** const argv = (char ** const) old_argv;
   char ** const envp = (char ** const) old_envp;
 
@@ -256,7 +249,7 @@
       break;
   }
 
-  // Parent process: Wait for the child process to termiante.
+  // Parent process: Wait for the child process to terminate.
   int status;
   if ((wait (&status)) == -1)
     return 1;




From lattner at cs.uiuc.edu  Tue Jun  1 19:15:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:15:01 2004
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200406020010.TAA19089@zion.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.72 -> 1.73

---
Log message:

Refactor a bit of code into a function, no functionality changes.


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

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.72 llvm/tools/gccld/gccld.cpp:1.73
--- llvm/tools/gccld/gccld.cpp:1.72	Thu May 27 00:39:32 2004
+++ llvm/tools/gccld/gccld.cpp	Tue Jun  1 19:10:19 2004
@@ -194,7 +194,41 @@
   return;
 }
 
-} // End llvm namespace
+} // end LLVM namespace
+
+/// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM
+/// bytecode file for the program.
+static void EmitShellScript(char **argv) {
+  // Output the script to start the program...
+  std::ofstream Out2(OutputFilename.c_str());
+  if (!Out2.good())
+    exit(PrintAndReturn(argv[0], "error opening '" + OutputFilename +
+                                 "' for writing!"));
+
+  Out2 << "#!/bin/sh\n";
+  // Allow user to setenv LLVMINTERP if lli is not in their PATH.
+  Out2 << "lli=${LLVMINTERP-lli}\n";
+  Out2 << "exec $lli \\\n";
+  // gcc accepts -l<lib> and implicitly searches /lib and /usr/lib.
+  LibPaths.push_back("/lib");
+  LibPaths.push_back("/usr/lib");
+  LibPaths.push_back("/usr/X11R6/lib");
+  // We don't need to link in libc! In fact, /usr/lib/libc.so may not be a
+  // shared object at all! See RH 8: plain text.
+  std::vector<std::string>::iterator libc = 
+    std::find(Libraries.begin(), Libraries.end(), "c");
+  if (libc != Libraries.end()) Libraries.erase(libc);
+  // List all the shared object (native) libraries this executable will need
+  // on the command line, so that we don't have to do this manually!
+  for (std::vector<std::string>::iterator i = Libraries.begin(), 
+         e = Libraries.end(); i != e; ++i) {
+    std::string FullLibraryPath = FindLib(*i, LibPaths, true);
+    if (!FullLibraryPath.empty() && IsSharedObject(FullLibraryPath))
+      Out2 << "    -load=" << FullLibraryPath << " \\\n";
+  }
+  Out2 << "    $0.bc ${1+\"$@\"}\n";
+  Out2.close();
+}
 
 int main(int argc, char **argv, char **envp) {
   cl::ParseCommandLineOptions(argc, argv, " llvm linker for GCC\n");
@@ -304,34 +338,7 @@
       removeFile(CFile);
 
     } else {
-      // Output the script to start the program...
-      std::ofstream Out2(OutputFilename.c_str());
-      if (!Out2.good())
-        return PrintAndReturn(argv[0], "error opening '" + OutputFilename +
-                                       "' for writing!");
-      Out2 << "#!/bin/sh\n";
-      // Allow user to setenv LLVMINTERP if lli is not in their PATH.
-      Out2 << "lli=${LLVMINTERP-lli}\n";
-      Out2 << "exec $lli \\\n";
-      // gcc accepts -l<lib> and implicitly searches /lib and /usr/lib.
-      LibPaths.push_back("/lib");
-      LibPaths.push_back("/usr/lib");
-      LibPaths.push_back("/usr/X11R6/lib");
-      // We don't need to link in libc! In fact, /usr/lib/libc.so may not be a
-      // shared object at all! See RH 8: plain text.
-      std::vector<std::string>::iterator libc = 
-        std::find(Libraries.begin(), Libraries.end(), "c");
-      if (libc != Libraries.end()) Libraries.erase(libc);
-      // List all the shared object (native) libraries this executable will need
-      // on the command line, so that we don't have to do this manually!
-      for (std::vector<std::string>::iterator i = Libraries.begin(), 
-             e = Libraries.end(); i != e; ++i) {
-        std::string FullLibraryPath = FindLib(*i, LibPaths, true);
-        if (!FullLibraryPath.empty() && IsSharedObject(FullLibraryPath))
-          Out2 << "    -load=" << FullLibraryPath << " \\\n";
-      }
-      Out2 << "    $0.bc ${1+\"$@\"}\n";
-      Out2.close();
+      EmitShellScript(argv);
     }
   
     // Make the script executable...




From lattner at cs.uiuc.edu  Tue Jun  1 19:27:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:27:01 2004
Subject: [llvm-commits] CVS: llvm/tools/gccld/GenerateCode.cpp Linker.cpp gccld.cpp gccld.h
Message-ID: <200406020022.TAA19196@zion.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.27 -> 1.28
Linker.cpp updated: 1.25 -> 1.26
gccld.cpp updated: 1.73 -> 1.74
gccld.h updated: 1.8 -> 1.9

---
Log message:

Move some functions out of gccld.cpp to GenerateCode.cpp.  This allows us
to reduce the inter-file interface in the gccld tool and gets some 
uninteresting code out of gccld.cpp.



---
Diffs of the changes:  (+86 -110)

Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.27 llvm/tools/gccld/GenerateCode.cpp:1.28
--- llvm/tools/gccld/GenerateCode.cpp:1.27	Mon Apr 12 00:38:15 2004
+++ llvm/tools/gccld/GenerateCode.cpp	Tue Jun  1 19:22:24 2004
@@ -39,6 +39,84 @@
                        cl::desc("Do not run any optimization passes"));
 }
 
+/// CopyEnv - This function takes an array of environment variables and makes a
+/// copy of it.  This copy can then be manipulated any way the caller likes
+/// without affecting the process's real environment.
+///
+/// Inputs:
+///  envp - An array of C strings containing an environment.
+///
+/// Return value:
+///  NULL - An error occurred.
+///
+///  Otherwise, a pointer to a new array of C strings is returned.  Every string
+///  in the array is a duplicate of the one in the original array (i.e. we do
+///  not copy the char *'s from one array to another).
+///
+static char ** CopyEnv(char ** const envp) {
+  // Count the number of entries in the old list;
+  unsigned entries;   // The number of entries in the old environment list
+  for (entries = 0; envp[entries] != NULL; entries++)
+    /*empty*/;
+
+  // Add one more entry for the NULL pointer that ends the list.
+  ++entries;
+
+  // If there are no entries at all, just return NULL.
+  if (entries == 0)
+    return NULL;
+
+  // Allocate a new environment list.
+  char **newenv = new char* [entries];
+  if ((newenv = new char* [entries]) == NULL)
+    return NULL;
+
+  // Make a copy of the list.  Don't forget the NULL that ends the list.
+  entries = 0;
+  while (envp[entries] != NULL) {
+    newenv[entries] = new char[strlen (envp[entries]) + 1];
+    strcpy (newenv[entries], envp[entries]);
+    ++entries;
+  }
+  newenv[entries] = NULL;
+
+  return newenv;
+}
+
+
+/// RemoveEnv - Remove the specified environment variable from the environment
+/// array.
+///
+/// Inputs:
+///  name - The name of the variable to remove.  It cannot be NULL.
+///  envp - The array of environment variables.  It cannot be NULL.
+///
+/// Notes:
+///  This is mainly done because functions to remove items from the environment
+///  are not available across all platforms.  In particular, Solaris does not
+///  seem to have an unsetenv() function or a setenv() function (or they are
+///  undocumented if they do exist).
+///
+static void RemoveEnv(const char * name, char ** const envp) {
+  for (unsigned index=0; envp[index] != NULL; index++) {
+    // Find the first equals sign in the array and make it an EOS character.
+    char *p = strchr (envp[index], '=');
+    if (p == NULL)
+      continue;
+    else
+      *p = '\0';
+
+    // Compare the two strings.  If they are equal, zap this string.
+    // Otherwise, restore it.
+    if (!strcmp(name, envp[index]))
+      *envp[index] = '\0';
+    else
+      *p = '=';
+  }
+
+  return;
+}
+
 static inline void addPass(PassManager &PM, Pass *P) {
   // Add the pass to the pass manager...
   PM.add(P);
@@ -270,3 +348,4 @@
   // Run the compiler to assembly and link together the program.
   return ExecWait(&(cmd[0]), clean_env);
 }
+


Index: llvm/tools/gccld/Linker.cpp
diff -u llvm/tools/gccld/Linker.cpp:1.25 llvm/tools/gccld/Linker.cpp:1.26
--- llvm/tools/gccld/Linker.cpp:1.25	Thu May 27 00:39:32 2004
+++ llvm/tools/gccld/Linker.cpp	Tue Jun  1 19:22:24 2004
@@ -332,8 +332,8 @@
         std::cerr << "Trying to link archive '" << Pathname << "'\n";
 
       if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) {
-        PrintAndReturn(progname, ErrorMessage,
-                       ": Error linking in archive '" + Pathname + "'");
+        std::cerr << progname << ": Error linking in archive '" << Pathname 
+                  << "': " << ErrorMessage << "\n";
         return true;
       }
     } else if (IsBytecode(Pathname)) {
@@ -341,8 +341,8 @@
         std::cerr << "Trying to link bytecode file '" << Pathname << "'\n";
 
       if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
-        PrintAndReturn(progname, ErrorMessage,
-                       ": Error linking in bytecode file '" + Pathname + "'");
+        std::cerr << progname << ": Error linking in bytecode file '"
+                  << Pathname << "': " << ErrorMessage << "\n";
         return true;
       }
     }


Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.73 llvm/tools/gccld/gccld.cpp:1.74
--- llvm/tools/gccld/gccld.cpp:1.73	Tue Jun  1 19:10:19 2004
+++ llvm/tools/gccld/gccld.cpp	Tue Jun  1 19:22:24 2004
@@ -93,108 +93,16 @@
   CO6("h", cl::Hidden, cl::desc("Compatibility option: ignored"));
 }
 
-namespace llvm {
-
-/// PrintAndReturn - Prints a message to standard error and returns a value
-/// usable for an exit status.
+/// PrintAndReturn - Prints a message to standard error and returns true.
 ///
 /// Inputs:
 ///  progname - The name of the program (i.e. argv[0]).
 ///  Message  - The message to print to standard error.
-///  Extra    - Extra information to print between the program name and thei
-///             message.  It is optional.
 ///
-/// Return value:
-///  Returns a value that can be used as the exit status (i.e. for exit()).
-///
-int
-PrintAndReturn(const char *progname,
-               const std::string &Message,
-               const std::string &Extra)
-{
-  std::cerr << progname << Extra << ": " << Message << "\n";
+static int PrintAndReturn(const char *progname, const std::string &Message) {
+  std::cerr << progname << ": " << Message << "\n";
   return 1;
 }
-
-/// CopyEnv - This function takes an array of environment variables and makes a
-/// copy of it.  This copy can then be manipulated any way the caller likes
-/// without affecting the process's real environment.
-///
-/// Inputs:
-///  envp - An array of C strings containing an environment.
-///
-/// Return value:
-///  NULL - An error occurred.
-///
-///  Otherwise, a pointer to a new array of C strings is returned.  Every string
-///  in the array is a duplicate of the one in the original array (i.e. we do
-///  not copy the char *'s from one array to another).
-///
-char ** CopyEnv(char ** const envp) {
-  // Count the number of entries in the old list;
-  unsigned entries;   // The number of entries in the old environment list
-  for (entries = 0; envp[entries] != NULL; entries++)
-    /*empty*/;
-
-  // Add one more entry for the NULL pointer that ends the list.
-  ++entries;
-
-  // If there are no entries at all, just return NULL.
-  if (entries == 0)
-    return NULL;
-
-  // Allocate a new environment list.
-  char **newenv = new char* [entries];
-  if ((newenv = new char* [entries]) == NULL)
-    return NULL;
-
-  // Make a copy of the list.  Don't forget the NULL that ends the list.
-  entries = 0;
-  while (envp[entries] != NULL) {
-    newenv[entries] = new char[strlen (envp[entries]) + 1];
-    strcpy (newenv[entries], envp[entries]);
-    ++entries;
-  }
-  newenv[entries] = NULL;
-
-  return newenv;
-}
-
-
-/// RemoveEnv - Remove the specified environment variable from the environment
-/// array.
-///
-/// Inputs:
-///  name - The name of the variable to remove.  It cannot be NULL.
-///  envp - The array of environment variables.  It cannot be NULL.
-///
-/// Notes:
-///  This is mainly done because functions to remove items from the environment
-///  are not available across all platforms.  In particular, Solaris does not
-///  seem to have an unsetenv() function or a setenv() function (or they are
-///  undocumented if they do exist).
-///
-void RemoveEnv(const char * name, char ** const envp) {
-  for (unsigned index=0; envp[index] != NULL; index++) {
-    // Find the first equals sign in the array and make it an EOS character.
-    char *p = strchr (envp[index], '=');
-    if (p == NULL)
-      continue;
-    else
-      *p = '\0';
-
-    // Compare the two strings.  If they are equal, zap this string.
-    // Otherwise, restore it.
-    if (!strcmp(name, envp[index]))
-      *envp[index] = '\0';
-    else
-      *p = '=';
-  }
-
-  return;
-}
-
-} // end LLVM namespace
 
 /// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM
 /// bytecode file for the program.


Index: llvm/tools/gccld/gccld.h
diff -u llvm/tools/gccld/gccld.h:1.8 llvm/tools/gccld/gccld.h:1.9
--- llvm/tools/gccld/gccld.h:1.8	Tue Apr  6 11:43:13 2004
+++ llvm/tools/gccld/gccld.h	Tue Jun  1 19:22:24 2004
@@ -19,22 +19,11 @@
 
 namespace llvm {
 
-int
-PrintAndReturn (const char *progname,
-                const std::string &Message,
-                const std::string &Extra = "");
-
 void
 GetAllDefinedSymbols (Module *M, std::set<std::string> &DefinedSymbols);
 
 void
 GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols);
-
-char **
-CopyEnv (char ** const envp);
-
-void
-RemoveEnv (const char * name, char ** const envp);
 
 int
 GenerateBytecode (Module * M,




From brukman at cs.uiuc.edu  Tue Jun  1 19:34:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Tue Jun  1 19:34:02 2004
Subject: [llvm-commits] CVS: llvm/tools/llvm-stub/llvm-stub.c
Message-ID: <200406020030.TAA19258@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llvm-stub:

llvm-stub.c updated: 1.2 -> 1.3

---
Log message:

Fix a double negation (in grammar).


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

Index: llvm/tools/llvm-stub/llvm-stub.c
diff -u llvm/tools/llvm-stub/llvm-stub.c:1.2 llvm/tools/llvm-stub/llvm-stub.c:1.3
--- llvm/tools/llvm-stub/llvm-stub.c:1.2	Tue Jun  1 19:04:54 2004
+++ llvm/tools/llvm-stub/llvm-stub.c	Tue Jun  1 19:29:52 2004
@@ -15,7 +15,7 @@
 //
 // This allows the end user to just say ./<program> and have the JIT executed
 // automatically.  On unix, the stub executable emitted is actually a bourne
-// shell script that does the forwarding.  Windows doesn't not like #!/bin/sh
+// shell script that does the forwarding.  Windows does not like #!/bin/sh
 // programs in .exe files, so we make it an actual program, defined here.
 //
 //===----------------------------------------------------------------------===*/




From lattner at cs.uiuc.edu  Tue Jun  1 19:56:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:56:01 2004
Subject: [llvm-commits] CVS: llvm/include/Support/FileUtilities.h
Message-ID: <200406020051.TAA26188@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

FileUtilities.h updated: 1.17 -> 1.18

---
Log message:

Add a new CopyFile function


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

Index: llvm/include/Support/FileUtilities.h
diff -u llvm/include/Support/FileUtilities.h:1.17 llvm/include/Support/FileUtilities.h:1.18
--- llvm/include/Support/FileUtilities.h:1.17	Thu May 27 19:23:11 2004
+++ llvm/include/Support/FileUtilities.h	Tue Jun  1 19:51:20 2004
@@ -53,6 +53,10 @@
 bool DiffFiles(const std::string &FileA, const std::string &FileB,
                std::string *Error = 0);
 
+/// CopyFile - Copy the specified source file to the specified destination,
+/// overwriting destination if it exists.  This returns true on failure.
+///
+bool CopyFile(const std::string &Dest, const std::string &Src);
 
 /// MoveFileOverIfUpdated - If the file specified by New is different than Old,
 /// or if Old does not exist, move the New file over the Old file.  Otherwise,
@@ -60,7 +64,7 @@
 ///
 void MoveFileOverIfUpdated(const std::string &New, const std::string &Old);
  
-/// removeFile - Delete the specified file
+/// removeFile - Delete the specified file.
 ///
 void removeFile(const std::string &Filename);
 




From lattner at cs.uiuc.edu  Tue Jun  1 19:57:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:57:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp
Message-ID: <200406020052.TAA26264@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

FileUtilities.cpp updated: 1.21 -> 1.22

---
Log message:

Implement the new CopyFile function


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

Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.21 llvm/lib/Support/FileUtilities.cpp:1.22
--- llvm/lib/Support/FileUtilities.cpp:1.21	Thu May 27 19:34:42 2004
+++ llvm/lib/Support/FileUtilities.cpp	Tue Jun  1 19:52:22 2004
@@ -109,6 +109,41 @@
 }
 
 
+/// CopyFile - Copy the specified source file to the specified destination,
+/// overwriting destination if it exists.  This returns true on failure.
+///
+bool llvm::CopyFile(const std::string &Dest, const std::string &Src) {
+  FDHandle InFD(open(Src.c_str(), O_RDONLY));
+  if (InFD == -1) return true;
+
+  FileRemover FR(Dest);
+
+  FDHandle OutFD(open(Dest.c_str(), O_WRONLY|O_CREAT, 0666));
+  if (OutFD == -1) return true;
+
+  char Buffer[16*1024];
+  while (ssize_t Amt = read(InFD, Buffer, 16*1024)) {
+    if (Amt == -1) {
+      if (errno != EINTR) return true;  // Error reading the file.
+    } else {
+      char *BufPtr = Buffer;
+      while (Amt) {
+        ssize_t AmtWritten = write(OutFD, BufPtr, Amt);
+        if (AmtWritten == -1) {
+          if (errno != EINTR) return true;  // Error writing the file.
+        } else {
+          Amt -= AmtWritten;
+          BufPtr += AmtWritten;
+        }
+      }
+    }
+  }
+
+  FR.releaseFile();  // Success!
+  return false;
+}
+
+
 /// MoveFileOverIfUpdated - If the file specified by New is different than Old,
 /// or if Old does not exist, move the New file over the Old file.  Otherwise,
 /// remove the New file.




From lattner at cs.uiuc.edu  Tue Jun  1 19:58:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 19:58:01 2004
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200406020054.TAA26322@zion.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.74 -> 1.75

---
Log message:

Make gccld copy the llvm-stub program to be the execution wrapper for 
bytecode files on win32 systems.  We keep the shell script on unix systems
because it is much more transparent for the users and supports -load 
options.

This allows llvmgcc work correctly on win32 systems without the -native or
-native-cbe options.



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

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.74 llvm/tools/gccld/gccld.cpp:1.75
--- llvm/tools/gccld/gccld.cpp:1.74	Tue Jun  1 19:22:24 2004
+++ llvm/tools/gccld/gccld.cpp	Tue Jun  1 19:53:57 2004
@@ -35,7 +35,6 @@
 #include "Support/SystemUtils.h"
 #include <fstream>
 #include <memory>
-
 using namespace llvm;
 
 namespace {
@@ -107,6 +106,22 @@
 /// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM
 /// bytecode file for the program.
 static void EmitShellScript(char **argv) {
+#if defined(_WIN32) || defined(__CYGWIN__)
+  // Windows doesn't support #!/bin/sh style shell scripts in .exe files.  To
+  // support windows systems, we copy the llvm-stub.exe executable from the
+  // build tree to the destination file.
+  std::string llvmstub = FindExecutable("llvm-stub.exe", argv[0]);
+  if (llvmstub.empty()) {
+    std::cerr << "Could not find llvm-stub.exe executable!\n";
+    exit(1);
+  }
+  if (CopyFile(OutputFilename, llvmstub)) {
+    std::cerr << "Could not copy the llvm-stub.exe executable!\n";
+    exit(1);
+  }
+  return;
+#endif
+
   // Output the script to start the program...
   std::ofstream Out2(OutputFilename.c_str());
   if (!Out2.good())




From lattner at cs.uiuc.edu  Tue Jun  1 23:02:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 23:02:01 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp
Message-ID: <200406020357.WAA10494@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGBuilder.cpp updated: 1.4 -> 1.5

---
Log message:

Fix a trivial but blatant bug


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

Index: llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.4 llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.5
--- llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.4	Tue Nov 11 16:41:33 2003
+++ llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp	Tue Jun  1 22:57:43 2004
@@ -253,10 +253,10 @@
 
   switch (TM.getTargetData().getPointerSize()) {
   default: assert(0 && "Unknown pointer size!"); abort();
-  case 8:  PointerType = MVT::i8; break;
-  case 16: PointerType = MVT::i16; break;
-  case 32: PointerType = MVT::i32; break;
-  case 64: PointerType = MVT::i64; break;
+  case 1: PointerType = MVT::i8;  break;
+  case 2: PointerType = MVT::i16; break;
+  case 3: PointerType = MVT::i32; break;
+  case 4: PointerType = MVT::i64; break;
   }
 
   // Create all of the machine basic blocks for the function... building the




From lattner at cs.uiuc.edu  Tue Jun  1 23:17:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 23:17:01 2004
Subject: [llvm-commits] CVS: llvm-www/RandomBoxes/index.html 007-Bugpoint.html
Message-ID: <200406020412.XAA11183@zion.cs.uiuc.edu>


Changes in directory llvm-www/RandomBoxes:

index.html added (r1.1)
007-Bugpoint.html updated: 1.3 -> 1.4

---
Log message:

Shrink the bug


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

Index: llvm-www/RandomBoxes/index.html
diff -c /dev/null llvm-www/RandomBoxes/index.html:1.1
*** /dev/null	Tue Jun  1 23:12:27 2004
--- llvm-www/RandomBoxes/index.html	Tue Jun  1 23:12:17 2004
***************
*** 0 ****
--- 1 ----
+ <a href="..">go away</a>.


Index: llvm-www/RandomBoxes/007-Bugpoint.html
diff -u llvm-www/RandomBoxes/007-Bugpoint.html:1.3 llvm-www/RandomBoxes/007-Bugpoint.html:1.4
--- llvm-www/RandomBoxes/007-Bugpoint.html:1.3	Tue Jun  1 14:19:04 2004
+++ llvm-www/RandomBoxes/007-Bugpoint.html	Tue Jun  1 23:12:17 2004
@@ -1,3 +1,3 @@
-<img align="right" src="img/logo-bugpoint.gif" width=176 height=154">
+<img align="right" src="img/logo-bugpoint.gif" width=120 height=119">
 <a href="docs/CommandGuide/bugpoint.html">Bugpoint</a> is an automated testcase reduction tool that is extremely useful for debugging problems in LLVM optimizers and code generators.  It can usually reduce an optimizer crash down to the few instructions needed to reproduce the problem or a miscompilation down to the specific loop nest or basic block in the program that is being miscompiled.
 




From lattner at cs.uiuc.edu  Tue Jun  1 23:17:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 23:17:07 2004
Subject: [llvm-commits] CVS: llvm-www/img/logo-bugpoint.gif
Message-ID: <200406020412.XAA11829@zion.cs.uiuc.edu>


Changes in directory llvm-www/img:

logo-bugpoint.gif updated: 1.1 -> 1.2

---
Log message:

Shrink and clean up the bug logo


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

Index: llvm-www/img/logo-bugpoint.gif




From lattner at cs.uiuc.edu  Tue Jun  1 23:32:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Jun  1 23:32:01 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp SelectionDAG.cpp
Message-ID: <200406020428.XAA12228@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGBuilder.cpp updated: 1.5 -> 1.6
SelectionDAG.cpp updated: 1.4 -> 1.5

---
Log message:

Finegrainify namespacification


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

Index: llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.5 llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.6
--- llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp:1.5	Tue Jun  1 22:57:43 2004
+++ llvm/lib/CodeGen/SelectionDAG/DAGBuilder.cpp	Tue Jun  1 23:28:06 2004
@@ -20,9 +20,9 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/InstVisitor.h"
+using namespace llvm;
 
 namespace llvm {
-
 struct SelectionDAGBuilder : public InstVisitor<SelectionDAGBuilder> {
   // DAG - the current dag we are building.
   SelectionDAG &DAG;
@@ -72,6 +72,7 @@
   
   SelectionDAGNode *addSeqNode(SelectionDAGNode *N);
 };
+}  // end llvm namespace
 
 /// addSeqNode - The same as addNode, but the node is also included in the
 /// sequence nodes for this block.  This method should be called for any
@@ -273,4 +274,3 @@
   Root = SDB.CurRoot;
 }
 
-} // End llvm namespace


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.4 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.5
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.4	Tue Nov 11 16:41:33 2003
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Tue Jun  1 23:28:06 2004
@@ -14,8 +14,7 @@
 
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/Type.h"
-
-namespace llvm {
+using namespace llvm;
 
 SelectionDAG::~SelectionDAG() {
   for (unsigned i = 0, e = AllNodes.size(); i != e; ++i)
@@ -128,5 +127,3 @@
 
   std::cerr << "\n";
 }
-
-} // End llvm namespace




From lattner at cs.uiuc.edu  Wed Jun  2 00:58:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 00:58:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200406020553.AAA31691@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.44 -> 1.45

---
Log message:

Delete the V9 specific findOptimalStorageSize method, inlining it into all callers.
Substantially clean up all target implementations by having the OPTIONAL get*Info
methods return a pointer instead of a reference.  This allows us to have default
implementations!


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

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.44 llvm/include/llvm/Target/TargetMachine.h:1.45
--- llvm/include/llvm/Target/TargetMachine.h:1.44	Tue Mar  2 20:12:27 2004
+++ llvm/include/llvm/Target/TargetMachine.h	Wed Jun  2 00:53:25 2004
@@ -71,15 +71,10 @@
   // Interfaces to the major aspects of target machine information:
   // -- Instruction opcode and operand information
   // -- Pipelines and scheduling information
-  // -- Register information
   // -- Stack frame information
-  // -- Cache hierarchy information
-  // -- Machine-level optimization information (peephole only)
   // 
-  virtual const TargetInstrInfo&        getInstrInfo() const = 0;
-  virtual const TargetSchedInfo&        getSchedInfo() const = 0;
-  virtual const TargetRegInfo&          getRegInfo()   const = 0;
-  virtual const TargetFrameInfo&        getFrameInfo() const = 0;
+  virtual const TargetInstrInfo        *getInstrInfo() const { return 0; }
+  virtual const TargetFrameInfo        *getFrameInfo() const { return 0; }
   const TargetData &getTargetData() const { return DataLayout; }
 
   /// getRegisterInfo - If register information is available, return it.  If
@@ -93,11 +88,10 @@
   ///
   virtual TargetJITInfo *getJITInfo() { return 0; }
 
-  // Data storage information.  FIXME, this should be moved out to sparc
-  // specific code.
-  // 
-  virtual unsigned findOptimalStorageSize(const Type* ty) const;
-  
+  // These are deprecated interfaces.
+  virtual const TargetSchedInfo        *getSchedInfo() const { return 0; }
+  virtual const TargetRegInfo          *getRegInfo()   const { return 0; }
+
   /// addPassesToEmitAssembly - Add passes to the specified pass manager to get
   /// assembly langage code emitted.  Typically this will involve several steps
   /// of code generation.  This method should return true if assembly emission




From lattner at cs.uiuc.edu  Wed Jun  2 00:58:12 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 00:58:12 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CTargetMachine.h
Message-ID: <200406020554.AAA31706@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/CBackend:

CTargetMachine.h updated: 1.3 -> 1.4

---
Log message:

Stubs are no longer needed


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

Index: llvm/lib/Target/CBackend/CTargetMachine.h
diff -u llvm/lib/Target/CBackend/CTargetMachine.h:1.3 llvm/lib/Target/CBackend/CTargetMachine.h:1.4
--- llvm/lib/Target/CBackend/CTargetMachine.h:1.3	Tue Mar  2 20:14:15 2004
+++ llvm/lib/Target/CBackend/CTargetMachine.h	Wed Jun  2 00:53:52 2004
@@ -23,11 +23,6 @@
   CTargetMachine(const Module &M, IntrinsicLowering *IL) :
     TargetMachine("CBackend", IL, M) {}
 
-  virtual const TargetInstrInfo &getInstrInfo() const { abort(); }
-  virtual const TargetFrameInfo &getFrameInfo() const { abort(); }
-  virtual const TargetSchedInfo &getSchedInfo() const { abort(); }
-  virtual const TargetRegInfo   &getRegInfo()   const { abort(); }
-
   // This is the only thing that actually does anything here.
   virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
 };




From lattner at cs.uiuc.edu  Wed Jun  2 00:59:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 00:59:04 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PowerPCTargetMachine.h
Message-ID: <200406020554.AAA31716@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/PowerPC:

PowerPCTargetMachine.h updated: 1.4 -> 1.5

---
Log message:

Convert to the new TM interface


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

Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.4 llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.5
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.4	Mon Mar  1 00:43:28 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.h	Wed Jun  2 00:54:06 2004
@@ -31,8 +31,8 @@
 public:
   PowerPCTargetMachine(const Module &M, IntrinsicLowering *IL);
 
-  virtual const PowerPCInstrInfo     &getInstrInfo() const { return InstrInfo; }
-  virtual const TargetFrameInfo  &getFrameInfo() const { return FrameInfo; }
+  virtual const PowerPCInstrInfo *getInstrInfo() const { return &InstrInfo; }
+  virtual const TargetFrameInfo  *getFrameInfo() const { return &FrameInfo; }
   virtual const MRegisterInfo *getRegisterInfo() const {
     return &InstrInfo.getRegisterInfo();
   }
@@ -40,9 +40,6 @@
     return &JITInfo;
   }
 
-  virtual const TargetSchedInfo &getSchedInfo()  const { abort(); }
-  virtual const TargetRegInfo   &getRegInfo()    const { abort(); }
-
   /// addPassesToEmitMachineCode - Add passes to the specified pass manager to
   /// get machine code emitted.  This uses a MachineCodeEmitter object to handle
   /// actually outputting the machine code and resolving things like the address




From lattner at cs.uiuc.edu  Wed Jun  2 01:00:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:00:06 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp SparcV9CodeEmitter.cpp SparcV9FrameInfo.h SparcV9InstrInfo.cpp SparcV9InstrSelection.cpp SparcV9PeepholeOpts.cpp SparcV9PreSelection.cpp SparcV9PrologEpilogInserter.cpp SparcV9RegInfo.cpp SparcV9TargetMachine.h
Message-ID: <200406020555.AAA01230@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

SparcV9AsmPrinter.cpp updated: 1.113 -> 1.114
SparcV9CodeEmitter.cpp updated: 1.62 -> 1.63
SparcV9FrameInfo.h updated: 1.4 -> 1.5
SparcV9InstrInfo.cpp updated: 1.64 -> 1.65
SparcV9InstrSelection.cpp updated: 1.141 -> 1.142
SparcV9PeepholeOpts.cpp updated: 1.23 -> 1.24
SparcV9PreSelection.cpp updated: 1.33 -> 1.34
SparcV9PrologEpilogInserter.cpp updated: 1.38 -> 1.39
SparcV9RegInfo.cpp updated: 1.126 -> 1.127
SparcV9TargetMachine.h updated: 1.8 -> 1.9

---
Log message:

Convert to the new TargetMachine interface.


---
Diffs of the changes:  (+115 -106)

Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.113 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.114
--- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.113	Tue May 25 03:50:52 2004
+++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp	Wed Jun  2 00:54:42 2004
@@ -74,6 +74,15 @@
             arrayType->getElementType() == Type::SByteTy);
   }
 
+  unsigned findOptimalStorageSize(const TargetMachine &TM, const Type *Ty) {
+    // All integer types smaller than ints promote to 4 byte integers.
+    if (Ty->isIntegral() && Ty->getPrimitiveSize() < 4)
+      return 4;
+
+    return TM.getTargetData().getTypeSize(Ty);
+  }
+
+
   inline const std::string
   TypeToDataDirective(const Type* type) {
     switch(type->getPrimitiveID())
@@ -111,7 +120,7 @@
         return 1 + CVA->getNumOperands();
     }
   
-    return target.findOptimalStorageSize(CV->getType());
+    return findOptimalStorageSize(target, CV->getType());
   }
 
   /// Align data larger than one L1 cache line on L1 cache line boundaries.
@@ -132,7 +141,7 @@
   /// 
   inline unsigned int
   TypeToAlignment(const Type* type, const TargetMachine& target) {
-    return SizeToAlignment(target.findOptimalStorageSize(type), target);
+    return SizeToAlignment(findOptimalStorageSize(target, type), target);
   }
 
   /// Get the size of the constant and then use SizeToAlignment.
@@ -580,9 +589,9 @@
 inline bool
 SparcV9AsmPrinter::OpIsMemoryAddressBase(const MachineInstr *MI,
                                        unsigned int opNum) {
-  if (Target.getInstrInfo().isLoad(MI->getOpcode()))
+  if (Target.getInstrInfo()->isLoad(MI->getOpcode()))
     return (opNum == 0);
-  else if (Target.getInstrInfo().isStore(MI->getOpcode()))
+  else if (Target.getInstrInfo()->isStore(MI->getOpcode()))
     return (opNum == 1);
   else
     return false;
@@ -639,11 +648,11 @@
       {
         int regNum = (int)mop.getReg();
         
-        if (regNum == Target.getRegInfo().getInvalidRegNum()) {
+        if (regNum == Target.getRegInfo()->getInvalidRegNum()) {
           // better to print code with NULL registers than to die
           toAsm << "<NULL VALUE>";
         } else {
-          toAsm << "%" << Target.getRegInfo().getUnifiedRegName(regNum);
+          toAsm << "%" << Target.getRegInfo()->getUnifiedRegName(regNum);
         }
         break;
       }
@@ -693,10 +702,10 @@
 void SparcV9AsmPrinter::emitMachineInst(const MachineInstr *MI) {
   unsigned Opcode = MI->getOpcode();
 
-  if (Target.getInstrInfo().isDummyPhiInstr(Opcode))
+  if (Target.getInstrInfo()->isDummyPhiInstr(Opcode))
     return;  // IGNORE PHI NODES
 
-  toAsm << "\t" << Target.getInstrInfo().getName(Opcode) << "\t";
+  toAsm << "\t" << Target.getInstrInfo()->getName(Opcode) << "\t";
 
   unsigned Mask = getOperandMask(Opcode);
   
@@ -770,7 +779,7 @@
                                                 Target) << "\n";
     toAsm << "\t.type\t" << getID(GV) << ",#object\n";
     toAsm << "\t.reserve\t" << getID(GV) << ","
-          << Target.findOptimalStorageSize(GV->getType()->getElementType())
+          << findOptimalStorageSize(Target, GV->getType()->getElementType())
           << "\n";
   }
 }


Index: llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.62 llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.63
--- llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.62	Thu May 20 02:43:40 2004
+++ llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp	Wed Jun  2 00:54:42 2004
@@ -474,7 +474,7 @@
 unsigned 
 SparcV9CodeEmitter::getRealRegNum(unsigned fakeReg,
                                   MachineInstr &MI) {
-  const TargetRegInfo &RI = TM.getRegInfo();
+  const TargetRegInfo &RI = *TM.getRegInfo();
   unsigned regClass, regType = RI.getRegType(fakeReg);
   // At least map fakeReg into its class
   fakeReg = RI.getClassRegNum(fakeReg, regClass);
@@ -656,7 +656,7 @@
     unsigned realRegByClass = getRealRegNum(fakeReg, MI);
     DEBUG(std::cerr << MO << ": Reg[" << std::dec << fakeReg << "] => "
                     << realRegByClass << " (LLC: " 
-                    << TM.getRegInfo().getUnifiedRegName(fakeReg) << ")\n");
+                    << TM.getRegInfo()->getUnifiedRegName(fakeReg) << ")\n");
     rv = realRegByClass;
   } else if (MO.isImmediate()) {
     rv = MO.getImmedValue();


Index: llvm/lib/Target/SparcV9/SparcV9FrameInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9FrameInfo.h:1.4 llvm/lib/Target/SparcV9/SparcV9FrameInfo.h:1.5
--- llvm/lib/Target/SparcV9/SparcV9FrameInfo.h:1.4	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9FrameInfo.h	Wed Jun  2 00:54:42 2004
@@ -72,22 +72,22 @@
   // (generally FP or SP)
   // 
   virtual int getIncomingArgBaseRegNum() const {
-    return (int) target.getRegInfo().getFramePointer();
+    return (int) target.getRegInfo()->getFramePointer();
   }
   virtual int getOutgoingArgBaseRegNum() const {
-    return (int) target.getRegInfo().getStackPointer();
+    return (int) target.getRegInfo()->getStackPointer();
   }
   virtual int getOptionalOutgoingArgBaseRegNum() const {
-    return (int) target.getRegInfo().getStackPointer();
+    return (int) target.getRegInfo()->getStackPointer();
   }
   virtual int getAutomaticVarBaseRegNum() const {
-    return (int) target.getRegInfo().getFramePointer();
+    return (int) target.getRegInfo()->getFramePointer();
   }
   virtual int getRegSpillAreaBaseRegNum() const {
-    return (int) target.getRegInfo().getFramePointer();
+    return (int) target.getRegInfo()->getFramePointer();
   }
   virtual int getDynamicAreaBaseRegNum() const {
-    return (int) target.getRegInfo().getStackPointer();
+    return (int) target.getRegInfo()->getStackPointer();
   }
 
   virtual int getIncomingArgOffset(MachineFunction& mcInfo, 


Index: llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.64 llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.65
--- llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.64	Sun May 30 02:34:01 2004
+++ llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp	Wed Jun  2 00:54:42 2004
@@ -174,8 +174,7 @@
     } else {
       // unsigned or small signed value that fits in simm13 field of OR
       assert(smallNegValue || (C & ~MAXSIMM) == 0);
-      miOR = BuildMI(V9::ORi, 3).addMReg(target.getRegInfo()
-                                        .getZeroRegNum())
+      miOR = BuildMI(V9::ORi, 3).addMReg(target.getRegInfo()->getZeroRegNum())
         .addSImm(sC).addRegDef(dest);
     }
     mvec.push_back(miOR);
@@ -588,7 +587,7 @@
                                       mvec, mcfi);
   }
 
-  unsigned FPReg = target.getRegInfo().getFramePointer();
+  unsigned FPReg = target.getRegInfo()->getFramePointer();
   unsigned StoreOpcode = ChooseStoreInstruction(storeType);
   StoreOpcode = convertOpcodeFromRegToImm(StoreOpcode);
   mvec.push_back(BuildMI(StoreOpcode, 3)
@@ -633,7 +632,7 @@
   // 
   int offset = MachineFunction::get(F).getInfo()->allocateLocalVar(val); 
 
-  unsigned FPReg = target.getRegInfo().getFramePointer();
+  unsigned FPReg = target.getRegInfo()->getFramePointer();
 
   // Store instruction stores `val' to [%fp+offset].
   // The store opCode is based only the source value being copied.
@@ -699,8 +698,8 @@
   if (loadConstantToReg) { 
     // `src' is constant and cannot fit in immed field for the ADD
     // Insert instructions to "load" the constant into a register
-    target.getInstrInfo().CreateCodeToLoadConst(target, F, src, dest,
-                                                mvec, mcfi);
+    target.getInstrInfo()->CreateCodeToLoadConst(target, F, src, dest,
+                                                 mvec, mcfi);
   } else { 
     // Create a reg-to-reg copy instruction for the given type:
     // -- For FP values, create a FMOVS or FMOVD instruction


Index: llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.141 llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.142
--- llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.141	Sun May 23 00:10:06 2004
+++ llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp	Wed Jun  2 00:54:43 2004
@@ -592,12 +592,12 @@
                                            castDestType));
 
   // Create the fpreg-to-intreg copy code
-  target.getInstrInfo().CreateCodeToCopyFloatToInt(target, F, destForCast,
+  target.getInstrInfo()->CreateCodeToCopyFloatToInt(target, F, destForCast,
                                                    fpToIntCopyDest, mvec, mcfi);
 
   // Create the uint64_t to uint32_t conversion, if needed
   if (destI->getType() == Type::UIntTy)
-    target.getInstrInfo().
+    target.getInstrInfo()->
       CreateZeroExtensionInstructions(target, F, fpToIntCopyDest, destI,
                                       /*numLowBits*/ 32, mvec, mcfi);
 }
@@ -743,7 +743,7 @@
 CreateIntNegInstruction(const TargetMachine& target,
                         Value* vreg)
 {
-  return BuildMI(V9::SUBr, 3).addMReg(target.getRegInfo().getZeroRegNum())
+  return BuildMI(V9::SUBr, 3).addMReg(target.getRegInfo()->getZeroRegNum())
     .addReg(vreg).addRegDef(vreg);
 }
 
@@ -793,7 +793,7 @@
   if (shiftDest != destVal) {
     // extend the sign-bit of the result into all upper bits of dest
     assert(8*opSize <= 32 && "Unexpected type size > 4 and < IntRegSize?");
-    target.getInstrInfo().
+    target.getInstrInfo()->
       CreateSignExtensionInstructions(target, F, shiftDest, destVal,
                                       8*opSize, mvec, mcfi);
   }
@@ -811,7 +811,7 @@
                           MachineCodeForInstruction& mcfi)
 {
   /* Use max. multiply cost, viz., cost of MULX */
-  unsigned cost = target.getInstrInfo().minLatency(V9::MULXr);
+  unsigned cost = target.getInstrInfo()->minLatency(V9::MULXr);
   unsigned firstNewInstr = mvec.size();
   
   Value* constOp = rval;
@@ -826,7 +826,7 @@
   
   if (resultType->isInteger() || isa<PointerType>(resultType)) {
     bool isValidConst;
-    int64_t C = (int64_t) target.getInstrInfo().ConvertConstantToIntType(target,
+    int64_t C = (int64_t) target.getInstrInfo()->ConvertConstantToIntType(target,
                                      constOp, constOp->getType(), isValidConst);
     if (isValidConst) {
       unsigned pow;
@@ -837,8 +837,8 @@
       }
           
       if (C == 0 || C == 1) {
-        cost = target.getInstrInfo().minLatency(V9::ADDr);
-        unsigned Zero = target.getRegInfo().getZeroRegNum();
+        cost = target.getInstrInfo()->minLatency(V9::ADDr);
+        unsigned Zero = target.getRegInfo()->getZeroRegNum();
         MachineInstr* M;
         if (C == 0)
           M =BuildMI(V9::ADDr,3).addMReg(Zero).addMReg(Zero).addRegDef(destVal);
@@ -873,7 +873,7 @@
   if (firstNewInstr < mvec.size()) {
     cost = 0;
     for (unsigned i=firstNewInstr; i < mvec.size(); ++i)
-      cost += target.getInstrInfo().minLatency(mvec[i]->getOpcode());
+      cost += target.getInstrInfo()->minLatency(mvec[i]->getOpcode());
   }
   
   return cost;
@@ -897,7 +897,7 @@
     Constant* P = ConstantExpr::get(Instruction::Mul,
                                     cast<Constant>(lval),
                                     cast<Constant>(rval));
-    target.getInstrInfo().CreateCodeToLoadConst(target,F,P,destVal,mvec,mcfi);
+    target.getInstrInfo()->CreateCodeToLoadConst(target,F,P,destVal,mvec,mcfi);
   }
   else if (isa<Constant>(rval))         // rval is constant, but not lval
     CreateMulConstInstruction(target, F, lval, rval, destVal, mvec, mcfi);
@@ -969,7 +969,7 @@
     return;
 
   Instruction* destVal = instrNode->getInstruction();
-  unsigned ZeroReg = target.getRegInfo().getZeroRegNum();
+  unsigned ZeroReg = target.getRegInfo()->getZeroRegNum();
   
   // Cases worth optimizing are:
   // (1) Divide by 1 for any type: replace with copy (ADD or FMOV)
@@ -980,7 +980,7 @@
   if (resultType->isInteger()) {
     unsigned pow;
     bool isValidConst;
-    int64_t C = (int64_t) target.getInstrInfo().ConvertConstantToIntType(target,
+    int64_t C = (int64_t) target.getInstrInfo()->ConvertConstantToIntType(target,
                                      constOp, constOp->getType(), isValidConst);
     if (isValidConst) {
       bool needNeg = false;
@@ -1089,13 +1089,13 @@
   // compile time if the total size is a known constant.
   if (isa<Constant>(numElementsVal)) {
     bool isValid;
-    int64_t numElem = (int64_t) target.getInstrInfo().
+    int64_t numElem = (int64_t) target.getInstrInfo()->
       ConvertConstantToIntType(target, numElementsVal,
                                numElementsVal->getType(), isValid);
     assert(isValid && "Unexpectedly large array dimension in alloca!");
     int64_t total = numElem * tsize;
-    if (int extra= total % target.getFrameInfo().getStackFrameSizeAlignment())
-      total += target.getFrameInfo().getStackFrameSizeAlignment() - extra;
+    if (int extra= total % target.getFrameInfo()->getStackFrameSizeAlignment())
+      total += target.getFrameInfo()->getStackFrameSizeAlignment() - extra;
     totalSizeVal = ConstantSInt::get(Type::IntTy, total);
   } else {
     // The size is not a constant.  Generate code to compute it and
@@ -1133,10 +1133,10 @@
   bool growUp;
   ConstantSInt* dynamicAreaOffset =
     ConstantSInt::get(Type::IntTy,
-                     target.getFrameInfo().getDynamicAreaOffset(mcInfo,growUp));
+                     target.getFrameInfo()->getDynamicAreaOffset(mcInfo,growUp));
   assert(! growUp && "Has SPARC v9 stack frame convention changed?");
 
-  unsigned SPReg = target.getRegInfo().getStackPointer();
+  unsigned SPReg = target.getRegInfo()->getStackPointer();
 
   // Instruction 2: sub %sp, totalSizeVal -> %sp
   getMvec.push_back(BuildMI(V9::SUBr, 3).addMReg(SPReg).addReg(totalSizeVal)
@@ -1180,8 +1180,8 @@
                                                                 paddedSize,
                                                          tsize * numElements);
 
-  if (((int)paddedSize) > 8 * target.getFrameInfo().getSizeOfEachArgOnStack() ||
-      ! target.getInstrInfo().constantFitsInImmedField(V9::LDXi,offsetFromFP)) {
+  if (((int)paddedSize) > 8 * target.getFrameInfo()->getSizeOfEachArgOnStack() ||
+      ! target.getInstrInfo()->constantFitsInImmedField(V9::LDXi,offsetFromFP)) {
     CreateCodeForVariableSizeAlloca(target, result, tsize, 
 				    ConstantSInt::get(Type::IntTy,numElements),
 				    getMvec);
@@ -1196,7 +1196,7 @@
   ConstantSInt* offsetVal = ConstantSInt::get(Type::IntTy, offsetFromFP);
   
   // Instruction 1: add %fp, offsetFromFP -> result
-  unsigned FPReg = target.getRegInfo().getFramePointer();
+  unsigned FPReg = target.getRegInfo()->getFramePointer();
   getMvec.push_back(BuildMI(V9::ADDr, 3).addMReg(FPReg).addReg(offsetVal)
                     .addRegDef(result));
 }
@@ -1408,9 +1408,9 @@
     bool ignore;
     Function* func = cast<Function>(callInstr.getParent()->getParent());
     int numFixedArgs   = func->getFunctionType()->getNumParams();
-    int fpReg          = target.getFrameInfo().getIncomingArgBaseRegNum();
-    int argSize        = target.getFrameInfo().getSizeOfEachArgOnStack();
-    int firstVarArgOff = numFixedArgs * argSize + target.getFrameInfo().
+    int fpReg          = target.getFrameInfo()->getIncomingArgBaseRegNum();
+    int argSize        = target.getFrameInfo()->getSizeOfEachArgOnStack();
+    int firstVarArgOff = numFixedArgs * argSize + target.getFrameInfo()->
       getFirstIncomingArgOffset(MachineFunction::get(func), ignore);
     mvec.push_back(BuildMI(V9::ADDi, 3).addMReg(fpReg).addSImm(firstVarArgOff).
                    addRegDef(&callInstr));
@@ -1423,7 +1423,7 @@
   case Intrinsic::vacopy:
     // Simple copy of current va_list (arg1) to new va_list (result)
     mvec.push_back(BuildMI(V9::ORr, 3).
-                   addMReg(target.getRegInfo().getZeroRegNum()).
+                   addMReg(target.getRegInfo()->getZeroRegNum()).
                    addReg(callInstr.getOperand(1)).
                    addRegDef(&callInstr));
     return true;
@@ -1539,7 +1539,7 @@
 
         MachineInstr* retMI = 
           BuildMI(V9::JMPLRETi, 3).addReg(returnAddrTmp).addSImm(8)
-          .addMReg(target.getRegInfo().getZeroRegNum(), MachineOperand::Def);
+          .addMReg(target.getRegInfo()->getZeroRegNum(), MachineOperand::Def);
       
         // If there is a value to return, we need to:
         // (a) Sign-extend the value if it is smaller than 8 bytes (reg size)
@@ -1549,7 +1549,7 @@
         // 
         if (retVal != NULL) {
           const SparcV9RegInfo& regInfo =
-            (SparcV9RegInfo&) target.getRegInfo();
+            (SparcV9RegInfo&) *target.getRegInfo();
           const Type* retType = retVal->getType();
           unsigned regClassID = regInfo.getRegClassIDOfType(retType);
           unsigned retRegNum = (retType->isFloatingPoint()
@@ -1567,7 +1567,7 @@
               retValToUse = new TmpInstruction(mcfi, retVal);
 
               // sign-extend retVal and put the result in the temporary reg.
-              target.getInstrInfo().CreateSignExtensionInstructions
+              target.getInstrInfo()->CreateSignExtensionInstructions
                 (target, returnInstr->getParent()->getParent(),
                  retVal, retValToUse, 8*retSize, mvec, mcfi);
             }
@@ -1637,7 +1637,7 @@
         
         if ((constVal->getType()->isInteger()
              || isa<PointerType>(constVal->getType()))
-            && target.getInstrInfo().ConvertConstantToIntType(target,
+            && target.getInstrInfo()->ConvertConstantToIntType(target,
                              constVal, constVal->getType(), isValidConst) == 0
             && isValidConst)
           {
@@ -1747,7 +1747,7 @@
         Instruction* notI = subtreeRoot->getInstruction();
         Value* notArg = BinaryOperator::getNotArgument(
                            cast<BinaryOperator>(subtreeRoot->getInstruction()));
-        unsigned ZeroReg = target.getRegInfo().getZeroRegNum();
+        unsigned ZeroReg = target.getRegInfo()->getZeroRegNum();
 
         // Unconditionally set register to 0
         mvec.push_back(BuildMI(V9::SETHI, 2).addZImm(0).addRegDef(notI));
@@ -1765,7 +1765,7 @@
       { // First find the unary operand. It may be left or right, usually right.
         Value* notArg = BinaryOperator::getNotArgument(
                            cast<BinaryOperator>(subtreeRoot->getInstruction()));
-        unsigned ZeroReg = target.getRegInfo().getZeroRegNum();
+        unsigned ZeroReg = target.getRegInfo()->getZeroRegNum();
         mvec.push_back(BuildMI(V9::XNORr, 3).addReg(notArg).addMReg(ZeroReg)
                                        .addRegDef(subtreeRoot->getValue()));
         break;
@@ -1889,15 +1889,15 @@
                                   ? new TmpInstruction(mcfi, destType, opVal)
                                   : destI);
 
-            target.getInstrInfo().CreateSignExtensionInstructions
+            target.getInstrInfo()->CreateSignExtensionInstructions
               (target, currentFunc,opVal,signExtDest,extSourceInBits,mvec,mcfi);
 
             if (signAndZeroExtend)
-              target.getInstrInfo().CreateZeroExtensionInstructions
+              target.getInstrInfo()->CreateZeroExtensionInstructions
               (target, currentFunc, signExtDest, destI, 8*destSize, mvec, mcfi);
           }
           else if (zeroExtendOnly) {
-            target.getInstrInfo().CreateZeroExtensionInstructions
+            target.getInstrInfo()->CreateZeroExtensionInstructions
               (target, currentFunc, opVal, destI, extSourceInBits, mvec, mcfi);
           }
           else
@@ -1955,7 +1955,7 @@
                 MachineCodeForInstruction::get(dest);
               srcForCast = new TmpInstruction(destMCFI, tmpTypeToUse, dest);
 
-              target.getInstrInfo().CreateCodeToCopyIntToFloat(target,
+              target.getInstrInfo()->CreateCodeToCopyIntToFloat(target,
                          dest->getParent()->getParent(),
                          leftVal, cast<Instruction>(srcForCast),
                          mvec, destMCFI);
@@ -2067,12 +2067,12 @@
             MachineCodeForInstruction& mcfi=MachineCodeForInstruction::get(divI);
             divOp1ToUse = new TmpInstruction(mcfi, divOp1);
             divOp2ToUse = new TmpInstruction(mcfi, divOp2);
-            target.getInstrInfo().
+            target.getInstrInfo()->
               CreateSignExtensionInstructions(target,
                                               divI->getParent()->getParent(),
                                               divOp1, divOp1ToUse,
                                               8*opSize, mvec, mcfi);
-            target.getInstrInfo().
+            target.getInstrInfo()->
               CreateSignExtensionInstructions(target,
                                               divI->getParent()->getParent(),
                                               divOp2, divOp2ToUse,
@@ -2109,7 +2109,7 @@
           unsigned opSize=target.getTargetData().getTypeSize(divOp2->getType());
           if (opSize < 8) {
             divOpToUse = new TmpInstruction(mcfi, divOp2);
-            target.getInstrInfo().
+            target.getInstrInfo()->
               CreateSignExtensionInstructions(target,
                                               remI->getParent()->getParent(),
                                               divOp2, divOpToUse,
@@ -2251,7 +2251,7 @@
           
           if ((constVal->getType()->isInteger()
                || isa<PointerType>(constVal->getType()))
-              && target.getInstrInfo().ConvertConstantToIntType(target,
+              && target.getInstrInfo()->ConvertConstantToIntType(target,
                              constVal, constVal->getType(), isValidConst) == 0
               && isValidConst)
           {
@@ -2328,10 +2328,10 @@
             rightOpToUse = new TmpInstruction(mcfi, rightVal);
             
             // sign-extend each operand and put the result in the temporary reg.
-            target.getInstrInfo().CreateSignExtensionInstructions
+            target.getInstrInfo()->CreateSignExtensionInstructions
               (target, setCCInstr->getParent()->getParent(),
                leftVal, leftOpToUse, 8*opSize, mvec, mcfi);
-            target.getInstrInfo().CreateSignExtensionInstructions
+            target.getInstrInfo()->CreateSignExtensionInstructions
               (target, setCCInstr->getParent()->getParent(),
                rightVal, rightOpToUse, 8*opSize, mvec, mcfi);
           }
@@ -2342,8 +2342,8 @@
           mvec.push_back(BuildMI(V9::SUBccr, 4)
                          .addReg(leftOpToUse)
                          .addReg(rightOpToUse)
-                         .addMReg(target.getRegInfo()
-                                   .getZeroRegNum(), MachineOperand::Def)
+                         .addMReg(target.getRegInfo()->
+                                   getZeroRegNum(), MachineOperand::Def)
                          .addCCReg(tmpForCC, MachineOperand::Def));
         } else {
           // FP condition: dest of FCMP should be some FCCn register
@@ -2456,8 +2456,8 @@
           MachineCodeForInstruction& mcfi =
             MachineCodeForInstruction::get(callInstr); 
           const SparcV9RegInfo& regInfo =
-            (SparcV9RegInfo&) target.getRegInfo();
-          const TargetFrameInfo& frameInfo = target.getFrameInfo();
+            (SparcV9RegInfo&) *target.getRegInfo();
+          const TargetFrameInfo& frameInfo = *target.getFrameInfo();
 
           // Create hidden virtual register for return address with type void*
           TmpInstruction* retAddrReg =
@@ -2506,7 +2506,7 @@
                   TmpInstruction* argExtend = new TmpInstruction(mcfi, argVal);
 
                   // sign-extend argVal and put the result in the temporary reg.
-                  target.getInstrInfo().CreateSignExtensionInstructions
+                  target.getInstrInfo()->CreateSignExtensionInstructions
                     (target, currentFunc, argVal, argExtend,
                      8*argSize, mvec, mcfi);
 
@@ -2787,7 +2787,7 @@
         Instruction* vaNextI = subtreeRoot->getInstruction();
         assert(target.getTargetData().getTypeSize(vaNextI->getType()) <= 8 &&
                "We assumed that all LLVM parameter types <= 8 bytes!");
-        int argSize = target.getFrameInfo().getSizeOfEachArgOnStack();
+        int argSize = target.getFrameInfo()->getSizeOfEachArgOnStack();
         mvec.push_back(BuildMI(V9::ADDi, 3).addReg(vaNextI->getOperand(0)).
                        addSImm(argSize).addRegDef(vaNextI));
         break;
@@ -2826,7 +2826,7 @@
     else {
       std::vector<MachineInstr*> minstrVec;
       Instruction* instr = subtreeRoot->getInstruction();
-      target.getInstrInfo().
+      target.getInstrInfo()->
         CreateCopyInstructionsByType(target,
                                      instr->getParent()->getParent(),
                                      instr->getOperand(forwardOperandNum),


Index: llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.23 llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.24
--- llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.23	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp	Wed Jun  2 00:54:43 2004
@@ -31,7 +31,7 @@
                   const TargetMachine& target) {
   // Check if this instruction is in a delay slot of its predecessor.
   if (BBI != mvec.begin()) {
-      const TargetInstrInfo& mii = target.getInstrInfo();
+      const TargetInstrInfo& mii = *target.getInstrInfo();
       MachineBasicBlock::iterator predMI = prior(BBI);
       if (unsigned ndelay = mii.getNumDelaySlots(predMI->getOpcode())) {
         // This instruction is in a delay slot of its predecessor, so
@@ -83,7 +83,7 @@
       return (// either operand otherOp is register %g0
               (MI->getOperand(otherOp).hasAllocatedReg() &&
                MI->getOperand(otherOp).getReg() ==
-               target.getRegInfo().getZeroRegNum()) ||
+               target.getRegInfo()->getZeroRegNum()) ||
               
               // or operand otherOp == 0
               (MI->getOperand(otherOp).getType()


Index: llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.33 llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.34
--- llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.33	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp	Wed Jun  2 00:54:43 2004
@@ -41,7 +41,7 @@
 
   public:
     PreSelection(const TargetMachine &T)
-      : instrInfo(T.getInstrInfo()) {}
+      : instrInfo(*T.getInstrInfo()) {}
 
     // runOnFunction - apply this pass to each Function
     bool runOnFunction(Function &F) {


Index: llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.38 llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.39
--- llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.38	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp	Wed Jun  2 00:54:43 2004
@@ -52,7 +52,7 @@
 //------------------------------------------------------------------------ 
 
 static unsigned getStaticStackSize (MachineFunction &MF) {
-  const TargetFrameInfo& frameInfo = MF.getTarget().getFrameInfo();
+  const TargetFrameInfo& frameInfo = *MF.getTarget().getFrameInfo();
 
   unsigned staticStackSize = MF.getInfo()->getStaticStackSize();
 
@@ -69,7 +69,7 @@
 {
   std::vector<MachineInstr*> mvec;
   const TargetMachine &TM = MF.getTarget();
-  const TargetFrameInfo& frameInfo = TM.getFrameInfo();
+  const TargetFrameInfo& frameInfo = *TM.getFrameInfo();
   
   // The second operand is the stack size. If it does not fit in the
   // immediate field, we have to use a free register to hold the size.
@@ -77,8 +77,8 @@
   // 
   unsigned staticStackSize = getStaticStackSize (MF);
   int32_t C = - (int) staticStackSize;
-  int SP = TM.getRegInfo().getStackPointer();
-  if (TM.getInstrInfo().constantFitsInImmedField(V9::SAVEi,staticStackSize)) {
+  int SP = TM.getRegInfo()->getStackPointer();
+  if (TM.getInstrInfo()->constantFitsInImmedField(V9::SAVEi,staticStackSize)) {
     mvec.push_back(BuildMI(V9::SAVEi, 3).addMReg(SP).addSImm(C)
                    .addMReg(SP, MachineOperand::Def));
   } else {
@@ -87,8 +87,8 @@
     // local (%l) and in (%i) registers cannot be used before the SAVE!
     // Do this by creating a code sequence equivalent to:
     //        SETSW -(stackSize), %g1
-    int uregNum = TM.getRegInfo().getUnifiedRegNum(
-			 TM.getRegInfo().getRegClassIDOfType(Type::IntTy),
+    int uregNum = TM.getRegInfo()->getUnifiedRegNum(
+			 TM.getRegInfo()->getRegClassIDOfType(Type::IntTy),
 			 SparcV9IntRegClass::g1);
 
     MachineInstr* M = BuildMI(V9::SETHI, 2).addSImm(C)
@@ -120,15 +120,16 @@
   // 
   if (MF.getFunction()->getFunctionType()->isVarArg()) {
     int numFixedArgs    = MF.getFunction()->getFunctionType()->getNumParams();
-    int numArgRegs      = TM.getRegInfo().getNumOfIntArgRegs();
+    int numArgRegs      = TM.getRegInfo()->getNumOfIntArgRegs();
     if (numFixedArgs < numArgRegs) {
+      const TargetFrameInfo &FI = *TM.getFrameInfo();
       bool ignore;
-      int firstArgReg   = TM.getRegInfo().getUnifiedRegNum(
-                             TM.getRegInfo().getRegClassIDOfType(Type::IntTy),
+      int firstArgReg   = TM.getRegInfo()->getUnifiedRegNum(
+                             TM.getRegInfo()->getRegClassIDOfType(Type::IntTy),
                              SparcV9IntRegClass::i0);
-      int fpReg         = TM.getFrameInfo().getIncomingArgBaseRegNum();
-      int argSize       = TM.getFrameInfo().getSizeOfEachArgOnStack();
-      int firstArgOffset=TM.getFrameInfo().getFirstIncomingArgOffset(MF,ignore);
+      int fpReg         = FI.getIncomingArgBaseRegNum();
+      int argSize       = FI.getSizeOfEachArgOnStack();
+      int firstArgOffset= FI.getFirstIncomingArgOffset(MF,ignore);
       int nextArgOffset = firstArgOffset + numFixedArgs * argSize;
 
       for (int i=numFixedArgs; i < numArgRegs; ++i) {
@@ -145,7 +146,7 @@
 void InsertPrologEpilogCode::InsertEpilogCode(MachineFunction &MF)
 {
   const TargetMachine &TM = MF.getTarget();
-  const TargetInstrInfo &MII = TM.getInstrInfo();
+  const TargetInstrInfo &MII = *TM.getInstrInfo();
 
   for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {
     MachineBasicBlock &MBB = *I;
@@ -153,7 +154,7 @@
     const Instruction *TermInst = (Instruction*)BB.getTerminator();
     if (TermInst->getOpcode() == Instruction::Ret)
     {
-      int ZR = TM.getRegInfo().getZeroRegNum();
+      int ZR = TM.getRegInfo()->getZeroRegNum();
       MachineInstr *Restore = 
         BuildMI(V9::RESTOREi, 3).addMReg(ZR).addSImm(0)
           .addMReg(ZR, MachineOperand::Def);


Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.126 llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.127
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.126	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp	Wed Jun  2 00:54:43 2004
@@ -314,7 +314,7 @@
 void SparcV9RegInfo::suggestReg4RetAddr(MachineInstr *RetMI, 
 					   LiveRangeInfo& LRI) const {
 
-  assert(target.getInstrInfo().isReturn(RetMI->getOpcode()));
+  assert(target.getInstrInfo()->isReturn(RetMI->getOpcode()));
   
   // return address is always mapped to i7 so set it immediately
   RetMI->SetRegForOperand(0, getUnifiedRegNum(IntRegClassID,
@@ -482,7 +482,7 @@
 	// Now the arg is coming on stack. Since the LR received a register,
 	// we just have to load the arg on stack into that register
 	//
-        const TargetFrameInfo& frameInfo = target.getFrameInfo();
+        const TargetFrameInfo& frameInfo = *target.getFrameInfo();
 	int offsetFromFP =
           frameInfo.getIncomingArgOffset(MachineFunction::get(Meth),
                                          argNo);
@@ -540,7 +540,7 @@
 	// since this method is called before any other method that makes
 	// uses of the stack pos of the LR (e.g., updateMachineInstr)
         // 
-        const TargetFrameInfo& frameInfo = target.getFrameInfo();
+        const TargetFrameInfo& frameInfo = *target.getFrameInfo();
 	int offsetFromFP =
           frameInfo.getIncomingArgOffset(MachineFunction::get(Meth),
                                          argNo);
@@ -572,7 +572,7 @@
 //---------------------------------------------------------------------------
 void SparcV9RegInfo::suggestRegs4CallArgs(MachineInstr *CallMI, 
 					     LiveRangeInfo& LRI) const {
-  assert ( (target.getInstrInfo()).isCall(CallMI->getOpcode()) );
+  assert ( (target.getInstrInfo())->isCall(CallMI->getOpcode()) );
 
   CallArgsDescriptor* argDesc = CallArgsDescriptor::get(CallMI); 
   
@@ -641,7 +641,7 @@
 void SparcV9RegInfo::suggestReg4RetValue(MachineInstr *RetMI, 
                                             LiveRangeInfo& LRI) const {
 
-  assert( (target.getInstrInfo()).isReturn( RetMI->getOpcode() ) );
+  assert( target.getInstrInfo()->isReturn( RetMI->getOpcode() ) );
 
   suggestReg4RetAddr(RetMI, LRI);
 
@@ -764,7 +764,7 @@
   // Use the register allocator, PRA, to find an unused reg. at this MI.
   // 
   if (RegType != IntCCRegType)          // does not use offset below
-    if (! target.getInstrInfo().constantFitsInImmedField(V9::LDXi, Offset)) {
+    if (! target.getInstrInfo()->constantFitsInImmedField(V9::LDXi, Offset)) {
 #ifdef CAN_FIND_FREE_REGISTER_TRANSPARENTLY
       RegClass* RC = PRA.getRegClassByID(this->getRegClassIDOfRegType(RegType));
       OffReg = PRA.getUnusedUniRegAtMI(RC, RegType, MInst, LVSetBef);
@@ -779,21 +779,21 @@
 
   switch (RegType) {
   case IntRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::STXi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::STXi, Offset))
       MI = BuildMI(V9::STXi,3).addMReg(SrcReg).addMReg(PtrReg).addSImm(Offset);
     else
       MI = BuildMI(V9::STXr,3).addMReg(SrcReg).addMReg(PtrReg).addMReg(OffReg);
     break;
 
   case FPSingleRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::STFi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::STFi, Offset))
       MI = BuildMI(V9::STFi, 3).addMReg(SrcReg).addMReg(PtrReg).addSImm(Offset);
     else
       MI = BuildMI(V9::STFr, 3).addMReg(SrcReg).addMReg(PtrReg).addMReg(OffReg);
     break;
 
   case FPDoubleRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::STDFi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::STDFi, Offset))
       MI = BuildMI(V9::STDFi,3).addMReg(SrcReg).addMReg(PtrReg).addSImm(Offset);
     else
       MI = BuildMI(V9::STDFr,3).addMReg(SrcReg).addMReg(PtrReg).addSImm(OffReg);
@@ -815,7 +815,7 @@
   case FloatCCRegType: {
     unsigned fsrReg =  getUnifiedRegNum(SparcV9RegInfo::SpecialRegClassID,
                                            SparcV9SpecialRegClass::fsr);
-    if (target.getInstrInfo().constantFitsInImmedField(V9::STXFSRi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::STXFSRi, Offset))
       MI=BuildMI(V9::STXFSRi,3).addMReg(fsrReg).addMReg(PtrReg).addSImm(Offset);
     else
       MI=BuildMI(V9::STXFSRr,3).addMReg(fsrReg).addMReg(PtrReg).addMReg(OffReg);
@@ -850,7 +850,7 @@
   // Use the register allocator, PRA, to find an unused reg. at this MI.
   // 
   if (RegType != IntCCRegType)          // does not use offset below
-    if (! target.getInstrInfo().constantFitsInImmedField(V9::LDXi, Offset)) {
+    if (! target.getInstrInfo()->constantFitsInImmedField(V9::LDXi, Offset)) {
 #ifdef CAN_FIND_FREE_REGISTER_TRANSPARENTLY
       RegClass* RC = PRA.getRegClassByID(this->getRegClassIDOfRegType(RegType));
       OffReg = PRA.getUnusedUniRegAtMI(RC, RegType, MInst, LVSetBef);
@@ -865,7 +865,7 @@
 
   switch (RegType) {
   case IntRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::LDXi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::LDXi, Offset))
       MI = BuildMI(V9::LDXi, 3).addMReg(PtrReg).addSImm(Offset)
           .addMReg(DestReg, MachineOperand::Def);
     else
@@ -874,7 +874,7 @@
     break;
 
   case FPSingleRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::LDFi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::LDFi, Offset))
       MI = BuildMI(V9::LDFi, 3).addMReg(PtrReg).addSImm(Offset)
           .addMReg(DestReg, MachineOperand::Def);
     else
@@ -883,7 +883,7 @@
     break;
 
   case FPDoubleRegType:
-    if (target.getInstrInfo().constantFitsInImmedField(V9::LDDFi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::LDDFi, Offset))
       MI= BuildMI(V9::LDDFi, 3).addMReg(PtrReg).addSImm(Offset)
           .addMReg(DestReg, MachineOperand::Def);
     else
@@ -906,7 +906,7 @@
   case FloatCCRegType: {
     unsigned fsrRegNum =  getUnifiedRegNum(SparcV9RegInfo::SpecialRegClassID,
                                            SparcV9SpecialRegClass::fsr);
-    if (target.getInstrInfo().constantFitsInImmedField(V9::LDXFSRi, Offset))
+    if (target.getInstrInfo()->constantFitsInImmedField(V9::LDXFSRi, Offset))
       MI = BuildMI(V9::LDXFSRi, 3).addMReg(PtrReg).addSImm(Offset)
         .addMReg(fsrRegNum, MachineOperand::UseAndDef);
     else


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.h
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.8 llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.9
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.8	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.h	Wed Jun  2 00:54:43 2004
@@ -34,10 +34,10 @@
 public:
   SparcV9TargetMachine(IntrinsicLowering *IL);
   
-  virtual const TargetInstrInfo  &getInstrInfo() const { return instrInfo; }
-  virtual const TargetSchedInfo  &getSchedInfo() const { return schedInfo; }
-  virtual const TargetRegInfo    &getRegInfo()   const { return regInfo; }
-  virtual const TargetFrameInfo  &getFrameInfo() const { return frameInfo; }
+  virtual const TargetInstrInfo  *getInstrInfo() const { return &instrInfo; }
+  virtual const TargetSchedInfo  *getSchedInfo() const { return &schedInfo; }
+  virtual const TargetRegInfo    *getRegInfo()   const { return &regInfo; }
+  virtual const TargetFrameInfo  *getFrameInfo() const { return &frameInfo; }
   virtual       TargetJITInfo    *getJITInfo()         { return &jitInfo; }
   virtual const MRegisterInfo    *getRegisterInfo() const {
     return &instrInfo.getRegisterInfo();




From lattner at cs.uiuc.edu  Wed Jun  2 01:00:19 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:00:19 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/FloatingPoint.cpp InstSelectSimple.cpp PeepholeOptimizer.cpp Printer.cpp X86CodeEmitter.cpp X86RegisterInfo.cpp X86SimpInstrSelector.cpp X86TargetMachine.h
Message-ID: <200406020555.AAA01668@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

FloatingPoint.cpp updated: 1.32 -> 1.33
InstSelectSimple.cpp updated: 1.256 -> 1.257
PeepholeOptimizer.cpp updated: 1.32 -> 1.33
Printer.cpp updated: 1.98 -> 1.99
X86CodeEmitter.cpp updated: 1.60 -> 1.61
X86RegisterInfo.cpp updated: 1.80 -> 1.81
X86SimpInstrSelector.cpp updated: 1.1 -> 1.2
X86TargetMachine.h updated: 1.23 -> 1.24

---
Log message:

Convert to the new TargetMachine interface.


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

Index: llvm/lib/Target/X86/FloatingPoint.cpp
diff -u llvm/lib/Target/X86/FloatingPoint.cpp:1.32 llvm/lib/Target/X86/FloatingPoint.cpp:1.33
--- llvm/lib/Target/X86/FloatingPoint.cpp:1.32	Sat May  1 16:27:53 2004
+++ llvm/lib/Target/X86/FloatingPoint.cpp	Wed Jun  2 00:55:25 2004
@@ -177,7 +177,7 @@
 /// transforming FP instructions into their stack form.
 ///
 bool FPS::processBasicBlock(MachineFunction &MF, MachineBasicBlock &BB) {
-  const TargetInstrInfo &TII = MF.getTarget().getInstrInfo();
+  const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
   bool Changed = false;
   MBB = &BB;
   


Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.256 llvm/lib/Target/X86/InstSelectSimple.cpp:1.257
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.256	Sun May 23 16:23:12 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Wed Jun  2 00:55:25 2004
@@ -638,7 +638,7 @@
 /// the current one.
 ///
 void ISel::SelectPHINodes() {
-  const TargetInstrInfo &TII = TM.getInstrInfo();
+  const TargetInstrInfo &TII = *TM.getInstrInfo();
   const Function &LF = *F->getFunction();  // The LLVM function...
   for (Function::const_iterator I = LF.begin(), E = LF.end(); I != E; ++I) {
     const BasicBlock *BB = I;


Index: llvm/lib/Target/X86/PeepholeOptimizer.cpp
diff -u llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.32 llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.33
--- llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.32	Fri Apr  2 01:11:10 2004
+++ llvm/lib/Target/X86/PeepholeOptimizer.cpp	Wed Jun  2 00:55:25 2004
@@ -456,7 +456,7 @@
 
   bool Changed = false;
 
-  const TargetInstrInfo &TII = MBB.getParent()->getTarget().getInstrInfo();
+  const TargetInstrInfo &TII = *MBB.getParent()->getTarget().getInstrInfo();
 
   // Scan the operands of this instruction.  If any operands are
   // register-register copies, replace the operand with the source.


Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.98 llvm/lib/Target/X86/Printer.cpp:1.99
--- llvm/lib/Target/X86/Printer.cpp:1.98	Fri May 14 01:54:57 2004
+++ llvm/lib/Target/X86/Printer.cpp	Wed Jun  2 00:55:25 2004
@@ -623,7 +623,7 @@
 ///
 void Printer::printMachineInstruction(const MachineInstr *MI) {
   unsigned Opcode = MI->getOpcode();
-  const TargetInstrInfo &TII = TM.getInstrInfo();
+  const TargetInstrInfo &TII = *TM.getInstrInfo();
   const TargetInstrDescriptor &Desc = TII.get(Opcode);
 
   ++EmittedInsts;
@@ -921,7 +921,7 @@
         MI->getOpcode() == X86::FILD64m ||
         MI->getOpcode() == X86::FISTP64m) {
         GasBugWorkaroundEmitter gwe(O);
-        X86::emitInstruction(gwe, (X86InstrInfo&)TM.getInstrInfo(), *MI);
+        X86::emitInstruction(gwe, (X86InstrInfo&)*TM.getInstrInfo(), *MI);
     }
 
     O << TII.getName(MI->getOpcode()) << " ";


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.60 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.61
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.60	Fri May 14 01:54:58 2004
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Wed Jun  2 00:55:25 2004
@@ -228,7 +228,7 @@
 }
 
 bool Emitter::runOnMachineFunction(MachineFunction &MF) {
-  II = &((X86TargetMachine&)MF.getTarget()).getInstrInfo();
+  II = ((X86TargetMachine&)MF.getTarget()).getInstrInfo();
 
   MCE.startFunction(MF);
   MCE.emitConstantPool(MF.getConstantPool());


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.80 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.81
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.80	Fri Apr  2 01:11:10 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed Jun  2 00:55:25 2004
@@ -350,7 +350,7 @@
       // We need to keep the stack aligned properly.  To do this, we round the
       // amount of space needed for the outgoing arguments up to the next
       // alignment boundary.
-      unsigned Align = MF.getTarget().getFrameInfo().getStackAlignment();
+      unsigned Align = MF.getTarget().getFrameInfo()->getStackAlignment();
       Amount = (Amount+Align-1)/Align*Align;
 
       MachineInstr *New;
@@ -450,7 +450,7 @@
 
       // Round the size to a multiple of the alignment (don't forget the 4 byte
       // offset though).
-      unsigned Align = MF.getTarget().getFrameInfo().getStackAlignment();
+      unsigned Align = MF.getTarget().getFrameInfo()->getStackAlignment();
       NumBytes = ((NumBytes+4)+Align-1)/Align*Align - 4;
     }
 


Index: llvm/lib/Target/X86/X86SimpInstrSelector.cpp
diff -u llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.1 llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.2
--- llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.1	Tue Apr  6 14:35:17 2004
+++ llvm/lib/Target/X86/X86SimpInstrSelector.cpp	Wed Jun  2 00:55:25 2004
@@ -557,7 +557,7 @@
 /// the current one.
 ///
 void ISel::SelectPHINodes() {
-  const TargetInstrInfo &TII = TM.getInstrInfo();
+  const TargetInstrInfo &TII = *TM.getInstrInfo();
   const Function &LF = *F->getFunction();  // The LLVM function...
   for (Function::const_iterator I = LF.begin(), E = LF.end(); I != E; ++I) {
     const BasicBlock *BB = I;


Index: llvm/lib/Target/X86/X86TargetMachine.h
diff -u llvm/lib/Target/X86/X86TargetMachine.h:1.23 llvm/lib/Target/X86/X86TargetMachine.h:1.24
--- llvm/lib/Target/X86/X86TargetMachine.h:1.23	Mon Mar  8 21:34:53 2004
+++ llvm/lib/Target/X86/X86TargetMachine.h	Wed Jun  2 00:55:25 2004
@@ -30,17 +30,13 @@
 public:
   X86TargetMachine(const Module &M, IntrinsicLowering *IL);
 
-  virtual const X86InstrInfo     &getInstrInfo() const { return InstrInfo; }
-  virtual const TargetFrameInfo  &getFrameInfo() const { return FrameInfo; }
+  virtual const X86InstrInfo     *getInstrInfo() const { return &InstrInfo; }
+  virtual const TargetFrameInfo  *getFrameInfo() const { return &FrameInfo; }
   virtual       TargetJITInfo    *getJITInfo()         { return &JITInfo; }
   virtual const MRegisterInfo    *getRegisterInfo() const {
     return &InstrInfo.getRegisterInfo();
   }
 
-  // deprecated interfaces
-  virtual const TargetSchedInfo  &getSchedInfo() const { abort(); }
-  virtual const TargetRegInfo    &getRegInfo()   const { abort(); }
-
   /// addPassesToEmitMachineCode - Add passes to the specified pass manager to
   /// get machine code emitted.  This uses a MachineCodeEmitter object to handle
   /// actually outputting the machine code and resolving things like the address




From lattner at cs.uiuc.edu  Wed Jun  2 01:01:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:01:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetMachine.cpp
Message-ID: <200406020556.AAA01697@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

TargetMachine.cpp updated: 1.24 -> 1.25

---
Log message:

Method has been inlined into all callers


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

Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.24 llvm/lib/Target/TargetMachine.cpp:1.25
--- llvm/lib/Target/TargetMachine.cpp:1.24	Thu Mar  4 13:16:23 2004
+++ llvm/lib/Target/TargetMachine.cpp	Wed Jun  2 00:55:48 2004
@@ -54,10 +54,3 @@
   delete IL;
 }
 
-unsigned TargetMachine::findOptimalStorageSize(const Type *Ty) const {
-  // All integer types smaller than ints promote to 4 byte integers.
-  if (Ty->isIntegral() && Ty->getPrimitiveSize() < 4)
-    return 4;
-
-  return DataLayout.getTypeSize(Ty);
-}




From lattner at cs.uiuc.edu  Wed Jun  2 01:01:11 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:01:11 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
Message-ID: <200406020555.AAA32444@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9/LiveVar:

FunctionLiveVarInfo.cpp updated: 1.54 -> 1.55

---
Log message:

Convert to the new TargetMachine interface.


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

Index: llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
diff -u llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.54 llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.55
--- llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.54	Tue Feb 24 13:45:45 2004
+++ llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp	Wed Jun  2 00:54:53 2004
@@ -295,12 +295,12 @@
     // If the current machine instruction has delay slots, mark values
     // used by this instruction as live before and after each delay slot
     // instruction (After(MI) is the same as Before(MI+1) except for last MI).
-    if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(MI->getOpcode())) {
+    if (unsigned DS = TM.getInstrInfo()->getNumDelaySlots(MI->getOpcode())) {
       MachineBasicBlock::const_iterator fwdMII = MII.base(); // ptr to *next* MI
       for (unsigned i = 0; i < DS; ++i, ++fwdMII) {
         assert(fwdMII != MIVec.end() && "Missing instruction in delay slot?");
         const MachineInstr* DelaySlotMI = fwdMII;
-        if (! TM.getInstrInfo().isNop(DelaySlotMI->getOpcode())) {
+        if (! TM.getInstrInfo()->isNop(DelaySlotMI->getOpcode())) {
           set_union(*MInst2LVSetBI[DelaySlotMI], *NewSet);
           if (i+1 == DS)
             set_union(*MInst2LVSetAI[DelaySlotMI], *NewSet);




From lattner at cs.uiuc.edu  Wed Jun  2 01:02:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:02:04 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetSchedInfo.cpp
Message-ID: <200406020556.AAA01690@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

TargetSchedInfo.cpp updated: 1.17 -> 1.18

---
Log message:

Adjust to new TM interface


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

Index: llvm/lib/Target/TargetSchedInfo.cpp
diff -u llvm/lib/Target/TargetSchedInfo.cpp:1.17 llvm/lib/Target/TargetSchedInfo.cpp:1.18
--- llvm/lib/Target/TargetSchedInfo.cpp:1.17	Sat May  8 11:12:50 2004
+++ llvm/lib/Target/TargetSchedInfo.cpp	Wed Jun  2 00:56:04 2004
@@ -101,7 +101,7 @@
                                  unsigned NumUsageDeltas,
                                  unsigned NumIssueDeltas)
   : target(tgt),
-    numSchedClasses(NumSchedClasses), mii(& tgt.getInstrInfo()),
+    numSchedClasses(NumSchedClasses), mii(tgt.getInstrInfo()),
     classRUsages(ClassRUsages), usageDeltas(UsageDeltas),
     issueDeltas(IssueDeltas), numUsageDeltas(NumUsageDeltas),
     numIssueDeltas(NumIssueDeltas)




From lattner at cs.uiuc.edu  Wed Jun  2 01:03:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:03:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp InstrSelectionSupport.cpp
Message-ID: <200406020555.AAA01646@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9/InstrSelection:

InstrSelection.cpp updated: 1.77 -> 1.78
InstrSelectionSupport.cpp updated: 1.67 -> 1.68

---
Log message:

Convert to the new TargetMachine interface.



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

Index: llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.77 llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.78
--- llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.77	Sat May 29 22:33:49 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp	Wed Jun  2 00:54:48 2004
@@ -220,8 +220,8 @@
       MachineCodeForInstruction &MCforPN = MachineCodeForInstruction::get (PN);
       for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) {
         std::vector<MachineInstr*> mvec, CpVec;
-        Target.getRegInfo().cpValue2Value(PN->getIncomingValue(i), PhiCpRes,
-                                          mvec);
+        Target.getRegInfo()->cpValue2Value(PN->getIncomingValue(i), 
+                                           PhiCpRes, mvec);
         for (std::vector<MachineInstr*>::iterator MI=mvec.begin();
              MI != mvec.end(); ++MI) {
           std::vector<MachineInstr*> CpVec2 =
@@ -235,7 +235,7 @@
       }
       // Insert a copy instruction from PhiCpRes to PN.
       std::vector<MachineInstr*> mvec;
-      Target.getRegInfo().cpValue2Value(PhiCpRes, const_cast<PHINode*>(PN),
+      Target.getRegInfo()->cpValue2Value(PhiCpRes, const_cast<PHINode*>(PN),
                                         mvec);
       BB->insert(BB->begin(), mvec.begin(), mvec.end());
       MCforPN.insert (MCforPN.end (), mvec.begin (), mvec.end ());


Index: llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.67 llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.68
--- llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.67	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp	Wed Jun  2 00:54:49 2004
@@ -40,7 +40,7 @@
   MachineCodeForInstruction &mcfi = MachineCodeForInstruction::get(vmInstr);
   TmpInstruction* tmpReg = new TmpInstruction(mcfi, opValue);
   
-  target.getInstrInfo().CreateCodeToLoadConst(target, F, opValue, tmpReg,
+  target.getInstrInfo()->CreateCodeToLoadConst(target, F, opValue, tmpReg,
                                               loadConstVec, mcfi);
   
   // Record the mapping from the tmp VM instruction to machine instruction.
@@ -66,14 +66,14 @@
   getImmedValue = 0;
 
   if (canUseImmed &&
-      target.getInstrInfo().constantFitsInImmedField(opCode, intValue)) {
+      target.getInstrInfo()->constantFitsInImmedField(opCode, intValue)) {
       opType = isSigned? MachineOperand::MO_SignExtendedImmed
                        : MachineOperand::MO_UnextendedImmed;
       getImmedValue = intValue;
   } else if (intValue == 0 &&
-             target.getRegInfo().getZeroRegNum() != (unsigned)-1) {
+             target.getRegInfo()->getZeroRegNum() != (unsigned)-1) {
     opType = MachineOperand::MO_MachineRegister;
-    getMachineRegNum = target.getRegInfo().getZeroRegNum();
+    getMachineRegNum = target.getRegInfo()->getZeroRegNum();
   }
 
   return opType;
@@ -95,7 +95,7 @@
   // TargetInstrInfo::ConvertConstantToIntType() does the right conversions:
   bool isValidConstant;
   uint64_t valueToUse =
-    target.getInstrInfo().ConvertConstantToIntType(target, val, val->getType(),
+    target.getInstrInfo()->ConvertConstantToIntType(target, val, val->getType(),
                                                    isValidConstant);
   if (! isValidConstant)
     return MachineOperand::MO_VirtualRegister;
@@ -130,7 +130,7 @@
   std::vector<MachineInstr*> MVec;
   
   MachineOpCode opCode = minstr->getOpcode();
-  const TargetInstrInfo& instrInfo = target.getInstrInfo();
+  const TargetInstrInfo& instrInfo = *target.getInstrInfo();
   int resultPos = instrInfo.getResultPos(opCode);
   int immedPos = instrInfo.getImmedConstantPos(opCode);
 




From lattner at cs.uiuc.edu  Wed Jun  2 01:03:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:03:08 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp PhyRegAlloc.cpp PhyRegAlloc.h
Message-ID: <200406020555.AAA32471@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

LiveRangeInfo.cpp updated: 1.52 -> 1.53
PhyRegAlloc.cpp updated: 1.149 -> 1.150
PhyRegAlloc.h updated: 1.66 -> 1.67

---
Log message:

Convert to the new TargetMachine interface.



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

Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.52 llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.53
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.52	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp	Wed Jun  2 00:55:00 2004
@@ -29,7 +29,7 @@
 
 LiveRangeInfo::LiveRangeInfo(const Function *F, const TargetMachine &tm,
 			     std::vector<RegClass *> &RCL)
-  : Meth(F), TM(tm), RegClassList(RCL), MRI(tm.getRegInfo()) { }
+  : Meth(F), TM(tm), RegClassList(RCL), MRI(*tm.getRegInfo()) { }
 
 
 LiveRangeInfo::~LiveRangeInfo() {
@@ -176,8 +176,8 @@
       // If the machine instruction is a  call/return instruction, add it to
       // CallRetInstrList for processing its args, ret value, and ret addr.
       // 
-      if(TM.getInstrInfo().isReturn(MInst->getOpcode()) ||
-	 TM.getInstrInfo().isCall(MInst->getOpcode()))
+      if(TM.getInstrInfo()->isReturn(MInst->getOpcode()) ||
+	 TM.getInstrInfo()->isCall(MInst->getOpcode()))
 	CallRetInstrList.push_back(MInst); 
  
       // iterate over explicit MI operands and create a new LR
@@ -244,9 +244,9 @@
     MachineInstr *MInst = *It;
     MachineOpCode OpCode = MInst->getOpcode();
 
-    if ((TM.getInstrInfo()).isReturn(OpCode))
+    if (TM.getInstrInfo()->isReturn(OpCode))
       MRI.suggestReg4RetValue(MInst, *this);
-    else if ((TM.getInstrInfo()).isCall(OpCode))
+    else if (TM.getInstrInfo()->isCall(OpCode))
       MRI.suggestRegs4CallArgs(MInst, *this);
     else 
       assert( 0 && "Non call/ret instr in CallRetInstrList" );


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.149 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.150
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.149	Sun May 30 02:08:43 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Wed Jun  2 00:55:00 2004
@@ -240,7 +240,7 @@
 
       // get the LV set after the instruction
       const ValueSet &LVSetAI = LVI->getLiveVarSetAfterMInst(MInst, BB);
-      bool isCallInst = TM.getInstrInfo().isCall(MInst->getOpcode());
+      bool isCallInst = TM.getInstrInfo()->isCall(MInst->getOpcode());
 
       if (isCallInst) {
 	// set the isCallInterference flag of each live range which extends
@@ -265,7 +265,7 @@
       // another.  This must be done because pseudo-instructions may be
       // expanded to multiple instructions by the assembler, so all the
       // operands must get distinct registers.
-      if (TM.getInstrInfo().isPseudoInstr(MInst->getOpcode()))
+      if (TM.getInstrInfo()->isPseudoInstr(MInst->getOpcode()))
       	addInterf4PseudoInstr(MInst);
 
       // Also add interference for any implicit definitions in a machine
@@ -453,7 +453,7 @@
   // Now insert caller-saving code before/after the call.
   // Do this before inserting spill code since some registers must be
   // used by save/restore and spill code should not use those registers.
-  if (TM.getInstrInfo().isCall(Opcode)) {
+  if (TM.getInstrInfo()->isCall(Opcode)) {
     AddedInstrns &AI = AddedInstrMap[MInst];
     insertCallerSavingCode(AI.InstrnsBefore, AI.InstrnsAfter, MInst,
                            MBB.getBasicBlock());
@@ -497,7 +497,7 @@
     // their assigned registers or insert spill code, as appropriate. 
     // Also, fix operands of call/return instructions.
     for (MachineBasicBlock::iterator MII = MBB.begin(); MII != MBB.end(); ++MII)
-      if (! TM.getInstrInfo().isDummyPhiInstr(MII->getOpcode()))
+      if (! TM.getInstrInfo()->isDummyPhiInstr(MII->getOpcode()))
         updateInstruction(MII, MBB);
 
     // Now, move code out of delay slots of branches and returns if needed.
@@ -516,15 +516,15 @@
     // If so, we need to handle spill differently but annulling is not yet used.
     for (MachineBasicBlock::iterator MII = MBB.begin(); MII != MBB.end(); ++MII)
       if (unsigned delaySlots =
-          TM.getInstrInfo().getNumDelaySlots(MII->getOpcode())) { 
+          TM.getInstrInfo()->getNumDelaySlots(MII->getOpcode())) { 
           MachineBasicBlock::iterator DelaySlotMI = next(MII);
           assert(DelaySlotMI != MBB.end() && "no instruction for delay slot");
           
           // Check the 2 conditions above:
           // (1) Does a branch need instructions added after it?
           // (2) O/w does delay slot instr. need instrns before or after?
-          bool isBranch = (TM.getInstrInfo().isBranch(MII->getOpcode()) ||
-                           TM.getInstrInfo().isReturn(MII->getOpcode()));
+          bool isBranch = (TM.getInstrInfo()->isBranch(MII->getOpcode()) ||
+                           TM.getInstrInfo()->isReturn(MII->getOpcode()));
           bool cond1 = (isBranch &&
                         AddedInstrMap.count(MII) &&
                         AddedInstrMap[MII].InstrnsAfter.size() > 0);
@@ -549,7 +549,7 @@
               // instruction out of the delay slot). On cond2 we need
               // to insert a nop in place of the moved instruction
               if (cond2) {
-                MBB.insert(MII, BuildMI(TM.getInstrInfo().getNOPOpCode(),1));
+                MBB.insert(MII, BuildMI(TM.getInstrInfo()->getNOPOpCode(),1));
               }
             }
           else {
@@ -565,7 +565,7 @@
       MachineInstr *MInst = MII; 
 
       // do not process Phis
-      if (TM.getInstrInfo().isDummyPhiInstr(MInst->getOpcode()))
+      if (TM.getInstrInfo()->isDummyPhiInstr(MInst->getOpcode()))
 	continue;
 
       // if there are any added instructions...
@@ -573,11 +573,11 @@
         AddedInstrns &CallAI = AddedInstrMap[MInst];
 
 #ifndef NDEBUG
-        bool isBranch = (TM.getInstrInfo().isBranch(MInst->getOpcode()) ||
-                         TM.getInstrInfo().isReturn(MInst->getOpcode()));
+        bool isBranch = (TM.getInstrInfo()->isBranch(MInst->getOpcode()) ||
+                         TM.getInstrInfo()->isReturn(MInst->getOpcode()));
         assert((!isBranch ||
                 AddedInstrMap[MInst].InstrnsAfter.size() <=
-                TM.getInstrInfo().getNumDelaySlots(MInst->getOpcode())) &&
+                TM.getInstrInfo()->getNumDelaySlots(MInst->getOpcode())) &&
                "Cannot put more than #delaySlots instrns after "
                "branch or return! Need to handle temps differently.");
 #endif
@@ -628,9 +628,9 @@
   MachineInstr *MInst = MII;
   const BasicBlock *BB = MBB.getBasicBlock();
 
-  assert((! TM.getInstrInfo().isCall(MInst->getOpcode()) || OpNum == 0) &&
+  assert((! TM.getInstrInfo()->isCall(MInst->getOpcode()) || OpNum == 0) &&
          "Outgoing arg of a call must be handled elsewhere (func arg ok)");
-  assert(! TM.getInstrInfo().isReturn(MInst->getOpcode()) &&
+  assert(! TM.getInstrInfo()->isReturn(MInst->getOpcode()) &&
 	 "Return value of a ret must be handled elsewhere");
 
   MachineOperand& Op = MInst->getOperand(OpNum);
@@ -649,7 +649,7 @@
   // trample those!  Verify that the set is included in the LV set before MInst.
   if (MII != MBB.begin()) {
     MachineBasicBlock::iterator PredMI = prior(MII);
-    if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(PredMI->getOpcode()))
+    if (unsigned DS = TM.getInstrInfo()->getNumDelaySlots(PredMI->getOpcode()))
       assert(set_difference(LVI->getLiveVarSetBeforeMInst(PredMI), LVSetBef)
              .empty() && "Live-var set before branch should be included in "
              "live-var set of each delay slot instruction!");
@@ -735,7 +735,7 @@
                                     std::vector<MachineInstr*> &instrnsAfter,
                                     MachineInstr *CallMI, 
                                     const BasicBlock *BB) {
-  assert(TM.getInstrInfo().isCall(CallMI->getOpcode()));
+  assert(TM.getInstrInfo()->isCall(CallMI->getOpcode()));
   
   // hash set to record which registers were saved/restored
   hash_set<unsigned> PushedRegSet;
@@ -1326,8 +1326,8 @@
   // Create each RegClass for the target machine and add it to the 
   // RegClassList.  This must be done before calling constructLiveRanges().
   for (unsigned rc = 0; rc != NumOfRegClasses; ++rc)   
-    RegClassList.push_back (new RegClass (Fn, &TM.getRegInfo (), 
-					  MRI.getMachineRegClass (rc))); 
+    RegClassList.push_back (new RegClass (Fn, TM.getRegInfo(), 
+					  MRI.getMachineRegClass(rc))); 
      
   LRI->constructLiveRanges();            // create LR info
   if (DEBUG_RA >= RA_DEBUG_LiveRanges)


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.66 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.67
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.66	Sat May 29 23:22:24 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h	Wed Jun  2 00:55:00 2004
@@ -93,7 +93,7 @@
   typedef std::map<const Function *, std::vector<AllocInfo> > SavedStateMapTy;
 
   inline PhyRegAlloc (const TargetMachine &TM_) :
-    TM (TM_), MRI (TM.getRegInfo ()),
+    TM (TM_), MRI (*TM.getRegInfo ()),
     NumOfRegClasses (MRI.getNumOfRegClasses ()) { }
   virtual ~PhyRegAlloc() { }
 




From lattner at cs.uiuc.edu  Wed Jun  2 01:04:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:04:00 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/MachineFunction.cpp
Message-ID: <200406020557.AAA01749@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

MachineFunction.cpp updated: 1.58 -> 1.59

---
Log message:

Inline findOptimalStorageSize into it's caller, both of which are sparc specific


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

Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.58 llvm/lib/CodeGen/MachineFunction.cpp:1.59
--- llvm/lib/CodeGen/MachineFunction.cpp:1.58	Mon May 24 02:14:26 2004
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed Jun  2 00:56:52 2004
@@ -24,6 +24,7 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Function.h"
 #include "llvm/iOther.h"
+#include "llvm/Type.h"
 #include "Support/LeakDetector.h"
 
 using namespace llvm;
@@ -187,7 +188,7 @@
 
 
 void MachineFrameInfo::print(const MachineFunction &MF, std::ostream &OS) const{
-  int ValOffset = MF.getTarget().getFrameInfo().getOffsetOfLocalArea();
+  int ValOffset = MF.getTarget().getFrameInfo()->getOffsetOfLocalArea();
 
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
     const StackObject &SO = Objects[i];
@@ -239,7 +240,7 @@
 ComputeMaxOptionalArgsSize(const TargetMachine& target, const Function *F,
                            unsigned &maxOptionalNumArgs)
 {
-  const TargetFrameInfo &frameInfo = target.getFrameInfo();
+  const TargetFrameInfo &frameInfo = *target.getFrameInfo();
   
   unsigned maxSize = 0;
   
@@ -306,7 +307,7 @@
 						   MF.getFunction(),
                                                    maxOptionalNumArgs);
   staticStackSize = maxOptionalArgsSize
-    + MF.getTarget().getFrameInfo().getMinStackFrameSize();
+    + MF.getTarget().getFrameInfo()->getMinStackFrameSize();
 }
 
 int
@@ -314,17 +315,22 @@
 					      unsigned &getPaddedSize,
 					      unsigned  sizeToUse)
 {
-  if (sizeToUse == 0)
-    sizeToUse = MF.getTarget().findOptimalStorageSize(val->getType());
+  if (sizeToUse == 0) {
+    // All integer types smaller than ints promote to 4 byte integers.
+    if (val->getType()->isIntegral() && val->getType()->getPrimitiveSize() < 4)
+      sizeToUse = 4;
+    else
+      sizeToUse = MF.getTarget().getTargetData().getTypeSize(val->getType());
+  }
   unsigned align = SizeToAlignment(sizeToUse, MF.getTarget());
 
   bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo().getFirstAutomaticVarOffset(MF,
-									     growUp);
+  int firstOffset = MF.getTarget().getFrameInfo()->getFirstAutomaticVarOffset(MF,
+						 			     growUp);
   int offset = growUp? firstOffset + getAutomaticVarsSize()
                      : firstOffset - (getAutomaticVarsSize() + sizeToUse);
 
-  int aligned = MF.getTarget().getFrameInfo().adjustAlignment(offset, growUp, align);
+  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp, align);
   getPaddedSize = sizeToUse + abs(aligned - offset);
 
   return aligned;
@@ -361,12 +367,12 @@
   unsigned char align = MF.getTarget().getTargetData().getTypeAlignment(type);
   
   bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo().getRegSpillAreaOffset(MF, growUp);
+  int firstOffset = MF.getTarget().getFrameInfo()->getRegSpillAreaOffset(MF, growUp);
   
   int offset = growUp? firstOffset + getRegSpillsSize()
                      : firstOffset - (getRegSpillsSize() + size);
 
-  int aligned = MF.getTarget().getFrameInfo().adjustAlignment(offset, growUp, align);
+  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp, align);
   size += abs(aligned - offset); // include alignment padding in size
   
   incrementRegSpillsSize(size);  // update size of reg. spills area
@@ -380,12 +386,12 @@
   unsigned align = SizeToAlignment(size, MF.getTarget());
 
   bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo().getTmpAreaOffset(MF, growUp);
+  int firstOffset = MF.getTarget().getFrameInfo()->getTmpAreaOffset(MF, growUp);
 
   int offset = growUp? firstOffset + currentTmpValuesSize
                      : firstOffset - (currentTmpValuesSize + size);
 
-  int aligned = MF.getTarget().getFrameInfo().adjustAlignment(offset, growUp,
+  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp,
 							      align);
   size += abs(aligned - offset); // include alignment padding in size
 




From lattner at cs.uiuc.edu  Wed Jun  2 01:04:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:04:07 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp LiveVariables.cpp MachineBasicBlock.cpp MachineInstr.cpp Makefile PHIElimination.cpp PrologEpilogInserter.cpp RegAllocLocal.cpp RegAllocSimple.cpp TwoAddressInstructionPass.cpp VirtRegMap.cpp
Message-ID: <200406020557.AAA01744@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.76 -> 1.77
LiveVariables.cpp updated: 1.31 -> 1.32
MachineBasicBlock.cpp updated: 1.13 -> 1.14
MachineInstr.cpp updated: 1.99 -> 1.100
Makefile updated: 1.17 -> 1.18
PHIElimination.cpp updated: 1.26 -> 1.27
PrologEpilogInserter.cpp updated: 1.22 -> 1.23
RegAllocLocal.cpp updated: 1.61 -> 1.62
RegAllocSimple.cpp updated: 1.55 -> 1.56
TwoAddressInstructionPass.cpp updated: 1.18 -> 1.19
VirtRegMap.cpp updated: 1.12 -> 1.13

---
Log message:

Adjust to new TargetMachine interface


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

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.76 llvm/lib/CodeGen/LiveIntervals.cpp:1.77
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.76	Sun May 30 02:46:27 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Wed Jun  2 00:57:12 2004
@@ -122,7 +122,7 @@
     // perform a final pass over the instructions and compute spill
     // weights, coalesce virtual registers and remove identity moves
     const LoopInfo& loopInfo = getAnalysis<LoopInfo>();
-    const TargetInstrInfo& tii = tm_->getInstrInfo();
+    const TargetInstrInfo& tii = *tm_->getInstrInfo();
 
     for (MachineFunction::iterator mbbi = mf_->begin(), mbbe = mf_->end();
          mbbi != mbbe; ++mbbi) {
@@ -424,7 +424,7 @@
         for (MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
              mi != miEnd; ++mi) {
             const TargetInstrDescriptor& tid =
-                tm_->getInstrInfo().get(mi->getOpcode());
+                tm_->getInstrInfo()->get(mi->getOpcode());
             DEBUG(std::cerr << getInstructionIndex(mi) << "\t";
                   mi->print(std::cerr, *tm_));
 
@@ -455,7 +455,7 @@
 {
     DEBUG(std::cerr << "********** JOINING INTERVALS ***********\n");
 
-    const TargetInstrInfo& tii = tm_->getInstrInfo();
+    const TargetInstrInfo& tii = *tm_->getInstrInfo();
 
     for (MachineFunction::iterator mbbi = mf_->begin(), mbbe = mf_->end();
          mbbi != mbbe; ++mbbi) {
@@ -464,8 +464,7 @@
 
         for (MachineBasicBlock::iterator mi = mbb->begin(), mie = mbb->end();
              mi != mie; ++mi) {
-            const TargetInstrDescriptor& tid =
-                tm_->getInstrInfo().get(mi->getOpcode());
+            const TargetInstrDescriptor& tid = tii.get(mi->getOpcode());
             DEBUG(std::cerr << getInstructionIndex(mi) << '\t';
                   mi->print(std::cerr, *tm_););
 


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.31 llvm/lib/CodeGen/LiveVariables.cpp:1.32
--- llvm/lib/CodeGen/LiveVariables.cpp:1.31	Mon May 10 00:12:43 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed Jun  2 00:57:12 2004
@@ -159,7 +159,7 @@
 }
 
 bool LiveVariables::runOnMachineFunction(MachineFunction &MF) {
-  const TargetInstrInfo &TII = MF.getTarget().getInstrInfo();
+  const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
   RegInfo = MF.getTarget().getRegisterInfo();
   assert(RegInfo && "Target doesn't have register information?");
 


Index: llvm/lib/CodeGen/MachineBasicBlock.cpp
diff -u llvm/lib/CodeGen/MachineBasicBlock.cpp:1.13 llvm/lib/CodeGen/MachineBasicBlock.cpp:1.14
--- llvm/lib/CodeGen/MachineBasicBlock.cpp:1.13	Mon May 24 02:14:27 2004
+++ llvm/lib/CodeGen/MachineBasicBlock.cpp	Wed Jun  2 00:57:12 2004
@@ -81,7 +81,7 @@
 
 MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator()
 {
-  const TargetInstrInfo& TII = getParent()->getTarget().getInstrInfo();
+  const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo();
   iterator I = end();
   while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode()));
   if (I != end() && !TII.isTerminatorInstr(I->getOpcode())) ++I;


Index: llvm/lib/CodeGen/MachineInstr.cpp
diff -u llvm/lib/CodeGen/MachineInstr.cpp:1.99 llvm/lib/CodeGen/MachineInstr.cpp:1.100
--- llvm/lib/CodeGen/MachineInstr.cpp:1.99	Sun May 23 22:14:16 2004
+++ llvm/lib/CodeGen/MachineInstr.cpp	Wed Jun  2 00:57:12 2004
@@ -322,7 +322,7 @@
     OS << " = ";
     ++StartOp;   // Don't print this operand again!
   }
-  OS << TM.getInstrInfo().getName(getOpcode());
+  OS << TM.getInstrInfo()->getName(getOpcode());
   
   for (unsigned i = StartOp, e = getNumOperands(); i != e; ++i) {
     const MachineOperand& mop = getOperand(i);


Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.17 llvm/lib/CodeGen/Makefile:1.18
--- llvm/lib/CodeGen/Makefile:1.17	Fri Jan  9 00:24:06 2004
+++ llvm/lib/CodeGen/Makefile	Wed Jun  2 00:57:12 2004
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = InstrSched SelectionDAG
+#PARALLEL_DIRS = InstrSched SelectionDAG
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.26 llvm/lib/CodeGen/PHIElimination.cpp:1.27
--- llvm/lib/CodeGen/PHIElimination.cpp:1.26	Wed May 12 16:47:57 2004
+++ llvm/lib/CodeGen/PHIElimination.cpp	Wed Jun  2 00:57:12 2004
@@ -66,7 +66,7 @@
     return false;   // Quick exit for normal case...
 
   LiveVariables *LV = getAnalysisToUpdate<LiveVariables>();
-  const TargetInstrInfo &MII = MF.getTarget().getInstrInfo();
+  const TargetInstrInfo &MII = *MF.getTarget().getInstrInfo();
   const MRegisterInfo *RegInfo = MF.getTarget().getRegisterInfo();
 
   // VRegPHIUseCount - Keep track of the number of times each virtual register


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.22 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.23
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.22	Sun Feb 15 15:37:17 2004
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Wed Jun  2 00:57:12 2004
@@ -82,7 +82,7 @@
 ///
 void PEI::saveCallerSavedRegisters(MachineFunction &Fn) {
   const MRegisterInfo *RegInfo = Fn.getTarget().getRegisterInfo();
-  const TargetFrameInfo &FrameInfo = Fn.getTarget().getFrameInfo();
+  const TargetFrameInfo &FrameInfo = *Fn.getTarget().getFrameInfo();
 
   // Get the callee saved register list...
   const unsigned *CSRegs = RegInfo->getCalleeSaveRegs();
@@ -170,7 +170,7 @@
   }
 
   // Add code to restore the callee-save registers in each exiting block.
-  const TargetInstrInfo &TII = Fn.getTarget().getInstrInfo();
+  const TargetInstrInfo &TII = *Fn.getTarget().getInstrInfo();
   for (MachineFunction::iterator FI = Fn.begin(), E = Fn.end(); FI != E; ++FI) {
     // If last instruction is a return instruction, add an epilogue
     if (!FI->empty() && TII.isReturn(FI->back().getOpcode())) {
@@ -191,7 +191,7 @@
 /// abstract stack objects...
 ///
 void PEI::calculateFrameObjectOffsets(MachineFunction &Fn) {
-  const TargetFrameInfo &TFI = Fn.getTarget().getFrameInfo();
+  const TargetFrameInfo &TFI = *Fn.getTarget().getFrameInfo();
   
   bool StackGrowsDown =
     TFI.getStackGrowthDirection() == TargetFrameInfo::StackGrowsDown;
@@ -245,7 +245,7 @@
   Fn.getTarget().getRegisterInfo()->emitPrologue(Fn);
 
   // Add epilogue to restore the callee-save registers in each exiting block
-  const TargetInstrInfo &TII = Fn.getTarget().getInstrInfo();
+  const TargetInstrInfo &TII = *Fn.getTarget().getInstrInfo();
   for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {
     // If last instruction is a return instruction, add an epilogue
     if (!I->empty() && TII.isReturn(I->back().getOpcode()))


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.61 llvm/lib/CodeGen/RegAllocLocal.cpp:1.62
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.61	Sun Mar 14 01:19:51 2004
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Wed Jun  2 00:57:12 2004
@@ -520,7 +520,7 @@
   // loop over each instruction
   MachineBasicBlock::iterator MI = MBB.begin();
   for (; MI != MBB.end(); ++MI) {
-    const TargetInstrDescriptor &TID = TM->getInstrInfo().get(MI->getOpcode());
+    const TargetInstrDescriptor &TID = TM->getInstrInfo()->get(MI->getOpcode());
     DEBUG(std::cerr << "\nStarting RegAlloc of: " << *MI;
           std::cerr << "  Regs have values: ";
           for (unsigned i = 0; i != RegInfo->getNumRegs(); ++i)


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.55 llvm/lib/CodeGen/RegAllocSimple.cpp:1.56
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.55	Mon Mar 15 19:45:55 2004
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Wed Jun  2 00:57:12 2004
@@ -159,7 +159,7 @@
     // a preliminary pass that will invalidate any registers that
     // are used by the instruction (including implicit uses)
     unsigned Opcode = MI->getOpcode();
-    const TargetInstrDescriptor &Desc = TM->getInstrInfo().get(Opcode);
+    const TargetInstrDescriptor &Desc = TM->getInstrInfo()->get(Opcode);
     const unsigned *Regs = Desc.ImplicitUses;
     while (*Regs)
       RegsUsed[*Regs++] = true;
@@ -184,7 +184,7 @@
         unsigned physReg = Virt2PhysRegMap[virtualReg];
         if (physReg == 0) {
           if (op.isDef()) {
-            if (!TM->getInstrInfo().isTwoAddrInstr(MI->getOpcode()) || i) {
+            if (!TM->getInstrInfo()->isTwoAddrInstr(MI->getOpcode()) || i) {
               physReg = getFreeReg(virtualReg);
             } else {
               // must be same register number as the first operand


Index: llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
diff -u llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.18 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.19
--- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.18	Tue Feb 17 18:35:06 2004
+++ llvm/lib/CodeGen/TwoAddressInstructionPass.cpp	Wed Jun  2 00:57:12 2004
@@ -77,7 +77,7 @@
     DEBUG(std::cerr << "Machine Function\n");
     const TargetMachine &TM = MF.getTarget();
     const MRegisterInfo &MRI = *TM.getRegisterInfo();
-    const TargetInstrInfo &TII = TM.getInstrInfo();
+    const TargetInstrInfo &TII = *TM.getInstrInfo();
     LiveVariables* LV = getAnalysisToUpdate<LiveVariables>();
 
     bool MadeChange = false;


Index: llvm/lib/CodeGen/VirtRegMap.cpp
diff -u llvm/lib/CodeGen/VirtRegMap.cpp:1.12 llvm/lib/CodeGen/VirtRegMap.cpp:1.13
--- llvm/lib/CodeGen/VirtRegMap.cpp:1.12	Sat May 29 15:38:05 2004
+++ llvm/lib/CodeGen/VirtRegMap.cpp	Wed Jun  2 00:57:12 2004
@@ -191,7 +191,7 @@
         bool runOnMachineFunction(MachineFunction& mf, const VirtRegMap& vrm) {
             mf_ = &mf;
             tm_ = &mf_->getTarget();
-            tii_ = &tm_->getInstrInfo();
+            tii_ = tm_->getInstrInfo();
             mri_ = tm_->getRegisterInfo();
             vrm_ = &vrm;
             p2vMap_.assign(mri_->getNumRegs(), 0);




From lattner at cs.uiuc.edu  Wed Jun  2 01:11:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:11:01 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp SchedGraph.cpp
Message-ID: <200406020606.BAA02783@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/InstrSched:

InstrScheduling.cpp updated: 1.70 -> 1.71
SchedGraph.cpp updated: 1.60 -> 1.61

---
Log message:

Adjust to the new TargetMachine interface


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

Index: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
diff -u llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.70 llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.71
--- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.70	Wed Mar 31 15:59:43 2004
+++ llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp	Wed Jun  2 01:06:19 2004
@@ -512,15 +512,15 @@
 SchedulingManager::SchedulingManager(const TargetMachine& target,
 				     const SchedGraph* graph,
 				     SchedPriorities& _schedPrio)
-  : nslots(target.getSchedInfo().getMaxNumIssueTotal()),
-    schedInfo(target.getSchedInfo()),
+  : nslots(target.getSchedInfo()->getMaxNumIssueTotal()),
+    schedInfo(*target.getSchedInfo()),
     schedPrio(_schedPrio),
     isched(nslots, graph->getNumNodes()),
     totalInstrCount(graph->getNumNodes() - 2),
     nextEarliestIssueTime(0),
     choicesForSlot(nslots),
-    numInClass(target.getSchedInfo().getNumSchedClasses(), 0),	// set all to 0
-    nextEarliestStartTime(target.getInstrInfo().getNumOpcodes(),
+    numInClass(target.getSchedInfo()->getNumSchedClasses(), 0),	// set all to 0
+    nextEarliestStartTime(target.getInstrInfo()->getNumOpcodes(),
 			  (cycles_t) 0)				// set all to 0
 {
   updateTime(0);


Index: llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
diff -u llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.60 llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.61
--- llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.60	Fri Apr 23 13:15:46 2004
+++ llvm/lib/CodeGen/InstrSched/SchedGraph.cpp	Wed Jun  2 01:06:20 2004
@@ -60,9 +60,9 @@
     MI = I;
 
     MachineOpCode mopCode = MI->getOpcode();
-    latency = Target.getInstrInfo().hasResultInterlock(mopCode)
-      ? Target.getInstrInfo().minLatency(mopCode)
-      : Target.getInstrInfo().maxLatency(mopCode);
+    latency = Target.getInstrInfo()->hasResultInterlock(mopCode)
+      ? Target.getInstrInfo()->minLatency(mopCode)
+      : Target.getInstrInfo()->maxLatency(mopCode);
   }
 }
 
@@ -138,7 +138,7 @@
 
 void SchedGraph::addCDEdges(const TerminatorInst* term,
 			    const TargetMachine& target) {
-  const TargetInstrInfo& mii = target.getInstrInfo();
+  const TargetInstrInfo& mii = *target.getInstrInfo();
   MachineCodeForInstruction &termMvec = MachineCodeForInstruction::get(term);
   
   // Find the first branch instr in the sequence of machine instrs for term
@@ -240,7 +240,7 @@
 // 
 void SchedGraph::addMemEdges(const std::vector<SchedGraphNode*>& memNodeVec,
 			     const TargetMachine& target) {
-  const TargetInstrInfo& mii = target.getInstrInfo();
+  const TargetInstrInfo& mii = *target.getInstrInfo();
   
   // Instructions in memNodeVec are in execution order within the basic block,
   // so simply look at all pairs <memNodeVec[i], memNodeVec[j: j > i]>.
@@ -272,7 +272,7 @@
 // 
 void SchedGraph::addCallDepEdges(const std::vector<SchedGraphNode*>& callDepNodeVec,
 				 const TargetMachine& target) {
-  const TargetInstrInfo& mii = target.getInstrInfo();
+  const TargetInstrInfo& mii = *target.getInstrInfo();
   
   // Instructions in memNodeVec are in execution order within the basic block,
   // so simply look at all pairs <memNodeVec[i], memNodeVec[j: j > i]>.
@@ -471,7 +471,7 @@
 				       std::vector<SchedGraphNode*>& callDepNodeVec,
 				       RegToRefVecMap& regToRefVecMap,
 				       ValueToDefVecMap& valueToDefVecMap) {
-  const TargetInstrInfo& mii = target.getInstrInfo();
+  const TargetInstrInfo& mii = *target.getInstrInfo();
   
   MachineOpCode opCode = node->getOpcode();
   
@@ -493,7 +493,7 @@
       unsigned regNum = mop.getReg();
       
       // If this is not a dummy zero register, record the reference in order
-      if (regNum != target.getRegInfo().getZeroRegNum())
+      if (regNum != target.getRegInfo()->getZeroRegNum())
         regToRefVecMap[mop.getReg()]
           .push_back(std::make_pair(node, i));
 
@@ -502,8 +502,8 @@
       if (callDepNodeVec.size() == 0 || callDepNodeVec.back() != node)
         {
           unsigned rcid;
-          int regInClass = target.getRegInfo().getClassRegNum(regNum, rcid);
-          if (target.getRegInfo().getMachineRegClass(rcid)
+          int regInClass = target.getRegInfo()->getClassRegNum(regNum, rcid);
+          if (target.getRegInfo()->getMachineRegClass(rcid)
               ->isRegVolatile(regInClass))
             callDepNodeVec.push_back(node);
         }
@@ -532,7 +532,7 @@
     const MachineOperand& mop = MI.getImplicitOp(i);
     if (mop.hasAllocatedReg()) {
       unsigned regNum = mop.getReg();
-      if (regNum != target.getRegInfo().getZeroRegNum())
+      if (regNum != target.getRegInfo()->getZeroRegNum())
         regToRefVecMap[mop.getReg()]
           .push_back(std::make_pair(node, i + MI.getNumOperands()));
       continue;                     // nothing more to do
@@ -553,7 +553,7 @@
 				 std::vector<SchedGraphNode*>& callDepNodeVec,
 				 RegToRefVecMap& regToRefVecMap,
 				 ValueToDefVecMap& valueToDefVecMap) {
-  const TargetInstrInfo& mii = target.getInstrInfo();
+  const TargetInstrInfo& mii = *target.getInstrInfo();
   
   // Build graph nodes for each VM instruction and gather def/use info.
   // Do both those together in a single pass over all machine instructions.




From lattner at cs.uiuc.edu  Wed Jun  2 01:11:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:11:08 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Makefile
Message-ID: <200406020606.BAA02795@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

Makefile updated: 1.18 -> 1.19

---
Log message:

Oops, this was not to go in


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

Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.18 llvm/lib/CodeGen/Makefile:1.19
--- llvm/lib/CodeGen/Makefile:1.18	Wed Jun  2 00:57:12 2004
+++ llvm/lib/CodeGen/Makefile	Wed Jun  2 01:06:45 2004
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-#PARALLEL_DIRS = InstrSched SelectionDAG
+PARALLEL_DIRS = InstrSched SelectionDAG
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Wed Jun  2 01:51:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 01:51:01 2004
Subject: [llvm-commits] CVS: llvm-www/CurrentWork.html
Message-ID: <200406020647.BAA03614@zion.cs.uiuc.edu>


Changes in directory llvm-www:

CurrentWork.html updated: 1.2 -> 1.3

---
Log message:

Add note that there is a lot of development work going on.


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

Index: llvm-www/CurrentWork.html
diff -u llvm-www/CurrentWork.html:1.2 llvm-www/CurrentWork.html:1.3
--- llvm-www/CurrentWork.html:1.2	Thu Jan  1 20:33:41 2004
+++ llvm-www/CurrentWork.html	Wed Jun  2 01:47:00 2004
@@ -1,8 +1,23 @@
 <!--#include virtual="header.incl" -->
-<div class="www_sectiontitle">Near-term LLVM Development</div>
+
+<div class="www_sectiontitle">Ongoing Development</div>
+
+<p>LLVM is always being improved and extended.  The abstractions used in the 
+source base constantly evolve to be more powerful, it aquires new features,
+and it is being used for new and different applications.</p>
+
+<p>In addition, the LLVM optimizers and code generators are <b>constantly</b> being
+extended and improved (see the status updates for history of progress).  If 
+you have a code snippet that is not being compiled to very nice code, or
+have a suggestion for a new optimization to implement, please let us know 
+by sending mail to the <a href="http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev">llvmdev 
+mailing list</a> or <a href="/bugs">filing an enhancment request bug</a> 
+in bugzilla.</p>
+
+<div class="www_sectiontitle">Near-term LLVM Research</div>
 
                 The LLVM infrastructure underlies many ongoing
-                research projects in our group.  Some key additional
+                research projects in our group and others.  Some key additional
 		components of the system that are being developed in these
 		projects include:
               <ul>




From lattner at cs.uiuc.edu  Wed Jun  2 02:10:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 02:10:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406020706.CAA04461@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.3 -> 1.4

---
Log message:

Add a note about the V9 backend.


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.3 llvm/docs/CodeGenerator.html:1.4
--- llvm/docs/CodeGenerator.html:1.3	Tue Jun  1 13:35:00 2004
+++ llvm/docs/CodeGenerator.html	Wed Jun  2 02:06:06 2004
@@ -130,6 +130,18 @@
 make use of any of the built-in components.  Doing so is not recommended at all,
 but could be required for radically different targets that do not fit into the
 LLVM machine description model: programmable FPGAs for example.</p>
+
+<p><b>Important Note:</b> For historical reasons, the LLVM SparcV9 code
+generator uses almost entirely different code paths than described in this
+document.  For this reason, there are some deprecated interfaces (such as
+<tt>TargetRegInfo</tt> and <tt>TargetSchedInfo</tt>), which are only used by the
+V9 backend and should not be used by any other targets.  Also, all code in the
+<tt>lib/Target/SparcV9</tt> directory and subdirectories should be considered
+deprecated, and should not be used as the basis for future code generator work.
+The SparcV9 backend is slowly being merged into the rest of the target
+independent code generators, but this is a low-priority process with no
+predictable completion date.</p>
+
 </div>
 
 <!-- ======================================================================= -->
@@ -345,7 +357,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 18:35:00 $
+  Last modified: $Date: 2004/06/02 07:06:06 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Wed Jun  2 13:33:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Jun  2 13:33:02 2004
Subject: [llvm-commits] CVS: llvm-www/www-index.html
Message-ID: <200406021826.NAA25223@zion.cs.uiuc.edu>


Changes in directory llvm-www:

www-index.html updated: 1.104 -> 1.105

---
Log message:

"Here's your random application" is too personal; it's "a random application".


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

Index: llvm-www/www-index.html
diff -u llvm-www/www-index.html:1.104 llvm-www/www-index.html:1.105
--- llvm-www/www-index.html:1.104	Tue Jun  1 13:36:00 2004
+++ llvm-www/www-index.html	Wed Jun  2 13:26:38 2004
@@ -116,7 +116,7 @@
 
 <div class="www_sectiontitle">Neat uses and features of LLVM</div>
 
-<p>Here is your random application or feature of LLVM:</p>
+<p>Here is a random application or feature of LLVM:</p>
 
 <div class="doc_code">
 <!--#exec cgi="random-box.cgi"-->




From lattner at cs.uiuc.edu  Wed Jun  2 13:36:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 13:36:01 2004
Subject: [llvm-commits] CVS: llvm-gcc/ltcf-c.sh ltcf-gcj.sh
Message-ID: <200406021831.NAA30035@zion.cs.uiuc.edu>


Changes in directory llvm-gcc:

ltcf-c.sh updated: 1.1.1.1 -> 1.2
ltcf-gcj.sh updated: 1.1.1.1 -> 1.2

---
Log message:

Do not use the microsoft "lib" tool to build archive files.  It does not
understand LLVM bytecode files, and refuses to do the link.


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

Index: llvm-gcc/ltcf-c.sh
diff -u llvm-gcc/ltcf-c.sh:1.1.1.1 llvm-gcc/ltcf-c.sh:1.2
--- llvm-gcc/ltcf-c.sh:1.1.1.1	Thu Jan  8 15:58:37 2004
+++ llvm-gcc/ltcf-c.sh	Wed Jun  2 13:31:37 2004
@@ -381,7 +381,7 @@
     # The linker will automatically build a .lib file if we build a DLL.
     old_archive_from_new_cmds='true'
     # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+    ###old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
     fix_srcfile_path='`cygpath -w "$srcfile"`'
     ;;
 


Index: llvm-gcc/ltcf-gcj.sh
diff -u llvm-gcc/ltcf-gcj.sh:1.1.1.1 llvm-gcc/ltcf-gcj.sh:1.2
--- llvm-gcc/ltcf-gcj.sh:1.1.1.1	Thu Jan  8 15:58:37 2004
+++ llvm-gcc/ltcf-gcj.sh	Wed Jun  2 13:31:37 2004
@@ -374,7 +374,7 @@
     # The linker will automatically build a .lib file if we build a DLL.
     old_archive_from_new_cmds='true'
     # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+    ####old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
     fix_srcfile_path='`cygpath -w "$srcfile"`'
     ;;
 




From lattner at cs.uiuc.edu  Wed Jun  2 13:48:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 13:48:08 2004
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c
Message-ID: <200406021844.NAA30215@zion.cs.uiuc.edu>


Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.39 -> 1.40

---
Log message:

Non-functional change to be more like the standard GCC code paths for expansion


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

Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.39 llvm-gcc/gcc/llvm-expand.c:1.40
--- llvm-gcc/gcc/llvm-expand.c:1.39	Fri May  7 13:34:32 2004
+++ llvm-gcc/gcc/llvm-expand.c	Wed Jun  2 13:44:20 2004
@@ -2228,7 +2228,7 @@
     if (stmts_are_full_exprs_p ())    /* Provide a scope for C++ temporaries */
       llvm_expand_start_bindings(Fn);
 
-    llvm_expand_expr(Fn, FOR_EXPR(t), 0);
+    llvm_expand_expr_stmt_value(Fn, FOR_EXPR(t), 0);
 
     if (stmts_are_full_exprs_p ())
       llvm_expand_end_bindings(Fn, 0);




From lattner at cs.uiuc.edu  Wed Jun  2 13:49:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 13:49:02 2004
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-representation.h
Message-ID: <200406021845.NAA30227@zion.cs.uiuc.edu>


Changes in directory llvm-gcc/gcc:

llvm-representation.h updated: 1.6 -> 1.7

---
Log message:

Opaque types are composites too!
This fixes test/Regression/C++Frontend/2003-09-30-ForIncrementExprBug2: http://llvm.cs.uiuc.edu/PR2 .cpp


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

Index: llvm-gcc/gcc/llvm-representation.h
diff -u llvm-gcc/gcc/llvm-representation.h:1.6 llvm-gcc/gcc/llvm-representation.h:1.7
--- llvm-gcc/gcc/llvm-representation.h:1.6	Fri May  7 11:55:49 2004
+++ llvm-gcc/gcc/llvm-representation.h	Wed Jun  2 13:45:07 2004
@@ -417,7 +417,7 @@
   ((TY)->ID == PointerTyID ||                            \
    (llvm_type_is_primitive(TY) && (TY)->ID != VoidTyID))
 #define llvm_type_is_composite(TY) \
-  (((TY)->ID == StructTyID) || ((TY)->ID == ArrayTyID))
+  (((TY)->ID == StructTyID) || ((TY)->ID == ArrayTyID) || ((TY)->ID == OpaqueTyID))
 #define llvm_type_is_signed(TY) \
   ((TY) == SByteTy || (TY) == ShortTy || (TY) == IntTy || (TY) == LongTy)
 #define llvm_type_is_unsigned(TY) \




From gaeke at cs.uiuc.edu  Wed Jun  2 14:17:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 14:17:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/gccas.pod
Message-ID: <200406021912.OAA30575@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

gccas.pod added (r1.1)

---
Log message:

Look, it's a gccas pod.


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

Index: llvm/docs/CommandGuide/gccas.pod
diff -c /dev/null llvm/docs/CommandGuide/gccas.pod:1.1
*** /dev/null	Wed Jun  2 14:12:48 2004
--- llvm/docs/CommandGuide/gccas.pod	Wed Jun  2 14:12:38 2004
***************
*** 0 ****
--- 1,83 ----
+ 
+ =pod
+ 
+ =head1 NAME
+ 
+ gccas - optimizing LLVM assembler
+ 
+ =head1 SYNOPSIS
+ 
+ gccas [options] filename
+ 
+ =head1 DESCRIPTION
+ 
+ The B<gccas> utility takes an LLVM assembly file generated by the
+ L<llvm-gcc|llvm-gcc> or L<llvm-g++|llvm-g++> front-ends and converts
+ it into an LLVM bytecode file.  It is primarily used by the GCC
+ front end, and as such, attempts to mimic the interface provided
+ by the default system assembler so that it can act as a "drop-in"
+ replacement.
+ 
+ B<gccas> performs a number of optimizations on the input program,
+ including but not limited to: promotion of stack values to SSA
+ registers; elimination of dead globals, function arguments, code,
+ and types; tail-call elimination; loop-invariant code motion; global
+ common-subexpression elimination; and sparse conditional constant
+ propagation.
+ 
+ =head1 OPTIONS
+ 
+ =over
+ 
+ =item B<--help>
+ 
+ Print a summary of command line options.
+ 
+ =item B<-o> F<filename>
+ 
+ Specify the name of the output file which will hold the assembled bytecode.
+ 
+ =item B<--disable-inlining>
+ 
+ Disable the inlining pass.  By default, it is enabled.
+ 
+ =item B<--disable-opt>
+ 
+ Disable all assembler-time optimization passes.
+ 
+ =item B<--enable-correct-eh-support>
+ 
+ Instruct the B<-lowerinvoke> pass to insert code for correct exception handling
+ support.  This is expensive and is by default omitted for efficiency.
+ 
+ =item B<--stats>
+ 
+ Print statistics.
+ 
+ =item B<--time-passes>
+ 
+ Record the amount of time needed for each pass and print it to standard
+ error.
+ 
+ =item B<--verify>
+ 
+ Verify each pass result.
+ 
+ =back
+ 
+ =head1 EXIT STATUS
+ 
+ If B<gccas> succeeds, it will exit with an exit status of 0.
+ Otherwise, if an error occurs, it will exit with a non-zero exit
+ status.
+ 
+ =head1 SEE ALSO
+ 
+ L<llvm-as>, L<gccld>
+ 
+ =head1 AUTHORS
+ 
+ Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+ 
+ =cut
+ 




From gaeke at cs.uiuc.edu  Wed Jun  2 14:28:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 14:28:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/extract.pod
Message-ID: <200406021921.OAA30743@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

extract.pod added (r1.1)

---
Log message:

Here's another pod.


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

Index: llvm/docs/CommandGuide/extract.pod
diff -c /dev/null llvm/docs/CommandGuide/extract.pod:1.1
*** /dev/null	Wed Jun  2 14:21:36 2004
--- llvm/docs/CommandGuide/extract.pod	Wed Jun  2 14:21:26 2004
***************
*** 0 ****
--- 1,74 ----
+ 
+ =pod
+ 
+ =head1 NAME
+ 
+ extract - extract a function from an LLVM module
+ 
+ =head1 SYNOPSIS
+ 
+ extract [options] --func function-name [filename]
+ 
+ =head1 DESCRIPTION
+ 
+ The B<extract> command takes the name of a function and extracts it from
+ the specified LLVM bytecode file.  It is primarily used as a debugging tool to
+ reduce test cases from larger programs that are triggering a bug.
+ 
+ In addition to extracting the bytecode of the specified function,
+ B<extract> will also remove unreachable global variables, prototypes, and
+ unused types.
+ 
+ The B<extract> command reads its input from standard input if filename is
+ omitted or if filename is -.  The output is always written to standard output,
+ unless the B<-o> option is specified (see below).
+ 
+ =head1 OPTIONS
+ 
+ =over
+ 
+ =item B<-f>
+ 
+ Force overwrite.  Normally, B<extract> will refuse to overwrite an
+ output file that already exists.  With this option, B<extract>
+ will overwrite the output file and replace it with new bytecode.
+ 
+ =item B<--func> I<function-name>
+ 
+ Extract the function named I<function-name> from the LLVM bytecode.
+ 
+ =item B<--help>
+ 
+ Print a summary of command line options.
+ 
+ =item B<-o> I<filename>
+ 
+ Specify the output filename.  If filename is "-" (the default), then
+ B<extract> sends its output to standard output.
+ 
+ =item B<--stats>
+ 
+ Print statistics.
+ 
+ =item B<--time-passes>
+ 
+ Record the amount of time needed for each pass and print it to standard
+ error.
+ 
+ =back
+ 
+ =head1 EXIT STATUS
+ 
+ If B<extract> succeeds, it will exit with 0.  Otherwise, if an error
+ occurs, it will exit with a non-zero value.
+ 
+ =head1 SEE ALSO
+ 
+ L<bugpoint>
+ 
+ =head1 AUTHORS
+ 
+ Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+ 
+ =cut
+ 




From lattner at cs.uiuc.edu  Wed Jun  2 14:28:09 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 14:28:09 2004
Subject: [llvm-commits] CVS: llvm/docs/index.html
Message-ID: <200406021924.OAA31407@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

index.html updated: 1.16 -> 1.17

---
Log message:

Add a link to the code gen document


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

Index: llvm/docs/index.html
diff -u llvm/docs/index.html:1.16 llvm/docs/index.html:1.17
--- llvm/docs/index.html:1.16	Sun May 23 23:43:49 2004
+++ llvm/docs/index.html	Wed Jun  2 14:24:10 2004
@@ -105,6 +105,7 @@
 <li><a href="ProgrammersManual.html">LLVM Programmers Manual</a></li>
 <li><a href="WritingAnLLVMPass.html">Writing an LLVM Pass</a></li>
 <li><a href="AliasAnalysis.html">Alias Analysis in LLVM</a></li>
+<li><a href="CodeGenerator.html">The LLVM Target-Independent Code Generator</a></li>
 <li><a href="GarbageCollection.html">Accurate Garbage Collection with LLVM</a></li>
 <li><a href="SourceLevelDebugging.html">Source Level Debugging with
 LLVM</a></li>
@@ -180,7 +181,7 @@
 
   <a href="mailto:criswell [at] cs.uiuc.edu">John Criswell</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/24 04:43:49 $
+  Last modified: $Date: 2004/06/02 19:24:10 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Wed Jun  2 14:30:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 14:30:01 2004
Subject: [llvm-commits] CVS: llvm-www/Documentation.html
Message-ID: <200406021926.OAA32093@zion.cs.uiuc.edu>


Changes in directory llvm-www:

Documentation.html updated: 1.8 -> 1.9

---
Log message:

Add link to the codegen doc


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

Index: llvm-www/Documentation.html
diff -u llvm-www/Documentation.html:1.8 llvm-www/Documentation.html:1.9
--- llvm-www/Documentation.html:1.8	Tue May 25 12:38:05 2004
+++ llvm-www/Documentation.html	Wed Jun  2 14:25:52 2004
@@ -56,6 +56,11 @@
 on how to write a new alias analysis implementation or how to use existing
 analyses.</li>
 
+<li><a href="docs/CodeGenerator.html">The LLVM Target-Independent Code Generator</a> -
+The design an implementation of the LLVM code generator.  Useful if you are working
+on retargetting LLVM to a new architecture, designing a new codegen pass, or enhancing
+existing components.</li>
+
 <li><a href="docs/GarbageCollection.html">Accurate Garbage Collection with LLVM</a> -
 The interfaces source-language compilers should use for compiling GC'd programs.</li>
 




From lattner at cs.uiuc.edu  Wed Jun  2 14:35:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 14:35:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html
Message-ID: <200406021928.OAA00304@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CFEBuildInstrs.html updated: 1.17 -> 1.18

---
Log message:

cygwin apparently doesn't have widechar support.  But when disabled, the whole
C/C++ front-end and runtime libraries finally build!


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

Index: llvm/docs/CFEBuildInstrs.html
diff -u llvm/docs/CFEBuildInstrs.html:1.17 llvm/docs/CFEBuildInstrs.html:1.18
--- llvm/docs/CFEBuildInstrs.html:1.17	Tue Jun  1 13:13:05 2004
+++ llvm/docs/CFEBuildInstrs.html	Wed Jun  2 14:27:50 2004
@@ -110,7 +110,6 @@
 <p>
 <b>Linux/x86:</b> <br>
 <b>MacOS X/PowerPC:</b><br>
-<b>cygwin/x86:</b>
 </p>
 
 <pre>
@@ -122,9 +121,18 @@
  % gmake all; gmake install
 </pre>
 
-<p>
-<b>Solaris/SPARC:</b>
-</p>
+<p><b>cygwin/x86:</b></p>
+
+<pre>
+ % cd build
+ % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls --disable-shared \
+   --enable-languages=c,c++ --disable-c-mbchar
+ % gmake all-gcc
+ % setenv LLVM_LIB_SEARCH_PATH `pwd`/gcc 
+ % gmake all; gmake install
+</pre>
+
+<p><b>Solaris/SPARC:</b></p>
 
 <p>
 For Solaris/SPARC, LLVM only supports the SPARC V9.  Therefore, the
@@ -294,7 +302,7 @@
 
   Brian Gaeke<br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 18:13:05 $
+  Last modified: $Date: 2004/06/02 19:27:50 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Wed Jun  2 14:35:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 14:35:07 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/gccas.html gccas.pod
Message-ID: <200406021930.OAA00999@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

gccas.html updated: 1.7 -> 1.8
gccas.pod updated: 1.1 -> 1.2

---
Log message:

The --enable-correct-eh-support option is meaningless when provided to
gccas.


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

Index: llvm/docs/CommandGuide/gccas.html
diff -u llvm/docs/CommandGuide/gccas.html:1.7 llvm/docs/CommandGuide/gccas.html:1.8
--- llvm/docs/CommandGuide/gccas.html:1.7	Fri Mar 12 16:45:35 2004
+++ llvm/docs/CommandGuide/gccas.html	Wed Jun  2 14:30:23 2004
@@ -49,12 +49,6 @@
   Disable all assemble-time optimization passes.
 	<p>
 
-	<li>-enable-correct-eh-support
-	<br>
-	Instruct the -lowerinvoke pass to insert code for correct exception handling
-  support.  This is expensive and is by default omitted for efficiency.
-	<p>
-
 	<li> -stats
 	<br>
 	Print statistics.


Index: llvm/docs/CommandGuide/gccas.pod
diff -u llvm/docs/CommandGuide/gccas.pod:1.1 llvm/docs/CommandGuide/gccas.pod:1.2
--- llvm/docs/CommandGuide/gccas.pod:1.1	Wed Jun  2 14:12:38 2004
+++ llvm/docs/CommandGuide/gccas.pod	Wed Jun  2 14:30:23 2004
@@ -45,11 +45,6 @@
 
 Disable all assembler-time optimization passes.
 
-=item B<--enable-correct-eh-support>
-
-Instruct the B<-lowerinvoke> pass to insert code for correct exception handling
-support.  This is expensive and is by default omitted for efficiency.
-
 =item B<--stats>
 
 Print statistics.




From brukman at cs.uiuc.edu  Wed Jun  2 14:35:14 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Jun  2 14:35:14 2004
Subject: [llvm-commits] CVS: llvm-www/Documentation.html
Message-ID: <200406021931.OAA08935@zion.cs.uiuc.edu>


Changes in directory llvm-www:

Documentation.html updated: 1.9 -> 1.10

---
Log message:

Fix grammar, wrap long lines.


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

Index: llvm-www/Documentation.html
diff -u llvm-www/Documentation.html:1.9 llvm-www/Documentation.html:1.10
--- llvm-www/Documentation.html:1.9	Wed Jun  2 14:25:52 2004
+++ llvm-www/Documentation.html	Wed Jun  2 14:31:18 2004
@@ -56,17 +56,18 @@
 on how to write a new alias analysis implementation or how to use existing
 analyses.</li>
 
-<li><a href="docs/CodeGenerator.html">The LLVM Target-Independent Code Generator</a> -
-The design an implementation of the LLVM code generator.  Useful if you are working
-on retargetting LLVM to a new architecture, designing a new codegen pass, or enhancing
-existing components.</li>
-
-<li><a href="docs/GarbageCollection.html">Accurate Garbage Collection with LLVM</a> -
-The interfaces source-language compilers should use for compiling GC'd programs.</li>
-
-<li><a href="docs/SourceLevelDebugging.html">Source Level Debugging with LLVM</a> -
-This document describes the design and philosophy behind the LLVM source-level 
-debugger.</li>
+<li><a href="docs/CodeGenerator.html">The LLVM Target-Independent Code
+Generator</a> - The design and implementation of the LLVM code generator.
+Useful if you are working on retargetting LLVM to a new architecture, designing
+a new codegen pass, or enhancing existing components.</li>
+
+<li><a href="docs/GarbageCollection.html">Accurate Garbage Collection with
+LLVM</a> - The interfaces source-language compilers should use for compiling
+GC'd programs.</li>
+
+<li><a href="docs/SourceLevelDebugging.html">Source Level Debugging with
+LLVM</a> - This document describes the design and philosophy behind the LLVM
+source-level debugger.</li>
 
 <li><a href="docs/TableGenFundamentals.html">TableGen Fundamentals</a> -
 Describes the TableGen tool, which is used heavily by the LLVM code
@@ -75,6 +76,10 @@
 <li><a href="docs/CommandLine.html">CommandLine library Reference Manual</a> -
 Provides information on using the command line parsing library.</li>
 
+<li><a href="docs/ExtendingLLVM.html">Extending LLVM to suit your needs</a> -
+Required modifications to add new instructions, intrinsic functions, and
+types.</li>
+
 <li><a href="docs/CodingStandards.html">Recommended LLVM Coding standards</a> -
 Details the LLVM coding standards and provides useful information on writing
 efficient C++ code.</li>




From lattner at cs.uiuc.edu  Wed Jun  2 14:57:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 14:57:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/opt.html
Message-ID: <200406021951.OAA13460@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

opt.html updated: 1.11 -> 1.12

---
Log message:

The -q option is gone


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

Index: llvm/docs/CommandGuide/opt.html
diff -u llvm/docs/CommandGuide/opt.html:1.11 llvm/docs/CommandGuide/opt.html:1.12
--- llvm/docs/CommandGuide/opt.html:1.11	Mon Mar 29 14:21:45 2004
+++ llvm/docs/CommandGuide/opt.html	Wed Jun  2 14:51:09 2004
@@ -76,22 +76,6 @@
 	href="../ProgrammersManual.html#DEBUG">Programmer's Manual</a> for more
 	information.
 	<p>
-<!--
-	<li> -internalize-public-api-file &lt;filename&gt;
-	<br>
-	Preserve the symbol names listed in the file filename.
-	<p>
-
-	<li> -internalize-public-api-list=&lt;list&gt;
-	<br>
-	Perserve the symbol names specified.
-	<p>
--->
-
-	<li> -q
-	<br>
-	Quiet mode.  Do not print messages on whether the program was modified.
-	<p>
 
 	<li> -load &lt;plugin&gt;
 	<br>




From gaeke at cs.uiuc.edu  Wed Jun  2 15:20:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 15:20:01 2004
Subject: [llvm-commits] CVS: reopt/test/run-tests
Message-ID: <200406022019.PAA27108@kain.cs.uiuc.edu>


Changes in directory reopt/test:

run-tests updated: 1.1 -> 1.2

---
Log message:

On -clean -output runs, erase all outputs.


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

Index: reopt/test/run-tests
diff -u reopt/test/run-tests:1.1 reopt/test/run-tests:1.2
--- reopt/test/run-tests:1.1	Wed May 26 04:32:22 2004
+++ reopt/test/run-tests	Wed Jun  2 15:19:03 2004
@@ -71,7 +71,7 @@
 
 do_clean () {
   echo "cleaning in $fullsubdirpath"
-  rm $fullsubdirpath/Output/*.out-reopt-llc
+  rm $fullsubdirpath/Output/*.out-*
   if [ $outputonly -eq 0 ]; then
     find $fullsubdirpath -name "*reopt*" -print |xargs rm
   fi




From gaeke at cs.uiuc.edu  Wed Jun  2 15:34:03 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 15:34:03 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvm-as.pod
Message-ID: <200406022029.PAA13703@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

llvm-as.pod added (r1.1)

---
Log message:

Tasty, tasty pods...


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

Index: llvm/docs/CommandGuide/llvm-as.pod
diff -c /dev/null llvm/docs/CommandGuide/llvm-as.pod:1.1
*** /dev/null	Wed Jun  2 15:29:59 2004
--- llvm/docs/CommandGuide/llvm-as.pod	Wed Jun  2 15:29:49 2004
***************
*** 0 ****
--- 1,87 ----
+ =pod
+ 
+ =head1 NAME
+ 
+ llvm-as - LLVM assembler
+ 
+ =head1 SYNOPSIS
+ 
+ llvm-as [options] [filename]
+ 
+ =head1 DESCRIPTION
+ 
+ The B<llvm-as> command invokes the LLVM assembler.  It reads a file containing
+ human-readable LLVM assembly language, translates it to LLVM bytecode, and
+ writes the result into a file or to standard output.
+ 
+ If F<filename> is omitted or is C<->, then B<llvm-as> reads its input from
+ standard input.
+ 
+ If an output file is not specified with the B<-o> option, then
+ B<llvm-as> sends its output to a file or standard output by following
+ these rules:
+ 
+ =over 
+ 
+ =item *
+ 
+ If the input is standard input, then the output is standard output.
+ 
+ =item *
+ 
+ If the input is a file that ends with C<.ll>, then the output file is of
+ the same name, except that the suffix is changed to C<.bc>.
+ 
+ =item *
+ 
+ If the input is a file that does not end with the C<.ll> suffix, then the
+ output file has the same name as the input file, except that the C<.bc>
+ suffix is appended.
+ 
+ =back
+ 
+ =head1 OPTIONS
+ 
+ =over
+ 
+ =item B<-f>
+ 
+ Force overwrite.  Normally, B<llvm-as> will refuse to overwrite an
+ output file that already exists.  With this option, B<llvm-as>
+ will overwrite the output file and replace it with new bytecode.
+ 
+ =item B<--help>
+ 
+ Print a summary of command line options.
+ 
+ =item B<-o> F<filename>
+ 
+ Specify the output file name.  If F<filename> is C<->, then B<llvm-as>
+ sends its output to standard output.
+ 
+ =item B<--stats>
+ 
+ Print statistics.
+ 
+ =item B<--time-passes>
+ 
+ Record the amount of time needed for each pass and print it to standard
+ error.
+ 
+ =back
+ 
+ =head1 EXIT STATUS
+ 
+ If B<llvm-as> succeeds, it will exit with 0.  Otherwise, if an error
+ occurs, it will exit with a non-zero value.
+ 
+ =head1 SEE ALSO
+ 
+ L<llvm-dis>, L<gccas>
+ 
+ =head1 AUTHORS
+ 
+ Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+ 
+ =cut
+ 




From lattner at cs.uiuc.edu  Wed Jun  2 15:41:15 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 15:41:15 2004
Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html
Message-ID: <200406022037.PAA14442@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

GettingStarted.html updated: 1.56 -> 1.57

---
Log message:

Update to include llc on x86 and other systems


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

Index: llvm/docs/GettingStarted.html
diff -u llvm/docs/GettingStarted.html:1.56 llvm/docs/GettingStarted.html:1.57
--- llvm/docs/GettingStarted.html:1.56	Sun May 23 16:07:26 2004
+++ llvm/docs/GettingStarted.html	Wed Jun  2 15:37:02 2004
@@ -1142,18 +1142,19 @@
 
       <p><tt>% llvm-dis &lt; hello.bc | less</tt><p></li>
 
-  <li><p>Compile the program to native Sparc assembly using the code
-      generator (assuming you are currently on a Sparc system):</p>
+  <li><p>Compile the program to native assembly using the LLC code
+      generator:</p>
 
       <p><tt>% llc hello.bc -o hello.s</tt></p>
 
-  <li><p>Assemble the native sparc assemble file into a program:</p>
+  <li><p>Assemble the native assembly language file into a program:</p>
 
-      <p><tt>% /opt/SUNWspro/bin/cc -xarch=v9 hello.s -o hello.sparc</tt></p>
+      <p><b>Solaris:</b><tt>% /opt/SUNWspro/bin/cc -xarch=v9 hello.s -o hello.native</tt></p>
+      <p><b>Others:</b><tt>% gcc hello.s -o hello.native</tt></p>
 
-  <li><p>Execute the native sparc program:</p>
+  <li><p>Execute the native code program:</p>
 
-      <p><tt>% ./hello.sparc</tt></p></li>
+      <p><tt>% ./hello.native</tt></p></li>
 
 </ol>
 
@@ -1207,7 +1208,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:26 $
+  Last modified: $Date: 2004/06/02 20:37:02 $
 </address>
 
 </body>




From gaeke at cs.uiuc.edu  Wed Jun  2 15:49:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 15:49:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvm-dis.pod
Message-ID: <200406022045.PAA14663@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

llvm-dis.pod added (r1.1)

---
Log message:

The llvm-dis.html page was a little out of date, but this pod file can supersede it.


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

Index: llvm/docs/CommandGuide/llvm-dis.pod
diff -c /dev/null llvm/docs/CommandGuide/llvm-dis.pod:1.1
*** /dev/null	Wed Jun  2 15:45:35 2004
--- llvm/docs/CommandGuide/llvm-dis.pod	Wed Jun  2 15:45:25 2004
***************
*** 0 ****
--- 1,66 ----
+ =pod
+ 
+ =head1 NAME
+ 
+ llvm-dis - LLVM disassembler
+ 
+ =head1 SYNOPSIS
+ 
+ llvm-dis [options] [filename]
+ 
+ =head1 DESCRIPTION
+ 
+ The B<llvm-dis> command is the LLVM disassembler.  It takes an LLVM
+ bytecode file and converts it into human-readable LLVM assembly language.
+ 
+ If filename is omitted or specified as C<->, B<llvm-dis> reads its
+ input from standard input.
+ 
+ If the input is being read from standard input, then B<llvm-dis>
+ will send its output to standard output by default.  Otherwise, the
+ output will be written to a file named after the input file, with
+ a C<.ll> suffix added (any existing C<.bc> suffix will first be
+ removed).  You can override the choice of output file using the
+ B<-o> option.
+ 
+ =head1 OPTIONS
+ 
+ =over
+ 
+ =item B<-f>
+ 
+ Force overwrite.  Normally, B<llvm-dis> will refuse to overwrite
+ an output file that already exists.  With this option, B<llvm-dis>
+ will overwrite the output file.
+ 
+ =item B<--help>
+ 
+ Print a summary of command line options.
+ 
+ =item B<-o> F<filename>
+ 
+ Specify the output file name.  If F<filename> is -, then the output is sent
+ to standard output.
+ 
+ =item B<-time-passes>
+ 
+ Record the amount of time needed for each pass and print it to standard
+ error.
+ 
+ =back
+ 
+ =head1 EXIT STATUS
+ 
+ If B<llvm-dis> succeeds, it will exit with 0.  Otherwise, if an error
+ occurs, it will exit with a non-zero value.
+ 
+ =head1 SEE ALSO
+ 
+ L<llvm-as>
+ 
+ =head1 AUTHORS
+ 
+ Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+ 
+ =cut
+ 




From gaeke at cs.uiuc.edu  Wed Jun  2 16:04:47 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 16:04:47 2004
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvm-link.pod
Message-ID: <200406022056.PAA14851@zion.cs.uiuc.edu>


Changes in directory llvm/docs/CommandGuide:

llvm-link.pod added (r1.1)

---
Log message:

Another pod


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

Index: llvm/docs/CommandGuide/llvm-link.pod
diff -c /dev/null llvm/docs/CommandGuide/llvm-link.pod:1.1
*** /dev/null	Wed Jun  2 15:56:02 2004
--- llvm/docs/CommandGuide/llvm-link.pod	Wed Jun  2 15:55:52 2004
***************
*** 0 ****
--- 1,75 ----
+ =pod
+ 
+ =head1 NAME
+ 
+ llvm-link - LLVM linker
+ 
+ =head1 SYNOPSIS
+ 
+ llvm-link [options] filename [...]
+ 
+ =head1 DESCRIPTION
+ 
+ The B<llvm-link> command takes several LLVM bytecode files and links them
+ together into a single LLVM bytecode file.  It writes the output file to
+ standard output, unless the B<-o> option is used to specify a filename.
+ 
+ The B<llvm-link> command attempts to load the input files from the current
+ directory.  If that fails, it looks for each file in each of the directories
+ specified by the B<-L> options on the command line.  The library search paths
+ are global; each one is searched for every input file if necessary.  The
+ directories are searched in the order they were specified on the command line.
+ 
+ =head1 OPTIONS
+ 
+ =over
+ 
+ =item B<-L> F<directory>
+ 
+ Add the specified F<directory> to the library search path.  When looking for
+ libraries, B<llvm-link> will look in pathname for libraries.  This option can be
+ specified multiple times; B<llvm-link> will search inside these directories in
+ the order in which they were specified on the command line.
+ 
+ =item B<-f>
+ 
+ Overwrite output files.  By default, B<llvm-link> will not overwrite an output
+ file if it alreadys exists.
+ 
+ =item B<-o> F<filename>
+ 
+ Specify the output file name.  If F<filename> is C<->, then B<llvm-link> will
+ write its output to standard output.
+ 
+ =item B<-d>
+ 
+ If specified, B<llvm-link> prints a human-readable version of the output
+ bytecode file to standard error.
+ 
+ =item B<--help>
+ 
+ Print a summary of command line options.
+ 
+ =item B<-v>
+ 
+ Verbose mode.  Print information about what B<llvm-link> is doing.  This
+ typically includes a message for each bytecode file linked in and for each
+ library found.
+ 
+ =back
+ 
+ =head1 EXIT STATUS
+ 
+ If B<llvm-link> succeeds, it will exit with 0.  Otherwise, if an error
+ occurs, it will exit with a non-zero value.
+ 
+ =head1 SEE ALSO
+ 
+ L<gccld>
+ 
+ =head1 AUTHORS
+ 
+ Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+ 
+ =cut
+ 




From lattner at cs.uiuc.edu  Wed Jun  2 16:34:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 16:34:02 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile
Message-ID: <200406022130.QAA15104@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/power:

Makefile updated: 1.3 -> 1.4

---
Log message:

Add tolerance setting to allow test to pass on win32


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

Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile
diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.3 llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.3	Fri Sep 12 11:02:29 2003
+++ llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile	Wed Jun  2 16:30:07 2004
@@ -3,6 +3,7 @@
 PROG     = power
 CPPFLAGS = -DTORONTO
 LDFLAGS  = -lm
+FP_TOLERANCE = 0.00001
 
 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Wed Jun  2 16:41:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 16:41:02 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c
Message-ID: <200406022132.QAA15156@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/bh:

util.c updated: 1.2 -> 1.3

---
Log message:

Silly benchmark, 'extern int errno' is not portable!


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

Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c:1.2	Mon Nov 26 11:04:02 2001
+++ llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/util.c	Wed Jun  2 16:32:32 2004
@@ -7,6 +7,7 @@
  */
 
 #include "stdinc.h"
+#include <errno.h>
 
 #define A	16807.0
 #define M	2147483647.0
@@ -65,8 +66,6 @@
 
 error(char *msg)
 {
-    extern int errno;
-
     fprintf(stderr, msg);
     if (errno != 0)
         perror("Error");




From lattner at cs.uiuc.edu  Wed Jun  2 17:40:05 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 17:40:05 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c commands.c dir.c file.c function.c job.c main.c make.h misc.c read.c
Message-ID: <200406022235.RAA15941@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make:

arscan.c updated: 1.1 -> 1.2
commands.c updated: 1.1 -> 1.2
dir.c updated: 1.1 -> 1.2
file.c updated: 1.1 -> 1.2
function.c updated: 1.1 -> 1.2
job.c updated: 1.1 -> 1.2
main.c updated: 1.3 -> 1.4
make.h updated: 1.1 -> 1.2
misc.c updated: 1.1 -> 1.2
read.c updated: 1.1 -> 1.2

---
Log message:

This benchmark is a nasty, distrurbing hell of ifdefs
I though that people didn't write this kind of stuff anymore.  :(


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

Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c	Wed Jun  2 17:35:39 2004
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 #if	defined (USG) || defined (POSIX)
 #include <fcntl.h>
@@ -399,7 +400,6 @@
   register int fd;
   struct ar_hdr ar_hdr;
   register int i;
-  extern int errno;
   struct stat statbuf;
 
   if (pos < 0)


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/commands.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/commands.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/commands.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/commands.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/commands.c	Wed Jun  2 17:35:39 2004
@@ -342,7 +342,7 @@
      int sig;
 {
   signal (sig, SIG_DFL);
-#ifndef USG
+#if !defined(USG) && !defined(__CYGWIN__)
   (void) sigsetmask (0);
 #endif
 


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/dir.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/dir.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/dir.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/dir.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/dir.c	Wed Jun  2 17:35:39 2004
@@ -25,6 +25,10 @@
 #define SYSNDIR
 #endif /* Xenix */
 
+#if !defined(POSIX) && defined(__CYGWIN__)
+#define POSIX
+#endif
+
 #if defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__)
 #include <dirent.h>
 #define direct dirent


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/file.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/file.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/file.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/file.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/file.c	Wed Jun  2 17:35:39 2004
@@ -23,8 +23,6 @@
 #include <errno.h>
 
 
-extern int errno;
-
 
 /* Hash table of files the makefile knows how to make.  */
 


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/function.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/function.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/function.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/function.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/function.c	Wed Jun  2 17:35:39 2004
@@ -23,7 +23,6 @@
 #include "job.h"
 #include <errno.h>
 
-extern int errno;
 
 static char *string_glob ();
 


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c	Wed Jun  2 17:35:39 2004
@@ -22,6 +22,7 @@
 #include "file.h"
 #include "variable.h"
 #include <errno.h>
+#include <signal.h>
 
 /* Default path to search for executables.  */
 static char default_path[] = ":/bin:/usr/bin";
@@ -29,8 +30,6 @@
 /* Default shell to use.  */
 char default_shell[] = "/bin/sh";
 
-extern int errno;
-
 #if	defined(POSIX) || defined(__GNU_LIBRARY__)
 #include <limits.h>
 #include <unistd.h>
@@ -101,7 +100,7 @@
 #endif	/* WTERMSIG defined or USG and don't have <sys/wait.h>.  */
 
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__)
 
 #include <sys/types.h>
 #define	GID_T	gid_t
@@ -128,8 +127,7 @@
 extern int start_remote_job_p ();
 extern int start_remote_job (), remote_status ();
 
-
-#if	(defined(USG) && !defined(HAVE_SIGLIST)) || defined(DGUX)
+#if	(defined(USG) && !defined(HAVE_SIGLIST)) || defined(DGUX) || defined(__CYGWIN__)
 static char *sys_siglist[NSIG];
 void init_siglist ();
 #else	/* Not (USG and HAVE_SIGLIST), or DGUX.  */
@@ -180,10 +178,12 @@
 
 extern int fatal_signal_mask;
 
-#ifdef	USG
+#if defined(USG) || defined(__CYGWIN__)
+
 /* Set nonzero in the interval when it's possible that we may see a dead
    child that's not in the `children' chain.  */
 static int unknown_children_possible = 0;
+
 #endif
 
 
@@ -192,7 +192,7 @@
 static void
 block_signals ()
 {
-#ifdef USG
+#if defined(USG) || defined(__CYGWIN__)
 
   /* Tell child_handler that it might see children that aren't yet
      in the `children' chain.  */
@@ -216,7 +216,7 @@
 static void
 unblock_signals ()
 {
-#ifdef	USG
+#if defined(USG) || defined(__CYGWIN__)
 
   (void) SIGNAL (SIGCLD, child_handler);
 
@@ -1243,7 +1243,7 @@
   return argv;
 }
 
-#if	(defined(USG) && !defined(HAVE_SIGLIST)) || defined(DGUX)
+#if	(defined(USG) && !defined(HAVE_SIGLIST)) || defined(DGUX) || defined(__CYGWIN__)
 /* Initialize sys_siglist.  */
 
 void
@@ -1274,9 +1274,11 @@
       case SIGTRAP:
 	sys_siglist[i] = "Trace Trap";
 	break;
+#ifdef SIGIOT
       case SIGIOT:
 	sys_siglist[i] = "IOT Trap";
 	break;
+#endif
 #ifdef	SIGEMT
       case SIGEMT:
 	sys_siglist[i] = "EMT Trap";


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/main.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/main.c:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/main.c:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/main.c:1.3	Mon Apr  5 11:39:53 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/main.c	Wed Jun  2 17:35:39 2004
@@ -313,7 +313,9 @@
   FATAL_SIG (SIGINT);
   FATAL_SIG (SIGILL);
   FATAL_SIG (SIGTRAP);
+#ifdef SIGIOT
   FATAL_SIG (SIGIOT);
+#endif
 #ifdef	SIGEMT
   FATAL_SIG (SIGEMT);
 #endif


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h	Wed Jun  2 17:35:39 2004
@@ -212,16 +212,13 @@
 #define	VFORK_NAME	"vfork"
 #endif	/* USG and don't have vfork.  */
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__)
 
 #include <unistd.h>
+#include <signal.h>
 
 #else
 
-#ifndef	USG
-extern int sigsetmask ();
-extern int sigblock ();
-#endif
 extern int kill ();
 extern void abort (), exit ();
 extern int unlink (), stat ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c	Wed Jun  2 17:35:39 2004
@@ -17,6 +17,7 @@
 
 #include "make.h"
 #include "dep.h"
+#include <errno.h>
 
 
 /* Compare strings *S1 and *S2.
@@ -273,9 +274,6 @@
 perror_with_name (str, name)
      char *str, *name;
 {
-  extern int errno, sys_nerr;
-  extern const char * const sys_errlist[];
-
   if (errno < sys_nerr)
     error ("%s%s: %s", str, name, sys_errlist[errno]);
   else
@@ -288,9 +286,6 @@
 pfatal_with_name (name)
      char *name;
 {
-  extern int errno, sys_nerr;
-  extern const char *const sys_errlist[];
-
   if (errno < sys_nerr)
     fatal ("%s: %s", name, sys_errlist[errno]);
   else
@@ -481,7 +476,7 @@
 }
 #endif
 
-#if	!defined(POSIX) && !defined(__GNU_LIBRARY__)
+#if	!defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(__CYGWIN__)
 extern int getuid (), getgid (), geteuid (), getegid ();
 #ifdef	USG
 extern int setuid (), setgid ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.1	Tue Feb 17 09:50:33 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c	Wed Jun  2 17:35:39 2004
@@ -22,7 +22,7 @@
 #include "variable.h"
 
 /* This is POSIX.2, but most systems using -DPOSIX probably don't have it.  */
-#ifdef	__GNU_LIBRARY__
+#if defined(__GNU_LIBRARY__) || defined(__CYGWIN__)
 #include <glob.h>
 #else
 #include "glob/glob.h"




From lattner at cs.uiuc.edu  Wed Jun  2 18:06:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 18:06:01 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/Burg/gram.y
Message-ID: <200406022258.RAA16261@zion.cs.uiuc.edu>


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

gram.y updated: 1.1 -> 1.2

---
Log message:

Fix compatibility with bison 1.875b


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

Index: llvm/test/Programs/MultiSource/Applications/Burg/gram.y
diff -u llvm/test/Programs/MultiSource/Applications/Burg/gram.y:1.1 llvm/test/Programs/MultiSource/Applications/Burg/gram.y:1.2
--- llvm/test/Programs/MultiSource/Applications/Burg/gram.y:1.1	Mon Oct 14 11:39:22 2002
+++ llvm/test/Programs/MultiSource/Applications/Burg/gram.y	Wed Jun  2 17:58:22 2004
@@ -1,5 +1,5 @@
 %{
-char rcsid_gram[] = "$Id: gram.y,v 1.1 2002/10/14 16:39:22 vadve Exp $";
+char rcsid_gram[] = "$Id: gram.y,v 1.2 2004/06/02 22:58:22 lattner Exp $";
 
 #include <stdio.h>
 #include "b.h"
@@ -45,46 +45,46 @@
 	;
 
 spec	: decls K_PPERCENT rules
-		= { doSpec($1, $3); }
+		{ doSpec($1, $3); }
 	;
 
-decls	: /* lambda */	= { $$ = 0; }
-	| decls decl	= { $$ = newList($2, $1); }
+decls	: /* lambda */	{ $$ = 0; }
+	| decls decl	{ $$ = newList($2, $1); }
 	;
 
-decl	: K_TERM bindinglist	= { $$ = newArity(-1, $2); }
-	| K_GRAM grammarlist	= { $$ = 0; doGram($2); }
-	| K_START ID		= { $$ = 0; doStart($2); }	/* kludge */
+decl	: K_TERM bindinglist	{ $$ = newArity(-1, $2); }
+	| K_GRAM grammarlist	{ $$ = 0; doGram($2); }
+	| K_START ID		{ $$ = 0; doStart($2); }	/* kludge */
 	;
 
-grammarlist	: /* lambda */		= { $$ = 0; }
-		| grammarlist ID	= { $$ = newList($2, $1); }
+grammarlist	: /* lambda */		{ $$ = 0; }
+		| grammarlist ID	{ $$ = newList($2, $1); }
 		;
 
-bindinglist	: /* lambda */		= { $$ = 0; }
-		| bindinglist binding	= { $$ = newList($2, $1); }
+bindinglist	: /* lambda */		{ $$ = 0; }
+		| bindinglist binding	{ $$ = newList($2, $1); }
 		;
 
-binding	: ID '=' INT	= { $$ = newBinding($1, $3); }
+binding	: ID '=' INT	{ $$ = newBinding($1, $3); }
 	;
 
-rules	: /* lambda */	= { $$ = 0; }
-	| rules rule	= { $$ = newList($2, $1); }
+rules	: /* lambda */	{ $$ = 0; }
+	| rules rule	{ $$ = newList($2, $1); }
 	;
 
-rule	: ID ':' pattern '=' INT cost ';'	= { $$ = newRuleAST($1, $3, $5, $6); }
+rule	: ID ':' pattern '=' INT cost ';'	{ $$ = newRuleAST($1, $3, $5, $6); }
 		;
 
-pattern	: ID 					= { $$ = newPatternAST($1, 0); }
-	| ID '(' pattern ')'			= { $$ = newPatternAST($1, newList($3,0)); }
-	| ID '(' pattern ',' pattern ')'	= { $$ = newPatternAST($1, newList($3, newList($5, 0))); }
+pattern	: ID 					{ $$ = newPatternAST($1, 0); }
+	| ID '(' pattern ')'			{ $$ = newPatternAST($1, newList($3,0)); }
+	| ID '(' pattern ',' pattern ')'	{ $$ = newPatternAST($1, newList($3, newList($5, 0))); }
 	;
 
-cost	: /* lambda */		= { $$ = 0; }
-	| '(' INT costtail ')'	= { $$ = newIntList($2, $3); }
+cost	: /* lambda */		{ $$ = 0; }
+	| '(' INT costtail ')'	{ $$ = newIntList($2, $3); }
 	;
 
-costtail	: /* lambda */		= { $$ = 0; }
-		| ',' INT costtail	= { $$ = newIntList($2, $3); }
-		| INT costtail		= { $$ = newIntList($1, $2); }
+costtail	: /* lambda */		{ $$ = 0; }
+		| ',' INT costtail	{ $$ = newIntList($2, $3); }
+		| INT costtail		{ $$ = newIntList($1, $2); }
 		;




From lattner at cs.uiuc.edu  Wed Jun  2 18:15:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 18:15:02 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/siod/Makefile slibu.c
Message-ID: <200406022306.SAA16563@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Applications/siod:

Makefile updated: 1.4 -> 1.5
slibu.c updated: 1.4 -> 1.5

---
Log message:

Fix compatibility with cygwin


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

Index: llvm/test/Programs/MultiSource/Applications/siod/Makefile
diff -u llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.4 llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.5
--- llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.4	Fri Mar 12 15:13:20 2004
+++ llvm/test/Programs/MultiSource/Applications/siod/Makefile	Wed Jun  2 18:06:37 2004
@@ -2,7 +2,7 @@
 LEVEL = ../../../../..
 PROG     = siod
 CPPFLAGS = -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix
-LDFLAGS  = -lm -ldl
+LDFLAGS  = -lm $(TOOLLINKOPTS)
 
 RUN_OPTIONS = -v1 $(BUILD_SRC_DIR)/test.scm
 


Index: llvm/test/Programs/MultiSource/Applications/siod/slibu.c
diff -u llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.4 llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.5
--- llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.4	Fri Mar 12 15:13:25 2004
+++ llvm/test/Programs/MultiSource/Applications/siod/slibu.c	Wed Jun  2 18:06:37 2004
@@ -98,7 +98,7 @@
 
 static void init_slibu_version(void)
 {setvar(cintern("*slibu-version*"),
-	cintern("$Id: slibu.c,v 1.4 2004/03/12 21:13:25 gaeke Exp $"),
+	cintern("$Id: slibu.c,v 1.5 2004/06/02 23:06:37 lattner Exp $"),
 	NIL);}
 
 
@@ -720,6 +720,8 @@
  if (!r) return(NIL);
 #if defined(sun) || defined(sgi) || defined(linux)
  namlen = safe_strlen(r->d_name,r->d_reclen);
+#elif defined(__CYGWIN__)
+ namlen = strlen(r->d_name);
 #else
  namlen = r->d_namlen;
 #endif




From lattner at cs.uiuc.edu  Wed Jun  2 18:15:14 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 18:15:14 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp
Message-ID: <200406022310.SAA16634@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.180 -> 1.181

---
Log message:

<alloca.h> on cygwin pulls in a ton of stuff (macros and function protos)
that we REALLY don't want in the CBE code.

With this fix, the CBE passes all of the MultiSource tests on cygwin that
it does on linux.  Yaay!



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

Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.180 llvm/lib/Target/CBackend/Writer.cpp:1.181
--- llvm/lib/Target/CBackend/Writer.cpp:1.180	Fri May 28 00:47:27 2004
+++ llvm/lib/Target/CBackend/Writer.cpp	Wed Jun  2 18:10:26 2004
@@ -660,7 +660,7 @@
 static void generateCompilerSpecificCode(std::ostream& Out) {
   // Alloca is hard to get, and we don't want to include stdlib.h here...
   Out << "/* get a declaration for alloca */\n"
-      << "#ifdef sun\n"
+      << "#if defined(sun) || defined(__CYGWIN__)\n"
       << "extern void *__builtin_alloca(unsigned long);\n"
       << "#define alloca(x) __builtin_alloca(x)\n"
       << "#else\n"




From lattner at cs.uiuc.edu  Wed Jun  2 18:35:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 18:35:00 2004
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200406022331.SAA16764@zion.cs.uiuc.edu>


Changes in directory llvm:

configure updated: 1.90 -> 1.91

---
Log message:

Recognize cygwin


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

Index: llvm/configure
diff -u llvm/configure:1.90 llvm/configure:1.91
--- llvm/configure:1.90	Thu May 27 15:40:31 2004
+++ llvm/configure	Wed Jun  2 18:31:01 2004
@@ -1869,6 +1869,10 @@
              OS=Darwin
 
 	         ;;
+	*-*-cygwin*)
+             OS=Cygwin
+
+	         ;;
 
 	*)       OS=Unknown
 




From lattner at cs.uiuc.edu  Wed Jun  2 18:41:45 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 18:41:45 2004
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac
Message-ID: <200406022332.SAA16816@zion.cs.uiuc.edu>


Changes in directory llvm/autoconf:

configure.ac updated: 1.88 -> 1.89

---
Log message:

Recognize cygwin


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

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.88 llvm/autoconf/configure.ac:1.89
--- llvm/autoconf/configure.ac:1.88	Thu May 27 15:40:39 2004
+++ llvm/autoconf/configure.ac	Wed Jun  2 18:32:17 2004
@@ -103,6 +103,9 @@
 	           AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
 			 fi
 	         ;;
+	*-*-cygwin*)
+             AC_SUBST(OS,[Cygwin])
+	         ;;
 
 	*-*-darwin*)
              AC_SUBST(OS,[Darwin])




From gaeke at cs.uiuc.edu  Wed Jun  2 21:55:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 21:55:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200406030245.VAA17623@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.45 -> 1.46

---
Log message:

Collapse together the abstract superclass TargetRegInfo and SparcV9RegInfo, its
only concrete implementation.


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

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.45 llvm/include/llvm/Target/TargetMachine.h:1.46
--- llvm/include/llvm/Target/TargetMachine.h:1.45	Wed Jun  2 00:53:25 2004
+++ llvm/include/llvm/Target/TargetMachine.h	Wed Jun  2 21:45:09 2004
@@ -23,7 +23,7 @@
 class TargetInstrDescriptor;
 class TargetJITInfo;
 class TargetSchedInfo;
-class TargetRegInfo;
+class SparcV9RegInfo;
 class TargetFrameInfo;
 class MachineCodeEmitter;
 class MRegisterInfo;
@@ -90,7 +90,7 @@
 
   // These are deprecated interfaces.
   virtual const TargetSchedInfo        *getSchedInfo() const { return 0; }
-  virtual const TargetRegInfo          *getRegInfo()   const { return 0; }
+  virtual const SparcV9RegInfo         *getRegInfo()   const { return 0; }
 
   /// addPassesToEmitAssembly - Add passes to the specified pass manager to get
   /// assembly langage code emitted.  Typically this will involve several steps




From gaeke at cs.uiuc.edu  Wed Jun  2 21:55:09 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 21:55:09 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/MachineInstrAnnot.h SparcV9CodeEmitter.cpp SparcV9InstrSelection.cpp SparcV9RegClassInfo.h SparcV9RegInfo.cpp SparcV9RegInfo.h SparcV9TargetMachine.h
Message-ID: <200406030245.VAA17647@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

MachineInstrAnnot.h updated: 1.15 -> 1.16
SparcV9CodeEmitter.cpp updated: 1.63 -> 1.64
SparcV9InstrSelection.cpp updated: 1.142 -> 1.143
SparcV9RegClassInfo.h updated: 1.27 -> 1.28
SparcV9RegInfo.cpp updated: 1.127 -> 1.128
SparcV9RegInfo.h updated: 1.13 -> 1.14
SparcV9TargetMachine.h updated: 1.9 -> 1.10

---
Log message:

Collapse together the abstract superclass TargetRegInfo and SparcV9RegInfo, its
only concrete implementation.


---
Diffs of the changes:  (+64 -150)

Index: llvm/lib/Target/SparcV9/MachineInstrAnnot.h
diff -u llvm/lib/Target/SparcV9/MachineInstrAnnot.h:1.15 llvm/lib/Target/SparcV9/MachineInstrAnnot.h:1.16
--- llvm/lib/Target/SparcV9/MachineInstrAnnot.h:1.15	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/MachineInstrAnnot.h	Wed Jun  2 21:45:09 2004
@@ -37,7 +37,7 @@
 public:
   // Constructors
   CallArgInfo(Value* _argVal)
-    : argVal(_argVal), argCopyReg(TargetRegInfo::getInvalidRegNum()),
+    : argVal(_argVal), argCopyReg(SparcV9RegInfo::getInvalidRegNum()),
       passingMethod(0x0) {}
   
   CallArgInfo(const CallArgInfo& obj)


Index: llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.63 llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.64
--- llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.63	Wed Jun  2 00:54:42 2004
+++ llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp	Wed Jun  2 21:45:09 2004
@@ -474,7 +474,7 @@
 unsigned 
 SparcV9CodeEmitter::getRealRegNum(unsigned fakeReg,
                                   MachineInstr &MI) {
-  const TargetRegInfo &RI = *TM.getRegInfo();
+  const SparcV9RegInfo &RI = *TM.getRegInfo();
   unsigned regClass, regType = RI.getRegType(fakeReg);
   // At least map fakeReg into its class
   fakeReg = RI.getClassRegNum(fakeReg, regClass);


Index: llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.142 llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.143
--- llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp:1.142	Wed Jun  2 00:54:43 2004
+++ llvm/lib/Target/SparcV9/SparcV9InstrSelection.cpp	Wed Jun  2 21:45:09 2004
@@ -2527,7 +2527,7 @@
             const Type* argType = argVal->getType();
             unsigned regType = regInfo.getRegTypeForDataType(argType);
             unsigned argSize = target.getTargetData().getTypeSize(argType);
-            int regNumForArg = TargetRegInfo::getInvalidRegNum();
+            int regNumForArg = SparcV9RegInfo::getInvalidRegNum();
             unsigned regClassIDOfArgReg;
 
             // Check for FP arguments to varargs functions.


Index: llvm/lib/Target/SparcV9/SparcV9RegClassInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9RegClassInfo.h:1.27 llvm/lib/Target/SparcV9/SparcV9RegClassInfo.h:1.28
--- llvm/lib/Target/SparcV9/SparcV9RegClassInfo.h:1.27	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegClassInfo.h	Wed Jun  2 21:45:09 2004
@@ -9,7 +9,7 @@
 //
 // This file defines the register classes used by the SparcV9 target. It
 // implicitly defines (using enums) the "class register numbers" used in
-// the SparcV9 target, which are converted using a formula in the TargetRegInfo
+// the SparcV9 target, which are converted using a formula in the SparcV9RegInfo
 // class to "unified register numbers".
 //
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.127 llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.128
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.127	Wed Jun  2 00:54:43 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp	Wed Jun  2 21:45:09 2004
@@ -36,7 +36,7 @@
 };
 
 SparcV9RegInfo::SparcV9RegInfo(const SparcV9TargetMachine &tgt)
-  : TargetRegInfo(tgt), NumOfIntArgRegs(6), NumOfFloatArgRegs(32)
+  : target (tgt), NumOfIntArgRegs (6), NumOfFloatArgRegs (32)
 {
   MachineRegClassArr.push_back(new SparcV9IntRegClass(IntRegClassID));
   MachineRegClassArr.push_back(new SparcV9FloatRegClass(FloatRegClassID));


Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.13 llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.14
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.13	Fri Apr 23 16:45:02 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.h	Wed Jun  2 21:45:09 2004
@@ -53,7 +53,7 @@
   // This defaults to marking a single register but may mark multiple
   // registers when a single number denotes paired registers.
   // 
-  virtual void markColorsUsed(unsigned RegInClass,
+  void markColorsUsed(unsigned RegInClass,
                               int UserRegType,
                               int RegTypeWanted,
                               std::vector<bool> &IsColorUsedArr) const {
@@ -69,7 +69,7 @@
   // for paired registers and other such silliness.
   // It returns -1 if no unused color is found.
   // 
-  virtual int findUnusedColor(int RegTypeWanted,
+  int findUnusedColor(int RegTypeWanted,
                           const std::vector<bool> &IsColorUsedArr) const {
     // find first unused color in the IsColorUsedArr directly
     unsigned NC = this->getNumOfAvailRegs();
@@ -82,30 +82,28 @@
 
   // This method should find a color which is not used by neighbors
   // (i.e., a false position in IsColorUsedArr) and 
-  virtual void colorIGNode(IGNode *Node,
-                           const std::vector<bool> &IsColorUsedArr) const = 0;
+  void colorIGNode(IGNode *Node,
+                           const std::vector<bool> &IsColorUsedArr) const;
 
   // Check whether a specific register is volatile, i.e., whether it is not
   // preserved across calls
-  virtual bool isRegVolatile(int Reg) const = 0;
+  bool isRegVolatile(int Reg) const;
 
   // Check whether a specific register is modified as a side-effect of the
   // call instruction itself,
-  virtual bool modifiedByCall(int Reg) const {return false; }
+  bool modifiedByCall(int Reg) const {return false; }
 
-  virtual const char* const getRegName(unsigned reg) const = 0;
+  virtual const char* const getRegName(unsigned reg) const;
 
   TargetRegClassInfo(unsigned ID, unsigned NVR, unsigned NAR)
     : RegClassID(ID), NumOfAvailRegs(NVR), NumOfAllRegs(NAR) {}
 };
 
-
-//---------------------------------------------------------------------------
-/// TargetRegInfo - Interface to register info of target machine
+/// SparcV9RegInfo - Interface to register info of SparcV9 target machine
 ///
-class TargetRegInfo {
-  TargetRegInfo(const TargetRegInfo &);  // DO NOT IMPLEMENT
-  void operator=(const TargetRegInfo &); // DO NOT IMPLEMENT
+class SparcV9RegInfo {
+  SparcV9RegInfo(const SparcV9RegInfo &);  // DO NOT IMPLEMENT
+  void operator=(const SparcV9RegInfo &); // DO NOT IMPLEMENT
 protected:
   // A vector of all machine register classes
   //
@@ -119,20 +117,21 @@
   //
   static int getInvalidRegNum() { return -1; }
 
-  TargetRegInfo(const TargetMachine& tgt) : target(tgt) { }
-  virtual ~TargetRegInfo() {
-    for (unsigned i = 0, e = MachineRegClassArr.size(); i != e; ++i)
-      delete MachineRegClassArr[i];
-  }
 
   // According the definition of a MachineOperand class, a Value in a
   // machine instruction can go into either a normal register or a 
   // condition code register. If isCCReg is true below, the ID of the condition
   // code register class will be returned. Otherwise, the normal register
   // class (eg. int, float) must be returned.
-  virtual unsigned getRegClassIDOfType  (const Type *type,
-					 bool isCCReg = false) const = 0;
-  virtual unsigned getRegClassIDOfRegType(int regType) const = 0;
+
+  // To find the register class used for a specified Type
+  //
+  unsigned getRegClassIDOfType  (const Type *type,
+					 bool isCCReg = false) const;
+
+  // To find the register class to which a specified register belongs
+  //
+  unsigned getRegClassIDOfRegType(int regType) const;
 
   unsigned getRegClassIDOfReg(int unifiedRegNum) const {
     unsigned classId = 0;
@@ -148,88 +147,48 @@
     return MachineRegClassArr[i]; 
   }
 
-  // returns the register that is hardwired to zero if any (-1 if none)
+  // getZeroRegNum - returns the register that is hardwired to always contain
+  // zero, if any (-1 if none). This is the unified register number.
   //
-  virtual unsigned getZeroRegNum() const = 0;
-
-  // Number of registers used for passing int args (usually 6: %o0 - %o5)
-  // and float args (usually 32: %f0 - %f31)
-  //
-  virtual unsigned const getNumOfIntArgRegs() const   = 0;
-  virtual unsigned const getNumOfFloatArgRegs() const = 0;
+  unsigned getZeroRegNum() const;
 
   // The following methods are used to color special live ranges (e.g.
   // method args and return values etc.) with specific hardware registers
   // as required. See SparcRegInfo.cpp for the implementation for Sparc.
   //
-  virtual void suggestRegs4MethodArgs(const Function *Func, 
-                                      LiveRangeInfo& LRI) const = 0;
+  void suggestRegs4MethodArgs(const Function *Func, 
+                                      LiveRangeInfo& LRI) const;
 
-  virtual void suggestRegs4CallArgs(MachineInstr *CallI, 
-                                    LiveRangeInfo& LRI) const = 0;
+  void suggestRegs4CallArgs(MachineInstr *CallI, 
+                                    LiveRangeInfo& LRI) const;
 
-  virtual void suggestReg4RetValue(MachineInstr *RetI, 
-				   LiveRangeInfo& LRI) const = 0;
+  void suggestReg4RetValue(MachineInstr *RetI, 
+				   LiveRangeInfo& LRI) const;
 
-  virtual void colorMethodArgs(const Function *Func,
+  void colorMethodArgs(const Function *Func,
                            LiveRangeInfo &LRI,
                            std::vector<MachineInstr*>& InstrnsBefore,
-                           std::vector<MachineInstr*>& InstrnsAfter) const = 0;
+                           std::vector<MachineInstr*>& InstrnsAfter) const;
 
-  // The following methods are used to generate "copy" machine instructions
-  // for an architecture. Currently they are used in TargetRegClass 
-  // interface. However, they can be moved to TargetInstrInfo interface if
-  // necessary.
-  //
-  // The function regTypeNeedsScratchReg() can be used to check whether a
-  // scratch register is needed to copy a register of type `regType' to
-  // or from memory.  If so, such a scratch register can be provided by
-  // the caller (e.g., if it knows which regsiters are free); otherwise
-  // an arbitrary one will be chosen and spilled by the copy instructions.
-  // If a scratch reg is needed, the reg. type that must be used
-  // for scratch registers is returned in scratchRegType.
-  //
-  virtual bool regTypeNeedsScratchReg(int RegType,
-                                      int& scratchRegType) const = 0;
-  
-  virtual void cpReg2RegMI(std::vector<MachineInstr*>& mvec,
-                           unsigned SrcReg, unsigned DestReg,
-                           int RegType) const = 0;
-  
-  virtual void cpReg2MemMI(std::vector<MachineInstr*>& mvec,
-                           unsigned SrcReg, unsigned DestPtrReg, int Offset,
-                           int RegType, int scratchReg = -1) const=0;
-
-  virtual void cpMem2RegMI(std::vector<MachineInstr*>& mvec,
-                           unsigned SrcPtrReg, int Offset, unsigned DestReg,
-                           int RegType, int scratchReg = -1) const=0;
-  
-  virtual void cpValue2Value(Value *Src, Value *Dest,
-                             std::vector<MachineInstr*>& mvec) const = 0;
 
   // Check whether a specific register is volatile, i.e., whether it is not
   // preserved across calls
-  inline virtual bool isRegVolatile(int RegClassID, int Reg) const {
+  inline bool isRegVolatile(int RegClassID, int Reg) const {
     return MachineRegClassArr[RegClassID]->isRegVolatile(Reg);
   }
 
   // Check whether a specific register is modified as a side-effect of the
   // call instruction itself,
-  inline virtual bool modifiedByCall(int RegClassID, int Reg) const {
+  inline bool modifiedByCall(int RegClassID, int Reg) const {
     return MachineRegClassArr[RegClassID]->modifiedByCall(Reg);
   }
   
-  // Returns the reg used for pushing the address when a method is called.
-  // This can be used for other purposes between calls
+  // getCallAddressReg - Returns the reg used for pushing the address
+  // when a method is called. This can be used for other purposes
+  // between calls
   //
-  virtual unsigned getCallAddressReg() const = 0;
+  unsigned getCallAddressReg() const;
 
-  // Returns the register containing the return address.
-  //It should be made sure that this 
-  // register contains the return value when a return instruction is reached.
-  //
-  virtual unsigned getReturnAddressReg() const = 0; 
-  
   // Each register class has a separate space for register IDs. To convert
   // a regId in a register class to a common Id, or vice versa,
   // we use the folloing two methods.
@@ -272,29 +231,18 @@
     return MachineRegClassArr[regClassID]->getRegName(regNumInClass);
   }
 
-  // Get the register type for a register identified different ways.
-  // Note that getRegTypeForLR(LR) != getRegTypeForDataType(LR->getType())!
-  // The reg class of a LR depends both on the Value types in it and whether
-  // they are CC registers or not (for example).
-  virtual int getRegTypeForDataType(const Type* type) const = 0;
-  virtual int getRegTypeForLR(const LiveRange *LR) const = 0;
-  virtual int getRegType(int unifiedRegNum) const = 0;
-  
-  // The following methods are used to get the frame/stack pointers
-  // 
-  virtual unsigned getFramePointer() const = 0;
-  virtual unsigned getStackPointer() const = 0;
-
   // This method gives the the number of bytes of stack space allocated 
-  // to a register when it is spilled to the stack.
+  // to a register when it is spilled to the stack, according to its
+  // register type.
   //
-  virtual int getSpilledRegSize(int RegType) const = 0;
-};
-
+  // For SparcV9, currently we allocate 8 bytes on stack for all 
+  // register types. We can optimize this later if necessary to save stack
+  // space (However, should make sure that stack alignment is correct)
+  //
+  int getSpilledRegSize(int RegType) const {
+    return 8;
+  }
 
-/// This class implements the virtual class TargetRegInfo for SparcV9.
-///
-class SparcV9RegInfo : public TargetRegInfo {
 private:
   // Number of registers used for passing int args (usually 6: %o0 - %o5)
   //
@@ -346,24 +294,10 @@
 
   SparcV9RegInfo(const SparcV9TargetMachine &tgt);
 
-  // To find the register class used for a specified Type
-  //
-  unsigned getRegClassIDOfType(const Type *type,
-                               bool isCCReg = false) const;
-
-  // To find the register class to which a specified register belongs
-  //
-  unsigned getRegClassIDOfRegType(int regType) const;
-  
-  // getZeroRegNum - returns the register that contains always zero this is the
-  // unified register number
-  //
-  virtual unsigned getZeroRegNum() const;
-
-  // getCallAddressReg - returns the reg used for pushing the address when a
-  // function is called. This can be used for other purposes between calls
-  //
-  unsigned getCallAddressReg() const;
+  ~SparcV9RegInfo() {
+    for (unsigned i = 0, e = MachineRegClassArr.size(); i != e; ++i)
+      delete MachineRegClassArr[i];
+  }
 
   // Returns the register containing the return address.
   // It should be made sure that this  register contains the return 
@@ -385,35 +319,10 @@
   int regNumForFPArg(unsigned RegType, bool inCallee, bool isVarArgsCall,
                      unsigned argNo, unsigned& regClassId) const;
   
-  // The following methods are used to color special live ranges (e.g.
-  // function args and return values etc.) with specific hardware registers
-  // as required. See SparcV9RegInfo.cpp for the implementation for SparcV9.
-  //
-  void suggestRegs4MethodArgs(const Function *Meth, 
-			      LiveRangeInfo& LRI) const;
-
-  void suggestRegs4CallArgs(MachineInstr *CallMI, 
-			    LiveRangeInfo& LRI) const; 
-
-  void suggestReg4RetValue(MachineInstr *RetMI, 
-                           LiveRangeInfo& LRI) const;
-  
-  void colorMethodArgs(const Function *Meth,  LiveRangeInfo& LRI,
-                       std::vector<MachineInstr*>& InstrnsBefore,
-                       std::vector<MachineInstr*>& InstrnsAfter) const;
 
   // method used for printing a register for debugging purposes
   //
   void printReg(const LiveRange *LR) const;
-  
-  // returns the # of bytes of stack space allocated for each register
-  // type. For SparcV9, currently we allocate 8 bytes on stack for all 
-  // register types. We can optimize this later if necessary to save stack
-  // space (However, should make sure that stack alignment is correct)
-  //
-  inline int getSpilledRegSize(int RegType) const {
-    return 8;
-  }
 
   // To obtain the return value and the indirect call address (if any)
   // contained in a CALL machine instruction
@@ -422,14 +331,19 @@
   const Value * getCallInstIndirectAddrVal(const MachineInstr *CallMI) const;
 
   // The following methods are used to generate "copy" machine instructions
-  // for an architecture.
+  // for an architecture. Currently they are used in TargetRegClass 
+  // interface. However, they can be moved to TargetInstrInfo interface if
+  // necessary.
   //
   // The function regTypeNeedsScratchReg() can be used to check whether a
   // scratch register is needed to copy a register of type `regType' to
   // or from memory.  If so, such a scratch register can be provided by
   // the caller (e.g., if it knows which regsiters are free); otherwise
   // an arbitrary one will be chosen and spilled by the copy instructions.
+  // If a scratch reg is needed, the reg. type that must be used
+  // for scratch registers is returned in scratchRegType.
   //
+
   bool regTypeNeedsScratchReg(int RegType,
                               int& scratchRegClassId) const;
 
@@ -456,8 +370,8 @@
   int getRegTypeForLR(const LiveRange *LR) const;
   int getRegType(int unifiedRegNum) const;
 
-  virtual unsigned getFramePointer() const;
-  virtual unsigned getStackPointer() const;
+  unsigned getFramePointer() const;
+  unsigned getStackPointer() const;
 };
 
 } // End llvm namespace


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.h
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.9 llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.10
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.9	Wed Jun  2 00:54:43 2004
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.h	Wed Jun  2 21:45:09 2004
@@ -36,7 +36,7 @@
   
   virtual const TargetInstrInfo  *getInstrInfo() const { return &instrInfo; }
   virtual const TargetSchedInfo  *getSchedInfo() const { return &schedInfo; }
-  virtual const TargetRegInfo    *getRegInfo()   const { return &regInfo; }
+  virtual const SparcV9RegInfo   *getRegInfo()   const { return &regInfo; }
   virtual const TargetFrameInfo  *getFrameInfo() const { return &frameInfo; }
   virtual       TargetJITInfo    *getJITInfo()         { return &jitInfo; }
   virtual const MRegisterInfo    *getRegisterInfo() const {




From gaeke at cs.uiuc.edu  Wed Jun  2 21:55:15 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Jun  2 21:55:15 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h PhyRegAlloc.cpp PhyRegAlloc.h RegClass.cpp RegClass.h
Message-ID: <200406030245.VAA17655@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

LiveRangeInfo.h updated: 1.23 -> 1.24
PhyRegAlloc.cpp updated: 1.150 -> 1.151
PhyRegAlloc.h updated: 1.67 -> 1.68
RegClass.cpp updated: 1.29 -> 1.30
RegClass.h updated: 1.22 -> 1.23

---
Log message:

Collapse together the abstract superclass TargetRegInfo and SparcV9RegInfo, its
only concrete implementation.


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

Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.23 llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.24
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.23	Tue Nov 11 16:41:33 2003
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h	Wed Jun  2 21:45:09 2004
@@ -34,7 +34,7 @@
 class LiveRange;
 class MachineInstr;
 class RegClass;
-class TargetRegInfo;
+class SparcV9RegInfo;
 class TargetMachine;
 class Value;
 class Function;
@@ -59,7 +59,7 @@
 
   std::vector<RegClass *> & RegClassList;// vector containing register classess
 
-  const TargetRegInfo& MRI;        // machine reg info
+  const SparcV9RegInfo& MRI;        // machine reg info
 
   std::vector<MachineInstr*> CallRetInstrList;  // a list of all call/ret instrs
 


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.150 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.151
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.150	Wed Jun  2 00:55:00 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Wed Jun  2 21:45:09 2004
@@ -1003,7 +1003,7 @@
 /// setRelRegsUsedByThisInst().
 ///
 static void markRegisterUsed(int RegNo, RegClass *RC, int RegType,
-                             const TargetRegInfo &TRI) {
+                             const SparcV9RegInfo &TRI) {
   unsigned classId = 0;
   int classRegNum = TRI.getClassRegNum(RegNo, classId);
   if (RC->getID() == classId)


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.67 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.68
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.67	Wed Jun  2 00:55:00 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h	Wed Jun  2 21:45:09 2004
@@ -69,7 +69,7 @@
   FunctionLiveVarInfo *LVI;             // LV information for this method 
                                         // (already computed for BBs) 
   LiveRangeInfo *LRI;                   // LR info  (will be computed)
-  const TargetRegInfo &MRI;             // Machine Register information
+  const SparcV9RegInfo &MRI;            // Machine Register information
   const unsigned NumOfRegClasses;       // recorded here for efficiency
 
   // Map to indicate whether operands of each MachineInstr have been


Index: llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.29 llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.30
--- llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.29	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp	Wed Jun  2 21:45:09 2004
@@ -23,7 +23,7 @@
 // createInterferenceGraph() above.
 //----------------------------------------------------------------------------
 RegClass::RegClass(const Function *M, 
-                   const TargetRegInfo *_MRI_,
+                   const SparcV9RegInfo *_MRI_,
 		   const TargetRegClassInfo *_MRC_)
                   :  Meth(M), MRI(_MRI_), MRC(_MRC_),
                      RegClassID( _MRC_->getRegClassID() ),


Index: llvm/lib/Target/SparcV9/RegAlloc/RegClass.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.22 llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.23
--- llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.22	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/RegClass.h	Wed Jun  2 21:45:09 2004
@@ -45,7 +45,7 @@
 //-----------------------------------------------------------------------------
 class RegClass {
   const Function *const Meth;           // Function we are working on
-  const TargetRegInfo *MRI;             // Machine register information 
+  const SparcV9RegInfo *MRI;            // Machine register information 
   const TargetRegClassInfo *const MRC;  // Machine reg. class for this RegClass
   const unsigned RegClassID;            // my int ID
 
@@ -87,7 +87,7 @@
  public:
 
   RegClass(const Function *M,
-	   const TargetRegInfo *_MRI_,
+	   const SparcV9RegInfo *_MRI_,
 	   const TargetRegClassInfo *_MRC_);
 
   inline void createInterferenceGraph() { IG.createGraph(); }




From lattner at cs.uiuc.edu  Wed Jun  2 22:41:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Jun  2 22:41:00 2004
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200406030329.WAA18147@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.48 -> 1.49

---
Log message:

Add -disable-codegen option to disable LLC and JIT targets


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

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.48 llvm/utils/NightlyTest.pl:1.49
--- llvm/utils/NightlyTest.pl:1.48	Mon May 31 15:59:55 2004
+++ llvm/utils/NightlyTest.pl	Wed Jun  2 22:29:39 2004
@@ -21,6 +21,7 @@
 #                   LARGE_PROBLEM_SIZE enabled.
 #  -parallel        Run two parallel jobs with GNU Make.
 #  -enable-linscan  Enable linearscan tests
+#  -disable-codegen Disable LLC and JIT tests in the nightly tester.
 #  -verbose         Turn on some debug output
 #  -debug           Print information useful only to maintainers of this script.
 #
@@ -129,7 +130,7 @@
 my $NOTEST     = 0;
 my $NORUNNINGTESTS = 0;
 my $MAKEOPTS   = "";
-my $ENABLELINEARSCAN = "";
+my $PROGTESTOPTS = "";
 my $VERBOSE  = 0;
 my $DEBUG = 0;
 
@@ -141,12 +142,13 @@
   # List command line options here...
   if (/^-nocheckout$/)     { $NOCHECKOUT = 1; next; }
   if (/^-noremove$/)       { $NOREMOVE   = 1; next; }
-  if (/^-nofeaturetests$/) { $NOFEATURES   = 1; next; }
-  if (/^-noregressiontests$/){ $NOREGRESSIONS   = 1; next; }
+  if (/^-nofeaturetests$/) { $NOFEATURES = 1; next; }
+  if (/^-noregressiontests$/){ $NOREGRESSIONS = 1; next; }
   if (/^-notest$/)         { $NOTEST     = 1; $NORUNNINGTESTS = 1; next; }
   if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
   if (/^-parallel$/)       { $MAKEOPTS   = "-j2 -l3.0"; next; }
-  if (/^-enable-linscan$/) { $ENABLELINEARSCAN = "ENABLE_LINEARSCAN=1"; next; }
+  if (/^-enable-linscan$/) { $PROGTESTOPTS .= " ENABLE_LINEARSCAN=1"; next; }
+  if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1"; next; }
   if (/^-verbose$/)        { $VERBOSE  = 1; next; }
   if (/^-debug$/)          { $DEBUG  = 1; next; }
 
@@ -467,7 +469,7 @@
 
   # Run the programs tests... creating a report.nightly.html file
   if (!$NOTEST) {
-    system "gmake -k $MAKEOPTS $ENABLELINEARSCAN report.nightly.html "
+    system "gmake -k $MAKEOPTS $PROGTESTOPTS report.nightly.html "
          . "TEST=nightly > $Prefix-$SubDir-ProgramTest.txt 2>&1";
   } else {
     system "gunzip $Prefix-$SubDir-ProgramTest.txt.gz";




From gaeke at cs.uiuc.edu  Thu Jun  3 00:12:06 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:12:06 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/MappingInfo.h
Message-ID: <200406030503.AAA07183@kain.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

MappingInfo.h updated: 1.8 -> 1.9

---
Log message:

Add decl. for new mapping info pass factory method.


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

Index: llvm/lib/Target/SparcV9/MappingInfo.h
diff -u llvm/lib/Target/SparcV9/MappingInfo.h:1.8 llvm/lib/Target/SparcV9/MappingInfo.h:1.9
--- llvm/lib/Target/SparcV9/MappingInfo.h:1.8	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/MappingInfo.h	Thu Jun  3 00:02:59 2004
@@ -24,6 +24,7 @@
 class Pass;
 
 Pass *getMappingInfoAsmPrinterPass(std::ostream &out);
+Pass *createInternalGlobalMapperPass();
 
 class MappingInfo {
   struct byteVector : public std::vector <unsigned char> {




From gaeke at cs.uiuc.edu  Thu Jun  3 00:12:19 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:12:19 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9RegInfo.h
Message-ID: <200406030503.AAA07190@kain.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

SparcV9RegInfo.h updated: 1.14 -> 1.15

---
Log message:

Fix big mistake in my last checkin... the big question is, how did I ever
get this to link before?


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

Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.14 llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.15
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.14	Wed Jun  2 21:45:09 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.h	Thu Jun  3 00:03:00 2004
@@ -53,7 +53,7 @@
   // This defaults to marking a single register but may mark multiple
   // registers when a single number denotes paired registers.
   // 
-  void markColorsUsed(unsigned RegInClass,
+  virtual void markColorsUsed(unsigned RegInClass,
                               int UserRegType,
                               int RegTypeWanted,
                               std::vector<bool> &IsColorUsedArr) const {
@@ -69,7 +69,7 @@
   // for paired registers and other such silliness.
   // It returns -1 if no unused color is found.
   // 
-  int findUnusedColor(int RegTypeWanted,
+  virtual int findUnusedColor(int RegTypeWanted,
                           const std::vector<bool> &IsColorUsedArr) const {
     // find first unused color in the IsColorUsedArr directly
     unsigned NC = this->getNumOfAvailRegs();
@@ -82,18 +82,18 @@
 
   // This method should find a color which is not used by neighbors
   // (i.e., a false position in IsColorUsedArr) and 
-  void colorIGNode(IGNode *Node,
-                           const std::vector<bool> &IsColorUsedArr) const;
+  virtual void colorIGNode(IGNode *Node,
+                           const std::vector<bool> &IsColorUsedArr) const = 0;
 
   // Check whether a specific register is volatile, i.e., whether it is not
   // preserved across calls
-  bool isRegVolatile(int Reg) const;
+  virtual bool isRegVolatile(int Reg) const = 0;
 
   // Check whether a specific register is modified as a side-effect of the
   // call instruction itself,
-  bool modifiedByCall(int Reg) const {return false; }
+  virtual bool modifiedByCall(int Reg) const { return false; }
 
-  virtual const char* const getRegName(unsigned reg) const;
+  virtual const char* const getRegName(unsigned reg) const = 0;
 
   TargetRegClassInfo(unsigned ID, unsigned NVR, unsigned NAR)
     : RegClassID(ID), NumOfAvailRegs(NVR), NumOfAllRegs(NAR) {}




From gaeke at cs.uiuc.edu  Thu Jun  3 00:12:30 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:12:30 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
Message-ID: <200406030503.AAA07197@kain.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

SparcV9TargetMachine.cpp updated: 1.112 -> 1.113

---
Log message:

Add new mapping info pass, when EmitMappingInfo is on.


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

Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.112 llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.113
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.112	Fri May 28 14:33:59 2004
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp	Thu Jun  3 00:03:01 2004
@@ -179,8 +179,10 @@
   if (!DisablePeephole)
     PM.add(createPeepholeOptsPass(*this));
 
-  if (EmitMappingInfo)
-    PM.add(getMappingInfoAsmPrinterPass(Out));  
+  if (EmitMappingInfo) {
+    PM.add(createInternalGlobalMapperPass());
+    PM.add(getMappingInfoAsmPrinterPass(Out));
+  }
 
   // Output assembly language to the .s file.  Assembly emission is split into
   // two parts: Function output and Global value output.  This is because




From gaeke at cs.uiuc.edu  Thu Jun  3 00:12:40 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:12:40 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
Message-ID: <200406030503.AAA07205@kain.cs.uiuc.edu>


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

CombineBranch.cpp updated: 1.9 -> 1.10

---
Log message:

Expand head-of-file comment.


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

Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.9 llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.10
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp:1.9	Tue Jun  1 15:06:10 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp	Thu Jun  3 00:03:02 2004
@@ -7,7 +7,9 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// Combine branches
+// Combine multiple back-edges going to the same sink into a single
+// back-edge. This introduces a new basic block and back-edge branch for each
+// such sink.
 //
 //===----------------------------------------------------------------------===//
 




From gaeke at cs.uiuc.edu  Thu Jun  3 00:12:48 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:12:48 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp
Message-ID: <200406030503.AAA07220@kain.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

InternalGlobalMapper.cpp added (r1.1)

---
Log message:

Add new internal-global-symbol mapping info pass... may its life be short
and sweet.


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

Index: llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp
diff -c /dev/null llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp:1.1
*** /dev/null	Thu Jun  3 00:03:47 2004
--- llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp	Thu Jun  3 00:03:37 2004
***************
*** 0 ****
--- 1,80 ----
+ //===-- InternalGlobalMapper.cpp - Mapping Info for Internal Globals ------===//
+ // 
+ //                     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.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // InternalGlobalMapper is a pass that helps the runtime trace optimizer map
+ // the names of internal GlobalValues (which may have mangled,
+ // unreconstructible names in the executable) to pointers. If the name mangler
+ // is changed at some point in the future to allow its results to be
+ // reconstructible (for instance, by making the type mangling symbolic instead
+ // of using a UniqueID) this pass should probably be phased out.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/Constants.h"
+ #include "llvm/Module.h"
+ #include "llvm/Pass.h"
+ #include "llvm/Type.h"
+ #include "llvm/DerivedTypes.h"
+ using namespace llvm;
+ 
+ namespace llvm {
+ 
+ typedef std::vector<Constant *> GVVectorTy;
+ 
+ class InternalGlobalMapper : public Pass {
+ public:
+   bool run (Module &M);
+ };
+ 
+ Pass *llvm::createInternalGlobalMapperPass () {
+   return new InternalGlobalMapper ();
+ }
+ 
+ static void maybeAddInternalValueToVector (GVVectorTy &Vector, GlobalValue &GV){
+   // If it's a GlobalValue with internal linkage and a name (i.e. it's going to
+   // be mangled), then put the GV, casted to sbyte*, in the vector. Otherwise
+   // add a null.
+   if (GV.hasInternalLinkage () && GV.hasName ())
+     Vector.push_back (ConstantExpr::getCast
+       (ConstantPointerRef::get (&GV), PointerType::get (Type::SByteTy)));
+   else
+     Vector.push_back (ConstantPointerNull::get (PointerType::get
+                                                 (Type::SByteTy)));
+ }
+ 
+ bool InternalGlobalMapper::run (Module &M) {
+   GVVectorTy gvvector;
+ 
+   // Populate the vector with internal global values and their names.
+   for (Module::giterator i = M.gbegin (), e = M.gend (); i != e; ++i)
+     maybeAddInternalValueToVector (gvvector, *i);
+   for (Module::iterator i = M.begin (), e = M.end (); i != e; ++i)
+     maybeAddInternalValueToVector (gvvector, *i);
+ 
+   // Convert the vector to a constant struct of type {Size, [Size x sbyte*]}.
+   ArrayType *ATy = ArrayType::get (PointerType::get (Type::SByteTy),
+                                   gvvector.size ());
+   std::vector<const Type *> FieldTypes;
+   FieldTypes.push_back (Type::UIntTy);
+   FieldTypes.push_back (ATy);
+   StructType *STy = StructType::get (FieldTypes);
+   std::vector<Constant *> FieldValues;
+   FieldValues.push_back (ConstantUInt::get (Type::UIntTy, gvvector.size ()));
+   FieldValues.push_back (ConstantArray::get (ATy, gvvector));
+   
+   // Add the constant struct to M as an external global symbol named
+   // "_llvm_internalGlobals".
+   new GlobalVariable (STy, true, GlobalValue::ExternalLinkage,
+                       ConstantStruct::get (STy, FieldValues),
+                       "_llvm_internalGlobals", &M);
+ 
+   return true; // Module was modified.
+ }
+ 
+ } // end namespace llvm




From gaeke at cs.uiuc.edu  Thu Jun  3 00:47:05 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:47:05 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200406030540.AAA12853@kain.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.78 -> 1.79

---
Log message:

Adjust to new target interfaces; TargetRegInfo --> SparcV9RegInfo.


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

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.78 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.79
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.78	Sun May 30 14:39:49 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Thu Jun  3 00:40:29 2004
@@ -31,7 +31,7 @@
 
 // Ripped off from SparcV9PrologEpilogInserter
 unsigned UnpackTraceFunction::getStaticStackSize (MachineFunction &MF) {
-  const TargetFrameInfo& frameInfo = MF.getTarget().getFrameInfo();
+  const TargetFrameInfo& frameInfo = *MF.getTarget().getFrameInfo();
 
   unsigned staticStackSize = MF.getInfo()->getStaticStackSize();
 
@@ -69,7 +69,7 @@
 /// back-end.
 ///
 void UnpackTraceFunction::findRegsToSave (MachineFunction &MF) {
-  const TargetRegInfo &TRI = TM->getRegInfo ();
+  const SparcV9RegInfo &TRI = *TM->getRegInfo ();
   bool intCCRegSeen = false, floatCCRegSeen = false;
   RegsToSave.clear ();
   for (MachineFunction::iterator fi = MF.begin (), fe = MF.end ();
@@ -138,7 +138,7 @@
 
 void UnpackTraceFunction::rewriteProlog (MachineFunction &MF,
                                          MachineBasicBlock &E) {
-  const TargetRegInfo &TRI = TM->getRegInfo ();
+  const SparcV9RegInfo &TRI = *TM->getRegInfo ();
   static const unsigned sp = SparcV9::o6, fp = SparcV9::i6, g1 = SparcV9::g1,
     g2 = SparcV9::g2;
 
@@ -208,7 +208,7 @@
 
 void UnpackTraceFunction::rewriteEpilog (MachineFunction &MF,
                                          MachineBasicBlock &MBB) {
-  const TargetRegInfo &TRI = TM->getRegInfo ();
+  const SparcV9RegInfo &TRI = *TM->getRegInfo ();
   static const unsigned fp = SparcV9::i6, sp = SparcV9::o6, g2 = SparcV9::g2;
 
   // UTF epilog: start out by clearing everything out of the exit basic block




From gaeke at cs.uiuc.edu  Thu Jun  3 00:47:17 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 00:47:17 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceJIT/TraceJITGlobals.cpp TraceJIT.cpp TraceJIT.h
Message-ID: <200406030542.AAA12880@kain.cs.uiuc.edu>


Changes in directory reopt/lib/TraceJIT:

TraceJITGlobals.cpp added (r1.1)
TraceJIT.cpp updated: 1.1 -> 1.2
TraceJIT.h updated: 1.2 -> 1.3

---
Log message:

Read in the internalGlobals map and populate the TraceJIT's
GlobalAddress map upon construction. This makes it possible to
jit traces that access GlobalValues whose mangled names we can't reconstruct
with the current Mangler.


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

Index: reopt/lib/TraceJIT/TraceJITGlobals.cpp
diff -c /dev/null reopt/lib/TraceJIT/TraceJITGlobals.cpp:1.1
*** /dev/null	Thu Jun  3 00:42:56 2004
--- reopt/lib/TraceJIT/TraceJITGlobals.cpp	Thu Jun  3 00:42:46 2004
***************
*** 0 ****
--- 1,49 ----
+ //===-- TraceJITGlobals.cpp - Parse internal global mapping info ----------===//
+ // 
+ //                     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.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // These methods allow the TraceJIT to find internal globals compiled by llc,
+ // whose names the mangler may not be able to reconstruct. This parses mapping
+ // info produced by the InternalGlobalMapper pass.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "TraceJIT.h"
+ #include "llvm/Module.h"
+ #include "Support/Debug.h"
+ using namespace llvm;
+ 
+ struct InternalGlobalMap {
+   unsigned int Size;
+   void *GlobalAddrs[0]; // Length is fixed but not known at compile time.
+ };
+ 
+ extern "C" InternalGlobalMap _llvm_internalGlobals;
+ 
+ namespace llvm {
+ 
+ void TraceJIT::maybeAddInternalGlobal (GlobalValue *GV, unsigned int &Counter) {
+   if (Counter >= _llvm_internalGlobals.Size) return;
+   void *savedAddr = _llvm_internalGlobals.GlobalAddrs[Counter];
+   ++Counter;
+   if (GV->hasInternalLinkage() && GV->hasName () && savedAddr) {
+     DEBUG (std::cerr << "Old internal global " << GV->getName ()
+            << " found at " << savedAddr << "\n");
+     addGlobalMapping (GV, savedAddr);
+   }
+ }
+ 
+ void TraceJIT::addInternalGlobalMappings (Module &M) {
+   unsigned Counter = 0;
+   for (Module::giterator i = M.gbegin (), e = M.gend (); i != e; ++i)
+     maybeAddInternalGlobal (i, Counter);
+   for (Module::iterator i = M.begin (), e = M.end (); i != e; ++i)
+     maybeAddInternalGlobal (i, Counter);
+ }
+ 
+ } // end namespace llvm


Index: reopt/lib/TraceJIT/TraceJIT.cpp
diff -u reopt/lib/TraceJIT/TraceJIT.cpp:1.1 reopt/lib/TraceJIT/TraceJIT.cpp:1.2
--- reopt/lib/TraceJIT/TraceJIT.cpp:1.1	Wed May 26 16:25:13 2004
+++ reopt/lib/TraceJIT/TraceJIT.cpp	Thu Jun  3 00:42:45 2004
@@ -69,6 +69,7 @@
 
   // Initialize MCE & trace-function unpacker
   MCE = createTraceJITEmitter (this);
+  addInternalGlobalMappings (*MP->getModule ());
   UTF = new UnpackTraceFunction (&TM);
 
   PM.add (new TargetData (getTargetData ()));


Index: reopt/lib/TraceJIT/TraceJIT.h
diff -u reopt/lib/TraceJIT/TraceJIT.h:1.2 reopt/lib/TraceJIT/TraceJIT.h:1.3
--- reopt/lib/TraceJIT/TraceJIT.h:1.2	Thu May 27 16:32:10 2004
+++ reopt/lib/TraceJIT/TraceJIT.h	Thu Jun  3 00:42:45 2004
@@ -99,6 +99,8 @@
   MachineCodeEmitter *getEmitter() { return MCE; }
 private:
   void addPassesToReoptimizeTrace (FunctionPassManager &PM);
+  void maybeAddInternalGlobal (GlobalValue *GV, unsigned int &Counter);
+  void addInternalGlobalMappings (Module &M);
   void runJITOnFunction (Function *F);
 };
 




From lattner at cs.uiuc.edu  Thu Jun  3 01:45:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 01:45:04 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Verifier.cpp
Message-ID: <200406030638.BAA29251@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Verifier.cpp updated: 1.102 -> 1.103

---
Log message:

* Verify function prototypes, not just functions with bodies.
* Verify that functions do not take aggregates as arguments.


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

Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.102 llvm/lib/VMCore/Verifier.cpp:1.103
--- llvm/lib/VMCore/Verifier.cpp:1.102	Thu May 27 16:58:13 2004
+++ llvm/lib/VMCore/Verifier.cpp	Thu Jun  3 01:38:43 2004
@@ -112,12 +112,18 @@
 
     bool doFinalization(Module &M) {
       // Scan through, checking all of the external function's linkage now...
-      for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
+      for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
         visitGlobalValue(*I);
 
+        // Check to make sure function prototypes are okay.
+        if (I->isExternal()) visitFunction(*I);
+      }
+
       for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
         visitGlobalValue(*I);
 
+      
+
       // If the module is broken, abort at this time.
       abortIfBroken();
       return false;
@@ -284,10 +290,14 @@
 
   // Check that the argument values match the function type for this function...
   unsigned i = 0;
-  for (Function::aiterator I = F.abegin(), E = F.aend(); I != E; ++I, ++i)
+  for (Function::aiterator I = F.abegin(), E = F.aend(); I != E; ++I, ++i) {
     Assert2(I->getType() == FT->getParamType(i),
             "Argument value does not match function argument type!",
             I, FT->getParamType(i));
+    // Make sure no aggregates are passed by value.
+    Assert1(I->getType()->isFirstClassType(), 
+            "Functions cannot take aggregates as arguments by value!", I);
+   }
 
   if (!F.isExternal()) {
     verifySymbolTable(F.getSymbolTable());




From lattner at cs.uiuc.edu  Thu Jun  3 01:58:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 01:58:02 2004
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-types.c
Message-ID: <200406030649.BAA29323@zion.cs.uiuc.edu>


Changes in directory llvm-gcc/gcc:

llvm-types.c updated: 1.7 -> 1.8

---
Log message:

Assert on the PR355: http://llvm.cs.uiuc.edu/PR355  case instead of producing illegal code.


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

Index: llvm-gcc/gcc/llvm-types.c
diff -u llvm-gcc/gcc/llvm-types.c:1.7 llvm-gcc/gcc/llvm-types.c:1.8
--- llvm-gcc/gcc/llvm-types.c:1.7	Fri May  7 14:24:53 2004
+++ llvm-gcc/gcc/llvm-types.c	Thu Jun  3 01:49:31 2004
@@ -950,7 +950,7 @@
       llvm_type *ArgTy = llvm_type_get_from_tree(TREE_VALUE(Args));
       if (isPassedByInvisibleReference(TREE_VALUE(Args)))
         ArgTy = llvm_type_get_pointer(ArgTy);
-          
+      assert(ArgTy->ID != OpaqueTyID && "Cannot pass opaque type by value!");
       NumArgs += llvm_type_get_num_recursive_elements(ArgTy);
     }
 




From brukman at cs.uiuc.edu  Thu Jun  3 10:18:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 10:18:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/SymbolTable.h
Message-ID: <200406031514.KAA10965@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

SymbolTable.h updated: 1.34 -> 1.35

---
Log message:

Fix case of doxygen directive \p.


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

Index: llvm/include/llvm/SymbolTable.h
diff -u llvm/include/llvm/SymbolTable.h:1.34 llvm/include/llvm/SymbolTable.h:1.35
--- llvm/include/llvm/SymbolTable.h:1.34	Fri May 28 00:30:29 2004
+++ llvm/include/llvm/SymbolTable.h	Thu Jun  3 10:14:00 2004
@@ -190,7 +190,7 @@
   void remove(Value* Val);
 
   /// This method removes a named type from the symbol table. The
-  /// name of the type is extracted from \P T and used to look up
+  /// name of the type is extracted from \p T and used to look up
   /// the Type in the type map. If the Type is not in the symbol
   /// table, this method silently ignores the request.
   /// @brief Remove a named type from the symbol table.




From brukman at cs.uiuc.edu  Thu Jun  3 10:35:06 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 10:35:06 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.intro
Message-ID: <200406031524.KAA24468@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.intro updated: 1.1 -> 1.2

---
Log message:

Wrap long lines.


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

Index: llvm/docs/doxygen.intro
diff -u llvm/docs/doxygen.intro:1.1 llvm/docs/doxygen.intro:1.2
--- llvm/docs/doxygen.intro:1.1	Wed Dec 31 00:47:28 2003
+++ llvm/docs/doxygen.intro	Thu Jun  3 10:23:59 2004
@@ -18,8 +18,8 @@
 /// @section main_caveat Caveat 
 /// This documentation is generated directly from the source code with doxygen. 
 /// Since LLVM is constantly under active development, what you're about to
-/// read is out of date! However, it may still be useful since certain portions of 
-/// LLVM are very stable. 
+/// read is out of date! However, it may still be useful since certain portions
+/// of LLVM are very stable. 
 ///
 /// @section main_changelog Change Log
 /// - Original content written 12/30/2003 by Reid Spencer




From brukman at cs.uiuc.edu  Thu Jun  3 10:35:14 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 10:35:14 2004
Subject: [llvm-commits] CVS: llvm/docs/doxygen.footer
Message-ID: <200406031525.KAA11852@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

doxygen.footer updated: 1.3 -> 1.4

---
Log message:

Properly close the footer paragraph.


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

Index: llvm/docs/doxygen.footer
diff -u llvm/docs/doxygen.footer:1.3 llvm/docs/doxygen.footer:1.4
--- llvm/docs/doxygen.footer:1.3	Tue Jun  1 13:00:39 2004
+++ llvm/docs/doxygen.footer	Thu Jun  3 10:25:16 2004
@@ -4,7 +4,7 @@
 Generated on $datetime for <a href="http://llvm.cs.uiuc.edu">LLVM</a> by
 <a href="http://www.doxygen.org">doxygen $doxygenversion</a><br/>
 Copyright &copy; 2003,2004 University of Illinois at Urbana-Champaign. All
-Rights Reserved.<p>
+Rights Reserved.</p>
 
 </body>
 </html>




From brukman at cs.uiuc.edu  Thu Jun  3 12:10:21 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 12:10:21 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406031656.LAA01638@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.4 -> 1.5

---
Log message:

Add a hyphen.


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.4 llvm/docs/CodeGenerator.html:1.5
--- llvm/docs/CodeGenerator.html:1.4	Wed Jun  2 02:06:06 2004
+++ llvm/docs/CodeGenerator.html	Thu Jun  3 11:55:57 2004
@@ -138,8 +138,8 @@
 V9 backend and should not be used by any other targets.  Also, all code in the
 <tt>lib/Target/SparcV9</tt> directory and subdirectories should be considered
 deprecated, and should not be used as the basis for future code generator work.
-The SparcV9 backend is slowly being merged into the rest of the target
-independent code generators, but this is a low-priority process with no
+The SparcV9 backend is slowly being merged into the rest of the
+target-independent code generators, but this is a low-priority process with no
 predictable completion date.</p>
 
 </div>
@@ -357,7 +357,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/02 07:06:06 $
+  Last modified: $Date: 2004/06/03 16:55:57 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 12:10:36 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 12:10:36 2004
Subject: [llvm-commits] CVS: llvm/docs/TableGenFundamentals.html
Message-ID: <200406031700.MAA14464@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

TableGenFundamentals.html updated: 1.6 -> 1.7

---
Log message:

Specify div type "doc_text" to get proper indentation for paragraphs.


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

Index: llvm/docs/TableGenFundamentals.html
diff -u llvm/docs/TableGenFundamentals.html:1.6 llvm/docs/TableGenFundamentals.html:1.7
--- llvm/docs/TableGenFundamentals.html:1.6	Sun May 23 16:07:27 2004
+++ llvm/docs/TableGenFundamentals.html	Thu Jun  3 11:59:59 2004
@@ -234,7 +234,8 @@
 </div>
 
 <!-- -------------------------------------------------------------------------->
-<div class="doc_subsubsection"><a name="types">The TableGen type system</a>
+<div class="doc_subsubsection">
+  <a name="types">The TableGen type system</a>
 </div>
 
 <div class="doc_text">
@@ -291,7 +292,8 @@
   <a name="values">TableGen values and expressions</a>
 </div>
 
-<div>
+<div class="doc_text">
+
 <p>TableGen allows for a pretty reasonable number of different expression forms
 when building up values.  These forms allow the TableGen file to be written in a
 natural syntax and flavor for the application.  The current expression forms
@@ -325,10 +327,12 @@
 </div>
 
 <!-- ======================================================================= -->
-<div class="doc_subsection"><a name="classesdefs">Classes and definitions</a>
+<div class="doc_subsection">
+  <a name="classesdefs">Classes and definitions</a>
 </div>
 
-<div>
+<div class="doc_text">
+
 <p>As mentioned in the <a href="#concepts">intro</a>, classes and definitions
 (collectively known as 'records') in TableGen are the main high-level unit of
 information that TableGen collects.  Records are defined with a <tt>def</tt> or
@@ -569,7 +573,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:27 $
+  Last modified: $Date: 2004/06/03 16:59:59 $
 </address>
 
 </body>




From gaeke at cs.uiuc.edu  Thu Jun  3 13:50:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 13:50:01 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/Makefile
Message-ID: <200406031846.NAA01321@zion.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

Makefile updated: 1.9 -> 1.10

---
Log message:

I should really automate this...


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

Index: reopt/lib/LightWtProfiling/Makefile
diff -u reopt/lib/LightWtProfiling/Makefile:1.9 reopt/lib/LightWtProfiling/Makefile:1.10
--- reopt/lib/LightWtProfiling/Makefile:1.9	Wed May 19 01:50:57 2004
+++ reopt/lib/LightWtProfiling/Makefile	Thu Jun  3 13:46:12 2004
@@ -5,7 +5,7 @@
 include $(LEVEL)/Makefile.config
 
 ifneq ($(ARCH),Sparc)
-Source := FirstTrigger.cpp Initialization.cpp RuntimeOptimizations.cpp SLI.cpp TraceOptEmitter.cpp UnpackTraceFunction.cpp
+Source := FirstTrigger.cpp Initialization.cpp RuntimeOptimizations.cpp SLI.cpp TraceWriter.cpp UnpackTraceFunction.cpp ValueAllocState.cpp
 all ::
 	@echo "This code assumes an LP64 machine- please ignore ptr cast warnings!"
 endif




From lattner at cs.uiuc.edu  Thu Jun  3 13:53:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 13:53:02 2004
Subject: [llvm-commits] CVS: llvm/include/Support/ilist
Message-ID: <200406031849.NAA01584@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

ilist updated: 1.18 -> 1.19

---
Log message:

Only use the non-standards-compliant std::distance on the compiler that is
buggy, not for all compilers that are not GCC 3



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

Index: llvm/include/Support/ilist
diff -u llvm/include/Support/ilist:1.18 llvm/include/Support/ilist:1.19
--- llvm/include/Support/ilist:1.18	Mon Feb  9 16:40:50 2004
+++ llvm/include/Support/ilist	Thu Jun  3 13:48:59 2004
@@ -438,13 +438,14 @@
   //
 
   size_type size() const {
-#if __GNUC__ == 3
-    size_type Result = std::distance(begin(), end());
-#else
+#if __GNUC__ == 2
+    // GCC 2.95 has a broken std::distance
     size_type Result = 0;
     std::distance(begin(), end(), Result);
-#endif
     return Result;
+#else
+    return std::distance(begin(), end());
+#endif
   }
 
   iterator erase(iterator first, iterator last) {




From gaeke at cs.uiuc.edu  Thu Jun  3 14:49:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 14:49:02 2004
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile
Message-ID: <200406031945.OAA18521@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.29 -> 1.30

---
Log message:

Testing out a fix for the Interpreter that will not die


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

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.29 llvm/test/Programs/TEST.nightly.Makefile:1.30
--- llvm/test/Programs/TEST.nightly.Makefile:1.29	Wed May 19 16:17:35 2004
+++ llvm/test/Programs/TEST.nightly.Makefile	Thu Jun  3 14:45:00 2004
@@ -10,7 +10,16 @@
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 CFLAGS  := -O3
 
-REPORTS_TO_GEN := compile nat llc cbe jit
+REPORTS_TO_GEN := compile nat
+ifndef DISABLE_LLC
+REPORTS_TO_GEN +=  llc
+endif
+ifndef DISABLE_JIT
+REPORTS_TO_GEN +=  jit
+endif
+ifndef DISABLE_CBE
+REPORTS_TO_GEN +=  cbe
+endif
 ifdef ENABLE_LINEARSCAN
 REPORTS_TO_GEN += llc-ls jit-ls
 endif




From lattner at cs.uiuc.edu  Thu Jun  3 16:16:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 16:16:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/BasicBlock.h
Message-ID: <200406032112.QAA24457@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

BasicBlock.h updated: 1.40 -> 1.41

---
Log message:

Don't use identifiers that start with an _


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

Index: llvm/include/llvm/BasicBlock.h
diff -u llvm/include/llvm/BasicBlock.h:1.40 llvm/include/llvm/BasicBlock.h:1.41
--- llvm/include/llvm/BasicBlock.h:1.40	Mon May 17 17:28:21 2004
+++ llvm/include/llvm/BasicBlock.h	Thu Jun  3 16:12:02 2004
@@ -35,8 +35,8 @@
 namespace llvm {
 
 class TerminatorInst;
-template <class _Term, class _BB> class SuccIterator;  // Successor Iterator
-template <class _Ptr, class _USE_iterator> class PredIterator;
+template <class Term, class BB> class SuccIterator;  // Successor Iterator
+template <class Ptr, class USE_iterator> class PredIterator;
 
 template<> struct ilist_traits<Instruction>
   : public SymbolTableListTraits<Instruction, BasicBlock, Function> {




From lattner at cs.uiuc.edu  Thu Jun  3 16:19:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 16:19:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/PassSupport.h
Message-ID: <200406032115.QAA24494@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

PassSupport.h updated: 1.18 -> 1.19

---
Log message:

Adjust argument to match destination data type


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

Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.18 llvm/include/llvm/PassSupport.h:1.19
--- llvm/include/llvm/PassSupport.h:1.18	Sun Nov 16 14:21:15 2003
+++ llvm/include/llvm/PassSupport.h	Thu Jun  3 16:14:56 2004
@@ -56,7 +56,7 @@
   /// PassInfo ctor - Do not call this directly, this should only be invoked
   /// through RegisterPass.
   PassInfo(const char *name, const char *arg, const std::type_info &ti, 
-           unsigned pt, Pass *(*normal)() = 0,
+           unsigned char pt, Pass *(*normal)() = 0,
            Pass *(*targetctor)(TargetMachine &) = 0)
     : PassName(name), PassArgument(arg), TypeInfo(ti), PassType(pt),
       NormalCtor(normal), TargetCtor(targetctor)  {




From gaeke at cs.uiuc.edu  Thu Jun  3 16:51:09 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 16:51:09 2004
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200406032147.QAA26611@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.49 -> 1.50

---
Log message:

Allow script to set configure args.
Allow environment to set llvmgccdir.


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

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.49 llvm/utils/NightlyTest.pl:1.50
--- llvm/utils/NightlyTest.pl:1.49	Wed Jun  2 22:29:39 2004
+++ llvm/utils/NightlyTest.pl	Thu Jun  3 16:46:56 2004
@@ -133,8 +133,9 @@
 my $PROGTESTOPTS = "";
 my $VERBOSE  = 0;
 my $DEBUG = 0;
+my $CONFIGUREARGS = "--enable-jit";
 
-# Parse arguments...
+# Parse arguments... 
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   shift;
   last if /^--$/;  # Stop processing arguments on --
@@ -148,13 +149,19 @@
   if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
   if (/^-parallel$/)       { $MAKEOPTS   = "-j2 -l3.0"; next; }
   if (/^-enable-linscan$/) { $PROGTESTOPTS .= " ENABLE_LINEARSCAN=1"; next; }
-  if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1"; next; }
+  if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1";
+                             $CONFIGUREARGS="--disable-jit --disable-llc_diffs";
+                             next; }
   if (/^-verbose$/)        { $VERBOSE  = 1; next; }
   if (/^-debug$/)          { $DEBUG  = 1; next; }
 
   print "Unknown option: $_ : ignoring!\n";
 }
 
+if ($ENV{'LLVMGCCDIR'}) {
+  $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
+}
+
 die "Must specify 0 or 3 options!" if (@ARGV != 0 and @ARGV != 3);
 
 if (@ARGV == 3) {
@@ -226,7 +233,7 @@
 #
 if (!$NOCHECKOUT) {
   if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
-  system "(time -p ./configure --enable-jit --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
+  system "(time -p ./configure $CONFIGUREARGS --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
 
   if ( $VERBOSE ) { print "BUILD STAGE\n"; }
   # Build the entire tree, capturing the output into $Prefix-Build-Log.txt




From lattner at cs.uiuc.edu  Thu Jun  3 17:12:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 17:12:02 2004
Subject: [llvm-commits] CVS: llvm/include/Support/CommandLine.h
Message-ID: <200406032207.RAA28644@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

CommandLine.h updated: 1.31 -> 1.32

---
Log message:

The prototype for ParseCommandLineOptions changed at some point, but this
was never updated.  I guess GCC just ignores the prototype


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

Index: llvm/include/Support/CommandLine.h
diff -u llvm/include/Support/CommandLine.h:1.31 llvm/include/Support/CommandLine.h:1.32
--- llvm/include/Support/CommandLine.h:1.31	Thu May  6 21:27:32 2004
+++ llvm/include/Support/CommandLine.h	Thu Jun  3 17:07:26 2004
@@ -119,7 +119,7 @@
 //
 class alias;
 class Option {
-  friend void cl::ParseCommandLineOptions(int &, char **, const char *, int);
+  friend void cl::ParseCommandLineOptions(int &, char **, const char *);
   friend class alias;
 
   // handleOccurrences - Overriden by subclasses to handle the value passed into




From lattner at cs.uiuc.edu  Thu Jun  3 17:39:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 17:39:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406032235.RAA29902@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.191 -> 1.192

---
Log message:

CQ bug implemented


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.191 llvm/docs/ReleaseNotes.html:1.192
--- llvm/docs/ReleaseNotes.html:1.191	Tue Jun  1 16:52:45 2004
+++ llvm/docs/ReleaseNotes.html	Thu Jun  3 17:35:13 2004
@@ -216,6 +216,10 @@
 <li>LLVM now has infrastructure for (simple and sparse conditional) constant
 propagation of function calls.  It currently supports a few math library
 functions like sqrt/sin/cos/etc.</li>
+
+<li>The C backend now emits <a href="http://llvm.cs.uiuc.edu/PR334">Syntactic
+loops</a> in the code to help C compilers whose optimizers do not recognize 
+loops formed from gotos (like GCC).</li>
 </ol>
 </div>
 
@@ -694,7 +698,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/01 21:52:45 $
+  Last modified: $Date: 2004/06/03 22:35:13 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Thu Jun  3 18:01:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 18:01:01 2004
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200406032257.RAA30998@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

LangRef.html updated: 1.61 -> 1.62

---
Log message:

Fix some broken links


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

Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.61 llvm/docs/LangRef.html:1.62
--- llvm/docs/LangRef.html:1.61	Sun May 23 16:06:01 2004
+++ llvm/docs/LangRef.html	Thu Jun  3 17:57:15 2004
@@ -522,7 +522,7 @@
       <td><tt>{ float, int (int) * }</tt></td>
       <td>: A pair, where the first element is a <tt>float</tt> and the
 second       element is a <a href="#t_pointer">pointer</a> to a <a
- href="t_function">function</a> that takes an <tt>int</tt>, returning
+ href="#t_function">function</a> that takes an <tt>int</tt>, returning
 an <tt>int</tt>.</td>
     </tr>
   </tbody>
@@ -549,7 +549,7 @@
     <tr>
       <td><tt>int (int *) *</tt></td>
       <td>: A <a href="#t_pointer">pointer</a> to a <a
- href="t_function">function</a> that takes an <tt>int</tt>, returning
+ href="#t_function">function</a> that takes an <tt>int</tt>, returning
 an <tt>int</tt>.</td>
     </tr>
   </tbody>
@@ -1417,7 +1417,7 @@
 <h5>Arguments:</h5>
 <p>The argument to the '<tt>load</tt>' instruction specifies the memory
 address to load from.  The pointer must point to a <a
- href="t_firstclass">first class</a> type.  If the <tt>load</tt> is
+ href="#t_firstclass">first class</a> type.  If the <tt>load</tt> is
 marked as <tt>volatile</tt> then the optimizer is not allowed to modify
 the number or order of execution of this <tt>load</tt> with other
 volatile <tt>load</tt> and <tt><a href="#i_store">store</a></tt>
@@ -1519,9 +1519,9 @@
 <h5>Semantics:</h5>
 
 <p>The index types specified for the '<tt>getelementptr</tt>' instruction depend
-on the pointer type that is being index into. <a href="t_pointer">Pointer</a>
-and <a href="t_array">array</a> types require <tt>uint</tt>, <tt>int</tt>,
-<tt>ulong</tt>, or <tt>long</tt> values, and <a href="t_struct">structure</a>
+on the pointer type that is being index into. <a href="#t_pointer">Pointer</a>
+and <a href="#t_array">array</a> types require <tt>uint</tt>, <tt>int</tt>,
+<tt>ulong</tt>, or <tt>long</tt> values, and <a href="#t_struct">structure</a>
 types require <tt>uint</tt> <b>constants</b>.</p>
 
 <p>In the example above, the first index is indexing into the '<tt>%ST*</tt>'
@@ -2553,7 +2553,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:06:01 $
+  Last modified: $Date: 2004/06/03 22:57:15 $
 </address>
 </body>
 </html>




From brukman at cs.uiuc.edu  Thu Jun  3 18:08:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:08:01 2004
Subject: [llvm-commits] CVS: llvm-www/header.incl
Message-ID: <200406032303.SAA05253@zion.cs.uiuc.edu>


Changes in directory llvm-www:

header.incl updated: 1.16 -> 1.17

---
Log message:

OldNews.html is at the top level.


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

Index: llvm-www/header.incl
diff -u llvm-www/header.incl:1.16 llvm-www/header.incl:1.17
--- llvm-www/header.incl:1.16	Thu May  6 12:26:07 2004
+++ llvm-www/header.incl	Thu Jun  3 18:03:47 2004
@@ -58,7 +58,7 @@
   <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-September/000489.html">September 10, 2003</a><br>
   <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-August/000448.html">August 15, 2003</a><br>
   <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-June/000416.html">June 26, 2003</a><br>
-  <a href="OldNews.html">Older News</a><br>
+  <a href="/OldNews.html">Older News</a><br>
 </font>
 </div>
 




From brukman at cs.uiuc.edu  Thu Jun  3 18:33:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:33:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ProgrammersManual.html
Message-ID: <200406032329.SAA17190@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ProgrammersManual.html updated: 1.59 -> 1.60

---
Log message:

Fix broken links as a result of the llvm namespace.


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

Index: llvm/docs/ProgrammersManual.html
diff -u llvm/docs/ProgrammersManual.html:1.59 llvm/docs/ProgrammersManual.html:1.60
--- llvm/docs/ProgrammersManual.html:1.59	Wed May 26 19:57:51 2004
+++ llvm/docs/ProgrammersManual.html	Thu Jun  3 18:29:12 2004
@@ -690,7 +690,7 @@
 most-specific common base class is <tt>Instruction</tt>, which includes lots of
 less closely-related things. For these cases, LLVM provides a handy wrapper
 class called <a
-href="http://llvm.cs.uiuc.edu/doxygen/classCallSite.html"><tt>CallSite</tt></a>.
+href="http://llvm.cs.uiuc.edu/doxygen/classllvm_1_1CallSite.html"><tt>CallSite</tt></a>.
 It is essentially a wrapper around an <tt>Instruction</tt> pointer, with some
 methods that provide functionality common to <tt>CallInst</tt>s and
 <tt>InvokeInst</tt>s.</p>
@@ -711,17 +711,18 @@
 <div class="doc_text">
 
 <p>Frequently, we might have an instance of the <a
-href="/doxygen/classValue.html">Value Class</a> and we want to determine which
-<tt>User</tt>s use the <tt>Value</tt>.  The list of all <tt>User</tt>s of a
-particular <tt>Value</tt> is called a <i>def-use</i> chain. For example, let's
-say we have a <tt>Function*</tt> named <tt>F</tt> to a particular function
-<tt>foo</tt>. Finding all of the instructions that <i>use</i> <tt>foo</tt> is as
-simple as iterating over the <i>def-use</i> chain of <tt>F</tt>:</p>
+href="/doxygen/structllvm_1_1Value.html">Value Class</a> and we want to
+determine which <tt>User</tt>s use the <tt>Value</tt>.  The list of all
+<tt>User</tt>s of a particular <tt>Value</tt> is called a <i>def-use</i> chain.
+For example, let's say we have a <tt>Function*</tt> named <tt>F</tt> to a
+particular function <tt>foo</tt>. Finding all of the instructions that
+<i>use</i> <tt>foo</tt> is as simple as iterating over the <i>def-use</i> chain
+of <tt>F</tt>:</p>
 
   <pre>Function* F = ...;<br><br>for (Value::use_iterator i = F-&gt;use_begin(), e = F-&gt;use_end(); i != e; ++i) {<br>    if (Instruction *Inst = dyn_cast&lt;Instruction&gt;(*i)) {<br>        cerr &lt;&lt; "F is used in instruction:\n";<br>        cerr &lt;&lt; *Inst &lt;&lt; "\n";<br>    }<br>}<br></pre>
 
 <p>Alternately, it's common to have an instance of the <a
-href="/doxygen/classUser.html">User Class</a> and need to know what
+href="/doxygen/classllvm_1_1User.html">User Class</a> and need to know what
 <tt>Value</tt>s are used by it.  The list of all <tt>Value</tt>s used by a
 <tt>User</tt> is known as a <i>use-def</i> chain.  Instances of class
 <tt>Instruction</tt> are common <tt>User</tt>s, so we might want to iterate over
@@ -912,8 +913,8 @@
 
 <p>You can use <tt>Value::replaceAllUsesWith</tt> and
 <tt>User::replaceUsesOfWith</tt> to change more than one use at a time.  See the
-doxygen documentation for the <a href="/doxygen/classValue.html">Value Class</a>
-and <a href="/doxygen/classUser.html">User Class</a>, respectively, for more
+doxygen documentation for the <a href="/doxygen/structllvm_1_1Value.html">Value Class</a>
+and <a href="/doxygen/classllvm_1_1User.html">User Class</a>, respectively, for more
 information.</p>
 
 <!-- Value::replaceAllUsesWith User::replaceUsesOfWith Point out:
@@ -946,7 +947,7 @@
 
 <p><tt>#include "<a href="/doxygen/Value_8h-source.html">llvm/Value.h</a>"</tt>
 <br> 
-doxygen info: <a href="/doxygen/classValue.html">Value Class</a></p>
+doxygen info: <a href="/doxygen/structllvm_1_1Value.html">Value Class</a></p>
 
 <p>The <tt>Value</tt> class is the most important class in the LLVM Source
 base.  It represents a typed value that may be used (among other things) as an
@@ -1047,7 +1048,7 @@
   
 <p>
 <tt>#include "<a href="/doxygen/User_8h-source.html">llvm/User.h</a>"</tt><br>
-doxygen info: <a href="/doxygen/classUser.html">User Class</a><br>
+doxygen info: <a href="/doxygen/classllvm_1_1User.html">User Class</a><br>
 Superclass: <a href="#Value"><tt>Value</tt></a></p>
 
 <p>The <tt>User</tt> class is the common base class of all LLVM nodes that may
@@ -1163,8 +1164,10 @@
 
 <div class="doc_text">
 
-<p><tt>#include "<a href="/doxygen/BasicBlock_8h-source.html">llvm/BasicBlock.h</a>"</tt><br>
-doxygen info: <a href="/doxygen/classBasicBlock.html">BasicBlock Class</a><br>
+<p><tt>#include "<a
+href="/doxygen/BasicBlock_8h-source.html">llvm/BasicBlock.h</a>"</tt><br>
+doxygen info: <a href="/doxygen/structllvm_1_1BasicBlock.html">BasicBlock
+Class</a><br>
 Superclass: <a href="#Value"><tt>Value</tt></a></p>
 
 <p>This class represents a single entry multiple exit section of the code,
@@ -1244,7 +1247,8 @@
 
 <p><tt>#include "<a
 href="/doxygen/GlobalValue_8h-source.html">llvm/GlobalValue.h</a>"</tt><br>
-doxygen info: <a href="/doxygen/classGlobalValue.html">GlobalValue Class</a><br>
+doxygen info: <a href="/doxygen/classllvm_1_1GlobalValue.html">GlobalValue
+Class</a><br>
 Superclasses: <a href="#User"><tt>User</tt></a>, <a
 href="#Value"><tt>Value</tt></a></p>
 
@@ -2043,7 +2047,7 @@
   <a href="mailto:dhurjati at cs.uiuc.edu">Dinakar Dhurjati</a> and
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/27 00:57:51 $
+  Last modified: $Date: 2004/06/03 23:29:12 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:37:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:37:01 2004
Subject: [llvm-commits] CVS: llvm/docs/SourceLevelDebugging.html
Message-ID: <200406032333.SAA28994@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

SourceLevelDebugging.html updated: 1.5 -> 1.6

---
Log message:

Fix broken internal links.


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

Index: llvm/docs/SourceLevelDebugging.html
diff -u llvm/docs/SourceLevelDebugging.html:1.5 llvm/docs/SourceLevelDebugging.html:1.6
--- llvm/docs/SourceLevelDebugging.html:1.5	Sun May 23 16:07:27 2004
+++ llvm/docs/SourceLevelDebugging.html	Thu Jun  3 18:33:10 2004
@@ -366,13 +366,13 @@
 <p>When run with no options, just <tt>llvm-db</tt>, the debugger starts up
 without a program loaded at all.  You must use the <a
 href="#c_file"><tt>file</tt> command</a> to load a program, and the <a
-href="c_set_args"><tt>set args</tt></a> or <a href="#c_run"><tt>run</tt></a>
+href="#c_set_args"><tt>set args</tt></a> or <a href="#c_run"><tt>run</tt></a>
 commands to specify the arguments for the program.</p>
 
 <p>If you start the debugger with one argument, as <tt>llvm-db
 &lt;program&gt;</tt>, the debugger will start up and load in the specified
 program.  You can then optionally specify arguments to the program with the <a
-href="c_set_args"><tt>set args</tt></a> or <a href="#c_run"><tt>run</tt></a>
+href="#c_set_args"><tt>set args</tt></a> or <a href="#c_run"><tt>run</tt></a>
 commands.</p>
 
 <p>The third way to start the program is with the <tt>--args</tt> option.  This
@@ -1111,7 +1111,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:27 $
+  Last modified: $Date: 2004/06/03 23:33:10 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:40:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:40:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ProgrammersManual.html
Message-ID: <200406032336.SAA09023@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ProgrammersManual.html updated: 1.60 -> 1.61

---
Log message:

Fix more broken links as a result of the llvm namespace.


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

Index: llvm/docs/ProgrammersManual.html
diff -u llvm/docs/ProgrammersManual.html:1.60 llvm/docs/ProgrammersManual.html:1.61
--- llvm/docs/ProgrammersManual.html:1.60	Thu Jun  3 18:29:12 2004
+++ llvm/docs/ProgrammersManual.html	Thu Jun  3 18:35:54 2004
@@ -774,7 +774,7 @@
 one integer in the current stack frame, at runtime. Each <tt>Instruction</tt>
 subclass is likely to have varying default parameters which change the semantics
 of the instruction, so refer to the <a
-href="/doxygen/classInstruction.html">doxygen documentation for the subclass of
+href="/doxygen/classllvm_1_1Instruction.html">doxygen documentation for the subclass of
 Instruction</a> that you're interested in instantiating.</p>
 
 <p><i>Naming values</i></p>
@@ -1102,7 +1102,7 @@
 
 <p><tt>#include "</tt><tt><a
 href="/doxygen/Instruction_8h-source.html">llvm/Instruction.h</a>"</tt><br>
-doxygen info: <a href="/doxygen/classInstruction.html">Instruction Class</a><br>
+doxygen info: <a href="/doxygen/classllvm_1_1Instruction.html">Instruction Class</a><br>
 Superclasses: <a href="#User"><tt>User</tt></a>, <a
 href="#Value"><tt>Value</tt></a></p>
 
@@ -1127,7 +1127,7 @@
 example <tt><a href="#BinaryOperator">BinaryOperator</a></tt> and <tt><a
 href="#SetCondInst">SetCondInst</a></tt>).  Unfortunately, the use of macros in
 this file confuses doxygen, so these enum values don't show up correctly in the
-<a href="/doxygen/classInstruction.html">doxygen output</a>.</p>
+<a href="/doxygen/classllvm_1_1Instruction.html">doxygen output</a>.</p>
 
 </div>
 
@@ -1316,8 +1316,8 @@
 
 <p><tt>#include "<a
 href="/doxygen/Function_8h-source.html">llvm/Function.h</a>"</tt><br> doxygen
-info: <a href="/doxygen/classFunction.html">Function Class</a><br> Superclasses:
-<a href="#GlobalValue"><tt>GlobalValue</tt></a>, <a
+info: <a href="/doxygen/classllvm_1_1Function.html">Function Class</a><br>
+Superclasses: <a href="#GlobalValue"><tt>GlobalValue</tt></a>, <a
 href="#User"><tt>User</tt></a>, <a href="#Value"><tt>Value</tt></a></p>
 
 <p>The <tt>Function</tt> class represents a single procedure in LLVM.  It is
@@ -1519,7 +1519,7 @@
 
 <p><tt>#include "<a
 href="/doxygen/Module_8h-source.html">llvm/Module.h</a>"</tt><br> doxygen info:
-<a href="/doxygen/classModule.html">Module Class</a></p>
+<a href="/doxygen/structllvm_1_1Module.html">Module Class</a></p>
 
 <p>The <tt>Module</tt> class represents the top level structure present in LLVM
 programs.  An LLVM module is effectively either a translation unit of the
@@ -2047,7 +2047,7 @@
   <a href="mailto:dhurjati at cs.uiuc.edu">Dinakar Dhurjati</a> and
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/03 23:29:12 $
+  Last modified: $Date: 2004/06/03 23:35:54 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:44:00 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:44:00 2004
Subject: [llvm-commits] CVS: llvm/docs/WritingAnLLVMPass.html
Message-ID: <200406032339.SAA20235@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

WritingAnLLVMPass.html updated: 1.27 -> 1.28

---
Log message:

GCSE has suddenly become a struct, not a class; fix broken link.


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

Index: llvm/docs/WritingAnLLVMPass.html
diff -u llvm/docs/WritingAnLLVMPass.html:1.27 llvm/docs/WritingAnLLVMPass.html:1.28
--- llvm/docs/WritingAnLLVMPass.html:1.27	Sun May 23 16:07:27 2004
+++ llvm/docs/WritingAnLLVMPass.html	Thu Jun  3 18:39:36 2004
@@ -1006,7 +1006,7 @@
 Passes that use the <tt><a
 href="http://llvm.cs.uiuc.edu/doxygen/classllvm_1_1AliasAnalysis.html">AliasAnalysis</a></tt>
 interface (for example the <tt><a
-href="http://llvm.cs.uiuc.edu/doxygen/classGCSE.html">gcse</a></tt> pass), do
+href="http://llvm.cs.uiuc.edu/doxygen/structGCSE.html">gcse</a></tt> pass), do
 not care which implementation of alias analysis is actually provided, they just
 use the designated interface.</p>
 
@@ -1471,7 +1471,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:27 $
+  Last modified: $Date: 2004/06/03 23:39:36 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:44:08 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:44:08 2004
Subject: [llvm-commits] CVS: llvm/docs/CodingStandards.html
Message-ID: <200406032340.SAA31864@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodingStandards.html updated: 1.16 -> 1.17

---
Log message:

Fix broken internal link.


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

Index: llvm/docs/CodingStandards.html
diff -u llvm/docs/CodingStandards.html:1.16 llvm/docs/CodingStandards.html:1.17
--- llvm/docs/CodingStandards.html:1.16	Sun May 23 16:05:07 2004
+++ llvm/docs/CodingStandards.html	Thu Jun  3 18:40:19 2004
@@ -211,7 +211,7 @@
 
 <p>Immediately after the <a href="#scf_commenting">header file comment</a> (and
 include guards if working on a header file), the <a
-href="hl_dontinclude">minimal</a> list of #includes required by the file should
+href="#hl_dontinclude">minimal</a> list of #includes required by the file should
 be listed.  We prefer these #includes to be listed in this order:</p>
 
 <ol>
@@ -605,7 +605,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:05:07 $
+  Last modified: $Date: 2004/06/03 23:40:19 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:46:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:46:01 2004
Subject: [llvm-commits] CVS: llvm/docs/TableGenFundamentals.html
Message-ID: <200406032341.SAA11148@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

TableGenFundamentals.html updated: 1.7 -> 1.8

---
Log message:

Fix broken internal link.


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

Index: llvm/docs/TableGenFundamentals.html
diff -u llvm/docs/TableGenFundamentals.html:1.7 llvm/docs/TableGenFundamentals.html:1.8
--- llvm/docs/TableGenFundamentals.html:1.7	Thu Jun  3 11:59:59 2004
+++ llvm/docs/TableGenFundamentals.html	Thu Jun  3 18:41:48 2004
@@ -337,7 +337,7 @@
 (collectively known as 'records') in TableGen are the main high-level unit of
 information that TableGen collects.  Records are defined with a <tt>def</tt> or
 <tt>class</tt> keyword, the record name, and an optional list of "<a
-href="templateargs">template arguments</a>".  If the record has superclasses,
+href="#templateargs">template arguments</a>".  If the record has superclasses,
 they are specified as a comma seperated list that starts with a colon character
 (":").  If <a href="#valuedef">value definitions</a> or <a href="#recordlet">let
 expressions</a> are needed for the class, they are enclosed in curly braces
@@ -573,7 +573,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/03 16:59:59 $
+  Last modified: $Date: 2004/06/03 23:41:48 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:47:00 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:47:00 2004
Subject: [llvm-commits] CVS: llvm-www/releases/1.2/docs/ReleaseNotes.html
Message-ID: <200406032343.SAA01756@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.2/docs:

ReleaseNotes.html updated: 1.17 -> 1.18

---
Log message:

Fix broken internal link.


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

Index: llvm-www/releases/1.2/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.2/docs/ReleaseNotes.html:1.17 llvm-www/releases/1.2/docs/ReleaseNotes.html:1.18
--- llvm-www/releases/1.2/docs/ReleaseNotes.html:1.17	Fri May 21 11:48:51 2004
+++ llvm-www/releases/1.2/docs/ReleaseNotes.html	Thu Jun  3 18:43:15 2004
@@ -77,7 +77,7 @@
 source-level debugger, and profile guided optimizer components), many <a
 href="#qualityofimp">speedups</a> and <a href="#codequality">code quality</a>
 improvements, documentation improvements, and a small collection of important <a
-href="bugfix">bug fixes</a>.  Overall, this is our highest quality release to
+href="#bugfix">bug fixes</a>.  Overall, this is our highest quality release to
 date, and we encourage you to upgrade if you are using LLVM 1.0 or 1.1.
 </p>
 
@@ -686,7 +686,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/21 16:48:51 $
+  Last modified: $Date: 2004/06/03 23:43:15 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:47:07 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:47:07 2004
Subject: [llvm-commits] CVS: llvm/docs/SourceLevelDebugging.html
Message-ID: <200406032342.SAA23212@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

SourceLevelDebugging.html updated: 1.6 -> 1.7

---
Log message:

Fix broken internal link.


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

Index: llvm/docs/SourceLevelDebugging.html
diff -u llvm/docs/SourceLevelDebugging.html:1.6 llvm/docs/SourceLevelDebugging.html:1.7
--- llvm/docs/SourceLevelDebugging.html:1.6	Thu Jun  3 18:33:10 2004
+++ llvm/docs/SourceLevelDebugging.html	Thu Jun  3 18:42:24 2004
@@ -971,7 +971,7 @@
 LLVM debugger.  See the <a href="#ccxx_descriptors">section on the C/C++
 front-end</a> for more information.  Also remember that global objects
 (functions, selectors, global variables, etc) must contain an <a
-href="format_common_anchors">anchor</a> to the <tt>llvm.dbg.globals</tt>
+href="#format_common_anchors">anchor</a> to the <tt>llvm.dbg.globals</tt>
 variable.</p>
 </div>
 
@@ -1111,7 +1111,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/03 23:33:10 $
+  Last modified: $Date: 2004/06/03 23:42:24 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:52:00 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:52:00 2004
Subject: [llvm-commits] CVS: llvm/docs/Stacker.html
Message-ID: <200406032347.SAA14042@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

Stacker.html updated: 1.14 -> 1.15

---
Log message:

Fix broken internal link; add stub for missing subsection.


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

Index: llvm/docs/Stacker.html
diff -u llvm/docs/Stacker.html:1.14 llvm/docs/Stacker.html:1.15
--- llvm/docs/Stacker.html:1.14	Sun May 23 16:07:27 2004
+++ llvm/docs/Stacker.html	Thu Jun  3 18:47:34 2004
@@ -33,7 +33,7 @@
       <li><a href="#comments">Comments</a></li>
       <li><a href="#literals">Literals</a></li>
       <li><a href="#words">Words</a></li>
-      <li><a href="style">Standard Style</a></li>
+      <li><a href="#style">Standard Style</a></li>
       <li><a href="#builtins">Built-Ins</a></li>
     </ol></li>
   <li><a href="#example">Prime: A Complete Example</a></li>
@@ -470,6 +470,11 @@
 linking.</p>
 </div>
 <!-- ======================================================================= -->
+<div class="doc_subsection"><a name="style"></a>Standard Style</div>
+<div class="doc_text">
+<p>TODO</p>
+</div>
+<!-- ======================================================================= -->
 <div class="doc_subsection"><a name="builtins"></a>Built In Words</div>
 <div class="doc_text">
 <p>The built-in words of the Stacker language are put in several groups 
@@ -1405,7 +1410,7 @@
 
   <a href="mailto:rspencer at x10sys.com">Reid Spencer</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/23 21:07:27 $
+  Last modified: $Date: 2004/06/03 23:47:34 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Thu Jun  3 18:58:04 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Jun  3 18:58:04 2004
Subject: [llvm-commits] CVS: llvm-www/releases/1.2/docs/LangRef.html Stacker.html
Message-ID: <200406032353.SAA25095@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.2/docs:

LangRef.html updated: 1.2 -> 1.3
Stacker.html updated: 1.2 -> 1.3

---
Log message:

Fix broken internal links.


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

Index: llvm-www/releases/1.2/docs/LangRef.html
diff -u llvm-www/releases/1.2/docs/LangRef.html:1.2 llvm-www/releases/1.2/docs/LangRef.html:1.3
--- llvm-www/releases/1.2/docs/LangRef.html:1.2	Fri Mar 19 16:04:17 2004
+++ llvm-www/releases/1.2/docs/LangRef.html	Thu Jun  3 18:53:48 2004
@@ -486,9 +486,9 @@
     <tr>
       <td><tt>{ float, int (int) * }</tt></td>
       <td>: A pair, where the first element is a <tt>float</tt> and the
-second       element is a <a href="#t_pointer">pointer</a> to a <a
- href="t_function">function</a> that takes an <tt>int</tt>, returning
-an <tt>int</tt>.</td>
+      second element is a <a href="#t_pointer">pointer</a> to a <a
+      href="#t_function">function</a> that takes an <tt>int</tt>, returning an
+      <tt>int</tt>.</td>
     </tr>
   </tbody>
 </table>
@@ -514,8 +514,8 @@
     <tr>
       <td><tt>int (int *) *</tt></td>
       <td>: A <a href="#t_pointer">pointer</a> to a <a
- href="t_function">function</a> that takes an <tt>int</tt>, returning
-an <tt>int</tt>.</td>
+      href="#t_function">function</a> that takes an <tt>int</tt>, returning an
+      <tt>int</tt>.</td>
     </tr>
   </tbody>
 </table>
@@ -1382,7 +1382,7 @@
 <h5>Arguments:</h5>
 <p>The argument to the '<tt>load</tt>' instruction specifies the memory
 address to load from.  The pointer must point to a <a
- href="t_firstclass">first class</a> type.  If the <tt>load</tt> is
+href="#t_firstclass">first class</a> type.  If the <tt>load</tt> is
 marked as <tt>volatile</tt> then the optimizer is not allowed to modify
 the number or order of execution of this <tt>load</tt> with other
 volatile <tt>load</tt> and <tt><a href="#i_store">store</a></tt>
@@ -1445,8 +1445,8 @@
 <h5>Semantics:</h5>
 <p>The index types specified for the '<tt>getelementptr</tt>'
 instruction depend on the pointer type that is being index into. <a
- href="t_pointer">Pointer</a> and <a href="t_array">array</a> types
-require '<tt>long</tt>' values, and <a href="t_struct">structure</a>
+href="#t_pointer">Pointer</a> and <a href="#t_array">array</a> types
+require '<tt>long</tt>' values, and <a href="#t_struct">structure</a>
 types require '<tt>ubyte</tt>' <b>constants</b>.</p>
 <p>In the example above, the first index is indexing into the '<tt>%ST*</tt>'
 type, which is a pointer, yielding a '<tt>%ST</tt>' = '<tt>{ int,
@@ -1847,7 +1847,7 @@
 <p>The '<tt>llvm.va_copy</tt>' intrinsic works just like the <tt>va_copy</tt>
 macro available in C.  In a target-dependent way, it copies the source <tt>va_list</tt>
 element into the returned list.  This intrinsic is necessary because the <tt><a
- href="i_va_start">llvm.va_start</a></tt> intrinsic may be arbitrarily
+ href="#i_va_start">llvm.va_start</a></tt> intrinsic may be arbitrarily
 complex and require memory allocation, for example.</p>
 </div>
 
@@ -2148,7 +2148,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/03/19 22:04:17 $
+  Last modified: $Date: 2004/06/03 23:53:48 $
 </address>
 </body>
 </html>


Index: llvm-www/releases/1.2/docs/Stacker.html
diff -u llvm-www/releases/1.2/docs/Stacker.html:1.2 llvm-www/releases/1.2/docs/Stacker.html:1.3
--- llvm-www/releases/1.2/docs/Stacker.html:1.2	Fri Mar 19 16:04:17 2004
+++ llvm-www/releases/1.2/docs/Stacker.html	Thu Jun  3 18:53:48 2004
@@ -28,7 +28,7 @@
       <li><a href="#comments">Comments</a>
       <li><a href="#literals">Literals</a>
       <li><a href="#words">Words</a>
-      <li><a href="style">Standard Style</a>
+      <li><a href="#style">Standard Style</a>
       <li><a href="#builtins">Built-Ins</a>
     </ol>
   </li>
@@ -1395,6 +1395,6 @@
 <div class="doc_footer">
 <address><a href="mailto:rspencer at x10sys.com">Reid Spencer</a></address>
 <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a> 
-<br>Last modified: $Date: 2004/03/19 22:04:17 $ </div>
+<br>Last modified: $Date: 2004/06/03 23:53:48 $ </div>
 </body>
 </html>




From gaeke at cs.uiuc.edu  Thu Jun  3 19:11:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Jun  3 19:11:01 2004
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200406040007.TAA30967@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.50 -> 1.51

---
Log message:

Honor DISABLE_CBE, etc., even when doing the "running tests" (i.e., Olden)


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

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.50 llvm/utils/NightlyTest.pl:1.51
--- llvm/utils/NightlyTest.pl:1.50	Thu Jun  3 16:46:56 2004
+++ llvm/utils/NightlyTest.pl	Thu Jun  3 19:07:12 2004
@@ -587,7 +587,7 @@
     system "gmake $MAKEOPTS clean > /dev/null 2>&1";
 
     # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
-    system "gmake -k $MAKEOPTS report.nightly.raw.out TEST=nightly " .
+    system "gmake -k $MAKEOPTS $PROGTESTOPTS report.nightly.raw.out TEST=nightly " .
            " LARGE_PROBLEM_SIZE=1 > /dev/null 2>&1";
     system "cp report.nightly.raw.out $Prefix-Olden-tests.txt";
   } else {




From lattner at cs.uiuc.edu  Thu Jun  3 19:20:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 19:20:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README.txt
Message-ID: <200406040015.TAA31028@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

README.txt (r1.13) removed

---
Log message:

This file is obsolete


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



From lattner at cs.uiuc.edu  Thu Jun  3 19:20:12 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 19:20:12 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406040016.TAA31673@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.5 -> 1.6

---
Log message:

Fix PR356: http://llvm.cs.uiuc.edu/PR356 : [doc] lib/Target/X86/README.txt needs update

Also add some documentation about how instructions work



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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.5 llvm/docs/CodeGenerator.html:1.6
--- llvm/docs/CodeGenerator.html:1.5	Thu Jun  3 11:55:57 2004
+++ llvm/docs/CodeGenerator.html	Thu Jun  3 19:16:02 2004
@@ -30,6 +30,9 @@
     </ul>
   </li>
   <li><a href="#codegendesc">Machine code description classes</a>
+    <ul>
+      <li><a href="#machineinstr">The <tt>MachineInstr</tt> class</a></li>
+    </ul>
   </li>
   <li><a href="#codegenalgs">Target-independent code generation algorithms</a>
   </li>
@@ -61,7 +64,7 @@
 suite of reusable components for translating the LLVM internal representation to
 the machine code for a specified target -- either in assembly form (suitable for
 a static compiler) or in binary machine code format (usable for a JIT compiler).
-The LLVM target-independent code generator consists of four main components:</p>
+The LLVM target-independent code generator consists of five main components:</p>
 
 <ol>
 <li><a href="#targetdesc">Abstract target description</a> interfaces which
@@ -84,6 +87,11 @@
 target-specific passes, to build complete code generators for a specific target.
 Target descriptions live in <tt>lib/Target/</tt>.</li>
 
+<li><a href="#jit">The target-independent JIT components</a>.  The LLVM JIT is
+completely target independent (it uses the <tt>TargetJITInfo</tt> structure to
+interface for target-specific issues.  The code for the target-independent
+JIT lives in <tt>lib/ExecutionEngine/JIT</tt>.</li>
+
 </ol>
 
 <p>
@@ -345,7 +353,278 @@
 </div>
 <!-- *********************************************************************** -->
 
+<div class="doc_text">
+
+<p>
+At the high-level, LLVM code is translated to a machine specific representation
+formed out of MachineFunction, MachineBasicBlock, and <a 
+href="#machineinstr"><tt>MachineInstr</tt></a> instances
+(defined in include/llvm/CodeGen).  This representation is completely target
+agnostic, representing instructions in their most abstract form: an opcode and a
+series of operands.  This representation is designed to support both SSA
+representation for machine code, as well as a register allocated, non-SSA form.
+</p>
+
+</div>
+
+<!-- ======================================================================= -->
+<div class="doc_subsection">
+  <a name="machineinstr">The <tt>MachineInstr</tt> class</a>
+</div>
+
+<div class="doc_text">
+
+<p>Target machine instructions are represented as instances of the
+<tt>MachineInstr</tt> class.  This class is an extremely abstract way of
+representing machine instructions.  In particular, all it keeps track of is 
+an opcode number and some number of operands.</p>
+
+<p>The opcode number is an simple unsigned number that only has meaning to a 
+specific backend.  All of the instructions for a target should be defined in 
+the <tt>*InstrInfo.td</tt> file for the target, and the opcode enum values
+are autogenerated from this description.  The <tt>MachineInstr</tt> class does
+not have any information about how to intepret the instruction (i.e., what the 
+semantics of the instruction are): for that you must refer to the 
+<tt><a href="#targetinstrinfo">TargetInstrInfo</a></tt> class.</p> 
+
+<p>The operands of a machine instruction can be of several different types:
+they can be a register reference, constant integer, basic block reference, etc.
+In addition, a machine operand should be marked as a def or a use of the value
+(though only registers are allowed to be defs).</p>
+
+<p>By convention, the LLVM code generator orders instruction operands so that
+all register definitions come before the register uses, even on architectures
+that are normally printed in other orders.  For example, the sparc add 
+instruction: "<tt>add %i1, %i2, %i3</tt>" adds the "%i1", and "%i2" registers
+and stores the result into the "%i3" register.  In the LLVM code generator,
+the operands should be stored as "<tt>%i3, %i1, %i2</tt>": with the destination
+first.</p>
+
+<p>Keeping destination operands at the beginning of the operand list has several
+advantages.  In particular, the debugging printer will print the instruction 
+like this:</p>
+
+<pre>
+  %r3 = add %i1, %i2
+</pre>
+
+<p>If the first operand is a def, and it is also easier to <a 
+href="#buildmi">create instructions</a> whose only def is the first 
+operand.</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="buildmi">Using the <tt>MachineInstrBuilder.h</tt> functions</a>
+</div>
+
+<div class="doc_text">
+
+<p>Machine instructions are created by using the <tt>BuildMI</tt> functions,
+located in the <tt>include/llvm/CodeGen/MachineInstrBuilder.h</tt> file.  The
+<tt>BuildMI</tt> functions make it easy to build arbitrary machine 
+instructions.  Usage of the <tt>BuildMI</tt> functions look like this: 
+</p>
+
+<pre>
+  // Create a 'DestReg = mov 42' (rendered in X86 assembly as 'mov DestReg, 42')
+  // instruction.  The '1' specifies how many operands will be added.
+  MachineInstr *MI = BuildMI(X86::MOV32ri, 1, DestReg).addImm(42);
+
+  // Create the same instr, but insert it at the end of a basic block.
+  MachineBasicBlock &amp;MBB = ...
+  BuildMI(MBB, X86::MOV32ri, 1, DestReg).addImm(42);
+
+  // Create the same instr, but insert it before a specified iterator point.
+  MachineBasicBlock::iterator MBBI = ...
+  BuildMI(MBB, MBBI, X86::MOV32ri, 1, DestReg).addImm(42);
+
+  // Create a 'cmp Reg, 0' instruction, no destination reg.
+  MI = BuildMI(X86::CMP32ri, 2).addReg(Reg).addImm(0);
+  // Create an 'sahf' instruction which takes no operands and stores nothing.
+  MI = BuildMI(X86::SAHF, 0);
+
+  // Create a self looping branch instruction.
+  BuildMI(MBB, X86::JNE, 1).addMBB(&amp;MBB);
+</pre>
+
+<p>
+The key thing to remember with the <tt>BuildMI</tt> functions is that you have
+to specify the number of operands that the machine instruction will take 
+(allowing efficient memory allocation).  Also, if operands default to be uses
+of values, not definitions.  If you need to add a definition operand (other 
+than the optional destination register), you must explicitly mark it as such.
+</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="fixedregs">Fixed (aka preassigned) registers</a>
+</div>
+
+<div class="doc_text">
+
+<p>One important issue that the code generator needs to be aware of is the
+presence of fixed registers.  In particular, there are often places in the 
+instruction stream where the register allocator <em>must</em> arrange for a
+particular value to be in a particular register.  This can occur due to 
+limitations in the instruction set (e.g., the X86 can only do a 32-bit divide 
+with the <tt>EAX</tt>/<tt>EDX</tt> registers), or external factors like calling
+conventions.  In any case, the instruction selector should emit code that 
+copies a virtual register into or out of a physical register when needed.</p>
+
+<p>For example, consider this simple LLVM example:</p>
+
+<pre>
+  int %test(int %X, int %Y) {
+    %Z = div int %X, %Y
+    ret int %Z
+  }
+</pre>
+
+<p>The X86 instruction selector produces this machine code for the div 
+and ret (use 
+"<tt>llc X.bc -march=x86 -print-machineinstrs</tt>" to get this):</p>
+
+<pre>
+        ;; Start of div
+        %EAX = mov %reg1024           ;; Copy X (in reg1024) into EAX
+        %reg1027 = sar %reg1024, 31
+        %EDX = mov %reg1027           ;; Sign extend X into EDX
+        idiv %reg1025                 ;; Divide by Y (in reg1025)
+        %reg1026 = mov %EAX           ;; Read the result (Z) out of EAX
+
+        ;; Start of ret
+        %EAX = mov %reg1026           ;; 32-bit return value goes in EAX
+        ret
+</pre>
+
+<p>By the end of code generation, the register allocator has coallesced
+the registers and deleted the resultant identity moves, producing the
+following code:</p>
+
+<pre>
+        ;; X is in EAX, Y is in ECX
+        mov %EAX, %EDX
+        sar %EDX, 31
+        idiv %ECX
+        ret 
+</pre>
+
+<p>This approach is extremely general (if it can handle the X86 architecture, 
+it can handle anything!) and allows all of the target specific
+knowledge about the instruction stream to be isolated in the instruction 
+selector.  Note that physical registers should have a short lifetime for good 
+code generation, and all physical registers are assumed dead on entry and
+exit of basic blocks (before register allocation).  Thus if you need a value
+to be live across basic block boundaries, it <em>must</em> live in a virtual 
+register.</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="ssa">Machine code SSA form</a>
+</div>
+
+<div class="doc_text">
+
+<p><tt>MachineInstr</tt>'s are initially instruction selected in SSA-form, and
+are maintained in SSA-form until register allocation happens.  For the most 
+part, this is trivially simple since LLVM is already in SSA form: LLVM PHI nodes
+become machine code PHI nodes, and virtual registers are only allowed to have a
+single definition.</p>
+
+<p>After register allocation, machine code is no longer in SSA-form, as there 
+are no virtual registers left in the code.</p>
+
+</div>
+
+<!-- *********************************************************************** -->
+<div class="doc_section">
+  <a name="targetimpls">Target description implementations</a>
+</div>
+<!-- *********************************************************************** -->
+
+<div class="doc_text">
+
+<p>This section of the document explains any features or design decisions that
+are specific to the code generator for a particular target.</p>
+
+</div>
+
+
+<!-- ======================================================================= -->
+<div class="doc_subsection">
+  <a name="x86">The X86 backend</a>
+</div>
 
+<div class="doc_text">
+
+<p>
+The X86 code generator lives in the <tt>lib/Target/X86</tt> directory.  This
+code generator currently targets a generic P6-like processor.  As such, it
+produces a few P6-and-above instructions (like conditional moves), but it does
+not make use of newer features like MMX or SSE.  In the future, the X86 backend
+will have subtarget support added for specific processor families and 
+implementations.</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="x86_memory">Representing X86 addressing modes in MachineInstrs</a>
+</div>
+
+<div class="doc_text">
+
+<p>
+The x86 has a very, uhm, flexible, way of accessing memory.  It is capable of
+forming memory addresses of the following expression directly in integer
+instructions (which use ModR/M addressing):</p>
+
+<pre>
+   Base+[1,2,4,8]*IndexReg+Disp32
+</pre>
+
+<p>Wow, that's crazy.  In order to represent this, LLVM tracks no less that 4
+operands for each memory operand of this form.  This means that the "load" form
+of 'mov' has the following "Operands" in this order:</p>
+
+<pre>
+Index:        0     |    1        2       3           4
+Meaning:   DestReg, | BaseReg,  Scale, IndexReg, Displacement
+OperandTy: VirtReg, | VirtReg, UnsImm, VirtReg,   SignExtImm
+</pre>
+
+<p>Stores and all other instructions treat the four memory operands in the same
+way, in the same order.</p>
+</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="x86_names">Instruction naming</a>
+</div>
+
+<div class="doc_text">
+
+<p>
+An instruction name consists of the base name, a default operand size
+followed by a character per operand with an optional special size. For
+example:</p>
+
+<p>
+<tt>ADD8rr</tt> -&gt; add, 8-bit register, 8-bit register<br>
+<tt>IMUL16rmi</tt> -&gt; imul, 16-bit register, 16-bit memory, 16-bit immediate<br>
+<tt>IMUL16rmi8</tt> -&gt; imul, 16-bit register, 16-bit memory, 8-bit immediate<br>
+<tt>MOVSX32rm16</tt> -&gt; movsx, 32-bit register, 16-bit memory
+</p>
+
+</div>
 
 <!-- *********************************************************************** -->
 <hr>
@@ -357,7 +636,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/03 16:55:57 $
+  Last modified: $Date: 2004/06/04 00:16:02 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Thu Jun  3 19:44:05 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 19:44:05 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200406040040.TAA32459@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.192 -> 1.193

---
Log message:

New doc


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.192 llvm/docs/ReleaseNotes.html:1.193
--- llvm/docs/ReleaseNotes.html:1.192	Thu Jun  3 17:35:13 2004
+++ llvm/docs/ReleaseNotes.html	Thu Jun  3 19:40:11 2004
@@ -117,6 +117,8 @@
 <li>LLVM and the C front-end now work under Win32 using the
 <a href="http://www.cygwin.com">Cygwin</a> runtime libraries.  
 This includes the JIT compiler.</li>
+<li>The LLVM code generator is now being <a 
+    href="CodeGenerator.html">documented</a>.</li>
 </ol>
 
 </div>
@@ -698,7 +700,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/03 22:35:13 $
+  Last modified: $Date: 2004/06/04 00:40:11 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Thu Jun  3 19:45:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Jun  3 19:45:04 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406040041.TAA00657@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.6 -> 1.7

---
Log message:

Fix extraneous tag


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.6 llvm/docs/CodeGenerator.html:1.7
--- llvm/docs/CodeGenerator.html:1.6	Thu Jun  3 19:16:02 2004
+++ llvm/docs/CodeGenerator.html	Thu Jun  3 19:40:53 2004
@@ -601,7 +601,6 @@
 
 <p>Stores and all other instructions treat the four memory operands in the same
 way, in the same order.</p>
-</p>
 
 </div>
 
@@ -636,7 +635,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/04 00:16:02 $
+  Last modified: $Date: 2004/06/04 00:40:53 $
 </address>
 
 </body>




From brukman at cs.uiuc.edu  Fri Jun  4 09:56:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Jun  4 09:56:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineFunction.h
Message-ID: <200406041451.JAA14437@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineFunction.h updated: 1.35 -> 1.36

---
Log message:

Clarify documentation and use correct doxygen comment form /// vs. // .
Thanks to Vladimir Prus for corrections.


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

Index: llvm/include/llvm/CodeGen/MachineFunction.h
diff -u llvm/include/llvm/CodeGen/MachineFunction.h:1.35 llvm/include/llvm/CodeGen/MachineFunction.h:1.36
--- llvm/include/llvm/CodeGen/MachineFunction.h:1.35	Mon May 24 02:14:35 2004
+++ llvm/include/llvm/CodeGen/MachineFunction.h	Fri Jun  4 09:51:25 2004
@@ -132,16 +132,19 @@
   ///
   void dump() const;
 
-  // The next three methods are used to construct, destruct, and retrieve the
-  // MachineFunction object for the given method.
-  //
-  // construct() -- Allocates and initializes for a given method and target
-  // get()       -- Returns a handle to the object.
-  //                This should not be called before "construct()"
-  //                for a given Method.
-  // 
+  /// construct - Allocate and initialize a MachineFunction for a given Function
+  /// and Target
+  ///
   static MachineFunction& construct(const Function *F, const TargetMachine &TM);
+
+  /// destruct - Destroy the MachineFunction corresponding to a given Function
+  ///
   static void destruct(const Function *F);
+
+  /// get - Return a handle to a MachineFunction corresponding to the given
+  /// Function.  This should not be called before "construct()" for a given
+  /// Function.
+  ///
   static MachineFunction& get(const Function *F);
 
   // Provide accessors for the MachineBasicBlock list...




From brukman at cs.uiuc.edu  Fri Jun  4 10:04:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Jun  4 10:04:01 2004
Subject: [llvm-commits] CVS: llvm/utils/TableGen/CodeGenWrappers.cpp
Message-ID: <200406041459.JAA14539@zion.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

CodeGenWrappers.cpp updated: 1.6 -> 1.7

---
Log message:

Emit a more sensible error message if no subclasses of Target are defined.
Patch contributed by Vladimir Prus.


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

Index: llvm/utils/TableGen/CodeGenWrappers.cpp
diff -u llvm/utils/TableGen/CodeGenWrappers.cpp:1.6 llvm/utils/TableGen/CodeGenWrappers.cpp:1.7
--- llvm/utils/TableGen/CodeGenWrappers.cpp:1.6	Tue Nov 11 16:41:34 2003
+++ llvm/utils/TableGen/CodeGenWrappers.cpp	Fri Jun  4 09:59:42 2004
@@ -72,6 +72,8 @@
 ///
 CodeGenTarget::CodeGenTarget() : PointerType(MVT::Other) {
   std::vector<Record*> Targets = Records.getAllDerivedDefinitions("Target");
+  if (Targets.size() == 0)
+    throw std::string("ERROR: No 'Target' subclasses defined!");  
   if (Targets.size() != 1)
     throw std::string("ERROR: Multiple subclasses of Target defined!");
   TargetRec = Targets[0];




From lattner at cs.uiuc.edu  Fri Jun  4 12:08:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 12:08:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/MRegisterInfo.h
Message-ID: <200406041703.MAA15291@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

MRegisterInfo.h updated: 1.41 -> 1.42

---
Log message:

Fix a nasty bug that caused areAliases to always return false.

Bug fix courtesy of Anshu Dasgupta



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

Index: llvm/include/llvm/Target/MRegisterInfo.h
diff -u llvm/include/llvm/Target/MRegisterInfo.h:1.41 llvm/include/llvm/Target/MRegisterInfo.h:1.42
--- llvm/include/llvm/Target/MRegisterInfo.h:1.41	Sun Mar 14 14:14:27 2004
+++ llvm/include/llvm/Target/MRegisterInfo.h	Fri Jun  4 12:03:11 2004
@@ -196,7 +196,7 @@
   /// false otherwise
   bool areAliases(unsigned regA, unsigned regB) const {
     for (const unsigned *Alias = getAliasSet(regA); *Alias; ++Alias)
-      if (*Alias == regA) return true;
+      if (*Alias == regB) return true;
     return false;
   }
 




From gaeke at cs.uiuc.edu  Fri Jun  4 12:59:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Jun  4 12:59:01 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200406041758.MAA01052@kain.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.79 -> 1.80

---
Log message:

Make live-in register saving a little more robust.
Add code (currently not tested) for copying live-ins from the MatrixFn's stack.


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

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.79 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.80
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.79	Thu Jun  3 00:40:29 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Fri Jun  4 12:58:24 2004
@@ -117,11 +117,11 @@
       std::make_pair (V, GetValueAllocState (TF, V));
     AllocStates.insert (as);
     AllocInfo &Source = as.second.first, &Target = as.second.second;
-    assert (Source.AllocState == AllocInfo::Allocated &&
-            Target.AllocState == AllocInfo::Allocated && 
-            "Only handle live-in values in registers for now!");
-    RegsToSave.insert (Source.Placement);
-    RegsToSave.insert (Target.Placement);
+    if (Source.AllocState == AllocInfo::Allocated)
+      RegsToSave.insert (Source.Placement);
+    if (Target.AllocState == AllocInfo::Allocated
+        && Target.Placement != Source.Placement)
+      RegsToSave.insert (Target.Placement);
   }
 
   DEBUG(std::cerr << "findRegsToSave: RegsToSave (size " 
@@ -191,18 +191,30 @@
     Value *V = *SI;
     std::pair<AllocInfo, AllocInfo> &ai = AllocStates[V];
     AllocInfo &Source = ai.first, &Target = ai.second;
-    assert (Target.AllocState == AllocInfo::Allocated
-            && "FIXME: can't do mem-->mem copy of live-ins yet");
-    mvec.clear ();
-    assert (TRI.getRegType (Target.Placement)
-            == TRI.getRegType (Source.Placement)
-            && "Live-in value changed reg type?!");
-    unsigned RegType = TRI.getRegType (Target.Placement);
-    TRI.cpMem2RegMI (mvec, sp, stackOffsetForReg (Source.Placement),
-                     Target.Placement, RegType, g2);
-    for (std::vector<MachineInstr *>::iterator vi = mvec.begin (),
+    if (Source.AllocState == AllocInfo::Allocated
+        && Target.AllocState == AllocInfo::Allocated) {
+      mvec.clear ();
+      assert (TRI.getRegType (Target.Placement)
+              == TRI.getRegType (Source.Placement)
+              && "Live-in value changed reg type?!");
+      unsigned RegType = TRI.getRegType (Target.Placement);
+      TRI.cpMem2RegMI (mvec, sp, stackOffsetForReg (Source.Placement),
+                       Target.Placement, RegType, g2);
+      for (std::vector<MachineInstr *>::iterator vi = mvec.begin (),
            ve = mvec.end (); vi != ve; ++vi)
-      E.push_back (*vi);
+        E.push_back (*vi);
+    } else if (Source.AllocState == AllocInfo::Spilled
+               && Target.AllocState == AllocInfo::Allocated) {
+      mvec.clear ();
+      unsigned RegType = TRI.getRegType (Target.Placement);
+      TRI.cpMem2RegMI (mvec, fp, Source.Placement, Target.Placement, RegType, g2);
+      for (std::vector<MachineInstr *>::iterator vi = mvec.begin (),
+           ve = mvec.end (); vi != ve; ++vi)
+        E.push_back (*vi);
+    } else {
+      std::cerr << "Whoops, can't do live-ins spilled in TraceFn yet\n";
+      abort ();
+    }
   }
 }
 




From gaeke at cs.uiuc.edu  Fri Jun  4 12:59:14 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Jun  4 12:59:14 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceToFunction/TraceToFunction.cpp
Message-ID: <200406041758.MAA01059@kain.cs.uiuc.edu>


Changes in directory reopt/lib/TraceToFunction:

TraceToFunction.cpp updated: 1.59 -> 1.60

---
Log message:

Add better debug printouts of live-out and live-in sets.
When we do replaceAllUses on a phi node, we may need to fix up whatever it
corresponded to in the O2CMap. The code for this is not right yet, so add
an assert.


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

Index: reopt/lib/TraceToFunction/TraceToFunction.cpp
diff -u reopt/lib/TraceToFunction/TraceToFunction.cpp:1.59 reopt/lib/TraceToFunction/TraceToFunction.cpp:1.60
--- reopt/lib/TraceToFunction/TraceToFunction.cpp:1.59	Mon May 31 00:51:45 2004
+++ reopt/lib/TraceToFunction/TraceToFunction.cpp	Fri Jun  4 12:58:25 2004
@@ -217,9 +217,15 @@
 ///
 static PointerType *createLiveOutType (LiveVariableSet S) {
   TypeVector T;
+  unsigned Counter = 0;
   // For each variable in S, make a new entry in T having its type.
-  for (LiveVariableSet::iterator I = S.begin (), E = S.end (); I != E; ++I)
+  DEBUG (std::cerr << "Live-out values:\n");
+  for (LiveVariableSet::iterator I = S.begin (), E = S.end (); I != E; ++I) {
+    DEBUG (WriteAsOperand (std::cerr, *I, true, true,
+                           cast<Instruction>(*I)->getParent ()->getParent ()->getParent ());
+           std::cerr << " is at position " << Counter++ << "\n");
     T.push_back ((*I)->getType ());
+  }
   return PointerType::get (StructType::get (T));
 }
 
@@ -241,8 +247,9 @@
     P.push_back (V->getType ());
     TF->LiveInToParameterMap[V] = P.size () - 1;
   }
-  // Print out mapping of instructions to arg numbers.
-  DEBUG(for (ValueToIntMap::iterator I = TF->LiveInToParameterMap.begin (),
+  // Print out mapping of instructions producing live-ins to arg numbers.
+  DEBUG(std::cerr << "\nLive-in values:\n";
+        for (ValueToIntMap::iterator I = TF->LiveInToParameterMap.begin (),
 	       E = TF->LiveInToParameterMap.end (); I != E; ++I) {
           WriteAsOperand (std::cerr, I->first, true, true,
             TF->MatrixFn->getParent ());
@@ -323,7 +330,7 @@
 }
 
 static void fixupPhis (BasicBlock *dstB, ValueMap &O2CMap) {
-  std::vector<Instruction *> goners;
+  std::map<Instruction *, Value *> replaced;
   Function *F = dstB->getParent ();
   // Fix up Phi nodes:
   for (BasicBlock::iterator Inst = dstB->begin ();
@@ -348,7 +355,8 @@
       DEBUG(std::cerr << "Replacing Phi node" << *PN << " with its lone"
         << " on-trace input " << *PN->getIncomingValue (lastSrcFound) << "\n");
       PN->replaceAllUsesWith (PN->getIncomingValue (lastSrcFound));
-      goners.push_back (PN); // Delete non-used phi node later.
+      replaced[PN] = PN->getIncomingValue (lastSrcFound);
+      // Non-used phi node will be deleted later.
     } else {
       // Case N. If the phi node has >1 source on the trace, just
       // delete sources from the Phi node that are not on the trace.
@@ -375,17 +383,12 @@
                   "Sorry, fixupPhis mishandled a Phi node"));
   }
 
-  while (!goners.empty ()) {
-    assert (goners.back ()->use_size () == 0
+  for (std::map<Instruction *, Value *>::iterator i = replaced.begin(),
+       e = replaced.end(); i != e; ++i) {
+    assert (i->first->use_size () == 0
             && "Whoops, I was going to delete something which still has uses");
-    dstB->getInstList ().erase (goners.back ());
-    for (ValueMap::iterator i = O2CMap.begin(), e = O2CMap.end(); i != e; ++i) {
-      if (i->second == goners.back ()) {
-        O2CMap.erase (i);
-        break;
-      }
-    }
-    goners.pop_back ();
+    dstB->getInstList ().erase (i->first);
+    if (0) { O2CMap[i->first] = i->second; } else { assert (0 && "I don't think this is right - i->first is the real clone"); }
   }
 }
 




From gaeke at cs.uiuc.edu  Fri Jun  4 12:59:23 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Jun  4 12:59:23 2004
Subject: [llvm-commits] CVS: reopt/test/run-tests
Message-ID: <200406041758.MAA01066@kain.cs.uiuc.edu>


Changes in directory reopt/test:

run-tests updated: 1.2 -> 1.3

---
Log message:

Currently we're working on fixing strcat.


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

Index: reopt/test/run-tests
diff -u reopt/test/run-tests:1.2 reopt/test/run-tests:1.3
--- reopt/test/run-tests:1.2	Wed Jun  2 15:19:03 2004
+++ reopt/test/run-tests	Fri Jun  4 12:58:26 2004
@@ -43,6 +43,7 @@
   ary3) SUBDIR=SingleSource/Reoptimizer/Ary3 ;;
   sieve) SUBDIR=SingleSource/Reoptimizer/Sieve ;;
   lists) SUBDIR=SingleSource/Reoptimizer/Lists ;;
+  strcat) SUBDIR=SingleSource/Reoptimizer/Strcat ;;
   shootout) SUBDIR=SingleSource/Benchmarks/Shootout ;;
   mynestedloop) SUBDIR=SingleSource/Reoptimizer/MyNestedLoop ;;
   *) die "Error: Unknown benchmark $arg" ;;




From lattner at cs.uiuc.edu  Fri Jun  4 14:06:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 14:06:02 2004
Subject: [llvm-commits] CVS: llvm/include/Support/DataTypes.h.in
Message-ID: <200406041901.OAA16035@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

DataTypes.h.in updated: 1.1 -> 1.2

---
Log message:

Make this work with VC++


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

Index: llvm/include/Support/DataTypes.h.in
diff -u llvm/include/Support/DataTypes.h.in:1.1 llvm/include/Support/DataTypes.h.in:1.2
--- llvm/include/Support/DataTypes.h.in:1.1	Mon Feb 23 16:07:26 2004
+++ llvm/include/Support/DataTypes.h.in	Fri Jun  4 14:01:49 2004
@@ -30,9 +30,16 @@
 # error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h"
 #endif
 
+#ifndef _MSC_VER
 // Note that <inttypes.h> includes <stdint.h>, if this is a C99 system.
 @INCLUDE_INTTYPES_H@
 @INCLUDE_SYS_TYPES_H@
+#else
+// Visual C++ doesn't provide standard integer headers, but it does provide
+// built-in data types.
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#endif
 
 #if !defined(INT64_MAX)
 /* We couldn't determine INT64_MAX; default it. */




From lattner at cs.uiuc.edu  Fri Jun  4 14:15:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 14:15:02 2004
Subject: [llvm-commits] CVS: llvm/include/Support/StringExtras.h
Message-ID: <200406041910.OAA16135@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

StringExtras.h updated: 1.12 -> 1.13

---
Log message:

Add explicit casts to silence warnings.  There is no need to use snprintf here.


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

Index: llvm/include/Support/StringExtras.h
diff -u llvm/include/Support/StringExtras.h:1.12 llvm/include/Support/StringExtras.h:1.13
--- llvm/include/Support/StringExtras.h:1.12	Sun Dec 28 23:06:38 2003
+++ llvm/include/Support/StringExtras.h	Fri Jun  4 14:10:30 2004
@@ -28,7 +28,7 @@
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    unsigned Mod = X & 15;
+    unsigned char Mod = unsigned char(X) & 15;
     if (Mod < 10)
       *--BufPtr = '0' + Mod;
     else
@@ -46,7 +46,7 @@
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    *--BufPtr = '0' + (X % 10);
+    *--BufPtr = '0' + char(X % 10);
     X /= 10;
   }
 
@@ -75,7 +75,7 @@
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    *--BufPtr = '0' + (X % 10);
+    *--BufPtr = '0' + char(X % 10);
     X /= 10;
   }
 
@@ -93,7 +93,7 @@
 
 static inline std::string ftostr(double V) {
   char Buffer[200];
-  snprintf(Buffer, 200, "%20.6e", V);
+  sprintf(Buffer, "%20.6e", V);
   return Buffer;
 }
 




From lattner at cs.uiuc.edu  Fri Jun  4 14:15:15 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 14:15:15 2004
Subject: [llvm-commits] CVS: llvm/include/Support/DataTypes.h.in
Message-ID: <200406041911.OAA16167@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

DataTypes.h.in updated: 1.2 -> 1.3

---
Log message:

Add more needed typedefs


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

Index: llvm/include/Support/DataTypes.h.in
diff -u llvm/include/Support/DataTypes.h.in:1.2 llvm/include/Support/DataTypes.h.in:1.3
--- llvm/include/Support/DataTypes.h.in:1.2	Fri Jun  4 14:01:49 2004
+++ llvm/include/Support/DataTypes.h.in	Fri Jun  4 14:11:04 2004
@@ -39,6 +39,8 @@
 // built-in data types.
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
+typedef int int32_t;
+typedef unsigned uint32_t;
 #endif
 
 #if !defined(INT64_MAX)




From lattner at cs.uiuc.edu  Fri Jun  4 14:30:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 14:30:01 2004
Subject: [llvm-commits] CVS: llvm/include/Config/alloca.h
Message-ID: <200406041926.OAA16245@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config:

alloca.h updated: 1.3 -> 1.4

---
Log message:

Make this work on VC++, pull the HAVE_ALLOCA_H case out instead of duplicating
it.  This code can probably be dramatically simplified, as I suspect that the
pragma and other stuff is not needed with C++ compilers.



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

Index: llvm/include/Config/alloca.h
diff -u llvm/include/Config/alloca.h:1.3 llvm/include/Config/alloca.h:1.4
--- llvm/include/Config/alloca.h:1.3	Mon Oct 20 15:11:34 2003
+++ llvm/include/Config/alloca.h	Fri Jun  4 14:25:50 2004
@@ -23,27 +23,23 @@
  *	2) If alloca.h cannot be found, then try stdlib.h.  Some platforms
  *	   (notably FreeBSD) defined alloca() there.
  */
-#ifndef __GNUC__
-#	ifdef HAVE_ALLOCA_H
-#		include <alloca.h>
+#ifdef _MSC_VER
+/* noop on Visual C++ */
+#elif defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#elif !defined(__GNUC__)
+#	ifdef _AIX
+ #		pragma alloca
 #	else
-#		ifdef _AIX
- #			pragma alloca
-#		else
-#			ifndef alloca
-				char * alloca ();
-#			endif
+#		ifndef alloca
+			char * alloca ();
 #		endif
 #	endif
 #else
-#	ifdef HAVE_ALLOCA_H
-#		include <alloca.h>
+#	ifdef HAVE_STDLIB_H
+#		include <stdlib.h>
 #	else
-#		ifdef HAVE_STDLIB_H
-#			include <stdlib.h>
-#		else
-#			error "The function alloca() is required but not found!"
-#		endif
+#		error "The function alloca() is required but not found!"
 #	endif
 #endif
 




From lattner at cs.uiuc.edu  Fri Jun  4 15:07:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:07:04 2004
Subject: [llvm-commits] CVS: llvm/include/Config/sys/mman.h stat.h
Message-ID: <200406042003.PAA16611@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config/sys:

mman.h updated: 1.3 -> 1.4
stat.h updated: 1.4 -> 1.5

---
Log message:

Visual C has something resembling a stat function, but it doesn't provide S_ISREG


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

Index: llvm/include/Config/sys/mman.h
diff -u llvm/include/Config/sys/mman.h:1.3 llvm/include/Config/sys/mman.h:1.4
--- llvm/include/Config/sys/mman.h:1.3	Mon Oct 20 15:11:42 2003
+++ llvm/include/Config/sys/mman.h	Fri Jun  4 15:03:06 2004
@@ -20,7 +20,7 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_MMAN_H
+#if defined(HAVE_SYS_MMAN_H) && !defined(_MSC_VER)
 #include <sys/mman.h>
 #endif
 


Index: llvm/include/Config/sys/stat.h
diff -u llvm/include/Config/sys/stat.h:1.4 llvm/include/Config/sys/stat.h:1.5
--- llvm/include/Config/sys/stat.h:1.4	Thu Feb 26 02:01:30 2004
+++ llvm/include/Config/sys/stat.h	Fri Jun  4 15:03:06 2004
@@ -21,5 +21,9 @@
 #include <sys/stat.h>
 #endif
 
+#if defined(_MSC_VER)
+#define S_ISREG(X) ((X) & _S_IFREG)
+#endif
+
 #endif
 




From lattner at cs.uiuc.edu  Fri Jun  4 15:10:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:10:07 2004
Subject: [llvm-commits] CVS: llvm/include/Config/unistd.h
Message-ID: <200406042005.PAA16685@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config:

unistd.h updated: 1.4 -> 1.5

---
Log message:

<io.h> provides read/write/open/...


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

Index: llvm/include/Config/unistd.h
diff -u llvm/include/Config/unistd.h:1.4 llvm/include/Config/unistd.h:1.5
--- llvm/include/Config/unistd.h:1.4	Tue Jun  1 18:47:00 2004
+++ llvm/include/Config/unistd.h	Fri Jun  4 15:05:35 2004
@@ -16,12 +16,13 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
 #include <unistd.h>
 #endif
 
 #ifdef _WIN32
 #include <process.h>
+#include <io.h>
 #endif
 
 #endif




From lattner at cs.uiuc.edu  Fri Jun  4 15:11:09 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:11:09 2004
Subject: [llvm-commits] CVS: llvm/include/Support/DataTypes.h.in
Message-ID: <200406042006.PAA16756@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

DataTypes.h.in updated: 1.3 -> 1.4

---
Log message:

Add ssize_t for VC++


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

Index: llvm/include/Support/DataTypes.h.in
diff -u llvm/include/Support/DataTypes.h.in:1.3 llvm/include/Support/DataTypes.h.in:1.4
--- llvm/include/Support/DataTypes.h.in:1.3	Fri Jun  4 14:11:04 2004
+++ llvm/include/Support/DataTypes.h.in	Fri Jun  4 15:06:33 2004
@@ -39,8 +39,9 @@
 // built-in data types.
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-typedef int int32_t;
-typedef unsigned uint32_t;
+typedef signed   int int32_t;
+typedef unsigned int uint32_t;
+typedef signed   int ssize_t;
 #endif
 
 #if !defined(INT64_MAX)




From lattner at cs.uiuc.edu  Fri Jun  4 15:15:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:15:01 2004
Subject: [llvm-commits] CVS: llvm/include/Support/ilist
Message-ID: <200406042010.PAA16849@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

ilist updated: 1.19 -> 1.20

---
Log message:

Silence a warning


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

Index: llvm/include/Support/ilist
diff -u llvm/include/Support/ilist:1.19 llvm/include/Support/ilist:1.20
--- llvm/include/Support/ilist:1.19	Thu Jun  3 13:48:59 2004
+++ llvm/include/Support/ilist	Fri Jun  4 15:10:17 2004
@@ -301,7 +301,7 @@
   typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
   typedef std::reverse_iterator<iterator>  reverse_iterator;
 
-  iplist() : Head(this->createNode()), Tail(Head) {
+  iplist() : Head(Traits::createNode()), Tail(Head) {
     setNext(Head, 0);
     setPrev(Head, 0);
   }




From lattner at cs.uiuc.edu  Fri Jun  4 15:19:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:19:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200406042014.PAA16943@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.100 -> 1.101

---
Log message:

Squish a warning


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

Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.100 llvm/lib/VMCore/Type.cpp:1.101
--- llvm/lib/VMCore/Type.cpp:1.100	Fri May 28 00:40:19 2004
+++ llvm/lib/VMCore/Type.cpp	Fri Jun  4 15:14:29 2004
@@ -305,7 +305,7 @@
 //
 const Type *StructType::getTypeAtIndex(const Value *V) const {
   assert(indexValid(V) && "Invalid structure index!");
-  unsigned Idx = cast<ConstantUInt>(V)->getValue();
+  unsigned Idx = (unsigned)cast<ConstantUInt>(V)->getValue();
   return ContainedTys[Idx];
 }
 




From lattner at cs.uiuc.edu  Fri Jun  4 15:26:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:26:01 2004
Subject: [llvm-commits] CVS: llvm/include/Support/StringExtras.h
Message-ID: <200406042022.PAA27458@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

StringExtras.h updated: 1.13 -> 1.14

---
Log message:

GCC doesn't like prefix form of cast with two identifiers I guess.


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

Index: llvm/include/Support/StringExtras.h
diff -u llvm/include/Support/StringExtras.h:1.13 llvm/include/Support/StringExtras.h:1.14
--- llvm/include/Support/StringExtras.h:1.13	Fri Jun  4 14:10:30 2004
+++ llvm/include/Support/StringExtras.h	Fri Jun  4 15:21:53 2004
@@ -28,7 +28,7 @@
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    unsigned char Mod = unsigned char(X) & 15;
+    unsigned char Mod = (unsigned char)X & 15;
     if (Mod < 10)
       *--BufPtr = '0' + Mod;
     else




From lattner at cs.uiuc.edu  Fri Jun  4 15:30:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:30:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
Message-ID: <200406042026.PAA31993@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

FindUnsafePointerTypes.cpp updated: 1.23 -> 1.24

---
Log message:

Don't send random junk to CachedWriter's.  Also remove a cast that could be
problematic when Type does not derive from Value.


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

Index: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.23 llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.24
--- llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.23	Wed Apr 28 13:52:43 2004
+++ llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp	Fri Jun  4 15:25:55 2004
@@ -71,8 +71,10 @@
 
           if (PrintFailures) {
             CachedWriter CW(F->getParent(), std::cerr);
-            CW << "FindUnsafePointerTypes: Type '" << ITy
-               << "' marked unsafe in '" << F->getName() << "' by:\n" << *I;
+            std::cerr << "FindUnsafePointerTypes: Type '";
+            CW << ITy;
+            std::cerr << "' marked unsafe in '" << F->getName() << "' by:\n";
+            CW << *I;
           }
         }
     }
@@ -93,13 +95,13 @@
 
   CachedWriter CW(M, o);
 
-  CW << "SafePointerAccess Analysis: Found these unsafe types:\n";
+  o << "SafePointerAccess Analysis: Found these unsafe types:\n";
   unsigned Counter = 1;
   for (std::set<PointerType*>::const_iterator I = getUnsafeTypes().begin(), 
          E = getUnsafeTypes().end(); I != E; ++I, ++Counter) {
     
     o << " #" << Counter << ". ";
-    CW << (Value*)*I << "\n";
+    CW << (Type*)*I << "\n";
   }
 }
 




From lattner at cs.uiuc.edu  Fri Jun  4 15:39:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:39:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/CachedWriter.h
Message-ID: <200406042035.PAA26247@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Assembly:

CachedWriter.h updated: 1.16 -> 1.17

---
Log message:

Remove support for printing strings from the cached writer



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

Index: llvm/include/llvm/Assembly/CachedWriter.h
diff -u llvm/include/llvm/Assembly/CachedWriter.h:1.16 llvm/include/llvm/Assembly/CachedWriter.h:1.17
--- llvm/include/llvm/Assembly/CachedWriter.h:1.16	Wed May 26 02:37:11 2004
+++ llvm/include/llvm/Assembly/CachedWriter.h	Fri Jun  4 15:34:51 2004
@@ -70,10 +70,6 @@
     *Out << X;
     return *this;
   }
-  inline CachedWriter& operator<<(const std::string &X) {
-    *Out << X;
-    return *this;
-  }
 
   inline CachedWriter &operator<<(enum TypeWriter tw) {
     SymbolicTypes = (tw == SymTypeOn);




From lattner at cs.uiuc.edu  Fri Jun  4 15:43:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:43:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/PassSupport.h
Message-ID: <200406042039.PAA29719@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

PassSupport.h updated: 1.19 -> 1.20

---
Log message:

Fix more warnings


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

Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.19 llvm/include/llvm/PassSupport.h:1.20
--- llvm/include/llvm/PassSupport.h:1.19	Thu Jun  3 16:14:56 2004
+++ llvm/include/llvm/PassSupport.h	Fri Jun  4 15:39:05 2004
@@ -174,19 +174,19 @@
 struct RegisterPass : public RegisterPassBase {
   
   // Register Pass using default constructor...
-  RegisterPass(const char *PassArg, const char *Name, unsigned PassTy = 0) {
+  RegisterPass(const char *PassArg, const char *Name, unsigned char PassTy = 0){
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy,
                               callDefaultCtor<PassName>));
   }
 
   // Register Pass using default constructor explicitly...
-  RegisterPass(const char *PassArg, const char *Name, unsigned PassTy,
+  RegisterPass(const char *PassArg, const char *Name, unsigned char PassTy,
                Pass *(*ctor)()) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy, ctor));
   }
 
   // Register Pass using TargetMachine constructor...
-  RegisterPass(const char *PassArg, const char *Name, unsigned PassTy,
+  RegisterPass(const char *PassArg, const char *Name, unsigned char PassTy,
                Pass *(*targetctor)(TargetMachine &)) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy,
                               0, targetctor));
@@ -194,7 +194,7 @@
 
   // Generic constructor version that has an unknown ctor type...
   template<typename CtorType>
-  RegisterPass(const char *PassArg, const char *Name, unsigned PassTy,
+  RegisterPass(const char *PassArg, const char *Name, unsigned char PassTy,
                CtorType *Fn) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy, 0));
   }




From lattner at cs.uiuc.edu  Fri Jun  4 15:52:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:52:01 2004
Subject: [llvm-commits] CVS: llvm/include/Support/TypeInfo.h
Message-ID: <200406042047.PAA09095@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

TypeInfo.h updated: 1.5 -> 1.6

---
Log message:

Fix a *really* dumb warning on VC


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

Index: llvm/include/Support/TypeInfo.h
diff -u llvm/include/Support/TypeInfo.h:1.5 llvm/include/Support/TypeInfo.h:1.6
--- llvm/include/Support/TypeInfo.h:1.5	Tue Nov 11 16:41:29 2003
+++ llvm/include/Support/TypeInfo.h	Fri Jun  4 15:47:19 2004
@@ -36,7 +36,7 @@
 
   // Compatibility functions
   bool before(const TypeInfo &rhs) const {
-    return Info->before(*rhs.Info);
+    return Info->before(*rhs.Info) != 0;
   }
   const char *getClassName() const {
     return Info->name();




From gaeke at cs.uiuc.edu  Fri Jun  4 15:52:09 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Jun  4 15:52:09 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
Message-ID: <200406042051.PAA13788@kain.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

SparcV9RegInfo.cpp updated: 1.128 -> 1.129

---
Log message:

Fix up some spacing & fix a typo in an assertion in cpValue2Value.


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

Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.128 llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.129
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.128	Wed Jun  2 21:45:09 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp	Fri Jun  4 15:51:40 2004
@@ -929,11 +929,11 @@
 
 void
 SparcV9RegInfo::cpValue2Value(Value *Src, Value *Dest,
-                                 std::vector<MachineInstr*>& mvec) const {
+                              std::vector<MachineInstr*>& mvec) const {
   int RegType = getRegTypeForDataType(Src->getType());
   MachineInstr * MI = NULL;
 
-  switch( RegType ) {
+  switch (RegType) {
   case IntRegType:
     MI = BuildMI(V9::ADDr, 3).addReg(Src).addMReg(getZeroRegNum())
       .addRegDef(Dest);
@@ -945,7 +945,7 @@
     MI = BuildMI(V9::FMOVD, 2).addReg(Src).addRegDef(Dest);
     break;
   default:
-    assert(0 && "Unknow RegType in CpValu2Value");
+    assert(0 && "Unknown RegType in cpValue2Value");
   }
 
   mvec.push_back(MI);




From lattner at cs.uiuc.edu  Fri Jun  4 15:53:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 15:53:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/PassManagerT.h
Message-ID: <200406042049.PAA10306@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

PassManagerT.h updated: 1.48 -> 1.49

---
Log message:

Ugh, apparently there is no common ground here.


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

Index: llvm/lib/VMCore/PassManagerT.h
diff -u llvm/lib/VMCore/PassManagerT.h:1.48 llvm/lib/VMCore/PassManagerT.h:1.49
--- llvm/lib/VMCore/PassManagerT.h:1.48	Fri Mar 12 00:16:28 2004
+++ llvm/lib/VMCore/PassManagerT.h	Fri Jun  4 15:48:51 2004
@@ -142,8 +142,13 @@
   typedef typename Traits::BatcherClass BatcherClass;
   typedef typename Traits::ParentClass   ParentClass;
 
+#ifndef _MSC_VER
   friend class PassManagerTraits<UnitType>::PassClass;
   friend class PassManagerTraits<UnitType>::SubPassClass;  
+#else
+  friend PassClass;
+  friend SubPassClass;
+#endif
   friend class PassManagerTraits<UnitType>;
   friend class ImmutablePass;
 




From lattner at cs.uiuc.edu  Fri Jun  4 16:03:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 16:03:02 2004
Subject: [llvm-commits] CVS: llvm/include/Support/DataTypes.h.in
Message-ID: <200406042058.PAA01873@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

DataTypes.h.in updated: 1.4 -> 1.5

---
Log message:

Add some constants for VC


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

Index: llvm/include/Support/DataTypes.h.in
diff -u llvm/include/Support/DataTypes.h.in:1.4 llvm/include/Support/DataTypes.h.in:1.5
--- llvm/include/Support/DataTypes.h.in:1.4	Fri Jun  4 15:06:33 2004
+++ llvm/include/Support/DataTypes.h.in	Fri Jun  4 15:58:34 2004
@@ -11,9 +11,8 @@
 // This file is important because different host OS's define different macros,
 // which makes portability tough.  This file exports the following definitions:
 //
-//   int64_t       : is a typedef for the signed 64 bit system type
-//   uint64_t      : is a typedef for the unsigned 64 bit system type
-//   INT64_MAX     : is a #define specifying the max value for int64_t's
+//   [u]int(32|64)_t : typedefs for signed and unsigned 32/64 bit system types
+//   [U]INT(8|16|32|64)_(MIN|MAX) : Constants for the min and max values.
 //
 // No library is required when using these functinons.
 //
@@ -42,6 +41,15 @@
 typedef signed   int int32_t;
 typedef unsigned int uint32_t;
 typedef signed   int ssize_t;
+#define INT8_MAX 127
+#define INT8_MIN -128
+#define UINT8_MAX 255
+#define INT16_MAX 32767
+#define INT16_MIN -32768
+#define UINT16_MAX 65535
+#define INT32_MAX 2147483647
+#define INT32_MIN -2147483648
+#define UINT32_MAX 4294967295U
 #endif
 
 #if !defined(INT64_MAX)




From brukman at cs.uiuc.edu  Fri Jun  4 16:15:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Jun  4 16:15:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/CachedWriter.h
Message-ID: <200406042110.QAA05123@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Assembly:

CachedWriter.h updated: 1.17 -> 1.18

---
Log message:

Revert ostream back to reference: the only user (llvm-tv) no longer needs it.


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

Index: llvm/include/llvm/Assembly/CachedWriter.h
diff -u llvm/include/llvm/Assembly/CachedWriter.h:1.17 llvm/include/llvm/Assembly/CachedWriter.h:1.18
--- llvm/include/llvm/Assembly/CachedWriter.h:1.17	Fri Jun  4 15:34:51 2004
+++ llvm/include/llvm/Assembly/CachedWriter.h	Fri Jun  4 16:10:35 2004
@@ -34,7 +34,7 @@
   AssemblyWriter *AW;
   SlotMachine *SC;
   bool SymbolicTypes;
-  std::ostream *Out;
+  std::ostream &Out;
 
 public:
   enum TypeWriter {
@@ -43,9 +43,9 @@
   };
 
   CachedWriter(std::ostream &O = std::cout)
-    : AW(0), SC(0), SymbolicTypes(false), Out(&O) { }
+    : AW(0), SC(0), SymbolicTypes(false), Out(O) { }
   CachedWriter(const Module *M, std::ostream &O = std::cout)
-    : AW(0), SC(0), SymbolicTypes(false), Out(&O) {
+    : AW(0), SC(0), SymbolicTypes(false), Out(O) {
     setModule(M);
   }
   ~CachedWriter();
@@ -63,11 +63,11 @@
   inline CachedWriter &operator<<(const PointerType *X);
 
   inline CachedWriter &operator<<(std::ostream &(&Manip)(std::ostream &)) {
-    *Out << Manip; return *this;
+    Out << Manip; return *this;
   }
 
   inline CachedWriter& operator<<(const char *X) {
-    *Out << X;
+    Out << X;
     return *this;
   }
 
@@ -75,9 +75,6 @@
     SymbolicTypes = (tw == SymTypeOn);
     return *this;
   }
-
-  inline std::ostream& getStream() { return *Out; }
-  void setStream(std::ostream &os);
 };
 
 } // End llvm namespace




From brukman at cs.uiuc.edu  Fri Jun  4 16:16:00 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Jun  4 16:16:00 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200406042112.QAA05154@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.134 -> 1.135

---
Log message:

* No more CachedWriter::setStream()
* ostream is back to being a reference instead of a pointer
* Output single characters as chars, not as length-1 strings


---
Diffs of the changes:  (+47 -52)

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.134 llvm/lib/VMCore/AsmWriter.cpp:1.135
--- llvm/lib/VMCore/AsmWriter.cpp:1.134	Tue Jun  1 09:54:08 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Fri Jun  4 16:11:51 2004
@@ -346,7 +346,7 @@
 ///
 std::ostream &llvm::WriteTypeSymbolic(std::ostream &Out, const Type *Ty,
                                       const Module *M) {
-  Out << " "; 
+  Out << ' '; 
 
   // If they want us to print out a type, attempt to make it symbolic if there
   // is a symbol table in the module...
@@ -434,9 +434,9 @@
       Out << "\"";
 
     } else {                // Cannot output in string format...
-      Out << "[";
+      Out << '[';
       if (CA->getNumOperands()) {
-        Out << " ";
+        Out << ' ';
         printTypeInt(Out, ETy, TypeTable);
         WriteAsOperandInternal(Out, CA->getOperand(0),
                                PrintName, TypeTable, Machine);
@@ -450,9 +450,9 @@
       Out << " ]";
     }
   } else if (const ConstantStruct *CS = dyn_cast<ConstantStruct>(CV)) {
-    Out << "{";
+    Out << '{';
     if (CS->getNumOperands()) {
-      Out << " ";
+      Out << ' ';
       printTypeInt(Out, CS->getOperand(0)->getType(), TypeTable);
 
       WriteAsOperandInternal(Out, CS->getOperand(0),
@@ -488,7 +488,7 @@
       Out << " to ";
       printTypeInt(Out, CE->getType(), TypeTable);
     }
-    Out << ")";
+    Out << ')';
 
   } else {
     Out << "<placeholder or erroneous Constant>";
@@ -504,7 +504,7 @@
                                    bool PrintName,
                                   std::map<const Type*, std::string> &TypeTable,
                                    SlotMachine *Machine) {
-  Out << " ";
+  Out << ' ';
   if (PrintName && V->hasName()) {
     Out << getLLVMName(V->getName());
   } else {
@@ -526,7 +526,7 @@
         Slot = Machine->getSlot(V);
         delete Machine;
       }
-      Out << "%" << Slot;
+      Out << '%' << Slot;
     }
   }
 }
@@ -631,7 +631,7 @@
       if (FTy->getNumParams()) *Out << ", ";
       *Out << "...";
     }
-    *Out << ")";
+    *Out << ')';
   } else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
     *Out << "{ ";
     for (StructType::element_iterator I = STy->element_begin(),
@@ -642,10 +642,10 @@
     }
     *Out << " }";
   } else if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
-    printType(PTy->getElementType()) << "*";
+    printType(PTy->getElementType()) << '*';
   } else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
-    *Out << "[" << ATy->getNumElements() << " x ";
-    printType(ATy->getElementType()) << "]";
+    *Out << '[' << ATy->getNumElements() << " x ";
+    printType(ATy->getElementType()) << ']';
   } else if (const OpaqueType *OTy = dyn_cast<OpaqueType>(Ty)) {
     *Out << "opaque";
   } else {
@@ -659,7 +659,7 @@
 
 void AssemblyWriter::writeOperand(const Value *Operand, bool PrintType, 
                                   bool PrintName) {
-  if (PrintType) { *Out << " "; printType(Operand->getType()); }
+  if (PrintType) { *Out << ' '; printType(Operand->getType()); }
   WriteAsOperandInternal(*Out, Operand, PrintName, TypeNames, &Machine);
 }
 
@@ -780,12 +780,12 @@
     case GlobalValue::ExternalLinkage: break;
     }
 
-  printType(F->getReturnType()) << " ";
+  printType(F->getReturnType()) << ' ';
   if (!F->getName().empty())
     *Out << getLLVMName(F->getName());
   else
     *Out << "\"\"";
-  *Out << "(";
+  *Out << '(';
   Machine.incorporateFunction(F);
 
   // Loop over the arguments, printing them...
@@ -799,7 +799,7 @@
     if (FT->getNumParams()) *Out << ", ";
     *Out << "...";  // Output varargs portion of signature!
   }
-  *Out << ")";
+  *Out << ')';
 
   if (F->isExternal()) {
     *Out << "\n";
@@ -828,14 +828,14 @@
   
   // Output name, if available...
   if (Arg->hasName())
-    *Out << " " << getLLVMName(Arg->getName());
+    *Out << ' ' << getLLVMName(Arg->getName());
 }
 
 /// printBasicBlock - This member is called for each basic block in a method.
 ///
 void AssemblyWriter::printBasicBlock(const BasicBlock *BB) {
   if (BB->hasName()) {              // Print out the label if it exists...
-    *Out << "\n" << BB->getName() << ":";
+    *Out << "\n" << BB->getName() << ':';
   } else if (!BB->use_empty()) {      // Don't print block # of no uses...
     *Out << "\n; <label>:" << Machine.getSlot(BB);
   }
@@ -854,7 +854,7 @@
         *Out << " preds =";
         writeOperand(*PI, false, true);
         for (++PI; PI != PE; ++PI) {
-          *Out << ",";
+          *Out << ',';
           writeOperand(*PI, false, true);
         }
       }
@@ -879,12 +879,12 @@
 void AssemblyWriter::printInfoComment(const Value &V) {
   if (V.getType() != Type::VoidTy) {
     *Out << "\t\t; <";
-    printType(V.getType()) << ">";
+    printType(V.getType()) << '>';
 
     if (!V.hasName()) {
-      *Out << ":" << Machine.getSlot(&V); // Print out the def slot taken.
+      *Out << ':' << Machine.getSlot(&V); // Print out the def slot taken.
     }
-    *Out << " [#uses=" << V.use_size() << "]";  // Output # uses
+    *Out << " [#uses=" << V.use_size() << ']';  // Output # uses
   }
 }
 
@@ -913,31 +913,31 @@
   // Special case conditional branches to swizzle the condition out to the front
   if (isa<BranchInst>(I) && I.getNumOperands() > 1) {
     writeOperand(I.getOperand(2), true);
-    *Out << ",";
+    *Out << ',';
     writeOperand(Operand, true);
-    *Out << ",";
+    *Out << ',';
     writeOperand(I.getOperand(1), true);
 
   } else if (isa<SwitchInst>(I)) {
     // Special case switch statement to get formatting nice and correct...
-    writeOperand(Operand        , true); *Out << ",";
+    writeOperand(Operand        , true); *Out << ',';
     writeOperand(I.getOperand(1), true); *Out << " [";
 
     for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; op += 2) {
       *Out << "\n\t\t";
-      writeOperand(I.getOperand(op  ), true); *Out << ",";
+      writeOperand(I.getOperand(op  ), true); *Out << ',';
       writeOperand(I.getOperand(op+1), true);
     }
     *Out << "\n\t]";
   } else if (isa<PHINode>(I)) {
-    *Out << " ";
+    *Out << ' ';
     printType(I.getType());
-    *Out << " ";
+    *Out << ' ';
 
     for (unsigned op = 0, Eop = I.getNumOperands(); op < Eop; op += 2) {
       if (op) *Out << ", ";
-      *Out << "[";  
-      writeOperand(I.getOperand(op  ), false); *Out << ",";
+      *Out << '[';  
+      writeOperand(I.getOperand(op  ), false); *Out << ',';
       writeOperand(I.getOperand(op+1), false); *Out << " ]";
     }
   } else if (isa<ReturnInst>(I) && !Operand) {
@@ -954,15 +954,15 @@
     if (!FTy->isVarArg() &&
         (!isa<PointerType>(RetTy) || 
          !isa<FunctionType>(cast<PointerType>(RetTy)->getElementType()))) {
-      *Out << " "; printType(RetTy);
+      *Out << ' '; printType(RetTy);
       writeOperand(Operand, false);
     } else {
       writeOperand(Operand, true);
     }
-    *Out << "(";
+    *Out << '(';
     if (I.getNumOperands() > 1) writeOperand(I.getOperand(1), true);
     for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; ++op) {
-      *Out << ",";
+      *Out << ',';
       writeOperand(I.getOperand(op), true);
     }
 
@@ -979,16 +979,16 @@
     if (!FTy->isVarArg() &&
         (!isa<PointerType>(RetTy) || 
          !isa<FunctionType>(cast<PointerType>(RetTy)->getElementType()))) {
-      *Out << " "; printType(RetTy);
+      *Out << ' '; printType(RetTy);
       writeOperand(Operand, false);
     } else {
       writeOperand(Operand, true);
     }
 
-    *Out << "(";
+    *Out << '(';
     if (I.getNumOperands() > 3) writeOperand(I.getOperand(3), true);
     for (unsigned op = 4, Eop = I.getNumOperands(); op < Eop; ++op) {
-      *Out << ",";
+      *Out << ',';
       writeOperand(I.getOperand(op), true);
     }
 
@@ -998,10 +998,10 @@
     writeOperand(II->getUnwindDest(), true);
 
   } else if (const AllocationInst *AI = dyn_cast<AllocationInst>(&I)) {
-    *Out << " ";
+    *Out << ' ';
     printType(AI->getType()->getElementType());
     if (AI->isArrayAllocation()) {
-      *Out << ",";
+      *Out << ',';
       writeOperand(AI->getArraySize(), true);
     }
   } else if (isa<CastInst>(I)) {
@@ -1039,12 +1039,12 @@
     }
     
     if (!PrintAllTypes) {
-      *Out << " ";
+      *Out << ' ';
       printType(TheType);
     }
 
     for (unsigned i = 0, E = I.getNumOperands(); i != E; ++i) {
-      if (i) *Out << ",";
+      if (i) *Out << ',';
       writeOperand(I.getOperand(i), PrintAllTypes);
     }
   }
@@ -1101,7 +1101,7 @@
     return;
   }
 
-  o << " " << getType()->getDescription() << " ";
+  o << ' ' << getType()->getDescription() << ' ';
 
   std::map<const Type *, std::string> TypeTable;
   WriteConstantInt(o, this, false, TypeTable, 0);
@@ -1115,7 +1115,7 @@
 }
 
 void Argument::print(std::ostream &o) const {
-  o << getType() << " " << getName();
+  o << getType() << ' ' << getName();
 }
 
 // Value::dump - allow easy printing of  Values from the debugger.
@@ -1134,7 +1134,7 @@
   delete SC; delete AW;
   if (M) {
     SC = new SlotMachine(M );
-    AW = new AssemblyWriter(*Out, *SC, M, 0);
+    AW = new AssemblyWriter(Out, *SC, M, 0);
   } else {
     SC = 0; AW = 0;
   }
@@ -1155,7 +1155,7 @@
   case Value::BasicBlockVal:     AW->write(cast<BasicBlock>(V)); break;
   case Value::FunctionVal:       AW->write(cast<Function>(V)); break;
   case Value::GlobalVariableVal: AW->write(cast<GlobalVariable>(V)); break;
-  default: *Out << "<unknown value type: " << V->getValueType() << ">"; break;
+  default: Out << "<unknown value type: " << V->getValueType() << '>'; break;
   }
   return *this;
 }
@@ -1163,17 +1163,12 @@
 CachedWriter& CachedWriter::operator<<(const Type *X) {
   if (SymbolicTypes) {
     const Module *M = AW->getModule();
-    if (M) WriteTypeSymbolic(*Out, X, M);
+    if (M) WriteTypeSymbolic(Out, X, M);
     return *this;
   } else
     return *this << (const Value*)X;
 }
 
-void CachedWriter::setStream(std::ostream &os) {
-  Out = &os;
-  if (AW) AW->setStream(os);
-}
-
 //===----------------------------------------------------------------------===//
 //===--                    SlotMachine Implementation
 //===----------------------------------------------------------------------===//
@@ -1455,8 +1450,8 @@
   SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" << 
            DestSlot << " [");
   // G = Global, C = Constant, T = Type, F = Function, o = other
-  SC_DEBUG((isa<GlobalVariable>(V) ? "G" : (isa<Constant>(V) ? "C" : 
-           (isa<Function>(V) ? "F" : "o"))));
+  SC_DEBUG((isa<GlobalVariable>(V) ? 'G' : (isa<Constant>(V) ? 'C' : 
+           (isa<Function>(V) ? 'F' : 'o'))));
   SC_DEBUG("]\n");
   return DestSlot;
 }




From lattner at cs.uiuc.edu  Fri Jun  4 18:57:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 18:57:02 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp
Message-ID: <200406042352.SAA07988@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.88 -> 1.89

---
Log message:

Delete some unreachable code


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

Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.88 llvm/lib/VMCore/Constants.cpp:1.89
--- llvm/lib/VMCore/Constants.cpp:1.88	Tue May 25 00:32:43 2004
+++ llvm/lib/VMCore/Constants.cpp	Fri Jun  4 18:52:36 2004
@@ -436,7 +436,6 @@
   switch (Ty->getPrimitiveID()) {
   default:
     return false;         // These can't be represented as integers!!!
-
     // Signed types...
   case Type::SByteTyID:
     return (Val <= INT8_MAX && Val >= INT8_MIN);
@@ -447,8 +446,6 @@
   case Type::LongTyID:
     return true;          // This is the largest type...
   }
-  assert(0 && "WTF?");
-  return false;
 }
 
 bool ConstantUInt::isValueValidForType(const Type *Ty, uint64_t Val) {
@@ -466,8 +463,6 @@
   case Type::ULongTyID:
     return true;          // This is the largest type...
   }
-  assert(0 && "WTF?");
-  return false;
 }
 
 bool ConstantFP::isValueValidForType(const Type *Ty, double Val) {




From lattner at cs.uiuc.edu  Fri Jun  4 18:58:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 18:58:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200406042353.SAA08078@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.135 -> 1.136

---
Log message:

Squelch a warning


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

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.135 llvm/lib/VMCore/AsmWriter.cpp:1.136
--- llvm/lib/VMCore/AsmWriter.cpp:1.135	Fri Jun  4 16:11:51 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Fri Jun  4 18:53:20 2004
@@ -421,7 +421,8 @@
     if (isString) {
       Out << "c\"";
       for (unsigned i = 0; i < CA->getNumOperands(); ++i) {
-        unsigned char C = cast<ConstantInt>(CA->getOperand(i))->getRawValue();
+        unsigned char C = 
+          (unsigned char)cast<ConstantInt>(CA->getOperand(i))->getRawValue();
         
         if (isprint(C) && C != '"' && C != '\\') {
           Out << C;




From lattner at cs.uiuc.edu  Fri Jun  4 19:08:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:08:02 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp
Message-ID: <200406050003.TAA08378@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.44 -> 1.45

---
Log message:

Remove unused var


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

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.44 llvm/lib/VMCore/SymbolTable.cpp:1.45
--- llvm/lib/VMCore/SymbolTable.cpp:1.44	Tue May 25 10:20:47 2004
+++ llvm/lib/VMCore/SymbolTable.cpp	Fri Jun  4 19:03:27 2004
@@ -111,7 +111,6 @@
 
   Value *Result = Entry->second;
   assert(!isa<Type>(Result) && "Can't remove types through this interface.");
-  const Type *Ty = Result->getType();
 #if DEBUG_SYMBOL_TABLE
   dump();
   std::cerr << " Removing Value: " << Result->getName() << "\n";




From lattner at cs.uiuc.edu  Fri Jun  4 19:16:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:16:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/BasicBlock.cpp
Message-ID: <200406050011.TAA08455@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

BasicBlock.cpp updated: 1.44 -> 1.45

---
Log message:

As much as I dislike doing this, it's the only fix for VC8.0 that I can come
up with, even though it's perfectly conformant code.  :(



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

Index: llvm/lib/VMCore/BasicBlock.cpp
diff -u llvm/lib/VMCore/BasicBlock.cpp:1.44 llvm/lib/VMCore/BasicBlock.cpp:1.45
--- llvm/lib/VMCore/BasicBlock.cpp:1.44	Fri Apr 16 12:37:12 2004
+++ llvm/lib/VMCore/BasicBlock.cpp	Fri Jun  4 19:11:27 2004
@@ -181,7 +181,8 @@
   } else {
     // Okay, now we know that we need to remove predecessor #pred_idx from all
     // PHI nodes.  Iterate over each PHI node fixing them up
-    for (iterator II = begin(); PHINode *PN = dyn_cast<PHINode>(II); ++II)
+    PHINode *PN;
+    for (iterator II = begin(); PN = dyn_cast<PHINode>(II); ++II)
       PN->removeIncomingValue(Pred);
   }
 }
@@ -221,8 +222,9 @@
     // Loop over any phi nodes in the basic block, updating the BB field of
     // incoming values...
     BasicBlock *Successor = *I;
+    PHINode *PN;
     for (BasicBlock::iterator II = Successor->begin();
-         PHINode *PN = dyn_cast<PHINode>(II); ++II) {
+         PN = dyn_cast<PHINode>(II); ++II) {
       int IDX = PN->getBasicBlockIndex(this);
       while (IDX != -1) {
         PN->setIncomingBlock((unsigned)IDX, New);




From lattner at cs.uiuc.edu  Fri Jun  4 19:22:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:22:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/CallSite.h
Message-ID: <200406050017.TAA08548@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

CallSite.h updated: 1.14 -> 1.15

---
Log message:

Warning foo


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

Index: llvm/include/llvm/Support/CallSite.h
diff -u llvm/include/llvm/Support/CallSite.h:1.14 llvm/include/llvm/Support/CallSite.h:1.15
--- llvm/include/llvm/Support/CallSite.h:1.14	Sun May 23 03:02:45 2004
+++ llvm/include/llvm/Support/CallSite.h	Fri Jun  4 19:17:13 2004
@@ -100,7 +100,7 @@
       return I->op_begin()+3; // Skip Function, BB, BB
   }
   arg_iterator arg_end() const { return I->op_end(); }
-  unsigned arg_size() const { return arg_end() - arg_begin(); }
+  unsigned arg_size() const { return unsigned(arg_end() - arg_begin()); }
 
   bool operator<(const CallSite &CS) const {
     return getInstruction() < CS.getInstruction();




From lattner at cs.uiuc.edu  Fri Jun  4 19:26:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:26:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Verifier.cpp
Message-ID: <200406050022.TAA08582@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Verifier.cpp updated: 1.103 -> 1.104

---
Log message:

Work around VS bug


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

Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.103 llvm/lib/VMCore/Verifier.cpp:1.104
--- llvm/lib/VMCore/Verifier.cpp:1.103	Thu Jun  3 01:38:43 2004
+++ llvm/lib/VMCore/Verifier.cpp	Fri Jun  4 19:22:04 2004
@@ -318,9 +318,8 @@
   if (isa<PHINode>(BB.front())) {
     std::vector<BasicBlock*> Preds(pred_begin(&BB), pred_end(&BB));
     std::sort(Preds.begin(), Preds.end());
-    
-    for (BasicBlock::iterator I = BB.begin();
-         PHINode *PN = dyn_cast<PHINode>(I); ++I) {
+    PHINode *PN; 
+    for (BasicBlock::iterator I = BB.begin(); PN = dyn_cast<PHINode>(I); ++I) {
 
       // Ensure that PHI nodes have at least one entry!
       Assert1(PN->getNumIncomingValues() != 0,




From lattner at cs.uiuc.edu  Fri Jun  4 19:29:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:29:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp
Message-ID: <200406050025.TAA08642@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Dominators.cpp updated: 1.54 -> 1.55

---
Log message:

Add missing #include


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

Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.54 llvm/lib/VMCore/Dominators.cpp:1.55
--- llvm/lib/VMCore/Dominators.cpp:1.54	Sat Dec  6 18:55:32 2003
+++ llvm/lib/VMCore/Dominators.cpp	Fri Jun  4 19:24:59 2004
@@ -19,6 +19,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/SetOperations.h"
+#include <algorithm>
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//




From lattner at cs.uiuc.edu  Fri Jun  4 19:32:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:32:00 2004
Subject: [llvm-commits] CVS: llvm/include/Config/sys/resource.h time.h
Message-ID: <200406050027.TAA08702@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config/sys:

resource.h updated: 1.4 -> 1.5
time.h updated: 1.4 -> 1.5

---
Log message:

Don't #include <unistd.h> directly, go through the config files


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

Index: llvm/include/Config/sys/resource.h
diff -u llvm/include/Config/sys/resource.h:1.4 llvm/include/Config/sys/resource.h:1.5
--- llvm/include/Config/sys/resource.h:1.4	Thu Feb 26 02:01:30 2004
+++ llvm/include/Config/sys/resource.h	Fri Jun  4 19:27:38 2004
@@ -18,22 +18,16 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_RESOURCE_H
+#if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER)
 
 /*
  * In LLVM, we use sys/resource.h to use getrusage() and maybe some other
  * stuff.  Some man pages say that you also need sys/time.h and unistd.h.
  * So, to be paranoid, we will try to include all three if possible.
  */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
+#include "Config/sys/time.h"
 #include <sys/resource.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include "Config/unistd.h"
 
 #endif
 


Index: llvm/include/Config/sys/time.h
diff -u llvm/include/Config/sys/time.h:1.4 llvm/include/Config/sys/time.h:1.5
--- llvm/include/Config/sys/time.h:1.4	Thu Feb 26 02:01:30 2004
+++ llvm/include/Config/sys/time.h	Fri Jun  4 19:27:38 2004
@@ -17,7 +17,7 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_TIME_H
+#if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
 #include <sys/time.h>
 #endif
 




From lattner at cs.uiuc.edu  Fri Jun  4 19:59:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 19:59:00 2004
Subject: [llvm-commits] CVS: llvm/include/Config/windows.h
Message-ID: <200406050054.TAA08845@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config:

windows.h updated: 1.2 -> 1.3

---
Log message:

Macros are baaad.


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

Index: llvm/include/Config/windows.h
diff -u llvm/include/Config/windows.h:1.2 llvm/include/Config/windows.h:1.3
--- llvm/include/Config/windows.h:1.2	Fri May 28 16:07:11 2004
+++ llvm/include/Config/windows.h	Fri Jun  4 19:54:11 2004
@@ -18,6 +18,8 @@
 
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
+#undef min
+#undef max
 #endif
 
 #endif




From lattner at cs.uiuc.edu  Fri Jun  4 20:10:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Jun  4 20:10:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/IntrinsicLowering.cpp
Message-ID: <200406050105.UAA08932@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

IntrinsicLowering.cpp updated: 1.12 -> 1.13

---
Log message:

Remove an unused variable.
Work around for bogus errors: no those static functions don't need to
be executed to be initialized!


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

Index: llvm/lib/VMCore/IntrinsicLowering.cpp
diff -u llvm/lib/VMCore/IntrinsicLowering.cpp:1.12 llvm/lib/VMCore/IntrinsicLowering.cpp:1.13
--- llvm/lib/VMCore/IntrinsicLowering.cpp:1.12	Sat May  8 23:29:57 2004
+++ llvm/lib/VMCore/IntrinsicLowering.cpp	Fri Jun  4 20:05:19 2004
@@ -107,8 +107,6 @@
   Function *Callee = CI->getCalledFunction();
   assert(Callee && "Cannot lower an indirect call!");
   
-  Module *M = Callee->getParent();
-
   switch (Callee->getIntrinsicID()) {
   case Intrinsic::not_intrinsic:
     std::cerr << "Cannot lower a call to a non-intrinsic function '"
@@ -136,18 +134,20 @@
        CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
      break;
 
-  case Intrinsic::longjmp:
+  case Intrinsic::longjmp: {
     static Function *LongjmpFCache = 0;
     ReplaceCallWith("longjmp", CI, CI->op_begin()+1, CI->op_end(),
                     Type::VoidTy, LongjmpFCache);
     break;
+  }
 
-  case Intrinsic::siglongjmp:
+  case Intrinsic::siglongjmp: {
     // Insert the call to abort
     static Function *AbortFCache = 0;
     ReplaceCallWith("abort", CI, CI->op_end(), CI->op_end(), Type::VoidTy,
                     AbortFCache);
     break;
+  }
 
   case Intrinsic::returnaddress:
   case Intrinsic::frameaddress:
@@ -167,27 +167,30 @@
       CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
     break;    // Simply strip out debugging intrinsics
 
-  case Intrinsic::memcpy:
+  case Intrinsic::memcpy: {
     // The memcpy intrinsic take an extra alignment argument that the memcpy
     // libc function does not.
     static Function *MemcpyFCache = 0;
     ReplaceCallWith("memcpy", CI, CI->op_begin()+1, CI->op_end()-1,
                     (*(CI->op_begin()+1))->getType(), MemcpyFCache);
     break;
-  case Intrinsic::memmove:
+  }
+  case Intrinsic::memmove: {
     // The memmove intrinsic take an extra alignment argument that the memmove
     // libc function does not.
     static Function *MemmoveFCache = 0;
     ReplaceCallWith("memmove", CI, CI->op_begin()+1, CI->op_end()-1,
                     (*(CI->op_begin()+1))->getType(), MemmoveFCache);
     break;
-  case Intrinsic::memset:
+  }
+  case Intrinsic::memset: {
     // The memset intrinsic take an extra alignment argument that the memset
     // libc function does not.
     static Function *MemsetFCache = 0;
     ReplaceCallWith("memset", CI, CI->op_begin()+1, CI->op_end()-1,
                     (*(CI->op_begin()+1))->getType(), MemsetFCache);
     break;
+  }
   }
   
   assert(CI->use_empty() &&




From alkis at cs.uiuc.edu  Sat Jun  5 04:04:07 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Sat Jun  5 04:04:07 2004
Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp
Message-ID: <200406050859.DAA28822@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

FileUtilities.cpp updated: 1.22 -> 1.23

---
Log message:

Include cerrno.


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

Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.22 llvm/lib/Support/FileUtilities.cpp:1.23
--- llvm/lib/Support/FileUtilities.cpp:1.22	Tue Jun  1 19:52:22 2004
+++ llvm/lib/Support/FileUtilities.cpp	Sat Jun  5 03:59:43 2004
@@ -18,9 +18,10 @@
 #include "Config/sys/stat.h"
 #include "Config/sys/types.h"
 #include "Config/sys/mman.h"
+#include <cerrno>
+#include <cstdio>
 #include <fstream>
 #include <iostream>
-#include <cstdio>
 using namespace llvm;
 
 /// CheckMagic - Returns true IFF the file named FN begins with Magic. FN must




From llvm at cs.uiuc.edu  Sat Jun  5 09:22:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat Jun  5 09:22:01 2004
Subject: [llvm-commits] CVS: llvm/docs/BytecodeFormat.html
Message-ID: <200406051418.JAA21948@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

BytecodeFormat.html updated: 1.8 -> 1.9

---
Log message:

Add "work in progress" warning.


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

Index: llvm/docs/BytecodeFormat.html
diff -u llvm/docs/BytecodeFormat.html:1.8 llvm/docs/BytecodeFormat.html:1.9
--- llvm/docs/BytecodeFormat.html:1.8	Tue May 25 12:44:58 2004
+++ llvm/docs/BytecodeFormat.html	Sat Jun  5 09:18:02 2004
@@ -42,6 +42,9 @@
 <p>Written by <a href="mailto:rspencer at x10sys.com">Reid Spencer</a>
 </p>
 </div>
+<div class="doc_warning">
+  <p>Warning: This is a work in progress.</p>
+</div>
 <!-- *********************************************************************** -->
 <div class="doc_section"> <a name="abstract">Abstract </a></div>
 <!-- *********************************************************************** -->
@@ -511,7 +514,7 @@
   <a href="mailto:rspencer at x10sys.com">Reid Spencer</a> and 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/05/25 17:44:58 $
+  Last modified: $Date: 2004/06/05 14:18:02 $
 </address>
 </body>
 </html>




From llvm at cs.uiuc.edu  Sat Jun  5 09:44:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat Jun  5 09:44:01 2004
Subject: [llvm-commits] CVS: llvm/docs/CodeGenerator.html
Message-ID: <200406051439.JAA22009@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

CodeGenerator.html updated: 1.7 -> 1.8

---
Log message:

Fix a few typos, spellos, grammaros.


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

Index: llvm/docs/CodeGenerator.html
diff -u llvm/docs/CodeGenerator.html:1.7 llvm/docs/CodeGenerator.html:1.8
--- llvm/docs/CodeGenerator.html:1.7	Thu Jun  3 19:40:53 2004
+++ llvm/docs/CodeGenerator.html	Sat Jun  5 09:39:24 2004
@@ -68,12 +68,12 @@
 
 <ol>
 <li><a href="#targetdesc">Abstract target description</a> interfaces which
-capture improtant properties about various aspects of the machine independently
+capture important properties about various aspects of the machine, independently
 of how they will be used.  These interfaces are defined in
 <tt>include/llvm/Target/</tt>.</li>
 
 <li>Classes used to represent the <a href="#codegendesc">machine code</a> being
-generator for a target.  These classes are intended to be abstract enough to
+generated for a target.  These classes are intended to be abstract enough to
 represent the machine code for <i>any</i> target machine.  These classes are
 defined in <tt>include/llvm/CodeGen/</tt>.</li>
 
@@ -99,8 +99,8 @@
 different pieces of this will be useful to you.  In any case, you should be
 familiar with the <a href="#targetdesc">target description</a> and <a
 href="#codegendesc">machine code representation</a> classes.  If you want to add
-a backend for a new target, you will need <a href="#targetimpls">implement the
-targe description</a> classes for your new target and understand the <a
+a backend for a new target, you will need to <a href="#targetimpls">implement the
+target description</a> classes for your new target and understand the <a
 href="LangRef.html">LLVM code representation</a>.  If you are interested in
 implementing a new <a href="#codegenalgs">code generation algorithm</a>, it
 should only depend on the target-description and machine code representation
@@ -133,7 +133,7 @@
 code generator like this is a (purely hypothetical) backend that converts LLVM
 to the GCC RTL form and uses GCC to emit machine code for a target.</p>
 
-<p>The other implication of this design is that it is possible to design and
+<p>This design also implies that it is possible to design and
 implement radically different code generators in the LLVM system that do not
 make use of any of the built-in components.  Doing so is not recommended at all,
 but could be required for radically different targets that do not fit into the
@@ -164,9 +164,9 @@
 generation in this model is divided into the following stages:</p>
 
 <ol>
-<li><b>Instruction Selection</b> - Determining a efficient implementation of the
+<li><b>Instruction Selection</b> - Determining an efficient implementation of the
 input LLVM code in the target instruction set.  This stage produces the initial
-code for the program in the target instruction set the makes use of virtual
+code for the program in the target instruction set, then makes use of virtual
 registers in SSA form and physical registers that represent any required
 register assignments due to target constraints or calling conventions.</li>
 
@@ -191,7 +191,7 @@
 "final" machine code can go here, such as spill code scheduling and peephole
 optimizations.</li>
 
-<li><b>Code Emission</b> - The final stage actually outputs the machine code for
+<li><b>Code Emission</b> - The final stage actually outputs the code for
 the current function, either in the target assembler format or in machine
 code.</li>
 
@@ -200,11 +200,13 @@
 <p>
 The code generator is based on the assumption that the instruction selector will
 use an optimal pattern matching selector to create high-quality sequences of
-native code.  Alternative code generator designs based on pattern expansion and
-aggressive iterative peephole optimization are much slower.  This design is
-designed to permit efficient compilation (important for JIT environments) and
-aggressive optimization (used when generate code offline) by allowing components
-of varying levels of sophisication to be used for any step of compilation.</p>
+native instructions.  Alternative code generator designs based on pattern 
+expansion and
+aggressive iterative peephole optimization are much slower.  This design 
+permits efficient compilation (important for JIT environments) and
+aggressive optimization (used when generating code offline) by allowing 
+components of varying levels of sophisication to be used for any step of 
+compilation.</p>
 
 <p>
 In addition to these stages, target implementations can insert arbitrary
@@ -253,7 +255,7 @@
 <p>All of the target description classes (except the <tt><a
 href="#targetdata">TargetData</a></tt> class) are designed to be subclassed by
 the concrete target implementation, and have virtual methods implemented.  To
-get to these implementations, <tt><a
+get to these implementations, the <tt><a
 href="#targetmachine">TargetMachine</a></tt> class provides accessors that
 should be implemented by the target.</p>
 
@@ -269,7 +271,7 @@
 <p>The <tt>TargetMachine</tt> class provides virtual methods that are used to
 access the target-specific implementations of the various target description
 classes (with the <tt>getInstrInfo</tt>, <tt>getRegisterInfo</tt>,
-<tt>getFrameInfo</tt>, ... methods).  This class is designed to be subclassed by
+<tt>getFrameInfo</tt>, ... methods).  This class is designed to be specialized by
 a concrete target implementation (e.g., <tt>X86TargetMachine</tt>) which
 implements the various virtual methods.  The only required target description
 class is the <a href="#targetdata"><tt>TargetData</tt></a> class, but if the
@@ -635,7 +637,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/06/04 00:40:53 $
+  Last modified: $Date: 2004/06/05 14:39:24 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Sat Jun  5 12:48:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Jun  5 12:48:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/BasicBlock.cpp
Message-ID: <200406051744.MAA23134@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

BasicBlock.cpp updated: 1.45 -> 1.46

---
Log message:

Fix GCC warnings


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

Index: llvm/lib/VMCore/BasicBlock.cpp
diff -u llvm/lib/VMCore/BasicBlock.cpp:1.45 llvm/lib/VMCore/BasicBlock.cpp:1.46
--- llvm/lib/VMCore/BasicBlock.cpp:1.45	Fri Jun  4 19:11:27 2004
+++ llvm/lib/VMCore/BasicBlock.cpp	Sat Jun  5 12:43:52 2004
@@ -182,7 +182,7 @@
     // Okay, now we know that we need to remove predecessor #pred_idx from all
     // PHI nodes.  Iterate over each PHI node fixing them up
     PHINode *PN;
-    for (iterator II = begin(); PN = dyn_cast<PHINode>(II); ++II)
+    for (iterator II = begin(); (PN = dyn_cast<PHINode>(II)); ++II)
       PN->removeIncomingValue(Pred);
   }
 }
@@ -224,7 +224,7 @@
     BasicBlock *Successor = *I;
     PHINode *PN;
     for (BasicBlock::iterator II = Successor->begin();
-         PN = dyn_cast<PHINode>(II); ++II) {
+         (PN = dyn_cast<PHINode>(II)); ++II) {
       int IDX = PN->getBasicBlockIndex(this);
       while (IDX != -1) {
         PN->setIncomingBlock((unsigned)IDX, New);




From lattner at cs.uiuc.edu  Sat Jun  5 12:49:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Jun  5 12:49:01 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Verifier.cpp
Message-ID: <200406051744.MAA23150@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Verifier.cpp updated: 1.104 -> 1.105

---
Log message:

Fix GCC warning


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

Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.104 llvm/lib/VMCore/Verifier.cpp:1.105
--- llvm/lib/VMCore/Verifier.cpp:1.104	Fri Jun  4 19:22:04 2004
+++ llvm/lib/VMCore/Verifier.cpp	Sat Jun  5 12:44:48 2004
@@ -319,7 +319,7 @@
     std::vector<BasicBlock*> Preds(pred_begin(&BB), pred_end(&BB));
     std::sort(Preds.begin(), Preds.end());
     PHINode *PN; 
-    for (BasicBlock::iterator I = BB.begin(); PN = dyn_cast<PHINode>(I); ++I) {
+    for (BasicBlock::iterator I = BB.begin(); (PN = dyn_cast<PHINode>(I));++I) {
 
       // Ensure that PHI nodes have at least one entry!
       Assert1(PN->getNumIncomingValues() != 0,




From lattner at cs.uiuc.edu  Sat Jun  5 15:17:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Jun  5 15:17:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
Message-ID: <200406052012.PAA23604@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.2 -> 1.3

---
Log message:

Add some notes so I can throw away one of my many todo lists.


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

Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.2 llvm/lib/Analysis/IPA/Andersens.cpp:1.3
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.2	Thu May 27 15:57:01 2004
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Sat Jun  5 15:12:36 2004
@@ -41,6 +41,12 @@
 // pointers.  If we find that an internal function's address escapes outside of
 // the program, we update this assumption.
 //
+// Future Improvements:
+//   This implementation of Andersen's algorithm is extremely slow.  To make it
+//   scale reasonably well, the inclusion constraints could be sorted (easy), 
+//   offline variable substitution would be a huge win (straight-forward), and 
+//   online cycle elimination (trickier) might help as well.
+//
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "anders-aa"




From llvm at cs.uiuc.edu  Sun Jun  6 11:45:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun Jun  6 11:45:01 2004
Subject: [llvm-commits] CVS: llvm/tools/llvm-abcd/
Message-ID: <200406061640.LAA15295@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llvm-abcd:


---
Log message:

Directory /var/cvs/llvm/llvm/tools/llvm-abcd added to the repository


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