From rspencer at reidspencer.com  Mon Jun 19 00:26:36 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 01:26:36 -0400
Subject: [hlvm-commits] r300 - in docs: . status
Message-ID: <200606190526.k5J5QaEi009042@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 01:26:34 -0400 (Mon, 19 Jun 2006)
New Revision: 300
Log:
Fix title lines to not duplicate "HLVM" and convert all the titles to use the
heading elements not div with class.


Modified:
   docs/Credits.html
   docs/DevelopersGuide.html
   docs/FAQ.html
   docs/GettingStarted.html
   docs/OpenProjects.html
   docs/ReleaseNotes.html
   docs/ReleasePlans.html
   docs/index.html
   docs/status/2006-05-25.html
   docs/status/index.html

Modified: docs/Credits.html
===================================================================
--- docs/Credits.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/Credits.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Credits" -->
+<!--#set var="title" value="Credits" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>HLVM Credits</h1>
 <p>This document is a partial list of the people who have given their time, 

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/DevelopersGuide.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Developer's Guide" -->
+<!--#set var="title" value="Developer's Guide" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1 class="title">HLVM Developer's Guide</h1>
 <div class="warning">CAUTION: This document is a work in progress.</div>
@@ -27,29 +27,24 @@
 </ol>
 
 <div class="author">
-  <p>Author:<a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
+  <p>Author: <a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="intro">Introduction</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="intro">Introduction</a></h2>
 <div class="text">
   <p>This document is a manual for developers who wish to contribute to the HLVM
   project. It covers topics such as copyright assignment, license, coding style,
   the build system and project rules.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="contributions">Contributions</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="contributions">Contributions</a></h2>
 <div class="text">
 <p>Contributions to the HLVM source base are very much appreciated. If you are
 able to contribute source code, this section provides details about how your
 contributions will be handled.</p>
 </div>
 
-<!-- ======================================================================= -->
-<div class="subsection"><a name="copyright">Copyright</a></div>
+<h3><a name="copyright">Copyright</a></h3>
 <div class="text">
   <p>The founders of the HLVM project intend for a formal non-profit legal 
   entity to be incorporated that will hold the copyright of all HLVM software. 
@@ -70,8 +65,7 @@
   </ul>
 </div>
 
-<!-- ======================================================================= -->
-<div class="subsection"><a name="license">License</a></div>
+<h3><a name="license">License</a></h3>
 <div class="text">
   <p>It is the intention of the HLVM project to release the HLVM software for
   distribution under the terms of the Lesser General Public License (LGPL). This
@@ -93,8 +87,7 @@
   <p>See <a href="#LGPL">below</a> for the complete text of the LGPL license</p>
 </div>
 
-<!-- ======================================================================= -->
-<div class="subsection"><a name="patches">Patches</a></div>
+<h3><a name="patches">Patches</a></h3>
 <div class="text">
   <p>The HLVM group welcomes your patches. If you find something wrong with the
   HLVM software or you wish to make a contribution to extend HLVM, you may send
@@ -118,14 +111,12 @@
   </ul>
 </div>
 
-<!-- ======================================================================= -->
-<div class="section"><a name="build">Build System</a></div>
+<h2><a name="build">Build System</a></h2>
 <div class="text">
   <p>This section describes the HLVM build system.</p>
 </div>
 
-<!-- ======================================================================= -->
-<div class="subsection"><a name="scons">About SCONS</a></div>
+<h3><a name="scons">About SCONS</a></h3>
 <div class="text">
   <p>The HLVM project uses the <a href="http://www.scons.org/">scons</a>
   software construction tool to orchestrate its builds. This gives us superior
@@ -137,10 +128,9 @@
   section.</p>
 </div>
 
-<!-- ======================================================================= -->
-<div class="subsection"><a name="config">Configuring</a></div>
+<h3><a name="config">Configuring</a></h3>
 <div class="text">
-  <h3>Configuration On Every Build</h3>
+  <h4>Configuration On Every Build</h4>
   <p>Unlike some other build systems (e.g. autoconf/automake), the
   configuration and construction phases of building are not separated with
   scons. The configuration parameters are checked every time you build. While
@@ -149,7 +139,7 @@
   stable. If something changes in your environment, only those pieces affected
   will get re-configured. This saves a lot of time and hassle by telling you of
   any configuration errors on the very next build.</p>
-  <h3>The Options Cache</h3>
+  <h4>The Options Cache</h4>
   <p>Configuration parameters are specified on the scons command line. The
   values of these parameters are stored in the <i>options cache</i> which is
   simply a file named .options_cache in the root source directory. If the file
@@ -157,7 +147,7 @@
   runs, the values are loaded from this cache and used unless new values are
   given on the command line. In this way, you only need to specify your options
   once and then they "stick" from that point forward.</p>
-  <h3>Configuration Options</h3>
+  <h4>Configuration Options</h4>
   <p>HLVM has a variety of options to assist with configuring HLVM for your
   environment and build choices. Each option has a default that will work in
   many environments but might need adjusting for your environment. The default
@@ -276,7 +266,7 @@
     <td>/usr/local/bin/xsltproc</td>
   </tr>
   </table>
-  <h3>Configuration Prompts</h3>
+  <h4>Configuration Prompts</h4>
   <p>When you first run <tt>scons</tt> against HLVM, if you did not specify the
   <tt>confpath</tt> option or the configuration code cannot otherwise find a
   package it needs, you will be prompted to enter the applicable path names
@@ -288,18 +278,18 @@
 </div>
 
 <!-- ======================================================================= -->
-<div class="subsection"><a name="rules">Build Rules</a></div>
+<h3><a name="rules">Build Rules</a></h3>
 <div class="text">
   <p>This subsection describes the various build rules and extensions to SCons
   that HLVM uses.</p>
-  <h3>The <tt>build</tt> python module</h3>
+  <h4>The <tt>build</tt> python module</h4>
   <p>For convenience, and to unclutter the SConscript files, the top level
   <tt>build</tt> directory contains a python module that provides the build
   facilities for HLVM. This module manipulates an SCons environment to set the
   variables and define the builder rules for HLVM. The public interface to this
   library is in the <tt>hlvm.py</tt> module. No other module should be imported
   into the SConscript files.</p>
-  <h3>HLVM Builder Rules</h3>
+  <h4>HLVM Builder Rules</h4>
   <p>HLVM requires some specialized build rules beyond what SCons provides.
   While general construction of static libraries, shared libraries, and
   executables use the standard SCons builders, several more are defined in the
@@ -376,8 +366,7 @@
   </table>
 </div>
 
-<!-- ======================================================================= -->
-<div class="section"><a name="style">Coding Style</a></div>
+<h2><a name="style">Coding Style</a></h2>
 <div class="text">
   <p>Contributions to HLVM must meet the following Coding Style
   requirements:</p>
@@ -396,12 +385,10 @@
   </ul>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="appendices">Appendices</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="appendices">Appendices</a></h2>
 <div class="text">&nbsp;</div>
 <!-- ======================================================================= -->
-<div class="subsection"><a name="LGPL">Lesser General Public License</a></div>
+<h3><a name="LGPL">Lesser General Public License</a></h3>
 <pre>
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

Modified: docs/FAQ.html
===================================================================
--- docs/FAQ.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/FAQ.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM FAQ" -->
+<!--#set var="title" value="FAQ" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>HLVM Frequently Asked Questions</h1>
 <p>Here's the list of questions we get frequently. Unlike many FAQ's, this is 
@@ -8,12 +8,12 @@
 <h2>Question Index</h2>
 <table>
   <tr>
-    <td>
+    <td style="width:50%">
       <ul>
         <li><a href="#compare">How does HLVM compare to other VMs?</a></li>
       </ul>
     </td>
-    <td>
+    <td style="width:50%">
     </td>
   </tr>
 </table>

Modified: docs/GettingStarted.html
===================================================================
--- docs/GettingStarted.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/GettingStarted.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,6 +1,6 @@
-<!--#set var="title" value="Getting Started with the HLVM System" -->
+<!--#set var="title" value="Getting Started with HLVM" -->
 <!--#include virtual="/incl/header.incl" -->
-<h1>Getting Started with the HLVM System</h1>
+<h1>Getting Started with HLVM</h1>
 <ol>
   <li><a href="#quickstart">Quick Start (For The Impatient)</a>
   <li><a href="#overview">Overview</a>
@@ -41,12 +41,7 @@
   <p>Author: <a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section">
-  <a name="quickstart"><b>Quick Start (For The Impatient)</b></a>
-</div>
-<!-- *********************************************************************** -->
-
+<h2><a name="quickstart"><b>Quick Start (For The Impatient)</b></a></h2>
 <div class="text">
 <p>Here's the quick start for getting up and running quickly with HLVM. Note
 that this is for experts and the impatient only.</p>
@@ -67,9 +62,7 @@
 </ol>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="overview"><b>Overview</b></a></div>
-<!-- *********************************************************************** -->
+<h2><a name="overview"><b>Overview</b></a></h2>
 <div class="text">
 <p>Welcome to HLVM! This document shows you how to get started with the High
 Level Virtual Machine. Before you do that, lets get some questions answered up
@@ -118,12 +111,8 @@
 </ol>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="requirements"><b>Requirements</b></a></div>
-<!-- *********************************************************************** -->
-
+<h2><a name="requirements"><b>Requirements</b></a></h2>
 <div class="text">
-
   <p>Before you attempt to build HLVM, you need to understand its requirements.
   HLVM is non-trivial and depends on a number of other software packages. These
   packages will be required before you can build HLVM. Taking
@@ -133,11 +122,11 @@
   obtain and build these packages yourself if they are not already present on 
   your system. HLVM won't compile or run without them.</p>
 
-  <h2><a name="hardware">Hardware</a></h2>
+  <h3><a name="hardware">Hardware</a></h3>
   <p>HLVM supports whatever hardware LLVM supports. For details, please see
   <a href="http://llvm.org/docs/GettingStarted.html#hardware">LLVM's documentation</a></p>
 
-  <h2><a name="software">Software</a></h2>
+  <h3><a name="software">Software</a></h3>
   <p>Compiling HLVM requires that you have several software packages installed. 
   The table below lists those required packages. The Package column is the usual
   name for the software package that HLVM depends on. The Version column 
@@ -272,17 +261,17 @@
 </div>
 
 <!-- *********************************************************************** -->
-<div class="section"><a name="other_packages">Building Other Packages</a></div>
+<h2><a name="other_packages">Building Other Packages</a></h2>
 <!-- *********************************************************************** -->
 <div class="text">
-  <h2><a name="SSIA">Single Separate Install Area</a></h2>
+  <h3><a name="SSIA">Single Separate Install Area</a></h3>
   <p>It is suggested that you keep a separate installation area for building the
   things upon which HLVM depends. This is the location in your file system where
   you will install the built packages. It is the parameter to the 
   <tt>--prefix</tt> options to the configure programs of those packages. By 
   using a separate install area, you ensure that the HLVM version of required 
   packages doesn't interfere with any of your system installed packages.</p>
-  <h2><a hame="libxml2">libxml2</a></h2>
+  <h3><a hame="libxml2">libxml2</a></h3>
   <ul>
     <li>If your system doesn't already have a modern version of libxml2, you can
     generally build this quite painlessly as it doesn't depend on much
@@ -300,7 +289,7 @@
     configuration options; it has many. Not everything libxml2 provides is
     needed. We need the parser, the textwriter and the relaxng validator.</li>
   </ul>
-  <h2><a name="apr">apr</a></h2>
+  <h3><a name="apr">apr</a></h3>
   <ul>
     <li>This package builds quite easily as well and doesn't depend on 
     anything other than your operating system.</li>
@@ -314,7 +303,7 @@
     <li>Optionally use the <tt>--enable-debug</tt> configure flag for making
     debugging easier (and your HLVM programs run slower).</li>
   </ul>
-  <h2><a name="apr-util">apr-util</a></h2>
+  <h3><a name="apr-util">apr-util</a></h3>
   <ul>
     <li>This package builds quite easily and doesn't depend on much.</li>
     <li>Build with:<pre>
@@ -328,7 +317,7 @@
     might want to use the various <tt>--with-*</tt> options to tell apr-util
     where your packages are located.</li>
   </ul>
-  <h2><a name="llvm">llvm</a></h2>
+  <h3><a name="llvm">llvm</a></h3>
   <ul>
     <li>You <em>must</em> use the latest CVS version of LLVM. LLVM is HLVM's 
     sister project and the two are intricately connected. Consequently, patches
@@ -357,7 +346,7 @@
     tools being built. Use of llvm-gcc4 completely gets around this problem and
     so it is only necessary to build the LLVM tools and not the runtime library.
   </ul>
-  <h2><a name="llvm-gcc4">llvm-gcc4</a></h2>
+  <h3><a name="llvm-gcc4">llvm-gcc4</a></h3>
   <ul>
     <li>You <em>must</em> use version 4 of llvm-gcc, not version 3. Version 4 is
     much better integrated with LLVM, supports more languages, builds native
@@ -399,7 +388,7 @@
     HLVM only needs C and C++ so you can shorten the build for llvm-gcc4 a
     little by dropping <tt>,objc,obj-c++</tt> from this option.</li>
   </ul>
-  <h2><a name="gperf">gperf</a></h2>
+  <h3><a name="gperf">gperf</a></h3>
   <ul>
     <li>Pretty simple tool to build.</li>
     <li>You need version 2.7.2. HLVM hasn't been tried with any other
@@ -409,7 +398,7 @@
     make
     make install</pre></li>
   </ul>
-  <h2><a name="deja-gnu">deja-gnu/</a></h2>
+  <h3><a name="deja-gnu">deja-gnu/</a></h3>
   <ul>
     <li>Simple tool to build</li>
     <li>You need version 1.4.4 or later</li>
@@ -420,11 +409,9 @@
   </ul>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="building">Building HLVM With SCons</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="building">Building HLVM With SCons</a></h2>
 <div class="text">
-  <h2><a name="quick">Quick Start</a></h2>
+  <h3><a name="quick">Quick Start</a></h3>
   <p>If you took our advice and built all dependent packages (except llvm-gcc4)
   into a separate install area, then you can build HLVM quickly by using this
   command:<pre>
@@ -436,7 +423,7 @@
   be the <a href="#SSIA">Single Separate Install Area</a> where you installed 
   all the other packages such as llvm, apr, apr-util, etc.</p>
 
-  <h2><a name="about_scons">About SCons And HLVM</a></h2>
+  <h3><a name="about_scons">About SCons And HLVM</a></h3>
   <p>HLVM uses the SCons tool for software construction. While <tt>make</tt> 
   and the various <tt>auto*</tt> tools were originally used, the full
   programming language support of SCons (Python) was attractive because of the
@@ -469,7 +456,7 @@
     <li>Configuration options are saved in cache files so you don't have to keep
     repeating them on each invocation of <tt>scons</tt></li>
   </ul>
-  <h2><a name="scons_options">SCons Options Supported</a></h2>
+  <h3><a name="scons_options">SCons Options Supported</a></h3>
   <p>The important options that may be given on the scons command line are:</p>
   <ul>
     <li><em>-Q</em>. Normally scons is quite verbose about all the
@@ -514,7 +501,7 @@
     your system. See the <tt>scons -Q --help</tt> output for a full list of
     these options.</li>
   </ul>
-  <h2><a name="targets">Build Targets</a></h2>
+  <h3><a name="targets">Build Targets</a></h3>
   <p>The default build target will simply build all the libraries and tools. 
   There are additional pseudo-targets (<i>aliases</i> in SCons lingo) that you 
   can build:</p>
@@ -571,7 +558,7 @@
   <p>Once you've made these adjustments you can use the various targets in the
   Makefile to build HLVM. Note that these targets just convert the target into
   the appropriate invocation of the <tt>scons</tt> command.</p>
-  <h2><a name="make_targets">Targets Supported</a></h2>
+  <h3><a name="make_targets">Targets Supported</a></h3>
   <p>You can use the following targets to build HLVM in various ways:
   <dl>
     <dt>all</dt>
@@ -614,7 +601,7 @@
     in the <tt>hlvm</tt> directory and instead descends into the <tt>tools</tt>
     and builds the executable tools there.</dd>
   </dl>
-  <h2><a name="tipsntricks">Tips And Tricks</a></h2>
+  <h3><a name="tipsntricks">Tips And Tricks</a></h3>
   <ul>
     <li><em>Override MYMODE</em>. On the <tt>make</tt> command line you can
     override the value of <tt>MYMODE</tt> makefile variable. This allows you to

Modified: docs/OpenProjects.html
===================================================================
--- docs/OpenProjects.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/OpenProjects.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Developers" -->
+<!--#set var="title" value="Open Projects" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>Open HLVM Projects</h1>
 <ul>
@@ -9,10 +9,7 @@
   <li><a href="#misc">Miscellaneous Projects</a></li>
 </ul>
 
-<!-- *********************************************************************** -->
-<div class="sectiontitle"><a name="what">What is this?</a></div>
-<!-- *********************************************************************** -->
-
+<h2><a name="what">What is this?</a></h2>
 <div class="text">
 <p>This document is a "TODO" list for HLVM.  Each project in this document is 
 something that would be useful for HLVM to have, and would also be a great way 
@@ -27,9 +24,7 @@
 projects to add to this page.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="sectiontitle"><a name="code">Coding Projects</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="code">Coding Projects</a></h2>
 <div class="text">
   <p>Projects in the list below are related to working on software code</p>
   <ol>
@@ -56,9 +51,7 @@
   </ol>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="sectiontitle"><a name="doc">Documentation Projects</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="doc">Documentation Projects</a></h2>
 <div class="text">
   <p>Projects in the list below are related to working on the projects
   documentation.</p>
@@ -75,9 +68,7 @@
   </ol>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="sectiontitle"><a name="test">Testing Projects</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="test">Testing Projects</a></h2>
 <div class="text">
   <p>Projects in the list below are related to testing software.</p>
   <ol>
@@ -100,9 +91,7 @@
   </ol>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="sectiontitle"><a name="misc">Miscellaneous Projects</a></div>
-<!-- *********************************************************************** -->
+<h2><a name="misc">Miscellaneous Projects</a></h2>
 <div class="text">
   <p>Here are some other things that need to get done.</p>
   <ol>

Modified: docs/ReleaseNotes.html
===================================================================
--- docs/ReleaseNotes.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/ReleaseNotes.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Release Notes" -->
+<!--#set var="title" value="Release Notes" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>HLVM Release Notes</h1>
 <ol>
@@ -17,10 +17,7 @@
   <p>Author: <a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="introduction">Introduction</a></div>
-<!-- *********************************************************************** -->
-
+<h2><a name="introduction">Introduction</a></h2>
 <div class="text">
   <p>Welcome to the High Level Virtual Machine (HLVM). This document contains 
   the release notes for HLVM. Here we describe what's new, what changed, what
@@ -39,9 +36,7 @@
   <a href="http://hlvm.org/hlvm-dev.shtml">HLVM Developers List</a>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="new"><b>What's New</b></a></div>
-<!-- *********************************************************************** -->
+<h2><a name="new"><b>What's New</b></a></h2>
 <div class="text">
   <p>This is the second public release of the High Level Virtual Machine. This 
   is a very early pre-release, version 0.2. That is, HLVM is not complete yet 
@@ -65,16 +60,13 @@
   another platform, <i>please let us know!</i></p>
 </div>
 
-<!-- *********************************************************************** -->
-<div class="section"><a name="problems"><b>Known Problems</b></a></div>
-<!-- *********************************************************************** -->
+<h2><a name="problems"><b>Known Problems</b></a></h2>
 <div class="text">
   <p>The main known problem with this release is that there isn't enough of HLVM
   implemented to be useful in any significant way.</p>
 </div>
-<!-- *********************************************************************** -->
-<div class="section"><a name="install"><b>Installation Notes</b></a></div>
-<!-- *********************************************************************** -->
+
+<h2><a name="install"><b>Installation Notes</b></a></h2>
 <div class="text">
   <p>Please see the <a href="GettingStarted.html">Getting Started Guide</a> that
   accompanies these relese notes. </p>

Modified: docs/ReleasePlans.html
===================================================================
--- docs/ReleasePlans.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/ReleasePlans.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Release Plans" -->
+<!--#set var="title" value="Release Plans" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>HLVM Release Plans</h1>
 <div class="warning">
@@ -6,10 +6,17 @@
 </div>
 <ol>
   <li><a href="#introduction">Introduction</a>
-  <li><a href="#upcoming">Upcoming Releases</a></li>
-  <li><a href="#completed">Completed Releases</a></li>
-  <li><a href="#status">Current Status</a></li>
-  <li><a href="#released">Released Features</a>
+  <li><a href="#releases">Release Index</a>
+  <ol>
+    <li><a href="#upcoming">Upcoming Releases</a></li>
+    <li><a href="#completed">Completed Releases</a></li>
+  </ol>
+  <li><a href="#status">Release Status</a>
+  <ol>
+    <li><a href="#current">Current Release</a></li>
+    <li><a href="#previous">Previous Releases</a></li>
+    </li>
+  </ol>
   <li><a href="#features">Feature Definitions</a></li>
 </ol>
 
@@ -17,9 +24,7 @@
   <p>Author:<a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
 </div>
 
-<!-- *********************************************************************** -->
 <h2><a name="introduction">Introduction</a></h2>
-<!-- *********************************************************************** -->
 <div class="text">
   <p>This document contains the Release plans for HLVM. Each release is broken
   down into a set of high-level features that we are intending to implement in
@@ -39,10 +44,14 @@
   occur in the next few releases.</p>
 </div>
 
-<!-- *********************************************************************** -->
-<h2><a name="upcoming">Upcoming Releases</a></h2>
-<!-- *********************************************************************** -->
+<h2><a name="releases"></a>Release Index</h2>
 <div class="text">
+  <p>The table below provides an index into the information for all
+  releases.</p>
+</div>
+
+<h3><a name="upcoming">Upcoming Releases</a></h3>
+<div class="text">
   <p>The table below provides an overview of the planned upcoming releases.</p>
   <table>
     <tr>
@@ -53,7 +62,7 @@
     <tr>
       <td>0.2</td>
       <td>Turing Complete, JIT Execution</td>
-      <td><a href="#f0_2">Features</a>&nbsp;<a href="#status">Status</a></td>
+      <td><a href="#f0_2">Features</a>&nbsp;<a href="#current">Status</a></td>
     </tr>
     <tr>
       <td>0.3</td>
@@ -83,9 +92,7 @@
   </table>
 </div>
 
-<!-- *********************************************************************** -->
-<h2><a name="completed">Completed Releases</a></h2>
-<!-- *********************************************************************** -->
+<h3><a name="completed">Completed Releases</a></h3>
 <div class="text">
   <p>The table below provides a list of the releases already completed.</p>
   <table>
@@ -102,19 +109,21 @@
   </table>
 </div>
 
-<!-- *********************************************************************** -->
-<h2><a name="status">Current Status (Release 0.2)</a></h2>
-<!-- *********************************************************************** -->
-<!-- ======================================================================= -->
+<h2><a name="status">Release Status</a></h2>
 <div class="text">
+  <p>This section provides the status for the current and previous releases.</p>
+</div>
+
+<h3><a name="status">Current Status (Release 0.2)</a></h3>
+<div class="text">
   <p>The table below shows the status of the current release. Click the feature
   name to get a complete description of the feature.</p>
   <table>
     <tr><th>Feature</th><th>Feature</th><th>Feature</th></tr>
     <tr>
-      <td><a href="#arithmetic">Arithmetic Operators</a><br/>Not Started</td>
+      <td><a href="#arithmetic">Arithmetic Operators</a><br/>Implemented.</td>
       <td><a href="#controlflow">Control Flow Operators</a><br/>Not Started</td>
-      <td><a href="#booleanops">Boolean Operators</a><br/>Not Started</td>
+      <td><a href="#booleanops">Boolean Operators</a><br/>Implemented.</td>
     </tr><tr>
       <td><a href="#textops">Text Operators</a><br/>Not Started</td>
       <td><a href="#args">Program Arguments</a><br/>Not Started</td>
@@ -123,13 +132,11 @@
   </table>
 </div>
 
-<!-- *********************************************************************** -->
-<h2><a name="released">Previously Released Status</a></h2>
-<!-- *********************************************************************** -->
+<h3><a name="released">Previous Releases</a></h3>
 <div class="text">
   <p>This section lists the final status information for previous releases.</p>
 </div>
-<h3><a name="s0_1">Release 0.1 (Hello World)</a></h3>
+<h4><a name="s0_1">Release 0.1 (Hello World)</a></h4>
 <div class="text">
   <table>
     <tr><th>Feature</th><th>Feature</th><th>Feature</th></tr>
@@ -174,13 +181,11 @@
   </table>
 </div>
 
-<!-- *********************************************************************** -->
 <h2><a name="features">Feature Definitions</a></h2>
-<!-- *********************************************************************** -->
 <div class="text">
   <p>This section defines the individual features for all releases.</p>
 </div>
-<!-- ======================================================================= -->
+
 <h3><a name="f0_1">Release 0.1 Features (Hello World)</a></h3>
 <div class="text">
   <ol>
@@ -221,7 +226,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_2">Release 0.2 Features (Turing Complete)</a></h3>
 <div class="text">
   <ol>
@@ -250,7 +254,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_3">Release 0.3 Features (Front End)</a></h3>
 <div class="text">
   <ol>
@@ -263,7 +266,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_4">Release 0.4 Features (Ruby)</a></h3>
 <div class="text">
   <ol>
@@ -276,7 +278,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_5">Release 0.5 Features (Scheme)</a></h3>
 <div class="text">
   <ol>
@@ -289,7 +290,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_6">Release 0.6 Features (Python)</a></h3>
 <div class="text">
   <ol>
@@ -302,7 +302,6 @@
   </ol>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="f0_9">Release 0.9 Features (Quality)</a></h3>
 <div class="text">
   <ol>

Modified: docs/index.html
===================================================================
--- docs/index.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/index.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Documentation Index" -->
+<!--#set var="title" value="Documentation Index" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1 class="title">HLVM Documentation Index</h1>
 <p>Below is the master index for all HLVM Documentation.</p>

Modified: docs/status/2006-05-25.html
===================================================================
--- docs/status/2006-05-25.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/status/2006-05-25.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Status As Of May 25, 2006" -->
+<!--#set var="title" value="Status As Of May 25, 2006" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>Status As Of May 25, 2006</h1>
 <p>HLVM is moving along nicely. We have accomplished much in our first month:

Modified: docs/status/index.html
===================================================================
--- docs/status/index.html	2006-06-19 04:52:49 UTC (rev 299)
+++ docs/status/index.html	2006-06-19 05:26:34 UTC (rev 300)
@@ -1,4 +1,4 @@
-<!--#set var="title" value="HLVM Status Updates" -->
+<!--#set var="title" value="Status Updates" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>HLVM Status Updates</h1>
 <ul>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 00:47:07 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 01:47:07 -0400
Subject: [hlvm-commits] r301 - docs
Message-ID: <200606190547.k5J5l7HA009093@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 01:47:06 -0400 (Mon, 19 Jun 2006)
New Revision: 301
Log:
Fix XHTML conformance problems.


Modified:
   docs/ReleasePlans.html

Modified: docs/ReleasePlans.html
===================================================================
--- docs/ReleasePlans.html	2006-06-19 05:26:34 UTC (rev 300)
+++ docs/ReleasePlans.html	2006-06-19 05:47:06 UTC (rev 301)
@@ -5,23 +5,23 @@
 WARNING: This document is <em>always</em> a work in progress.
 </div>
 <ol>
-  <li><a href="#introduction">Introduction</a>
+  <li><a href="#introduction">Introduction</a></li>
   <li><a href="#releases">Release Index</a>
   <ol>
     <li><a href="#upcoming">Upcoming Releases</a></li>
     <li><a href="#completed">Completed Releases</a></li>
-  </ol>
+  </ol></li>
   <li><a href="#status">Release Status</a>
   <ol>
     <li><a href="#current">Current Release</a></li>
     <li><a href="#previous">Previous Releases</a></li>
     </li>
-  </ol>
+  </ol></li>
   <li><a href="#features">Feature Definitions</a></li>
 </ol>
 
 <div class="author">
-  <p>Author:<a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
+  <p>Author: <a href="mailto:rspencer at reidspencer.com">Reid Spencer</a>.</p>
 </div>
 
 <h2><a name="introduction">Introduction</a></h2>
@@ -114,7 +114,7 @@
   <p>This section provides the status for the current and previous releases.</p>
 </div>
 
-<h3><a name="status">Current Status (Release 0.2)</a></h3>
+<h3><a name="current">Current Status (Release 0.2)</a></h3>
 <div class="text">
   <p>The table below shows the status of the current release. Click the feature
   name to get a complete description of the feature.</p>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 00:49:25 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 01:49:25 -0400
Subject: [hlvm-commits] r302 - docs
Message-ID: <200606190549.k5J5nPD7009108@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 01:49:25 -0400 (Mon, 19 Jun 2006)
New Revision: 302
Log:
One more shot at XHTML compliance.


Modified:
   docs/ReleasePlans.html

Modified: docs/ReleasePlans.html
===================================================================
--- docs/ReleasePlans.html	2006-06-19 05:47:06 UTC (rev 301)
+++ docs/ReleasePlans.html	2006-06-19 05:49:25 UTC (rev 302)
@@ -7,16 +7,17 @@
 <ol>
   <li><a href="#introduction">Introduction</a></li>
   <li><a href="#releases">Release Index</a>
-  <ol>
-    <li><a href="#upcoming">Upcoming Releases</a></li>
-    <li><a href="#completed">Completed Releases</a></li>
-  </ol></li>
+    <ol>
+      <li><a href="#upcoming">Upcoming Releases</a></li>
+      <li><a href="#completed">Completed Releases</a></li>
+    </ol>
+  </li>
   <li><a href="#status">Release Status</a>
-  <ol>
-    <li><a href="#current">Current Release</a></li>
-    <li><a href="#previous">Previous Releases</a></li>
-    </li>
-  </ol></li>
+    <ol>
+      <li><a href="#current">Current Release</a></li>
+      <li><a href="#previous">Previous Releases</a></li>
+    </ol>
+  </li>
   <li><a href="#features">Feature Definitions</a></li>
 </ol>
 

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 01:42:09 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 02:42:09 -0400
Subject: [hlvm-commits] r303 - docs
Message-ID: <200606190642.k5J6g907012850@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 02:42:08 -0400 (Mon, 19 Jun 2006)
New Revision: 303
Log:
Fix some XHTML problems.


Modified:
   docs/GettingStarted.html

Modified: docs/GettingStarted.html
===================================================================
--- docs/GettingStarted.html	2006-06-19 05:49:25 UTC (rev 302)
+++ docs/GettingStarted.html	2006-06-19 06:42:08 UTC (rev 303)
@@ -2,8 +2,8 @@
 <!--#include virtual="/incl/header.incl" -->
 <h1>Getting Started with HLVM</h1>
 <ol>
-  <li><a href="#quickstart">Quick Start (For The Impatient)</a>
-  <li><a href="#overview">Overview</a>
+  <li><a href="#quickstart">Quick Start (For The Impatient)</a></li>
+  <li><a href="#overview">Overview</a></li>
   <li><a href="#requirements">Requirements</a>
     <ol>
       <li><a href="#hardware">Hardware</a>
@@ -117,7 +117,7 @@
   HLVM is non-trivial and depends on a number of other software packages. These
   packages will be required before you can build HLVM. Taking
   a moment to familiarize yourself with HLVM's requirements may save you some 
-  time in the long run.<p>
+  time in the long run.</p>
   <p>The table below shows the software that HLVM depends on. You <b>must</b> 
   obtain and build these packages yourself if they are not already present on 
   your system. HLVM won't compile or run without them.</p>
@@ -206,7 +206,7 @@
       <td><a href="http://savannah.gnu.org/projects/dejagnu">dejagnu</a></td>
       <td>1.4.2</td>
       <td>Test suite automation package. You only need this if you want to
-        run the automated test suite.</a></sup></td>
+        run the automated test suite.</td>
     </tr>
     <tr>
       <td><a href="http://expect.nist.gov/">expect</a></td>
@@ -240,12 +240,12 @@
   <p><b>Notes:</b></p>
   <div class="notes">
   <ol>
-    <li><a name="sf1">Certain LLVM tools are being modified to accommodate HLVM
-      as it progresses. Until this situation stabilizes you will be required
+    <li><a name="sf1"></a>Certain LLVM tools are being modified to accommodate 
+    HLVM as it progresses. Until this situation stabilizes you will be required
       to have a very fresh (recent) version of LLVM from the CVS sources.  At 
       some point in the future, an LLVM release will contain all the features 
       that HLVM needs and this notice will be removed. Until then, you should 
-      obtain and build LLVM from CVS and keep it up to date regularly.</a></li>
+      obtain and build LLVM from CVS and keep it up to date regularly.</li>
   </ol>
   </div>
   

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 01:45:31 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 02:45:31 -0400
Subject: [hlvm-commits] r304 - docs
Message-ID: <200606190645.k5J6jVv7012868@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 02:45:30 -0400 (Mon, 19 Jun 2006)
New Revision: 304
Log:
More XHTML fixes.


Modified:
   docs/GettingStarted.html

Modified: docs/GettingStarted.html
===================================================================
--- docs/GettingStarted.html	2006-06-19 06:42:08 UTC (rev 303)
+++ docs/GettingStarted.html	2006-06-19 06:45:30 UTC (rev 304)
@@ -6,8 +6,8 @@
   <li><a href="#overview">Overview</a></li>
   <li><a href="#requirements">Requirements</a>
     <ol>
-      <li><a href="#hardware">Hardware</a>
-      <li><a href="#software">Software</a>
+      <li><a href="#hardware">Hardware</a></li>
+      <li><a href="#software">Software</a></li>
     </ol>
   </li>
   <li><a href="#other_packages">Building Other Packages</a>
@@ -271,7 +271,7 @@
   <tt>--prefix</tt> options to the configure programs of those packages. By 
   using a separate install area, you ensure that the HLVM version of required 
   packages doesn't interfere with any of your system installed packages.</p>
-  <h3><a hame="libxml2">libxml2</a></h3>
+  <h3><a name="libxml2">libxml2</a></h3>
   <ul>
     <li>If your system doesn't already have a modern version of libxml2, you can
     generally build this quite painlessly as it doesn't depend on much
@@ -345,6 +345,7 @@
     runtime libraries depend on llvm-gcc3 but llvm-gcc3 depends on the LLVM
     tools being built. Use of llvm-gcc4 completely gets around this problem and
     so it is only necessary to build the LLVM tools and not the runtime library.
+    </li>
   </ul>
   <h3><a name="llvm-gcc4">llvm-gcc4</a></h3>
   <ul>
@@ -414,9 +415,8 @@
   <h3><a name="quick">Quick Start</a></h3>
   <p>If you took our advice and built all dependent packages (except llvm-gcc4)
   into a separate install area, then you can build HLVM quickly by using this
-  command:<pre>
+  command:</p><pre>
   scons -Q mode=debug confpath=/path/to/llvm-gcc4/install:/path/to/install</pre>
-  </p>
   <p>The <tt>confpath</tt> option indicates to the HLVM build system some 
   additional places to search for software. The first path should be the 
   location in which the llmv-gcc4 software was installed. The second path should
@@ -559,7 +559,7 @@
   Makefile to build HLVM. Note that these targets just convert the target into
   the appropriate invocation of the <tt>scons</tt> command.</p>
   <h3><a name="make_targets">Targets Supported</a></h3>
-  <p>You can use the following targets to build HLVM in various ways:
+  <p>You can use the following targets to build HLVM in various ways:</p>
   <dl>
     <dt>all</dt>
     <dd>Builds HLVM in the default mode, as specified by <em>MYMODE</em>.

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 02:20:09 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 03:20:09 -0400
Subject: [hlvm-commits] r305 - docs/status
Message-ID: <200606190720.k5J7K9Nt014809@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 03:20:08 -0400 (Mon, 19 Jun 2006)
New Revision: 305
Log:
XHTML compliance


Modified:
   docs/status/2006-05-25.html

Modified: docs/status/2006-05-25.html
===================================================================
--- docs/status/2006-05-25.html	2006-06-19 06:45:30 UTC (rev 304)
+++ docs/status/2006-05-25.html	2006-06-19 07:20:08 UTC (rev 305)
@@ -1,7 +1,8 @@
 <!--#set var="title" value="Status As Of May 25, 2006" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1>Status As Of May 25, 2006</h1>
-<p>HLVM is moving along nicely. We have accomplished much in our first month:
+<p>HLVM is moving along nicely. We have accomplished much in our first
+month:</p>
 <ul>
   <li>A few new people became interested in HLVM (Hi laurence and Slant).</li>
   <li>Everyone participated in making some design documentation in the wiki 

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 11:10:20 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 12:10:20 -0400
Subject: [hlvm-commits] r306 - docs hlvm/AST hlvm/Pass hlvm/Reader
Message-ID: <200606191610.k5JGAK2D005242@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 12:10:18 -0400 (Mon, 19 Jun 2006)
New Revision: 306
Log:
Implement more validation of AST and provide better AST construction asserts.


Modified:
   docs/FAQ.html
   hlvm/AST/AST.cpp
   hlvm/AST/Block.cpp
   hlvm/AST/Bundle.cpp
   hlvm/AST/ContainerType.cpp
   hlvm/AST/Operator.cpp
   hlvm/Pass/Validate.cpp
   hlvm/Reader/XMLReader.cpp

Modified: docs/FAQ.html
===================================================================
--- docs/FAQ.html	2006-06-19 07:20:08 UTC (rev 305)
+++ docs/FAQ.html	2006-06-19 16:10:18 UTC (rev 306)
@@ -40,6 +40,7 @@
     <td>TBD</td>
     <td>TBD</td>
     <td>TBD</td>
+  </tr>
   <tr><td>Optimization</td>
     <td>Offers a wide range of optimization levels from "none" to "life long".
       Most of this is provided by LLVM and works today. LLVM is "state of the

Modified: hlvm/AST/AST.cpp
===================================================================
--- hlvm/AST/AST.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/AST/AST.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -124,6 +124,10 @@
 ASTImpl::insertChild(Node* child)
 {
   hlvmAssert(llvm::isa<Bundle>(child) && "Can't insert that here");
+#ifdef HLVM_ASSERT
+  for (const_iterator I = begin(), E = end(); I != E; ++I)
+    hlvmAssert((*I) != child && "Attempt to duplicate insertion of child");
+#endif
   bundles.push_back(llvm::cast<Bundle>(child));
 }
 
@@ -131,6 +135,7 @@
 ASTImpl::removeChild(Node* child)
 {
   hlvmAssert(llvm::isa<Bundle>(child) && "Can't remove that here");
+  //FIXME: bundles.erase(llvm::cast<Bundle>(child));
 }
 
 Type*
@@ -269,6 +274,7 @@
   Bundle* result = new Bundle();
   result->setLocator(loc);
   result->setName(id);
+  result->setParent(this);
   return result;
 }
 

Modified: hlvm/AST/Block.cpp
===================================================================
--- hlvm/AST/Block.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/AST/Block.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -42,11 +42,11 @@
 Block::insertChild(Node* child)
 {
   hlvmAssert(llvm::isa<Operator>(child));
+  MultiOperator::insertChild(child);
   if (llvm::isa<AutoVarOp>(child)) {
     AutoVarOp* av = llvm::cast<AutoVarOp>(child);
     autovars[av->getName()] = av;
   }
-  MultiOperator::insertChild(child);
   type = getResultType(); // update type to match type of thing just added
 }
 

Modified: hlvm/AST/Bundle.cpp
===================================================================
--- hlvm/AST/Bundle.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/AST/Bundle.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -41,6 +41,7 @@
 void 
 Bundle::insertChild(Node* kid)
 {
+  hlvmAssert(kid && "Null child!");
   if (kid->isType())
     types.insert(cast<Type>(kid)->getName(), kid);
   else if (kid->is(VariableID))

Modified: hlvm/AST/ContainerType.cpp
===================================================================
--- hlvm/AST/ContainerType.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/AST/ContainerType.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -101,6 +101,10 @@
 DisparateContainerType::insertChild(Node* n)
 {
   hlvmAssert(isa<AliasType>(n) && "Can't insert those here");
+#ifdef HLVM_ASSERT
+  for (const_iterator I = begin(), E = end(); I != E; ++I)
+    hlvmAssert((*I) != n);
+#endif
   contents.push_back(cast<AliasType>(n));
 }
 

Modified: hlvm/AST/Operator.cpp
===================================================================
--- hlvm/AST/Operator.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/AST/Operator.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -102,6 +102,7 @@
 UnaryOperator::insertChild(Node* child)
 {
   hlvmAssert(isa<Operator>(child));
+  hlvmAssert(child != op1 && "Re-insertion of child");
   if (!op1)
     op1 = cast<Operator>(child);
   else
@@ -146,6 +147,7 @@
 BinaryOperator::insertChild(Node* child)
 {
   hlvmAssert(isa<Operator>(child));
+  hlvmAssert(child != ops[0] && child != ops[1] && "Re-insertion of child");
   if (!ops[0])
     ops[0] = cast<Operator>(child);
   else if (!ops[1])
@@ -194,6 +196,8 @@
 TernaryOperator::insertChild(Node* child)
 {
   hlvmAssert(isa<Operator>(child));
+  hlvmAssert(child != ops[0] && child != ops[1] && child != ops[2] && 
+             "Re-insertion of child");
   if (!ops[0])
     ops[0] = cast<Operator>(child);
   else if (!ops[1])
@@ -257,6 +261,10 @@
 MultiOperator::insertChild(Node* child)
 {
   hlvmAssert(isa<Operator>(child));
+#ifdef HLVM_ASSERT
+  for (const_iterator I = begin(), E = end(); I != E; ++I)
+    hlvmAssert((*I) != child && "Re-insertion of child");
+#endif
   ops.push_back(cast<Operator>(child));
 }
 

Modified: hlvm/Pass/Validate.cpp
===================================================================
--- hlvm/Pass/Validate.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/Pass/Validate.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -156,7 +156,12 @@
 bool
 ValidateImpl::checkConstant(Constant* C,NodeIDs id)
 {
-  return checkValue(C,id);
+  if (checkValue(C,id)) {
+    if (C->getName().empty())
+      error(C,"Constants must not have empty name");
+      return false;
+  }
+  return true;
 }
 
 bool
@@ -283,6 +288,12 @@
 }
 
 template<> inline void
+ValidateImpl::validate(OpaqueType* n)
+{
+  checkType(n,OpaqueTypeID);
+}
+
+template<> inline void
 ValidateImpl::validate(RangeType* n)
 {
   if (checkType(n,RangeTypeID))
@@ -313,9 +324,9 @@
 }
 
 template<> inline void
-ValidateImpl::validate(OpaqueType* n)
+ValidateImpl::validate(StringType* n)
 {
-  checkType(n,OpaqueTypeID);
+  checkType(n,StringTypeID);
 }
 
 template<> inline void
@@ -379,9 +390,55 @@
 }
 
 template<> inline void
+ValidateImpl::validate(ConstantBoolean* n)
+{
+  checkConstant(n,ConstantBooleanID);
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantInteger* n)
+{
+  checkConstant(n,ConstantIntegerID);
+  // FIXME: validate that the constant value is in the right numeric base
+  // FIXME: validate that the constant value is in range for the type
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantReal* n)
+{
+  checkConstant(n,ConstantRealID);
+  // FIXME: validate that the constant value is in range for the type
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantString* n)
+{
+  if (checkConstant(n,ConstantStringID))
+    if (std::string::npos != n->getValue().find('\0'))
+      error(n,"String constants may not contain a null byte");
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantAggregate* n)
+{
+  checkConstant(n,ConstantAggregateID);
+  // FIXME: validate fields vs. type
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantExpression* n)
+{
+  checkConstant(n,ConstantExpressionID);
+  // FIXME: validate opcodes and operands
+}
+
+template<> inline void
 ValidateImpl::validate(Variable* n)
 {
-  checkLinkageItem(n, VariableID);
+  if (checkLinkageItem(n, VariableID)) 
+    if (n->hasInitializer())
+      if (n->getType() != n->getInitializer()->getType())
+        error(n,"Variable and its initializer do not agree in type");
 }
 
 template<> inline void
@@ -537,8 +594,18 @@
     const Type* Ty2 = n->getOperand(1)->getType();
     if (!isa<PointerType>(Ty1))
       error(n,"StoreOp expects first operand to be pointer type");
-    else if (cast<PointerType>(Ty1)->getElementType() != Ty2)
+    else if (cast<PointerType>(Ty1)->getElementType() != Ty2) {
       error(n,"StoreOp operands do not agree in type");
+    } else if (const ReferenceOp* ref = 
+               dyn_cast<ReferenceOp>(n->getOperand(0))) {
+      const Value* R = ref->getReferent();
+      if (isa<Variable>(R) && cast<Variable>(R)->isConstant())
+        error(n,"Can't store to constant variable");
+      else if (isa<AutoVarOp>(R) && cast<AutoVarOp>(R)->isConstant())
+        error(n,"Can't store to constant automatic variable");
+    } else if (const IndexOp* ref = dyn_cast<IndexOp>(n)) {
+      /// FIXME: Implement this
+    }
   }
 }
 
@@ -555,6 +622,20 @@
 }
 
 template<> inline void
+ValidateImpl::validate(ReferenceOp* op)
+{
+  checkOperator(op,ReferenceOpID,0,true);
+  /// FIXME: check referent out
+}
+
+template<> inline void
+ValidateImpl::validate(ConstantReferenceOp* op)
+{
+  checkOperator(op,ConstantReferenceOpID,0,true);
+  /// FIXME: check referent out
+}
+
+template<> inline void
 ValidateImpl::validate(NegateOp* n)
 {
   if (checkOperator(n,NegateOpID,1)) {
@@ -836,123 +917,177 @@
 template<> inline void
 ValidateImpl::validate(IsPInfOp* n)
 {
-  if (checkOperator(n,IsPInfOpID,1))
-    ;
+  if (checkOperator(n,IsPInfOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"IsPInfoOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(IsNInfOp* n)
 {
-  if (checkOperator(n,IsNInfOpID,1))
-    ;
+  if (checkOperator(n,IsNInfOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"IsPInfoOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(IsNanOp* n)
 {
-  if (checkOperator(n,IsNanOpID,1))
-    ;
+  if (checkOperator(n,IsNanOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"IsNanOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(TruncOp* n)
 {
-  if (checkOperator(n,TruncOpID,1))
-    ;
+  if (checkOperator(n,TruncOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"TruncOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(RoundOp* n)
 {
-  if (checkOperator(n,RoundOpID,1))
-    ;
+  if (checkOperator(n,RoundOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"RoundOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(FloorOp* n)
 {
-  if (checkOperator(n,FloorOpID,1))
-    ;
+  if (checkOperator(n,FloorOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"FloorOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(CeilingOp* n)
 {
-  if (checkOperator(n,CeilingOpID,1))
-    ;
+  if (checkOperator(n,CeilingOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"CeilingOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(LogEOp* n)
 {
-  if (checkOperator(n,LogEOpID,1))
-    ;
+  if (checkOperator(n,LogEOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"LogEOpID requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(Log2Op* n)
 {
-  if (checkOperator(n,Log2OpID,1))
-    ;
+  if (checkOperator(n,Log2OpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"Log2OpID requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(Log10Op* n)
 {
-  if (checkOperator(n,Log10OpID,1))
-    ;
+  if (checkOperator(n,Log10OpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"Log10OpID requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(SquareRootOp* n)
 {
-  if (checkOperator(n,SquareRootOpID,1))
-    ;
+  if (checkOperator(n,SquareRootOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"SquareRootOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(CubeRootOp* n)
 {
-  if (checkOperator(n,CubeRootOpID,1))
-    ;
+  if (checkOperator(n,CubeRootOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"CubeRootOpID requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(FactorialOp* n)
 {
-  if (checkOperator(n,FactorialOpID,1))
-    ;
+  if (checkOperator(n,FactorialOpID,1)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    if (!Ty1->isRealType())
+      error(n,"FactorialOp requires real number operand");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(PowerOp* n)
 {
-  if (checkOperator(n,PowerOpID,2))
-    ;
+  if (checkOperator(n,PowerOpID,2)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    const Type* Ty2 = n->getOperand(1)->getType();
+    if (!Ty1->isRealType() || !Ty2->isRealType())
+      error(n,"LogEOpID requires two real number operands");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(RootOp* n)
 {
-  if (checkOperator(n,RootOpID,2))
-    ;
+  if (checkOperator(n,RootOpID,2)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    const Type* Ty2 = n->getOperand(1)->getType();
+    if (!Ty1->isRealType() || !Ty2->isRealType())
+      error(n,"RootOp requires two real number operands");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(GCDOp* n)
 {
-  if (checkOperator(n,GCDOpID,2))
-    ;
+  if (checkOperator(n,GCDOpID,2)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    const Type* Ty2 = n->getOperand(1)->getType();
+    if (!Ty1->isRealType() || !Ty2->isRealType())
+      error(n,"GCDOp requires two real number operands");
+  }
 }
 
 template<> inline void
 ValidateImpl::validate(LCMOp* n)
 {
-  if (checkOperator(n,LCMOpID,2))
-    ;
+  if (checkOperator(n,LCMOpID,2)) {
+    const Type* Ty1 = n->getOperand(0)->getType();
+    const Type* Ty2 = n->getOperand(1)->getType();
+    if (!Ty1->isRealType() || !Ty2->isRealType())
+      error(n,"LCMOp requires two real number operands");
+  }
 }
 
-
 template<> inline void
 ValidateImpl::validate(OpenOp* n)
 {
@@ -1007,43 +1142,15 @@
 }
 
 template<> inline void
-ValidateImpl::validate(ConstantBoolean* n)
-{
-}
-
-template<> inline void
-ValidateImpl::validate(ConstantInteger* n)
-{
-}
-
-template<> inline void
-ValidateImpl::validate(ConstantReal* n)
-{
-}
-
-template<> inline void
-ValidateImpl::validate(ConstantString* n)
-{
-}
-
-template<> inline void
-ValidateImpl::validate(ConstantAggregate* n)
-{
-}
-
-template<> inline void
-ValidateImpl::validate(ConstantExpression* n)
-{
-}
-
-template<> inline void
 ValidateImpl::validate(Bundle* n)
 {
+  // FIXME: checkNode(n);
 }
 
 template<> inline void
 ValidateImpl::validate(Import* n)
 {
+  // FIXME: checkNode(n);
 }
 
 void
@@ -1103,8 +1210,8 @@
     case AllocateOpID:           validate(cast<AllocateOp>(n)); break;
     case DeallocateOpID:         validate(cast<DeallocateOp>(n)); break;
     case ReallocateOpID:         /*validate(cast<ReallocateOp>(n));*/ break;
-    case ReferenceOpID:          /*validate(cast<ReferenceOp>(n));*/ break;
-    case ConstantReferenceOpID:  /*validate(cast<ConstantReferenceOp>(n));*/ 
+    case ReferenceOpID:          validate(cast<ReferenceOp>(n)); break;
+    case ConstantReferenceOpID:  validate(cast<ConstantReferenceOp>(n)); 
                                                                      break;
     case AutoVarOpID:            validate(cast<AutoVarOp>(n)); break;
     case NegateOpID:             validate(cast<NegateOp>(n)); break;
@@ -1156,9 +1263,9 @@
     case ReadOpID:               validate(cast<ReadOp>(n)); break;
     case WriteOpID:              validate(cast<WriteOp>(n)); break;
     case PositionOpID:           /*validate(cast<PositionOp>(n));*/ break;
-    case PInfOpID:               /*validate(cast<PInfOp>(n));*/ break;
-    case NInfOpID:               /*validate(cast<NInfoOp>(n));*/ break;
-    case NaNOpID:                /*validate(cast<NaNOp>(n));*/ break;
+    case PInfOpID:               /*validate(cast<PInfOp>(n)); */ break;
+    case NInfOpID:               /*validate(cast<NInfoOp>(n)); */ break;
+    case NaNOpID:                /*validate(cast<NaNOp>(n)); */ break;
     case ConstantBooleanID:      validate(cast<ConstantBoolean>(n)); break;
     case ConstantIntegerID:      validate(cast<ConstantInteger>(n)); break;
     case ConstantRealID:         validate(cast<ConstantReal>(n)); break;

Modified: hlvm/Reader/XMLReader.cpp
===================================================================
--- hlvm/Reader/XMLReader.cpp	2006-06-19 07:20:08 UTC (rev 305)
+++ hlvm/Reader/XMLReader.cpp	2006-06-19 16:10:18 UTC (rev 306)
@@ -1110,7 +1110,6 @@
   cur = cur->children;
   if (skipBlanks(cur)) {
     Bundle* b = parse<Bundle>(cur);
-    ast->addBundle(b);
   }
 }
 

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 21:14:23 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Mon, 19 Jun 2006 22:14:23 -0400
Subject: [hlvm-commits] r307 - in test: . error lib
Message-ID: <200606200214.k5K2ENFK018587@sneezy.swagora.com>

Author: reid
Date: 2006-06-19 22:14:22 -0400 (Mon, 19 Jun 2006)
New Revision: 307
Log:
Implement error tests where an error result is expected. Initial tests in this
class consist of numeric literal constant validity and range checks.


Added:
   test/error/
   test/error/badbin.hlx
   test/error/baddec.hlx
   test/error/badhex.hlx
   test/error/badoct.hlx
   test/error/dg.exp
   test/error/range16.hlx
   test/error/range32.hlx
   test/error/range64.hlx
   test/error/range8.hlx
   test/lib/error.exp
Modified:
   test/SConscript

Modified: test/SConscript
===================================================================
--- test/SConscript	2006-06-19 16:10:18 UTC (rev 306)
+++ test/SConscript	2006-06-20 02:14:22 UTC (rev 307)
@@ -24,4 +24,4 @@
 Import('env')
 if 'check' in COMMAND_LINE_TARGETS:
   from build import check
-  check.Check(env,['xml2xml','return0'])
+  check.Check(env,['xml2xml','error','return0'])

Added: test/error/badbin.hlx
===================================================================
--- test/error/badbin.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/badbin.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/badbin.hlx">
+  <bundle id="badbin">
+    <constant id="0000" type="s8"><bin>12345</bin></constant>
+  </bundle>
+</hlvm>

Added: test/error/baddec.hlx
===================================================================
--- test/error/baddec.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/baddec.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/baddec.hlx">
+  <bundle id="baddec">
+    <constant id="0000" type="s8"><dec>1234abc</dec></constant>
+  </bundle>
+</hlvm>

Added: test/error/badhex.hlx
===================================================================
--- test/error/badhex.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/badhex.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/badhex.hlx">
+  <bundle id="badhex">
+    <constant id="0000" type="s8"><hex>$!%^@$</hex></constant>
+  </bundle>
+</hlvm>

Added: test/error/badoct.hlx
===================================================================
--- test/error/badoct.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/badoct.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/badoct.hlx">
+  <bundle id="badoct">
+    <constant id="0000" type="s8"><oct>29</oct></constant>
+  </bundle>
+</hlvm>

Added: test/error/dg.exp
===================================================================
--- test/error/dg.exp	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/dg.exp	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,3 @@
+load_lib error.exp
+
+hlvm-error-tests hlvm-xml2xml "*.hlx"

Added: test/error/range16.hlx
===================================================================
--- test/error/range16.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/range16.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/range16.hlx">
+  <bundle id="range16">
+    <constant id="0001" type="s16"><dec>32768</dec></constant>
+    <constant id="0002" type="s16"><dec>-32769</dec></constant>
+    <constant id="0003" type="u16"><dec>65536</dec></constant>
+    <constant id="0004" type="u16"><dec>-1</dec></constant>
+  </bundle>
+</hlvm>

Added: test/error/range32.hlx
===================================================================
--- test/error/range32.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/range32.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/range32.hlx">
+  <bundle id="range32">
+    <constant id="0001" type="s32"><dec>2147483648</dec></constant>
+    <constant id="0002" type="s32"><dec>-2147483649</dec></constant>
+    <constant id="0003" type="u32"><dec>4294967296</dec></constant>
+    <constant id="0004" type="u32"><dec>-1</dec></constant>
+  </bundle>
+</hlvm>

Added: test/error/range64.hlx
===================================================================
--- test/error/range64.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/range64.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/range64.hlx">
+  <bundle id="range64">
+    <constant id="0001" type="s8"><dec>9223372036854775808</dec></constant>
+    <constant id="0002" type="s8"><dec>-9223372036854775809</dec></constant>
+    <constant id="0003" type="u8"><hex>ffffffffffffffff</hex></constant>
+    <constant id="0004" type="u8"><dec>-1</dec></constant>
+  </bundle>
+</hlvm>

Added: test/error/range8.hlx
===================================================================
--- test/error/range8.hlx	2006-06-19 16:10:18 UTC (rev 306)
+++ test/error/range8.hlx	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/range8.hlx">
+  <bundle id="range8">
+    <constant id="0001" type="s8"><dec>128</dec></constant>
+    <constant id="0002" type="s8"><dec>-129</dec></constant>
+    <constant id="0003" type="u8"><dec>256</dec></constant>
+    <constant id="0004" type="u8"><dec>-1</dec></constant>
+  </bundle>
+</hlvm>

Added: test/lib/error.exp
===================================================================
--- test/lib/error.exp	2006-06-19 16:10:18 UTC (rev 306)
+++ test/lib/error.exp	2006-06-20 02:14:22 UTC (rev 307)
@@ -0,0 +1,55 @@
+#===-test/lib/error.exp - Script for error check tests ---------------------===#
+#
+#                      High Level Virtual Machine (HLVM)
+# 
+#  Copyright (C) 2006 Reid Spencer. All Rights Reserved.
+# 
+#  This software is free software; you can redistribute it and/or modify it 
+#  under the terms of the GNU Lesser General Public License as published by 
+#  the Free Software Foundation; either version 2.1 of the License, or (at 
+#  your option) any later version.
+# 
+#  This software is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for 
+#  more details.
+# 
+#  You should have received a copy of the GNU Lesser General Public License 
+#  along with this library in the file named LICENSE.txt; if not, write to the 
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+#  MA 02110-1301 USA
+# 
+#===------------------------------------------------------------------------===#
+proc hlvm-error-tests { prog pat } {
+  global srcdir subdir objdir tmpdir objrootdir
+  set outdir [file join $objdir $subdir]
+  set tool [file join $objrootdir tools $prog $prog ]
+  set source [file join $srcdir $subdir ]
+  set files [lsort [
+    glob -nocomplain -tails -types {f r} -directory $source $pat]]
+  set dirs [lsort [
+    glob -nocomplain -tails -types {d r} -directory $source *]]
+
+  if { [file isdirectory $outdir] } {
+    cd $outdir
+  } else {
+    if { [file exists $outdir] } {
+      fail "identity: $outdir exists and is not a directory. Remove it"
+      exit(2)
+    } else {
+      file mkdir $outdir
+    }
+  }
+  
+  foreach test $files {
+    set output [file join $outdir ${test}.out]
+    set testsrc [file join $source $test]
+    set execout ""
+    set retval [ catch { exec -keepnewline $tool $testsrc -o $output } msg ]
+    if { $retval != 0 } {
+      pass "$test"
+    } else {
+      fail "$test: $tool return $retval\n$msg"
+    }
+  }
+}

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Mon Jun 19 23:43:13 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 00:43:13 -0400
Subject: [hlvm-commits] r308 - hlvm/AST hlvm/Pass test/error
Message-ID: <200606200443.k5K4hDa7021198@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 00:43:12 -0400 (Tue, 20 Jun 2006)
New Revision: 308
Log:
Get integer literal constant validation working correctly.


Added:
   test/error/range_real.hlx
Modified:
   hlvm/AST/AST.cpp
   hlvm/Pass/Validate.cpp

Modified: hlvm/AST/AST.cpp
===================================================================
--- hlvm/AST/AST.cpp	2006-06-20 02:14:22 UTC (rev 307)
+++ hlvm/AST/AST.cpp	2006-06-20 04:43:12 UTC (rev 308)
@@ -528,6 +528,7 @@
   ConstantInteger* result = new ConstantInteger(base);
   result->setLocator(loc);
   result->setValue(v);
+  result->setBase(base);
   result->setType(Ty);
   return result;
 }

Modified: hlvm/Pass/Validate.cpp
===================================================================
--- hlvm/Pass/Validate.cpp	2006-06-20 02:14:22 UTC (rev 307)
+++ hlvm/Pass/Validate.cpp	2006-06-20 04:43:12 UTC (rev 308)
@@ -40,6 +40,8 @@
 #include <hlvm/AST/LinkageItems.h>
 #include <hlvm/AST/Constants.h>
 #include <llvm/Support/Casting.h>
+#include <llvm/Support/MathExtras.h>
+#include <llvm/ADT/StringExtras.h>
 #include <iostream>
 
 using namespace hlvm;
@@ -53,8 +55,8 @@
     ValidateImpl() : Pass(0,Pass::PostOrderTraversal), ast(0) {}
     virtual void handleInitialize(AST* tree) { ast = tree; }
     virtual void handle(Node* b,Pass::TraversalKinds k);
-    inline void error(Node*n, const char* msg);
-    inline void warning(Node*n, const char* msg);
+    inline void error(Node*n, const std::string& msg);
+    inline void warning(Node*n, const std::string& msg);
     inline bool checkNode(Node*);
     inline bool checkType(Type*,NodeIDs id);
     inline bool checkValue(Value*,NodeIDs id);
@@ -71,7 +73,7 @@
 };
 
 void 
-ValidateImpl::warning(Node* n, const char* msg)
+ValidateImpl::warning(Node* n, const std::string& msg)
 {
   if (n) {
     const Locator* loc = n->getLocator();
@@ -86,7 +88,7 @@
 }
 
 void 
-ValidateImpl::error(Node* n, const char* msg)
+ValidateImpl::error(Node* n, const std::string& msg)
 {
   if (n) {
     const Locator* loc = n->getLocator();
@@ -105,16 +107,15 @@
 bool
 ValidateImpl::checkNode(Node* n)
 {
-  bool result = true;
   if (n->getParent() == 0) {
     error(n,"Node has no parent");
-    result = false;
+    return false;
   }
   if (n->getID() < FirstNodeID || n->getID() > LastNodeID) {
     error(n,"Node ID out of range");
-    result = false;
+    return false;
   }
-  return result;;
+  return true;
 }
 
 bool
@@ -157,9 +158,10 @@
 ValidateImpl::checkConstant(Constant* C,NodeIDs id)
 {
   if (checkValue(C,id)) {
-    if (C->getName().empty())
+    if (C->getName().empty()) {
       error(C,"Constants must not have empty name");
       return false;
+    }
   }
   return true;
 }
@@ -396,18 +398,44 @@
 }
 
 template<> inline void
-ValidateImpl::validate(ConstantInteger* n)
+ValidateImpl::validate(ConstantInteger* CI)
 {
-  checkConstant(n,ConstantIntegerID);
-  // FIXME: validate that the constant value is in the right numeric base
-  // FIXME: validate that the constant value is in range for the type
+  if (checkConstant(CI,ConstantIntegerID)) {
+    const IntegerType* Ty = cast<IntegerType>(CI->getType());
+    // Check that it can be converted to binary
+    const char* startp = CI->getValue().c_str();
+    char* endp = 0;
+    int64_t val = strtoll(startp,&endp,CI->getBase());
+    if (!endp || startp == endp || *endp != '\0')
+      error(CI,"Invalid integer constant. Conversion failed.");
+    else if (val < 0 && !Ty->isSigned()) {
+      error(CI,"Invalid integer constant. " 
+               "Signed value not accepted by unsigned type");
+    } else {
+      // It converted to binary okay, check that it is in range
+      uint64_t uval = (val < 0) ? -val : val;
+      unsigned leading_zeros = llvm::CountLeadingZeros_64(uval);
+      unsigned bits_required = (sizeof(uint64_t)*8 - leading_zeros) + 
+                               unsigned(Ty->isSigned());
+      unsigned bits_allowed  = Ty->getBits();
+      if (bits_required > bits_allowed)
+        error(CI, "Invalid integer constant. Value requires " + 
+              utostr(bits_required) + " bits, but type only holds " +
+              utostr(bits_allowed) + " bits.");
+    }
+  }
 }
 
 template<> inline void
-ValidateImpl::validate(ConstantReal* n)
+ValidateImpl::validate(ConstantReal* CR)
 {
-  checkConstant(n,ConstantRealID);
-  // FIXME: validate that the constant value is in range for the type
+  if (checkConstant(CR,ConstantRealID)) {
+    const char* startp = CR->getValue().c_str();
+    char* endp = 0;
+    double val = strtod(startp,&endp);
+    if (!endp || startp == endp || *endp != '\0')
+      error(CR,"Invalid real constant. Conversion failed.");
+  }
 }
 
 template<> inline void

Added: test/error/range_real.hlx
===================================================================
--- test/error/range_real.hlx	2006-06-20 02:14:22 UTC (rev 307)
+++ test/error/range_real.hlx	2006-06-20 04:43:12 UTC (rev 308)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/error/range_real32.hlx">
+  <bundle id="range_real32">
+    <constant id="0001" type="f32"><flt>1.0E+39</flt></constant>
+    <constant id="0002" type="f32"><flt>1.0E-39</flt></constant>
+    <constant id="0003" type="f32"><flt>-1.0E+39</flt></constant>
+    <constant id="0004" type="f64"><dbl>1.0E+309</dbl></constant>
+    <constant id="0005" type="f64"><dbl>1.0E-309</dbl></constant>
+    <constant id="0006" type="f64"><dbl>-1.0E+309</dbl></constant>
+  </bundle>
+</hlvm>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 00:26:39 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 01:26:39 -0400
Subject: [hlvm-commits] r309 - docs
Message-ID: <200606200526.k5K5QdRb023580@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 01:26:38 -0400 (Tue, 20 Jun 2006)
New Revision: 309
Log:
Add some instructions for getting a sane build environment.


Modified:
   docs/DevelopersGuide.html

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-20 04:43:12 UTC (rev 308)
+++ docs/DevelopersGuide.html	2006-06-20 05:26:38 UTC (rev 309)
@@ -16,6 +16,7 @@
       <li><a href="#scons">About SCONS</a></li>
       <li><a href="#config">Configuring</a></li>
       <li><a href="#rules">Build Rules</a></li>
+      <li><a href="#sanity">Sane Build Environment</a></li>
     </ol>
   </li>
   <li><a href="#style">Coding Style</a></li>
@@ -277,7 +278,6 @@
   </p>
 </div>
 
-<!-- ======================================================================= -->
 <h3><a name="rules">Build Rules</a></h3>
 <div class="text">
   <p>This subsection describes the various build rules and extensions to SCons
@@ -366,6 +366,145 @@
   </table>
 </div>
 
+<h3><a name="sanity">A Sane Build Environment</a></h3>
+<div class="text">
+  <p>Building HLVM is no small feat. It depends on a lot of software that is
+  quite version dependent. To bring a little sanity to the process, here is a
+  step-by-step procedure we know to work.</p>
+  <h4>Build Separation</h4>
+  <p>In building HLVM, you'll be installing compilers and library that may
+  already exist on your system. You don't want to overwrite your system versions
+  of these things or it will wreak havoc on your system. So, we suggest that you
+  start with a fresh directory. In the discussion that follows, we'll call it
+  <tt>/proj</tt> (that's what Reid uses).  But, it could be anything you want, 
+  as long as its new.  <tt>~/hlvm</tt> would work just as well.  Choosing the
+  disk location for this should not be taken lightly. You will need upwards of
+  40GB of storage to build all this software.</p>
+  <p>Once you've found a suitable location for HLVM, create the following
+  directory structure:</p><pre>
+  cd /proj
+  mkdir gcc llvm llvm-gcc4 libxml2 apr apru hlvm gperf scons install
+  </pre>
+  <p>In the following sections you will build each of these packages and install
+  them into <tt>/proj/install</tt> which will keep it separate from anything
+  else in your system.</p>
+  <h4>Build GCC 3.4.6</h4>
+  <p>First, start with obtaining GCC 3.4.6. This will be the compiler that you
+  use for all the remaining compilations. Use the following commands to obtain,
+  build and install GCC 3.4.6:</p><pre>
+  cd /proj/gcc
+  mkdir build
+  svn svn://gcc.gnu.org/svn/gcc/tags/gcc_3_4_6_release src
+  cd ../build
+  ../src/configure  --prefix=/proj/install
+  make 
+  make install
+  </pre>
+  <h4>Set Environment</h4>
+  <p>Now that you have gcc installed in a separate location, you will need to
+  change your environment to ensure that that version of gcc is the one used in
+  subsequent builds. Details vary from platform to platform, but on Linux, the
+  following should work:</p><pre>
+  export PATH=/proj/install/bin:$PATH
+  export LD_LIBRARY_PATH=/proj/install/lib:$LD_LIBRARY_PATH
+  </pre>
+  <p>The essential point is to change your environment so that programs and
+  libraries installed into /proj/install will be found first. You should do this
+  in any shell environment in which you'll be building HLVM related software.
+  </p>
+  <h4>Build gperf</h4>
+  <p>This package is used for generating perfect hash functions. It is used by
+  HLVM for fast recognition of XML element and attribute names. Its easy and
+  fast to build:</p><pre>
+  cd /proj/gperf
+  wget http://mirrors.kernel.org/gnu/gperf/gperf-2.7.2.tar.gz
+  tar zxf gperf-2.7.2.tar.gz
+  mkdir build
+  cd build
+  ../gperf-2.7.2/configure --prefix=/proj/install
+  make
+  make install
+  </pre>
+  <h4>Build libxml2</h4>
+  <p>This package provides all XML services for HLVM. It is part of GNome and
+  many other packages and quite stable. It should build quickly and easily for
+  you. Use these commands:</p><pre>
+  cd /proj/libxml2
+  wget ftp://xmlsoft.org/libxml2/libxml2-2.6.24.tar.gz
+  tar zxf libxml2-2.6.24.tar.gz
+  mkdir build
+  cd build
+  ../libxml2-2.6.24/configure --prefix=/proj/install
+  make
+  make install
+  </pre>
+  <h4>Build apr</h4>
+  <pre>
+  cd /proj/apr
+  wget http://mirror.olnevhost.net/pub/apache/apr/apr-1.2.7.tar.gz
+  tar zxf apr-1.2.7.tar.gz
+  mkdir build
+  cd apr-1.2.7
+  ./buildconf
+  cd ../build
+  ../apr-1.2.7/configure --prefix=/proj/install --enable-debug \
+    --enable-threads --enable-other-child
+  make
+  make install
+  </pre>
+  <h4>Build apr-util</h4>
+  <pre>
+  cd /proj/apru
+  wget http://mirror.olnevhost.net/pub/apache/apr/apr-util-1.2.7.tar.gz
+  tar zxf apr-1.2.7.tar.gz
+  mkdir build
+  cd apr-util-1.2.7
+  ./buildconf
+  cd ../build
+  ../apr-util-1.2.7/configure --prefix=/proj/install --enable-debug \
+    --enable-threads --enable-other-child
+  make
+  make install
+  </pre>
+  <h4>Build LLVM</h4>
+  <pre>
+  cd /proj/llvm
+  cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
+  &lt;return&gt;
+  cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co llvm
+  mkdir build
+  cd build
+  ../llvm/configure --prefix=/proj/install
+  make tools-only
+  make install
+  make ENABLE_OPTIMIZED=1 OPTIMIZE_OPTION=-O2 tools-only
+  </pre>
+  <h4>Build llvm-gcc4</h4>
+  <pre>
+  cd /proj/llvm-gcc4
+  svn co svn://anonsvn.opensource.apple.com/svn/llvm cfe
+  mkdir build install
+  cd build
+  ../cfe/configure --prefix=/proj/llvm-gcc4/cfe/install \
+    --enable-llvm=/proj/llvm/build --enable-languages=c,c++
+  make
+  make install
+  </pre>
+  <h4>Build HLVM</h4>
+  <p>Note in the following that if you've actually used <tt>/proj</tt> as your
+  build area then you don't need to provide any arguments to <tt>make</tt> as
+  these paths are the default. Also note that the arguments are only needed the
+  first time you build HLVM. Subsequently, these options will be remembered. See
+  the description of SCons above.</p>
+  <pre>
+  cd /proj/hlvm
+  svn co svn://hlvm.org/hlvm hlvm
+  cd hlvm
+  make MYMODE=Debug MYPATH=/proj/llvm/cfe/install:/proj/install \
+    MYPREFIX=/proj/install/bin
+  </pre>
+</div>
+
 <h2><a name="style">Coding Style</a></h2>
 <div class="text">
   <p>Contributions to HLVM must meet the following Coding Style
@@ -382,12 +521,13 @@
     build related.</li>
     <li>Files must not exceed 80 columns in width</li>
     <li>Indentation is 2 spaces (no tabs).</li>
+    <li>Doxygen documentation must be provided in header files.</li>
   </ul>
 </div>
 
 <h2><a name="appendices">Appendices</a></h2>
 <div class="text">&nbsp;</div>
-<!-- ======================================================================= -->
+
 <h3><a name="LGPL">Lesser General Public License</a></h3>
 <pre>
 		  GNU LESSER GENERAL PUBLIC LICENSE

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 00:38:09 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 01:38:09 -0400
Subject: [hlvm-commits] r310 - docs
Message-ID: <200606200538.k5K5c9sg023605@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 01:38:08 -0400 (Tue, 20 Jun 2006)
New Revision: 310
Log:
XHTML corrections and some additonal verbage.


Modified:
   docs/DevelopersGuide.html

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-20 05:26:38 UTC (rev 309)
+++ docs/DevelopersGuide.html	2006-06-20 05:38:08 UTC (rev 310)
@@ -3,7 +3,7 @@
 <h1 class="title">HLVM Developer's Guide</h1>
 <div class="warning">CAUTION: This document is a work in progress.</div>
 <ol>
-  <li><a href="#intro">Introduction</a>
+  <li><a href="#intro">Introduction</a></li>
   <li><a href="#contributions">Contributions</a>
     <ol>
       <li><a href="#copyright">Copyright</a></li>
@@ -11,7 +11,7 @@
       <li><a href="#patches">Patches</a></li>
     </ol>
   </li>
-  <li><a href="#build">Build System</a></li>
+  <li><a href="#build">Build System</a>
     <ol>
       <li><a href="#scons">About SCONS</a></li>
       <li><a href="#config">Configuring</a></li>
@@ -77,7 +77,6 @@
     from being incorporated into commercial and proprietary products. The
     founders wish to encourage HLVM's use both in open source and proprietary
     projects.</li>
-    <li>
     <li>The LGPL protects the contributors by ensuring that distributions of
     HLVM retain copyright and the LGPL license for any modifications to
     HLVM.</li>
@@ -383,8 +382,7 @@
   <p>Once you've found a suitable location for HLVM, create the following
   directory structure:</p><pre>
   cd /proj
-  mkdir gcc llvm llvm-gcc4 libxml2 apr apru hlvm gperf scons install
-  </pre>
+  mkdir gcc llvm llvm-gcc4 libxml2 apr apru hlvm gperf scons install</pre>
   <p>In the following sections you will build each of these packages and install
   them into <tt>/proj/install</tt> which will keep it separate from anything
   else in your system.</p>
@@ -398,16 +396,14 @@
   cd ../build
   ../src/configure  --prefix=/proj/install
   make 
-  make install
-  </pre>
+  make install</pre>
   <h4>Set Environment</h4>
   <p>Now that you have gcc installed in a separate location, you will need to
   change your environment to ensure that that version of gcc is the one used in
   subsequent builds. Details vary from platform to platform, but on Linux, the
   following should work:</p><pre>
   export PATH=/proj/install/bin:$PATH
-  export LD_LIBRARY_PATH=/proj/install/lib:$LD_LIBRARY_PATH
-  </pre>
+  export LD_LIBRARY_PATH=/proj/install/lib:$LD_LIBRARY_PATH</pre>
   <p>The essential point is to change your environment so that programs and
   libraries installed into /proj/install will be found first. You should do this
   in any shell environment in which you'll be building HLVM related software.
@@ -423,8 +419,7 @@
   cd build
   ../gperf-2.7.2/configure --prefix=/proj/install
   make
-  make install
-  </pre>
+  make install</pre>
   <h4>Build libxml2</h4>
   <p>This package provides all XML services for HLVM. It is part of GNome and
   many other packages and quite stable. It should build quickly and easily for
@@ -436,9 +431,12 @@
   cd build
   ../libxml2-2.6.24/configure --prefix=/proj/install
   make
-  make install
-  </pre>
+  make install</pre>
   <h4>Build apr</h4>
+  <p>The Apache Portable Runtime is a portability layer used within the Apache
+  HTTP Server. Although it is still undergoing active development, stable
+  releases are available. HLVM uses APR for portability in the runtime. Build 
+  APR with the following commands:</p>
   <pre>
   cd /proj/apr
   wget http://mirror.olnevhost.net/pub/apache/apr/apr-1.2.7.tar.gz
@@ -450,9 +448,10 @@
   ../apr-1.2.7/configure --prefix=/proj/install --enable-debug \
     --enable-threads --enable-other-child
   make
-  make install
-  </pre>
+  make install</pre>
   <h4>Build apr-util</h4>
+  <p>The apr-util package is some additional utilities that go with APR. Build 
+  apr-util with the following commands:</p>
   <pre>
   cd /proj/apru
   wget http://mirror.olnevhost.net/pub/apache/apr/apr-util-1.2.7.tar.gz
@@ -464,9 +463,15 @@
   ../apr-util-1.2.7/configure --prefix=/proj/install --enable-debug \
     --enable-threads --enable-other-child
   make
-  make install
-  </pre>
+  make install</pre>
   <h4>Build LLVM</h4>
+  <p>For now, you must build LLVM from the CVS repository. Although LLVM is
+  actively being developed, it is generally stable and this is safe. If you get
+  tempted to use a release tarball, it will fail. HLVM depends on post-1.7
+  features of LLVM. When you build LLVM, use the "tools-only" target. This will
+  avoid building the "runtime" portion of LLVM which was necessary for an older
+  version of llvm-gcc (v3). Since we'll be using llvm-gcc4, this is unnecessary
+  and will eliminate some chicken-and-egg type problems.</p>
   <pre>
   cd /proj/llvm
   cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
@@ -477,9 +482,12 @@
   ../llvm/configure --prefix=/proj/install
   make tools-only
   make install
-  make ENABLE_OPTIMIZED=1 OPTIMIZE_OPTION=-O2 tools-only
-  </pre>
+  make ENABLE_OPTIMIZED=1 OPTIMIZE_OPTION=-O2 tools-only</pre>
   <h4>Build llvm-gcc4</h4>
+  <p>Apple provides a Subversion repository for llvm-gcc4. You need this latest
+  version because HLVM depends on some of the features. You might find this one
+  a bit tricky. See the README.LLVM file in the top source directory for
+  additional help and late breaking news.</p>
   <pre>
   cd /proj/llvm-gcc4
   svn co svn://anonsvn.opensource.apple.com/svn/llvm cfe
@@ -1033,5 +1041,4 @@
 
 That's all there is to it!
 </pre>
-</div>
 <!--#include virtual="/incl/footer.incl" -->

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From saem at hlvm.org  Tue Jun 20 01:49:37 2006
From: saem at hlvm.org (saem at hlvm.org)
Date: Tue, 20 Jun 2006 02:49:37 -0400
Subject: [hlvm-commits] r311 - docs
Message-ID: <200606200649.k5K6nb3F025962@sneezy.swagora.com>

Author: saem
Date: 2006-06-20 02:49:36 -0400 (Tue, 20 Jun 2006)
New Revision: 311
Log:
missing the "co" command for the gcc svn checkout instruction

Modified:
   docs/DevelopersGuide.html

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-20 05:38:08 UTC (rev 310)
+++ docs/DevelopersGuide.html	2006-06-20 06:49:36 UTC (rev 311)
@@ -1,6 +1,71 @@
+<<<<<<< .mine
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+<head>
+  <title>HLVM: Developer's Guide</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta name="keywords"
+    content="HLVM,High Levl Virtual Machine,virtual machine,VM"/>
+  <meta name="description" 
+    content="A resuable virtula machine infrastructure."/>
+  <link rel="stylesheet" href="/hlvm.css" type="text/css"/>
+  <link rel="icon" href="http://hlvm.org/favicon.png" type="image/png"/>
+  <link rel="shortcut icon" href="http://hlvm.org/favicon.png" 
+    type="image/png"/>
+</head>
+<body>
+<table class="layout"><tr><td class="sidebar">
+<a href="/"
+  onmouseover="window.status='High Level Virtual Machine';return true;"
+  title="High Level Virtual Machine">
+  <img src="/img/logo.png" style="border:none" alt="HLVM Logo"/></a><br/>
+  <br/>
+<b>Contents</b>
+<div class="sidebox">
+  <a href="/">Overview</a><br/>
+  <a href="/docs/ReleasePlans.html">Release Plans</a><br/>
+  <a href="/docs/OpenProjects.html">Open Projects</a><br/>
+  <a href="/docs/GettingStarted.html">Getting Started</a><br/>
+  <a href="/docs/index.html">Documentation</a><br/>
+  <a href="/APIs.shtml">Doxygen APIs</a><br/>
+  <a href="/docs/Credits.html">Credits</a><br/>
+  <a href="/docs/FAQ.html">FAQ</a><br/>
+  <a href="/Feedback.php">Feedback</a><br/>
+</div>
+
+  <br/>
+<b>Search&nbsp;this&nbsp;Site</b>
+<form action="http://www.google.com/search" method="get">
+  <input type="hidden" name="sitesearch" value="hlvm.org"/>
+  <input type="text" name="q" size="11"/>
+  <input type="submit" value="Search!" name="submit"/>
+</form>
+
+  <br/>
+<b>Releases</b>
+<div class="sidebox">
+June&nbsp;13,&nbsp;2006&nbsp;<a href="/releases/0.1/hlvm-0.1-tar.bz2">0.1</a>
+&nbsp;<a href="/releases/0.1/docs/ReleaseNotes.html">Notes</a><br/>
+</div>
+
+  <br/>
+<b>Status&nbsp;Updates</b>
+<div class="sidebox">
+  <a href="/docs/status/2006-05-25.html">May 25, 2006</a><br/>
+  <a href="/docs/status/2006-04-25.html">April 25, 2006</a><br/>
+</div>
+
+</td>
+<td class="body">
+
+<h1 class="title">HLVM Developer's Guide</h1>
+=======
 <!--#set var="title" value="Developer's Guide" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1 class="title">HLVM Developer's Guide</h1>
+>>>>>>> .r310
 <div class="warning">CAUTION: This document is a work in progress.</div>
 <ol>
   <li><a href="#intro">Introduction</a></li>
@@ -367,6 +432,7 @@
 
 <h3><a name="sanity">A Sane Build Environment</a></h3>
 <div class="text">
+<<<<<<< .mine
   <p>Building HLVM is no small feat. It depends on a lot of software that is
   quite version dependent. To bring a little sanity to the process, here is a
   step-by-step procedure we know to work.</p>
@@ -392,6 +458,155 @@
   build and install GCC 3.4.6:</p><pre>
   cd /proj/gcc
   mkdir build
+  svn co svn://gcc.gnu.org/svn/gcc/tags/gcc_3_4_6_release src
+  cd ../build
+  ../src/configure  --prefix=/proj/install
+  make 
+  make install</pre>
+  <h4>Set Environment</h4>
+  <p>Now that you have gcc installed in a separate location, you will need to
+  change your environment to ensure that that version of gcc is the one used in
+  subsequent builds. Details vary from platform to platform, but on Linux, the
+  following should work:</p><pre>
+  export PATH=/proj/install/bin:$PATH
+  export LD_LIBRARY_PATH=/proj/install/lib:$LD_LIBRARY_PATH</pre>
+  <p>The essential point is to change your environment so that programs and
+  libraries installed into /proj/install will be found first. You should do this
+  in any shell environment in which you'll be building HLVM related software.
+  </p>
+  <h4>Build gperf</h4>
+  <p>This package is used for generating perfect hash functions. It is used by
+  HLVM for fast recognition of XML element and attribute names. Its easy and
+  fast to build:</p><pre>
+  cd /proj/gperf
+  wget http://mirrors.kernel.org/gnu/gperf/gperf-2.7.2.tar.gz
+  tar zxf gperf-2.7.2.tar.gz
+  mkdir build
+  cd build
+  ../gperf-2.7.2/configure --prefix=/proj/install
+  make
+  make install</pre>
+  <h4>Build libxml2</h4>
+  <p>This package provides all XML services for HLVM. It is part of GNome and
+  many other packages and quite stable. It should build quickly and easily for
+  you. Use these commands:</p><pre>
+  cd /proj/libxml2
+  wget ftp://xmlsoft.org/libxml2/libxml2-2.6.24.tar.gz
+  tar zxf libxml2-2.6.24.tar.gz
+  mkdir build
+  cd build
+  ../libxml2-2.6.24/configure --prefix=/proj/install
+  make
+  make install</pre>
+  <h4>Build apr</h4>
+  <p>The Apache Portable Runtime is a portability layer used within the Apache
+  HTTP Server. Although it is still undergoing active development, stable
+  releases are available. HLVM uses APR for portability in the runtime. Build 
+  APR with the following commands:</p>
+  <pre>
+  cd /proj/apr
+  wget http://mirror.olnevhost.net/pub/apache/apr/apr-1.2.7.tar.gz
+  tar zxf apr-1.2.7.tar.gz
+  mkdir build
+  cd apr-1.2.7
+  ./buildconf
+  cd ../build
+  ../apr-1.2.7/configure --prefix=/proj/install --enable-debug \
+    --enable-threads --enable-other-child
+  make
+  make install</pre>
+  <h4>Build apr-util</h4>
+  <p>The apr-util package is some additional utilities that go with APR. Build 
+  apr-util with the following commands:</p>
+  <pre>
+  cd /proj/apru
+  wget http://mirror.olnevhost.net/pub/apache/apr/apr-util-1.2.7.tar.gz
+  tar zxf apr-1.2.7.tar.gz
+  mkdir build
+  cd apr-util-1.2.7
+  ./buildconf
+  cd ../build
+  ../apr-util-1.2.7/configure --prefix=/proj/install --enable-debug \
+    --enable-threads --enable-other-child
+  make
+  make install</pre>
+  <h4>Build LLVM</h4>
+  <p>For now, you must build LLVM from the CVS repository. Although LLVM is
+  actively being developed, it is generally stable and this is safe. If you get
+  tempted to use a release tarball, it will fail. HLVM depends on post-1.7
+  features of LLVM. When you build LLVM, use the "tools-only" target. This will
+  avoid building the "runtime" portion of LLVM which was necessary for an older
+  version of llvm-gcc (v3). Since we'll be using llvm-gcc4, this is unnecessary
+  and will eliminate some chicken-and-egg type problems.</p>
+  <pre>
+  cd /proj/llvm
+  cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
+  &lt;return&gt;
+  cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co llvm
+  mkdir build
+  cd build
+  ../llvm/configure --prefix=/proj/install
+  make tools-only
+  make install
+  make ENABLE_OPTIMIZED=1 OPTIMIZE_OPTION=-O2 tools-only</pre>
+  <h4>Build llvm-gcc4</h4>
+  <p>Apple provides a Subversion repository for llvm-gcc4. You need this latest
+  version because HLVM depends on some of the features. You might find this one
+  a bit tricky. See the README.LLVM file in the top source directory for
+  additional help and late breaking news.</p>
+  <pre>
+  cd /proj/llvm-gcc4
+  svn co svn://anonsvn.opensource.apple.com/svn/llvm cfe
+  mkdir build install
+  cd build
+  ../cfe/configure --prefix=/proj/llvm-gcc4/cfe/install \
+    --enable-llvm=/proj/llvm/build --enable-languages=c,c++
+  make
+  make install
+  </pre>
+  <h4>Build HLVM</h4>
+  <p>Note in the following that if you've actually used <tt>/proj</tt> as your
+  build area then you don't need to provide any arguments to <tt>make</tt> as
+  these paths are the default. Also note that the arguments are only needed the
+  first time you build HLVM. Subsequently, these options will be remembered. See
+  the description of SCons above.</p>
+  <pre>
+  cd /proj/hlvm
+  svn co svn://hlvm.org/hlvm hlvm
+  cd hlvm
+  make MYMODE=Debug MYPATH=/proj/llvm/cfe/install:/proj/install \
+    MYPREFIX=/proj/install/bin
+  </pre>
+</div>
+
+<h2><a name="style">Coding Style</a></h2>
+<div class="text">
+=======
+  <p>Building HLVM is no small feat. It depends on a lot of software that is
+  quite version dependent. To bring a little sanity to the process, here is a
+  step-by-step procedure we know to work.</p>
+  <h4>Build Separation</h4>
+  <p>In building HLVM, you'll be installing compilers and library that may
+  already exist on your system. You don't want to overwrite your system versions
+  of these things or it will wreak havoc on your system. So, we suggest that you
+  start with a fresh directory. In the discussion that follows, we'll call it
+  <tt>/proj</tt> (that's what Reid uses).  But, it could be anything you want, 
+  as long as its new.  <tt>~/hlvm</tt> would work just as well.  Choosing the
+  disk location for this should not be taken lightly. You will need upwards of
+  40GB of storage to build all this software.</p>
+  <p>Once you've found a suitable location for HLVM, create the following
+  directory structure:</p><pre>
+  cd /proj
+  mkdir gcc llvm llvm-gcc4 libxml2 apr apru hlvm gperf scons install</pre>
+  <p>In the following sections you will build each of these packages and install
+  them into <tt>/proj/install</tt> which will keep it separate from anything
+  else in your system.</p>
+  <h4>Build GCC 3.4.6</h4>
+  <p>First, start with obtaining GCC 3.4.6. This will be the compiler that you
+  use for all the remaining compilations. Use the following commands to obtain,
+  build and install GCC 3.4.6:</p><pre>
+  cd /proj/gcc
+  mkdir build
   svn svn://gcc.gnu.org/svn/gcc/tags/gcc_3_4_6_release src
   cd ../build
   ../src/configure  --prefix=/proj/install
@@ -515,6 +730,7 @@
 
 <h2><a name="style">Coding Style</a></h2>
 <div class="text">
+>>>>>>> .r310
   <p>Contributions to HLVM must meet the following Coding Style
   requirements:</p>
   <ul>
@@ -1041,4 +1257,69 @@
 
 That's all there is to it!
 </pre>
+<<<<<<< .mine
+</td>
+<td class="sidebar">
+  <br/>
+<b>Resources</b>
+<div class="sidebox">
+  <a href="http://hlvm.org/wiki/">Wiki Site</a><br/>
+  <a href="http://hlvm.org/hlvm-dev.shtml">Developers List</a><br/>
+  <a href="http://hlvm.org/hlvm-commits.shtml">Commits List</a><br/>
+  <a href="irc://irc.oftc.net/#hlvm">IRC Channel</a><br/> 
+  <a href="http://hlvm.org/Source.shtml">Latest Source</a><br/>
+  <a href="http://hlvm.org/WebSVN.shtml">Web SVN</a><br/>
+  <a href="http://hlvm.org/bugs/">HLVM Bugzilla</a>
+</div>
+
+  <br/>
+<b>Random Facts</b><br/>
+<div class="sidebox">
+HLVM uses the <a href="http://xmlsoft.org/">Libxml2 Library</a> to parse and
+validate XML documents that generate the Abstract Syntax Tree. See the
+hlvm-xml2xml program.
+
+
+</div>
+
+
+  <br/>
+<b>Notices</b><br/>
+<div class="sidebox">
+  <a href="http://www.opensource.org/docs/definition.php" 
+    title="Open Source Definition">
+    <img src="/img/osi-certified-60x50.gif" alt="OSI Certification Logo" 
+      style="width:60px;height:50px;border:0"/>
+  </a><br/>
+  <a href="http://validator.w3.org/check/referer" 
+    title="Validate XHTML On This Page">
+    <img src="/img/vxhtml10.gif" style="border:0;width:88px;height:31px" 
+      alt="Valid XHTML 1.0!"/>
+  </a><br/>
+  <a href="http://jigsaw.w3.org/css-validator/check/referer" 
+    title="Validate CSS2 On This Page">
+    <img src="/img/vcss.gif" style="border:0;width:88px;height:31px" 
+      alt="Valid CSS2!"/>
+  </a>
+</div>
+
+
+</td>
+</tr>
+</table>
+<div class="footer">
+<a href="/Privacy.shtml">Privacy</a>&nbsp;&nbsp;<a 
+href="/Contact.shtml">Contact Us</a>&nbsp;&nbsp;<a
+href="/Feedback.php">Feedback</a>&nbsp;&nbsp;<a
+href="/">Home</a>
+<br/>
+Copyright&nbsp;&copy;&nbsp;2006&nbsp;Reid Spencer&nbsp;All&nbsp;Rights&nbsp;Reserved.<br/>
+Last Modified: 
+Tuesday, 20-Jun-2006 01:38:09 EDT
+</div>
+</body>
+</html>
+
+=======
 <!--#include virtual="/incl/footer.incl" -->
+>>>>>>> .r310

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 02:19:57 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 03:19:57 -0400
Subject: [hlvm-commits] r312 - docs
Message-ID: <200606200719.k5K7JvJa026028@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 03:19:56 -0400 (Tue, 20 Jun 2006)
New Revision: 312
Log:
Revert Saem's patch that broke this page and apply the correct patch.


Modified:
   docs/DevelopersGuide.html

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-20 06:49:36 UTC (rev 311)
+++ docs/DevelopersGuide.html	2006-06-20 07:19:56 UTC (rev 312)
@@ -1,71 +1,6 @@
-<<<<<<< .mine
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
-<head>
-  <title>HLVM: Developer's Guide</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <meta name="keywords"
-    content="HLVM,High Levl Virtual Machine,virtual machine,VM"/>
-  <meta name="description" 
-    content="A resuable virtula machine infrastructure."/>
-  <link rel="stylesheet" href="/hlvm.css" type="text/css"/>
-  <link rel="icon" href="http://hlvm.org/favicon.png" type="image/png"/>
-  <link rel="shortcut icon" href="http://hlvm.org/favicon.png" 
-    type="image/png"/>
-</head>
-<body>
-<table class="layout"><tr><td class="sidebar">
-<a href="/"
-  onmouseover="window.status='High Level Virtual Machine';return true;"
-  title="High Level Virtual Machine">
-  <img src="/img/logo.png" style="border:none" alt="HLVM Logo"/></a><br/>
-  <br/>
-<b>Contents</b>
-<div class="sidebox">
-  <a href="/">Overview</a><br/>
-  <a href="/docs/ReleasePlans.html">Release Plans</a><br/>
-  <a href="/docs/OpenProjects.html">Open Projects</a><br/>
-  <a href="/docs/GettingStarted.html">Getting Started</a><br/>
-  <a href="/docs/index.html">Documentation</a><br/>
-  <a href="/APIs.shtml">Doxygen APIs</a><br/>
-  <a href="/docs/Credits.html">Credits</a><br/>
-  <a href="/docs/FAQ.html">FAQ</a><br/>
-  <a href="/Feedback.php">Feedback</a><br/>
-</div>
-
-  <br/>
-<b>Search&nbsp;this&nbsp;Site</b>
-<form action="http://www.google.com/search" method="get">
-  <input type="hidden" name="sitesearch" value="hlvm.org"/>
-  <input type="text" name="q" size="11"/>
-  <input type="submit" value="Search!" name="submit"/>
-</form>
-
-  <br/>
-<b>Releases</b>
-<div class="sidebox">
-June&nbsp;13,&nbsp;2006&nbsp;<a href="/releases/0.1/hlvm-0.1-tar.bz2">0.1</a>
-&nbsp;<a href="/releases/0.1/docs/ReleaseNotes.html">Notes</a><br/>
-</div>
-
-  <br/>
-<b>Status&nbsp;Updates</b>
-<div class="sidebox">
-  <a href="/docs/status/2006-05-25.html">May 25, 2006</a><br/>
-  <a href="/docs/status/2006-04-25.html">April 25, 2006</a><br/>
-</div>
-
-</td>
-<td class="body">
-
-<h1 class="title">HLVM Developer's Guide</h1>
-=======
 <!--#set var="title" value="Developer's Guide" -->
 <!--#include virtual="/incl/header.incl" -->
 <h1 class="title">HLVM Developer's Guide</h1>
->>>>>>> .r310
 <div class="warning">CAUTION: This document is a work in progress.</div>
 <ol>
   <li><a href="#intro">Introduction</a></li>
@@ -432,7 +367,6 @@
 
 <h3><a name="sanity">A Sane Build Environment</a></h3>
 <div class="text">
-<<<<<<< .mine
   <p>Building HLVM is no small feat. It depends on a lot of software that is
   quite version dependent. To bring a little sanity to the process, here is a
   step-by-step procedure we know to work.</p>
@@ -581,156 +515,6 @@
 
 <h2><a name="style">Coding Style</a></h2>
 <div class="text">
-=======
-  <p>Building HLVM is no small feat. It depends on a lot of software that is
-  quite version dependent. To bring a little sanity to the process, here is a
-  step-by-step procedure we know to work.</p>
-  <h4>Build Separation</h4>
-  <p>In building HLVM, you'll be installing compilers and library that may
-  already exist on your system. You don't want to overwrite your system versions
-  of these things or it will wreak havoc on your system. So, we suggest that you
-  start with a fresh directory. In the discussion that follows, we'll call it
-  <tt>/proj</tt> (that's what Reid uses).  But, it could be anything you want, 
-  as long as its new.  <tt>~/hlvm</tt> would work just as well.  Choosing the
-  disk location for this should not be taken lightly. You will need upwards of
-  40GB of storage to build all this software.</p>
-  <p>Once you've found a suitable location for HLVM, create the following
-  directory structure:</p><pre>
-  cd /proj
-  mkdir gcc llvm llvm-gcc4 libxml2 apr apru hlvm gperf scons install</pre>
-  <p>In the following sections you will build each of these packages and install
-  them into <tt>/proj/install</tt> which will keep it separate from anything
-  else in your system.</p>
-  <h4>Build GCC 3.4.6</h4>
-  <p>First, start with obtaining GCC 3.4.6. This will be the compiler that you
-  use for all the remaining compilations. Use the following commands to obtain,
-  build and install GCC 3.4.6:</p><pre>
-  cd /proj/gcc
-  mkdir build
-  svn svn://gcc.gnu.org/svn/gcc/tags/gcc_3_4_6_release src
-  cd ../build
-  ../src/configure  --prefix=/proj/install
-  make 
-  make install</pre>
-  <h4>Set Environment</h4>
-  <p>Now that you have gcc installed in a separate location, you will need to
-  change your environment to ensure that that version of gcc is the one used in
-  subsequent builds. Details vary from platform to platform, but on Linux, the
-  following should work:</p><pre>
-  export PATH=/proj/install/bin:$PATH
-  export LD_LIBRARY_PATH=/proj/install/lib:$LD_LIBRARY_PATH</pre>
-  <p>The essential point is to change your environment so that programs and
-  libraries installed into /proj/install will be found first. You should do this
-  in any shell environment in which you'll be building HLVM related software.
-  </p>
-  <h4>Build gperf</h4>
-  <p>This package is used for generating perfect hash functions. It is used by
-  HLVM for fast recognition of XML element and attribute names. Its easy and
-  fast to build:</p><pre>
-  cd /proj/gperf
-  wget http://mirrors.kernel.org/gnu/gperf/gperf-2.7.2.tar.gz
-  tar zxf gperf-2.7.2.tar.gz
-  mkdir build
-  cd build
-  ../gperf-2.7.2/configure --prefix=/proj/install
-  make
-  make install</pre>
-  <h4>Build libxml2</h4>
-  <p>This package provides all XML services for HLVM. It is part of GNome and
-  many other packages and quite stable. It should build quickly and easily for
-  you. Use these commands:</p><pre>
-  cd /proj/libxml2
-  wget ftp://xmlsoft.org/libxml2/libxml2-2.6.24.tar.gz
-  tar zxf libxml2-2.6.24.tar.gz
-  mkdir build
-  cd build
-  ../libxml2-2.6.24/configure --prefix=/proj/install
-  make
-  make install</pre>
-  <h4>Build apr</h4>
-  <p>The Apache Portable Runtime is a portability layer used within the Apache
-  HTTP Server. Although it is still undergoing active development, stable
-  releases are available. HLVM uses APR for portability in the runtime. Build 
-  APR with the following commands:</p>
-  <pre>
-  cd /proj/apr
-  wget http://mirror.olnevhost.net/pub/apache/apr/apr-1.2.7.tar.gz
-  tar zxf apr-1.2.7.tar.gz
-  mkdir build
-  cd apr-1.2.7
-  ./buildconf
-  cd ../build
-  ../apr-1.2.7/configure --prefix=/proj/install --enable-debug \
-    --enable-threads --enable-other-child
-  make
-  make install</pre>
-  <h4>Build apr-util</h4>
-  <p>The apr-util package is some additional utilities that go with APR. Build 
-  apr-util with the following commands:</p>
-  <pre>
-  cd /proj/apru
-  wget http://mirror.olnevhost.net/pub/apache/apr/apr-util-1.2.7.tar.gz
-  tar zxf apr-1.2.7.tar.gz
-  mkdir build
-  cd apr-util-1.2.7
-  ./buildconf
-  cd ../build
-  ../apr-util-1.2.7/configure --prefix=/proj/install --enable-debug \
-    --enable-threads --enable-other-child
-  make
-  make install</pre>
-  <h4>Build LLVM</h4>
-  <p>For now, you must build LLVM from the CVS repository. Although LLVM is
-  actively being developed, it is generally stable and this is safe. If you get
-  tempted to use a release tarball, it will fail. HLVM depends on post-1.7
-  features of LLVM. When you build LLVM, use the "tools-only" target. This will
-  avoid building the "runtime" portion of LLVM which was necessary for an older
-  version of llvm-gcc (v3). Since we'll be using llvm-gcc4, this is unnecessary
-  and will eliminate some chicken-and-egg type problems.</p>
-  <pre>
-  cd /proj/llvm
-  cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
-  &lt;return&gt;
-  cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co llvm
-  mkdir build
-  cd build
-  ../llvm/configure --prefix=/proj/install
-  make tools-only
-  make install
-  make ENABLE_OPTIMIZED=1 OPTIMIZE_OPTION=-O2 tools-only</pre>
-  <h4>Build llvm-gcc4</h4>
-  <p>Apple provides a Subversion repository for llvm-gcc4. You need this latest
-  version because HLVM depends on some of the features. You might find this one
-  a bit tricky. See the README.LLVM file in the top source directory for
-  additional help and late breaking news.</p>
-  <pre>
-  cd /proj/llvm-gcc4
-  svn co svn://anonsvn.opensource.apple.com/svn/llvm cfe
-  mkdir build install
-  cd build
-  ../cfe/configure --prefix=/proj/llvm-gcc4/cfe/install \
-    --enable-llvm=/proj/llvm/build --enable-languages=c,c++
-  make
-  make install
-  </pre>
-  <h4>Build HLVM</h4>
-  <p>Note in the following that if you've actually used <tt>/proj</tt> as your
-  build area then you don't need to provide any arguments to <tt>make</tt> as
-  these paths are the default. Also note that the arguments are only needed the
-  first time you build HLVM. Subsequently, these options will be remembered. See
-  the description of SCons above.</p>
-  <pre>
-  cd /proj/hlvm
-  svn co svn://hlvm.org/hlvm hlvm
-  cd hlvm
-  make MYMODE=Debug MYPATH=/proj/llvm/cfe/install:/proj/install \
-    MYPREFIX=/proj/install/bin
-  </pre>
-</div>
-
-<h2><a name="style">Coding Style</a></h2>
-<div class="text">
->>>>>>> .r310
   <p>Contributions to HLVM must meet the following Coding Style
   requirements:</p>
   <ul>
@@ -1257,69 +1041,4 @@
 
 That's all there is to it!
 </pre>
-<<<<<<< .mine
-</td>
-<td class="sidebar">
-  <br/>
-<b>Resources</b>
-<div class="sidebox">
-  <a href="http://hlvm.org/wiki/">Wiki Site</a><br/>
-  <a href="http://hlvm.org/hlvm-dev.shtml">Developers List</a><br/>
-  <a href="http://hlvm.org/hlvm-commits.shtml">Commits List</a><br/>
-  <a href="irc://irc.oftc.net/#hlvm">IRC Channel</a><br/> 
-  <a href="http://hlvm.org/Source.shtml">Latest Source</a><br/>
-  <a href="http://hlvm.org/WebSVN.shtml">Web SVN</a><br/>
-  <a href="http://hlvm.org/bugs/">HLVM Bugzilla</a>
-</div>
-
-  <br/>
-<b>Random Facts</b><br/>
-<div class="sidebox">
-HLVM uses the <a href="http://xmlsoft.org/">Libxml2 Library</a> to parse and
-validate XML documents that generate the Abstract Syntax Tree. See the
-hlvm-xml2xml program.
-
-
-</div>
-
-
-  <br/>
-<b>Notices</b><br/>
-<div class="sidebox">
-  <a href="http://www.opensource.org/docs/definition.php" 
-    title="Open Source Definition">
-    <img src="/img/osi-certified-60x50.gif" alt="OSI Certification Logo" 
-      style="width:60px;height:50px;border:0"/>
-  </a><br/>
-  <a href="http://validator.w3.org/check/referer" 
-    title="Validate XHTML On This Page">
-    <img src="/img/vxhtml10.gif" style="border:0;width:88px;height:31px" 
-      alt="Valid XHTML 1.0!"/>
-  </a><br/>
-  <a href="http://jigsaw.w3.org/css-validator/check/referer" 
-    title="Validate CSS2 On This Page">
-    <img src="/img/vcss.gif" style="border:0;width:88px;height:31px" 
-      alt="Valid CSS2!"/>
-  </a>
-</div>
-
-
-</td>
-</tr>
-</table>
-<div class="footer">
-<a href="/Privacy.shtml">Privacy</a>&nbsp;&nbsp;<a 
-href="/Contact.shtml">Contact Us</a>&nbsp;&nbsp;<a
-href="/Feedback.php">Feedback</a>&nbsp;&nbsp;<a
-href="/">Home</a>
-<br/>
-Copyright&nbsp;&copy;&nbsp;2006&nbsp;Reid Spencer&nbsp;All&nbsp;Rights&nbsp;Reserved.<br/>
-Last Modified: 
-Tuesday, 20-Jun-2006 01:38:09 EDT
-</div>
-</body>
-</html>
-
-=======
 <!--#include virtual="/incl/footer.incl" -->
->>>>>>> .r310

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 03:12:10 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 04:12:10 -0400
Subject: [hlvm-commits] r313 - hlvm/Pass
Message-ID: <200606200812.k5K8CAdO028871@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 04:12:09 -0400 (Tue, 20 Jun 2006)
New Revision: 313
Log:
Validate the ReturnOp and the SelectOp a bit more carefully.


Modified:
   hlvm/Pass/Validate.cpp

Modified: hlvm/Pass/Validate.cpp
===================================================================
--- hlvm/Pass/Validate.cpp	2006-06-20 07:19:56 UTC (rev 312)
+++ hlvm/Pass/Validate.cpp	2006-06-20 08:12:09 UTC (rev 313)
@@ -519,7 +519,13 @@
 ValidateImpl::validate(ReturnOp* n)
 {
   if (checkOperator(n,ReturnOpID,1))
-    checkTerminator(n);
+    if (checkTerminator(n)) {
+      Operator* res = n->getOperand(0);
+      const Function* F = n->getContainingFunction();
+      const SignatureType* SigTy = F->getSignature();
+      if (res->getType() != SigTy->getResultType())
+        error(n,"ReturnOp operand does not agree in type with Function result");
+    }
 }
 
 template<> inline void
@@ -540,9 +546,19 @@
 ValidateImpl::validate(SelectOp* n)
 {
   if (checkOperator(n,SelectOpID,3)) {
-    const Type* Ty = n->getOperand(0)->getType();
-    if (!isa<BooleanType>(Ty))
+    Operator* Op1 = n->getOperand(0);
+    Operator* Op2 = n->getOperand(1);
+    Operator* Op3 = n->getOperand(2);
+    const Type* Ty1 = Op1->getType();
+    const Type* Ty2 = Op2->getType();
+    const Type* Ty3 = Op3->getType();
+    if (!isa<BooleanType>(Ty1))
       error(n,"SelectOp expects first operand to be type boolean");
+    else if ( Ty1 != Ty2 )
+      error(n,"Second and third operands for SelectOp must agree in type");
+    else if (isa<Block>(Op2) != isa<Block>(Op3))
+      error(n,"SelectOp requires operands 2 and 3 to both be blocks or "
+              "neither be blocks");
   }
 }
 

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 09:32:47 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 10:32:47 -0400
Subject: [hlvm-commits] r314 - in hlvm: AST CodeGen Reader
Message-ID: <200606201432.k5KEWl5T008853@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 10:32:44 -0400 (Tue, 20 Jun 2006)
New Revision: 314
Log:
Make getValue() a virtual function so Block can override it. Provide a
getContainingFunction to Block. Implement code generation for SelectOp.


Modified:
   hlvm/AST/Block.h
   hlvm/AST/Node.h
   hlvm/AST/Operator.cpp
   hlvm/AST/Operator.h
   hlvm/CodeGen/LLVMGenerator.cpp
   hlvm/Reader/HLVM.rng

Modified: hlvm/AST/Block.h
===================================================================
--- hlvm/AST/Block.h	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/AST/Block.h	2006-06-20 14:32:44 UTC (rev 314)
@@ -57,6 +57,7 @@
   /// @name Accessors
   /// @{
   public:
+    virtual const Type* getType() const { return this->back()->getType(); }
     const std::string& getLabel() const { return label; }
     AutoVarOp*   getAutoVar(const std::string& name) const; 
     const Type* getResultType() { return this->back()->getType(); }

Modified: hlvm/AST/Node.h
===================================================================
--- hlvm/AST/Node.h	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/AST/Node.h	2006-06-20 14:32:44 UTC (rev 314)
@@ -539,7 +539,7 @@
   /// @{
   public:
     // Get the type of the value
-    inline const Type* getType() const { return type; }
+    virtual const Type* getType() const { return type; }
 
     static inline bool classof(const Value*) { return true; }
     static inline bool classof(const Node* N) { return N->isValue(); }

Modified: hlvm/AST/Operator.cpp
===================================================================
--- hlvm/AST/Operator.cpp	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/AST/Operator.cpp	2006-06-20 14:32:44 UTC (rev 314)
@@ -28,6 +28,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <hlvm/AST/Operator.h>
+#include <hlvm/AST/LinkageItems.h>
 #include <hlvm/Base/Assert.h>
 #include <llvm/Support/Casting.h>
 
@@ -39,6 +40,14 @@
 {
 }
 
+Function* 
+Operator::getContainingFunction()
+{
+  Node* p = getParent();
+  while (p && !isa<Function>(p)) p = p->getParent();
+  return cast<Function>(p);
+}
+
 NilaryOperator::~NilaryOperator()
 {
 }

Modified: hlvm/AST/Operator.h
===================================================================
--- hlvm/AST/Operator.h	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/AST/Operator.h	2006-06-20 14:32:44 UTC (rev 314)
@@ -36,6 +36,7 @@
 {
 
 class Type; 
+class Function;
 
 /// This class is the abstract base class in the Abstract Syntax Tree for all
 /// operators. An Operator is an instruction to the virtual machine to take
@@ -66,6 +67,9 @@
     virtual size_t  getNumOperands() const = 0;
     virtual Operator* getOperand(unsigned opnum) const = 0;
 
+    /// Return the function containing this operator
+    Function* getContainingFunction();
+
     /// Determine if this is a classof some other type.
     static inline bool classof(const Operator*) { return true; }
     static inline bool classof(const Node* N) { return N->isOperator(); }

Modified: hlvm/CodeGen/LLVMGenerator.cpp
===================================================================
--- hlvm/CodeGen/LLVMGenerator.cpp	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/CodeGen/LLVMGenerator.cpp	2006-06-20 14:32:44 UTC (rev 314)
@@ -1195,16 +1195,45 @@
 template<> void
 LLVMGeneratorPass::gen<SelectOp>(SelectOp* op)
 {
+  hlvmAssert(lops.size() >= 3 && "Too few operands for SelectOp");
+  llvm::Value* op3 = lops.back(); lops.pop_back();
+  llvm::Value* op2 = lops.back(); lops.pop_back();
+  llvm::Value* op1 = lops.back(); lops.pop_back();
+  hlvmAssert(op1->getType() == llvm::Type::BoolTy);
+  hlvmAssert(op2->getType() == op2->getType());
+  hlvmAssert(llvm::isa<llvm::BasicBlock>(op2) == 
+             llvm::isa<llvm::BasicBlock>(op3));
+  if (llvm::isa<llvm::BasicBlock>(op2)) {
+    // both are blocks, emit a BranchInstr
+    new llvm::BranchInst(
+        llvm::cast<llvm::BasicBlock>(op2),
+        llvm::cast<llvm::BasicBlock>(op3),op1,lblk);
+    return;
+  } 
+
+  // A this point, we can only be left with a first class type since all HLVM
+  // operators translate to a first class type. Since the select operator
+  // requires first class types, its okay to just use it here.
+  hlvmAssert(op2->getType()->isFirstClassType());
+  new llvm::SelectInst(op1,op2,op3,"select",lblk);
 }
 
 template<> void
 LLVMGeneratorPass::gen<SwitchOp>(SwitchOp* op)
 {
+  hlvmAssert(lops.size() >= 2 && "Too few operands for SwitchOp");
+  llvm::Value* op2 = lops.back(); lops.pop_back();
+  llvm::Value* op1 = lops.back(); lops.pop_back();
+
 }
 
 template<> void
 LLVMGeneratorPass::gen<LoopOp>(LoopOp* op)
 {
+  hlvmAssert(lops.size() >= 3 && "Too few operands for SelectOp");
+  llvm::Value* op3 = lops.back(); lops.pop_back();
+  llvm::Value* op2 = lops.back(); lops.pop_back();
+  llvm::Value* op1 = lops.back(); lops.pop_back();
 }
 
 template<> void

Modified: hlvm/Reader/HLVM.rng
===================================================================
--- hlvm/Reader/HLVM.rng	2006-06-20 08:12:09 UTC (rev 313)
+++ hlvm/Reader/HLVM.rng	2006-06-20 14:32:44 UTC (rev 314)
@@ -1060,6 +1060,7 @@
       <ref name="break.elem"/>
       <ref name="continue.elem"/>
       <ref name="ret.elem"/>
+      <ref name="call.elem"/>
     </choice>
   </define>
 
@@ -1112,4 +1113,13 @@
     </element>
   </define>
 
+  <define name="call.elem">
+    <element name="call">
+      <ref name="Named_Element.pat"/>
+      <zeroOrMore>
+        <ref name="Operators.pat"/>
+      </zeroOrMore>
+    </element>
+  </define>
+
 </grammar>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 09:36:55 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 10:36:55 -0400
Subject: [hlvm-commits] r315 - hlvm/Writer
Message-ID: <200606201436.k5KEat87009441@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 10:36:54 -0400 (Tue, 20 Jun 2006)
New Revision: 315
Log:
The dump() function is only a debug mode thing. Make it so.


Modified:
   hlvm/Writer/XMLWriter.cpp

Modified: hlvm/Writer/XMLWriter.cpp
===================================================================
--- hlvm/Writer/XMLWriter.cpp	2006-06-20 14:32:44 UTC (rev 314)
+++ hlvm/Writer/XMLWriter.cpp	2006-06-20 14:36:54 UTC (rev 315)
@@ -883,7 +883,9 @@
   return new XMLWriterImpl(fname);
 }
 
+#ifdef HLVM_DEBUG
 void 
 hlvm::dump(Node*)
 {
 }
+#endif

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 09:42:55 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 10:42:55 -0400
Subject: [hlvm-commits] r316 - build
Message-ID: <200606201442.k5KEgtkA009464@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 10:42:55 -0400 (Tue, 20 Jun 2006)
New Revision: 316
Log:
Check variables for None before using them!
Patch contributed by Mark Rowe.


Modified:
   build/configure.py

Modified: build/configure.py
===================================================================
--- build/configure.py	2006-06-20 14:36:54 UTC (rev 315)
+++ build/configure.py	2006-06-20 14:42:55 UTC (rev 316)
@@ -182,7 +182,7 @@
 
 def CheckProgram(ctxt,progname,varname,moredirs=[],critical=1):
   ctxt.Message("Checking for Program " + progname + "...")
-  if exists(ctxt.env[varname]):
+  if ctxt.env[varname] is not None and exists(ctxt.env[varname]):
     ret = 1
   else:
     paths = sjoin(moredirs,':') + ':' + ctxt.env['ENV']['PATH'] 

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 09:55:51 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 10:55:51 -0400
Subject: [hlvm-commits] r317 - /
Message-ID: <200606201455.k5KEtp91009494@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 10:55:50 -0400 (Tue, 20 Jun 2006)
New Revision: 317
Log:
Don't search the llvm-gcc4 install area before the gcc install area or you'll
end up finding the wrong compiler!


Modified:
   Makefile

Modified: Makefile
===================================================================
--- Makefile	2006-06-20 14:42:55 UTC (rev 316)
+++ Makefile	2006-06-20 14:55:50 UTC (rev 317)
@@ -13,7 +13,7 @@
 MYMODE := Debug
 
 # Specify a path for where the 3rd party software is installed
-MYPATH := /proj/llvm/cfe/install:/proj/install
+MYPATH := /proj/install:/proj/llvm/cfe/install
 
 # Specify where you want HLVM to be installed
 MYPREFIX := /proj/install/hlvm

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 10:16:04 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 11:16:04 -0400
Subject: [hlvm-commits] r318 - docs
Message-ID: <200606201516.k5KFG4So009515@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 11:16:03 -0400 (Tue, 20 Jun 2006)
New Revision: 318
Log:
Add a section on getting and installing SCons


Modified:
   docs/DevelopersGuide.html

Modified: docs/DevelopersGuide.html
===================================================================
--- docs/DevelopersGuide.html	2006-06-20 14:55:50 UTC (rev 317)
+++ docs/DevelopersGuide.html	2006-06-20 15:16:03 UTC (rev 318)
@@ -496,8 +496,21 @@
   ../cfe/configure --prefix=/proj/llvm-gcc4/cfe/install \
     --enable-llvm=/proj/llvm/build --enable-languages=c,c++
   make
-  make install
-  </pre>
+  make install</pre>
+  <h4>Install SCons</h4>
+  <p>As noted earlier, HLVM uses the SCons tool for its builds. You need version
+  0.96.92. Install it like this:</p>
+  <pre>
+  cd /proj/scons
+  wget http://internap.dl.sourceforge.net/sourceforge/scons/scons-0.96.92.tar.gz
+  tar zxf scons-0.96.92.tar.gz
+  python config.py install</pre>
+  <p>Alternatively, you could use one of the SCons packages, such as:</p>
+  <pre>
+  cd /proj/scons
+  wget http://internap.dl.sourceforge.net/sourceforge/scons/scons-0.96.92-1.noarch.rpm
+  rpm --install scons-0.96.92-1.noarch.rpm</pre>
+
   <h4>Build HLVM</h4>
   <p>Note in the following that if you've actually used <tt>/proj</tt> as your
   build area then you don't need to provide any arguments to <tt>make</tt> as
@@ -509,8 +522,7 @@
   svn co svn://hlvm.org/hlvm hlvm
   cd hlvm
   make MYMODE=Debug MYPATH=/proj/llvm/cfe/install:/proj/install \
-    MYPREFIX=/proj/install/bin
-  </pre>
+    MYPREFIX=/proj/install/bin</pre>
 </div>
 
 <h2><a name="style">Coding Style</a></h2>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Tue Jun 20 10:20:21 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Tue, 20 Jun 2006 11:20:21 -0400
Subject: [hlvm-commits] r319 - test/return0
Message-ID: <200606201520.k5KFKLpA009534@sneezy.swagora.com>

Author: reid
Date: 2006-06-20 11:20:20 -0400 (Tue, 20 Jun 2006)
New Revision: 319
Log:
Make the constants s32 instead of u32 so they don't have type conflicts 
with the result of the program.


Modified:
   test/return0/bitwise.hlx

Modified: test/return0/bitwise.hlx
===================================================================
--- test/return0/bitwise.hlx	2006-06-20 15:16:03 UTC (rev 318)
+++ test/return0/bitwise.hlx	2006-06-20 15:20:20 UTC (rev 319)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/xml2xml/bitwise.hlx">
   <bundle id="bitwise">
-    <constant id="0f0f0f0f" type="u32"><hex>0f0f0f0f</hex></constant>
-    <constant id="08080808" type="u32"><hex>08080808</hex></constant>
-    <constant id="04040404" type="u32"><hex>04040404</hex></constant>
-    <constant id="00000000" type="u32"><hex>00000000</hex></constant>
+    <constant id="0f0f0f0f" type="s32"><hex>0f0f0f0f</hex></constant>
+    <constant id="08080808" type="s32"><hex>08080808</hex></constant>
+    <constant id="04040404" type="s32"><hex>04040404</hex></constant>
+    <constant id="00000000" type="s32"><hex>00000000</hex></constant>
     <program id="bitwise">
       <block>
         <ret>

_______________________________________________
hlvm-commits mailing list
hlvm-commits at hlvm.org
http://hlvm.org/mailman/listinfo/hlvm-commits


From rspencer at reidspencer.com  Wed Jun 21 16:52:06 2006
From: rspencer at reidspencer.com (rspencer at reidspencer.com)
Date: Wed, 21 Jun 2006 17:52:06 -0400
Subject: [hlvm-commits] r320 - in hlvm: Base Runtime
Message-ID: <200606212152.k5LLq6wB025903@sneezy.swagora.com>

Author: reid
Date: 2006-06-21 17:52:05 -0400 (Wed, 21 Jun 2006)
New Revision: 320
Log:
Renamed Config.h.in so that it doesn't conflict with config.h on cast
insensitive file systems.


Added:
   hlvm/Base/Configuration.h.in
Removed:
   hlvm/Base/Config.h.in
Modified:
   hlvm/Base/Memory.cpp
   hlvm/Base/SConscript
   hlvm/Runtime/Main.cpp

Deleted: hlvm/Base/Config.h.in
===================================================================
--- hlvm/Base/Config.h.in	2006-06-20 15:20:20 UTC (rev 319)
+++ hlvm/Base/Config.h.in	2006-06-21 21:52:05 UTC (rev 320)
@@ -1,100 +0,0 @@
-//===-- HLVM Configuration Template -----------------------------*- C++ -*-===//
-//
-//                      High Level Virtual Machine (HLVM)
-//
-// Copyright (C) 2006 Reid Spencer. All Rights Reserved.
-//
-// This software is free software; you can redistribute it and/or modify it 
-// under the terms of the GNU Lesser General Public License as published by 
-// the Free Software Foundation; either version 2.1 of the License, or (at 
-// your option) any later version.
-//
-// This software is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for 
-// more details.
-//
-// You should have received a copy of the GNU Lesser General Public License 
-// along with this library in the file named LICENSE.txt; if not, write to the 
-// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-// MA 02110-1301 USA
-//
-//===----------------------------------------------------------------------===//
-/// @file hlvm/Base/Config.h.in
-/// @author Reid Spencer <rspencer at reidspencer.com> (original author)
-/// @date 2006/05/04
-/// @since 0.1.0
-/// @brief Template header for capturing configuration data
-//===------------------------